diff --git a/.gitignore b/.gitignore
index ed04c57d..97b87e3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,4 +23,5 @@ yarn-error.log
 .Spotlight-V100
 .TemporaryItems
 .Trashes
-.VolumeIcon.icns
\ No newline at end of file
+.VolumeIcon.icns
+storage/app/public/avatars/*
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index b2ea669a..3688debd 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -4,6 +4,11 @@ namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use App\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\URL;
 
 class LoginController extends Controller
 {
@@ -25,7 +30,7 @@ class LoginController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/home';
+    protected $redirectTo = '/';
 
     /**
      * Create a new controller instance.
@@ -34,6 +39,88 @@ class LoginController extends Controller
      */
     public function __construct()
     {
+        Session::put('backUrl', URL::previous());
         $this->middleware('guest')->except('logout');
     }
+
+    public function username()
+    {
+        return 'username';
+    }
+
+    /**
+     * Handle a login request to the application.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response|\Illuminate\Http\JsonResponse
+     *
+     * @throws \Illuminate\Validation\ValidationException
+     */
+    public function login(Request $request)
+    {
+        $current_user = User::currentUser();
+        $request->merge(['username' => $current_user->username]);
+        //die(print_r($request->all()));
+        $this->validateLogin($request);
+
+        // If the class is using the ThrottlesLogins trait, we can automatically throttle
+        // the login attempts for this application. We'll key this by the username and
+        // the IP address of the client making these requests into this application.
+        if ($this->hasTooManyLoginAttempts($request)) {
+            $this->fireLockoutEvent($request);
+
+            return $this->sendLockoutResponse($request);
+        }
+
+        if ($this->attemptLogin($request)) {
+            return $this->sendLoginResponse($request);
+        }
+
+        // If the login attempt was unsuccessful we will increment the number of attempts
+        // to login and redirect the user back to the login form. Of course, when this
+        // user surpasses their maximum number of attempts they will get locked out.
+        $this->incrementLoginAttempts($request);
+
+        return $this->sendFailedLoginResponse($request);
+    }
+
+    public function index()
+    {
+    }
+
+    public function setUser(User $user)
+    {
+        Auth::logout();
+        session(['current_user' => $user]);
+        return redirect()->route('dash');
+    }
+
+    public function autologin($uuid)
+    {
+        $user = User::where('autologin', $uuid)->first();
+        Auth::login($user);
+        session(['current_user' => $user]);
+        return redirect()->route('dash');
+    }
+
+    /**
+     * Show the application's login form.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function showLoginForm()
+    {
+        return view('auth.login');
+    }
+
+    protected function authenticated(Request $request, $user)
+    {
+        return back();
+    }
+
+    public function redirectTo()
+    {
+        return Session::get('url.intended') ? Session::get('url.intended') : $this->redirectTo;
+    }
+
 }
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index f77265ab..d5bfca5a 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -27,7 +27,7 @@ class RegisterController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/home';
+    protected $redirectTo = '/';
 
     /**
      * Create a new controller instance.
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
index cf726eec..2c863aa6 100644
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -25,7 +25,7 @@ class ResetPasswordController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/home';
+    protected $redirectTo = '/';
 
     /**
      * Create a new controller instance.
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 03e02a23..04c8100d 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -6,8 +6,27 @@ use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Support\Facades\Auth;
+use App\User;
 
 class Controller extends BaseController
 {
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+
+    protected $user;
+
+    public function __construct()
+    {
+        $this->middleware(function ($request, $next) {
+            $this->user = $this->user();
+            //print_r($this->user);
+            return $next($request);
+        });
+        
+    }
+
+    public function user()
+    {
+        return User::currentUser();
+    }
 }
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
new file mode 100644
index 00000000..374563c8
--- /dev/null
+++ b/app/Http/Controllers/HomeController.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class HomeController extends Controller
+{
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    /**
+     * Show the application dashboard.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        return redirect()->route('dash');
+    }
+}
diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php
index f087c26e..63d8d5f6 100644
--- a/app/Http/Controllers/ItemController.php
+++ b/app/Http/Controllers/ItemController.php
@@ -5,12 +5,16 @@ namespace App\Http\Controllers;
 use Illuminate\Http\Request;
 use App\Item;
 use App\Setting;
+use App\User;
 use App\SupportedApps\Nzbget;
 use Illuminate\Support\Facades\Storage;
 
 class ItemController extends Controller
 {
-
+    public function __construct()
+    {
+        $this->middleware('allowed');
+    }
      /**
      * Display a listing of the resource on the dashboard.
      *
@@ -144,10 +148,13 @@ class ItemController extends Controller
         }
 
         $config = Item::checkConfig($request->input('config'));
+        $current_user = User::currentUser();
         $request->merge([
-            'description' => $config
+            'description' => $config,
+            'user_id' => $current_user->id
         ]);
 
+
         //die(print_r($request->input('config')));
         
         $item = Item::create($request->all());
@@ -209,8 +216,10 @@ class ItemController extends Controller
         }
         
         $config = Item::checkConfig($request->input('config'));
+        $current_user = User::currentUser();
         $request->merge([
-            'description' => $config
+            'description' => $config,
+            'user_id' => $current_user->id
         ]);
 
         $item = Item::find($id);
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 843e2de0..24d4c413 100644
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -5,10 +5,17 @@ namespace App\Http\Controllers;
 use Illuminate\Http\Request;
 use App\Setting;
 use App\SettingGroup;
+use App\User;
+use Illuminate\Support\Facades\Auth;
 use App\Http\Controllers\Controller;
 
 class SettingsController extends Controller
 {
+    public function __construct()
+    {
+        $this->middleware('allowed');
+    }
+
     /**
      * @return \Illuminate\View\View
      */
@@ -31,6 +38,7 @@ class SettingsController extends Controller
     public function edit($id)
     {
         $setting = Setting::find($id);
+        //die("s: ".$setting->label);
 
         if((bool)$setting->system === true) return abort(404);
 
@@ -55,6 +63,7 @@ class SettingsController extends Controller
     public function update(Request $request, $id)
     {
         $setting = Setting::find($id);
+        $user = $this->user();
 
         if (!is_null($setting)) {
             $data = Setting::getInput();
@@ -64,17 +73,16 @@ class SettingsController extends Controller
 
                 if($request->hasFile('value')) {
                     $path = $request->file('value')->store('backgrounds');
-                    $setting->value = $path;
+                    $setting_value = $path;
                 }
             
-
-
             } else {
-                $setting->value = $data->value;
+                $setting_value = $data->value;
             }
 
-            $setting->save();
-
+            $user->settings()->detach($setting->id);
+            $user->settings()->save($setting, ['uservalue' => $setting_value]);
+            
             $route = route('settings.index', [], false);
             return redirect($route) 
             ->with([
@@ -95,10 +103,11 @@ class SettingsController extends Controller
      */
     public function clear($id)
     {
+        $user = $this->user();
         $setting = Setting::find($id);
         if((bool)$setting->system !== true) {
-            $setting->value = '';
-            $setting->save();
+            $user->settings()->detach($setting->id);
+            $user->settings()->save($setting, ['uservalue' => '']);
         }
         $route = route('settings.index', [], false);
         return redirect($route) 
diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php
index aa0a4880..6bac8a04 100644
--- a/app/Http/Controllers/TagController.php
+++ b/app/Http/Controllers/TagController.php
@@ -8,6 +8,10 @@ use DB;
 
 class TagController extends Controller
 {
+    public function __construct()
+    {
+        $this->middleware('allowed');
+    }
     /**
      * Display a listing of the resource.
      *
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
new file mode 100644
index 00000000..df28a1f8
--- /dev/null
+++ b/app/Http/Controllers/UserController.php
@@ -0,0 +1,175 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\User;
+use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Auth;
+
+class UserController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('allowed')->except(['selectUser']);
+    }
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        $data['users'] = User::all();
+        return view('users.index', $data);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        $data = [];
+        return view('users.create', $data);
+    }
+
+    public function selectUser()
+    {
+        Auth::logout();
+        $data['users'] = User::all();
+        return view('userselect', $data);
+
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $validatedData = $request->validate([
+            'username' => 'required|max:255|unique:users',
+            'email' => 'required|email',
+            'password' => 'nullable|confirmed',
+            'password_confirmation' => 'nullable'
+
+        ]);
+        $user = new User;
+        $user->username = $request->input('username');
+        $user->email = $request->input('email');
+        $user->public_front = $request->input('public_front');
+
+        $password = $request->input('password');
+        if(!empty($password)) {
+            $user->password = bcrypt($password);
+        }
+
+        if($request->hasFile('file')) {
+            $path = $request->file('file')->store('avatars');
+            $user->avatar = $path;
+        }
+
+        if ((bool)$request->input('autologin_allow') === true) {
+            $user->autologin = (string)Str::uuid();
+        }
+
+        $user->save();
+        
+        $route = route('dash', [], false);
+        return redirect($route)
+            ->with('success',__('app.alert.success.user_updated'));
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(User $user)
+    {
+        $data['user'] = $user;
+        return view('users.edit', $data);
+
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, User $user)
+    {
+        $validatedData = $request->validate([
+            'username' => 'required|max:255|unique:users,username,'.$user->id,
+            'email' => 'required|email',
+            'password' => 'nullable|confirmed',
+            'password_confirmation' => 'nullable'
+        ]);
+            //die(print_r($request->all()));
+
+        $user->username = $request->input('username');
+        $user->email = $request->input('email');
+        $user->public_front = $request->input('public_front');
+
+        $password = $request->input('password');
+        if(!empty($password)) {
+            $user->password = bcrypt($password);
+        } elseif($password == 'null') {
+            $user->password = null;
+        }
+    
+        if($request->hasFile('file')) {
+            $path = $request->file('file')->store('avatars');
+            $user->avatar = $path;
+        }
+
+        if ((bool)$request->input('autologin_allow') === true) {
+            $user->autologin = (is_null($user->autologin)) ? (string)Str::uuid() : $user->autologin;
+        } else {
+            $user->autologin = null;
+        }
+
+        $user->save();
+
+        $route = route('dash', [], false);
+        return redirect($route)
+            ->with('success',__('app.alert.success.user_updated'));
+
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(User $user)
+    {
+        if($user->id !== 1) {
+            $user->delete();
+            $route = route('dash', [], false);
+            return redirect($route)
+            ->with('success',__('app.alert.success.user_deleted'));
+
+        }
+    }
+}
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 93bf68bf..e9e665a6 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -51,6 +51,7 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
+        'allowed' => \App\Http\Middleware\CheckAllowed::class,
         'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
diff --git a/app/Http/Middleware/CheckAllowed.php b/app/Http/Middleware/CheckAllowed.php
new file mode 100644
index 00000000..59f8e68d
--- /dev/null
+++ b/app/Http/Middleware/CheckAllowed.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Support\Facades\Auth;
+use App\User;
+use Illuminate\Support\Facades\Route;
+use Session;
+
+class CheckAllowed
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        $route = Route::currentRouteName();
+        $current_user = User::currentUser();
+
+        if(str_is('users*', $route)) {
+            if($current_user->id !== 1) {
+                return redirect()->route('dash');
+            }
+        }
+
+        if($route == 'dash') {
+            //print_r(User::all());
+            //die("here".var_dump($current_user->password));
+            if((bool)$current_user->public_front === true) return $next($request);
+        }
+
+        if(empty($current_user->password)) return $next($request);
+
+        // Check if user is logged in as $current_user
+        if (Auth::check()) {
+            $loggedin_user = Auth::user();
+            if($loggedin_user->id === $current_user->id) return $next($request);
+        }
+
+        return Auth::authenticate();
+
+    }
+}
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
index e4cec9c8..0d289bde 100644
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -18,7 +18,7 @@ class RedirectIfAuthenticated
     public function handle($request, Closure $next, $guard = null)
     {
         if (Auth::guard($guard)->check()) {
-            return redirect('/home');
+            return redirect()->intended();
         }
 
         return $next($request);
diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
index ef1c00d1..6a0a1a44 100644
--- a/app/Http/Middleware/TrustProxies.php
+++ b/app/Http/Middleware/TrustProxies.php
@@ -19,11 +19,5 @@ class TrustProxies extends Middleware
      *
      * @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',
-    ];
+    protected $headers = Request::HEADER_X_FORWARDED_ALL;
 }
diff --git a/app/Item.php b/app/Item.php
index 45a523b5..6e34878a 100644
--- a/app/Item.php
+++ b/app/Item.php
@@ -5,15 +5,26 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use Symfony\Component\ClassLoader\ClassMapGenerator;
 use Illuminate\Database\Eloquent\SoftDeletes;
-
+use Illuminate\Database\Eloquent\Builder;
+use App\User;
 
 class Item extends Model
 {
     use SoftDeletes;
 
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::addGlobalScope('user_id', function (Builder $builder) {
+            $current_user = User::currentUser();
+            $builder->where('user_id', $current_user->id);
+        });
+    }
+
     //
     protected $fillable = [
-        'title', 'url', 'colour', 'icon', 'description', 'pinned', 'order', 'type'
+        'title', 'url', 'colour', 'icon', 'description', 'pinned', 'order', 'type', 'user_id'
     ];
 
     /**
@@ -50,6 +61,7 @@ class Item extends Model
             'Krusader' => \App\SupportedApps\Krusader::class,
             'LibreNMS' => \App\SupportedApps\LibreNMS::class,
             'Lidarr' => \App\SupportedApps\Lidarr::class,
+            'Mailcow' => \App\SupportedApps\Mailcow::class,
             'Mcmyadmin' => \App\SupportedApps\Mcmyadmin::class,
             'Medusa' => \App\SupportedApps\Medusa::class,
             'Monica' => \App\SupportedApps\Monica::class,
@@ -87,7 +99,9 @@ class Item extends Model
             'pfSense' => \App\SupportedApps\Pfsense::class,
             'pyLoad' => \App\SupportedApps\pyLoad::class,
             'ruTorrent' => \App\SupportedApps\ruTorrent::class,
+            'Virtualmin' => \App\SupportedApps\Virtualmin::class,
             'Watcher3' => \App\SupportedApps\Watcher3::class,
+            'Webmin' => \App\SupportedApps\Webmin::class,
             'WebTools' => \App\SupportedApps\WebTools::class,
         ];
     }
@@ -218,5 +232,13 @@ class Item extends Model
         return $query->where('type', $typeid);
     }
 
+    /**
+     * Get the user that owns the item.
+     */
+    public function user()
+    {
+        return $this->belongsTo('App\User');
+    }   
+
 
 }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index da76af6f..ab01f8ee 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -6,6 +6,7 @@ use Illuminate\Support\ServiceProvider;
 use Artisan;
 use Schema;
 use App\Setting;
+use App\User;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -16,7 +17,7 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $alt_bg = '';
+        
 
         if(!is_file(base_path('.env'))) {
             touch(base_path('.env'));
@@ -32,12 +33,9 @@ class AppServiceProvider extends ServiceProvider
         }
         if(is_file(database_path('app.sqlite'))) {
             if(Schema::hasTable('settings')) {
-                if($bg_image = Setting::fetch('background_image')) {
-                    $alt_bg = ' style="background-image: url(/storage/'.$bg_image.')"';
-                }
 
                 // check version to see if an upgrade is needed
-                $db_version = Setting::fetch('version');
+                $db_version = Setting::_fetch('version');
                 $app_version = config('app.version');
                 if(version_compare($app_version, $db_version) == 1) { // app is higher than db, so need to run migrations etc
                     Artisan::call('migrate', array('--path' => 'database/migrations', '--force' => true, '--seed' => true));                   
@@ -45,16 +43,54 @@ class AppServiceProvider extends ServiceProvider
             } else {
                 Artisan::call('migrate', array('--path' => 'database/migrations', '--force' => true, '--seed' => true)); 
             }
-            $lang = Setting::fetch('language');
-            \App::setLocale($lang);
 
         }
         if(!is_file(public_path('storage'))) {
             Artisan::call('storage:link');
+            \Session::put('current_user', null);
         }
-        view()->share('alt_bg', $alt_bg);
 
-        //var_dump(env('FORCE_HTTPS'));
+        // User specific settings need to go here as session isn't available at this point in the app
+        view()->composer('*', function ($view) 
+        {
+
+            if(isset($_SERVER['HTTP_AUTHORIZATION']) && !empty($_SERVER['HTTP_AUTHORIZATION'])) {
+                list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = 
+                explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
+            }
+            if(!\Auth::check()) {
+                if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
+                    $credentials = ['username' => $_SERVER['PHP_AUTH_USER'], 'password' => $_SERVER['PHP_AUTH_PW']];
+                    
+                    if (\Auth::attempt($credentials)) {
+                        // Authentication passed...
+                        $user = \Auth::user();
+                        //\Session::put('current_user', $user);
+                        session(['current_user' => $user]);                
+                    }
+                }
+            }
+
+
+            $alt_bg = '';
+            if($bg_image = Setting::fetch('background_image')) {
+                $alt_bg = ' style="background-image: url(/storage/'.$bg_image.')"';
+            }
+            $lang = Setting::fetch('language');
+            \App::setLocale($lang);
+
+            $allusers = User::all();
+            $current_user = User::currentUser();
+
+            $view->with('alt_bg', $alt_bg );    
+            $view->with('allusers', $allusers );    
+            $view->with('current_user', $current_user );   
+
+    
+            
+            
+        });  
+
 
         if (env('FORCE_HTTPS') === true) {
             \URL::forceScheme('https');
diff --git a/app/Setting.php b/app/Setting.php
index 706e1eb7..e7ee4cce 100644
--- a/app/Setting.php
+++ b/app/Setting.php
@@ -5,6 +5,8 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Input;
 use Form;
+use Illuminate\Support\Facades\Auth;
+use App\User;
 
 class Setting extends Model
 {
@@ -46,6 +48,12 @@ class Setting extends Model
 
     public function getListValueAttribute()
     {
+        if((bool)$this->system === true) {
+            $value = self::_fetch($this->key);
+        } else {
+            $value = self::fetch($this->key);
+        }
+        $this->value = $value;
         switch($this->type) {
             case 'image':
                 if(!empty($this->value)) {
@@ -80,6 +88,12 @@ class Setting extends Model
 
     public function getEditValueAttribute()
     {
+        if((bool)$this->system === true) {
+            $value = self::_fetch($this->key);
+        } else {
+            $value = self::fetch($this->key);
+        }
+        $this->value = $value;
         switch($this->type) {
             case 'image':
                 $value = '';
@@ -125,6 +139,7 @@ class Setting extends Model
         return $this->belongsTo('App\SettingGroup', 'group_id');
     }
 
+
     /**
      * @param string $key
      *
@@ -132,20 +147,54 @@ class Setting extends Model
      */
     public static function fetch($key)
     {
-        if (Setting::cached($key)) {
-            return Setting::$cache[$key];
-        } else {
+        $user = self::user();
+        return self::_fetch($key, $user);
+    }
+    /**
+     * @param string $key
+     *
+     * @return mixed
+     */
+    public static function _fetch($key, $user=null)
+    {
+        #$cachekey = ($user === null) ? $key : $key.'-'.$user->id;
+        #if (Setting::cached($cachekey)) {
+        #    return Setting::$cache[$cachekey];
+        #} else {
             $find = self::where('key', '=', $key)->first();
 
             if (!is_null($find)) {
-                $value = $find->value;
-                Setting::add($key, $value);
+                if((bool)$find->system === true) { // if system variable use global value
+                    $value = $find->value;
+                } else { // not system variable so use user specific value
+                    // check if user specified value has been set
+                    //print_r($user);
+                    $usersetting = $user->settings()->where('id', $find->id)->first();
+                    //print_r($user->settings);
+                    //die(var_dump($usersetting));
+                    //->pivot->value;
+                    //echo "user: ".$user->id." --- ".$usersettings;
+                    if(isset($usersetting) && !empty($usersetting)) {
+                        $value = $usersetting->pivot->uservalue;
+                    } else { // if not get default from base setting
+                        //$user->settings()->save($find, ['value' => $find->value]);
+                        #$has_setting = $user->settings()->where('id', $find->id)->exists();
+                        #if($has_setting) {
+                        #    $user->settings()->updateExistingPivot($find->id, ['uservalue' => (string)$find->value]);
+                        #} else {
+                        #    $user->settings()->save($find, ['uservalue' => (string)$find->value]);
+                        #}
+                        $value = $find->value;
+                    }
+                    
+                }
+                #Setting::add($cachekey, $value);
 
                 return $value;
             } else {
                 return false;
             }
-        }
+        #}
     }
 
     /**
@@ -175,21 +224,23 @@ class Setting extends Model
         $output = '';
         $homepage_search = self::fetch('homepage_search');
         $search_provider = self::where('key', '=', 'search_provider')->first();
-        
-        //die(var_dump($search_provider->value));
+        $user_search_provider = self::fetch('search_provider');
+        //die(print_r($search_provider));
+       
+        //die(var_dump($user_search_provider));
         // return early if search isn't applicable
         if((bool)$homepage_search !== true) return $output;
-        if($search_provider->value === 'none') return $output;
-        if(empty($search_provider->value)) return $output;
-        if(is_null($search_provider->value)) return $output;
+        if($user_search_provider === 'none') return $output;
+        if(empty($user_search_provider)) return $output;
+        if(is_null($user_search_provider)) return $output;
 
 
         if((bool)$homepage_search && (bool)$search_provider) {
 
             $options = (array)json_decode($search_provider->options);
-            $name = $options[$search_provider->value];
-            if((bool)$search_provider->value) {
-                switch($search_provider->value) {
+            $name = $options[$user_search_provider];
+            if((bool)$user_search_provider) {
+                switch($user_search_provider) {
                     case 'google':
                         $url = 'https://www.google.com/search';
                         $var = 'q';
@@ -218,4 +269,19 @@ class Setting extends Model
         }
         return $output;
     }
+
+    /**
+     * The users that belong to the setting.
+     */
+    public function users()
+    {
+        return $this->belongsToMany('App\User')->using('App\SettingUser')->withPivot('uservalue');
+    }
+
+    public static function user()
+    {
+        return User::currentUser();
+    }
+
+
 }
diff --git a/app/SettingUser.php b/app/SettingUser.php
new file mode 100644
index 00000000..05c3949b
--- /dev/null
+++ b/app/SettingUser.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Relations\Pivot;
+
+class SettingUser extends Pivot
+{
+    //
+}
diff --git a/app/SupportedApps/Mailcow.php b/app/SupportedApps/Mailcow.php
new file mode 100644
index 00000000..9dfe24b2
--- /dev/null
+++ b/app/SupportedApps/Mailcow.php
@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Mailcow implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#161b1f';
+    }
+    public function icon()
+    {
+        return 'supportedapps/mailcow.svg';
+    }
+}
\ No newline at end of file
diff --git a/app/SupportedApps/Virtualmin.php b/app/SupportedApps/Virtualmin.php
new file mode 100644
index 00000000..3e1edae9
--- /dev/null
+++ b/app/SupportedApps/Virtualmin.php
@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Virtualmin implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#161b1f';
+    }
+    public function icon()
+    {
+        return 'supportedapps/virtualmin.svg';
+    }
+}
\ No newline at end of file
diff --git a/app/SupportedApps/Webmin.php b/app/SupportedApps/Webmin.php
new file mode 100644
index 00000000..72cff494
--- /dev/null
+++ b/app/SupportedApps/Webmin.php
@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Webmin implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#161b1f';
+    }
+    public function icon()
+    {
+        return 'supportedapps/webmin.svg';
+    }
+}
\ No newline at end of file
diff --git a/app/User.php b/app/User.php
index bfd96a6a..d74928ac 100644
--- a/app/User.php
+++ b/app/User.php
@@ -15,7 +15,7 @@ class User extends Authenticatable
      * @var array
      */
     protected $fillable = [
-        'name', 'email', 'password',
+        'username', 'email', 'password',
     ];
 
     /**
@@ -26,4 +26,35 @@ class User extends Authenticatable
     protected $hidden = [
         'password', 'remember_token',
     ];
+
+    /**
+     * Get the items for the user.
+     */
+    public function items()
+    {
+        return $this->hasMany('App\Item');
+    }
+
+    /**
+     * The settings that belong to the user.
+     */
+    public function settings()
+    {
+        return $this->belongsToMany('App\Setting')->withPivot('uservalue');
+    }
+
+    public static function currentUser()
+    {
+        $current_user = session('current_user');
+        if ($current_user) { // if logged in, set this user
+            return $current_user;
+        } else { // not logged in, get first user
+            $user = User::first();
+            session(['current_user' => $user]);
+            return $user;
+        }
+
+    }
+
+
 }
diff --git a/composer.json b/composer.json
index 50f228c9..f22a0038 100644
--- a/composer.json
+++ b/composer.json
@@ -6,9 +6,9 @@
     "type": "project",
     "require": {
         "php": ">=7.0.0",
-        "fideloper/proxy": "~3.3",
+        "fideloper/proxy": "^4.0",
         "guzzlehttp/guzzle": "^6.3",
-        "laravel/framework": "5.5.*",
+        "laravel/framework": "5.7.*",
         "laravel/tinker": "~1.0",
         "laravelcollective/html": "^5.5"
     },
diff --git a/composer.lock b/composer.lock
index 46bbb5e0..00951edc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "ab6533331102493e1757f58bb2b94824",
+    "content-hash": "bf16de2ee67c686f3b454d56cd12d6d6",
     "packages": [
         {
             "name": "dnoegel/php-xdg-base-dir",
@@ -160,18 +160,67 @@
             ],
             "time": "2014-09-09T13:34:57+00:00"
         },
+        {
+            "name": "dragonmantank/cron-expression",
+            "version": "v2.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dragonmantank/cron-expression.git",
+                "reference": "92a2c3768d50e21a1f26a53cb795ce72806266c5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/92a2c3768d50e21a1f26a53cb795ce72806266c5",
+                "reference": "92a2c3768d50e21a1f26a53cb795ce72806266c5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~6.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Cron\\": "src/Cron/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Chris Tankersley",
+                    "email": "chris@ctankersley.com",
+                    "homepage": "https://github.com/dragonmantank"
+                }
+            ],
+            "description": "CRON for PHP: Calculate the next or previous run date and determine if a CRON expression is due",
+            "keywords": [
+                "cron",
+                "schedule"
+            ],
+            "time": "2018-06-06T03:12:17+00:00"
+        },
         {
             "name": "egulias/email-validator",
-            "version": "2.1.4",
+            "version": "2.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/egulias/EmailValidator.git",
-                "reference": "8790f594151ca6a2010c6218e09d96df67173ad3"
+                "reference": "0578b32b30b22de3e8664f797cf846fc9246f786"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/8790f594151ca6a2010c6218e09d96df67173ad3",
-                "reference": "8790f594151ca6a2010c6218e09d96df67173ad3",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/0578b32b30b22de3e8664f797cf846fc9246f786",
+                "reference": "0578b32b30b22de3e8664f797cf846fc9246f786",
                 "shasum": ""
             },
             "require": {
@@ -215,7 +264,7 @@
                 "validation",
                 "validator"
             ],
-            "time": "2018-04-10T10:11:19+00:00"
+            "time": "2018-09-25T20:47:26+00:00"
         },
         {
             "name": "erusev/parsedown",
@@ -265,16 +314,16 @@
         },
         {
             "name": "fideloper/proxy",
-            "version": "3.3.4",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/fideloper/TrustedProxy.git",
-                "reference": "9cdf6f118af58d89764249bbcc7bb260c132924f"
+                "reference": "cf8a0ca4b85659b9557e206c90110a6a4dba980a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/9cdf6f118af58d89764249bbcc7bb260c132924f",
-                "reference": "9cdf6f118af58d89764249bbcc7bb260c132924f",
+                "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/cf8a0ca4b85659b9557e206c90110a6a4dba980a",
+                "reference": "cf8a0ca4b85659b9557e206c90110a6a4dba980a",
                 "shasum": ""
             },
             "require": {
@@ -282,15 +331,12 @@
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "illuminate/http": "~5.0",
-                "mockery/mockery": "~0.9.3",
-                "phpunit/phpunit": "^5.7"
+                "illuminate/http": "~5.6",
+                "mockery/mockery": "~1.0",
+                "phpunit/phpunit": "^6.0"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "3.3-dev"
-                },
                 "laravel": {
                     "providers": [
                         "Fideloper\\Proxy\\TrustedProxyServiceProvider"
@@ -318,7 +364,7 @@
                 "proxy",
                 "trusted proxy"
             ],
-            "time": "2017-06-15T17:19:42+00:00"
+            "time": "2018-02-07T20:20:57+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
@@ -503,32 +549,32 @@
         },
         {
             "name": "jakub-onderka/php-console-color",
-            "version": "0.1",
+            "version": "v0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/JakubOnderka/PHP-Console-Color.git",
-                "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1"
+                "reference": "d5deaecff52a0d61ccb613bb3804088da0307191"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/e0b393dacf7703fc36a4efc3df1435485197e6c1",
-                "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1",
+                "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/d5deaecff52a0d61ccb613bb3804088da0307191",
+                "reference": "d5deaecff52a0d61ccb613bb3804088da0307191",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.2"
+                "php": ">=5.4.0"
             },
             "require-dev": {
                 "jakub-onderka/php-code-style": "1.0",
-                "jakub-onderka/php-parallel-lint": "0.*",
+                "jakub-onderka/php-parallel-lint": "1.0",
                 "jakub-onderka/php-var-dump-check": "0.*",
-                "phpunit/phpunit": "3.7.*",
+                "phpunit/phpunit": "~4.3",
                 "squizlabs/php_codesniffer": "1.*"
             },
             "type": "library",
             "autoload": {
-                "psr-0": {
-                    "JakubOnderka\\PhpConsoleColor": "src/"
+                "psr-4": {
+                    "JakubOnderka\\PhpConsoleColor\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -538,41 +584,41 @@
             "authors": [
                 {
                     "name": "Jakub Onderka",
-                    "email": "jakub.onderka@gmail.com",
-                    "homepage": "http://www.acci.cz"
+                    "email": "jakub.onderka@gmail.com"
                 }
             ],
-            "time": "2014-04-08T15:00:19+00:00"
+            "time": "2018-09-29T17:23:10+00:00"
         },
         {
             "name": "jakub-onderka/php-console-highlighter",
-            "version": "v0.3.2",
+            "version": "v0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git",
-                "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5"
+                "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/7daa75df45242c8d5b75a22c00a201e7954e4fb5",
-                "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5",
+                "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/9f7a229a69d52506914b4bc61bfdb199d90c5547",
+                "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547",
                 "shasum": ""
             },
             "require": {
-                "jakub-onderka/php-console-color": "~0.1",
-                "php": ">=5.3.0"
+                "ext-tokenizer": "*",
+                "jakub-onderka/php-console-color": "~0.2",
+                "php": ">=5.4.0"
             },
             "require-dev": {
                 "jakub-onderka/php-code-style": "~1.0",
-                "jakub-onderka/php-parallel-lint": "~0.5",
+                "jakub-onderka/php-parallel-lint": "~1.0",
                 "jakub-onderka/php-var-dump-check": "~0.1",
                 "phpunit/phpunit": "~4.0",
                 "squizlabs/php_codesniffer": "~1.5"
             },
             "type": "library",
             "autoload": {
-                "psr-0": {
-                    "JakubOnderka\\PhpConsoleHighlighter": "src/"
+                "psr-4": {
+                    "JakubOnderka\\PhpConsoleHighlighter\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -586,46 +632,51 @@
                     "homepage": "http://www.acci.cz/"
                 }
             ],
-            "time": "2015-04-20T18:58:01+00:00"
+            "description": "Highlight PHP code in terminal",
+            "time": "2018-09-29T18:48:56+00:00"
         },
         {
             "name": "laravel/framework",
-            "version": "v5.5.40",
+            "version": "v5.7.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "d724ce0aa61bbd9adf658215eec484f5dd6711d6"
+                "reference": "172f69f86bb86e107fb9fafff293b4b01291cf05"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/d724ce0aa61bbd9adf658215eec484f5dd6711d6",
-                "reference": "d724ce0aa61bbd9adf658215eec484f5dd6711d6",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/172f69f86bb86e107fb9fafff293b4b01291cf05",
+                "reference": "172f69f86bb86e107fb9fafff293b4b01291cf05",
                 "shasum": ""
             },
             "require": {
-                "doctrine/inflector": "~1.1",
-                "erusev/parsedown": "~1.7",
+                "doctrine/inflector": "^1.1",
+                "dragonmantank/cron-expression": "^2.0",
+                "erusev/parsedown": "^1.7",
                 "ext-mbstring": "*",
                 "ext-openssl": "*",
                 "league/flysystem": "^1.0.8",
-                "monolog/monolog": "~1.12",
-                "mtdowling/cron-expression": "~1.0",
-                "nesbot/carbon": "^1.24.1",
-                "php": ">=7.0",
-                "psr/container": "~1.0",
+                "monolog/monolog": "^1.12",
+                "nesbot/carbon": "^1.26.3",
+                "opis/closure": "^3.1",
+                "php": "^7.1.3",
+                "psr/container": "^1.0",
                 "psr/simple-cache": "^1.0",
-                "ramsey/uuid": "~3.0",
-                "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"
+                "ramsey/uuid": "^3.7",
+                "swiftmailer/swiftmailer": "^6.0",
+                "symfony/console": "^4.1",
+                "symfony/debug": "^4.1",
+                "symfony/finder": "^4.1",
+                "symfony/http-foundation": "^4.1",
+                "symfony/http-kernel": "^4.1",
+                "symfony/process": "^4.1",
+                "symfony/routing": "^4.1",
+                "symfony/var-dumper": "^4.1",
+                "tijsverkoyen/css-to-inline-styles": "^2.2.1",
+                "vlucas/phpdotenv": "^2.2"
+            },
+            "conflict": {
+                "tightenco/collect": "<5.5.33"
             },
             "replace": {
                 "illuminate/auth": "self.version",
@@ -655,44 +706,48 @@
                 "illuminate/support": "self.version",
                 "illuminate/translation": "self.version",
                 "illuminate/validation": "self.version",
-                "illuminate/view": "self.version",
-                "tightenco/collect": "<5.5.33"
+                "illuminate/view": "self.version"
             },
             "require-dev": {
-                "aws/aws-sdk-php": "~3.0",
-                "doctrine/dbal": "~2.5",
+                "aws/aws-sdk-php": "^3.0",
+                "doctrine/dbal": "^2.6",
                 "filp/whoops": "^2.1.4",
-                "mockery/mockery": "~1.0",
-                "orchestra/testbench-core": "3.5.*",
-                "pda/pheanstalk": "~3.0",
-                "phpunit/phpunit": "~6.0",
+                "league/flysystem-cached-adapter": "^1.0",
+                "mockery/mockery": "^1.0",
+                "moontoast/math": "^1.1",
+                "orchestra/testbench-core": "3.7.*",
+                "pda/pheanstalk": "^3.0",
+                "phpunit/phpunit": "^7.0",
                 "predis/predis": "^1.1.1",
-                "symfony/css-selector": "~3.3",
-                "symfony/dom-crawler": "~3.3"
+                "symfony/css-selector": "^4.1",
+                "symfony/dom-crawler": "^4.1",
+                "true/punycode": "^2.1"
             },
             "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).",
+                "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.6).",
                 "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).",
-                "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).",
-                "league/flysystem-cached-adapter": "Required to use Flysystem caching (~1.0).",
-                "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~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 (~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)."
+                "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).",
+                "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).",
+                "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).",
+                "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (^1.0).",
+                "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
+                "moontoast/math": "Required to use ordered UUIDs (^1.1).",
+                "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 (^3.0).",
+                "symfony/css-selector": "Required to use some of the crawler integration testing tools (^4.1).",
+                "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (^4.1).",
+                "symfony/psr-http-message-bridge": "Required to psr7 bridging features (^1.0)."
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.5-dev"
+                    "dev-master": "5.7-dev"
                 }
             },
             "autoload": {
@@ -720,20 +775,20 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2018-03-30T13:29:30+00:00"
+            "time": "2018-10-09T13:28:28+00:00"
         },
         {
             "name": "laravel/tinker",
-            "version": "v1.0.7",
+            "version": "v1.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/tinker.git",
-                "reference": "e3086ee8cb1f54a39ae8dcb72d1c37d10128997d"
+                "reference": "cafbf598a90acde68985660e79b2b03c5609a405"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/tinker/zipball/e3086ee8cb1f54a39ae8dcb72d1c37d10128997d",
-                "reference": "e3086ee8cb1f54a39ae8dcb72d1c37d10128997d",
+                "url": "https://api.github.com/repos/laravel/tinker/zipball/cafbf598a90acde68985660e79b2b03c5609a405",
+                "reference": "cafbf598a90acde68985660e79b2b03c5609a405",
                 "shasum": ""
             },
             "require": {
@@ -783,39 +838,39 @@
                 "laravel",
                 "psysh"
             ],
-            "time": "2018-05-17T13:42:07+00:00"
+            "time": "2018-10-12T19:39:35+00:00"
         },
         {
             "name": "laravelcollective/html",
-            "version": "v5.5.4",
+            "version": "v5.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/LaravelCollective/html.git",
-                "reference": "04c596a69975b901f2223eb6eb4adf55354121c2"
+                "reference": "777b6d390811ba249255ed5750bf17a019cd88a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/LaravelCollective/html/zipball/04c596a69975b901f2223eb6eb4adf55354121c2",
-                "reference": "04c596a69975b901f2223eb6eb4adf55354121c2",
+                "url": "https://api.github.com/repos/LaravelCollective/html/zipball/777b6d390811ba249255ed5750bf17a019cd88a5",
+                "reference": "777b6d390811ba249255ed5750bf17a019cd88a5",
                 "shasum": ""
             },
             "require": {
-                "illuminate/http": "5.5.*",
-                "illuminate/routing": "5.5.*",
-                "illuminate/session": "5.5.*",
-                "illuminate/support": "5.5.*",
-                "illuminate/view": "5.5.*",
-                "php": ">=7.0.0"
+                "illuminate/http": "5.7.*",
+                "illuminate/routing": "5.7.*",
+                "illuminate/session": "5.7.*",
+                "illuminate/support": "5.7.*",
+                "illuminate/view": "5.7.*",
+                "php": ">=7.1.3"
             },
             "require-dev": {
-                "illuminate/database": "5.5.*",
-                "mockery/mockery": "~0.9.4",
-                "phpunit/phpunit": "~5.4"
+                "illuminate/database": "5.7.*",
+                "mockery/mockery": "~1.0",
+                "phpunit/phpunit": "~7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.5-dev"
+                    "dev-master": "5.7-dev"
                 },
                 "laravel": {
                     "providers": [
@@ -851,32 +906,32 @@
             ],
             "description": "HTML and Form Builders for the Laravel Framework",
             "homepage": "https://laravelcollective.com",
-            "time": "2018-03-24T00:39:21+00:00"
+            "time": "2018-09-05T18:32:53+00:00"
         },
         {
             "name": "league/flysystem",
-            "version": "1.0.45",
+            "version": "1.0.48",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "a99f94e63b512d75f851b181afcdf0ee9ebef7e6"
+                "reference": "a6ded5b2f6055e2db97b4b859fdfca2b952b78aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a99f94e63b512d75f851b181afcdf0ee9ebef7e6",
-                "reference": "a99f94e63b512d75f851b181afcdf0ee9ebef7e6",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a6ded5b2f6055e2db97b4b859fdfca2b952b78aa",
+                "reference": "a6ded5b2f6055e2db97b4b859fdfca2b952b78aa",
                 "shasum": ""
             },
             "require": {
+                "ext-fileinfo": "*",
                 "php": ">=5.5.9"
             },
             "conflict": {
                 "league/flysystem-sftp": "<1.0.6"
             },
             "require-dev": {
-                "ext-fileinfo": "*",
                 "phpspec/phpspec": "^3.4",
-                "phpunit/phpunit": "^5.7"
+                "phpunit/phpunit": "^5.7.10"
             },
             "suggest": {
                 "ext-fileinfo": "Required for MimeType",
@@ -935,7 +990,7 @@
                 "sftp",
                 "storage"
             ],
-            "time": "2018-05-07T08:44:23+00:00"
+            "time": "2018-10-15T13:53:10+00:00"
         },
         {
             "name": "monolog/monolog",
@@ -1015,62 +1070,18 @@
             ],
             "time": "2017-06-19T01:22:40+00:00"
         },
-        {
-            "name": "mtdowling/cron-expression",
-            "version": "v1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/mtdowling/cron-expression.git",
-                "reference": "9504fa9ea681b586028adaaa0877db4aecf32bad"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/9504fa9ea681b586028adaaa0877db4aecf32bad",
-                "reference": "9504fa9ea681b586028adaaa0877db4aecf32bad",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0|~5.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Cron\\": "src/Cron/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "description": "CRON for PHP: Calculate the next or previous run date and determine if a CRON expression is due",
-            "keywords": [
-                "cron",
-                "schedule"
-            ],
-            "time": "2017-01-23T04:29:33+00:00"
-        },
         {
             "name": "nesbot/carbon",
-            "version": "1.29.2",
+            "version": "1.34.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "ed6aa898982f441ccc9b2acdec51490f2bc5d337"
+                "reference": "1dbd3cb01c5645f3e7deda7aa46ef780d95fcc33"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/ed6aa898982f441ccc9b2acdec51490f2bc5d337",
-                "reference": "ed6aa898982f441ccc9b2acdec51490f2bc5d337",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/1dbd3cb01c5645f3e7deda7aa46ef780d95fcc33",
+                "reference": "1dbd3cb01c5645f3e7deda7aa46ef780d95fcc33",
                 "shasum": ""
             },
             "require": {
@@ -1082,6 +1093,13 @@
                 "phpunit/phpunit": "^4.8.35 || ^5.7"
             },
             "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Carbon\\Laravel\\ServiceProvider"
+                    ]
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "": "src/"
@@ -1105,20 +1123,20 @@
                 "datetime",
                 "time"
             ],
-            "time": "2018-05-29T15:23:46+00:00"
+            "time": "2018-09-20T19:36:25+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.0.2",
+            "version": "v4.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "35b8caf75e791ba1b2d24fec1552168d72692b12"
+                "reference": "d0230c5c77a7e3cfa69446febf340978540958c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/35b8caf75e791ba1b2d24fec1552168d72692b12",
-                "reference": "35b8caf75e791ba1b2d24fec1552168d72692b12",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/d0230c5c77a7e3cfa69446febf340978540958c0",
+                "reference": "d0230c5c77a7e3cfa69446febf340978540958c0",
                 "shasum": ""
             },
             "require": {
@@ -1134,7 +1152,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -1156,37 +1174,94 @@
                 "parser",
                 "php"
             ],
-            "time": "2018-06-03T11:33:10+00:00"
+            "time": "2018-10-10T09:24:14+00:00"
+        },
+        {
+            "name": "opis/closure",
+            "version": "3.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/opis/closure.git",
+                "reference": "d3209e46ad6c69a969b705df0738fd0dbe26ef9e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/opis/closure/zipball/d3209e46ad6c69a969b705df0738fd0dbe26ef9e",
+                "reference": "d3209e46ad6c69a969b705df0738fd0dbe26ef9e",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.4 || ^7.0"
+            },
+            "require-dev": {
+                "jeremeamia/superclosure": "^2.0",
+                "phpunit/phpunit": "^4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Opis\\Closure\\": "src/"
+                },
+                "files": [
+                    "functions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marius Sarca",
+                    "email": "marius.sarca@gmail.com"
+                },
+                {
+                    "name": "Sorin Sarca",
+                    "email": "sarca_sorin@hotmail.com"
+                }
+            ],
+            "description": "A library that can be used to serialize closures (anonymous functions) and arbitrary objects.",
+            "homepage": "https://opis.io/closure",
+            "keywords": [
+                "anonymous functions",
+                "closure",
+                "function",
+                "serializable",
+                "serialization",
+                "serialize"
+            ],
+            "time": "2018-10-02T13:36:53+00:00"
         },
         {
             "name": "paragonie/random_compat",
-            "version": "v2.0.15",
+            "version": "v9.99.99",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09"
+                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/10bcb46e8f3d365170f6de9d05245aa066b81f09",
-                "reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.2.0"
+                "php": "^7"
             },
             "require-dev": {
-                "phpunit/phpunit": "4.*|5.*"
+                "phpunit/phpunit": "4.*|5.*",
+                "vimeo/psalm": "^1"
             },
             "suggest": {
                 "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
             },
             "type": "library",
-            "autoload": {
-                "files": [
-                    "lib/random.php"
-                ]
-            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
@@ -1205,7 +1280,7 @@
                 "pseudorandom",
                 "random"
             ],
-            "time": "2018-06-08T15:26:40+00:00"
+            "time": "2018-07-02T15:55:56+00:00"
         },
         {
             "name": "psr/container",
@@ -1403,21 +1478,23 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.9.6",
+            "version": "v0.9.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "4a2ce86f199d51b6e2524214dc06835e872f4fce"
+                "reference": "9aaf29575bb8293206bb0420c1e1c87ff2ffa94e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/4a2ce86f199d51b6e2524214dc06835e872f4fce",
-                "reference": "4a2ce86f199d51b6e2524214dc06835e872f4fce",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/9aaf29575bb8293206bb0420c1e1c87ff2ffa94e",
+                "reference": "9aaf29575bb8293206bb0420c1e1c87ff2ffa94e",
                 "shasum": ""
             },
             "require": {
                 "dnoegel/php-xdg-base-dir": "0.1",
-                "jakub-onderka/php-console-highlighter": "0.3.*",
+                "ext-json": "*",
+                "ext-tokenizer": "*",
+                "jakub-onderka/php-console-highlighter": "0.3.*|0.4.*",
                 "nikic/php-parser": "~1.3|~2.0|~3.0|~4.0",
                 "php": ">=5.4.0",
                 "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0",
@@ -1471,25 +1548,26 @@
                 "interactive",
                 "shell"
             ],
-            "time": "2018-06-10T17:57:20+00:00"
+            "time": "2018-10-13T15:16:03+00:00"
         },
         {
             "name": "ramsey/uuid",
-            "version": "3.7.3",
+            "version": "3.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "44abcdad877d9a46685a3a4d221e3b2c4b87cb76"
+                "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/44abcdad877d9a46685a3a4d221e3b2c4b87cb76",
-                "reference": "44abcdad877d9a46685a3a4d221e3b2c4b87cb76",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
+                "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
                 "shasum": ""
             },
             "require": {
-                "paragonie/random_compat": "^1.0|^2.0",
-                "php": "^5.4 || ^7.0"
+                "paragonie/random_compat": "^1.0|^2.0|9.99.99",
+                "php": "^5.4 || ^7.0",
+                "symfony/polyfill-ctype": "^1.8"
             },
             "replace": {
                 "rhumsaa/uuid": "self.version"
@@ -1497,16 +1575,17 @@
             "require-dev": {
                 "codeception/aspect-mock": "^1.0 | ~2.0.0",
                 "doctrine/annotations": "~1.2.0",
-                "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1",
+                "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ~2.1.0",
                 "ircmaxell/random-lib": "^1.1",
                 "jakub-onderka/php-parallel-lint": "^0.9.0",
                 "mockery/mockery": "^0.9.9",
                 "moontoast/math": "^1.1",
                 "php-mock/php-mock-phpunit": "^0.3|^1.1",
-                "phpunit/phpunit": "^4.7|^5.0",
+                "phpunit/phpunit": "^4.7|^5.0|^6.5",
                 "squizlabs/php_codesniffer": "^2.3"
             },
             "suggest": {
+                "ext-ctype": "Provides support for PHP Ctype functions",
                 "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator",
                 "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator",
                 "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
@@ -1551,20 +1630,20 @@
                 "identifier",
                 "uuid"
             ],
-            "time": "2018-01-20T00:28:24+00:00"
+            "time": "2018-07-19T23:38:55+00:00"
         },
         {
             "name": "swiftmailer/swiftmailer",
-            "version": "v6.0.2",
+            "version": "v6.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/swiftmailer/swiftmailer.git",
-                "reference": "412333372fb6c8ffb65496a2bbd7321af75733fc"
+                "reference": "8ddcb66ac10c392d3beb54829eef8ac1438595f4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/412333372fb6c8ffb65496a2bbd7321af75733fc",
-                "reference": "412333372fb6c8ffb65496a2bbd7321af75733fc",
+                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8ddcb66ac10c392d3beb54829eef8ac1438595f4",
+                "reference": "8ddcb66ac10c392d3beb54829eef8ac1438595f4",
                 "shasum": ""
             },
             "require": {
@@ -1575,10 +1654,14 @@
                 "mockery/mockery": "~0.9.1",
                 "symfony/phpunit-bridge": "~3.3@dev"
             },
+            "suggest": {
+                "ext-intl": "Needed to support internationalized email addresses",
+                "true/punycode": "Needed to support internationalized email addresses, if ext-intl is not installed"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6.0-dev"
+                    "dev-master": "6.1-dev"
                 }
             },
             "autoload": {
@@ -1600,31 +1683,30 @@
                 }
             ],
             "description": "Swiftmailer, free feature-rich PHP mailer",
-            "homepage": "http://swiftmailer.symfony.com",
+            "homepage": "https://swiftmailer.symfony.com",
             "keywords": [
                 "email",
                 "mail",
                 "mailer"
             ],
-            "time": "2017-09-30T22:39:41+00:00"
+            "time": "2018-09-11T07:12:52+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v3.4.11",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "36f83f642443c46f3cf751d4d2ee5d047d757a27"
+                "reference": "dc7122fe5f6113cfaba3b3de575d31112c9aa60b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/36f83f642443c46f3cf751d4d2ee5d047d757a27",
-                "reference": "36f83f642443c46f3cf751d4d2ee5d047d757a27",
+                "url": "https://api.github.com/repos/symfony/console/zipball/dc7122fe5f6113cfaba3b3de575d31112c9aa60b",
+                "reference": "dc7122fe5f6113cfaba3b3de575d31112c9aa60b",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/debug": "~2.8|~3.0|~4.0",
+                "php": "^7.1.3",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
@@ -1633,11 +1715,11 @@
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~3.3|~4.0",
+                "symfony/config": "~3.4|~4.0",
                 "symfony/dependency-injection": "~3.4|~4.0",
-                "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
+                "symfony/event-dispatcher": "~3.4|~4.0",
                 "symfony/lock": "~3.4|~4.0",
-                "symfony/process": "~3.3|~4.0"
+                "symfony/process": "~3.4|~4.0"
             },
             "suggest": {
                 "psr/log-implementation": "For using the console logger",
@@ -1648,7 +1730,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -1675,20 +1757,20 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2018-05-16T08:49:21+00:00"
+            "time": "2018-10-03T08:15:46+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v4.1.0",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "03ac71606ecb0b0ce792faa17d74cc32c2949ef4"
+                "reference": "d67de79a70a27d93c92c47f37ece958bf8de4d8a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/03ac71606ecb0b0ce792faa17d74cc32c2949ef4",
-                "reference": "03ac71606ecb0b0ce792faa17d74cc32c2949ef4",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/d67de79a70a27d93c92c47f37ece958bf8de4d8a",
+                "reference": "d67de79a70a27d93c92c47f37ece958bf8de4d8a",
                 "shasum": ""
             },
             "require": {
@@ -1728,36 +1810,36 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2018-05-30T07:26:09+00:00"
+            "time": "2018-10-02T16:36:10+00:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v3.4.11",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "b28fd73fefbac341f673f5efd707d539d6a19f68"
+                "reference": "e3f76ce6198f81994e019bb2b4e533e9de1b9b90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/b28fd73fefbac341f673f5efd707d539d6a19f68",
-                "reference": "b28fd73fefbac341f673f5efd707d539d6a19f68",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/e3f76ce6198f81994e019bb2b4e533e9de1b9b90",
+                "reference": "e3f76ce6198f81994e019bb2b4e533e9de1b9b90",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
+                "php": "^7.1.3",
                 "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"
+                "symfony/http-kernel": "<3.4"
             },
             "require-dev": {
-                "symfony/http-kernel": "~2.8|~3.0|~4.0"
+                "symfony/http-kernel": "~3.4|~4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -1784,20 +1866,20 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2018-05-16T14:03:39+00:00"
+            "time": "2018-10-02T16:36:10+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v4.1.0",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "2391ed210a239868e7256eb6921b1bd83f3087b5"
+                "reference": "bfb30c2ad377615a463ebbc875eba64a99f6aa3e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2391ed210a239868e7256eb6921b1bd83f3087b5",
-                "reference": "2391ed210a239868e7256eb6921b1bd83f3087b5",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/bfb30c2ad377615a463ebbc875eba64a99f6aa3e",
+                "reference": "bfb30c2ad377615a463ebbc875eba64a99f6aa3e",
                 "shasum": ""
             },
             "require": {
@@ -1847,29 +1929,29 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2018-04-06T07:35:57+00:00"
+            "time": "2018-07-26T09:10:45+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v3.4.11",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "472a92f3df8b247b49ae364275fb32943b9656c6"
+                "reference": "1f17195b44543017a9c9b2d437c670627e96ad06"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/472a92f3df8b247b49ae364275fb32943b9656c6",
-                "reference": "472a92f3df8b247b49ae364275fb32943b9656c6",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/1f17195b44543017a9c9b2d437c670627e96ad06",
+                "reference": "1f17195b44543017a9c9b2d437c670627e96ad06",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8"
+                "php": "^7.1.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -1896,34 +1978,34 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2018-05-16T08:49:21+00:00"
+            "time": "2018-10-03T08:47:56+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v3.4.11",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "a7b5fc605d1c215cea1122359044b1e682eb70c0"
+                "reference": "d528136617ff24f530e70df9605acc1b788b08d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a7b5fc605d1c215cea1122359044b1e682eb70c0",
-                "reference": "a7b5fc605d1c215cea1122359044b1e682eb70c0",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d528136617ff24f530e70df9605acc1b788b08d4",
+                "reference": "d528136617ff24f530e70df9605acc1b788b08d4",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/polyfill-mbstring": "~1.1",
-                "symfony/polyfill-php70": "~1.6"
+                "php": "^7.1.3",
+                "symfony/polyfill-mbstring": "~1.1"
             },
             "require-dev": {
-                "symfony/expression-language": "~2.8|~3.0|~4.0"
+                "predis/predis": "~1.0",
+                "symfony/expression-language": "~3.4|~4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -1950,34 +2032,34 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2018-05-25T11:07:31+00:00"
+            "time": "2018-10-03T08:48:45+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v3.4.11",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "3dac45df55ee0c5134c457a730cd68e2a2ce0445"
+                "reference": "f5e7c15a5d010be0e16ce798594c5960451d4220"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3dac45df55ee0c5134c457a730cd68e2a2ce0445",
-                "reference": "3dac45df55ee0c5134c457a730cd68e2a2ce0445",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f5e7c15a5d010be0e16ce798594c5960451d4220",
+                "reference": "f5e7c15a5d010be0e16ce798594c5960451d4220",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
+                "php": "^7.1.3",
                 "psr/log": "~1.0",
-                "symfony/debug": "~2.8|~3.0|~4.0",
-                "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
-                "symfony/http-foundation": "^3.4.4|^4.0.4",
+                "symfony/debug": "~3.4|~4.0",
+                "symfony/event-dispatcher": "~4.1",
+                "symfony/http-foundation": "^4.1.1",
                 "symfony/polyfill-ctype": "~1.8"
             },
             "conflict": {
-                "symfony/config": "<2.8",
-                "symfony/dependency-injection": "<3.4.5|<4.0.5,>=4",
-                "symfony/var-dumper": "<3.3",
+                "symfony/config": "<3.4",
+                "symfony/dependency-injection": "<4.1",
+                "symfony/var-dumper": "<4.1.1",
                 "twig/twig": "<1.34|<2.4,>=2"
             },
             "provide": {
@@ -1985,34 +2067,32 @@
             },
             "require-dev": {
                 "psr/cache": "~1.0",
-                "symfony/browser-kit": "~2.8|~3.0|~4.0",
-                "symfony/class-loader": "~2.8|~3.0",
-                "symfony/config": "~2.8|~3.0|~4.0",
-                "symfony/console": "~2.8|~3.0|~4.0",
-                "symfony/css-selector": "~2.8|~3.0|~4.0",
-                "symfony/dependency-injection": "^3.4.5|^4.0.5",
-                "symfony/dom-crawler": "~2.8|~3.0|~4.0",
-                "symfony/expression-language": "~2.8|~3.0|~4.0",
-                "symfony/finder": "~2.8|~3.0|~4.0",
-                "symfony/process": "~2.8|~3.0|~4.0",
+                "symfony/browser-kit": "~3.4|~4.0",
+                "symfony/config": "~3.4|~4.0",
+                "symfony/console": "~3.4|~4.0",
+                "symfony/css-selector": "~3.4|~4.0",
+                "symfony/dependency-injection": "^4.1",
+                "symfony/dom-crawler": "~3.4|~4.0",
+                "symfony/expression-language": "~3.4|~4.0",
+                "symfony/finder": "~3.4|~4.0",
+                "symfony/process": "~3.4|~4.0",
                 "symfony/routing": "~3.4|~4.0",
-                "symfony/stopwatch": "~2.8|~3.0|~4.0",
-                "symfony/templating": "~2.8|~3.0|~4.0",
-                "symfony/translation": "~2.8|~3.0|~4.0",
-                "symfony/var-dumper": "~3.3|~4.0"
+                "symfony/stopwatch": "~3.4|~4.0",
+                "symfony/templating": "~3.4|~4.0",
+                "symfony/translation": "~3.4|~4.0",
+                "symfony/var-dumper": "^4.1.1"
             },
             "suggest": {
                 "symfony/browser-kit": "",
                 "symfony/config": "",
                 "symfony/console": "",
                 "symfony/dependency-injection": "",
-                "symfony/finder": "",
                 "symfony/var-dumper": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -2039,29 +2119,32 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2018-05-25T13:16:28+00:00"
+            "time": "2018-10-03T12:53:38+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.8.0",
+            "version": "v1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae"
+                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
-                "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
+                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
+            "suggest": {
+                "ext-ctype": "For best performance"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.8-dev"
+                    "dev-master": "1.9-dev"
                 }
             },
             "autoload": {
@@ -2094,20 +2177,20 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2018-04-30T19:57:29+00:00"
+            "time": "2018-08-06T14:22:27+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.8.0",
+            "version": "v1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "3296adf6a6454a050679cde90f95350ad604b171"
+                "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171",
-                "reference": "3296adf6a6454a050679cde90f95350ad604b171",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8",
+                "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8",
                 "shasum": ""
             },
             "require": {
@@ -2119,7 +2202,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.8-dev"
+                    "dev-master": "1.9-dev"
                 }
             },
             "autoload": {
@@ -2153,41 +2236,37 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-04-26T10:06:28+00:00"
+            "time": "2018-08-06T14:22:27+00:00"
         },
         {
-            "name": "symfony/polyfill-php70",
-            "version": "v1.8.0",
+            "name": "symfony/polyfill-php72",
+            "version": "v1.9.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6"
+                "url": "https://github.com/symfony/polyfill-php72.git",
+                "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/77454693d8f10dd23bb24955cffd2d82db1007a6",
-                "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/95c50420b0baed23852452a7f0c7b527303ed5ae",
+                "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae",
                 "shasum": ""
             },
             "require": {
-                "paragonie/random_compat": "~1.0|~2.0",
                 "php": ">=5.3.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.8-dev"
+                    "dev-master": "1.9-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Polyfill\\Php70\\": ""
+                    "Symfony\\Polyfill\\Php72\\": ""
                 },
                 "files": [
                     "bootstrap.php"
-                ],
-                "classmap": [
-                    "Resources/stubs"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2204,7 +2283,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
+            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
@@ -2212,29 +2291,29 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-04-26T10:06:28+00:00"
+            "time": "2018-08-06T14:22:27+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v3.4.11",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "4cbf2db9abcb01486a21b7a059e03a62fae63187"
+                "reference": "ee33c0322a8fee0855afcc11fff81e6b1011b529"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/4cbf2db9abcb01486a21b7a059e03a62fae63187",
-                "reference": "4cbf2db9abcb01486a21b7a059e03a62fae63187",
+                "url": "https://api.github.com/repos/symfony/process/zipball/ee33c0322a8fee0855afcc11fff81e6b1011b529",
+                "reference": "ee33c0322a8fee0855afcc11fff81e6b1011b529",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8"
+                "php": "^7.1.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -2261,38 +2340,37 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2018-05-16T08:49:21+00:00"
+            "time": "2018-10-02T12:40:59+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v3.4.11",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "e382da877f5304aabc12ec3073eec430670c8296"
+                "reference": "537803f0bdfede36b9acef052d2e4d447d9fa0e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/e382da877f5304aabc12ec3073eec430670c8296",
-                "reference": "e382da877f5304aabc12ec3073eec430670c8296",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/537803f0bdfede36b9acef052d2e4d447d9fa0e9",
+                "reference": "537803f0bdfede36b9acef052d2e4d447d9fa0e9",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8"
+                "php": "^7.1.3"
             },
             "conflict": {
-                "symfony/config": "<3.3.1",
-                "symfony/dependency-injection": "<3.3",
+                "symfony/config": "<3.4",
+                "symfony/dependency-injection": "<3.4",
                 "symfony/yaml": "<3.4"
             },
             "require-dev": {
                 "doctrine/annotations": "~1.0",
-                "doctrine/common": "~2.2",
                 "psr/log": "~1.0",
-                "symfony/config": "^3.3.1|~4.0",
-                "symfony/dependency-injection": "~3.3|~4.0",
-                "symfony/expression-language": "~2.8|~3.0|~4.0",
-                "symfony/http-foundation": "~2.8|~3.0|~4.0",
+                "symfony/config": "~3.4|~4.0",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/expression-language": "~3.4|~4.0",
+                "symfony/http-foundation": "~3.4|~4.0",
                 "symfony/yaml": "~3.4|~4.0"
             },
             "suggest": {
@@ -2306,7 +2384,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -2339,20 +2417,20 @@
                 "uri",
                 "url"
             ],
-            "time": "2018-05-16T12:49:49+00:00"
+            "time": "2018-10-02T12:40:59+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v4.1.0",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "16328f5b217cebc8dd4adfe4aeeaa8c377581f5a"
+                "reference": "9f0b61e339160a466ebcde167a6c5521c810e304"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/16328f5b217cebc8dd4adfe4aeeaa8c377581f5a",
-                "reference": "16328f5b217cebc8dd4adfe4aeeaa8c377581f5a",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/9f0b61e339160a466ebcde167a6c5521c810e304",
+                "reference": "9f0b61e339160a466ebcde167a6c5521c810e304",
                 "shasum": ""
             },
             "require": {
@@ -2408,42 +2486,48 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2018-05-30T07:26:09+00:00"
+            "time": "2018-10-02T16:36:10+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v3.4.11",
+            "version": "v4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "0e6545672d8c9ce70dd472adc2f8b03155a46f73"
+                "reference": "60319b45653580b0cdacca499344577d87732f16"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0e6545672d8c9ce70dd472adc2f8b03155a46f73",
-                "reference": "0e6545672d8c9ce70dd472adc2f8b03155a46f73",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/60319b45653580b0cdacca499344577d87732f16",
+                "reference": "60319b45653580b0cdacca499344577d87732f16",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/polyfill-mbstring": "~1.0"
+                "php": "^7.1.3",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php72": "~1.5"
             },
             "conflict": {
-                "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
+                "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
+                "symfony/console": "<3.4"
             },
             "require-dev": {
                 "ext-iconv": "*",
+                "symfony/process": "~3.4|~4.0",
                 "twig/twig": "~1.34|~2.4"
             },
             "suggest": {
                 "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
                 "ext-intl": "To show region name in time zone dump",
-                "ext-symfony_debug": ""
+                "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script"
             },
+            "bin": [
+                "Resources/bin/var-dump-server"
+            ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -2477,7 +2561,7 @@
                 "debug",
                 "dump"
             ],
-            "time": "2018-04-26T12:42:15+00:00"
+            "time": "2018-10-02T16:36:10+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -2528,28 +2612,28 @@
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v2.4.0",
+            "version": "v2.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c"
+                "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
-                "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e",
+                "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.9"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8 || ^5.0"
+                "phpunit/phpunit": "^4.8.35 || ^5.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.4-dev"
+                    "dev-master": "2.5-dev"
                 }
             },
             "autoload": {
@@ -2559,7 +2643,7 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause-Attribution"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
@@ -2574,7 +2658,7 @@
                 "env",
                 "environment"
             ],
-            "time": "2016-09-01T10:05:43+00:00"
+            "time": "2018-07-29T20:33:41+00:00"
         }
     ],
     "packages-dev": [
@@ -2634,16 +2718,16 @@
         },
         {
             "name": "filp/whoops",
-            "version": "2.2.0",
+            "version": "2.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "181c4502d8f34db7aed7bfe88d4f87875b8e947a"
+                "reference": "e79cd403fb77fc8963a99ecc30e80ddd885b3311"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/181c4502d8f34db7aed7bfe88d4f87875b8e947a",
-                "reference": "181c4502d8f34db7aed7bfe88d4f87875b8e947a",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/e79cd403fb77fc8963a99ecc30e80ddd885b3311",
+                "reference": "e79cd403fb77fc8963a99ecc30e80ddd885b3311",
                 "shasum": ""
             },
             "require": {
@@ -2662,7 +2746,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "2.2-dev"
                 }
             },
             "autoload": {
@@ -2691,20 +2775,20 @@
                 "throwable",
                 "whoops"
             ],
-            "time": "2018-03-03T17:56:25+00:00"
+            "time": "2018-06-30T13:14:06+00:00"
         },
         {
             "name": "fzaninotto/faker",
-            "version": "v1.7.1",
+            "version": "v1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/fzaninotto/Faker.git",
-                "reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d"
+                "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d3ed4cc37051c1ca52d22d76b437d14809fc7e0d",
-                "reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d",
+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de",
+                "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de",
                 "shasum": ""
             },
             "require": {
@@ -2712,7 +2796,7 @@
             },
             "require-dev": {
                 "ext-intl": "*",
-                "phpunit/phpunit": "^4.0 || ^5.0",
+                "phpunit/phpunit": "^4.8.35 || ^5.7",
                 "squizlabs/php_codesniffer": "^1.5"
             },
             "type": "library",
@@ -2741,7 +2825,7 @@
                 "faker",
                 "fixtures"
             ],
-            "time": "2017-08-15T16:48:10+00:00"
+            "time": "2018-07-12T10:23:15+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
@@ -2793,16 +2877,16 @@
         },
         {
             "name": "mockery/mockery",
-            "version": "1.1.0",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "99e29d3596b16dabe4982548527d5ddf90232e99"
+                "reference": "100633629bf76d57430b86b7098cd6beb996a35a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/99e29d3596b16dabe4982548527d5ddf90232e99",
-                "reference": "99e29d3596b16dabe4982548527d5ddf90232e99",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/100633629bf76d57430b86b7098cd6beb996a35a",
+                "reference": "100633629bf76d57430b86b7098cd6beb996a35a",
                 "shasum": ""
             },
             "require": {
@@ -2811,8 +2895,7 @@
                 "php": ">=5.6.0"
             },
             "require-dev": {
-                "phpdocumentor/phpdocumentor": "^2.9",
-                "phpunit/phpunit": "~5.7.10|~6.5"
+                "phpunit/phpunit": "~5.7.10|~6.5|~7.0"
             },
             "type": "library",
             "extra": {
@@ -2855,7 +2938,7 @@
                 "test double",
                 "testing"
             ],
-            "time": "2018-05-08T08:54:48+00:00"
+            "time": "2018-10-02T21:52:37+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -3161,16 +3244,16 @@
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.7.6",
+            "version": "1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712"
+                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
-                "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
                 "shasum": ""
             },
             "require": {
@@ -3182,12 +3265,12 @@
             },
             "require-dev": {
                 "phpspec/phpspec": "^2.5|^3.2",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.7.x-dev"
+                    "dev-master": "1.8.x-dev"
                 }
             },
             "autoload": {
@@ -3220,7 +3303,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2018-04-18T13:57:24+00:00"
+            "time": "2018-08-05T17:53:17+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -3473,16 +3556,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "6.5.8",
+            "version": "6.5.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b"
+                "reference": "0973426fb012359b2f18d3bd1e90ef1172839693"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4f21a3c6b97c42952fd5c2837bb354ec0199b97b",
-                "reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0973426fb012359b2f18d3bd1e90ef1172839693",
+                "reference": "0973426fb012359b2f18d3bd1e90ef1172839693",
                 "shasum": ""
             },
             "require": {
@@ -3500,7 +3583,7 @@
                 "phpunit/php-file-iterator": "^1.4.3",
                 "phpunit/php-text-template": "^1.2.1",
                 "phpunit/php-timer": "^1.0.9",
-                "phpunit/phpunit-mock-objects": "^5.0.5",
+                "phpunit/phpunit-mock-objects": "^5.0.9",
                 "sebastian/comparator": "^2.1",
                 "sebastian/diff": "^2.0",
                 "sebastian/environment": "^3.1",
@@ -3553,20 +3636,20 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2018-04-10T11:38:34+00:00"
+            "time": "2018-09-08T15:10:43+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
-            "version": "5.0.7",
+            "version": "5.0.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "3eaf040f20154d27d6da59ca2c6e28ac8fd56dce"
+                "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3eaf040f20154d27d6da59ca2c6e28ac8fd56dce",
-                "reference": "3eaf040f20154d27d6da59ca2c6e28ac8fd56dce",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/cd1cf05c553ecfec36b170070573e540b67d3f1f",
+                "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f",
                 "shasum": ""
             },
             "require": {
@@ -3579,7 +3662,7 @@
                 "phpunit/phpunit": "<6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.5"
+                "phpunit/phpunit": "^6.5.11"
             },
             "suggest": {
                 "ext-soap": "*"
@@ -3612,7 +3695,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2018-05-29T13:50:43+00:00"
+            "time": "2018-08-09T05:50:03+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
@@ -4175,16 +4258,16 @@
         },
         {
             "name": "symfony/thanks",
-            "version": "v1.0.7",
+            "version": "v1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/thanks.git",
-                "reference": "bade4992c46ed722162694b4af8d72f84402819a"
+                "reference": "9474a631b52737c623b6aeba22f00bbc003251da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/thanks/zipball/bade4992c46ed722162694b4af8d72f84402819a",
-                "reference": "bade4992c46ed722162694b4af8d72f84402819a",
+                "url": "https://api.github.com/repos/symfony/thanks/zipball/9474a631b52737c623b6aeba22f00bbc003251da",
+                "reference": "9474a631b52737c623b6aeba22f00bbc003251da",
                 "shasum": ""
             },
             "require": {
@@ -4214,7 +4297,7 @@
                 }
             ],
             "description": "Give thanks (in the form of a GitHub ⭐) to your fellow PHP package maintainers (not limited to Symfony components)!",
-            "time": "2018-03-14T21:51:39+00:00"
+            "time": "2018-08-24T14:08:13+00:00"
         },
         {
             "name": "theseer/tokenizer",
diff --git a/config/app.php b/config/app.php
index 083d9d5b..edfa7970 100644
--- a/config/app.php
+++ b/config/app.php
@@ -14,7 +14,7 @@ return [
     */
 
     'name' => env('APP_NAME', 'Heimdall'),  
-    'version' => '1.4.14',
+    'version' => '2.0.0',
 
     /*
     |--------------------------------------------------------------------------
diff --git a/database/migrations/2018_10_12_122907_create_users_table.php b/database/migrations/2018_10_12_122907_create_users_table.php
new file mode 100644
index 00000000..cadc2344
--- /dev/null
+++ b/database/migrations/2018_10_12_122907_create_users_table.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('users', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('username')->unique();
+            $table->string('email');
+            $table->string('avatar')->nullable();
+            $table->string('password')->nullable();
+            $table->string('autologin')->nullable()->index();
+            $table->boolean('public_front')->default(false);
+            $table->rememberToken();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('users');
+    }
+}
diff --git a/database/migrations/2018_10_12_123036_create_password_resets_table.php b/database/migrations/2018_10_12_123036_create_password_resets_table.php
new file mode 100644
index 00000000..0d5cb845
--- /dev/null
+++ b/database/migrations/2018_10_12_123036_create_password_resets_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreatePasswordResetsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('password_resets', function (Blueprint $table) {
+            $table->string('email')->index();
+            $table->string('token');
+            $table->timestamp('created_at')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('password_resets');
+    }
+}
diff --git a/database/migrations/2018_10_12_131222_add_user_id_to_items_table.php b/database/migrations/2018_10_12_131222_add_user_id_to_items_table.php
new file mode 100644
index 00000000..9afa7902
--- /dev/null
+++ b/database/migrations/2018_10_12_131222_add_user_id_to_items_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddUserIdToItemsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('items', function (Blueprint $table) {
+            $table->integer('user_id')->default(1)->index(); // 0 = item, 1 = category
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('items', function (Blueprint $table) {
+            $table->dropColumn(['user_id']);
+        });
+    }
+}
diff --git a/database/migrations/2018_10_12_140451_create_setting_user_pivot_table.php b/database/migrations/2018_10_12_140451_create_setting_user_pivot_table.php
new file mode 100644
index 00000000..64e858cb
--- /dev/null
+++ b/database/migrations/2018_10_12_140451_create_setting_user_pivot_table.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateSettingUserPivotTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('setting_user', function (Blueprint $table) {
+            $table->integer('setting_id')->unsigned()->index();
+            $table->foreign('setting_id')->references('id')->on('settings')->onDelete('cascade');
+            $table->integer('user_id')->unsigned()->index();
+            $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+            $table->primary(['setting_id', 'user_id']);
+            $table->string('uservalue')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('setting_user');
+    }
+}
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index c03f1d90..bb08577f 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -12,5 +12,6 @@ class DatabaseSeeder extends Seeder
     public function run()
     {
         $this->call(SettingsSeeder::class);
+        $this->call(UsersSeeder::class);
     }
 }
diff --git a/database/seeds/SettingsSeeder.php b/database/seeds/SettingsSeeder.php
index 70db7070..f3fb8285 100644
--- a/database/seeds/SettingsSeeder.php
+++ b/database/seeds/SettingsSeeder.php
@@ -160,5 +160,38 @@ class SettingsSeeder extends Seeder
             $setting->label = 'app.settings.window_target';
             $setting->save();
         }
+
+        if($support = Setting::find(8)) {
+            $support->label = 'app.settings.support';
+            $support->value = '<a rel="noopener" target="_blank" href="https://discord.gg/CCjHKn4">Discord</a> | <a rel="noopener" target="_blank" href="https://github.com/linuxserver/Heimdall">Github</a> | <a rel="noopener" target="_blank" href="https://blog.heimdall.site/">Blog</a>';
+            $support->save();
+        } else {
+            $setting = new Setting;
+            $setting->id = 8;
+            $setting->group_id = 1;
+            $setting->key = 'support';
+            $setting->type = 'text';
+            $setting->label = 'app.settings.support';
+            $setting->value = '<a rel="noopener" target="_blank" href="https://discord.gg/CCjHKn4">Discord</a> | <a rel="noopener" target="_blank" href="https://github.com/linuxserver/Heimdall">Github</a> | <a rel="noopener" target="_blank" href="https://blog.heimdall.site/">Blog</a>';
+            $setting->system = true;
+            $setting->save();
+        }
+
+        if($donate = Setting::find(9)) {
+            $donate->label = 'app.settings.donate';
+            $donate->value = '<a rel="noopener" target="_blank" href="https://discord.gg/CCjHKn4">Discord</a> | <a rel="noopener" target="_blank" href="https://github.com/linuxserver/Heimdall">Github</a> | <a rel="noopener" target="_blank" href="https://blog.heimdall.site/">Blog</a>';
+            $donate->save();
+        } else {
+            $setting = new Setting;
+            $setting->id = 9;
+            $setting->group_id = 1;
+            $setting->key = 'donate';
+            $setting->type = 'text';
+            $setting->label = 'app.settings.donate';
+            $setting->value = '<a rel="noopener" target="_blank" href="https://paypal.me/pools/c/81ZR4dfBGo">Paypal</a>';
+            $setting->system = true;
+            $setting->save();
+        }
+
     }
 }
diff --git a/database/seeds/UsersSeeder.php b/database/seeds/UsersSeeder.php
new file mode 100644
index 00000000..e7454ec3
--- /dev/null
+++ b/database/seeds/UsersSeeder.php
@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Seeder;
+use App\User;
+
+class UsersSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        // Groups
+        if(!$user = User::find(1)) {
+            $user = new User;
+            $user->id = 1;
+            $user->username = 'admin';
+            $user->email = 'admin@test.com';
+            $user->password = null;
+            $user->save();
+        } else {
+            //$user->save();
+        }
+    }
+}
diff --git a/public/css/app.css b/public/css/app.css
index f9a450ab..6ccf1995 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -1,4 +1,4 @@
-@import url(https://fonts.googleapis.com/css?family=Raleway:300,400,600);/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
+/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
 html {
   font-family: sans-serif;
   -ms-text-size-adjust: 100%;
@@ -233,6 +233,61 @@ body {
   background: #cfd2d4;
 }
 
+#switchuser {
+  background: rgba(0, 0, 0, 0.5);
+  position: absolute;
+  padding: 10px;
+  color: white;
+  text-align: center;
+  bottom: 0;
+  left: 0;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+      -ms-flex-direction: column;
+          flex-direction: column;
+  -webkit-box-pack: center;
+      -ms-flex-pack: center;
+          justify-content: center;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+  border-top: 2px solid rgba(255, 255, 255, 0.15);
+  border-right: 2px solid rgba(255, 255, 255, 0.15);
+  -webkit-box-shadow: 0 0 10px 0px rgba(0, 0, 0, 0.4);
+          box-shadow: 0 0 10px 0px rgba(0, 0, 0, 0.4);
+  border-radius: 0 9px 0 0;
+  line-height: 1.5;
+  font-size: 14px;
+}
+
+#switchuser img {
+  width: 50px;
+  margin-bottom: 5px;
+  border-radius: 50%;
+}
+
+#switchuser .btn {
+  font-size: 13px;
+  color: white;
+  text-decoration: none;
+  margin-left: -10px;
+  margin-right: -10px;
+  margin-bottom: -10px;
+  margin-top: 8px;
+  border-radius: 0;
+  width: calc(100% + 22px);
+  background: rgba(255, 255, 255, 0.15);
+  -webkit-transition: all .35s ease-in-out;
+  transition: all .35s ease-in-out;
+}
+
+#switchuser .btn:hover {
+  background: #d64d55;
+}
+
 #app {
   display: -webkit-box;
   display: -ms-flexbox;
@@ -323,7 +378,7 @@ body {
 }
 
 #app main, #app #sortable {
-  padding: 10px;
+  padding: 30px 10px;
   display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
@@ -374,6 +429,68 @@ body {
   margin-top: 12px;
 }
 
+.userlist {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-pack: center;
+      -ms-flex-pack: center;
+          justify-content: center;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+}
+
+.userlist .user {
+  background: rgba(0, 0, 0, 0.5);
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  padding: 15px;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+      -ms-flex-direction: column;
+          flex-direction: column;
+  -webkit-box-pack: center;
+      -ms-flex-pack: center;
+          justify-content: center;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+  margin: 20px;
+  color: white;
+  text-decoration: none;
+  border-radius: 15px;
+  border: 5px solid rgba(255, 255, 255, 0.7);
+  -webkit-box-shadow: 0 0 10px 0px rgba(0, 0, 0, 0.4);
+          box-shadow: 0 0 10px 0px rgba(0, 0, 0, 0.4);
+}
+
+.userlist .user-img {
+  width: 130px;
+  height: 130px;
+  margin-bottom: 20px;
+  border-radius: 50%;
+  margin: 10px 10px 15px;
+}
+
+.userlist #password {
+  color: #2f313a;
+  width: 100%;
+  padding: 5px 10px;
+  margin: 15px -5px;
+}
+
+.userlist .btn {
+  width: 100%;
+}
+
+.userlist .forgot {
+  color: white;
+  font-size: 12px;
+  margin-top: 25px;
+}
+
 .item-container {
   position: relative;
 }
diff --git a/public/img/heimdall-logo-small.svg b/public/img/heimdall-logo-small.svg
new file mode 100644
index 00000000..e38dc463
--- /dev/null
+++ b/public/img/heimdall-logo-small.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="15pt" height="12pt" viewBox="0 0 16 16" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 8.464844 8.046875 L 8.464844 7.566406 L 8.628906 7.050781 C 9.78125 5.898438 10.6875 4.824219 10.847656 4.492188 L 10.648438 4.5625 C 10.648438 4.5625 10.832031 4.332031 10.8125 4.203125 C 10.667969 1.949219 9.40625 0.773438 9.058594 0.484375 C 9.570312 1.105469 9.429688 1.308594 9.429688 1.308594 C 9.207031 0.882812 8.742188 0.472656 8.652344 0.367188 L 8.542969 1.023438 C 8.980469 1.28125 8.863281 1.429688 8.863281 1.429688 C 8.761719 1.28125 8.480469 1.152344 8.480469 1.152344 L 8.449219 1.335938 C 8.585938 1.398438 9.1875 1.765625 9.191406 2.710938 C 9.191406 3.863281 8.542969 4.164062 8.429688 4.210938 C 8.050781 3.980469 7.640625 3.984375 7.539062 3.976562 C 7.4375 3.984375 7.027344 3.980469 6.648438 4.210938 C 6.535156 4.164062 5.882812 3.863281 5.882812 2.710938 C 5.890625 1.765625 6.492188 1.398438 6.625 1.335938 L 6.597656 1.152344 C 6.597656 1.152344 6.316406 1.28125 6.210938 1.429688 C 6.210938 1.429688 6.097656 1.28125 6.535156 1.023438 L 6.425781 0.367188 C 6.332031 0.472656 5.871094 0.882812 5.644531 1.308594 C 5.644531 1.308594 5.503906 1.105469 6.015625 0.484375 C 5.667969 0.773438 4.410156 1.949219 4.261719 4.203125 C 4.246094 4.332031 4.425781 4.5625 4.425781 4.5625 L 4.230469 4.492188 C 4.390625 4.824219 5.296875 5.898438 6.445312 7.050781 L 6.609375 7.566406 L 6.609375 8.046875 L 6.464844 7.53125 L 6.132812 6.980469 L 6.132812 7.542969 C 6.269531 7.933594 6.804688 8.722656 6.804688 8.722656 L 6.804688 7.085938 L 4.757812 4.835938 C 4.757812 4.835938 6.035156 5.886719 6.402344 6.261719 L 6.59375 6.066406 C 6.355469 5.894531 5.324219 4.851562 5.230469 3.929688 C 6.007812 5.585938 6.753906 5.792969 7.300781 6.4375 L 7.300781 6.59375 L 7.777344 6.59375 L 7.777344 6.4375 C 8.324219 5.792969 9.070312 5.585938 9.84375 3.929688 C 9.753906 4.851562 8.722656 5.894531 8.484375 6.066406 L 8.675781 6.261719 C 9.042969 5.886719 10.320312 4.835938 10.320312 4.835938 L 8.273438 7.085938 L 8.273438 8.722656 C 8.273438 8.722656 8.808594 7.933594 8.945312 7.542969 L 8.945312 6.980469 L 8.613281 7.53125 Z M 7.539062 6.070312 C 7.195312 5.839844 6.3125 5.300781 5.949219 4.460938 C 6.152344 4.703125 6.375 4.929688 6.609375 5.136719 C 6.609375 5.136719 6.589844 4.542969 6.632812 4.414062 C 6.714844 5.125 6.886719 5.429688 7.539062 5.808594 C 8.191406 5.429688 8.359375 5.125 8.441406 4.414062 C 8.488281 4.542969 8.464844 5.136719 8.464844 5.136719 C 8.703125 4.929688 8.925781 4.703125 9.128906 4.460938 C 8.761719 5.300781 7.882812 5.839844 7.539062 6.070312 Z M 7.539062 6.070312 "/>
+</g>
+</svg>
diff --git a/public/img/heimdall-logo.svg b/public/img/heimdall-logo.svg
new file mode 100644
index 00000000..1da63454
--- /dev/null
+++ b/public/img/heimdall-logo.svg
@@ -0,0 +1,14 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="780" height="619" viewBox="0 0 780 619">
+  <metadata><?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.6-c138 79.159824, 2016/09/14-01:09:01        ">
+   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+      <rdf:Description rdf:about=""/>
+   </rdf:RDF>
+</x:xmpmeta>
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                           
+<?xpacket end="w"?></metadata>
+  <path class="cls-1" d="M440.227,415.119V390.2l8.552-26.577C508.647,304.3,555.686,248.776,564,231.691l-10.215,3.56s9.5-11.864,8.552-18.51c-7.6-116.273-73.17-176.862-91.226-191.732,26.607,31.955,19.326,42.4,19.326,42.4C478.714,45.576,454.64,24.377,449.888,19l-5.7,33.853c22.806,13.289,16.79,20.882,16.79,20.882C455.591,66.141,441.021,59.5,441.021,59.5l-1.586,9.491c6.973,3.165,38.327,22.149,38.565,70.872,0,59.323-33.735,74.985-39.674,77.357-19.718-11.865-41.1-11.627-46.326-12.1-5.226.474-26.608,0.236-46.324,12.1C339.735,214.844,306,199.182,306,139.859c0.238-48.723,31.6-67.707,38.564-70.872L342.983,59.5s-14.574,6.644-19.955,14.238c0,0-6.022-7.593,16.786-20.882L334.112,19c-4.752,5.378-28.824,26.577-40.543,48.407,0,0-7.288-10.443,19.32-42.4-18.054,14.87-83.625,75.459-91.226,191.732-0.95,6.646,8.554,18.51,8.554,18.51L220,231.691c8.316,17.085,55.355,72.612,115.221,131.935l8.554,26.577v24.916l-7.6-26.577L318.83,360.067v28.95C325.957,409.186,353.751,450,353.751,450V365.525L247.32,249.488s66.52,54.1,85.526,73.56l9.978-10.2c-12.355-8.78-66.045-62.646-70.8-110.1,40.388,85.426,79.111,96.1,107.62,129.325V340.2h24.707v-8.131c28.508-33.221,67.233-43.9,107.619-129.325-4.75,47.459-58.442,101.325-70.8,110.1l9.976,10.2c19.006-19.458,85.526-73.56,85.526-73.56L430.249,365.525V450s27.8-40.815,34.923-60.984v-28.95l-17.343,28.475ZM392,313.083c-17.818-11.865-63.668-39.629-82.672-83.053a314.117,314.117,0,0,0,34.447,34.882s-1.189-30.61,1.186-37.255c4.276,36.781,13.068,52.442,47.039,71.9,33.973-19.458,42.763-35.119,47.039-71.9,2.375,6.645,1.188,37.255,1.188,37.255a314.117,314.117,0,0,0,34.447-34.882C455.668,273.454,409.818,301.218,392,313.083Z"/>
+</svg>
diff --git a/public/js/jquery-ui.min.js b/public/js/jquery-ui.min.js
new file mode 100644
index 00000000..117cb35e
--- /dev/null
+++ b/public/js/jquery-ui.min.js
@@ -0,0 +1,13 @@
+/*! jQuery UI - v1.12.1 - 2016-09-14
+* http://jqueryui.com
+* Includes: widget.js, position.js, data.js, disable-selection.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js, focusable.js, form-reset-mixin.js, jquery-1-7.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/draggable.js, widgets/droppable.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/resizable.js, widgets/selectable.js, widgets/selectmenu.js, widgets/slider.js, widgets/sortable.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
+
+(function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)})(function(t){function e(t){for(var e=t.css("visibility");"inherit"===e;)t=t.parent(),e=t.css("visibility");return"hidden"!==e}function i(t){for(var e,i;t.length&&t[0]!==document;){if(e=t.css("position"),("absolute"===e||"relative"===e||"fixed"===e)&&(i=parseInt(t.css("zIndex"),10),!isNaN(i)&&0!==i))return i;t=t.parent()}return 0}function s(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},t.extend(this._defaults,this.regional[""]),this.regional.en=t.extend(!0,{},this.regional[""]),this.regional["en-US"]=t.extend(!0,{},this.regional.en),this.dpDiv=n(t("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}function n(e){var i="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return e.on("mouseout",i,function(){t(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).removeClass("ui-datepicker-next-hover")}).on("mouseover",i,o)}function o(){t.datepicker._isDisabledDatepicker(m.inline?m.dpDiv.parent()[0]:m.input[0])||(t(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),t(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).addClass("ui-datepicker-next-hover"))}function a(e,i){t.extend(e,i);for(var s in i)null==i[s]&&(e[s]=i[s]);return e}function r(t){return function(){var e=this.element.val();t.apply(this,arguments),this._refresh(),e!==this.element.val()&&this._trigger("change")}}t.ui=t.ui||{},t.ui.version="1.12.1";var h=0,l=Array.prototype.slice;t.cleanData=function(e){return function(i){var s,n,o;for(o=0;null!=(n=i[o]);o++)try{s=t._data(n,"events"),s&&s.remove&&t(n).triggerHandler("remove")}catch(a){}e(i)}}(t.cleanData),t.widget=function(e,i,s){var n,o,a,r={},h=e.split(".")[0];e=e.split(".")[1];var l=h+"-"+e;return s||(s=i,i=t.Widget),t.isArray(s)&&(s=t.extend.apply(null,[{}].concat(s))),t.expr[":"][l.toLowerCase()]=function(e){return!!t.data(e,l)},t[h]=t[h]||{},n=t[h][e],o=t[h][e]=function(t,e){return this._createWidget?(arguments.length&&this._createWidget(t,e),void 0):new o(t,e)},t.extend(o,n,{version:s.version,_proto:t.extend({},s),_childConstructors:[]}),a=new i,a.options=t.widget.extend({},a.options),t.each(s,function(e,s){return t.isFunction(s)?(r[e]=function(){function t(){return i.prototype[e].apply(this,arguments)}function n(t){return i.prototype[e].apply(this,t)}return function(){var e,i=this._super,o=this._superApply;return this._super=t,this._superApply=n,e=s.apply(this,arguments),this._super=i,this._superApply=o,e}}(),void 0):(r[e]=s,void 0)}),o.prototype=t.widget.extend(a,{widgetEventPrefix:n?a.widgetEventPrefix||e:e},r,{constructor:o,namespace:h,widgetName:e,widgetFullName:l}),n?(t.each(n._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete n._childConstructors):i._childConstructors.push(o),t.widget.bridge(e,o),o},t.widget.extend=function(e){for(var i,s,n=l.call(arguments,1),o=0,a=n.length;a>o;o++)for(i in n[o])s=n[o][i],n[o].hasOwnProperty(i)&&void 0!==s&&(e[i]=t.isPlainObject(s)?t.isPlainObject(e[i])?t.widget.extend({},e[i],s):t.widget.extend({},s):s);return e},t.widget.bridge=function(e,i){var s=i.prototype.widgetFullName||e;t.fn[e]=function(n){var o="string"==typeof n,a=l.call(arguments,1),r=this;return o?this.length||"instance"!==n?this.each(function(){var i,o=t.data(this,s);return"instance"===n?(r=o,!1):o?t.isFunction(o[n])&&"_"!==n.charAt(0)?(i=o[n].apply(o,a),i!==o&&void 0!==i?(r=i&&i.jquery?r.pushStack(i.get()):i,!1):void 0):t.error("no such method '"+n+"' for "+e+" widget instance"):t.error("cannot call methods on "+e+" prior to initialization; "+"attempted to call method '"+n+"'")}):r=void 0:(a.length&&(n=t.widget.extend.apply(null,[n].concat(a))),this.each(function(){var e=t.data(this,s);e?(e.option(n||{}),e._init&&e._init()):t.data(this,s,new i(n,this))})),r}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{classes:{},disabled:!1,create:null},_createWidget:function(e,i){i=t(i||this.defaultElement||this)[0],this.element=t(i),this.uuid=h++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=t(),this.hoverable=t(),this.focusable=t(),this.classesElementLookup={},i!==this&&(t.data(i,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===i&&this.destroy()}}),this.document=t(i.style?i.ownerDocument:i.document||i),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this.options=t.widget.extend({},this.options,this._getCreateOptions(),e),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){var e=this;this._destroy(),t.each(this.classesElementLookup,function(t,i){e._removeClass(i,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:t.noop,widget:function(){return this.element},option:function(e,i){var s,n,o,a=e;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof e)if(a={},s=e.split("."),e=s.shift(),s.length){for(n=a[e]=t.widget.extend({},this.options[e]),o=0;s.length-1>o;o++)n[s[o]]=n[s[o]]||{},n=n[s[o]];if(e=s.pop(),1===arguments.length)return void 0===n[e]?null:n[e];n[e]=i}else{if(1===arguments.length)return void 0===this.options[e]?null:this.options[e];a[e]=i}return this._setOptions(a),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return"classes"===t&&this._setOptionClasses(e),this.options[t]=e,"disabled"===t&&this._setOptionDisabled(e),this},_setOptionClasses:function(e){var i,s,n;for(i in e)n=this.classesElementLookup[i],e[i]!==this.options.classes[i]&&n&&n.length&&(s=t(n.get()),this._removeClass(n,i),s.addClass(this._classes({element:s,keys:i,classes:e,add:!0})))},_setOptionDisabled:function(t){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!t),t&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(e){function i(i,o){var a,r;for(r=0;i.length>r;r++)a=n.classesElementLookup[i[r]]||t(),a=e.add?t(t.unique(a.get().concat(e.element.get()))):t(a.not(e.element).get()),n.classesElementLookup[i[r]]=a,s.push(i[r]),o&&e.classes[i[r]]&&s.push(e.classes[i[r]])}var s=[],n=this;return e=t.extend({element:this.element,classes:this.options.classes||{}},e),this._on(e.element,{remove:"_untrackClassesElement"}),e.keys&&i(e.keys.match(/\S+/g)||[],!0),e.extra&&i(e.extra.match(/\S+/g)||[]),s.join(" ")},_untrackClassesElement:function(e){var i=this;t.each(i.classesElementLookup,function(s,n){-1!==t.inArray(e.target,n)&&(i.classesElementLookup[s]=t(n.not(e.target).get()))})},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){s="boolean"==typeof s?s:i;var n="string"==typeof t||null===t,o={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s};return o.element.toggleClass(this._classes(o),s),this},_on:function(e,i,s){var n,o=this;"boolean"!=typeof e&&(s=i,i=e,e=!1),s?(i=n=t(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),t.each(s,function(s,a){function r(){return e||o.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof a?o[a]:a).apply(o,arguments):void 0}"string"!=typeof a&&(r.guid=a.guid=a.guid||r.guid||t.guid++);var h=s.match(/^([\w:-]*)\s*(.*)$/),l=h[1]+o.eventNamespace,c=h[2];c?n.on(l,c,r):i.on(l,r)})},_off:function(e,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.off(i).off(i),this.bindings=t(this.bindings.not(e).get()),this.focusable=t(this.focusable.not(e).get()),this.hoverable=t(this.hoverable.not(e).get())},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){this._addClass(t(e.currentTarget),null,"ui-state-hover")},mouseleave:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){this._addClass(t(e.currentTarget),null,"ui-state-focus")},focusout:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-focus")}})},_trigger:function(e,i,s){var n,o,a=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],o=i.originalEvent)for(n in o)n in i||(i[n]=o[n]);return this.element.trigger(i,s),!(t.isFunction(a)&&a.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,o){"string"==typeof n&&(n={effect:n});var a,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),a=!t.isEmptyObject(n),n.complete=o,n.delay&&s.delay(n.delay),a&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,o):s.queue(function(i){t(this)[e](),o&&o.call(s[0]),i()})}}),t.widget,function(){function e(t,e,i){return[parseFloat(t[0])*(u.test(t[0])?e/100:1),parseFloat(t[1])*(u.test(t[1])?i/100:1)]}function i(e,i){return parseInt(t.css(e,i),10)||0}function s(e){var i=e[0];return 9===i.nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:t.isWindow(i)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()}}var n,o=Math.max,a=Math.abs,r=/left|center|right/,h=/top|center|bottom/,l=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,u=/%$/,d=t.fn.position;t.position={scrollbarWidth:function(){if(void 0!==n)return n;var e,i,s=t("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),o=s.children()[0];return t("body").append(s),e=o.offsetWidth,s.css("overflow","scroll"),i=o.offsetWidth,e===i&&(i=s[0].clientWidth),s.remove(),n=e-i},getScrollInfo:function(e){var i=e.isWindow||e.isDocument?"":e.element.css("overflow-x"),s=e.isWindow||e.isDocument?"":e.element.css("overflow-y"),n="scroll"===i||"auto"===i&&e.width<e.element[0].scrollWidth,o="scroll"===s||"auto"===s&&e.height<e.element[0].scrollHeight;return{width:o?t.position.scrollbarWidth():0,height:n?t.position.scrollbarWidth():0}},getWithinInfo:function(e){var i=t(e||window),s=t.isWindow(i[0]),n=!!i[0]&&9===i[0].nodeType,o=!s&&!n;return{element:i,isWindow:s,isDocument:n,offset:o?t(e).offset():{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:i.outerWidth(),height:i.outerHeight()}}},t.fn.position=function(n){if(!n||!n.of)return d.apply(this,arguments);n=t.extend({},n);var u,p,f,g,m,_,v=t(n.of),b=t.position.getWithinInfo(n.within),y=t.position.getScrollInfo(b),w=(n.collision||"flip").split(" "),k={};return _=s(v),v[0].preventDefault&&(n.at="left top"),p=_.width,f=_.height,g=_.offset,m=t.extend({},g),t.each(["my","at"],function(){var t,e,i=(n[this]||"").split(" ");1===i.length&&(i=r.test(i[0])?i.concat(["center"]):h.test(i[0])?["center"].concat(i):["center","center"]),i[0]=r.test(i[0])?i[0]:"center",i[1]=h.test(i[1])?i[1]:"center",t=l.exec(i[0]),e=l.exec(i[1]),k[this]=[t?t[0]:0,e?e[0]:0],n[this]=[c.exec(i[0])[0],c.exec(i[1])[0]]}),1===w.length&&(w[1]=w[0]),"right"===n.at[0]?m.left+=p:"center"===n.at[0]&&(m.left+=p/2),"bottom"===n.at[1]?m.top+=f:"center"===n.at[1]&&(m.top+=f/2),u=e(k.at,p,f),m.left+=u[0],m.top+=u[1],this.each(function(){var s,r,h=t(this),l=h.outerWidth(),c=h.outerHeight(),d=i(this,"marginLeft"),_=i(this,"marginTop"),x=l+d+i(this,"marginRight")+y.width,C=c+_+i(this,"marginBottom")+y.height,D=t.extend({},m),I=e(k.my,h.outerWidth(),h.outerHeight());"right"===n.my[0]?D.left-=l:"center"===n.my[0]&&(D.left-=l/2),"bottom"===n.my[1]?D.top-=c:"center"===n.my[1]&&(D.top-=c/2),D.left+=I[0],D.top+=I[1],s={marginLeft:d,marginTop:_},t.each(["left","top"],function(e,i){t.ui.position[w[e]]&&t.ui.position[w[e]][i](D,{targetWidth:p,targetHeight:f,elemWidth:l,elemHeight:c,collisionPosition:s,collisionWidth:x,collisionHeight:C,offset:[u[0]+I[0],u[1]+I[1]],my:n.my,at:n.at,within:b,elem:h})}),n.using&&(r=function(t){var e=g.left-D.left,i=e+p-l,s=g.top-D.top,r=s+f-c,u={target:{element:v,left:g.left,top:g.top,width:p,height:f},element:{element:h,left:D.left,top:D.top,width:l,height:c},horizontal:0>i?"left":e>0?"right":"center",vertical:0>r?"top":s>0?"bottom":"middle"};l>p&&p>a(e+i)&&(u.horizontal="center"),c>f&&f>a(s+r)&&(u.vertical="middle"),u.important=o(a(e),a(i))>o(a(s),a(r))?"horizontal":"vertical",n.using.call(this,t,u)}),h.offset(t.extend(D,{using:r}))})},t.ui.position={fit:{left:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=t.left-e.collisionPosition.marginLeft,h=n-r,l=r+e.collisionWidth-a-n;e.collisionWidth>a?h>0&&0>=l?(i=t.left+h+e.collisionWidth-a-n,t.left+=h-i):t.left=l>0&&0>=h?n:h>l?n+a-e.collisionWidth:n:h>0?t.left+=h:l>0?t.left-=l:t.left=o(t.left-r,t.left)},top:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollTop:s.offset.top,a=e.within.height,r=t.top-e.collisionPosition.marginTop,h=n-r,l=r+e.collisionHeight-a-n;e.collisionHeight>a?h>0&&0>=l?(i=t.top+h+e.collisionHeight-a-n,t.top+=h-i):t.top=l>0&&0>=h?n:h>l?n+a-e.collisionHeight:n:h>0?t.top+=h:l>0?t.top-=l:t.top=o(t.top-r,t.top)}},flip:{left:function(t,e){var i,s,n=e.within,o=n.offset.left+n.scrollLeft,r=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=t.left-e.collisionPosition.marginLeft,c=l-h,u=l+e.collisionWidth-r-h,d="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,p="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,f=-2*e.offset[0];0>c?(i=t.left+d+p+f+e.collisionWidth-r-o,(0>i||a(c)>i)&&(t.left+=d+p+f)):u>0&&(s=t.left-e.collisionPosition.marginLeft+d+p+f-h,(s>0||u>a(s))&&(t.left+=d+p+f))},top:function(t,e){var i,s,n=e.within,o=n.offset.top+n.scrollTop,r=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=t.top-e.collisionPosition.marginTop,c=l-h,u=l+e.collisionHeight-r-h,d="top"===e.my[1],p=d?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,f="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,g=-2*e.offset[1];0>c?(s=t.top+p+f+g+e.collisionHeight-r-o,(0>s||a(c)>s)&&(t.top+=p+f+g)):u>0&&(i=t.top-e.collisionPosition.marginTop+p+f+g-h,(i>0||u>a(i))&&(t.top+=p+f+g))}},flipfit:{left:function(){t.ui.position.flip.left.apply(this,arguments),t.ui.position.fit.left.apply(this,arguments)},top:function(){t.ui.position.flip.top.apply(this,arguments),t.ui.position.fit.top.apply(this,arguments)}}}}(),t.ui.position,t.extend(t.expr[":"],{data:t.expr.createPseudo?t.expr.createPseudo(function(e){return function(i){return!!t.data(i,e)}}):function(e,i,s){return!!t.data(e,s[3])}}),t.fn.extend({disableSelection:function(){var t="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.on(t+".ui-disableSelection",function(t){t.preventDefault()})}}(),enableSelection:function(){return this.off(".ui-disableSelection")}});var c="ui-effects-",u="ui-effects-style",d="ui-effects-animated",p=t;t.effects={effect:{}},function(t,e){function i(t,e,i){var s=u[e.type]||{};return null==t?i||!e.def?null:e.def:(t=s.floor?~~t:parseFloat(t),isNaN(t)?e.def:s.mod?(t+s.mod)%s.mod:0>t?0:t>s.max?s.max:t)}function s(i){var s=l(),n=s._rgba=[];return i=i.toLowerCase(),f(h,function(t,o){var a,r=o.re.exec(i),h=r&&o.parse(r),l=o.space||"rgba";return h?(a=s[l](h),s[c[l].cache]=a[c[l].cache],n=s._rgba=a._rgba,!1):e}),n.length?("0,0,0,0"===n.join()&&t.extend(n,o.transparent),s):o[i]}function n(t,e,i){return i=(i+1)%1,1>6*i?t+6*(e-t)*i:1>2*i?e:2>3*i?t+6*(e-t)*(2/3-i):t}var o,a="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,h=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[t[1],t[2],t[3],t[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[2.55*t[1],2.55*t[2],2.55*t[3],t[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(t){return[parseInt(t[1],16),parseInt(t[2],16),parseInt(t[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(t){return[parseInt(t[1]+t[1],16),parseInt(t[2]+t[2],16),parseInt(t[3]+t[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(t){return[t[1],t[2]/100,t[3]/100,t[4]]}}],l=t.Color=function(e,i,s,n){return new t.Color.fn.parse(e,i,s,n)},c={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},u={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},d=l.support={},p=t("<p>")[0],f=t.each;p.style.cssText="background-color:rgba(1,1,1,.5)",d.rgba=p.style.backgroundColor.indexOf("rgba")>-1,f(c,function(t,e){e.cache="_"+t,e.props.alpha={idx:3,type:"percent",def:1}}),l.fn=t.extend(l.prototype,{parse:function(n,a,r,h){if(n===e)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=t(n).css(a),a=e);var u=this,d=t.type(n),p=this._rgba=[];return a!==e&&(n=[n,a,r,h],d="array"),"string"===d?this.parse(s(n)||o._default):"array"===d?(f(c.rgba.props,function(t,e){p[e.idx]=i(n[e.idx],e)}),this):"object"===d?(n instanceof l?f(c,function(t,e){n[e.cache]&&(u[e.cache]=n[e.cache].slice())}):f(c,function(e,s){var o=s.cache;f(s.props,function(t,e){if(!u[o]&&s.to){if("alpha"===t||null==n[t])return;u[o]=s.to(u._rgba)}u[o][e.idx]=i(n[t],e,!0)}),u[o]&&0>t.inArray(null,u[o].slice(0,3))&&(u[o][3]=1,s.from&&(u._rgba=s.from(u[o])))}),this):e},is:function(t){var i=l(t),s=!0,n=this;return f(c,function(t,o){var a,r=i[o.cache];return r&&(a=n[o.cache]||o.to&&o.to(n._rgba)||[],f(o.props,function(t,i){return null!=r[i.idx]?s=r[i.idx]===a[i.idx]:e})),s}),s},_space:function(){var t=[],e=this;return f(c,function(i,s){e[s.cache]&&t.push(i)}),t.pop()},transition:function(t,e){var s=l(t),n=s._space(),o=c[n],a=0===this.alpha()?l("transparent"):this,r=a[o.cache]||o.to(a._rgba),h=r.slice();return s=s[o.cache],f(o.props,function(t,n){var o=n.idx,a=r[o],l=s[o],c=u[n.type]||{};null!==l&&(null===a?h[o]=l:(c.mod&&(l-a>c.mod/2?a+=c.mod:a-l>c.mod/2&&(a-=c.mod)),h[o]=i((l-a)*e+a,n)))}),this[n](h)},blend:function(e){if(1===this._rgba[3])return this;var i=this._rgba.slice(),s=i.pop(),n=l(e)._rgba;return l(t.map(i,function(t,e){return(1-s)*n[e]+s*t}))},toRgbaString:function(){var e="rgba(",i=t.map(this._rgba,function(t,e){return null==t?e>2?1:0:t});return 1===i[3]&&(i.pop(),e="rgb("),e+i.join()+")"},toHslaString:function(){var e="hsla(",i=t.map(this.hsla(),function(t,e){return null==t&&(t=e>2?1:0),e&&3>e&&(t=Math.round(100*t)+"%"),t});return 1===i[3]&&(i.pop(),e="hsl("),e+i.join()+")"},toHexString:function(e){var i=this._rgba.slice(),s=i.pop();return e&&i.push(~~(255*s)),"#"+t.map(i,function(t){return t=(t||0).toString(16),1===t.length?"0"+t:t}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),l.fn.parse.prototype=l.fn,c.hsla.to=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e,i,s=t[0]/255,n=t[1]/255,o=t[2]/255,a=t[3],r=Math.max(s,n,o),h=Math.min(s,n,o),l=r-h,c=r+h,u=.5*c;return e=h===r?0:s===r?60*(n-o)/l+360:n===r?60*(o-s)/l+120:60*(s-n)/l+240,i=0===l?0:.5>=u?l/c:l/(2-c),[Math.round(e)%360,i,u,null==a?1:a]},c.hsla.from=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e=t[0]/360,i=t[1],s=t[2],o=t[3],a=.5>=s?s*(1+i):s+i-s*i,r=2*s-a;return[Math.round(255*n(r,a,e+1/3)),Math.round(255*n(r,a,e)),Math.round(255*n(r,a,e-1/3)),o]},f(c,function(s,n){var o=n.props,a=n.cache,h=n.to,c=n.from;l.fn[s]=function(s){if(h&&!this[a]&&(this[a]=h(this._rgba)),s===e)return this[a].slice();var n,r=t.type(s),u="array"===r||"object"===r?s:arguments,d=this[a].slice();return f(o,function(t,e){var s=u["object"===r?t:e.idx];null==s&&(s=d[e.idx]),d[e.idx]=i(s,e)}),c?(n=l(c(d)),n[a]=d,n):l(d)},f(o,function(e,i){l.fn[e]||(l.fn[e]=function(n){var o,a=t.type(n),h="alpha"===e?this._hsla?"hsla":"rgba":s,l=this[h](),c=l[i.idx];return"undefined"===a?c:("function"===a&&(n=n.call(this,c),a=t.type(n)),null==n&&i.empty?this:("string"===a&&(o=r.exec(n),o&&(n=c+parseFloat(o[2])*("+"===o[1]?1:-1))),l[i.idx]=n,this[h](l)))})})}),l.hook=function(e){var i=e.split(" ");f(i,function(e,i){t.cssHooks[i]={set:function(e,n){var o,a,r="";if("transparent"!==n&&("string"!==t.type(n)||(o=s(n)))){if(n=l(o||n),!d.rgba&&1!==n._rgba[3]){for(a="backgroundColor"===i?e.parentNode:e;(""===r||"transparent"===r)&&a&&a.style;)try{r=t.css(a,"backgroundColor"),a=a.parentNode}catch(h){}n=n.blend(r&&"transparent"!==r?r:"_default")}n=n.toRgbaString()}try{e.style[i]=n}catch(h){}}},t.fx.step[i]=function(e){e.colorInit||(e.start=l(e.elem,i),e.end=l(e.end),e.colorInit=!0),t.cssHooks[i].set(e.elem,e.start.transition(e.end,e.pos))}})},l.hook(a),t.cssHooks.borderColor={expand:function(t){var e={};return f(["Top","Right","Bottom","Left"],function(i,s){e["border"+s+"Color"]=t}),e}},o=t.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(p),function(){function e(e){var i,s,n=e.ownerDocument.defaultView?e.ownerDocument.defaultView.getComputedStyle(e,null):e.currentStyle,o={};if(n&&n.length&&n[0]&&n[n[0]])for(s=n.length;s--;)i=n[s],"string"==typeof n[i]&&(o[t.camelCase(i)]=n[i]);else for(i in n)"string"==typeof n[i]&&(o[i]=n[i]);return o}function i(e,i){var s,o,a={};for(s in i)o=i[s],e[s]!==o&&(n[s]||(t.fx.step[s]||!isNaN(parseFloat(o)))&&(a[s]=o));return a}var s=["add","remove","toggle"],n={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};t.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(e,i){t.fx.step[i]=function(t){("none"!==t.end&&!t.setAttr||1===t.pos&&!t.setAttr)&&(p.style(t.elem,i,t.end),t.setAttr=!0)}}),t.fn.addBack||(t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.effects.animateClass=function(n,o,a,r){var h=t.speed(o,a,r);return this.queue(function(){var o,a=t(this),r=a.attr("class")||"",l=h.children?a.find("*").addBack():a;l=l.map(function(){var i=t(this);return{el:i,start:e(this)}}),o=function(){t.each(s,function(t,e){n[e]&&a[e+"Class"](n[e])})},o(),l=l.map(function(){return this.end=e(this.el[0]),this.diff=i(this.start,this.end),this}),a.attr("class",r),l=l.map(function(){var e=this,i=t.Deferred(),s=t.extend({},h,{queue:!1,complete:function(){i.resolve(e)}});return this.el.animate(this.diff,s),i.promise()}),t.when.apply(t,l.get()).done(function(){o(),t.each(arguments,function(){var e=this.el;t.each(this.diff,function(t){e.css(t,"")})}),h.complete.call(a[0])})})},t.fn.extend({addClass:function(e){return function(i,s,n,o){return s?t.effects.animateClass.call(this,{add:i},s,n,o):e.apply(this,arguments)}}(t.fn.addClass),removeClass:function(e){return function(i,s,n,o){return arguments.length>1?t.effects.animateClass.call(this,{remove:i},s,n,o):e.apply(this,arguments)}}(t.fn.removeClass),toggleClass:function(e){return function(i,s,n,o,a){return"boolean"==typeof s||void 0===s?n?t.effects.animateClass.call(this,s?{add:i}:{remove:i},n,o,a):e.apply(this,arguments):t.effects.animateClass.call(this,{toggle:i},s,n,o)}}(t.fn.toggleClass),switchClass:function(e,i,s,n,o){return t.effects.animateClass.call(this,{add:i,remove:e},s,n,o)}})}(),function(){function e(e,i,s,n){return t.isPlainObject(e)&&(i=e,e=e.effect),e={effect:e},null==i&&(i={}),t.isFunction(i)&&(n=i,s=null,i={}),("number"==typeof i||t.fx.speeds[i])&&(n=s,s=i,i={}),t.isFunction(s)&&(n=s,s=null),i&&t.extend(e,i),s=s||i.duration,e.duration=t.fx.off?0:"number"==typeof s?s:s in t.fx.speeds?t.fx.speeds[s]:t.fx.speeds._default,e.complete=n||i.complete,e}function i(e){return!e||"number"==typeof e||t.fx.speeds[e]?!0:"string"!=typeof e||t.effects.effect[e]?t.isFunction(e)?!0:"object"!=typeof e||e.effect?!1:!0:!0}function s(t,e){var i=e.outerWidth(),s=e.outerHeight(),n=/^rect\((-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto)\)$/,o=n.exec(t)||["",0,i,s,0];return{top:parseFloat(o[1])||0,right:"auto"===o[2]?i:parseFloat(o[2]),bottom:"auto"===o[3]?s:parseFloat(o[3]),left:parseFloat(o[4])||0}}t.expr&&t.expr.filters&&t.expr.filters.animated&&(t.expr.filters.animated=function(e){return function(i){return!!t(i).data(d)||e(i)}}(t.expr.filters.animated)),t.uiBackCompat!==!1&&t.extend(t.effects,{save:function(t,e){for(var i=0,s=e.length;s>i;i++)null!==e[i]&&t.data(c+e[i],t[0].style[e[i]])},restore:function(t,e){for(var i,s=0,n=e.length;n>s;s++)null!==e[s]&&(i=t.data(c+e[s]),t.css(e[s],i))},setMode:function(t,e){return"toggle"===e&&(e=t.is(":hidden")?"show":"hide"),e},createWrapper:function(e){if(e.parent().is(".ui-effects-wrapper"))return e.parent();var i={width:e.outerWidth(!0),height:e.outerHeight(!0),"float":e.css("float")},s=t("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),n={width:e.width(),height:e.height()},o=document.activeElement;try{o.id}catch(a){o=document.body}return e.wrap(s),(e[0]===o||t.contains(e[0],o))&&t(o).trigger("focus"),s=e.parent(),"static"===e.css("position")?(s.css({position:"relative"}),e.css({position:"relative"})):(t.extend(i,{position:e.css("position"),zIndex:e.css("z-index")}),t.each(["top","left","bottom","right"],function(t,s){i[s]=e.css(s),isNaN(parseInt(i[s],10))&&(i[s]="auto")}),e.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),e.css(n),s.css(i).show()},removeWrapper:function(e){var i=document.activeElement;return e.parent().is(".ui-effects-wrapper")&&(e.parent().replaceWith(e),(e[0]===i||t.contains(e[0],i))&&t(i).trigger("focus")),e}}),t.extend(t.effects,{version:"1.12.1",define:function(e,i,s){return s||(s=i,i="effect"),t.effects.effect[e]=s,t.effects.effect[e].mode=i,s},scaledDimensions:function(t,e,i){if(0===e)return{height:0,width:0,outerHeight:0,outerWidth:0};var s="horizontal"!==i?(e||100)/100:1,n="vertical"!==i?(e||100)/100:1;return{height:t.height()*n,width:t.width()*s,outerHeight:t.outerHeight()*n,outerWidth:t.outerWidth()*s}},clipToBox:function(t){return{width:t.clip.right-t.clip.left,height:t.clip.bottom-t.clip.top,left:t.clip.left,top:t.clip.top}},unshift:function(t,e,i){var s=t.queue();e>1&&s.splice.apply(s,[1,0].concat(s.splice(e,i))),t.dequeue()},saveStyle:function(t){t.data(u,t[0].style.cssText)},restoreStyle:function(t){t[0].style.cssText=t.data(u)||"",t.removeData(u)},mode:function(t,e){var i=t.is(":hidden");return"toggle"===e&&(e=i?"show":"hide"),(i?"hide"===e:"show"===e)&&(e="none"),e},getBaseline:function(t,e){var i,s;switch(t[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=t[0]/e.height}switch(t[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=t[1]/e.width}return{x:s,y:i}},createPlaceholder:function(e){var i,s=e.css("position"),n=e.position();return e.css({marginTop:e.css("marginTop"),marginBottom:e.css("marginBottom"),marginLeft:e.css("marginLeft"),marginRight:e.css("marginRight")}).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()),/^(static|relative)/.test(s)&&(s="absolute",i=t("<"+e[0].nodeName+">").insertAfter(e).css({display:/^(inline|ruby)/.test(e.css("display"))?"inline-block":"block",visibility:"hidden",marginTop:e.css("marginTop"),marginBottom:e.css("marginBottom"),marginLeft:e.css("marginLeft"),marginRight:e.css("marginRight"),"float":e.css("float")}).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()).addClass("ui-effects-placeholder"),e.data(c+"placeholder",i)),e.css({position:s,left:n.left,top:n.top}),i},removePlaceholder:function(t){var e=c+"placeholder",i=t.data(e);i&&(i.remove(),t.removeData(e))},cleanUp:function(e){t.effects.restoreStyle(e),t.effects.removePlaceholder(e)},setTransition:function(e,i,s,n){return n=n||{},t.each(i,function(t,i){var o=e.cssUnit(i);o[0]>0&&(n[i]=o[0]*s+o[1])}),n}}),t.fn.extend({effect:function(){function i(e){function i(){r.removeData(d),t.effects.cleanUp(r),"hide"===s.mode&&r.hide(),a()}function a(){t.isFunction(h)&&h.call(r[0]),t.isFunction(e)&&e()}var r=t(this);s.mode=c.shift(),t.uiBackCompat===!1||o?"none"===s.mode?(r[l](),a()):n.call(r[0],s,i):(r.is(":hidden")?"hide"===l:"show"===l)?(r[l](),a()):n.call(r[0],s,a)}var s=e.apply(this,arguments),n=t.effects.effect[s.effect],o=n.mode,a=s.queue,r=a||"fx",h=s.complete,l=s.mode,c=[],u=function(e){var i=t(this),s=t.effects.mode(i,l)||o;i.data(d,!0),c.push(s),o&&("show"===s||s===o&&"hide"===s)&&i.show(),o&&"none"===s||t.effects.saveStyle(i),t.isFunction(e)&&e()};return t.fx.off||!n?l?this[l](s.duration,h):this.each(function(){h&&h.call(this)}):a===!1?this.each(u).each(i):this.queue(r,u).queue(r,i)},show:function(t){return function(s){if(i(s))return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="show",this.effect.call(this,n)
+}}(t.fn.show),hide:function(t){return function(s){if(i(s))return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="hide",this.effect.call(this,n)}}(t.fn.hide),toggle:function(t){return function(s){if(i(s)||"boolean"==typeof s)return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="toggle",this.effect.call(this,n)}}(t.fn.toggle),cssUnit:function(e){var i=this.css(e),s=[];return t.each(["em","px","%","pt"],function(t,e){i.indexOf(e)>0&&(s=[parseFloat(i),e])}),s},cssClip:function(t){return t?this.css("clip","rect("+t.top+"px "+t.right+"px "+t.bottom+"px "+t.left+"px)"):s(this.css("clip"),this)},transfer:function(e,i){var s=t(this),n=t(e.to),o="fixed"===n.css("position"),a=t("body"),r=o?a.scrollTop():0,h=o?a.scrollLeft():0,l=n.offset(),c={top:l.top-r,left:l.left-h,height:n.innerHeight(),width:n.innerWidth()},u=s.offset(),d=t("<div class='ui-effects-transfer'></div>").appendTo("body").addClass(e.className).css({top:u.top-r,left:u.left-h,height:s.innerHeight(),width:s.innerWidth(),position:o?"fixed":"absolute"}).animate(c,e.duration,e.easing,function(){d.remove(),t.isFunction(i)&&i()})}}),t.fx.step.clip=function(e){e.clipInit||(e.start=t(e.elem).cssClip(),"string"==typeof e.end&&(e.end=s(e.end,e.elem)),e.clipInit=!0),t(e.elem).cssClip({top:e.pos*(e.end.top-e.start.top)+e.start.top,right:e.pos*(e.end.right-e.start.right)+e.start.right,bottom:e.pos*(e.end.bottom-e.start.bottom)+e.start.bottom,left:e.pos*(e.end.left-e.start.left)+e.start.left})}}(),function(){var e={};t.each(["Quad","Cubic","Quart","Quint","Expo"],function(t,i){e[i]=function(e){return Math.pow(e,t+2)}}),t.extend(e,{Sine:function(t){return 1-Math.cos(t*Math.PI/2)},Circ:function(t){return 1-Math.sqrt(1-t*t)},Elastic:function(t){return 0===t||1===t?t:-Math.pow(2,8*(t-1))*Math.sin((80*(t-1)-7.5)*Math.PI/15)},Back:function(t){return t*t*(3*t-2)},Bounce:function(t){for(var e,i=4;((e=Math.pow(2,--i))-1)/11>t;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*e-2)/22-t,2)}}),t.each(e,function(e,i){t.easing["easeIn"+e]=i,t.easing["easeOut"+e]=function(t){return 1-i(1-t)},t.easing["easeInOut"+e]=function(t){return.5>t?i(2*t)/2:1-i(-2*t+2)/2}})}();var f=t.effects;t.effects.define("blind","hide",function(e,i){var s={up:["bottom","top"],vertical:["bottom","top"],down:["top","bottom"],left:["right","left"],horizontal:["right","left"],right:["left","right"]},n=t(this),o=e.direction||"up",a=n.cssClip(),r={clip:t.extend({},a)},h=t.effects.createPlaceholder(n);r.clip[s[o][0]]=r.clip[s[o][1]],"show"===e.mode&&(n.cssClip(r.clip),h&&h.css(t.effects.clipToBox(r)),r.clip=a),h&&h.animate(t.effects.clipToBox(r),e.duration,e.easing),n.animate(r,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("bounce",function(e,i){var s,n,o,a=t(this),r=e.mode,h="hide"===r,l="show"===r,c=e.direction||"up",u=e.distance,d=e.times||5,p=2*d+(l||h?1:0),f=e.duration/p,g=e.easing,m="up"===c||"down"===c?"top":"left",_="up"===c||"left"===c,v=0,b=a.queue().length;for(t.effects.createPlaceholder(a),o=a.css(m),u||(u=a["top"===m?"outerHeight":"outerWidth"]()/3),l&&(n={opacity:1},n[m]=o,a.css("opacity",0).css(m,_?2*-u:2*u).animate(n,f,g)),h&&(u/=Math.pow(2,d-1)),n={},n[m]=o;d>v;v++)s={},s[m]=(_?"-=":"+=")+u,a.animate(s,f,g).animate(n,f,g),u=h?2*u:u/2;h&&(s={opacity:0},s[m]=(_?"-=":"+=")+u,a.animate(s,f,g)),a.queue(i),t.effects.unshift(a,b,p+1)}),t.effects.define("clip","hide",function(e,i){var s,n={},o=t(this),a=e.direction||"vertical",r="both"===a,h=r||"horizontal"===a,l=r||"vertical"===a;s=o.cssClip(),n.clip={top:l?(s.bottom-s.top)/2:s.top,right:h?(s.right-s.left)/2:s.right,bottom:l?(s.bottom-s.top)/2:s.bottom,left:h?(s.right-s.left)/2:s.left},t.effects.createPlaceholder(o),"show"===e.mode&&(o.cssClip(n.clip),n.clip=s),o.animate(n,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("drop","hide",function(e,i){var s,n=t(this),o=e.mode,a="show"===o,r=e.direction||"left",h="up"===r||"down"===r?"top":"left",l="up"===r||"left"===r?"-=":"+=",c="+="===l?"-=":"+=",u={opacity:0};t.effects.createPlaceholder(n),s=e.distance||n["top"===h?"outerHeight":"outerWidth"](!0)/2,u[h]=l+s,a&&(n.css(u),u[h]=c+s,u.opacity=1),n.animate(u,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("explode","hide",function(e,i){function s(){b.push(this),b.length===u*d&&n()}function n(){p.css({visibility:"visible"}),t(b).remove(),i()}var o,a,r,h,l,c,u=e.pieces?Math.round(Math.sqrt(e.pieces)):3,d=u,p=t(this),f=e.mode,g="show"===f,m=p.show().css("visibility","hidden").offset(),_=Math.ceil(p.outerWidth()/d),v=Math.ceil(p.outerHeight()/u),b=[];for(o=0;u>o;o++)for(h=m.top+o*v,c=o-(u-1)/2,a=0;d>a;a++)r=m.left+a*_,l=a-(d-1)/2,p.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-a*_,top:-o*v}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:_,height:v,left:r+(g?l*_:0),top:h+(g?c*v:0),opacity:g?0:1}).animate({left:r+(g?0:l*_),top:h+(g?0:c*v),opacity:g?1:0},e.duration||500,e.easing,s)}),t.effects.define("fade","toggle",function(e,i){var s="show"===e.mode;t(this).css("opacity",s?0:1).animate({opacity:s?1:0},{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("fold","hide",function(e,i){var s=t(this),n=e.mode,o="show"===n,a="hide"===n,r=e.size||15,h=/([0-9]+)%/.exec(r),l=!!e.horizFirst,c=l?["right","bottom"]:["bottom","right"],u=e.duration/2,d=t.effects.createPlaceholder(s),p=s.cssClip(),f={clip:t.extend({},p)},g={clip:t.extend({},p)},m=[p[c[0]],p[c[1]]],_=s.queue().length;h&&(r=parseInt(h[1],10)/100*m[a?0:1]),f.clip[c[0]]=r,g.clip[c[0]]=r,g.clip[c[1]]=0,o&&(s.cssClip(g.clip),d&&d.css(t.effects.clipToBox(g)),g.clip=p),s.queue(function(i){d&&d.animate(t.effects.clipToBox(f),u,e.easing).animate(t.effects.clipToBox(g),u,e.easing),i()}).animate(f,u,e.easing).animate(g,u,e.easing).queue(i),t.effects.unshift(s,_,4)}),t.effects.define("highlight","show",function(e,i){var s=t(this),n={backgroundColor:s.css("backgroundColor")};"hide"===e.mode&&(n.opacity=0),t.effects.saveStyle(s),s.css({backgroundImage:"none",backgroundColor:e.color||"#ffff99"}).animate(n,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("size",function(e,i){var s,n,o,a=t(this),r=["fontSize"],h=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],l=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],c=e.mode,u="effect"!==c,d=e.scale||"both",p=e.origin||["middle","center"],f=a.css("position"),g=a.position(),m=t.effects.scaledDimensions(a),_=e.from||m,v=e.to||t.effects.scaledDimensions(a,0);t.effects.createPlaceholder(a),"show"===c&&(o=_,_=v,v=o),n={from:{y:_.height/m.height,x:_.width/m.width},to:{y:v.height/m.height,x:v.width/m.width}},("box"===d||"both"===d)&&(n.from.y!==n.to.y&&(_=t.effects.setTransition(a,h,n.from.y,_),v=t.effects.setTransition(a,h,n.to.y,v)),n.from.x!==n.to.x&&(_=t.effects.setTransition(a,l,n.from.x,_),v=t.effects.setTransition(a,l,n.to.x,v))),("content"===d||"both"===d)&&n.from.y!==n.to.y&&(_=t.effects.setTransition(a,r,n.from.y,_),v=t.effects.setTransition(a,r,n.to.y,v)),p&&(s=t.effects.getBaseline(p,m),_.top=(m.outerHeight-_.outerHeight)*s.y+g.top,_.left=(m.outerWidth-_.outerWidth)*s.x+g.left,v.top=(m.outerHeight-v.outerHeight)*s.y+g.top,v.left=(m.outerWidth-v.outerWidth)*s.x+g.left),a.css(_),("content"===d||"both"===d)&&(h=h.concat(["marginTop","marginBottom"]).concat(r),l=l.concat(["marginLeft","marginRight"]),a.find("*[width]").each(function(){var i=t(this),s=t.effects.scaledDimensions(i),o={height:s.height*n.from.y,width:s.width*n.from.x,outerHeight:s.outerHeight*n.from.y,outerWidth:s.outerWidth*n.from.x},a={height:s.height*n.to.y,width:s.width*n.to.x,outerHeight:s.height*n.to.y,outerWidth:s.width*n.to.x};n.from.y!==n.to.y&&(o=t.effects.setTransition(i,h,n.from.y,o),a=t.effects.setTransition(i,h,n.to.y,a)),n.from.x!==n.to.x&&(o=t.effects.setTransition(i,l,n.from.x,o),a=t.effects.setTransition(i,l,n.to.x,a)),u&&t.effects.saveStyle(i),i.css(o),i.animate(a,e.duration,e.easing,function(){u&&t.effects.restoreStyle(i)})})),a.animate(v,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){var e=a.offset();0===v.opacity&&a.css("opacity",_.opacity),u||(a.css("position","static"===f?"relative":f).offset(e),t.effects.saveStyle(a)),i()}})}),t.effects.define("scale",function(e,i){var s=t(this),n=e.mode,o=parseInt(e.percent,10)||(0===parseInt(e.percent,10)?0:"effect"!==n?0:100),a=t.extend(!0,{from:t.effects.scaledDimensions(s),to:t.effects.scaledDimensions(s,o,e.direction||"both"),origin:e.origin||["middle","center"]},e);e.fade&&(a.from.opacity=1,a.to.opacity=0),t.effects.effect.size.call(this,a,i)}),t.effects.define("puff","hide",function(e,i){var s=t.extend(!0,{},e,{fade:!0,percent:parseInt(e.percent,10)||150});t.effects.effect.scale.call(this,s,i)}),t.effects.define("pulsate","show",function(e,i){var s=t(this),n=e.mode,o="show"===n,a="hide"===n,r=o||a,h=2*(e.times||5)+(r?1:0),l=e.duration/h,c=0,u=1,d=s.queue().length;for((o||!s.is(":visible"))&&(s.css("opacity",0).show(),c=1);h>u;u++)s.animate({opacity:c},l,e.easing),c=1-c;s.animate({opacity:c},l,e.easing),s.queue(i),t.effects.unshift(s,d,h+1)}),t.effects.define("shake",function(e,i){var s=1,n=t(this),o=e.direction||"left",a=e.distance||20,r=e.times||3,h=2*r+1,l=Math.round(e.duration/h),c="up"===o||"down"===o?"top":"left",u="up"===o||"left"===o,d={},p={},f={},g=n.queue().length;for(t.effects.createPlaceholder(n),d[c]=(u?"-=":"+=")+a,p[c]=(u?"+=":"-=")+2*a,f[c]=(u?"-=":"+=")+2*a,n.animate(d,l,e.easing);r>s;s++)n.animate(p,l,e.easing).animate(f,l,e.easing);n.animate(p,l,e.easing).animate(d,l/2,e.easing).queue(i),t.effects.unshift(n,g,h+1)}),t.effects.define("slide","show",function(e,i){var s,n,o=t(this),a={up:["bottom","top"],down:["top","bottom"],left:["right","left"],right:["left","right"]},r=e.mode,h=e.direction||"left",l="up"===h||"down"===h?"top":"left",c="up"===h||"left"===h,u=e.distance||o["top"===l?"outerHeight":"outerWidth"](!0),d={};t.effects.createPlaceholder(o),s=o.cssClip(),n=o.position()[l],d[l]=(c?-1:1)*u+n,d.clip=o.cssClip(),d.clip[a[h][1]]=d.clip[a[h][0]],"show"===r&&(o.cssClip(d.clip),o.css(l,d[l]),d.clip=s,d[l]=n),o.animate(d,{queue:!1,duration:e.duration,easing:e.easing,complete:i})});var f;t.uiBackCompat!==!1&&(f=t.effects.define("transfer",function(e,i){t(this).transfer(e,i)})),t.ui.focusable=function(i,s){var n,o,a,r,h,l=i.nodeName.toLowerCase();return"area"===l?(n=i.parentNode,o=n.name,i.href&&o&&"map"===n.nodeName.toLowerCase()?(a=t("img[usemap='#"+o+"']"),a.length>0&&a.is(":visible")):!1):(/^(input|select|textarea|button|object)$/.test(l)?(r=!i.disabled,r&&(h=t(i).closest("fieldset")[0],h&&(r=!h.disabled))):r="a"===l?i.href||s:s,r&&t(i).is(":visible")&&e(t(i)))},t.extend(t.expr[":"],{focusable:function(e){return t.ui.focusable(e,null!=t.attr(e,"tabindex"))}}),t.ui.focusable,t.fn.form=function(){return"string"==typeof this[0].form?this.closest("form"):t(this[0].form)},t.ui.formResetMixin={_formResetHandler:function(){var e=t(this);setTimeout(function(){var i=e.data("ui-form-reset-instances");t.each(i,function(){this.refresh()})})},_bindFormResetHandler:function(){if(this.form=this.element.form(),this.form.length){var t=this.form.data("ui-form-reset-instances")||[];t.length||this.form.on("reset.ui-form-reset",this._formResetHandler),t.push(this),this.form.data("ui-form-reset-instances",t)}},_unbindFormResetHandler:function(){if(this.form.length){var e=this.form.data("ui-form-reset-instances");e.splice(t.inArray(this,e),1),e.length?this.form.data("ui-form-reset-instances",e):this.form.removeData("ui-form-reset-instances").off("reset.ui-form-reset")}}},"1.7"===t.fn.jquery.substring(0,3)&&(t.each(["Width","Height"],function(e,i){function s(e,i,s,o){return t.each(n,function(){i-=parseFloat(t.css(e,"padding"+this))||0,s&&(i-=parseFloat(t.css(e,"border"+this+"Width"))||0),o&&(i-=parseFloat(t.css(e,"margin"+this))||0)}),i}var n="Width"===i?["Left","Right"]:["Top","Bottom"],o=i.toLowerCase(),a={innerWidth:t.fn.innerWidth,innerHeight:t.fn.innerHeight,outerWidth:t.fn.outerWidth,outerHeight:t.fn.outerHeight};t.fn["inner"+i]=function(e){return void 0===e?a["inner"+i].call(this):this.each(function(){t(this).css(o,s(this,e)+"px")})},t.fn["outer"+i]=function(e,n){return"number"!=typeof e?a["outer"+i].call(this,e):this.each(function(){t(this).css(o,s(this,e,!0,n)+"px")})}}),t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38},t.ui.escapeSelector=function(){var t=/([!"#$%&'()*+,./:;<=>?@[\]^`{|}~])/g;return function(e){return e.replace(t,"\\$1")}}(),t.fn.labels=function(){var e,i,s,n,o;return this[0].labels&&this[0].labels.length?this.pushStack(this[0].labels):(n=this.eq(0).parents("label"),s=this.attr("id"),s&&(e=this.eq(0).parents().last(),o=e.add(e.length?e.siblings():this.siblings()),i="label[for='"+t.ui.escapeSelector(s)+"']",n=n.add(o.find(i).addBack(i))),this.pushStack(n))},t.fn.scrollParent=function(e){var i=this.css("position"),s="absolute"===i,n=e?/(auto|scroll|hidden)/:/(auto|scroll)/,o=this.parents().filter(function(){var e=t(this);return s&&"static"===e.css("position")?!1:n.test(e.css("overflow")+e.css("overflow-y")+e.css("overflow-x"))}).eq(0);return"fixed"!==i&&o.length?o:t(this[0].ownerDocument||document)},t.extend(t.expr[":"],{tabbable:function(e){var i=t.attr(e,"tabindex"),s=null!=i;return(!s||i>=0)&&t.ui.focusable(e,s)}}),t.fn.extend({uniqueId:function(){var t=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++t)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&t(this).removeAttr("id")})}}),t.widget("ui.accordion",{version:"1.12.1",options:{active:0,animate:{},classes:{"ui-accordion-header":"ui-corner-top","ui-accordion-header-collapsed":"ui-corner-all","ui-accordion-content":"ui-corner-bottom"},collapsible:!1,event:"click",header:"> li > :first-child, > :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var e=this.options;this.prevShow=this.prevHide=t(),this._addClass("ui-accordion","ui-widget ui-helper-reset"),this.element.attr("role","tablist"),e.collapsible||e.active!==!1&&null!=e.active||(e.active=0),this._processPanels(),0>e.active&&(e.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():t()}},_createIcons:function(){var e,i,s=this.options.icons;s&&(e=t("<span>"),this._addClass(e,"ui-accordion-header-icon","ui-icon "+s.header),e.prependTo(this.headers),i=this.active.children(".ui-accordion-header-icon"),this._removeClass(i,s.header)._addClass(i,null,s.activeHeader)._addClass(this.headers,"ui-accordion-icons"))},_destroyIcons:function(){this._removeClass(this.headers,"ui-accordion-icons"),this.headers.children(".ui-accordion-header-icon").remove()},_destroy:function(){var t;this.element.removeAttr("role"),this.headers.removeAttr("role aria-expanded aria-selected aria-controls tabIndex").removeUniqueId(),this._destroyIcons(),t=this.headers.next().css("display","").removeAttr("role aria-hidden aria-labelledby").removeUniqueId(),"content"!==this.options.heightStyle&&t.css("height","")},_setOption:function(t,e){return"active"===t?(this._activate(e),void 0):("event"===t&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(e)),this._super(t,e),"collapsible"!==t||e||this.options.active!==!1||this._activate(0),"icons"===t&&(this._destroyIcons(),e&&this._createIcons()),void 0)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t),this._toggleClass(this.headers.add(this.headers.next()),null,"ui-state-disabled",!!t)},_keydown:function(e){if(!e.altKey&&!e.ctrlKey){var i=t.ui.keyCode,s=this.headers.length,n=this.headers.index(e.target),o=!1;switch(e.keyCode){case i.RIGHT:case i.DOWN:o=this.headers[(n+1)%s];break;case i.LEFT:case i.UP:o=this.headers[(n-1+s)%s];break;case i.SPACE:case i.ENTER:this._eventHandler(e);break;case i.HOME:o=this.headers[0];break;case i.END:o=this.headers[s-1]}o&&(t(e.target).attr("tabIndex",-1),t(o).attr("tabIndex",0),t(o).trigger("focus"),e.preventDefault())}},_panelKeyDown:function(e){e.keyCode===t.ui.keyCode.UP&&e.ctrlKey&&t(e.currentTarget).prev().trigger("focus")},refresh:function(){var e=this.options;this._processPanels(),e.active===!1&&e.collapsible===!0||!this.headers.length?(e.active=!1,this.active=t()):e.active===!1?this._activate(0):this.active.length&&!t.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(e.active=!1,this.active=t()):this._activate(Math.max(0,e.active-1)):e.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var t=this.headers,e=this.panels;this.headers=this.element.find(this.options.header),this._addClass(this.headers,"ui-accordion-header ui-accordion-header-collapsed","ui-state-default"),this.panels=this.headers.next().filter(":not(.ui-accordion-content-active)").hide(),this._addClass(this.panels,"ui-accordion-content","ui-helper-reset ui-widget-content"),e&&(this._off(t.not(this.headers)),this._off(e.not(this.panels)))},_refresh:function(){var e,i=this.options,s=i.heightStyle,n=this.element.parent();this.active=this._findActive(i.active),this._addClass(this.active,"ui-accordion-header-active","ui-state-active")._removeClass(this.active,"ui-accordion-header-collapsed"),this._addClass(this.active.next(),"ui-accordion-content-active"),this.active.next().show(),this.headers.attr("role","tab").each(function(){var e=t(this),i=e.uniqueId().attr("id"),s=e.next(),n=s.uniqueId().attr("id");e.attr("aria-controls",n),s.attr("aria-labelledby",i)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(i.event),"fill"===s?(e=n.height(),this.element.siblings(":visible").each(function(){var i=t(this),s=i.css("position");"absolute"!==s&&"fixed"!==s&&(e-=i.outerHeight(!0))}),this.headers.each(function(){e-=t(this).outerHeight(!0)}),this.headers.next().each(function(){t(this).height(Math.max(0,e-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===s&&(e=0,this.headers.next().each(function(){var i=t(this).is(":visible");i||t(this).show(),e=Math.max(e,t(this).css("height","").height()),i||t(this).hide()}).height(e))},_activate:function(e){var i=this._findActive(e)[0];i!==this.active[0]&&(i=i||this.active[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return"number"==typeof e?this.headers.eq(e):t()},_setupEvents:function(e){var i={keydown:"_keydown"};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(e){var i,s,n=this.options,o=this.active,a=t(e.currentTarget),r=a[0]===o[0],h=r&&n.collapsible,l=h?t():a.next(),c=o.next(),u={oldHeader:o,oldPanel:c,newHeader:h?t():a,newPanel:l};e.preventDefault(),r&&!n.collapsible||this._trigger("beforeActivate",e,u)===!1||(n.active=h?!1:this.headers.index(a),this.active=r?t():a,this._toggle(u),this._removeClass(o,"ui-accordion-header-active","ui-state-active"),n.icons&&(i=o.children(".ui-accordion-header-icon"),this._removeClass(i,null,n.icons.activeHeader)._addClass(i,null,n.icons.header)),r||(this._removeClass(a,"ui-accordion-header-collapsed")._addClass(a,"ui-accordion-header-active","ui-state-active"),n.icons&&(s=a.children(".ui-accordion-header-icon"),this._removeClass(s,null,n.icons.header)._addClass(s,null,n.icons.activeHeader)),this._addClass(a.next(),"ui-accordion-content-active")))},_toggle:function(e){var i=e.newPanel,s=this.prevShow.length?this.prevShow:e.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=i,this.prevHide=s,this.options.animate?this._animate(i,s,e):(s.hide(),i.show(),this._toggleComplete(e)),s.attr({"aria-hidden":"true"}),s.prev().attr({"aria-selected":"false","aria-expanded":"false"}),i.length&&s.length?s.prev().attr({tabIndex:-1,"aria-expanded":"false"}):i.length&&this.headers.filter(function(){return 0===parseInt(t(this).attr("tabIndex"),10)}).attr("tabIndex",-1),i.attr("aria-hidden","false").prev().attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_animate:function(t,e,i){var s,n,o,a=this,r=0,h=t.css("box-sizing"),l=t.length&&(!e.length||t.index()<e.index()),c=this.options.animate||{},u=l&&c.down||c,d=function(){a._toggleComplete(i)};return"number"==typeof u&&(o=u),"string"==typeof u&&(n=u),n=n||u.easing||c.easing,o=o||u.duration||c.duration,e.length?t.length?(s=t.show().outerHeight(),e.animate(this.hideProps,{duration:o,easing:n,step:function(t,e){e.now=Math.round(t)}}),t.hide().animate(this.showProps,{duration:o,easing:n,complete:d,step:function(t,i){i.now=Math.round(t),"height"!==i.prop?"content-box"===h&&(r+=i.now):"content"!==a.options.heightStyle&&(i.now=Math.round(s-e.outerHeight()-r),r=0)}}),void 0):e.animate(this.hideProps,o,n,d):t.animate(this.showProps,o,n,d)},_toggleComplete:function(t){var e=t.oldPanel,i=e.prev();this._removeClass(e,"ui-accordion-content-active"),this._removeClass(i,"ui-accordion-header-active")._addClass(i,"ui-accordion-header-collapsed"),e.length&&(e.parent()[0].className=e.parent()[0].className),this._trigger("activate",null,t)}}),t.ui.safeActiveElement=function(t){var e;try{e=t.activeElement}catch(i){e=t.body}return e||(e=t.body),e.nodeName||(e=t.body),e},t.widget("ui.menu",{version:"1.12.1",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-caret-1-e"},items:"> *",menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().attr({role:this.options.role,tabIndex:0}),this._addClass("ui-menu","ui-widget ui-widget-content"),this._on({"mousedown .ui-menu-item":function(t){t.preventDefault()},"click .ui-menu-item":function(e){var i=t(e.target),s=t(t.ui.safeActiveElement(this.document[0]));!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(e),e.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(e):!this.element.is(":focus")&&s.closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(e){if(!this.previousFilter){var i=t(e.target).closest(".ui-menu-item"),s=t(e.currentTarget);i[0]===s[0]&&(this._removeClass(s.siblings().children(".ui-state-active"),null,"ui-state-active"),this.focus(e,s))}},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this.element.find(this.options.items).eq(0);e||this.focus(t,i)},blur:function(e){this._delay(function(){var i=!t.contains(this.element[0],t.ui.safeActiveElement(this.document[0]));i&&this.collapseAll(e)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){this._closeOnDocumentClick(t)&&this.collapseAll(t),this.mouseHandled=!1}})},_destroy:function(){var e=this.element.find(".ui-menu-item").removeAttr("role aria-disabled"),i=e.children(".ui-menu-item-wrapper").removeUniqueId().removeAttr("tabIndex role aria-haspopup");this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeAttr("role aria-labelledby aria-expanded aria-hidden aria-disabled tabIndex").removeUniqueId().show(),i.children().each(function(){var e=t(this);e.data("ui-menu-submenu-caret")&&e.remove()})},_keydown:function(e){var i,s,n,o,a=!0;switch(e.keyCode){case t.ui.keyCode.PAGE_UP:this.previousPage(e);break;case t.ui.keyCode.PAGE_DOWN:this.nextPage(e);break;case t.ui.keyCode.HOME:this._move("first","first",e);break;case t.ui.keyCode.END:this._move("last","last",e);break;case t.ui.keyCode.UP:this.previous(e);break;case t.ui.keyCode.DOWN:this.next(e);break;case t.ui.keyCode.LEFT:this.collapse(e);break;case t.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(e);break;case t.ui.keyCode.ENTER:case t.ui.keyCode.SPACE:this._activate(e);break;case t.ui.keyCode.ESCAPE:this.collapse(e);break;default:a=!1,s=this.previousFilter||"",o=!1,n=e.keyCode>=96&&105>=e.keyCode?""+(e.keyCode-96):String.fromCharCode(e.keyCode),clearTimeout(this.filterTimer),n===s?o=!0:n=s+n,i=this._filterMenuItems(n),i=o&&-1!==i.index(this.active.next())?this.active.nextAll(".ui-menu-item"):i,i.length||(n=String.fromCharCode(e.keyCode),i=this._filterMenuItems(n)),i.length?(this.focus(e,i),this.previousFilter=n,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}a&&e.preventDefault()},_activate:function(t){this.active&&!this.active.is(".ui-state-disabled")&&(this.active.children("[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var e,i,s,n,o,a=this,r=this.options.icons.submenu,h=this.element.find(this.options.menus);this._toggleClass("ui-menu-icons",null,!!this.element.find(".ui-icon").length),s=h.filter(":not(.ui-menu)").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var e=t(this),i=e.prev(),s=t("<span>").data("ui-menu-submenu-caret",!0);a._addClass(s,"ui-menu-icon","ui-icon "+r),i.attr("aria-haspopup","true").prepend(s),e.attr("aria-labelledby",i.attr("id"))}),this._addClass(s,"ui-menu","ui-widget ui-widget-content ui-front"),e=h.add(this.element),i=e.find(this.options.items),i.not(".ui-menu-item").each(function(){var e=t(this);a._isDivider(e)&&a._addClass(e,"ui-menu-divider","ui-widget-content")}),n=i.not(".ui-menu-item, .ui-menu-divider"),o=n.children().not(".ui-menu").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),this._addClass(n,"ui-menu-item")._addClass(o,"ui-menu-item-wrapper"),i.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!t.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){if("icons"===t){var i=this.element.find(".ui-menu-icon");this._removeClass(i,null,this.options.icons.submenu)._addClass(i,null,e.submenu)}this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t+""),this._toggleClass(null,"ui-state-disabled",!!t)},focus:function(t,e){var i,s,n;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),s=this.active.children(".ui-menu-item-wrapper"),this._addClass(s,null,"ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),n=this.active.parent().closest(".ui-menu-item").children(".ui-menu-item-wrapper"),this._addClass(n,null,"ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=e.children(".ui-menu"),i.length&&t&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(e){var i,s,n,o,a,r;this._hasScroll()&&(i=parseFloat(t.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(t.css(this.activeMenu[0],"paddingTop"))||0,n=e.offset().top-this.activeMenu.offset().top-i-s,o=this.activeMenu.scrollTop(),a=this.activeMenu.height(),r=e.outerHeight(),0>n?this.activeMenu.scrollTop(o+n):n+r>a&&this.activeMenu.scrollTop(o+n-a+r))},blur:function(t,e){e||clearTimeout(this.timer),this.active&&(this._removeClass(this.active.children(".ui-menu-item-wrapper"),null,"ui-state-active"),this._trigger("blur",t,{item:this.active}),this.active=null)},_startOpening:function(t){clearTimeout(this.timer),"true"===t.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(t)},this.delay))},_open:function(e){var i=t.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(e.parents(".ui-menu")).hide().attr("aria-hidden","true"),e.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(e,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:t(e&&e.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(e),this._removeClass(s.find(".ui-state-active"),null,"ui-state-active"),this.activeMenu=s},this.delay)},_close:function(t){t||(t=this.active?this.active.parent():this.element),t.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false")},_closeOnDocumentClick:function(e){return!t(e.target).closest(".ui-menu").length},_isDivider:function(t){return!/[^\-\u2014\u2013\s]/.test(t.text())},collapse:function(t){var e=this.active&&this.active.parent().closest(".ui-menu-item",this.element);e&&e.length&&(this._close(),this.focus(t,e))},expand:function(t){var e=this.active&&this.active.children(".ui-menu ").find(this.options.items).first();e&&e.length&&(this._open(e.parent()),this._delay(function(){this.focus(t,e)}))},next:function(t){this._move("next","first",t)},previous:function(t){this._move("prev","last",t)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(t,e,i){var s;this.active&&(s="first"===t||"last"===t?this.active["first"===t?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[t+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.find(this.options.items)[e]()),this.focus(i,s)},nextPage:function(e){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=t(this),0>i.offset().top-s-n}),this.focus(e,i)):this.focus(e,this.activeMenu.find(this.options.items)[this.active?"last":"first"]())),void 0):(this.next(e),void 0)},previousPage:function(e){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=t(this),i.offset().top-s+n>0}),this.focus(e,i)):this.focus(e,this.activeMenu.find(this.options.items).first())),void 0):(this.next(e),void 0)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(e){this.active=this.active||t(e.target).closest(".ui-menu-item");var i={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(e,!0),this._trigger("select",e,i)},_filterMenuItems:function(e){var i=e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&"),s=RegExp("^"+i,"i");return this.activeMenu.find(this.options.items).filter(".ui-menu-item").filter(function(){return s.test(t.trim(t(this).children(".ui-menu-item-wrapper").text()))})}}),t.widget("ui.autocomplete",{version:"1.12.1",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var e,i,s,n=this.element[0].nodeName.toLowerCase(),o="textarea"===n,a="input"===n;
+this.isMultiLine=o||!a&&this._isContentEditable(this.element),this.valueMethod=this.element[o||a?"val":"text"],this.isNewMenu=!0,this._addClass("ui-autocomplete-input"),this.element.attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return e=!0,s=!0,i=!0,void 0;e=!1,s=!1,i=!1;var o=t.ui.keyCode;switch(n.keyCode){case o.PAGE_UP:e=!0,this._move("previousPage",n);break;case o.PAGE_DOWN:e=!0,this._move("nextPage",n);break;case o.UP:e=!0,this._keyEvent("previous",n);break;case o.DOWN:e=!0,this._keyEvent("next",n);break;case o.ENTER:this.menu.active&&(e=!0,n.preventDefault(),this.menu.select(n));break;case o.TAB:this.menu.active&&this.menu.select(n);break;case o.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(e)return e=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),void 0;if(!i){var n=t.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(t){return s?(s=!1,t.preventDefault(),void 0):(this._searchTimeout(t),void 0)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(clearTimeout(this.searching),this.close(t),this._change(t),void 0)}}),this._initSource(),this.menu=t("<ul>").appendTo(this._appendTo()).menu({role:null}).hide().menu("instance"),this._addClass(this.menu.element,"ui-autocomplete","ui-front"),this._on(this.menu.element,{mousedown:function(e){e.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,this.element[0]!==t.ui.safeActiveElement(this.document[0])&&this.element.trigger("focus")})},menufocus:function(e,i){var s,n;return this.isNewMenu&&(this.isNewMenu=!1,e.originalEvent&&/^mouse/.test(e.originalEvent.type))?(this.menu.blur(),this.document.one("mousemove",function(){t(e.target).trigger(e.originalEvent)}),void 0):(n=i.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",e,{item:n})&&e.originalEvent&&/^key/.test(e.originalEvent.type)&&this._value(n.value),s=i.item.attr("aria-label")||n.value,s&&t.trim(s).length&&(this.liveRegion.children().hide(),t("<div>").text(s).appendTo(this.liveRegion)),void 0)},menuselect:function(e,i){var s=i.item.data("ui-autocomplete-item"),n=this.previous;this.element[0]!==t.ui.safeActiveElement(this.document[0])&&(this.element.trigger("focus"),this.previous=n,this._delay(function(){this.previous=n,this.selectedItem=s})),!1!==this._trigger("select",e,{item:s})&&this._value(s.value),this.term=this._value(),this.close(e),this.selectedItem=s}}),this.liveRegion=t("<div>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(t,e){this._super(t,e),"source"===t&&this._initSource(),"appendTo"===t&&this.menu.element.appendTo(this._appendTo()),"disabled"===t&&e&&this.xhr&&this.xhr.abort()},_isEventTargetInWidget:function(e){var i=this.menu.element[0];return e.target===this.element[0]||e.target===i||t.contains(i,e.target)},_closeOnClickOutside:function(t){this._isEventTargetInWidget(t)||this.close()},_appendTo:function(){var e=this.options.appendTo;return e&&(e=e.jquery||e.nodeType?t(e):this.document.find(e).eq(0)),e&&e[0]||(e=this.element.closest(".ui-front, dialog")),e.length||(e=this.document[0].body),e},_initSource:function(){var e,i,s=this;t.isArray(this.options.source)?(e=this.options.source,this.source=function(i,s){s(t.ui.autocomplete.filter(e,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(e,n){s.xhr&&s.xhr.abort(),s.xhr=t.ajax({url:i,data:e,dataType:"json",success:function(t){n(t)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(t){clearTimeout(this.searching),this.searching=this._delay(function(){var e=this.term===this._value(),i=this.menu.element.is(":visible"),s=t.altKey||t.ctrlKey||t.metaKey||t.shiftKey;(!e||e&&!i&&!s)&&(this.selectedItem=null,this.search(null,t))},this.options.delay)},search:function(t,e){return t=null!=t?t:this._value(),this.term=this._value(),t.length<this.options.minLength?this.close(e):this._trigger("search",e)!==!1?this._search(t):void 0},_search:function(t){this.pending++,this._addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:t},this._response())},_response:function(){var e=++this.requestIndex;return t.proxy(function(t){e===this.requestIndex&&this.__response(t),this.pending--,this.pending||this._removeClass("ui-autocomplete-loading")},this)},__response:function(t){t&&(t=this._normalize(t)),this._trigger("response",null,{content:t}),!this.options.disabled&&t&&t.length&&!this.cancelSearch?(this._suggest(t),this._trigger("open")):this._close()},close:function(t){this.cancelSearch=!0,this._close(t)},_close:function(t){this._off(this.document,"mousedown"),this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",t))},_change:function(t){this.previous!==this._value()&&this._trigger("change",t,{item:this.selectedItem})},_normalize:function(e){return e.length&&e[0].label&&e[0].value?e:t.map(e,function(e){return"string"==typeof e?{label:e,value:e}:t.extend({},e,{label:e.label||e.value,value:e.value||e.label})})},_suggest:function(e){var i=this.menu.element.empty();this._renderMenu(i,e),this.isNewMenu=!0,this.menu.refresh(),i.show(),this._resizeMenu(),i.position(t.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next(),this._on(this.document,{mousedown:"_closeOnClickOutside"})},_resizeMenu:function(){var t=this.menu.element;t.outerWidth(Math.max(t.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(e,i){var s=this;t.each(i,function(t,i){s._renderItemData(e,i)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-autocomplete-item",e)},_renderItem:function(e,i){return t("<li>").append(t("<div>").text(i.label)).appendTo(e)},_move:function(t,e){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(t)||this.menu.isLastItem()&&/^next/.test(t)?(this.isMultiLine||this._value(this.term),this.menu.blur(),void 0):(this.menu[t](e),void 0):(this.search(null,e),void 0)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(t,e){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(t,e),e.preventDefault())},_isContentEditable:function(t){if(!t.length)return!1;var e=t.prop("contentEditable");return"inherit"===e?this._isContentEditable(t.parent()):"true"===e}}),t.extend(t.ui.autocomplete,{escapeRegex:function(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(e,i){var s=RegExp(t.ui.autocomplete.escapeRegex(i),"i");return t.grep(e,function(t){return s.test(t.label||t.value||t)})}}),t.widget("ui.autocomplete",t.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(t){return t+(t>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(e){var i;this._superApply(arguments),this.options.disabled||this.cancelSearch||(i=e&&e.length?this.options.messages.results(e.length):this.options.messages.noResults,this.liveRegion.children().hide(),t("<div>").text(i).appendTo(this.liveRegion))}}),t.ui.autocomplete;var g=/ui-corner-([a-z]){2,6}/g;t.widget("ui.controlgroup",{version:"1.12.1",defaultElement:"<div>",options:{direction:"horizontal",disabled:null,onlyVisible:!0,items:{button:"input[type=button], input[type=submit], input[type=reset], button, a",controlgroupLabel:".ui-controlgroup-label",checkboxradio:"input[type='checkbox'], input[type='radio']",selectmenu:"select",spinner:".ui-spinner-input"}},_create:function(){this._enhance()},_enhance:function(){this.element.attr("role","toolbar"),this.refresh()},_destroy:function(){this._callChildMethod("destroy"),this.childWidgets.removeData("ui-controlgroup-data"),this.element.removeAttr("role"),this.options.items.controlgroupLabel&&this.element.find(this.options.items.controlgroupLabel).find(".ui-controlgroup-label-contents").contents().unwrap()},_initWidgets:function(){var e=this,i=[];t.each(this.options.items,function(s,n){var o,a={};return n?"controlgroupLabel"===s?(o=e.element.find(n),o.each(function(){var e=t(this);e.children(".ui-controlgroup-label-contents").length||e.contents().wrapAll("<span class='ui-controlgroup-label-contents'></span>")}),e._addClass(o,null,"ui-widget ui-widget-content ui-state-default"),i=i.concat(o.get()),void 0):(t.fn[s]&&(a=e["_"+s+"Options"]?e["_"+s+"Options"]("middle"):{classes:{}},e.element.find(n).each(function(){var n=t(this),o=n[s]("instance"),r=t.widget.extend({},a);if("button"!==s||!n.parent(".ui-spinner").length){o||(o=n[s]()[s]("instance")),o&&(r.classes=e._resolveClassesValues(r.classes,o)),n[s](r);var h=n[s]("widget");t.data(h[0],"ui-controlgroup-data",o?o:n[s]("instance")),i.push(h[0])}})),void 0):void 0}),this.childWidgets=t(t.unique(i)),this._addClass(this.childWidgets,"ui-controlgroup-item")},_callChildMethod:function(e){this.childWidgets.each(function(){var i=t(this),s=i.data("ui-controlgroup-data");s&&s[e]&&s[e]()})},_updateCornerClass:function(t,e){var i="ui-corner-top ui-corner-bottom ui-corner-left ui-corner-right ui-corner-all",s=this._buildSimpleOptions(e,"label").classes.label;this._removeClass(t,null,i),this._addClass(t,null,s)},_buildSimpleOptions:function(t,e){var i="vertical"===this.options.direction,s={classes:{}};return s.classes[e]={middle:"",first:"ui-corner-"+(i?"top":"left"),last:"ui-corner-"+(i?"bottom":"right"),only:"ui-corner-all"}[t],s},_spinnerOptions:function(t){var e=this._buildSimpleOptions(t,"ui-spinner");return e.classes["ui-spinner-up"]="",e.classes["ui-spinner-down"]="",e},_buttonOptions:function(t){return this._buildSimpleOptions(t,"ui-button")},_checkboxradioOptions:function(t){return this._buildSimpleOptions(t,"ui-checkboxradio-label")},_selectmenuOptions:function(t){var e="vertical"===this.options.direction;return{width:e?"auto":!1,classes:{middle:{"ui-selectmenu-button-open":"","ui-selectmenu-button-closed":""},first:{"ui-selectmenu-button-open":"ui-corner-"+(e?"top":"tl"),"ui-selectmenu-button-closed":"ui-corner-"+(e?"top":"left")},last:{"ui-selectmenu-button-open":e?"":"ui-corner-tr","ui-selectmenu-button-closed":"ui-corner-"+(e?"bottom":"right")},only:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"}}[t]}},_resolveClassesValues:function(e,i){var s={};return t.each(e,function(n){var o=i.options.classes[n]||"";o=t.trim(o.replace(g,"")),s[n]=(o+" "+e[n]).replace(/\s+/g," ")}),s},_setOption:function(t,e){return"direction"===t&&this._removeClass("ui-controlgroup-"+this.options.direction),this._super(t,e),"disabled"===t?(this._callChildMethod(e?"disable":"enable"),void 0):(this.refresh(),void 0)},refresh:function(){var e,i=this;this._addClass("ui-controlgroup ui-controlgroup-"+this.options.direction),"horizontal"===this.options.direction&&this._addClass(null,"ui-helper-clearfix"),this._initWidgets(),e=this.childWidgets,this.options.onlyVisible&&(e=e.filter(":visible")),e.length&&(t.each(["first","last"],function(t,s){var n=e[s]().data("ui-controlgroup-data");if(n&&i["_"+n.widgetName+"Options"]){var o=i["_"+n.widgetName+"Options"](1===e.length?"only":s);o.classes=i._resolveClassesValues(o.classes,n),n.element[n.widgetName](o)}else i._updateCornerClass(e[s](),s)}),this._callChildMethod("refresh"))}}),t.widget("ui.checkboxradio",[t.ui.formResetMixin,{version:"1.12.1",options:{disabled:null,label:null,icon:!0,classes:{"ui-checkboxradio-label":"ui-corner-all","ui-checkboxradio-icon":"ui-corner-all"}},_getCreateOptions:function(){var e,i,s=this,n=this._super()||{};return this._readType(),i=this.element.labels(),this.label=t(i[i.length-1]),this.label.length||t.error("No label found for checkboxradio widget"),this.originalLabel="",this.label.contents().not(this.element[0]).each(function(){s.originalLabel+=3===this.nodeType?t(this).text():this.outerHTML}),this.originalLabel&&(n.label=this.originalLabel),e=this.element[0].disabled,null!=e&&(n.disabled=e),n},_create:function(){var t=this.element[0].checked;this._bindFormResetHandler(),null==this.options.disabled&&(this.options.disabled=this.element[0].disabled),this._setOption("disabled",this.options.disabled),this._addClass("ui-checkboxradio","ui-helper-hidden-accessible"),this._addClass(this.label,"ui-checkboxradio-label","ui-button ui-widget"),"radio"===this.type&&this._addClass(this.label,"ui-checkboxradio-radio-label"),this.options.label&&this.options.label!==this.originalLabel?this._updateLabel():this.originalLabel&&(this.options.label=this.originalLabel),this._enhance(),t&&(this._addClass(this.label,"ui-checkboxradio-checked","ui-state-active"),this.icon&&this._addClass(this.icon,null,"ui-state-hover")),this._on({change:"_toggleClasses",focus:function(){this._addClass(this.label,null,"ui-state-focus ui-visual-focus")},blur:function(){this._removeClass(this.label,null,"ui-state-focus ui-visual-focus")}})},_readType:function(){var e=this.element[0].nodeName.toLowerCase();this.type=this.element[0].type,"input"===e&&/radio|checkbox/.test(this.type)||t.error("Can't create checkboxradio on element.nodeName="+e+" and element.type="+this.type)},_enhance:function(){this._updateIcon(this.element[0].checked)},widget:function(){return this.label},_getRadioGroup:function(){var e,i=this.element[0].name,s="input[name='"+t.ui.escapeSelector(i)+"']";return i?(e=this.form.length?t(this.form[0].elements).filter(s):t(s).filter(function(){return 0===t(this).form().length}),e.not(this.element)):t([])},_toggleClasses:function(){var e=this.element[0].checked;this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",e),this.options.icon&&"checkbox"===this.type&&this._toggleClass(this.icon,null,"ui-icon-check ui-state-checked",e)._toggleClass(this.icon,null,"ui-icon-blank",!e),"radio"===this.type&&this._getRadioGroup().each(function(){var e=t(this).checkboxradio("instance");e&&e._removeClass(e.label,"ui-checkboxradio-checked","ui-state-active")})},_destroy:function(){this._unbindFormResetHandler(),this.icon&&(this.icon.remove(),this.iconSpace.remove())},_setOption:function(t,e){return"label"!==t||e?(this._super(t,e),"disabled"===t?(this._toggleClass(this.label,null,"ui-state-disabled",e),this.element[0].disabled=e,void 0):(this.refresh(),void 0)):void 0},_updateIcon:function(e){var i="ui-icon ui-icon-background ";this.options.icon?(this.icon||(this.icon=t("<span>"),this.iconSpace=t("<span> </span>"),this._addClass(this.iconSpace,"ui-checkboxradio-icon-space")),"checkbox"===this.type?(i+=e?"ui-icon-check ui-state-checked":"ui-icon-blank",this._removeClass(this.icon,null,e?"ui-icon-blank":"ui-icon-check")):i+="ui-icon-blank",this._addClass(this.icon,"ui-checkboxradio-icon",i),e||this._removeClass(this.icon,null,"ui-icon-check ui-state-checked"),this.icon.prependTo(this.label).after(this.iconSpace)):void 0!==this.icon&&(this.icon.remove(),this.iconSpace.remove(),delete this.icon)},_updateLabel:function(){var t=this.label.contents().not(this.element[0]);this.icon&&(t=t.not(this.icon[0])),this.iconSpace&&(t=t.not(this.iconSpace[0])),t.remove(),this.label.append(this.options.label)},refresh:function(){var t=this.element[0].checked,e=this.element[0].disabled;this._updateIcon(t),this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",t),null!==this.options.label&&this._updateLabel(),e!==this.options.disabled&&this._setOptions({disabled:e})}}]),t.ui.checkboxradio,t.widget("ui.button",{version:"1.12.1",defaultElement:"<button>",options:{classes:{"ui-button":"ui-corner-all"},disabled:null,icon:null,iconPosition:"beginning",label:null,showLabel:!0},_getCreateOptions:function(){var t,e=this._super()||{};return this.isInput=this.element.is("input"),t=this.element[0].disabled,null!=t&&(e.disabled=t),this.originalLabel=this.isInput?this.element.val():this.element.html(),this.originalLabel&&(e.label=this.originalLabel),e},_create:function(){!this.option.showLabel&!this.options.icon&&(this.options.showLabel=!0),null==this.options.disabled&&(this.options.disabled=this.element[0].disabled||!1),this.hasTitle=!!this.element.attr("title"),this.options.label&&this.options.label!==this.originalLabel&&(this.isInput?this.element.val(this.options.label):this.element.html(this.options.label)),this._addClass("ui-button","ui-widget"),this._setOption("disabled",this.options.disabled),this._enhance(),this.element.is("a")&&this._on({keyup:function(e){e.keyCode===t.ui.keyCode.SPACE&&(e.preventDefault(),this.element[0].click?this.element[0].click():this.element.trigger("click"))}})},_enhance:function(){this.element.is("button")||this.element.attr("role","button"),this.options.icon&&(this._updateIcon("icon",this.options.icon),this._updateTooltip())},_updateTooltip:function(){this.title=this.element.attr("title"),this.options.showLabel||this.title||this.element.attr("title",this.options.label)},_updateIcon:function(e,i){var s="iconPosition"!==e,n=s?this.options.iconPosition:i,o="top"===n||"bottom"===n;this.icon?s&&this._removeClass(this.icon,null,this.options.icon):(this.icon=t("<span>"),this._addClass(this.icon,"ui-button-icon","ui-icon"),this.options.showLabel||this._addClass("ui-button-icon-only")),s&&this._addClass(this.icon,null,i),this._attachIcon(n),o?(this._addClass(this.icon,null,"ui-widget-icon-block"),this.iconSpace&&this.iconSpace.remove()):(this.iconSpace||(this.iconSpace=t("<span> </span>"),this._addClass(this.iconSpace,"ui-button-icon-space")),this._removeClass(this.icon,null,"ui-wiget-icon-block"),this._attachIconSpace(n))},_destroy:function(){this.element.removeAttr("role"),this.icon&&this.icon.remove(),this.iconSpace&&this.iconSpace.remove(),this.hasTitle||this.element.removeAttr("title")},_attachIconSpace:function(t){this.icon[/^(?:end|bottom)/.test(t)?"before":"after"](this.iconSpace)},_attachIcon:function(t){this.element[/^(?:end|bottom)/.test(t)?"append":"prepend"](this.icon)},_setOptions:function(t){var e=void 0===t.showLabel?this.options.showLabel:t.showLabel,i=void 0===t.icon?this.options.icon:t.icon;e||i||(t.showLabel=!0),this._super(t)},_setOption:function(t,e){"icon"===t&&(e?this._updateIcon(t,e):this.icon&&(this.icon.remove(),this.iconSpace&&this.iconSpace.remove())),"iconPosition"===t&&this._updateIcon(t,e),"showLabel"===t&&(this._toggleClass("ui-button-icon-only",null,!e),this._updateTooltip()),"label"===t&&(this.isInput?this.element.val(e):(this.element.html(e),this.icon&&(this._attachIcon(this.options.iconPosition),this._attachIconSpace(this.options.iconPosition)))),this._super(t,e),"disabled"===t&&(this._toggleClass(null,"ui-state-disabled",e),this.element[0].disabled=e,e&&this.element.blur())},refresh:function(){var t=this.element.is("input, button")?this.element[0].disabled:this.element.hasClass("ui-button-disabled");t!==this.options.disabled&&this._setOptions({disabled:t}),this._updateTooltip()}}),t.uiBackCompat!==!1&&(t.widget("ui.button",t.ui.button,{options:{text:!0,icons:{primary:null,secondary:null}},_create:function(){this.options.showLabel&&!this.options.text&&(this.options.showLabel=this.options.text),!this.options.showLabel&&this.options.text&&(this.options.text=this.options.showLabel),this.options.icon||!this.options.icons.primary&&!this.options.icons.secondary?this.options.icon&&(this.options.icons.primary=this.options.icon):this.options.icons.primary?this.options.icon=this.options.icons.primary:(this.options.icon=this.options.icons.secondary,this.options.iconPosition="end"),this._super()},_setOption:function(t,e){return"text"===t?(this._super("showLabel",e),void 0):("showLabel"===t&&(this.options.text=e),"icon"===t&&(this.options.icons.primary=e),"icons"===t&&(e.primary?(this._super("icon",e.primary),this._super("iconPosition","beginning")):e.secondary&&(this._super("icon",e.secondary),this._super("iconPosition","end"))),this._superApply(arguments),void 0)}}),t.fn.button=function(e){return function(){return!this.length||this.length&&"INPUT"!==this[0].tagName||this.length&&"INPUT"===this[0].tagName&&"checkbox"!==this.attr("type")&&"radio"!==this.attr("type")?e.apply(this,arguments):(t.ui.checkboxradio||t.error("Checkboxradio widget missing"),0===arguments.length?this.checkboxradio({icon:!1}):this.checkboxradio.apply(this,arguments))}}(t.fn.button),t.fn.buttonset=function(){return t.ui.controlgroup||t.error("Controlgroup widget missing"),"option"===arguments[0]&&"items"===arguments[1]&&arguments[2]?this.controlgroup.apply(this,[arguments[0],"items.button",arguments[2]]):"option"===arguments[0]&&"items"===arguments[1]?this.controlgroup.apply(this,[arguments[0],"items.button"]):("object"==typeof arguments[0]&&arguments[0].items&&(arguments[0].items={button:arguments[0].items}),this.controlgroup.apply(this,arguments))}),t.ui.button,t.extend(t.ui,{datepicker:{version:"1.12.1"}});var m;t.extend(s.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(t){return a(this._defaults,t||{}),this},_attachDatepicker:function(e,i){var s,n,o;s=e.nodeName.toLowerCase(),n="div"===s||"span"===s,e.id||(this.uuid+=1,e.id="dp"+this.uuid),o=this._newInst(t(e),n),o.settings=t.extend({},i||{}),"input"===s?this._connectDatepicker(e,o):n&&this._inlineDatepicker(e,o)},_newInst:function(e,i){var s=e[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1");return{id:s,input:e,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:i,dpDiv:i?n(t("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(e,i){var s=t(e);i.append=t([]),i.trigger=t([]),s.hasClass(this.markerClassName)||(this._attachments(s,i),s.addClass(this.markerClassName).on("keydown",this._doKeyDown).on("keypress",this._doKeyPress).on("keyup",this._doKeyUp),this._autoSize(i),t.data(e,"datepicker",i),i.settings.disabled&&this._disableDatepicker(e))},_attachments:function(e,i){var s,n,o,a=this._get(i,"appendText"),r=this._get(i,"isRTL");i.append&&i.append.remove(),a&&(i.append=t("<span class='"+this._appendClass+"'>"+a+"</span>"),e[r?"before":"after"](i.append)),e.off("focus",this._showDatepicker),i.trigger&&i.trigger.remove(),s=this._get(i,"showOn"),("focus"===s||"both"===s)&&e.on("focus",this._showDatepicker),("button"===s||"both"===s)&&(n=this._get(i,"buttonText"),o=this._get(i,"buttonImage"),i.trigger=t(this._get(i,"buttonImageOnly")?t("<img/>").addClass(this._triggerClass).attr({src:o,alt:n,title:n}):t("<button type='button'></button>").addClass(this._triggerClass).html(o?t("<img/>").attr({src:o,alt:n,title:n}):n)),e[r?"before":"after"](i.trigger),i.trigger.on("click",function(){return t.datepicker._datepickerShowing&&t.datepicker._lastInput===e[0]?t.datepicker._hideDatepicker():t.datepicker._datepickerShowing&&t.datepicker._lastInput!==e[0]?(t.datepicker._hideDatepicker(),t.datepicker._showDatepicker(e[0])):t.datepicker._showDatepicker(e[0]),!1}))},_autoSize:function(t){if(this._get(t,"autoSize")&&!t.inline){var e,i,s,n,o=new Date(2009,11,20),a=this._get(t,"dateFormat");a.match(/[DM]/)&&(e=function(t){for(i=0,s=0,n=0;t.length>n;n++)t[n].length>i&&(i=t[n].length,s=n);return s},o.setMonth(e(this._get(t,a.match(/MM/)?"monthNames":"monthNamesShort"))),o.setDate(e(this._get(t,a.match(/DD/)?"dayNames":"dayNamesShort"))+20-o.getDay())),t.input.attr("size",this._formatDate(t,o).length)}},_inlineDatepicker:function(e,i){var s=t(e);s.hasClass(this.markerClassName)||(s.addClass(this.markerClassName).append(i.dpDiv),t.data(e,"datepicker",i),this._setDate(i,this._getDefaultDate(i),!0),this._updateDatepicker(i),this._updateAlternate(i),i.settings.disabled&&this._disableDatepicker(e),i.dpDiv.css("display","block"))},_dialogDatepicker:function(e,i,s,n,o){var r,h,l,c,u,d=this._dialogInst;return d||(this.uuid+=1,r="dp"+this.uuid,this._dialogInput=t("<input type='text' id='"+r+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.on("keydown",this._doKeyDown),t("body").append(this._dialogInput),d=this._dialogInst=this._newInst(this._dialogInput,!1),d.settings={},t.data(this._dialogInput[0],"datepicker",d)),a(d.settings,n||{}),i=i&&i.constructor===Date?this._formatDate(d,i):i,this._dialogInput.val(i),this._pos=o?o.length?o:[o.pageX,o.pageY]:null,this._pos||(h=document.documentElement.clientWidth,l=document.documentElement.clientHeight,c=document.documentElement.scrollLeft||document.body.scrollLeft,u=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[h/2-100+c,l/2-150+u]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),d.settings.onSelect=s,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),t.blockUI&&t.blockUI(this.dpDiv),t.data(this._dialogInput[0],"datepicker",d),this},_destroyDatepicker:function(e){var i,s=t(e),n=t.data(e,"datepicker");s.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),t.removeData(e,"datepicker"),"input"===i?(n.append.remove(),n.trigger.remove(),s.removeClass(this.markerClassName).off("focus",this._showDatepicker).off("keydown",this._doKeyDown).off("keypress",this._doKeyPress).off("keyup",this._doKeyUp)):("div"===i||"span"===i)&&s.removeClass(this.markerClassName).empty(),m===n&&(m=null))},_enableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,"datepicker");n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!1,o.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().removeClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}))},_disableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,"datepicker");n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!0,o.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().addClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}),this._disabledInputs[this._disabledInputs.length]=e)},_isDisabledDatepicker:function(t){if(!t)return!1;for(var e=0;this._disabledInputs.length>e;e++)if(this._disabledInputs[e]===t)return!0;return!1},_getInst:function(e){try{return t.data(e,"datepicker")}catch(i){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(e,i,s){var n,o,r,h,l=this._getInst(e);return 2===arguments.length&&"string"==typeof i?"defaults"===i?t.extend({},t.datepicker._defaults):l?"all"===i?t.extend({},l.settings):this._get(l,i):null:(n=i||{},"string"==typeof i&&(n={},n[i]=s),l&&(this._curInst===l&&this._hideDatepicker(),o=this._getDateDatepicker(e,!0),r=this._getMinMaxDate(l,"min"),h=this._getMinMaxDate(l,"max"),a(l.settings,n),null!==r&&void 0!==n.dateFormat&&void 0===n.minDate&&(l.settings.minDate=this._formatDate(l,r)),null!==h&&void 0!==n.dateFormat&&void 0===n.maxDate&&(l.settings.maxDate=this._formatDate(l,h)),"disabled"in n&&(n.disabled?this._disableDatepicker(e):this._enableDatepicker(e)),this._attachments(t(e),l),this._autoSize(l),this._setDate(l,o),this._updateAlternate(l),this._updateDatepicker(l)),void 0)},_changeDatepicker:function(t,e,i){this._optionDatepicker(t,e,i)},_refreshDatepicker:function(t){var e=this._getInst(t);e&&this._updateDatepicker(e)},_setDateDatepicker:function(t,e){var i=this._getInst(t);i&&(this._setDate(i,e),this._updateDatepicker(i),this._updateAlternate(i))},_getDateDatepicker:function(t,e){var i=this._getInst(t);return i&&!i.inline&&this._setDateFromField(i,e),i?this._getDate(i):null},_doKeyDown:function(e){var i,s,n,o=t.datepicker._getInst(e.target),a=!0,r=o.dpDiv.is(".ui-datepicker-rtl");if(o._keyEvent=!0,t.datepicker._datepickerShowing)switch(e.keyCode){case 9:t.datepicker._hideDatepicker(),a=!1;break;case 13:return n=t("td."+t.datepicker._dayOverClass+":not(."+t.datepicker._currentClass+")",o.dpDiv),n[0]&&t.datepicker._selectDay(e.target,o.selectedMonth,o.selectedYear,n[0]),i=t.datepicker._get(o,"onSelect"),i?(s=t.datepicker._formatDate(o),i.apply(o.input?o.input[0]:null,[s,o])):t.datepicker._hideDatepicker(),!1;case 27:t.datepicker._hideDatepicker();break;case 33:t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M");break;case 34:t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");break;case 35:(e.ctrlKey||e.metaKey)&&t.datepicker._clearDate(e.target),a=e.ctrlKey||e.metaKey;break;case 36:(e.ctrlKey||e.metaKey)&&t.datepicker._gotoToday(e.target),a=e.ctrlKey||e.metaKey;break;case 37:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?1:-1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M");break;case 38:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,-7,"D"),a=e.ctrlKey||e.metaKey;break;case 39:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?-1:1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");break;case 40:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,7,"D"),a=e.ctrlKey||e.metaKey;break;default:a=!1}else 36===e.keyCode&&e.ctrlKey?t.datepicker._showDatepicker(this):a=!1;a&&(e.preventDefault(),e.stopPropagation())},_doKeyPress:function(e){var i,s,n=t.datepicker._getInst(e.target);return t.datepicker._get(n,"constrainInput")?(i=t.datepicker._possibleChars(t.datepicker._get(n,"dateFormat")),s=String.fromCharCode(null==e.charCode?e.keyCode:e.charCode),e.ctrlKey||e.metaKey||" ">s||!i||i.indexOf(s)>-1):void 0},_doKeyUp:function(e){var i,s=t.datepicker._getInst(e.target);if(s.input.val()!==s.lastVal)try{i=t.datepicker.parseDate(t.datepicker._get(s,"dateFormat"),s.input?s.input.val():null,t.datepicker._getFormatConfig(s)),i&&(t.datepicker._setDateFromField(s),t.datepicker._updateAlternate(s),t.datepicker._updateDatepicker(s))}catch(n){}return!0},_showDatepicker:function(e){if(e=e.target||e,"input"!==e.nodeName.toLowerCase()&&(e=t("input",e.parentNode)[0]),!t.datepicker._isDisabledDatepicker(e)&&t.datepicker._lastInput!==e){var s,n,o,r,h,l,c;s=t.datepicker._getInst(e),t.datepicker._curInst&&t.datepicker._curInst!==s&&(t.datepicker._curInst.dpDiv.stop(!0,!0),s&&t.datepicker._datepickerShowing&&t.datepicker._hideDatepicker(t.datepicker._curInst.input[0])),n=t.datepicker._get(s,"beforeShow"),o=n?n.apply(e,[e,s]):{},o!==!1&&(a(s.settings,o),s.lastVal=null,t.datepicker._lastInput=e,t.datepicker._setDateFromField(s),t.datepicker._inDialog&&(e.value=""),t.datepicker._pos||(t.datepicker._pos=t.datepicker._findPos(e),t.datepicker._pos[1]+=e.offsetHeight),r=!1,t(e).parents().each(function(){return r|="fixed"===t(this).css("position"),!r}),h={left:t.datepicker._pos[0],top:t.datepicker._pos[1]},t.datepicker._pos=null,s.dpDiv.empty(),s.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),t.datepicker._updateDatepicker(s),h=t.datepicker._checkOffset(s,h,r),s.dpDiv.css({position:t.datepicker._inDialog&&t.blockUI?"static":r?"fixed":"absolute",display:"none",left:h.left+"px",top:h.top+"px"}),s.inline||(l=t.datepicker._get(s,"showAnim"),c=t.datepicker._get(s,"duration"),s.dpDiv.css("z-index",i(t(e))+1),t.datepicker._datepickerShowing=!0,t.effects&&t.effects.effect[l]?s.dpDiv.show(l,t.datepicker._get(s,"showOptions"),c):s.dpDiv[l||"show"](l?c:null),t.datepicker._shouldFocusInput(s)&&s.input.trigger("focus"),t.datepicker._curInst=s))
+}},_updateDatepicker:function(e){this.maxRows=4,m=e,e.dpDiv.empty().append(this._generateHTML(e)),this._attachHandlers(e);var i,s=this._getNumberOfMonths(e),n=s[1],a=17,r=e.dpDiv.find("."+this._dayOverClass+" a");r.length>0&&o.apply(r.get(0)),e.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),n>1&&e.dpDiv.addClass("ui-datepicker-multi-"+n).css("width",a*n+"em"),e.dpDiv[(1!==s[0]||1!==s[1]?"add":"remove")+"Class"]("ui-datepicker-multi"),e.dpDiv[(this._get(e,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),e===t.datepicker._curInst&&t.datepicker._datepickerShowing&&t.datepicker._shouldFocusInput(e)&&e.input.trigger("focus"),e.yearshtml&&(i=e.yearshtml,setTimeout(function(){i===e.yearshtml&&e.yearshtml&&e.dpDiv.find("select.ui-datepicker-year:first").replaceWith(e.yearshtml),i=e.yearshtml=null},0))},_shouldFocusInput:function(t){return t.input&&t.input.is(":visible")&&!t.input.is(":disabled")&&!t.input.is(":focus")},_checkOffset:function(e,i,s){var n=e.dpDiv.outerWidth(),o=e.dpDiv.outerHeight(),a=e.input?e.input.outerWidth():0,r=e.input?e.input.outerHeight():0,h=document.documentElement.clientWidth+(s?0:t(document).scrollLeft()),l=document.documentElement.clientHeight+(s?0:t(document).scrollTop());return i.left-=this._get(e,"isRTL")?n-a:0,i.left-=s&&i.left===e.input.offset().left?t(document).scrollLeft():0,i.top-=s&&i.top===e.input.offset().top+r?t(document).scrollTop():0,i.left-=Math.min(i.left,i.left+n>h&&h>n?Math.abs(i.left+n-h):0),i.top-=Math.min(i.top,i.top+o>l&&l>o?Math.abs(o+r):0),i},_findPos:function(e){for(var i,s=this._getInst(e),n=this._get(s,"isRTL");e&&("hidden"===e.type||1!==e.nodeType||t.expr.filters.hidden(e));)e=e[n?"previousSibling":"nextSibling"];return i=t(e).offset(),[i.left,i.top]},_hideDatepicker:function(e){var i,s,n,o,a=this._curInst;!a||e&&a!==t.data(e,"datepicker")||this._datepickerShowing&&(i=this._get(a,"showAnim"),s=this._get(a,"duration"),n=function(){t.datepicker._tidyDialog(a)},t.effects&&(t.effects.effect[i]||t.effects[i])?a.dpDiv.hide(i,t.datepicker._get(a,"showOptions"),s,n):a.dpDiv["slideDown"===i?"slideUp":"fadeIn"===i?"fadeOut":"hide"](i?s:null,n),i||n(),this._datepickerShowing=!1,o=this._get(a,"onClose"),o&&o.apply(a.input?a.input[0]:null,[a.input?a.input.val():"",a]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),t.blockUI&&(t.unblockUI(),t("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(t){t.dpDiv.removeClass(this._dialogClass).off(".ui-datepicker-calendar")},_checkExternalClick:function(e){if(t.datepicker._curInst){var i=t(e.target),s=t.datepicker._getInst(i[0]);(i[0].id!==t.datepicker._mainDivId&&0===i.parents("#"+t.datepicker._mainDivId).length&&!i.hasClass(t.datepicker.markerClassName)&&!i.closest("."+t.datepicker._triggerClass).length&&t.datepicker._datepickerShowing&&(!t.datepicker._inDialog||!t.blockUI)||i.hasClass(t.datepicker.markerClassName)&&t.datepicker._curInst!==s)&&t.datepicker._hideDatepicker()}},_adjustDate:function(e,i,s){var n=t(e),o=this._getInst(n[0]);this._isDisabledDatepicker(n[0])||(this._adjustInstDate(o,i+("M"===s?this._get(o,"showCurrentAtPos"):0),s),this._updateDatepicker(o))},_gotoToday:function(e){var i,s=t(e),n=this._getInst(s[0]);this._get(n,"gotoCurrent")&&n.currentDay?(n.selectedDay=n.currentDay,n.drawMonth=n.selectedMonth=n.currentMonth,n.drawYear=n.selectedYear=n.currentYear):(i=new Date,n.selectedDay=i.getDate(),n.drawMonth=n.selectedMonth=i.getMonth(),n.drawYear=n.selectedYear=i.getFullYear()),this._notifyChange(n),this._adjustDate(s)},_selectMonthYear:function(e,i,s){var n=t(e),o=this._getInst(n[0]);o["selected"+("M"===s?"Month":"Year")]=o["draw"+("M"===s?"Month":"Year")]=parseInt(i.options[i.selectedIndex].value,10),this._notifyChange(o),this._adjustDate(n)},_selectDay:function(e,i,s,n){var o,a=t(e);t(n).hasClass(this._unselectableClass)||this._isDisabledDatepicker(a[0])||(o=this._getInst(a[0]),o.selectedDay=o.currentDay=t("a",n).html(),o.selectedMonth=o.currentMonth=i,o.selectedYear=o.currentYear=s,this._selectDate(e,this._formatDate(o,o.currentDay,o.currentMonth,o.currentYear)))},_clearDate:function(e){var i=t(e);this._selectDate(i,"")},_selectDate:function(e,i){var s,n=t(e),o=this._getInst(n[0]);i=null!=i?i:this._formatDate(o),o.input&&o.input.val(i),this._updateAlternate(o),s=this._get(o,"onSelect"),s?s.apply(o.input?o.input[0]:null,[i,o]):o.input&&o.input.trigger("change"),o.inline?this._updateDatepicker(o):(this._hideDatepicker(),this._lastInput=o.input[0],"object"!=typeof o.input[0]&&o.input.trigger("focus"),this._lastInput=null)},_updateAlternate:function(e){var i,s,n,o=this._get(e,"altField");o&&(i=this._get(e,"altFormat")||this._get(e,"dateFormat"),s=this._getDate(e),n=this.formatDate(i,s,this._getFormatConfig(e)),t(o).val(n))},noWeekends:function(t){var e=t.getDay();return[e>0&&6>e,""]},iso8601Week:function(t){var e,i=new Date(t.getTime());return i.setDate(i.getDate()+4-(i.getDay()||7)),e=i.getTime(),i.setMonth(0),i.setDate(1),Math.floor(Math.round((e-i)/864e5)/7)+1},parseDate:function(e,i,s){if(null==e||null==i)throw"Invalid arguments";if(i="object"==typeof i?""+i:i+"",""===i)return null;var n,o,a,r,h=0,l=(s?s.shortYearCutoff:null)||this._defaults.shortYearCutoff,c="string"!=typeof l?l:(new Date).getFullYear()%100+parseInt(l,10),u=(s?s.dayNamesShort:null)||this._defaults.dayNamesShort,d=(s?s.dayNames:null)||this._defaults.dayNames,p=(s?s.monthNamesShort:null)||this._defaults.monthNamesShort,f=(s?s.monthNames:null)||this._defaults.monthNames,g=-1,m=-1,_=-1,v=-1,b=!1,y=function(t){var i=e.length>n+1&&e.charAt(n+1)===t;return i&&n++,i},w=function(t){var e=y(t),s="@"===t?14:"!"===t?20:"y"===t&&e?4:"o"===t?3:2,n="y"===t?s:1,o=RegExp("^\\d{"+n+","+s+"}"),a=i.substring(h).match(o);if(!a)throw"Missing number at position "+h;return h+=a[0].length,parseInt(a[0],10)},k=function(e,s,n){var o=-1,a=t.map(y(e)?n:s,function(t,e){return[[e,t]]}).sort(function(t,e){return-(t[1].length-e[1].length)});if(t.each(a,function(t,e){var s=e[1];return i.substr(h,s.length).toLowerCase()===s.toLowerCase()?(o=e[0],h+=s.length,!1):void 0}),-1!==o)return o+1;throw"Unknown name at position "+h},x=function(){if(i.charAt(h)!==e.charAt(n))throw"Unexpected literal at position "+h;h++};for(n=0;e.length>n;n++)if(b)"'"!==e.charAt(n)||y("'")?x():b=!1;else switch(e.charAt(n)){case"d":_=w("d");break;case"D":k("D",u,d);break;case"o":v=w("o");break;case"m":m=w("m");break;case"M":m=k("M",p,f);break;case"y":g=w("y");break;case"@":r=new Date(w("@")),g=r.getFullYear(),m=r.getMonth()+1,_=r.getDate();break;case"!":r=new Date((w("!")-this._ticksTo1970)/1e4),g=r.getFullYear(),m=r.getMonth()+1,_=r.getDate();break;case"'":y("'")?x():b=!0;break;default:x()}if(i.length>h&&(a=i.substr(h),!/^\s+/.test(a)))throw"Extra/unparsed characters found in date: "+a;if(-1===g?g=(new Date).getFullYear():100>g&&(g+=(new Date).getFullYear()-(new Date).getFullYear()%100+(c>=g?0:-100)),v>-1)for(m=1,_=v;;){if(o=this._getDaysInMonth(g,m-1),o>=_)break;m++,_-=o}if(r=this._daylightSavingAdjust(new Date(g,m-1,_)),r.getFullYear()!==g||r.getMonth()+1!==m||r.getDate()!==_)throw"Invalid date";return r},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:1e7*60*60*24*(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925)),formatDate:function(t,e,i){if(!e)return"";var s,n=(i?i.dayNamesShort:null)||this._defaults.dayNamesShort,o=(i?i.dayNames:null)||this._defaults.dayNames,a=(i?i.monthNamesShort:null)||this._defaults.monthNamesShort,r=(i?i.monthNames:null)||this._defaults.monthNames,h=function(e){var i=t.length>s+1&&t.charAt(s+1)===e;return i&&s++,i},l=function(t,e,i){var s=""+e;if(h(t))for(;i>s.length;)s="0"+s;return s},c=function(t,e,i,s){return h(t)?s[e]:i[e]},u="",d=!1;if(e)for(s=0;t.length>s;s++)if(d)"'"!==t.charAt(s)||h("'")?u+=t.charAt(s):d=!1;else switch(t.charAt(s)){case"d":u+=l("d",e.getDate(),2);break;case"D":u+=c("D",e.getDay(),n,o);break;case"o":u+=l("o",Math.round((new Date(e.getFullYear(),e.getMonth(),e.getDate()).getTime()-new Date(e.getFullYear(),0,0).getTime())/864e5),3);break;case"m":u+=l("m",e.getMonth()+1,2);break;case"M":u+=c("M",e.getMonth(),a,r);break;case"y":u+=h("y")?e.getFullYear():(10>e.getFullYear()%100?"0":"")+e.getFullYear()%100;break;case"@":u+=e.getTime();break;case"!":u+=1e4*e.getTime()+this._ticksTo1970;break;case"'":h("'")?u+="'":d=!0;break;default:u+=t.charAt(s)}return u},_possibleChars:function(t){var e,i="",s=!1,n=function(i){var s=t.length>e+1&&t.charAt(e+1)===i;return s&&e++,s};for(e=0;t.length>e;e++)if(s)"'"!==t.charAt(e)||n("'")?i+=t.charAt(e):s=!1;else switch(t.charAt(e)){case"d":case"m":case"y":case"@":i+="0123456789";break;case"D":case"M":return null;case"'":n("'")?i+="'":s=!0;break;default:i+=t.charAt(e)}return i},_get:function(t,e){return void 0!==t.settings[e]?t.settings[e]:this._defaults[e]},_setDateFromField:function(t,e){if(t.input.val()!==t.lastVal){var i=this._get(t,"dateFormat"),s=t.lastVal=t.input?t.input.val():null,n=this._getDefaultDate(t),o=n,a=this._getFormatConfig(t);try{o=this.parseDate(i,s,a)||n}catch(r){s=e?"":s}t.selectedDay=o.getDate(),t.drawMonth=t.selectedMonth=o.getMonth(),t.drawYear=t.selectedYear=o.getFullYear(),t.currentDay=s?o.getDate():0,t.currentMonth=s?o.getMonth():0,t.currentYear=s?o.getFullYear():0,this._adjustInstDate(t)}},_getDefaultDate:function(t){return this._restrictMinMax(t,this._determineDate(t,this._get(t,"defaultDate"),new Date))},_determineDate:function(e,i,s){var n=function(t){var e=new Date;return e.setDate(e.getDate()+t),e},o=function(i){try{return t.datepicker.parseDate(t.datepicker._get(e,"dateFormat"),i,t.datepicker._getFormatConfig(e))}catch(s){}for(var n=(i.toLowerCase().match(/^c/)?t.datepicker._getDate(e):null)||new Date,o=n.getFullYear(),a=n.getMonth(),r=n.getDate(),h=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,l=h.exec(i);l;){switch(l[2]||"d"){case"d":case"D":r+=parseInt(l[1],10);break;case"w":case"W":r+=7*parseInt(l[1],10);break;case"m":case"M":a+=parseInt(l[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a));break;case"y":case"Y":o+=parseInt(l[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a))}l=h.exec(i)}return new Date(o,a,r)},a=null==i||""===i?s:"string"==typeof i?o(i):"number"==typeof i?isNaN(i)?s:n(i):new Date(i.getTime());return a=a&&"Invalid Date"==""+a?s:a,a&&(a.setHours(0),a.setMinutes(0),a.setSeconds(0),a.setMilliseconds(0)),this._daylightSavingAdjust(a)},_daylightSavingAdjust:function(t){return t?(t.setHours(t.getHours()>12?t.getHours()+2:0),t):null},_setDate:function(t,e,i){var s=!e,n=t.selectedMonth,o=t.selectedYear,a=this._restrictMinMax(t,this._determineDate(t,e,new Date));t.selectedDay=t.currentDay=a.getDate(),t.drawMonth=t.selectedMonth=t.currentMonth=a.getMonth(),t.drawYear=t.selectedYear=t.currentYear=a.getFullYear(),n===t.selectedMonth&&o===t.selectedYear||i||this._notifyChange(t),this._adjustInstDate(t),t.input&&t.input.val(s?"":this._formatDate(t))},_getDate:function(t){var e=!t.currentYear||t.input&&""===t.input.val()?null:this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return e},_attachHandlers:function(e){var i=this._get(e,"stepMonths"),s="#"+e.id.replace(/\\\\/g,"\\");e.dpDiv.find("[data-handler]").map(function(){var e={prev:function(){t.datepicker._adjustDate(s,-i,"M")},next:function(){t.datepicker._adjustDate(s,+i,"M")},hide:function(){t.datepicker._hideDatepicker()},today:function(){t.datepicker._gotoToday(s)},selectDay:function(){return t.datepicker._selectDay(s,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return t.datepicker._selectMonthYear(s,this,"M"),!1},selectYear:function(){return t.datepicker._selectMonthYear(s,this,"Y"),!1}};t(this).on(this.getAttribute("data-event"),e[this.getAttribute("data-handler")])})},_generateHTML:function(t){var e,i,s,n,o,a,r,h,l,c,u,d,p,f,g,m,_,v,b,y,w,k,x,C,D,I,T,P,M,S,H,z,O,A,N,W,E,F,L,R=new Date,B=this._daylightSavingAdjust(new Date(R.getFullYear(),R.getMonth(),R.getDate())),Y=this._get(t,"isRTL"),j=this._get(t,"showButtonPanel"),q=this._get(t,"hideIfNoPrevNext"),K=this._get(t,"navigationAsDateFormat"),U=this._getNumberOfMonths(t),V=this._get(t,"showCurrentAtPos"),$=this._get(t,"stepMonths"),X=1!==U[0]||1!==U[1],G=this._daylightSavingAdjust(t.currentDay?new Date(t.currentYear,t.currentMonth,t.currentDay):new Date(9999,9,9)),Q=this._getMinMaxDate(t,"min"),J=this._getMinMaxDate(t,"max"),Z=t.drawMonth-V,te=t.drawYear;if(0>Z&&(Z+=12,te--),J)for(e=this._daylightSavingAdjust(new Date(J.getFullYear(),J.getMonth()-U[0]*U[1]+1,J.getDate())),e=Q&&Q>e?Q:e;this._daylightSavingAdjust(new Date(te,Z,1))>e;)Z--,0>Z&&(Z=11,te--);for(t.drawMonth=Z,t.drawYear=te,i=this._get(t,"prevText"),i=K?this.formatDate(i,this._daylightSavingAdjust(new Date(te,Z-$,1)),this._getFormatConfig(t)):i,s=this._canAdjustMonth(t,-1,te,Z)?"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>":q?"":"<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>",n=this._get(t,"nextText"),n=K?this.formatDate(n,this._daylightSavingAdjust(new Date(te,Z+$,1)),this._getFormatConfig(t)):n,o=this._canAdjustMonth(t,1,te,Z)?"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>":q?"":"<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>",a=this._get(t,"currentText"),r=this._get(t,"gotoCurrent")&&t.currentDay?G:B,a=K?this.formatDate(a,r,this._getFormatConfig(t)):a,h=t.inline?"":"<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>"+this._get(t,"closeText")+"</button>",l=j?"<div class='ui-datepicker-buttonpane ui-widget-content'>"+(Y?h:"")+(this._isInRange(t,r)?"<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'>"+a+"</button>":"")+(Y?"":h)+"</div>":"",c=parseInt(this._get(t,"firstDay"),10),c=isNaN(c)?0:c,u=this._get(t,"showWeek"),d=this._get(t,"dayNames"),p=this._get(t,"dayNamesMin"),f=this._get(t,"monthNames"),g=this._get(t,"monthNamesShort"),m=this._get(t,"beforeShowDay"),_=this._get(t,"showOtherMonths"),v=this._get(t,"selectOtherMonths"),b=this._getDefaultDate(t),y="",k=0;U[0]>k;k++){for(x="",this.maxRows=4,C=0;U[1]>C;C++){if(D=this._daylightSavingAdjust(new Date(te,Z,t.selectedDay)),I=" ui-corner-all",T="",X){if(T+="<div class='ui-datepicker-group",U[1]>1)switch(C){case 0:T+=" ui-datepicker-group-first",I=" ui-corner-"+(Y?"right":"left");break;case U[1]-1:T+=" ui-datepicker-group-last",I=" ui-corner-"+(Y?"left":"right");break;default:T+=" ui-datepicker-group-middle",I=""}T+="'>"}for(T+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+I+"'>"+(/all|left/.test(I)&&0===k?Y?o:s:"")+(/all|right/.test(I)&&0===k?Y?s:o:"")+this._generateMonthYearHeader(t,Z,te,Q,J,k>0||C>0,f,g)+"</div><table class='ui-datepicker-calendar'><thead>"+"<tr>",P=u?"<th class='ui-datepicker-week-col'>"+this._get(t,"weekHeader")+"</th>":"",w=0;7>w;w++)M=(w+c)%7,P+="<th scope='col'"+((w+c+6)%7>=5?" class='ui-datepicker-week-end'":"")+">"+"<span title='"+d[M]+"'>"+p[M]+"</span></th>";for(T+=P+"</tr></thead><tbody>",S=this._getDaysInMonth(te,Z),te===t.selectedYear&&Z===t.selectedMonth&&(t.selectedDay=Math.min(t.selectedDay,S)),H=(this._getFirstDayOfMonth(te,Z)-c+7)%7,z=Math.ceil((H+S)/7),O=X?this.maxRows>z?this.maxRows:z:z,this.maxRows=O,A=this._daylightSavingAdjust(new Date(te,Z,1-H)),N=0;O>N;N++){for(T+="<tr>",W=u?"<td class='ui-datepicker-week-col'>"+this._get(t,"calculateWeek")(A)+"</td>":"",w=0;7>w;w++)E=m?m.apply(t.input?t.input[0]:null,[A]):[!0,""],F=A.getMonth()!==Z,L=F&&!v||!E[0]||Q&&Q>A||J&&A>J,W+="<td class='"+((w+c+6)%7>=5?" ui-datepicker-week-end":"")+(F?" ui-datepicker-other-month":"")+(A.getTime()===D.getTime()&&Z===t.selectedMonth&&t._keyEvent||b.getTime()===A.getTime()&&b.getTime()===D.getTime()?" "+this._dayOverClass:"")+(L?" "+this._unselectableClass+" ui-state-disabled":"")+(F&&!_?"":" "+E[1]+(A.getTime()===G.getTime()?" "+this._currentClass:"")+(A.getTime()===B.getTime()?" ui-datepicker-today":""))+"'"+(F&&!_||!E[2]?"":" title='"+E[2].replace(/'/g,"&#39;")+"'")+(L?"":" data-handler='selectDay' data-event='click' data-month='"+A.getMonth()+"' data-year='"+A.getFullYear()+"'")+">"+(F&&!_?"&#xa0;":L?"<span class='ui-state-default'>"+A.getDate()+"</span>":"<a class='ui-state-default"+(A.getTime()===B.getTime()?" ui-state-highlight":"")+(A.getTime()===G.getTime()?" ui-state-active":"")+(F?" ui-priority-secondary":"")+"' href='#'>"+A.getDate()+"</a>")+"</td>",A.setDate(A.getDate()+1),A=this._daylightSavingAdjust(A);T+=W+"</tr>"}Z++,Z>11&&(Z=0,te++),T+="</tbody></table>"+(X?"</div>"+(U[0]>0&&C===U[1]-1?"<div class='ui-datepicker-row-break'></div>":""):""),x+=T}y+=x}return y+=l,t._keyEvent=!1,y},_generateMonthYearHeader:function(t,e,i,s,n,o,a,r){var h,l,c,u,d,p,f,g,m=this._get(t,"changeMonth"),_=this._get(t,"changeYear"),v=this._get(t,"showMonthAfterYear"),b="<div class='ui-datepicker-title'>",y="";if(o||!m)y+="<span class='ui-datepicker-month'>"+a[e]+"</span>";else{for(h=s&&s.getFullYear()===i,l=n&&n.getFullYear()===i,y+="<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>",c=0;12>c;c++)(!h||c>=s.getMonth())&&(!l||n.getMonth()>=c)&&(y+="<option value='"+c+"'"+(c===e?" selected='selected'":"")+">"+r[c]+"</option>");y+="</select>"}if(v||(b+=y+(!o&&m&&_?"":"&#xa0;")),!t.yearshtml)if(t.yearshtml="",o||!_)b+="<span class='ui-datepicker-year'>"+i+"</span>";else{for(u=this._get(t,"yearRange").split(":"),d=(new Date).getFullYear(),p=function(t){var e=t.match(/c[+\-].*/)?i+parseInt(t.substring(1),10):t.match(/[+\-].*/)?d+parseInt(t,10):parseInt(t,10);return isNaN(e)?d:e},f=p(u[0]),g=Math.max(f,p(u[1]||"")),f=s?Math.max(f,s.getFullYear()):f,g=n?Math.min(g,n.getFullYear()):g,t.yearshtml+="<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";g>=f;f++)t.yearshtml+="<option value='"+f+"'"+(f===i?" selected='selected'":"")+">"+f+"</option>";t.yearshtml+="</select>",b+=t.yearshtml,t.yearshtml=null}return b+=this._get(t,"yearSuffix"),v&&(b+=(!o&&m&&_?"":"&#xa0;")+y),b+="</div>"},_adjustInstDate:function(t,e,i){var s=t.selectedYear+("Y"===i?e:0),n=t.selectedMonth+("M"===i?e:0),o=Math.min(t.selectedDay,this._getDaysInMonth(s,n))+("D"===i?e:0),a=this._restrictMinMax(t,this._daylightSavingAdjust(new Date(s,n,o)));t.selectedDay=a.getDate(),t.drawMonth=t.selectedMonth=a.getMonth(),t.drawYear=t.selectedYear=a.getFullYear(),("M"===i||"Y"===i)&&this._notifyChange(t)},_restrictMinMax:function(t,e){var i=this._getMinMaxDate(t,"min"),s=this._getMinMaxDate(t,"max"),n=i&&i>e?i:e;return s&&n>s?s:n},_notifyChange:function(t){var e=this._get(t,"onChangeMonthYear");e&&e.apply(t.input?t.input[0]:null,[t.selectedYear,t.selectedMonth+1,t])},_getNumberOfMonths:function(t){var e=this._get(t,"numberOfMonths");return null==e?[1,1]:"number"==typeof e?[1,e]:e},_getMinMaxDate:function(t,e){return this._determineDate(t,this._get(t,e+"Date"),null)},_getDaysInMonth:function(t,e){return 32-this._daylightSavingAdjust(new Date(t,e,32)).getDate()},_getFirstDayOfMonth:function(t,e){return new Date(t,e,1).getDay()},_canAdjustMonth:function(t,e,i,s){var n=this._getNumberOfMonths(t),o=this._daylightSavingAdjust(new Date(i,s+(0>e?e:n[0]*n[1]),1));return 0>e&&o.setDate(this._getDaysInMonth(o.getFullYear(),o.getMonth())),this._isInRange(t,o)},_isInRange:function(t,e){var i,s,n=this._getMinMaxDate(t,"min"),o=this._getMinMaxDate(t,"max"),a=null,r=null,h=this._get(t,"yearRange");return h&&(i=h.split(":"),s=(new Date).getFullYear(),a=parseInt(i[0],10),r=parseInt(i[1],10),i[0].match(/[+\-].*/)&&(a+=s),i[1].match(/[+\-].*/)&&(r+=s)),(!n||e.getTime()>=n.getTime())&&(!o||e.getTime()<=o.getTime())&&(!a||e.getFullYear()>=a)&&(!r||r>=e.getFullYear())},_getFormatConfig:function(t){var e=this._get(t,"shortYearCutoff");return e="string"!=typeof e?e:(new Date).getFullYear()%100+parseInt(e,10),{shortYearCutoff:e,dayNamesShort:this._get(t,"dayNamesShort"),dayNames:this._get(t,"dayNames"),monthNamesShort:this._get(t,"monthNamesShort"),monthNames:this._get(t,"monthNames")}},_formatDate:function(t,e,i,s){e||(t.currentDay=t.selectedDay,t.currentMonth=t.selectedMonth,t.currentYear=t.selectedYear);var n=e?"object"==typeof e?e:this._daylightSavingAdjust(new Date(s,i,e)):this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return this.formatDate(this._get(t,"dateFormat"),n,this._getFormatConfig(t))}}),t.fn.datepicker=function(e){if(!this.length)return this;t.datepicker.initialized||(t(document).on("mousedown",t.datepicker._checkExternalClick),t.datepicker.initialized=!0),0===t("#"+t.datepicker._mainDivId).length&&t("body").append(t.datepicker.dpDiv);var i=Array.prototype.slice.call(arguments,1);return"string"!=typeof e||"isDisabled"!==e&&"getDate"!==e&&"widget"!==e?"option"===e&&2===arguments.length&&"string"==typeof arguments[1]?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i)):this.each(function(){"string"==typeof e?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this].concat(i)):t.datepicker._attachDatepicker(this,e)}):t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i))},t.datepicker=new s,t.datepicker.initialized=!1,t.datepicker.uuid=(new Date).getTime(),t.datepicker.version="1.12.1",t.datepicker,t.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase());var _=!1;t(document).on("mouseup",function(){_=!1}),t.widget("ui.mouse",{version:"1.12.1",options:{cancel:"input, textarea, button, select, option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.on("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).on("click."+this.widgetName,function(i){return!0===t.data(i.target,e.widgetName+".preventClickEvent")?(t.removeData(i.target,e.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.off("."+this.widgetName),this._mouseMoveDelegate&&this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(e){if(!_){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(e),this._mouseDownEvent=e;var i=this,s=1===e.which,n="string"==typeof this.options.cancel&&e.target.nodeName?t(e.target).closest(this.options.cancel).length:!1;return s&&!n&&this._mouseCapture(e)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(e)!==!1,!this._mouseStarted)?(e.preventDefault(),!0):(!0===t.data(e.target,this.widgetName+".preventClickEvent")&&t.removeData(e.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return i._mouseMove(t)},this._mouseUpDelegate=function(t){return i._mouseUp(t)},this.document.on("mousemove."+this.widgetName,this._mouseMoveDelegate).on("mouseup."+this.widgetName,this._mouseUpDelegate),e.preventDefault(),_=!0,!0)):!0}},_mouseMove:function(e){if(this._mouseMoved){if(t.ui.ie&&(!document.documentMode||9>document.documentMode)&&!e.button)return this._mouseUp(e);if(!e.which)if(e.originalEvent.altKey||e.originalEvent.ctrlKey||e.originalEvent.metaKey||e.originalEvent.shiftKey)this.ignoreMissingWhich=!0;else if(!this.ignoreMissingWhich)return this._mouseUp(e)}return(e.which||e.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(e),e.preventDefault()):(this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,e)!==!1,this._mouseStarted?this._mouseDrag(e):this._mouseUp(e)),!this._mouseStarted)},_mouseUp:function(e){this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,e.target===this._mouseDownEvent.target&&t.data(e.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(e)),this._mouseDelayTimer&&(clearTimeout(this._mouseDelayTimer),delete this._mouseDelayTimer),this.ignoreMissingWhich=!1,_=!1,e.preventDefault()},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),t.ui.plugin={add:function(e,i,s){var n,o=t.ui[e].prototype;for(n in s)o.plugins[n]=o.plugins[n]||[],o.plugins[n].push([i,s[n]])},call:function(t,e,i,s){var n,o=t.plugins[e];if(o&&(s||t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType))for(n=0;o.length>n;n++)t.options[o[n][0]]&&o[n][1].apply(t.element,i)}},t.ui.safeBlur=function(e){e&&"body"!==e.nodeName.toLowerCase()&&t(e).trigger("blur")},t.widget("ui.draggable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"===this.options.helper&&this._setPositionRelative(),this.options.addClasses&&this._addClass("ui-draggable"),this._setHandleClassName(),this._mouseInit()},_setOption:function(t,e){this._super(t,e),"handle"===t&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){return(this.helper||this.element).is(".ui-draggable-dragging")?(this.destroyOnClear=!0,void 0):(this._removeHandleClassName(),this._mouseDestroy(),void 0)},_mouseCapture:function(e){var i=this.options;return this.helper||i.disabled||t(e.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(e),this.handle?(this._blurActiveElement(e),this._blockFrames(i.iframeFix===!0?"iframe":i.iframeFix),!0):!1)},_blockFrames:function(e){this.iframeBlocks=this.document.find(e).map(function(){var e=t(this);return t("<div>").css("position","absolute").appendTo(e.parent()).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(e){var i=t.ui.safeActiveElement(this.document[0]),s=t(e.target);s.closest(i).length||t.ui.safeBlur(i)},_mouseStart:function(e){var i=this.options;return this.helper=this._createHelper(e),this._addClass(this.helper,"ui-draggable-dragging"),this._cacheHelperProportions(),t.ui.ddmanager&&(t.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return"fixed"===t(this).css("position")}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(e),this.originalPosition=this.position=this._generatePosition(e,!1),this.originalPageX=e.pageX,this.originalPageY=e.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",e)===!1?(this._clear(),!1):(this._cacheHelperProportions(),t.ui.ddmanager&&!i.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this._mouseDrag(e,!0),t.ui.ddmanager&&t.ui.ddmanager.dragStart(this,e),!0)},_refreshOffsets:function(t){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:t.pageX-this.offset.left,top:t.pageY-this.offset.top}},_mouseDrag:function(e,i){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(e,!0),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",e,s)===!1)return this._mouseUp(new t.Event("mouseup",e)),!1;this.position=s.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),!1},_mouseStop:function(e){var i=this,s=!1;return t.ui.ddmanager&&!this.options.dropBehaviour&&(s=t.ui.ddmanager.drop(this,e)),this.dropped&&(s=this.dropped,this.dropped=!1),"invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||t.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?t(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",e)!==!1&&i._clear()}):this._trigger("stop",e)!==!1&&this._clear(),!1},_mouseUp:function(e){return this._unblockFrames(),t.ui.ddmanager&&t.ui.ddmanager.dragStop(this,e),this.handleElement.is(e.target)&&this.element.trigger("focus"),t.ui.mouse.prototype._mouseUp.call(this,e)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp(new t.Event("mouseup",{target:this.element[0]})):this._clear(),this},_getHandle:function(e){return this.options.handle?!!t(e.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this._addClass(this.handleElement,"ui-draggable-handle")},_removeHandleClassName:function(){this._removeClass(this.handleElement,"ui-draggable-handle")},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper),n=s?t(i.helper.apply(this.element[0],[e])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return n.parents("body").length||n.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s&&n[0]===this.element[0]&&this._setPositionRelative(),n[0]===this.element[0]||/(fixed|absolute)/.test(n.css("position"))||n.css("position","absolute"),n},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_isRootNode:function(t){return/(html|body)/i.test(t.tagName)||t===this.document[0]},_getParentOffset:function(){var e=this.offsetParent.offset(),i=this.document[0];return"absolute"===this.cssPosition&&this.scrollParent[0]!==i&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var t=this.element.position(),e=this._isRootNode(this.scrollParent[0]);return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+(e?0:this.scrollParent.scrollTop()),left:t.left-(parseInt(this.helper.css("left"),10)||0)+(e?0:this.scrollParent.scrollLeft())}
+},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options,o=this.document[0];return this.relativeContainer=null,n.containment?"window"===n.containment?(this.containment=[t(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,t(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,t(window).scrollLeft()+t(window).width()-this.helperProportions.width-this.margins.left,t(window).scrollTop()+(t(window).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):"document"===n.containment?(this.containment=[0,0,t(o).width()-this.helperProportions.width-this.margins.left,(t(o).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):n.containment.constructor===Array?(this.containment=n.containment,void 0):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=t(n.containment),s=i[0],s&&(e=/(scroll|auto)/.test(i.css("overflow")),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(e?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(e?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=i),void 0):(this.containment=null,void 0)},_convertPositionTo:function(t,e){e||(e=this.position);var i="absolute"===t?1:-1,s=this._isRootNode(this.scrollParent[0]);return{top:e.top+this.offset.relative.top*i+this.offset.parent.top*i-("fixed"===this.cssPosition?-this.offset.scroll.top:s?0:this.offset.scroll.top)*i,left:e.left+this.offset.relative.left*i+this.offset.parent.left*i-("fixed"===this.cssPosition?-this.offset.scroll.left:s?0:this.offset.scroll.left)*i}},_generatePosition:function(t,e){var i,s,n,o,a=this.options,r=this._isRootNode(this.scrollParent[0]),h=t.pageX,l=t.pageY;return r&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),e&&(this.containment&&(this.relativeContainer?(s=this.relativeContainer.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,t.pageX-this.offset.click.left<i[0]&&(h=i[0]+this.offset.click.left),t.pageY-this.offset.click.top<i[1]&&(l=i[1]+this.offset.click.top),t.pageX-this.offset.click.left>i[2]&&(h=i[2]+this.offset.click.left),t.pageY-this.offset.click.top>i[3]&&(l=i[3]+this.offset.click.top)),a.grid&&(n=a.grid[1]?this.originalPageY+Math.round((l-this.originalPageY)/a.grid[1])*a.grid[1]:this.originalPageY,l=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-a.grid[1]:n+a.grid[1]:n,o=a.grid[0]?this.originalPageX+Math.round((h-this.originalPageX)/a.grid[0])*a.grid[0]:this.originalPageX,h=i?o-this.offset.click.left>=i[0]||o-this.offset.click.left>i[2]?o:o-this.offset.click.left>=i[0]?o-a.grid[0]:o+a.grid[0]:o),"y"===a.axis&&(h=this.originalPageX),"x"===a.axis&&(l=this.originalPageY)),{top:l-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:r?0:this.offset.scroll.top),left:h-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:r?0:this.offset.scroll.left)}},_clear:function(){this._removeClass(this.helper,"ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_trigger:function(e,i,s){return s=s||this._uiHash(),t.ui.plugin.call(this,e,[i,s,this],!0),/^(drag|start|stop)/.test(e)&&(this.positionAbs=this._convertPositionTo("absolute"),s.offset=this.positionAbs),t.Widget.prototype._trigger.call(this,e,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),t.ui.plugin.add("draggable","connectToSortable",{start:function(e,i,s){var n=t.extend({},i,{item:s.element});s.sortables=[],t(s.options.connectToSortable).each(function(){var i=t(this).sortable("instance");i&&!i.options.disabled&&(s.sortables.push(i),i.refreshPositions(),i._trigger("activate",e,n))})},stop:function(e,i,s){var n=t.extend({},i,{item:s.element});s.cancelHelperRemoval=!1,t.each(s.sortables,function(){var t=this;t.isOver?(t.isOver=0,s.cancelHelperRemoval=!0,t.cancelHelperRemoval=!1,t._storedCSS={position:t.placeholder.css("position"),top:t.placeholder.css("top"),left:t.placeholder.css("left")},t._mouseStop(e),t.options.helper=t.options._helper):(t.cancelHelperRemoval=!0,t._trigger("deactivate",e,n))})},drag:function(e,i,s){t.each(s.sortables,function(){var n=!1,o=this;o.positionAbs=s.positionAbs,o.helperProportions=s.helperProportions,o.offset.click=s.offset.click,o._intersectsWith(o.containerCache)&&(n=!0,t.each(s.sortables,function(){return this.positionAbs=s.positionAbs,this.helperProportions=s.helperProportions,this.offset.click=s.offset.click,this!==o&&this._intersectsWith(this.containerCache)&&t.contains(o.element[0],this.element[0])&&(n=!1),n})),n?(o.isOver||(o.isOver=1,s._parent=i.helper.parent(),o.currentItem=i.helper.appendTo(o.element).data("ui-sortable-item",!0),o.options._helper=o.options.helper,o.options.helper=function(){return i.helper[0]},e.target=o.currentItem[0],o._mouseCapture(e,!0),o._mouseStart(e,!0,!0),o.offset.click.top=s.offset.click.top,o.offset.click.left=s.offset.click.left,o.offset.parent.left-=s.offset.parent.left-o.offset.parent.left,o.offset.parent.top-=s.offset.parent.top-o.offset.parent.top,s._trigger("toSortable",e),s.dropped=o.element,t.each(s.sortables,function(){this.refreshPositions()}),s.currentItem=s.element,o.fromOutside=s),o.currentItem&&(o._mouseDrag(e),i.position=o.position)):o.isOver&&(o.isOver=0,o.cancelHelperRemoval=!0,o.options._revert=o.options.revert,o.options.revert=!1,o._trigger("out",e,o._uiHash(o)),o._mouseStop(e,!0),o.options.revert=o.options._revert,o.options.helper=o.options._helper,o.placeholder&&o.placeholder.remove(),i.helper.appendTo(s._parent),s._refreshOffsets(e),i.position=s._generatePosition(e,!0),s._trigger("fromSortable",e),s.dropped=!1,t.each(s.sortables,function(){this.refreshPositions()}))})}}),t.ui.plugin.add("draggable","cursor",{start:function(e,i,s){var n=t("body"),o=s.options;n.css("cursor")&&(o._cursor=n.css("cursor")),n.css("cursor",o.cursor)},stop:function(e,i,s){var n=s.options;n._cursor&&t("body").css("cursor",n._cursor)}}),t.ui.plugin.add("draggable","opacity",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("opacity")&&(o._opacity=n.css("opacity")),n.css("opacity",o.opacity)},stop:function(e,i,s){var n=s.options;n._opacity&&t(i.helper).css("opacity",n._opacity)}}),t.ui.plugin.add("draggable","scroll",{start:function(t,e,i){i.scrollParentNotHidden||(i.scrollParentNotHidden=i.helper.scrollParent(!1)),i.scrollParentNotHidden[0]!==i.document[0]&&"HTML"!==i.scrollParentNotHidden[0].tagName&&(i.overflowOffset=i.scrollParentNotHidden.offset())},drag:function(e,i,s){var n=s.options,o=!1,a=s.scrollParentNotHidden[0],r=s.document[0];a!==r&&"HTML"!==a.tagName?(n.axis&&"x"===n.axis||(s.overflowOffset.top+a.offsetHeight-e.pageY<n.scrollSensitivity?a.scrollTop=o=a.scrollTop+n.scrollSpeed:e.pageY-s.overflowOffset.top<n.scrollSensitivity&&(a.scrollTop=o=a.scrollTop-n.scrollSpeed)),n.axis&&"y"===n.axis||(s.overflowOffset.left+a.offsetWidth-e.pageX<n.scrollSensitivity?a.scrollLeft=o=a.scrollLeft+n.scrollSpeed:e.pageX-s.overflowOffset.left<n.scrollSensitivity&&(a.scrollLeft=o=a.scrollLeft-n.scrollSpeed))):(n.axis&&"x"===n.axis||(e.pageY-t(r).scrollTop()<n.scrollSensitivity?o=t(r).scrollTop(t(r).scrollTop()-n.scrollSpeed):t(window).height()-(e.pageY-t(r).scrollTop())<n.scrollSensitivity&&(o=t(r).scrollTop(t(r).scrollTop()+n.scrollSpeed))),n.axis&&"y"===n.axis||(e.pageX-t(r).scrollLeft()<n.scrollSensitivity?o=t(r).scrollLeft(t(r).scrollLeft()-n.scrollSpeed):t(window).width()-(e.pageX-t(r).scrollLeft())<n.scrollSensitivity&&(o=t(r).scrollLeft(t(r).scrollLeft()+n.scrollSpeed)))),o!==!1&&t.ui.ddmanager&&!n.dropBehaviour&&t.ui.ddmanager.prepareOffsets(s,e)}}),t.ui.plugin.add("draggable","snap",{start:function(e,i,s){var n=s.options;s.snapElements=[],t(n.snap.constructor!==String?n.snap.items||":data(ui-draggable)":n.snap).each(function(){var e=t(this),i=e.offset();this!==s.element[0]&&s.snapElements.push({item:this,width:e.outerWidth(),height:e.outerHeight(),top:i.top,left:i.left})})},drag:function(e,i,s){var n,o,a,r,h,l,c,u,d,p,f=s.options,g=f.snapTolerance,m=i.offset.left,_=m+s.helperProportions.width,v=i.offset.top,b=v+s.helperProportions.height;for(d=s.snapElements.length-1;d>=0;d--)h=s.snapElements[d].left-s.margins.left,l=h+s.snapElements[d].width,c=s.snapElements[d].top-s.margins.top,u=c+s.snapElements[d].height,h-g>_||m>l+g||c-g>b||v>u+g||!t.contains(s.snapElements[d].item.ownerDocument,s.snapElements[d].item)?(s.snapElements[d].snapping&&s.options.snap.release&&s.options.snap.release.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=!1):("inner"!==f.snapMode&&(n=g>=Math.abs(c-b),o=g>=Math.abs(u-v),a=g>=Math.abs(h-_),r=g>=Math.abs(l-m),n&&(i.position.top=s._convertPositionTo("relative",{top:c-s.helperProportions.height,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h-s.helperProportions.width}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l}).left)),p=n||o||a||r,"outer"!==f.snapMode&&(n=g>=Math.abs(c-v),o=g>=Math.abs(u-b),a=g>=Math.abs(h-m),r=g>=Math.abs(l-_),n&&(i.position.top=s._convertPositionTo("relative",{top:c,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u-s.helperProportions.height,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l-s.helperProportions.width}).left)),!s.snapElements[d].snapping&&(n||o||a||r||p)&&s.options.snap.snap&&s.options.snap.snap.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=n||o||a||r||p)}}),t.ui.plugin.add("draggable","stack",{start:function(e,i,s){var n,o=s.options,a=t.makeArray(t(o.stack)).sort(function(e,i){return(parseInt(t(e).css("zIndex"),10)||0)-(parseInt(t(i).css("zIndex"),10)||0)});a.length&&(n=parseInt(t(a[0]).css("zIndex"),10)||0,t(a).each(function(e){t(this).css("zIndex",n+e)}),this.css("zIndex",n+a.length))}}),t.ui.plugin.add("draggable","zIndex",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("zIndex")&&(o._zIndex=n.css("zIndex")),n.css("zIndex",o.zIndex)},stop:function(e,i,s){var n=s.options;n._zIndex&&t(i.helper).css("zIndex",n._zIndex)}}),t.ui.draggable,t.widget("ui.resizable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,classes:{"ui-resizable-se":"ui-icon ui-icon-gripsmall-diagonal-se"},containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(t){return parseFloat(t)||0},_isNumber:function(t){return!isNaN(parseFloat(t))},_hasScroll:function(e,i){if("hidden"===t(e).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return e[s]>0?!0:(e[s]=1,n=e[s]>0,e[s]=0,n)},_create:function(){var e,i=this.options,s=this;this._addClass("ui-resizable"),t.extend(this,{_aspectRatio:!!i.aspectRatio,aspectRatio:i.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:i.helper||i.ghost||i.animate?i.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)&&(this.element.wrap(t("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,e={marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom"),marginLeft:this.originalElement.css("marginLeft")},this.element.css(e),this.originalElement.css("margin",0),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css(e),this._proportionallyResize()),this._setupHandles(),i.autoHide&&t(this.element).on("mouseenter",function(){i.disabled||(s._removeClass("ui-resizable-autohide"),s._handles.show())}).on("mouseleave",function(){i.disabled||s.resizing||(s._addClass("ui-resizable-autohide"),s._handles.hide())}),this._mouseInit()},_destroy:function(){this._mouseDestroy();var e,i=function(e){t(e).removeData("resizable").removeData("ui-resizable").off(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),e=this.element,this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")}).insertAfter(e),e.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_setOption:function(t,e){switch(this._super(t,e),t){case"handles":this._removeHandles(),this._setupHandles();break;default:}},_setupHandles:function(){var e,i,s,n,o,a=this.options,r=this;if(this.handles=a.handles||(t(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=t(),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),s=this.handles.split(","),this.handles={},i=0;s.length>i;i++)e=t.trim(s[i]),n="ui-resizable-"+e,o=t("<div>"),this._addClass(o,"ui-resizable-handle "+n),o.css({zIndex:a.zIndex}),this.handles[e]=".ui-resizable-"+e,this.element.append(o);this._renderAxis=function(e){var i,s,n,o;e=e||this.element;for(i in this.handles)this.handles[i].constructor===String?this.handles[i]=this.element.children(this.handles[i]).first().show():(this.handles[i].jquery||this.handles[i].nodeType)&&(this.handles[i]=t(this.handles[i]),this._on(this.handles[i],{mousedown:r._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(s=t(this.handles[i],this.element),o=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),e.css(n,o),this._proportionallyResize()),this._handles=this._handles.add(this.handles[i])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.on("mouseover",function(){r.resizing||(this.className&&(o=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),r.axis=o&&o[1]?o[1]:"se")}),a.autoHide&&(this._handles.hide(),this._addClass("ui-resizable-autohide"))},_removeHandles:function(){this._handles.remove()},_mouseCapture:function(e){var i,s,n=!1;for(i in this.handles)s=t(this.handles[i])[0],(s===e.target||t.contains(s,e.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(e){var i,s,n,o=this.options,a=this.element;return this.resizing=!0,this._renderProxy(),i=this._num(this.helper.css("left")),s=this._num(this.helper.css("top")),o.containment&&(i+=t(o.containment).scrollLeft()||0,s+=t(o.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:i,top:s},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:a.width(),height:a.height()},this.originalSize=this._helper?{width:a.outerWidth(),height:a.outerHeight()}:{width:a.width(),height:a.height()},this.sizeDiff={width:a.outerWidth()-a.width(),height:a.outerHeight()-a.height()},this.originalPosition={left:i,top:s},this.originalMousePosition={left:e.pageX,top:e.pageY},this.aspectRatio="number"==typeof o.aspectRatio?o.aspectRatio:this.originalSize.width/this.originalSize.height||1,n=t(".ui-resizable-"+this.axis).css("cursor"),t("body").css("cursor","auto"===n?this.axis+"-resize":n),this._addClass("ui-resizable-resizing"),this._propagate("start",e),!0},_mouseDrag:function(e){var i,s,n=this.originalMousePosition,o=this.axis,a=e.pageX-n.left||0,r=e.pageY-n.top||0,h=this._change[o];return this._updatePrevProperties(),h?(i=h.apply(this,[e,a,r]),this._updateVirtualBoundaries(e.shiftKey),(this._aspectRatio||e.shiftKey)&&(i=this._updateRatio(i,e)),i=this._respectSize(i,e),this._updateCache(i),this._propagate("resize",e),s=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),t.isEmptyObject(s)||(this._updatePrevProperties(),this._trigger("resize",e,this.ui()),this._applyChanges()),!1):!1},_mouseStop:function(e){this.resizing=!1;var i,s,n,o,a,r,h,l=this.options,c=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&this._hasScroll(i[0],"left")?0:c.sizeDiff.height,o=s?0:c.sizeDiff.width,a={width:c.helper.width()-o,height:c.helper.height()-n},r=parseFloat(c.element.css("left"))+(c.position.left-c.originalPosition.left)||null,h=parseFloat(c.element.css("top"))+(c.position.top-c.originalPosition.top)||null,l.animate||this.element.css(t.extend(a,{top:h,left:r})),c.helper.height(c.size.height),c.helper.width(c.size.width),this._helper&&!l.animate&&this._proportionallyResize()),t("body").css("cursor","auto"),this._removeClass("ui-resizable-resizing"),this._propagate("stop",e),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var t={};return this.position.top!==this.prevPosition.top&&(t.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(t.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(t.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(t.height=this.size.height+"px"),this.helper.css(t),t},_updateVirtualBoundaries:function(t){var e,i,s,n,o,a=this.options;o={minWidth:this._isNumber(a.minWidth)?a.minWidth:0,maxWidth:this._isNumber(a.maxWidth)?a.maxWidth:1/0,minHeight:this._isNumber(a.minHeight)?a.minHeight:0,maxHeight:this._isNumber(a.maxHeight)?a.maxHeight:1/0},(this._aspectRatio||t)&&(e=o.minHeight*this.aspectRatio,s=o.minWidth/this.aspectRatio,i=o.maxHeight*this.aspectRatio,n=o.maxWidth/this.aspectRatio,e>o.minWidth&&(o.minWidth=e),s>o.minHeight&&(o.minHeight=s),o.maxWidth>i&&(o.maxWidth=i),o.maxHeight>n&&(o.maxHeight=n)),this._vBoundaries=o},_updateCache:function(t){this.offset=this.helper.offset(),this._isNumber(t.left)&&(this.position.left=t.left),this._isNumber(t.top)&&(this.position.top=t.top),this._isNumber(t.height)&&(this.size.height=t.height),this._isNumber(t.width)&&(this.size.width=t.width)},_updateRatio:function(t){var e=this.position,i=this.size,s=this.axis;return this._isNumber(t.height)?t.width=t.height*this.aspectRatio:this._isNumber(t.width)&&(t.height=t.width/this.aspectRatio),"sw"===s&&(t.left=e.left+(i.width-t.width),t.top=null),"nw"===s&&(t.top=e.top+(i.height-t.height),t.left=e.left+(i.width-t.width)),t},_respectSize:function(t){var e=this._vBoundaries,i=this.axis,s=this._isNumber(t.width)&&e.maxWidth&&e.maxWidth<t.width,n=this._isNumber(t.height)&&e.maxHeight&&e.maxHeight<t.height,o=this._isNumber(t.width)&&e.minWidth&&e.minWidth>t.width,a=this._isNumber(t.height)&&e.minHeight&&e.minHeight>t.height,r=this.originalPosition.left+this.originalSize.width,h=this.originalPosition.top+this.originalSize.height,l=/sw|nw|w/.test(i),c=/nw|ne|n/.test(i);return o&&(t.width=e.minWidth),a&&(t.height=e.minHeight),s&&(t.width=e.maxWidth),n&&(t.height=e.maxHeight),o&&l&&(t.left=r-e.minWidth),s&&l&&(t.left=r-e.maxWidth),a&&c&&(t.top=h-e.minHeight),n&&c&&(t.top=h-e.maxHeight),t.width||t.height||t.left||!t.top?t.width||t.height||t.top||!t.left||(t.left=null):t.top=null,t},_getPaddingPlusBorderDimensions:function(t){for(var e=0,i=[],s=[t.css("borderTopWidth"),t.css("borderRightWidth"),t.css("borderBottomWidth"),t.css("borderLeftWidth")],n=[t.css("paddingTop"),t.css("paddingRight"),t.css("paddingBottom"),t.css("paddingLeft")];4>e;e++)i[e]=parseFloat(s[e])||0,i[e]+=parseFloat(n[e])||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var t,e=0,i=this.helper||this.element;this._proportionallyResizeElements.length>e;e++)t=this._proportionallyResizeElements[e],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(t)),t.css({height:i.height()-this.outerDimensions.height||0,width:i.width()-this.outerDimensions.width||0})},_renderProxy:function(){var e=this.element,i=this.options;this.elementOffset=e.offset(),this._helper?(this.helper=this.helper||t("<div style='overflow:hidden;'></div>"),this._addClass(this.helper,this._helper),this.helper.css({width:this.element.outerWidth(),height:this.element.outerHeight(),position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(t,e){return{width:this.originalSize.width+e}},w:function(t,e){var i=this.originalSize,s=this.originalPosition;return{left:s.left+e,width:i.width-e}},n:function(t,e,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(t,e,i){return{height:this.originalSize.height+i}},se:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},sw:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,i,s]))},ne:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},nw:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,i,s]))}},_propagate:function(e,i){t.ui.plugin.call(this,e,[i,this.ui()]),"resize"!==e&&this._trigger(e,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),t.ui.plugin.add("resizable","animate",{stop:function(e){var i=t(this).resizable("instance"),s=i.options,n=i._proportionallyResizeElements,o=n.length&&/textarea/i.test(n[0].nodeName),a=o&&i._hasScroll(n[0],"left")?0:i.sizeDiff.height,r=o?0:i.sizeDiff.width,h={width:i.size.width-r,height:i.size.height-a},l=parseFloat(i.element.css("left"))+(i.position.left-i.originalPosition.left)||null,c=parseFloat(i.element.css("top"))+(i.position.top-i.originalPosition.top)||null;i.element.animate(t.extend(h,c&&l?{top:c,left:l}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseFloat(i.element.css("width")),height:parseFloat(i.element.css("height")),top:parseFloat(i.element.css("top")),left:parseFloat(i.element.css("left"))};n&&n.length&&t(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",e)}})}}),t.ui.plugin.add("resizable","containment",{start:function(){var e,i,s,n,o,a,r,h=t(this).resizable("instance"),l=h.options,c=h.element,u=l.containment,d=u instanceof t?u.get(0):/parent/.test(u)?c.parent().get(0):u;d&&(h.containerElement=t(d),/document/.test(u)||u===document?(h.containerOffset={left:0,top:0},h.containerPosition={left:0,top:0},h.parentData={element:t(document),left:0,top:0,width:t(document).width(),height:t(document).height()||document.body.parentNode.scrollHeight}):(e=t(d),i=[],t(["Top","Right","Left","Bottom"]).each(function(t,s){i[t]=h._num(e.css("padding"+s))}),h.containerOffset=e.offset(),h.containerPosition=e.position(),h.containerSize={height:e.innerHeight()-i[3],width:e.innerWidth()-i[1]},s=h.containerOffset,n=h.containerSize.height,o=h.containerSize.width,a=h._hasScroll(d,"left")?d.scrollWidth:o,r=h._hasScroll(d)?d.scrollHeight:n,h.parentData={element:d,left:s.left,top:s.top,width:a,height:r}))},resize:function(e){var i,s,n,o,a=t(this).resizable("instance"),r=a.options,h=a.containerOffset,l=a.position,c=a._aspectRatio||e.shiftKey,u={top:0,left:0},d=a.containerElement,p=!0;d[0]!==document&&/static/.test(d.css("position"))&&(u=h),l.left<(a._helper?h.left:0)&&(a.size.width=a.size.width+(a._helper?a.position.left-h.left:a.position.left-u.left),c&&(a.size.height=a.size.width/a.aspectRatio,p=!1),a.position.left=r.helper?h.left:0),l.top<(a._helper?h.top:0)&&(a.size.height=a.size.height+(a._helper?a.position.top-h.top:a.position.top),c&&(a.size.width=a.size.height*a.aspectRatio,p=!1),a.position.top=a._helper?h.top:0),n=a.containerElement.get(0)===a.element.parent().get(0),o=/relative|absolute/.test(a.containerElement.css("position")),n&&o?(a.offset.left=a.parentData.left+a.position.left,a.offset.top=a.parentData.top+a.position.top):(a.offset.left=a.element.offset().left,a.offset.top=a.element.offset().top),i=Math.abs(a.sizeDiff.width+(a._helper?a.offset.left-u.left:a.offset.left-h.left)),s=Math.abs(a.sizeDiff.height+(a._helper?a.offset.top-u.top:a.offset.top-h.top)),i+a.size.width>=a.parentData.width&&(a.size.width=a.parentData.width-i,c&&(a.size.height=a.size.width/a.aspectRatio,p=!1)),s+a.size.height>=a.parentData.height&&(a.size.height=a.parentData.height-s,c&&(a.size.width=a.size.height*a.aspectRatio,p=!1)),p||(a.position.left=a.prevPosition.left,a.position.top=a.prevPosition.top,a.size.width=a.prevSize.width,a.size.height=a.prevSize.height)},stop:function(){var e=t(this).resizable("instance"),i=e.options,s=e.containerOffset,n=e.containerPosition,o=e.containerElement,a=t(e.helper),r=a.offset(),h=a.outerWidth()-e.sizeDiff.width,l=a.outerHeight()-e.sizeDiff.height;e._helper&&!i.animate&&/relative/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l}),e._helper&&!i.animate&&/static/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l})}}),t.ui.plugin.add("resizable","alsoResize",{start:function(){var e=t(this).resizable("instance"),i=e.options;t(i.alsoResize).each(function(){var e=t(this);e.data("ui-resizable-alsoresize",{width:parseFloat(e.width()),height:parseFloat(e.height()),left:parseFloat(e.css("left")),top:parseFloat(e.css("top"))})})},resize:function(e,i){var s=t(this).resizable("instance"),n=s.options,o=s.originalSize,a=s.originalPosition,r={height:s.size.height-o.height||0,width:s.size.width-o.width||0,top:s.position.top-a.top||0,left:s.position.left-a.left||0};t(n.alsoResize).each(function(){var e=t(this),s=t(this).data("ui-resizable-alsoresize"),n={},o=e.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];t.each(o,function(t,e){var i=(s[e]||0)+(r[e]||0);i&&i>=0&&(n[e]=i||null)}),e.css(n)})},stop:function(){t(this).removeData("ui-resizable-alsoresize")}}),t.ui.plugin.add("resizable","ghost",{start:function(){var e=t(this).resizable("instance"),i=e.size;e.ghost=e.originalElement.clone(),e.ghost.css({opacity:.25,display:"block",position:"relative",height:i.height,width:i.width,margin:0,left:0,top:0}),e._addClass(e.ghost,"ui-resizable-ghost"),t.uiBackCompat!==!1&&"string"==typeof e.options.ghost&&e.ghost.addClass(this.options.ghost),e.ghost.appendTo(e.helper)},resize:function(){var e=t(this).resizable("instance");e.ghost&&e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})},stop:function(){var e=t(this).resizable("instance");e.ghost&&e.helper&&e.helper.get(0).removeChild(e.ghost.get(0))}}),t.ui.plugin.add("resizable","grid",{resize:function(){var e,i=t(this).resizable("instance"),s=i.options,n=i.size,o=i.originalSize,a=i.originalPosition,r=i.axis,h="number"==typeof s.grid?[s.grid,s.grid]:s.grid,l=h[0]||1,c=h[1]||1,u=Math.round((n.width-o.width)/l)*l,d=Math.round((n.height-o.height)/c)*c,p=o.width+u,f=o.height+d,g=s.maxWidth&&p>s.maxWidth,m=s.maxHeight&&f>s.maxHeight,_=s.minWidth&&s.minWidth>p,v=s.minHeight&&s.minHeight>f;s.grid=h,_&&(p+=l),v&&(f+=c),g&&(p-=l),m&&(f-=c),/^(se|s|e)$/.test(r)?(i.size.width=p,i.size.height=f):/^(ne)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.top=a.top-d):/^(sw)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.left=a.left-u):((0>=f-c||0>=p-l)&&(e=i._getPaddingPlusBorderDimensions(this)),f-c>0?(i.size.height=f,i.position.top=a.top-d):(f=c-e.height,i.size.height=f,i.position.top=a.top+o.height-f),p-l>0?(i.size.width=p,i.position.left=a.left-u):(p=l-e.width,i.size.width=p,i.position.left=a.left+o.width-p))}}),t.ui.resizable,t.widget("ui.dialog",{version:"1.12.1",options:{appendTo:"body",autoOpen:!0,buttons:[],classes:{"ui-dialog":"ui-corner-all","ui-dialog-titlebar":"ui-corner-all"},closeOnEscape:!0,closeText:"Close",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(e){var i=t(this).css(e).offset().top;0>i&&t(this).css("top",e.top-i)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),null==this.options.title&&null!=this.originalTitle&&(this.options.title=this.originalTitle),this.options.disabled&&(this.options.disabled=!1),this._createWrapper(),this.element.show().removeAttr("title").appendTo(this.uiDialog),this._addClass("ui-dialog-content","ui-widget-content"),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&t.fn.draggable&&this._makeDraggable(),this.options.resizable&&t.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var e=this.options.appendTo;return e&&(e.jquery||e.nodeType)?t(e):this.document.find(e||"body").eq(0)},_destroy:function(){var t,e=this.originalPosition;this._untrackInstance(),this._destroyOverlay(),this.element.removeUniqueId().css(this.originalCss).detach(),this.uiDialog.remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),t=e.parent.children().eq(e.index),t.length&&t[0]!==this.element[0]?t.before(this.element):e.parent.append(this.element)},widget:function(){return this.uiDialog
+},disable:t.noop,enable:t.noop,close:function(e){var i=this;this._isOpen&&this._trigger("beforeClose",e)!==!1&&(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),this.opener.filter(":focusable").trigger("focus").length||t.ui.safeBlur(t.ui.safeActiveElement(this.document[0])),this._hide(this.uiDialog,this.options.hide,function(){i._trigger("close",e)}))},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(e,i){var s=!1,n=this.uiDialog.siblings(".ui-front:visible").map(function(){return+t(this).css("z-index")}).get(),o=Math.max.apply(null,n);return o>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",o+1),s=!0),s&&!i&&this._trigger("focus",e),s},open:function(){var e=this;return this._isOpen?(this._moveToTop()&&this._focusTabbable(),void 0):(this._isOpen=!0,this.opener=t(t.ui.safeActiveElement(this.document[0])),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,function(){e._focusTabbable(),e._trigger("focus")}),this._makeFocusTarget(),this._trigger("open"),void 0)},_focusTabbable:function(){var t=this._focusedElement;t||(t=this.element.find("[autofocus]")),t.length||(t=this.element.find(":tabbable")),t.length||(t=this.uiDialogButtonPane.find(":tabbable")),t.length||(t=this.uiDialogTitlebarClose.filter(":tabbable")),t.length||(t=this.uiDialog),t.eq(0).trigger("focus")},_keepFocus:function(e){function i(){var e=t.ui.safeActiveElement(this.document[0]),i=this.uiDialog[0]===e||t.contains(this.uiDialog[0],e);i||this._focusTabbable()}e.preventDefault(),i.call(this),this._delay(i)},_createWrapper:function(){this.uiDialog=t("<div>").hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._addClass(this.uiDialog,"ui-dialog","ui-widget ui-widget-content ui-front"),this._on(this.uiDialog,{keydown:function(e){if(this.options.closeOnEscape&&!e.isDefaultPrevented()&&e.keyCode&&e.keyCode===t.ui.keyCode.ESCAPE)return e.preventDefault(),this.close(e),void 0;if(e.keyCode===t.ui.keyCode.TAB&&!e.isDefaultPrevented()){var i=this.uiDialog.find(":tabbable"),s=i.filter(":first"),n=i.filter(":last");e.target!==n[0]&&e.target!==this.uiDialog[0]||e.shiftKey?e.target!==s[0]&&e.target!==this.uiDialog[0]||!e.shiftKey||(this._delay(function(){n.trigger("focus")}),e.preventDefault()):(this._delay(function(){s.trigger("focus")}),e.preventDefault())}},mousedown:function(t){this._moveToTop(t)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var e;this.uiDialogTitlebar=t("<div>"),this._addClass(this.uiDialogTitlebar,"ui-dialog-titlebar","ui-widget-header ui-helper-clearfix"),this._on(this.uiDialogTitlebar,{mousedown:function(e){t(e.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.trigger("focus")}}),this.uiDialogTitlebarClose=t("<button type='button'></button>").button({label:t("<a>").text(this.options.closeText).html(),icon:"ui-icon-closethick",showLabel:!1}).appendTo(this.uiDialogTitlebar),this._addClass(this.uiDialogTitlebarClose,"ui-dialog-titlebar-close"),this._on(this.uiDialogTitlebarClose,{click:function(t){t.preventDefault(),this.close(t)}}),e=t("<span>").uniqueId().prependTo(this.uiDialogTitlebar),this._addClass(e,"ui-dialog-title"),this._title(e),this.uiDialogTitlebar.prependTo(this.uiDialog),this.uiDialog.attr({"aria-labelledby":e.attr("id")})},_title:function(t){this.options.title?t.text(this.options.title):t.html("&#160;")},_createButtonPane:function(){this.uiDialogButtonPane=t("<div>"),this._addClass(this.uiDialogButtonPane,"ui-dialog-buttonpane","ui-widget-content ui-helper-clearfix"),this.uiButtonSet=t("<div>").appendTo(this.uiDialogButtonPane),this._addClass(this.uiButtonSet,"ui-dialog-buttonset"),this._createButtons()},_createButtons:function(){var e=this,i=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),t.isEmptyObject(i)||t.isArray(i)&&!i.length?(this._removeClass(this.uiDialog,"ui-dialog-buttons"),void 0):(t.each(i,function(i,s){var n,o;s=t.isFunction(s)?{click:s,text:i}:s,s=t.extend({type:"button"},s),n=s.click,o={icon:s.icon,iconPosition:s.iconPosition,showLabel:s.showLabel,icons:s.icons,text:s.text},delete s.click,delete s.icon,delete s.iconPosition,delete s.showLabel,delete s.icons,"boolean"==typeof s.text&&delete s.text,t("<button></button>",s).button(o).appendTo(e.uiButtonSet).on("click",function(){n.apply(e.element[0],arguments)})}),this._addClass(this.uiDialog,"ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog),void 0)},_makeDraggable:function(){function e(t){return{position:t.position,offset:t.offset}}var i=this,s=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(s,n){i._addClass(t(this),"ui-dialog-dragging"),i._blockFrames(),i._trigger("dragStart",s,e(n))},drag:function(t,s){i._trigger("drag",t,e(s))},stop:function(n,o){var a=o.offset.left-i.document.scrollLeft(),r=o.offset.top-i.document.scrollTop();s.position={my:"left top",at:"left"+(a>=0?"+":"")+a+" "+"top"+(r>=0?"+":"")+r,of:i.window},i._removeClass(t(this),"ui-dialog-dragging"),i._unblockFrames(),i._trigger("dragStop",n,e(o))}})},_makeResizable:function(){function e(t){return{originalPosition:t.originalPosition,originalSize:t.originalSize,position:t.position,size:t.size}}var i=this,s=this.options,n=s.resizable,o=this.uiDialog.css("position"),a="string"==typeof n?n:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:s.maxWidth,maxHeight:s.maxHeight,minWidth:s.minWidth,minHeight:this._minHeight(),handles:a,start:function(s,n){i._addClass(t(this),"ui-dialog-resizing"),i._blockFrames(),i._trigger("resizeStart",s,e(n))},resize:function(t,s){i._trigger("resize",t,e(s))},stop:function(n,o){var a=i.uiDialog.offset(),r=a.left-i.document.scrollLeft(),h=a.top-i.document.scrollTop();s.height=i.uiDialog.height(),s.width=i.uiDialog.width(),s.position={my:"left top",at:"left"+(r>=0?"+":"")+r+" "+"top"+(h>=0?"+":"")+h,of:i.window},i._removeClass(t(this),"ui-dialog-resizing"),i._unblockFrames(),i._trigger("resizeStop",n,e(o))}}).css("position",o)},_trackFocus:function(){this._on(this.widget(),{focusin:function(e){this._makeFocusTarget(),this._focusedElement=t(e.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var e=this._trackingInstances(),i=t.inArray(this,e);-1!==i&&e.splice(i,1)},_trackingInstances:function(){var t=this.document.data("ui-dialog-instances");return t||(t=[],this.document.data("ui-dialog-instances",t)),t},_minHeight:function(){var t=this.options;return"auto"===t.height?t.minHeight:Math.min(t.minHeight,t.height)},_position:function(){var t=this.uiDialog.is(":visible");t||this.uiDialog.show(),this.uiDialog.position(this.options.position),t||this.uiDialog.hide()},_setOptions:function(e){var i=this,s=!1,n={};t.each(e,function(t,e){i._setOption(t,e),t in i.sizeRelatedOptions&&(s=!0),t in i.resizableRelatedOptions&&(n[t]=e)}),s&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",n)},_setOption:function(e,i){var s,n,o=this.uiDialog;"disabled"!==e&&(this._super(e,i),"appendTo"===e&&this.uiDialog.appendTo(this._appendTo()),"buttons"===e&&this._createButtons(),"closeText"===e&&this.uiDialogTitlebarClose.button({label:t("<a>").text(""+this.options.closeText).html()}),"draggable"===e&&(s=o.is(":data(ui-draggable)"),s&&!i&&o.draggable("destroy"),!s&&i&&this._makeDraggable()),"position"===e&&this._position(),"resizable"===e&&(n=o.is(":data(ui-resizable)"),n&&!i&&o.resizable("destroy"),n&&"string"==typeof i&&o.resizable("option","handles",i),n||i===!1||this._makeResizable()),"title"===e&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var t,e,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),t=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),e=Math.max(0,s.minHeight-t),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-t):"none","auto"===s.height?this.element.css({minHeight:e,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-t)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var e=t(this);return t("<div>").css({position:"absolute",width:e.outerWidth(),height:e.outerHeight()}).appendTo(e.parent()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(e){return t(e.target).closest(".ui-dialog").length?!0:!!t(e.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var e=!0;this._delay(function(){e=!1}),this.document.data("ui-dialog-overlays")||this._on(this.document,{focusin:function(t){e||this._allowInteraction(t)||(t.preventDefault(),this._trackingInstances()[0]._focusTabbable())}}),this.overlay=t("<div>").appendTo(this._appendTo()),this._addClass(this.overlay,null,"ui-widget-overlay ui-front"),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var t=this.document.data("ui-dialog-overlays")-1;t?this.document.data("ui-dialog-overlays",t):(this._off(this.document,"focusin"),this.document.removeData("ui-dialog-overlays")),this.overlay.remove(),this.overlay=null}}}),t.uiBackCompat!==!1&&t.widget("ui.dialog",t.ui.dialog,{options:{dialogClass:""},_createWrapper:function(){this._super(),this.uiDialog.addClass(this.options.dialogClass)},_setOption:function(t,e){"dialogClass"===t&&this.uiDialog.removeClass(this.options.dialogClass).addClass(e),this._superApply(arguments)}}),t.ui.dialog,t.widget("ui.droppable",{version:"1.12.1",widgetEventPrefix:"drop",options:{accept:"*",addClasses:!0,greedy:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var e,i=this.options,s=i.accept;this.isover=!1,this.isout=!0,this.accept=t.isFunction(s)?s:function(t){return t.is(s)},this.proportions=function(){return arguments.length?(e=arguments[0],void 0):e?e:e={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}},this._addToManager(i.scope),i.addClasses&&this._addClass("ui-droppable")},_addToManager:function(e){t.ui.ddmanager.droppables[e]=t.ui.ddmanager.droppables[e]||[],t.ui.ddmanager.droppables[e].push(this)},_splice:function(t){for(var e=0;t.length>e;e++)t[e]===this&&t.splice(e,1)},_destroy:function(){var e=t.ui.ddmanager.droppables[this.options.scope];this._splice(e)},_setOption:function(e,i){if("accept"===e)this.accept=t.isFunction(i)?i:function(t){return t.is(i)};else if("scope"===e){var s=t.ui.ddmanager.droppables[this.options.scope];this._splice(s),this._addToManager(i)}this._super(e,i)},_activate:function(e){var i=t.ui.ddmanager.current;this._addActiveClass(),i&&this._trigger("activate",e,this.ui(i))},_deactivate:function(e){var i=t.ui.ddmanager.current;this._removeActiveClass(),i&&this._trigger("deactivate",e,this.ui(i))},_over:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this._addHoverClass(),this._trigger("over",e,this.ui(i)))},_out:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this._removeHoverClass(),this._trigger("out",e,this.ui(i)))},_drop:function(e,i){var s=i||t.ui.ddmanager.current,n=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var i=t(this).droppable("instance");return i.options.greedy&&!i.options.disabled&&i.options.scope===s.options.scope&&i.accept.call(i.element[0],s.currentItem||s.element)&&v(s,t.extend(i,{offset:i.element.offset()}),i.options.tolerance,e)?(n=!0,!1):void 0}),n?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this._removeActiveClass(),this._removeHoverClass(),this._trigger("drop",e,this.ui(s)),this.element):!1):!1},ui:function(t){return{draggable:t.currentItem||t.element,helper:t.helper,position:t.position,offset:t.positionAbs}},_addHoverClass:function(){this._addClass("ui-droppable-hover")},_removeHoverClass:function(){this._removeClass("ui-droppable-hover")},_addActiveClass:function(){this._addClass("ui-droppable-active")},_removeActiveClass:function(){this._removeClass("ui-droppable-active")}});var v=t.ui.intersect=function(){function t(t,e,i){return t>=e&&e+i>t}return function(e,i,s,n){if(!i.offset)return!1;var o=(e.positionAbs||e.position.absolute).left+e.margins.left,a=(e.positionAbs||e.position.absolute).top+e.margins.top,r=o+e.helperProportions.width,h=a+e.helperProportions.height,l=i.offset.left,c=i.offset.top,u=l+i.proportions().width,d=c+i.proportions().height;switch(s){case"fit":return o>=l&&u>=r&&a>=c&&d>=h;case"intersect":return o+e.helperProportions.width/2>l&&u>r-e.helperProportions.width/2&&a+e.helperProportions.height/2>c&&d>h-e.helperProportions.height/2;case"pointer":return t(n.pageY,c,i.proportions().height)&&t(n.pageX,l,i.proportions().width);case"touch":return(a>=c&&d>=a||h>=c&&d>=h||c>a&&h>d)&&(o>=l&&u>=o||r>=l&&u>=r||l>o&&r>u);default:return!1}}}();t.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(e,i){var s,n,o=t.ui.ddmanager.droppables[e.options.scope]||[],a=i?i.type:null,r=(e.currentItem||e.element).find(":data(ui-droppable)").addBack();t:for(s=0;o.length>s;s++)if(!(o[s].options.disabled||e&&!o[s].accept.call(o[s].element[0],e.currentItem||e.element))){for(n=0;r.length>n;n++)if(r[n]===o[s].element[0]){o[s].proportions().height=0;continue t}o[s].visible="none"!==o[s].element.css("display"),o[s].visible&&("mousedown"===a&&o[s]._activate.call(o[s],i),o[s].offset=o[s].element.offset(),o[s].proportions({width:o[s].element[0].offsetWidth,height:o[s].element[0].offsetHeight}))}},drop:function(e,i){var s=!1;return t.each((t.ui.ddmanager.droppables[e.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&v(e,this,this.options.tolerance,i)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],e.currentItem||e.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(e,i){e.element.parentsUntil("body").on("scroll.droppable",function(){e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)})},drag:function(e,i){e.options.refreshPositions&&t.ui.ddmanager.prepareOffsets(e,i),t.each(t.ui.ddmanager.droppables[e.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,n,o,a=v(e,this,this.options.tolerance,i),r=!a&&this.isover?"isout":a&&!this.isover?"isover":null;r&&(this.options.greedy&&(n=this.options.scope,o=this.element.parents(":data(ui-droppable)").filter(function(){return t(this).droppable("instance").options.scope===n}),o.length&&(s=t(o[0]).droppable("instance"),s.greedyChild="isover"===r)),s&&"isover"===r&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[r]=!0,this["isout"===r?"isover":"isout"]=!1,this["isover"===r?"_over":"_out"].call(this,i),s&&"isout"===r&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(e,i){e.element.parentsUntil("body").off("scroll.droppable"),e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)}},t.uiBackCompat!==!1&&t.widget("ui.droppable",t.ui.droppable,{options:{hoverClass:!1,activeClass:!1},_addActiveClass:function(){this._super(),this.options.activeClass&&this.element.addClass(this.options.activeClass)},_removeActiveClass:function(){this._super(),this.options.activeClass&&this.element.removeClass(this.options.activeClass)},_addHoverClass:function(){this._super(),this.options.hoverClass&&this.element.addClass(this.options.hoverClass)},_removeHoverClass:function(){this._super(),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass)}}),t.ui.droppable,t.widget("ui.progressbar",{version:"1.12.1",options:{classes:{"ui-progressbar":"ui-corner-all","ui-progressbar-value":"ui-corner-left","ui-progressbar-complete":"ui-corner-right"},max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.attr({role:"progressbar","aria-valuemin":this.min}),this._addClass("ui-progressbar","ui-widget ui-widget-content"),this.valueDiv=t("<div>").appendTo(this.element),this._addClass(this.valueDiv,"ui-progressbar-value","ui-widget-header"),this._refreshValue()},_destroy:function(){this.element.removeAttr("role aria-valuemin aria-valuemax aria-valuenow"),this.valueDiv.remove()},value:function(t){return void 0===t?this.options.value:(this.options.value=this._constrainedValue(t),this._refreshValue(),void 0)},_constrainedValue:function(t){return void 0===t&&(t=this.options.value),this.indeterminate=t===!1,"number"!=typeof t&&(t=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,t))},_setOptions:function(t){var e=t.value;delete t.value,this._super(t),this.options.value=this._constrainedValue(e),this._refreshValue()},_setOption:function(t,e){"max"===t&&(e=Math.max(this.min,e)),this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var e=this.options.value,i=this._percentage();this.valueDiv.toggle(this.indeterminate||e>this.min).width(i.toFixed(0)+"%"),this._toggleClass(this.valueDiv,"ui-progressbar-complete",null,e===this.options.max)._toggleClass("ui-progressbar-indeterminate",null,this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=t("<div>").appendTo(this.valueDiv),this._addClass(this.overlayDiv,"ui-progressbar-overlay"))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":e}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==e&&(this.oldValue=e,this._trigger("change")),e===this.options.max&&this._trigger("complete")}}),t.widget("ui.selectable",t.ui.mouse,{version:"1.12.1",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var e=this;this._addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){e.elementPos=t(e.element[0]).offset(),e.selectees=t(e.options.filter,e.element[0]),e._addClass(e.selectees,"ui-selectee"),e.selectees.each(function(){var i=t(this),s=i.offset(),n={left:s.left-e.elementPos.left,top:s.top-e.elementPos.top};t.data(this,"selectable-item",{element:this,$element:i,left:n.left,top:n.top,right:n.left+i.outerWidth(),bottom:n.top+i.outerHeight(),startselected:!1,selected:i.hasClass("ui-selected"),selecting:i.hasClass("ui-selecting"),unselecting:i.hasClass("ui-unselecting")})})},this.refresh(),this._mouseInit(),this.helper=t("<div>"),this._addClass(this.helper,"ui-selectable-helper")},_destroy:function(){this.selectees.removeData("selectable-item"),this._mouseDestroy()},_mouseStart:function(e){var i=this,s=this.options;this.opos=[e.pageX,e.pageY],this.elementPos=t(this.element[0]).offset(),this.options.disabled||(this.selectees=t(s.filter,this.element[0]),this._trigger("start",e),t(s.appendTo).append(this.helper),this.helper.css({left:e.pageX,top:e.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=t.data(this,"selectable-item");s.startselected=!0,e.metaKey||e.ctrlKey||(i._removeClass(s.$element,"ui-selected"),s.selected=!1,i._addClass(s.$element,"ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",e,{unselecting:s.element}))}),t(e.target).parents().addBack().each(function(){var s,n=t.data(this,"selectable-item");return n?(s=!e.metaKey&&!e.ctrlKey||!n.$element.hasClass("ui-selected"),i._removeClass(n.$element,s?"ui-unselecting":"ui-selected")._addClass(n.$element,s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",e,{selecting:n.element}):i._trigger("unselecting",e,{unselecting:n.element}),!1):void 0}))},_mouseDrag:function(e){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,o=this.opos[0],a=this.opos[1],r=e.pageX,h=e.pageY;return o>r&&(i=r,r=o,o=i),a>h&&(i=h,h=a,a=i),this.helper.css({left:o,top:a,width:r-o,height:h-a}),this.selectees.each(function(){var i=t.data(this,"selectable-item"),l=!1,c={};i&&i.element!==s.element[0]&&(c.left=i.left+s.elementPos.left,c.right=i.right+s.elementPos.left,c.top=i.top+s.elementPos.top,c.bottom=i.bottom+s.elementPos.top,"touch"===n.tolerance?l=!(c.left>r||o>c.right||c.top>h||a>c.bottom):"fit"===n.tolerance&&(l=c.left>o&&r>c.right&&c.top>a&&h>c.bottom),l?(i.selected&&(s._removeClass(i.$element,"ui-selected"),i.selected=!1),i.unselecting&&(s._removeClass(i.$element,"ui-unselecting"),i.unselecting=!1),i.selecting||(s._addClass(i.$element,"ui-selecting"),i.selecting=!0,s._trigger("selecting",e,{selecting:i.element}))):(i.selecting&&((e.metaKey||e.ctrlKey)&&i.startselected?(s._removeClass(i.$element,"ui-selecting"),i.selecting=!1,s._addClass(i.$element,"ui-selected"),i.selected=!0):(s._removeClass(i.$element,"ui-selecting"),i.selecting=!1,i.startselected&&(s._addClass(i.$element,"ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",e,{unselecting:i.element}))),i.selected&&(e.metaKey||e.ctrlKey||i.startselected||(s._removeClass(i.$element,"ui-selected"),i.selected=!1,s._addClass(i.$element,"ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",e,{unselecting:i.element})))))}),!1}},_mouseStop:function(e){var i=this;return this.dragged=!1,t(".ui-unselecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");i._removeClass(s.$element,"ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",e,{unselected:s.element})}),t(".ui-selecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");i._removeClass(s.$element,"ui-selecting")._addClass(s.$element,"ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",e,{selected:s.element})}),this._trigger("stop",e),this.helper.remove(),!1}}),t.widget("ui.selectmenu",[t.ui.formResetMixin,{version:"1.12.1",defaultElement:"<select>",options:{appendTo:null,classes:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"},disabled:null,icons:{button:"ui-icon-triangle-1-s"},position:{my:"left top",at:"left bottom",collision:"none"},width:!1,change:null,close:null,focus:null,open:null,select:null},_create:function(){var e=this.element.uniqueId().attr("id");this.ids={element:e,button:e+"-button",menu:e+"-menu"},this._drawButton(),this._drawMenu(),this._bindFormResetHandler(),this._rendered=!1,this.menuItems=t()},_drawButton:function(){var e,i=this,s=this._parseOption(this.element.find("option:selected"),this.element[0].selectedIndex);this.labels=this.element.labels().attr("for",this.ids.button),this._on(this.labels,{click:function(t){this.button.focus(),t.preventDefault()}}),this.element.hide(),this.button=t("<span>",{tabindex:this.options.disabled?-1:0,id:this.ids.button,role:"combobox","aria-expanded":"false","aria-autocomplete":"list","aria-owns":this.ids.menu,"aria-haspopup":"true",title:this.element.attr("title")}).insertAfter(this.element),this._addClass(this.button,"ui-selectmenu-button ui-selectmenu-button-closed","ui-button ui-widget"),e=t("<span>").appendTo(this.button),this._addClass(e,"ui-selectmenu-icon","ui-icon "+this.options.icons.button),this.buttonItem=this._renderButtonItem(s).appendTo(this.button),this.options.width!==!1&&this._resizeButton(),this._on(this.button,this._buttonEvents),this.button.one("focusin",function(){i._rendered||i._refreshMenu()})},_drawMenu:function(){var e=this;this.menu=t("<ul>",{"aria-hidden":"true","aria-labelledby":this.ids.button,id:this.ids.menu}),this.menuWrap=t("<div>").append(this.menu),this._addClass(this.menuWrap,"ui-selectmenu-menu","ui-front"),this.menuWrap.appendTo(this._appendTo()),this.menuInstance=this.menu.menu({classes:{"ui-menu":"ui-corner-bottom"},role:"listbox",select:function(t,i){t.preventDefault(),e._setSelection(),e._select(i.item.data("ui-selectmenu-item"),t)},focus:function(t,i){var s=i.item.data("ui-selectmenu-item");null!=e.focusIndex&&s.index!==e.focusIndex&&(e._trigger("focus",t,{item:s}),e.isOpen||e._select(s,t)),e.focusIndex=s.index,e.button.attr("aria-activedescendant",e.menuItems.eq(s.index).attr("id"))}}).menu("instance"),this.menuInstance._off(this.menu,"mouseleave"),this.menuInstance._closeOnDocumentClick=function(){return!1},this.menuInstance._isDivider=function(){return!1}},refresh:function(){this._refreshMenu(),this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(this._getSelectedItem().data("ui-selectmenu-item")||{})),null===this.options.width&&this._resizeButton()},_refreshMenu:function(){var t,e=this.element.find("option");this.menu.empty(),this._parseOptions(e),this._renderMenu(this.menu,this.items),this.menuInstance.refresh(),this.menuItems=this.menu.find("li").not(".ui-selectmenu-optgroup").find(".ui-menu-item-wrapper"),this._rendered=!0,e.length&&(t=this._getSelectedItem(),this.menuInstance.focus(null,t),this._setAria(t.data("ui-selectmenu-item")),this._setOption("disabled",this.element.prop("disabled")))},open:function(t){this.options.disabled||(this._rendered?(this._removeClass(this.menu.find(".ui-state-active"),null,"ui-state-active"),this.menuInstance.focus(null,this._getSelectedItem())):this._refreshMenu(),this.menuItems.length&&(this.isOpen=!0,this._toggleAttr(),this._resizeMenu(),this._position(),this._on(this.document,this._documentClick),this._trigger("open",t)))},_position:function(){this.menuWrap.position(t.extend({of:this.button},this.options.position))},close:function(t){this.isOpen&&(this.isOpen=!1,this._toggleAttr(),this.range=null,this._off(this.document),this._trigger("close",t))},widget:function(){return this.button},menuWidget:function(){return this.menu},_renderButtonItem:function(e){var i=t("<span>");return this._setText(i,e.label),this._addClass(i,"ui-selectmenu-text"),i},_renderMenu:function(e,i){var s=this,n="";t.each(i,function(i,o){var a;o.optgroup!==n&&(a=t("<li>",{text:o.optgroup}),s._addClass(a,"ui-selectmenu-optgroup","ui-menu-divider"+(o.element.parent("optgroup").prop("disabled")?" ui-state-disabled":"")),a.appendTo(e),n=o.optgroup),s._renderItemData(e,o)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-selectmenu-item",e)},_renderItem:function(e,i){var s=t("<li>"),n=t("<div>",{title:i.element.attr("title")});return i.disabled&&this._addClass(s,null,"ui-state-disabled"),this._setText(n,i.label),s.append(n).appendTo(e)},_setText:function(t,e){e?t.text(e):t.html("&#160;")},_move:function(t,e){var i,s,n=".ui-menu-item";this.isOpen?i=this.menuItems.eq(this.focusIndex).parent("li"):(i=this.menuItems.eq(this.element[0].selectedIndex).parent("li"),n+=":not(.ui-state-disabled)"),s="first"===t||"last"===t?i["first"===t?"prevAll":"nextAll"](n).eq(-1):i[t+"All"](n).eq(0),s.length&&this.menuInstance.focus(e,s)},_getSelectedItem:function(){return this.menuItems.eq(this.element[0].selectedIndex).parent("li")},_toggle:function(t){this[this.isOpen?"close":"open"](t)},_setSelection:function(){var t;this.range&&(window.getSelection?(t=window.getSelection(),t.removeAllRanges(),t.addRange(this.range)):this.range.select(),this.button.focus())},_documentClick:{mousedown:function(e){this.isOpen&&(t(e.target).closest(".ui-selectmenu-menu, #"+t.ui.escapeSelector(this.ids.button)).length||this.close(e))}},_buttonEvents:{mousedown:function(){var t;window.getSelection?(t=window.getSelection(),t.rangeCount&&(this.range=t.getRangeAt(0))):this.range=document.selection.createRange()},click:function(t){this._setSelection(),this._toggle(t)},keydown:function(e){var i=!0;switch(e.keyCode){case t.ui.keyCode.TAB:case t.ui.keyCode.ESCAPE:this.close(e),i=!1;break;case t.ui.keyCode.ENTER:this.isOpen&&this._selectFocusedItem(e);break;case t.ui.keyCode.UP:e.altKey?this._toggle(e):this._move("prev",e);break;case t.ui.keyCode.DOWN:e.altKey?this._toggle(e):this._move("next",e);break;case t.ui.keyCode.SPACE:this.isOpen?this._selectFocusedItem(e):this._toggle(e);break;case t.ui.keyCode.LEFT:this._move("prev",e);break;case t.ui.keyCode.RIGHT:this._move("next",e);break;case t.ui.keyCode.HOME:case t.ui.keyCode.PAGE_UP:this._move("first",e);break;case t.ui.keyCode.END:case t.ui.keyCode.PAGE_DOWN:this._move("last",e);break;default:this.menu.trigger(e),i=!1}i&&e.preventDefault()}},_selectFocusedItem:function(t){var e=this.menuItems.eq(this.focusIndex).parent("li");e.hasClass("ui-state-disabled")||this._select(e.data("ui-selectmenu-item"),t)},_select:function(t,e){var i=this.element[0].selectedIndex;this.element[0].selectedIndex=t.index,this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(t)),this._setAria(t),this._trigger("select",e,{item:t}),t.index!==i&&this._trigger("change",e,{item:t}),this.close(e)},_setAria:function(t){var e=this.menuItems.eq(t.index).attr("id");this.button.attr({"aria-labelledby":e,"aria-activedescendant":e}),this.menu.attr("aria-activedescendant",e)},_setOption:function(t,e){if("icons"===t){var i=this.button.find("span.ui-icon");this._removeClass(i,null,this.options.icons.button)._addClass(i,null,e.button)}this._super(t,e),"appendTo"===t&&this.menuWrap.appendTo(this._appendTo()),"width"===t&&this._resizeButton()},_setOptionDisabled:function(t){this._super(t),this.menuInstance.option("disabled",t),this.button.attr("aria-disabled",t),this._toggleClass(this.button,null,"ui-state-disabled",t),this.element.prop("disabled",t),t?(this.button.attr("tabindex",-1),this.close()):this.button.attr("tabindex",0)},_appendTo:function(){var e=this.options.appendTo;return e&&(e=e.jquery||e.nodeType?t(e):this.document.find(e).eq(0)),e&&e[0]||(e=this.element.closest(".ui-front, dialog")),e.length||(e=this.document[0].body),e},_toggleAttr:function(){this.button.attr("aria-expanded",this.isOpen),this._removeClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"closed":"open"))._addClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"open":"closed"))._toggleClass(this.menuWrap,"ui-selectmenu-open",null,this.isOpen),this.menu.attr("aria-hidden",!this.isOpen)},_resizeButton:function(){var t=this.options.width;return t===!1?(this.button.css("width",""),void 0):(null===t&&(t=this.element.show().outerWidth(),this.element.hide()),this.button.outerWidth(t),void 0)},_resizeMenu:function(){this.menu.outerWidth(Math.max(this.button.outerWidth(),this.menu.width("").outerWidth()+1))},_getCreateOptions:function(){var t=this._super();return t.disabled=this.element.prop("disabled"),t},_parseOptions:function(e){var i=this,s=[];e.each(function(e,n){s.push(i._parseOption(t(n),e))}),this.items=s},_parseOption:function(t,e){var i=t.parent("optgroup");return{element:t,index:e,value:t.val(),label:t.text(),optgroup:i.attr("label")||"",disabled:i.prop("disabled")||t.prop("disabled")}},_destroy:function(){this._unbindFormResetHandler(),this.menuWrap.remove(),this.button.remove(),this.element.show(),this.element.removeUniqueId(),this.labels.attr("for",this.ids.element)}}]),t.widget("ui.slider",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"slide",options:{animate:!1,classes:{"ui-slider":"ui-corner-all","ui-slider-handle":"ui-corner-all","ui-slider-range":"ui-corner-all ui-widget-header"},distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},numPages:5,_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this._calculateNewMax(),this._addClass("ui-slider ui-slider-"+this.orientation,"ui-widget ui-widget-content"),this._refresh(),this._animateOff=!1
+},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var e,i,s=this.options,n=this.element.find(".ui-slider-handle"),o="<span tabindex='0'></span>",a=[];for(i=s.values&&s.values.length||1,n.length>i&&(n.slice(i).remove(),n=n.slice(0,i)),e=n.length;i>e;e++)a.push(o);this.handles=n.add(t(a.join("")).appendTo(this.element)),this._addClass(this.handles,"ui-slider-handle","ui-state-default"),this.handle=this.handles.eq(0),this.handles.each(function(e){t(this).data("ui-slider-handle-index",e).attr("tabIndex",0)})},_createRange:function(){var e=this.options;e.range?(e.range===!0&&(e.values?e.values.length&&2!==e.values.length?e.values=[e.values[0],e.values[0]]:t.isArray(e.values)&&(e.values=e.values.slice(0)):e.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?(this._removeClass(this.range,"ui-slider-range-min ui-slider-range-max"),this.range.css({left:"",bottom:""})):(this.range=t("<div>").appendTo(this.element),this._addClass(this.range,"ui-slider-range")),("min"===e.range||"max"===e.range)&&this._addClass(this.range,"ui-slider-range-"+e.range)):(this.range&&this.range.remove(),this.range=null)},_setupEvents:function(){this._off(this.handles),this._on(this.handles,this._handleEvents),this._hoverable(this.handles),this._focusable(this.handles)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this._mouseDestroy()},_mouseCapture:function(e){var i,s,n,o,a,r,h,l,c=this,u=this.options;return u.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),i={x:e.pageX,y:e.pageY},s=this._normValueFromMouse(i),n=this._valueMax()-this._valueMin()+1,this.handles.each(function(e){var i=Math.abs(s-c.values(e));(n>i||n===i&&(e===c._lastChangedValue||c.values(e)===u.min))&&(n=i,o=t(this),a=e)}),r=this._start(e,a),r===!1?!1:(this._mouseSliding=!0,this._handleIndex=a,this._addClass(o,null,"ui-state-active"),o.trigger("focus"),h=o.offset(),l=!t(e.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=l?{left:0,top:0}:{left:e.pageX-h.left-o.width()/2,top:e.pageY-h.top-o.height()/2-(parseInt(o.css("borderTopWidth"),10)||0)-(parseInt(o.css("borderBottomWidth"),10)||0)+(parseInt(o.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(e,a,s),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(t){var e={x:t.pageX,y:t.pageY},i=this._normValueFromMouse(e);return this._slide(t,this._handleIndex,i),!1},_mouseStop:function(t){return this._removeClass(this.handles,null,"ui-state-active"),this._mouseSliding=!1,this._stop(t,this._handleIndex),this._change(t,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(t){var e,i,s,n,o;return"horizontal"===this.orientation?(e=this.elementSize.width,i=t.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(e=this.elementSize.height,i=t.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),s=i/e,s>1&&(s=1),0>s&&(s=0),"vertical"===this.orientation&&(s=1-s),n=this._valueMax()-this._valueMin(),o=this._valueMin()+s*n,this._trimAlignValue(o)},_uiHash:function(t,e,i){var s={handle:this.handles[t],handleIndex:t,value:void 0!==e?e:this.value()};return this._hasMultipleValues()&&(s.value=void 0!==e?e:this.values(t),s.values=i||this.values()),s},_hasMultipleValues:function(){return this.options.values&&this.options.values.length},_start:function(t,e){return this._trigger("start",t,this._uiHash(e))},_slide:function(t,e,i){var s,n,o=this.value(),a=this.values();this._hasMultipleValues()&&(n=this.values(e?0:1),o=this.values(e),2===this.options.values.length&&this.options.range===!0&&(i=0===e?Math.min(n,i):Math.max(n,i)),a[e]=i),i!==o&&(s=this._trigger("slide",t,this._uiHash(e,i,a)),s!==!1&&(this._hasMultipleValues()?this.values(e,i):this.value(i)))},_stop:function(t,e){this._trigger("stop",t,this._uiHash(e))},_change:function(t,e){this._keySliding||this._mouseSliding||(this._lastChangedValue=e,this._trigger("change",t,this._uiHash(e)))},value:function(t){return arguments.length?(this.options.value=this._trimAlignValue(t),this._refreshValue(),this._change(null,0),void 0):this._value()},values:function(e,i){var s,n,o;if(arguments.length>1)return this.options.values[e]=this._trimAlignValue(i),this._refreshValue(),this._change(null,e),void 0;if(!arguments.length)return this._values();if(!t.isArray(arguments[0]))return this._hasMultipleValues()?this._values(e):this.value();for(s=this.options.values,n=arguments[0],o=0;s.length>o;o+=1)s[o]=this._trimAlignValue(n[o]),this._change(null,o);this._refreshValue()},_setOption:function(e,i){var s,n=0;switch("range"===e&&this.options.range===!0&&("min"===i?(this.options.value=this._values(0),this.options.values=null):"max"===i&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),t.isArray(this.options.values)&&(n=this.options.values.length),this._super(e,i),e){case"orientation":this._detectOrientation(),this._removeClass("ui-slider-horizontal ui-slider-vertical")._addClass("ui-slider-"+this.orientation),this._refreshValue(),this.options.range&&this._refreshRange(i),this.handles.css("horizontal"===i?"bottom":"left","");break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),s=n-1;s>=0;s--)this._change(null,s);this._animateOff=!1;break;case"step":case"min":case"max":this._animateOff=!0,this._calculateNewMax(),this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_setOptionDisabled:function(t){this._super(t),this._toggleClass(null,"ui-state-disabled",!!t)},_value:function(){var t=this.options.value;return t=this._trimAlignValue(t)},_values:function(t){var e,i,s;if(arguments.length)return e=this.options.values[t],e=this._trimAlignValue(e);if(this._hasMultipleValues()){for(i=this.options.values.slice(),s=0;i.length>s;s+=1)i[s]=this._trimAlignValue(i[s]);return i}return[]},_trimAlignValue:function(t){if(this._valueMin()>=t)return this._valueMin();if(t>=this._valueMax())return this._valueMax();var e=this.options.step>0?this.options.step:1,i=(t-this._valueMin())%e,s=t-i;return 2*Math.abs(i)>=e&&(s+=i>0?e:-e),parseFloat(s.toFixed(5))},_calculateNewMax:function(){var t=this.options.max,e=this._valueMin(),i=this.options.step,s=Math.round((t-e)/i)*i;t=s+e,t>this.options.max&&(t-=i),this.max=parseFloat(t.toFixed(this._precision()))},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_valueMin:function(){return this.options.min},_valueMax:function(){return this.max},_refreshRange:function(t){"vertical"===t&&this.range.css({width:"",left:""}),"horizontal"===t&&this.range.css({height:"",bottom:""})},_refreshValue:function(){var e,i,s,n,o,a=this.options.range,r=this.options,h=this,l=this._animateOff?!1:r.animate,c={};this._hasMultipleValues()?this.handles.each(function(s){i=100*((h.values(s)-h._valueMin())/(h._valueMax()-h._valueMin())),c["horizontal"===h.orientation?"left":"bottom"]=i+"%",t(this).stop(1,1)[l?"animate":"css"](c,r.animate),h.options.range===!0&&("horizontal"===h.orientation?(0===s&&h.range.stop(1,1)[l?"animate":"css"]({left:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({width:i-e+"%"},{queue:!1,duration:r.animate})):(0===s&&h.range.stop(1,1)[l?"animate":"css"]({bottom:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({height:i-e+"%"},{queue:!1,duration:r.animate}))),e=i}):(s=this.value(),n=this._valueMin(),o=this._valueMax(),i=o!==n?100*((s-n)/(o-n)):0,c["horizontal"===this.orientation?"left":"bottom"]=i+"%",this.handle.stop(1,1)[l?"animate":"css"](c,r.animate),"min"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:i+"%"},r.animate),"max"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:100-i+"%"},r.animate),"min"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:i+"%"},r.animate),"max"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:100-i+"%"},r.animate))},_handleEvents:{keydown:function(e){var i,s,n,o,a=t(e.target).data("ui-slider-handle-index");switch(e.keyCode){case t.ui.keyCode.HOME:case t.ui.keyCode.END:case t.ui.keyCode.PAGE_UP:case t.ui.keyCode.PAGE_DOWN:case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(e.preventDefault(),!this._keySliding&&(this._keySliding=!0,this._addClass(t(e.target),null,"ui-state-active"),i=this._start(e,a),i===!1))return}switch(o=this.options.step,s=n=this._hasMultipleValues()?this.values(a):this.value(),e.keyCode){case t.ui.keyCode.HOME:n=this._valueMin();break;case t.ui.keyCode.END:n=this._valueMax();break;case t.ui.keyCode.PAGE_UP:n=this._trimAlignValue(s+(this._valueMax()-this._valueMin())/this.numPages);break;case t.ui.keyCode.PAGE_DOWN:n=this._trimAlignValue(s-(this._valueMax()-this._valueMin())/this.numPages);break;case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:if(s===this._valueMax())return;n=this._trimAlignValue(s+o);break;case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(s===this._valueMin())return;n=this._trimAlignValue(s-o)}this._slide(e,a,n)},keyup:function(e){var i=t(e.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(e,i),this._change(e,i),this._removeClass(t(e.target),null,"ui-state-active"))}}}),t.widget("ui.sortable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(t,e,i){return t>=e&&e+i>t},_isFloating:function(t){return/left|right/.test(t.css("float"))||/inline|table-cell/.test(t.css("display"))},_create:function(){this.containerCache={},this._addClass("ui-sortable"),this.refresh(),this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(t,e){this._super(t,e),"handle"===t&&this._setHandleClassName()},_setHandleClassName:function(){var e=this;this._removeClass(this.element.find(".ui-sortable-handle"),"ui-sortable-handle"),t.each(this.items,function(){e._addClass(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item,"ui-sortable-handle")})},_destroy:function(){this._mouseDestroy();for(var t=this.items.length-1;t>=0;t--)this.items[t].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(e,i){var s=null,n=!1,o=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(e),t(e.target).parents().each(function(){return t.data(this,o.widgetName+"-item")===o?(s=t(this),!1):void 0}),t.data(e.target,o.widgetName+"-item")===o&&(s=t(e.target)),s?!this.options.handle||i||(t(this.options.handle,s).find("*").addBack().each(function(){this===e.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(e,i,s){var n,o,a=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(e),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,a.cursorAt&&this._adjustOffsetFromHelper(a.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),a.containment&&this._setContainment(),a.cursor&&"auto"!==a.cursor&&(o=this.document.find("body"),this.storedCursor=o.css("cursor"),o.css("cursor",a.cursor),this.storedStylesheet=t("<style>*{ cursor: "+a.cursor+" !important; }</style>").appendTo(o)),a.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",a.opacity)),a.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",a.zIndex)),this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",e,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",e,this._uiHash(this));return t.ui.ddmanager&&(t.ui.ddmanager.current=this),t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this.dragging=!0,this._addClass(this.helper,"ui-sortable-helper"),this._mouseDrag(e),!0},_mouseDrag:function(e){var i,s,n,o,a=this.options,r=!1;for(this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-e.pageY<a.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+a.scrollSpeed:e.pageY-this.overflowOffset.top<a.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-a.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-e.pageX<a.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+a.scrollSpeed:e.pageX-this.overflowOffset.left<a.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-a.scrollSpeed)):(e.pageY-this.document.scrollTop()<a.scrollSensitivity?r=this.document.scrollTop(this.document.scrollTop()-a.scrollSpeed):this.window.height()-(e.pageY-this.document.scrollTop())<a.scrollSensitivity&&(r=this.document.scrollTop(this.document.scrollTop()+a.scrollSpeed)),e.pageX-this.document.scrollLeft()<a.scrollSensitivity?r=this.document.scrollLeft(this.document.scrollLeft()-a.scrollSpeed):this.window.width()-(e.pageX-this.document.scrollLeft())<a.scrollSensitivity&&(r=this.document.scrollLeft(this.document.scrollLeft()+a.scrollSpeed))),r!==!1&&t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],o=this._intersectsWithPointer(s),o&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===o?"next":"prev"]()[0]!==n&&!t.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!t.contains(this.element[0],n):!0)){if(this.direction=1===o?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;this._rearrange(e,s),this._trigger("change",e,this._uiHash());break}return this._contactContainers(e),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),this._trigger("sort",e,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(e,i){if(e){if(t.ui.ddmanager&&!this.options.dropBehaviour&&t.ui.ddmanager.drop(this,e),this.options.revert){var s=this,n=this.placeholder.offset(),o=this.options.axis,a={};o&&"x"!==o||(a.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollLeft)),o&&"y"!==o||(a.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,t(this.helper).animate(a,parseInt(this.options.revert,10)||500,function(){s._clear(e)})}else this._clear(e,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp(new t.Event("mouseup",{target:null})),"original"===this.options.helper?(this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")):this.currentItem.show();for(var e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("deactivate",null,this._uiHash(this)),this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",null,this._uiHash(this)),this.containers[e].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),t.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?t(this.domPosition.prev).after(this.currentItem):t(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},t(i).each(function(){var i=(t(e.item||this).attr(e.attribute||"id")||"").match(e.expression||/(.+)[\-=_](.+)/);i&&s.push((e.key||i[1]+"[]")+"="+(e.key&&e.expression?i[1]:i[2]))}),!s.length&&e.key&&s.push(e.key+"="),s.join("&")},toArray:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},i.each(function(){s.push(t(e.item||this).attr(e.attribute||"id")||"")}),s},_intersectsWith:function(t){var e=this.positionAbs.left,i=e+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,o=t.left,a=o+t.width,r=t.top,h=r+t.height,l=this.offset.click.top,c=this.offset.click.left,u="x"===this.options.axis||s+l>r&&h>s+l,d="y"===this.options.axis||e+c>o&&a>e+c,p=u&&d;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>t[this.floating?"width":"height"]?p:e+this.helperProportions.width/2>o&&a>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&h>n-this.helperProportions.height/2},_intersectsWithPointer:function(t){var e,i,s="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top,t.height),n="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left,t.width),o=s&&n;return o?(e=this._getDragVerticalDirection(),i=this._getDragHorizontalDirection(),this.floating?"right"===i||"down"===e?2:1:e&&("down"===e?2:1)):!1},_intersectsWithSides:function(t){var e=this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),i=this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),s=this._getDragVerticalDirection(),n=this._getDragHorizontalDirection();return this.floating&&n?"right"===n&&i||"left"===n&&!i:s&&("down"===s&&e||"up"===s&&!e)},_getDragVerticalDirection:function(){var t=this.positionAbs.top-this.lastPositionAbs.top;return 0!==t&&(t>0?"down":"up")},_getDragHorizontalDirection:function(){var t=this.positionAbs.left-this.lastPositionAbs.left;return 0!==t&&(t>0?"right":"left")},refresh:function(t){return this._refreshItems(t),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var t=this.options;return t.connectWith.constructor===String?[t.connectWith]:t.connectWith},_getItemsAsjQuery:function(e){function i(){r.push(this)}var s,n,o,a,r=[],h=[],l=this._connectWith();if(l&&e)for(s=l.length-1;s>=0;s--)for(o=t(l[s],this.document[0]),n=o.length-1;n>=0;n--)a=t.data(o[n],this.widgetFullName),a&&a!==this&&!a.options.disabled&&h.push([t.isFunction(a.options.items)?a.options.items.call(a.element):t(a.options.items,a.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),a]);for(h.push([t.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):t(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),s=h.length-1;s>=0;s--)h[s][0].each(i);return t(r)},_removeCurrentsFromItems:function(){var e=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=t.grep(this.items,function(t){for(var i=0;e.length>i;i++)if(e[i]===t.item[0])return!1;return!0})},_refreshItems:function(e){this.items=[],this.containers=[this];var i,s,n,o,a,r,h,l,c=this.items,u=[[t.isFunction(this.options.items)?this.options.items.call(this.element[0],e,{item:this.currentItem}):t(this.options.items,this.element),this]],d=this._connectWith();if(d&&this.ready)for(i=d.length-1;i>=0;i--)for(n=t(d[i],this.document[0]),s=n.length-1;s>=0;s--)o=t.data(n[s],this.widgetFullName),o&&o!==this&&!o.options.disabled&&(u.push([t.isFunction(o.options.items)?o.options.items.call(o.element[0],e,{item:this.currentItem}):t(o.options.items,o.element),o]),this.containers.push(o));for(i=u.length-1;i>=0;i--)for(a=u[i][1],r=u[i][0],s=0,l=r.length;l>s;s++)h=t(r[s]),h.data(this.widgetName+"-item",a),c.push({item:h,instance:a,width:0,height:0,left:0,top:0})},refreshPositions:function(e){this.floating=this.items.length?"x"===this.options.axis||this._isFloating(this.items[0].item):!1,this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,o;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?t(this.options.toleranceElement,s.item):s.item,e||(s.width=n.outerWidth(),s.height=n.outerHeight()),o=n.offset(),s.left=o.left,s.top=o.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)o=this.containers[i].element.offset(),this.containers[i].containerCache.left=o.left,this.containers[i].containerCache.top=o.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(e){e=e||this;var i,s=e.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=e.currentItem[0].nodeName.toLowerCase(),n=t("<"+s+">",e.document[0]);return e._addClass(n,"ui-sortable-placeholder",i||e.currentItem[0].className)._removeClass(n,"ui-sortable-helper"),"tbody"===s?e._createTrPlaceholder(e.currentItem.find("tr").eq(0),t("<tr>",e.document[0]).appendTo(n)):"tr"===s?e._createTrPlaceholder(e.currentItem,n):"img"===s&&n.attr("src",e.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(t,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(e.currentItem.innerHeight()-parseInt(e.currentItem.css("paddingTop")||0,10)-parseInt(e.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(e.currentItem.innerWidth()-parseInt(e.currentItem.css("paddingLeft")||0,10)-parseInt(e.currentItem.css("paddingRight")||0,10)))}}),e.placeholder=t(s.placeholder.element.call(e.element,e.currentItem)),e.currentItem.after(e.placeholder),s.placeholder.update(e,e.placeholder)},_createTrPlaceholder:function(e,i){var s=this;e.children().each(function(){t("<td>&#160;</td>",s.document[0]).attr("colspan",t(this).attr("colspan")||1).appendTo(i)})},_contactContainers:function(e){var i,s,n,o,a,r,h,l,c,u,d=null,p=null;for(i=this.containers.length-1;i>=0;i--)if(!t.contains(this.currentItem[0],this.containers[i].element[0]))if(this._intersectsWith(this.containers[i].containerCache)){if(d&&t.contains(this.containers[i].element[0],d.element[0]))continue;d=this.containers[i],p=i}else this.containers[i].containerCache.over&&(this.containers[i]._trigger("out",e,this._uiHash(this)),this.containers[i].containerCache.over=0);if(d)if(1===this.containers.length)this.containers[p].containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1);else{for(n=1e4,o=null,c=d.floating||this._isFloating(this.currentItem),a=c?"left":"top",r=c?"width":"height",u=c?"pageX":"pageY",s=this.items.length-1;s>=0;s--)t.contains(this.containers[p].element[0],this.items[s].item[0])&&this.items[s].item[0]!==this.currentItem[0]&&(h=this.items[s].item.offset()[a],l=!1,e[u]-h>this.items[s][r]/2&&(l=!0),n>Math.abs(e[u]-h)&&(n=Math.abs(e[u]-h),o=this.items[s],this.direction=l?"up":"down"));if(!o&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[p])return this.currentContainer.containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash()),this.currentContainer.containerCache.over=1),void 0;o?this._rearrange(e,o,null,!0):this._rearrange(e,null,this.containers[p].element,!0),this._trigger("change",e,this._uiHash()),this.containers[p]._trigger("change",e,this._uiHash(this)),this.currentContainer=this.containers[p],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1}},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||t("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===this.document[0].body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.currentItem.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,"document"===n.containment?this.document.width():this.window.width()-this.helperProportions.width-this.margins.left,("document"===n.containment?this.document.height()||document.body.parentNode.scrollHeight:this.window.height()||this.document[0].body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(e=t(n.containment)[0],i=t(n.containment).offset(),s="hidden"!==t(e).css("overflow"),this.containment=[i.left+(parseInt(t(e).css("borderLeftWidth"),10)||0)+(parseInt(t(e).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(t(e).css("borderTopWidth"),10)||0)+(parseInt(t(e).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(e.scrollWidth,e.offsetWidth):e.offsetWidth)-(parseInt(t(e).css("borderLeftWidth"),10)||0)-(parseInt(t(e).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(e.scrollHeight,e.offsetHeight):e.offsetHeight)-(parseInt(t(e).css("borderTopWidth"),10)||0)-(parseInt(t(e).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():o?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():o?0:n.scrollLeft())*s}},_generatePosition:function(e){var i,s,n=this.options,o=e.pageX,a=e.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(e.pageX-this.offset.click.left<this.containment[0]&&(o=this.containment[0]+this.offset.click.left),e.pageY-this.offset.click.top<this.containment[1]&&(a=this.containment[1]+this.offset.click.top),e.pageX-this.offset.click.left>this.containment[2]&&(o=this.containment[2]+this.offset.click.left),e.pageY-this.offset.click.top>this.containment[3]&&(a=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((a-this.originalPageY)/n.grid[1])*n.grid[1],a=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((o-this.originalPageX)/n.grid[0])*n.grid[0],o=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:a-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():h?0:r.scrollTop()),left:o-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():h?0:r.scrollLeft())}},_rearrange:function(t,e,i,s){i?i[0].appendChild(this.placeholder[0]):e.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?e.item[0]:e.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;
+this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){function i(t,e,i){return function(s){i._trigger(t,s,e._uiHash(e))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!e&&n.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||n.push(function(t){this._trigger("update",t,this._uiHash())}),this!==this.currentContainer&&(e||(n.push(function(t){this._trigger("remove",t,this._uiHash())}),n.push(function(t){return function(e){t._trigger("receive",e,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(t){return function(e){t._trigger("update",e,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)e||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!e){for(s=0;n.length>s;s++)n[s].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){t.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(e){var i=e||this;return{helper:i.helper,placeholder:i.placeholder||t([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:e?e.element:null}}}),t.widget("ui.spinner",{version:"1.12.1",defaultElement:"<input>",widgetEventPrefix:"spin",options:{classes:{"ui-spinner":"ui-corner-all","ui-spinner-down":"ui-corner-br","ui-spinner-up":"ui-corner-tr"},culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),""!==this.value()&&this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var e=this._super(),i=this.element;return t.each(["min","max","step"],function(t,s){var n=i.attr(s);null!=n&&n.length&&(e[s]=n)}),e},_events:{keydown:function(t){this._start(t)&&this._keydown(t)&&t.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",t),void 0)},mousewheel:function(t,e){if(e){if(!this.spinning&&!this._start(t))return!1;this._spin((e>0?1:-1)*this.options.step,t),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(t)},100),t.preventDefault()}},"mousedown .ui-spinner-button":function(e){function i(){var e=this.element[0]===t.ui.safeActiveElement(this.document[0]);e||(this.element.trigger("focus"),this.previous=s,this._delay(function(){this.previous=s}))}var s;s=this.element[0]===t.ui.safeActiveElement(this.document[0])?this.previous:this.element.val(),e.preventDefault(),i.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,i.call(this)}),this._start(e)!==!1&&this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(e){return t(e.currentTarget).hasClass("ui-state-active")?this._start(e)===!1?!1:(this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e),void 0):void 0},"mouseleave .ui-spinner-button":"_stop"},_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap("<span>").parent().append("<a></a><a></a>")},_draw:function(){this._enhance(),this._addClass(this.uiSpinner,"ui-spinner","ui-widget ui-widget-content"),this._addClass("ui-spinner-input"),this.element.attr("role","spinbutton"),this.buttons=this.uiSpinner.children("a").attr("tabIndex",-1).attr("aria-hidden",!0).button({classes:{"ui-button":""}}),this._removeClass(this.buttons,"ui-corner-all"),this._addClass(this.buttons.first(),"ui-spinner-button ui-spinner-up"),this._addClass(this.buttons.last(),"ui-spinner-button ui-spinner-down"),this.buttons.first().button({icon:this.options.icons.up,showLabel:!1}),this.buttons.last().button({icon:this.options.icons.down,showLabel:!1}),this.buttons.height()>Math.ceil(.5*this.uiSpinner.height())&&this.uiSpinner.height()>0&&this.uiSpinner.height(this.uiSpinner.height())},_keydown:function(e){var i=this.options,s=t.ui.keyCode;switch(e.keyCode){case s.UP:return this._repeat(null,1,e),!0;case s.DOWN:return this._repeat(null,-1,e),!0;case s.PAGE_UP:return this._repeat(null,i.page,e),!0;case s.PAGE_DOWN:return this._repeat(null,-i.page,e),!0}return!1},_start:function(t){return this.spinning||this._trigger("start",t)!==!1?(this.counter||(this.counter=1),this.spinning=!0,!0):!1},_repeat:function(t,e,i){t=t||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,e,i)},t),this._spin(e*this.options.step,i)},_spin:function(t,e){var i=this.value()||0;this.counter||(this.counter=1),i=this._adjustValue(i+t*this._increment(this.counter)),this.spinning&&this._trigger("spin",e,{value:i})===!1||(this._value(i),this.counter++)},_increment:function(e){var i=this.options.incremental;return i?t.isFunction(i)?i(e):Math.floor(e*e*e/5e4-e*e/500+17*e/200+1):1},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_adjustValue:function(t){var e,i,s=this.options;return e=null!==s.min?s.min:0,i=t-e,i=Math.round(i/s.step)*s.step,t=e+i,t=parseFloat(t.toFixed(this._precision())),null!==s.max&&t>s.max?s.max:null!==s.min&&s.min>t?s.min:t},_stop:function(t){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",t))},_setOption:function(t,e){var i,s,n;return"culture"===t||"numberFormat"===t?(i=this._parse(this.element.val()),this.options[t]=e,this.element.val(this._format(i)),void 0):(("max"===t||"min"===t||"step"===t)&&"string"==typeof e&&(e=this._parse(e)),"icons"===t&&(s=this.buttons.first().find(".ui-icon"),this._removeClass(s,null,this.options.icons.up),this._addClass(s,null,e.up),n=this.buttons.last().find(".ui-icon"),this._removeClass(n,null,this.options.icons.down),this._addClass(n,null,e.down)),this._super(t,e),void 0)},_setOptionDisabled:function(t){this._super(t),this._toggleClass(this.uiSpinner,null,"ui-state-disabled",!!t),this.element.prop("disabled",!!t),this.buttons.button(t?"disable":"enable")},_setOptions:r(function(t){this._super(t)}),_parse:function(t){return"string"==typeof t&&""!==t&&(t=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(t,10,this.options.culture):+t),""===t||isNaN(t)?null:t},_format:function(t){return""===t?"":window.Globalize&&this.options.numberFormat?Globalize.format(t,this.options.numberFormat,this.options.culture):t},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},isValid:function(){var t=this.value();return null===t?!1:t===this._adjustValue(t)},_value:function(t,e){var i;""!==t&&(i=this._parse(t),null!==i&&(e||(i=this._adjustValue(i)),t=this._format(i))),this.element.val(t),this._refresh()},_destroy:function(){this.element.prop("disabled",!1).removeAttr("autocomplete role aria-valuemin aria-valuemax aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:r(function(t){this._stepUp(t)}),_stepUp:function(t){this._start()&&(this._spin((t||1)*this.options.step),this._stop())},stepDown:r(function(t){this._stepDown(t)}),_stepDown:function(t){this._start()&&(this._spin((t||1)*-this.options.step),this._stop())},pageUp:r(function(t){this._stepUp((t||1)*this.options.page)}),pageDown:r(function(t){this._stepDown((t||1)*this.options.page)}),value:function(t){return arguments.length?(r(this._value).call(this,t),void 0):this._parse(this.element.val())},widget:function(){return this.uiSpinner}}),t.uiBackCompat!==!1&&t.widget("ui.spinner",t.ui.spinner,{_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml())},_uiSpinnerHtml:function(){return"<span>"},_buttonHtml:function(){return"<a></a><a></a>"}}),t.ui.spinner,t.widget("ui.tabs",{version:"1.12.1",delay:300,options:{active:null,classes:{"ui-tabs":"ui-corner-all","ui-tabs-nav":"ui-corner-all","ui-tabs-panel":"ui-corner-bottom","ui-tabs-tab":"ui-corner-top"},collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_isLocal:function(){var t=/#.*$/;return function(e){var i,s;i=e.href.replace(t,""),s=location.href.replace(t,"");try{i=decodeURIComponent(i)}catch(n){}try{s=decodeURIComponent(s)}catch(n){}return e.hash.length>1&&i===s}}(),_create:function(){var e=this,i=this.options;this.running=!1,this._addClass("ui-tabs","ui-widget ui-widget-content"),this._toggleClass("ui-tabs-collapsible",null,i.collapsible),this._processTabs(),i.active=this._initialActive(),t.isArray(i.disabled)&&(i.disabled=t.unique(i.disabled.concat(t.map(this.tabs.filter(".ui-state-disabled"),function(t){return e.tabs.index(t)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(i.active):t(),this._refresh(),this.active.length&&this.load(i.active)},_initialActive:function(){var e=this.options.active,i=this.options.collapsible,s=location.hash.substring(1);return null===e&&(s&&this.tabs.each(function(i,n){return t(n).attr("aria-controls")===s?(e=i,!1):void 0}),null===e&&(e=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===e||-1===e)&&(e=this.tabs.length?0:!1)),e!==!1&&(e=this.tabs.index(this.tabs.eq(e)),-1===e&&(e=i?!1:0)),!i&&e===!1&&this.anchors.length&&(e=0),e},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):t()}},_tabKeydown:function(e){var i=t(t.ui.safeActiveElement(this.document[0])).closest("li"),s=this.tabs.index(i),n=!0;if(!this._handlePageNav(e)){switch(e.keyCode){case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:s++;break;case t.ui.keyCode.UP:case t.ui.keyCode.LEFT:n=!1,s--;break;case t.ui.keyCode.END:s=this.anchors.length-1;break;case t.ui.keyCode.HOME:s=0;break;case t.ui.keyCode.SPACE:return e.preventDefault(),clearTimeout(this.activating),this._activate(s),void 0;case t.ui.keyCode.ENTER:return e.preventDefault(),clearTimeout(this.activating),this._activate(s===this.options.active?!1:s),void 0;default:return}e.preventDefault(),clearTimeout(this.activating),s=this._focusNextTab(s,n),e.ctrlKey||e.metaKey||(i.attr("aria-selected","false"),this.tabs.eq(s).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",s)},this.delay))}},_panelKeydown:function(e){this._handlePageNav(e)||e.ctrlKey&&e.keyCode===t.ui.keyCode.UP&&(e.preventDefault(),this.active.trigger("focus"))},_handlePageNav:function(e){return e.altKey&&e.keyCode===t.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):e.altKey&&e.keyCode===t.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):void 0},_findNextTab:function(e,i){function s(){return e>n&&(e=0),0>e&&(e=n),e}for(var n=this.tabs.length-1;-1!==t.inArray(s(),this.options.disabled);)e=i?e+1:e-1;return e},_focusNextTab:function(t,e){return t=this._findNextTab(t,e),this.tabs.eq(t).trigger("focus"),t},_setOption:function(t,e){return"active"===t?(this._activate(e),void 0):(this._super(t,e),"collapsible"===t&&(this._toggleClass("ui-tabs-collapsible",null,e),e||this.options.active!==!1||this._activate(0)),"event"===t&&this._setupEvents(e),"heightStyle"===t&&this._setupHeightStyle(e),void 0)},_sanitizeSelector:function(t){return t?t.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var e=this.options,i=this.tablist.children(":has(a[href])");e.disabled=t.map(i.filter(".ui-state-disabled"),function(t){return i.index(t)}),this._processTabs(),e.active!==!1&&this.anchors.length?this.active.length&&!t.contains(this.tablist[0],this.active[0])?this.tabs.length===e.disabled.length?(e.active=!1,this.active=t()):this._activate(this._findNextTab(Math.max(0,e.active-1),!1)):e.active=this.tabs.index(this.active):(e.active=!1,this.active=t()),this._refresh()},_refresh:function(){this._setOptionDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-hidden":"true"}),this.active.length?(this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}),this._addClass(this.active,"ui-tabs-active","ui-state-active"),this._getPanelForTab(this.active).show().attr({"aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var e=this,i=this.tabs,s=this.anchors,n=this.panels;this.tablist=this._getList().attr("role","tablist"),this._addClass(this.tablist,"ui-tabs-nav","ui-helper-reset ui-helper-clearfix ui-widget-header"),this.tablist.on("mousedown"+this.eventNamespace,"> li",function(e){t(this).is(".ui-state-disabled")&&e.preventDefault()}).on("focus"+this.eventNamespace,".ui-tabs-anchor",function(){t(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this.tabs=this.tablist.find("> li:has(a[href])").attr({role:"tab",tabIndex:-1}),this._addClass(this.tabs,"ui-tabs-tab","ui-state-default"),this.anchors=this.tabs.map(function(){return t("a",this)[0]}).attr({role:"presentation",tabIndex:-1}),this._addClass(this.anchors,"ui-tabs-anchor"),this.panels=t(),this.anchors.each(function(i,s){var n,o,a,r=t(s).uniqueId().attr("id"),h=t(s).closest("li"),l=h.attr("aria-controls");e._isLocal(s)?(n=s.hash,a=n.substring(1),o=e.element.find(e._sanitizeSelector(n))):(a=h.attr("aria-controls")||t({}).uniqueId()[0].id,n="#"+a,o=e.element.find(n),o.length||(o=e._createPanel(a),o.insertAfter(e.panels[i-1]||e.tablist)),o.attr("aria-live","polite")),o.length&&(e.panels=e.panels.add(o)),l&&h.data("ui-tabs-aria-controls",l),h.attr({"aria-controls":a,"aria-labelledby":r}),o.attr("aria-labelledby",r)}),this.panels.attr("role","tabpanel"),this._addClass(this.panels,"ui-tabs-panel","ui-widget-content"),i&&(this._off(i.not(this.tabs)),this._off(s.not(this.anchors)),this._off(n.not(this.panels)))},_getList:function(){return this.tablist||this.element.find("ol, ul").eq(0)},_createPanel:function(e){return t("<div>").attr("id",e).data("ui-tabs-destroy",!0)},_setOptionDisabled:function(e){var i,s,n;for(t.isArray(e)&&(e.length?e.length===this.anchors.length&&(e=!0):e=!1),n=0;s=this.tabs[n];n++)i=t(s),e===!0||-1!==t.inArray(n,e)?(i.attr("aria-disabled","true"),this._addClass(i,null,"ui-state-disabled")):(i.removeAttr("aria-disabled"),this._removeClass(i,null,"ui-state-disabled"));this.options.disabled=e,this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,e===!0)},_setupEvents:function(e){var i={};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(!0,this.anchors,{click:function(t){t.preventDefault()}}),this._on(this.anchors,i),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(e){var i,s=this.element.parent();"fill"===e?(i=s.height(),i-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var e=t(this),s=e.css("position");"absolute"!==s&&"fixed"!==s&&(i-=e.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){i-=t(this).outerHeight(!0)}),this.panels.each(function(){t(this).height(Math.max(0,i-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===e&&(i=0,this.panels.each(function(){i=Math.max(i,t(this).height("").height())}).height(i))},_eventHandler:function(e){var i=this.options,s=this.active,n=t(e.currentTarget),o=n.closest("li"),a=o[0]===s[0],r=a&&i.collapsible,h=r?t():this._getPanelForTab(o),l=s.length?this._getPanelForTab(s):t(),c={oldTab:s,oldPanel:l,newTab:r?t():o,newPanel:h};e.preventDefault(),o.hasClass("ui-state-disabled")||o.hasClass("ui-tabs-loading")||this.running||a&&!i.collapsible||this._trigger("beforeActivate",e,c)===!1||(i.active=r?!1:this.tabs.index(o),this.active=a?t():o,this.xhr&&this.xhr.abort(),l.length||h.length||t.error("jQuery UI Tabs: Mismatching fragment identifier."),h.length&&this.load(this.tabs.index(o),e),this._toggle(e,c))},_toggle:function(e,i){function s(){o.running=!1,o._trigger("activate",e,i)}function n(){o._addClass(i.newTab.closest("li"),"ui-tabs-active","ui-state-active"),a.length&&o.options.show?o._show(a,o.options.show,s):(a.show(),s())}var o=this,a=i.newPanel,r=i.oldPanel;this.running=!0,r.length&&this.options.hide?this._hide(r,this.options.hide,function(){o._removeClass(i.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),n()}):(this._removeClass(i.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),r.hide(),n()),r.attr("aria-hidden","true"),i.oldTab.attr({"aria-selected":"false","aria-expanded":"false"}),a.length&&r.length?i.oldTab.attr("tabIndex",-1):a.length&&this.tabs.filter(function(){return 0===t(this).attr("tabIndex")}).attr("tabIndex",-1),a.attr("aria-hidden","false"),i.newTab.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_activate:function(e){var i,s=this._findActive(e);s[0]!==this.active[0]&&(s.length||(s=this.active),i=s.find(".ui-tabs-anchor")[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return e===!1?t():this.tabs.eq(e)},_getIndex:function(e){return"string"==typeof e&&(e=this.anchors.index(this.anchors.filter("[href$='"+t.ui.escapeSelector(e)+"']"))),e},_destroy:function(){this.xhr&&this.xhr.abort(),this.tablist.removeAttr("role").off(this.eventNamespace),this.anchors.removeAttr("role tabIndex").removeUniqueId(),this.tabs.add(this.panels).each(function(){t.data(this,"ui-tabs-destroy")?t(this).remove():t(this).removeAttr("role tabIndex aria-live aria-busy aria-selected aria-labelledby aria-hidden aria-expanded")}),this.tabs.each(function(){var e=t(this),i=e.data("ui-tabs-aria-controls");i?e.attr("aria-controls",i).removeData("ui-tabs-aria-controls"):e.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(e){var i=this.options.disabled;i!==!1&&(void 0===e?i=!1:(e=this._getIndex(e),i=t.isArray(i)?t.map(i,function(t){return t!==e?t:null}):t.map(this.tabs,function(t,i){return i!==e?i:null})),this._setOptionDisabled(i))},disable:function(e){var i=this.options.disabled;if(i!==!0){if(void 0===e)i=!0;else{if(e=this._getIndex(e),-1!==t.inArray(e,i))return;i=t.isArray(i)?t.merge([e],i).sort():[e]}this._setOptionDisabled(i)}},load:function(e,i){e=this._getIndex(e);var s=this,n=this.tabs.eq(e),o=n.find(".ui-tabs-anchor"),a=this._getPanelForTab(n),r={tab:n,panel:a},h=function(t,e){"abort"===e&&s.panels.stop(!1,!0),s._removeClass(n,"ui-tabs-loading"),a.removeAttr("aria-busy"),t===s.xhr&&delete s.xhr};this._isLocal(o[0])||(this.xhr=t.ajax(this._ajaxSettings(o,i,r)),this.xhr&&"canceled"!==this.xhr.statusText&&(this._addClass(n,"ui-tabs-loading"),a.attr("aria-busy","true"),this.xhr.done(function(t,e,n){setTimeout(function(){a.html(t),s._trigger("load",i,r),h(n,e)},1)}).fail(function(t,e){setTimeout(function(){h(t,e)},1)})))},_ajaxSettings:function(e,i,s){var n=this;return{url:e.attr("href").replace(/#.*$/,""),beforeSend:function(e,o){return n._trigger("beforeLoad",i,t.extend({jqXHR:e,ajaxSettings:o},s))}}},_getPanelForTab:function(e){var i=t(e).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+i))}}),t.uiBackCompat!==!1&&t.widget("ui.tabs",t.ui.tabs,{_processTabs:function(){this._superApply(arguments),this._addClass(this.tabs,"ui-tab")}}),t.ui.tabs,t.widget("ui.tooltip",{version:"1.12.1",options:{classes:{"ui-tooltip":"ui-corner-all ui-widget-shadow"},content:function(){var e=t(this).attr("title")||"";return t("<a>").text(e).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,track:!1,close:null,open:null},_addDescribedBy:function(e,i){var s=(e.attr("aria-describedby")||"").split(/\s+/);s.push(i),e.data("ui-tooltip-id",i).attr("aria-describedby",t.trim(s.join(" ")))},_removeDescribedBy:function(e){var i=e.data("ui-tooltip-id"),s=(e.attr("aria-describedby")||"").split(/\s+/),n=t.inArray(i,s);-1!==n&&s.splice(n,1),e.removeData("ui-tooltip-id"),s=t.trim(s.join(" ")),s?e.attr("aria-describedby",s):e.removeAttr("aria-describedby")},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.liveRegion=t("<div>").attr({role:"log","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this.disabledTitles=t([])},_setOption:function(e,i){var s=this;this._super(e,i),"content"===e&&t.each(this.tooltips,function(t,e){s._updateContent(e.element)})},_setOptionDisabled:function(t){this[t?"_disable":"_enable"]()},_disable:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur");n.target=n.currentTarget=s.element[0],e.close(n,!0)}),this.disabledTitles=this.disabledTitles.add(this.element.find(this.options.items).addBack().filter(function(){var e=t(this);return e.is("[title]")?e.data("ui-tooltip-title",e.attr("title")).removeAttr("title"):void 0}))},_enable:function(){this.disabledTitles.each(function(){var e=t(this);e.data("ui-tooltip-title")&&e.attr("title",e.data("ui-tooltip-title"))}),this.disabledTitles=t([])},open:function(e){var i=this,s=t(e?e.target:this.element).closest(this.options.items);s.length&&!s.data("ui-tooltip-id")&&(s.attr("title")&&s.data("ui-tooltip-title",s.attr("title")),s.data("ui-tooltip-open",!0),e&&"mouseover"===e.type&&s.parents().each(function(){var e,s=t(this);s.data("ui-tooltip-open")&&(e=t.Event("blur"),e.target=e.currentTarget=this,i.close(e,!0)),s.attr("title")&&(s.uniqueId(),i.parents[this.id]={element:this,title:s.attr("title")},s.attr("title",""))}),this._registerCloseHandlers(e,s),this._updateContent(s,e))},_updateContent:function(t,e){var i,s=this.options.content,n=this,o=e?e.type:null;return"string"==typeof s||s.nodeType||s.jquery?this._open(e,t,s):(i=s.call(t[0],function(i){n._delay(function(){t.data("ui-tooltip-open")&&(e&&(e.type=o),this._open(e,t,i))})}),i&&this._open(e,t,i),void 0)},_open:function(e,i,s){function n(t){l.of=t,a.is(":hidden")||a.position(l)}var o,a,r,h,l=t.extend({},this.options.position);if(s){if(o=this._find(i))return o.tooltip.find(".ui-tooltip-content").html(s),void 0;i.is("[title]")&&(e&&"mouseover"===e.type?i.attr("title",""):i.removeAttr("title")),o=this._tooltip(i),a=o.tooltip,this._addDescribedBy(i,a.attr("id")),a.find(".ui-tooltip-content").html(s),this.liveRegion.children().hide(),h=t("<div>").html(a.find(".ui-tooltip-content").html()),h.removeAttr("name").find("[name]").removeAttr("name"),h.removeAttr("id").find("[id]").removeAttr("id"),h.appendTo(this.liveRegion),this.options.track&&e&&/^mouse/.test(e.type)?(this._on(this.document,{mousemove:n}),n(e)):a.position(t.extend({of:i},this.options.position)),a.hide(),this._show(a,this.options.show),this.options.track&&this.options.show&&this.options.show.delay&&(r=this.delayedShow=setInterval(function(){a.is(":visible")&&(n(l.of),clearInterval(r))},t.fx.interval)),this._trigger("open",e,{tooltip:a})}},_registerCloseHandlers:function(e,i){var s={keyup:function(e){if(e.keyCode===t.ui.keyCode.ESCAPE){var s=t.Event(e);s.currentTarget=i[0],this.close(s,!0)}}};i[0]!==this.element[0]&&(s.remove=function(){this._removeTooltip(this._find(i).tooltip)}),e&&"mouseover"!==e.type||(s.mouseleave="close"),e&&"focusin"!==e.type||(s.focusout="close"),this._on(!0,i,s)},close:function(e){var i,s=this,n=t(e?e.currentTarget:this.element),o=this._find(n);return o?(i=o.tooltip,o.closing||(clearInterval(this.delayedShow),n.data("ui-tooltip-title")&&!n.attr("title")&&n.attr("title",n.data("ui-tooltip-title")),this._removeDescribedBy(n),o.hiding=!0,i.stop(!0),this._hide(i,this.options.hide,function(){s._removeTooltip(t(this))}),n.removeData("ui-tooltip-open"),this._off(n,"mouseleave focusout keyup"),n[0]!==this.element[0]&&this._off(n,"remove"),this._off(this.document,"mousemove"),e&&"mouseleave"===e.type&&t.each(this.parents,function(e,i){t(i.element).attr("title",i.title),delete s.parents[e]}),o.closing=!0,this._trigger("close",e,{tooltip:i}),o.hiding||(o.closing=!1)),void 0):(n.removeData("ui-tooltip-open"),void 0)},_tooltip:function(e){var i=t("<div>").attr("role","tooltip"),s=t("<div>").appendTo(i),n=i.uniqueId().attr("id");return this._addClass(s,"ui-tooltip-content"),this._addClass(i,"ui-tooltip","ui-widget ui-widget-content"),i.appendTo(this._appendTo(e)),this.tooltips[n]={element:e,tooltip:i}},_find:function(t){var e=t.data("ui-tooltip-id");return e?this.tooltips[e]:null},_removeTooltip:function(t){t.remove(),delete this.tooltips[t.attr("id")]},_appendTo:function(t){var e=t.closest(".ui-front, dialog");return e.length||(e=this.document[0].body),e},_destroy:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur"),o=s.element;n.target=n.currentTarget=o[0],e.close(n,!0),t("#"+i).remove(),o.data("ui-tooltip-title")&&(o.attr("title")||o.attr("title",o.data("ui-tooltip-title")),o.removeData("ui-tooltip-title"))}),this.liveRegion.remove()}}),t.uiBackCompat!==!1&&t.widget("ui.tooltip",t.ui.tooltip,{options:{tooltipClass:null},_tooltip:function(){var t=this._superApply(arguments);return this.options.tooltipClass&&t.tooltip.addClass(this.options.tooltipClass),t}}),t.ui.tooltip});
\ No newline at end of file
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index e906db68..96cfafe2 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,4 +1,4 @@
 {
-    "/css/app.css": "/css/app.css?id=2aa9dedf14862069c2ff",
-    "/js/app.js": "/js/app.js?id=32cbf6f4924b46ae7e05"
-}
\ No newline at end of file
+    "/css/app.css": "/css/app.css?id=24e9bb4fa993b66f0572",
+    "/js/app.js": "/js/app.js?id=f18d23b8fc7a094a2c66"
+}
diff --git a/readme.md b/readme.md
index 8b6f2fa4..eb1ff52a 100644
--- a/readme.md
+++ b/readme.md
@@ -61,6 +61,7 @@ Supported applications are recognized by the title of the application as entered
 - Krusader
 - LibreNMS
 - Lidarr
+- Mailcow
 - McMyAdmin
 - Medusa
 - Monica
@@ -88,7 +89,9 @@ Supported applications are recognized by the title of the application as entered
 - rTorrent/Flood
 - rTorrent/ruTorrent
 - Syncthing
+- Virtualmin
 - Watcher3
+- Webmin
 - WebTools
 
 ## Installing
diff --git a/resources/assets/sass/_app.scss b/resources/assets/sass/_app.scss
index c2f0dcdc..af3c1397 100644
--- a/resources/assets/sass/_app.scss
+++ b/resources/assets/sass/_app.scss
@@ -7,7 +7,46 @@ html {
 body {
 	background: $body-bg;
 }
-
+#switchuser {
+	background: rgba(0,0,0,0.5); 
+	position: absolute; 
+	padding: 10px; 
+	color: white; 
+	text-align: center; 
+	bottom:0; 
+	left: 0; 
+	display: flex;
+    flex-direction: column;
+    justify-content: center;
+	align-items: center;
+	border-top: 2px solid rgba(255, 255, 255, 0.15);
+	border-right: 2px solid rgba(255, 255, 255, 0.15);
+	box-shadow: 0 0 10px 0px rgba(0, 0, 0, 0.4);
+	border-radius: 0 9px 0 0;
+	line-height: 1.5;
+	font-size: 14px;
+	img {
+		width: 50px;
+		margin-bottom: 5px;
+		border-radius: 50%;
+	}
+	.btn {
+		font-size: 13px;
+		color: white;
+		text-decoration: none;
+		margin-left: -10px;
+		margin-right: -10px;
+		margin-bottom: -10px;
+		margin-top: 8px;
+		border-radius: 0;
+		width: calc(100% + 22px);
+		background: rgba(255, 255, 255, 0.15);
+		transition: all .35s ease-in-out;
+		&:hover {
+			background: #d64d55;
+		}
+	}
+}
 #app {
 	display: flex;
 	min-height: 100vh;
@@ -70,7 +109,7 @@ body {
 		flex-direction: column;
 	}
 	main, #sortable {
-		padding: 10px;
+		padding: 30px 10px;
 		display: flex;
 		justify-content: center;
 		align-items: center;
@@ -104,6 +143,47 @@ body {
 	}
 }
 
+.userlist {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	.user {
+		background: rgba(0,0,0,0.5);
+		display: flex;
+		padding: 15px;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		margin: 20px;
+		color: white;
+		text-decoration: none;
+		border-radius: 15px;
+    	border: 5px solid rgba(255,255,255, 0.7);
+    	box-shadow: 0 0 10px 0px rgba(0,0,0,0.4);
+	}
+	.user-img {
+		width: 130px;
+		height: 130px;
+		margin-bottom: 20px;
+		border-radius: 50%;
+		margin: 10px 10px 15px;
+	}
+	#password {
+		color: $app-text;
+		width: 100%;
+		padding: 5px 10px;
+		margin: 15px -5px;
+	}
+	.btn {
+		width: 100%;
+	}
+	.forgot {
+		color: white;
+		font-size: 12px;
+		margin-top: 25px;
+	}
+}
+
 .item-container {
 	//width: 340px;
 	//transition: width .35s ease-in-out;	
diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss
index b3af68e1..306dcf1e 100644
--- a/resources/assets/sass/app.scss
+++ b/resources/assets/sass/app.scss
@@ -1,6 +1,6 @@
 
 // Fonts
-@import url("https://fonts.googleapis.com/css?family=Raleway:300,400,600");
+//@import url("https://fonts.googleapis.com/css?family=Raleway:300,400,600");
 
 // Variables
 @import "variables";
diff --git a/resources/lang/br/app.php b/resources/lang/br/app.php
index 0d6e9e7d..930bc11d 100644
--- a/resources/lang/br/app.php
+++ b/resources/lang/br/app.php
@@ -12,6 +12,8 @@ return [
     'settings.system' => 'Sistema',
     'settings.appearance' => 'Aparência',
     'settings.miscellaneous' => 'Diversos',
+    'settings.support' => 'Ajuda',
+    'settings.donate' => 'Doar',
 
     'settings.version' => 'Versão',
     'settings.background_image' => 'Imagem de fundo',
@@ -72,6 +74,15 @@ return [
     'apps.tags' => 'Tags',
     'apps.override' => 'Se diferente do URL principal',
 
+    'user.user_list' => 'Comercial',
+    'user.add_user' => 'Adicionar usuários',
+    'user.username' => 'Nome de usuário',
+    'user.avatar' => 'Avatar',
+    'user.email' => 'O email',
+    'user.password_confirm' => 'Confirme a Senha',
+    'user.secure_front' => 'Permitir acesso público à frente - Aplicado apenas se uma senha for definida.',
+    'user.autologin' => 'Permitir o login a partir de um URL específico. Qualquer pessoa com o link pode fazer o login.',
+
     'url' => 'URL',
     'title' => 'Título',
     'delete' => 'Apagar',
@@ -91,5 +102,9 @@ return [
     'alert.success.setting_updated' => 'Você editou com sucesso essa configuração',
     'alert.error.not_exist' => 'Essa configuração não existe.',
 
+    'alert.success.user_created' => 'Usuário criado com sucesso',
+    'alert.success.user_updated' => 'Usuário atualizado com sucesso',
+    'alert.success.user_deleted' => 'Usuário excluído com sucesso',
+    'alert.success.user_restored' => 'Usuário restaurado com sucesso',
 
 ];
diff --git a/resources/lang/en/app.php b/resources/lang/en/app.php
index 39b86ff7..2148839e 100644
--- a/resources/lang/en/app.php
+++ b/resources/lang/en/app.php
@@ -12,6 +12,8 @@ return [
     'settings.system' => 'System',
     'settings.appearance' => 'Appearance',
     'settings.miscellaneous' => 'Miscellaneous',
+    'settings.support' => 'Support',
+    'settings.donate' => 'Donate',
 
     'settings.version' => 'Version',
     'settings.background_image' => 'Background Image',
@@ -72,6 +74,15 @@ return [
     'apps.tags' => 'Tags',
     'apps.override' => 'If different to main url',
 
+    'user.user_list' => 'Users',
+    'user.add_user' => 'Add user',
+    'user.username' => 'Username',
+    'user.avatar' => 'Avatar',
+    'user.email' => 'Email',
+    'user.password_confirm' => 'Confirm Password',
+    'user.secure_front' => 'Allow public access to front - Only enforced if a password is set.',
+    'user.autologin' => 'Allow logging in from a specific URL. Anyone with the link can login.',
+
     'url' => 'URL',
     'title' => 'Title',
     'delete' => 'Delete',
@@ -91,5 +102,10 @@ return [
     'alert.success.setting_updated' => 'You have successfully edited this setting',
     'alert.error.not_exist' => 'This setting does not exist.',
 
+    'alert.success.user_created' => 'User created successfully',
+    'alert.success.user_updated' => 'User updated successfully',
+    'alert.success.user_deleted' => 'User deleted successfully',
+    'alert.success.user_restored' => 'User restored successfully',
+
 
 ];
diff --git a/resources/lang/fr/app.php b/resources/lang/fr/app.php
index 639b24b3..656e3ebc 100644
--- a/resources/lang/fr/app.php
+++ b/resources/lang/fr/app.php
@@ -4,55 +4,88 @@ return array (
   'settings.system' => 'Système',
   'settings.appearance' => 'Apparence',
   'settings.miscellaneous' => 'Divers',
+  'settings.support' => 'Support',
+  'settings.donate' => 'Contribuer',
+  
   'settings.version' => 'Version',
-  'settings.background_image' => 'Image D\'Arrière-Plan',
-  'settings.homepage_search' => 'La Page D\'Accueil De Recherche',
-  'settings.search_provider' => 'Fournisseur de recherche',
+  'settings.background_image' => 'Image d\'arrière-plan',
+  'settings.window_target' => 'Ouverture des liens',
+  'settings.window_target.current' => 'Dans l\'onglet courant',
+  'settings.window_target.one' => 'Dans le même nouvel onglet',
+  'settings.window_target.new' => 'Dans un nouvel onglet',
+  'settings.homepage_search' => 'Barre de recherche',
+  'settings.search_provider' => 'Moteur de recherche',
   'settings.language' => 'Langue',
-  'settings.reset' => 'Réinitialiser aux valeurs par défaut',
+  'settings.reset' => 'Réinitialiser les valeurs par défaut',
   'settings.remove' => 'Supprimer',
-  'settings.search' => 'chercher',
-  'settings.no_items' => 'Pas d\'articles trouvés',
+  'settings.search' => 'Chercher',
+  'settings.no_items' => 'Aucun élement trouvé',
+  
   'settings.label' => 'Étiquette',
   'settings.value' => 'Valeur',
   'settings.edit' => 'Modifier',
   'settings.view' => 'Vue',
+  
   'options.none' => '- non défini -',
   'options.google' => 'Google',
   'options.ddg' => 'DuckDuckGo',
   'options.bing' => 'Bing',
+  'options.startpage' => 'Page d\'accueil',
   'options.yes' => 'Oui',
   'options.no' => 'Non',
+  
   'buttons.save' => 'Enregistrer',
   'buttons.cancel' => 'Annuler',
   'buttons.add' => 'Ajouter',
-  'buttons.upload' => 'Télécharger un fichier',
-  'dash.pin_item' => 'Épingler l\'élément au tableau de bord',
-  'dash.no_apps' => 'Il n\'existe actuellement aucun épinglé applications :link1 ou :link2',
-  'dash.link1' => 'Ajouter une application ici',
-  'dash.link2' => 'Pin un élément au tableau de bord',
-  'dash.pinned_items' => 'Éléments épinglés',
+  'buttons.upload' => 'Choisir un fichier',
+  
+  'dash.pin_item' => 'Épingler l\'application au tableau de bord',
+  'dash.no_apps' => 'Il n\'existe actuellement aucune application épinglée :link1 ou :link2',
+  'dash.link1' => 'Ajouter une application',
+  'dash.link2' => 'Épingler une application au tableau de bord',
+  'dash.pinned_items' => 'Applications épinglées',
+  
   'apps.app_list' => 'Liste des applications',
   'apps.view_trash' => 'Voir la corbeille',
   'apps.add_application' => 'Ajouter une application',
   'apps.application_name' => 'Nom de l\'application',
   'apps.colour' => 'Couleur',
   'apps.icon' => 'Icône',
-  'apps.pinned' => 'Épinglé',
+  'apps.pinned' => 'Épinglée',
   'apps.title' => 'Titre',
   'apps.hex' => 'Hexadécimal de la couleur',
   'apps.username' => 'Nom d\'utilisateur',
   'apps.password' => 'Mot de passe',
   'apps.config' => 'Config',
+  'apps.enable' => 'Actif',
+  'apps.tag_list' => 'Liste des labels',
+  'apps.add_tag' => 'Ajouter un label',
+  'apps.tag_name' => 'Nom du label',
+  'apps.tags' => 'Labels',
+  'apps.override' => 'Si différent de l\'url actuelle',
+  
   'url' => 'Url',
   'title' => 'Titre',
   'delete' => 'Effacer',
   'optional' => 'Optionnel',
   'restore' => 'Restaurer',
-  'alert.success.item_created' => 'Élément créé avec succès',
-  'alert.success.item_updated' => 'Article mis à jour avec succès',
-  'alert.success.item_deleted' => 'Élément supprimé avec succès',
-  'alert.success.item_restored' => 'Élément à restaurer avec succès',
-  'alert.success.setting_updated' => 'Vous avez modifié ce paramètre avec succès',
+  
+  'alert.success.item_created' => 'Application créée avec succès',
+  'alert.success.item_updated' => 'Application mise à jour avec succès',
+  'alert.success.item_deleted' => 'Application supprimée avec succès',
+  'alert.success.item_restored' => 'Application restaurée avec succès',
+  
+  'alert.success.tag_created' => 'Label crée avec succès',
+  'alert.success.tag_updated' => 'Label mis à jour avec succès',
+  'alert.success.tag_deleted' => 'Label supprimé avec succès',
+  'alert.success.tag_restored' => 'Label restauré avec succès',
+  
+  'alert.success.setting_updated' => 'Paramètre mis à jour avec succès',
   'alert.error.not_exist' => 'Ce paramètre n\'existe pas.',
-);
\ No newline at end of file
+  
+  'alert.success.user_created' => 'Utilisateur crée avec succès',
+  'alert.success.user_updated' => 'Utilisateur mis à jour avec succès',
+  'alert.success.user_deleted' => 'Utilisateur supprimé avec succès',
+  'alert.success.user_restored' => 'Utilisateur restoré avec succès',
+  
+);
diff --git a/resources/lang/nl/app.php b/resources/lang/nl/app.php
index 416b38bb..a2bba533 100644
--- a/resources/lang/nl/app.php
+++ b/resources/lang/nl/app.php
@@ -18,7 +18,7 @@ return [
     'settings.homepage_search' => 'Zoeken op thuispagina',
     'settings.search_provider' => 'Zoekaanbieder',
     'settings.language' => 'Taal',
-    'settings.reset' => 'Op standaard instellen',
+    'settings.reset' => 'Standaard instellingen herstellen',
     'settings.remove' => 'Verwijderen',
     'settings.search' => 'zoeken',
     'settings.no_items' => 'Geen items gevonden',
@@ -39,21 +39,21 @@ return [
     'buttons.save' => 'Opslaan',
     'buttons.cancel' => 'Annuleren',
     'buttons.add' => 'Toevoegen',
-    'buttons.upload' => 'Bestand uploaden',
+    'buttons.upload' => 'Een bestand uploaden',
 
-    'dash.pin_item' => 'Item aan dashboard vastmaken',
-    'dash.no_apps' => 'Er zijn momenteel geen vastgemaakte toepassingen, :link1 of :link2',
+    'dash.pin_item' => 'Item aan dashboard vastpinnen',
+    'dash.no_apps' => 'Er zijn momenteel geen vastgepinde toepassingen, :link1 of :link2',
     'dash.link1' => 'Voeg hier een toepassing toe',
-    'dash.link2' => 'Een item aan het dashboard vastmaken',
-    'dash.pinned_items' => 'Vastgemaakte Items',
+    'dash.link2' => 'Een item aan het dashboard vastpinnen',
+    'dash.pinned_items' => 'Vastgepinde Items',
 
-    'apps.app_list' => 'Lijst met toepassingen',
+    'apps.app_list' => 'Applicatielijst',
     'apps.view_trash' => 'Prullenbak weergeven',
-    'apps.add_application' => 'Toepassing toevoegen',
-    'apps.application_name' => 'Naam van toepassing',
+    'apps.add_application' => 'Applicatie toevoegen',
+    'apps.application_name' => 'Applicatienaam',
     'apps.colour' => 'Kleur',
     'apps.icon' => 'Pictogram',
-    'apps.pinned' => 'Vastgemaakt',
+    'apps.pinned' => 'Vastgepind',
     'apps.title' => 'Titel',
     'apps.hex' => 'Hex-kleur',
     'apps.username' => 'Gebruikersnaam',
@@ -61,10 +61,20 @@ return [
     'apps.config' => 'Configuratie',
     'apps.apikey' => 'API-sleutel',
     'apps.enable' => 'Inschakalen',
-    'apps.tag_list' => 'Lijst met tags',
+    'apps.tag_list' => 'Tags-lijst',
     'apps.add_tag' => 'Tag toevoegen',
-    'apps.tag_name' => 'Naam van tag',
+    'apps.tag_name' => 'Tag naam',
     'apps.tags' => 'Tags',
+    'apps.override' => 'Indien anders dan hoofd-url',
+    
+    'user.user_list' => 'Gebruikers',
+    'user.add_user' => 'Gebruiker toevoegen',
+    'user.username' => 'Gebruikersnaam',
+    'user.avatar' => 'Avatar',
+    'user.email' => 'Email',
+    'user.password_confirm' => 'Bevestig wachtwoord',
+    'user.secure_front' => 'Sta publieke toegang toe tot voorkant - Alleen geforceerd indien een wachtwoord is ingesteld.',
+    'user.autologin' => 'Sta inloggen vanaf een specifieke URL toe. Iedereen met de link kan inloggen.',
 
     'url' => 'URL',
     'title' => 'Titel',
@@ -84,6 +94,11 @@ return [
 
     'alert.success.setting_updated' => 'Deze instelling is met succes gewijzigd',
     'alert.error.not_exist' => 'Deze instelling bestaat niet.',
+    
+    'alert.success.user_created' => 'Gebruiker met succes aangemaakt',
+    'alert.success.user_updated' => 'Gebruiker met succes bewerkt',
+    'alert.success.user_deleted' => 'Gebruiker met succes verwijderd',
+    'alert.success.user_restored' => 'Gebruiker met succes hersteld',
 
 
 ];
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
new file mode 100644
index 00000000..19f39865
--- /dev/null
+++ b/resources/views/auth/login.blade.php
@@ -0,0 +1,25 @@
+@extends('layouts.app')
+
+@section('content')
+<?php
+$user = \App\User::currentUser();
+?>
+<form class="form-horizontal" method="POST" action="{{ route('login') }}">
+    {{ csrf_field() }}
+    <div class="userlist">
+    
+        <div class="user" href="{{ route('user.set', [$user->id]) }}">
+            @if($user->avatar)
+            <img class="user-img" src="{{ asset('/storage/'.$user->avatar) }}" />
+            @else
+            <img class="user-img" src="{{ asset('/img/heimdall-icon-small.png') }}" />
+            @endif
+            {{ $user->username }}
+            <input id="password" type="password" class="form-control" name="password" required>
+            <button type="submit" class="btn btn-primary">Login</button>
+        </div>
+    </div>
+        
+</form>
+
+@endsection
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
new file mode 100644
index 00000000..ad38245b
--- /dev/null
+++ b/resources/views/auth/passwords/email.blade.php
@@ -0,0 +1,47 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2">
+            <div class="panel panel-default">
+                <div class="panel-heading">Reset Password</div>
+
+                <div class="panel-body">
+                    @if (session('status'))
+                        <div class="alert alert-success">
+                            {{ session('status') }}
+                        </div>
+                    @endif
+
+                    <form class="form-horizontal" method="POST" action="{{ route('password.email') }}">
+                        {{ csrf_field() }}
+
+                        <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
+                            <label for="email" class="col-md-4 control-label">E-Mail Address</label>
+
+                            <div class="col-md-6">
+                                <input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required>
+
+                                @if ($errors->has('email'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('email') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <div class="col-md-6 col-md-offset-4">
+                                <button type="submit" class="btn btn-primary">
+                                    Send Password Reset Link
+                                </button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
new file mode 100644
index 00000000..84ec0101
--- /dev/null
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -0,0 +1,70 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2">
+            <div class="panel panel-default">
+                <div class="panel-heading">Reset Password</div>
+
+                <div class="panel-body">
+                    <form class="form-horizontal" method="POST" action="{{ route('password.request') }}">
+                        {{ csrf_field() }}
+
+                        <input type="hidden" name="token" value="{{ $token }}">
+
+                        <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
+                            <label for="email" class="col-md-4 control-label">E-Mail Address</label>
+
+                            <div class="col-md-6">
+                                <input id="email" type="email" class="form-control" name="email" value="{{ $email or old('email') }}" required autofocus>
+
+                                @if ($errors->has('email'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('email') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
+                            <label for="password" class="col-md-4 control-label">Password</label>
+
+                            <div class="col-md-6">
+                                <input id="password" type="password" class="form-control" name="password" required>
+
+                                @if ($errors->has('password'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('password') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group{{ $errors->has('password_confirmation') ? ' has-error' : '' }}">
+                            <label for="password-confirm" class="col-md-4 control-label">Confirm Password</label>
+                            <div class="col-md-6">
+                                <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
+
+                                @if ($errors->has('password_confirmation'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('password_confirmation') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <div class="col-md-6 col-md-offset-4">
+                                <button type="submit" class="btn btn-primary">
+                                    Reset Password
+                                </button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
new file mode 100644
index 00000000..38eef838
--- /dev/null
+++ b/resources/views/auth/register.blade.php
@@ -0,0 +1,77 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2">
+            <div class="panel panel-default">
+                <div class="panel-heading">Register</div>
+
+                <div class="panel-body">
+                    <form class="form-horizontal" method="POST" action="{{ route('register') }}">
+                        {{ csrf_field() }}
+
+                        <div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
+                            <label for="name" class="col-md-4 control-label">Name</label>
+
+                            <div class="col-md-6">
+                                <input id="name" type="text" class="form-control" name="name" value="{{ old('name') }}" required autofocus>
+
+                                @if ($errors->has('name'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('name') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
+                            <label for="email" class="col-md-4 control-label">E-Mail Address</label>
+
+                            <div class="col-md-6">
+                                <input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required>
+
+                                @if ($errors->has('email'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('email') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
+                            <label for="password" class="col-md-4 control-label">Password</label>
+
+                            <div class="col-md-6">
+                                <input id="password" type="password" class="form-control" name="password" required>
+
+                                @if ($errors->has('password'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('password') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="password-confirm" class="col-md-4 control-label">Confirm Password</label>
+
+                            <div class="col-md-6">
+                                <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <div class="col-md-6 col-md-offset-4">
+                                <button type="submit" class="btn btn-primary">
+                                    Register
+                                </button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
new file mode 100644
index 00000000..d8437bf8
--- /dev/null
+++ b/resources/views/home.blade.php
@@ -0,0 +1,23 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2">
+            <div class="panel panel-default">
+                <div class="panel-heading">Dashboard</div>
+
+                <div class="panel-body">
+                    @if (session('status'))
+                        <div class="alert alert-success">
+                            {{ session('status') }}
+                        </div>
+                    @endif
+
+                    You are logged in!
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
diff --git a/resources/views/items/create.blade.php b/resources/views/items/create.blade.php
index 88886f2f..4b0ff6cd 100644
--- a/resources/views/items/create.blade.php
+++ b/resources/views/items/create.blade.php
@@ -1,4 +1,4 @@
-@extends('app')
+@extends('layouts.app')
 
 @section('content')
 
diff --git a/resources/views/items/edit.blade.php b/resources/views/items/edit.blade.php
index ce7f54e1..3bcaa313 100644
--- a/resources/views/items/edit.blade.php
+++ b/resources/views/items/edit.blade.php
@@ -1,4 +1,4 @@
-@extends('app')
+@extends('layouts.app')
 
 @section('content')
 
diff --git a/resources/views/items/list.blade.php b/resources/views/items/list.blade.php
index 2b046b53..d3792d93 100644
--- a/resources/views/items/list.blade.php
+++ b/resources/views/items/list.blade.php
@@ -1,4 +1,4 @@
-@extends('app')
+@extends('layouts.app')
 
 @section('content')
         <section class="module-container">
diff --git a/resources/views/items/trash.blade.php b/resources/views/items/trash.blade.php
index d3833586..caed294d 100644
--- a/resources/views/items/trash.blade.php
+++ b/resources/views/items/trash.blade.php
@@ -1,4 +1,4 @@
-@extends('app')
+@extends('layouts.app')
 
 @section('content')
         <section class="module-container">
diff --git a/resources/views/app.blade.php b/resources/views/layouts/app.blade.php
similarity index 81%
rename from resources/views/app.blade.php
rename to resources/views/layouts/app.blade.php
index 124fc2d5..4929adf5 100644
--- a/resources/views/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -19,6 +19,7 @@
         <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
         <link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png">
         <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+        <link rel="mask-icon" href="{{ asset('img/heimdall-logo-small.svg') }}" color="black">
         <link rel="manifest" href="/manifest.json">
         <meta name="msapplication-TileColor" content="#ffffff">
         <meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
@@ -71,14 +72,29 @@
                         </div>
                     </div>
                     @endif
-                    
+                    @if($allusers->count() > 1)
+                    <div id="switchuser">
+                        @if($current_user->avatar)
+                        <img class="user-img" src="{{ asset('/storage/'.$current_user->avatar) }}" />
+                        @else
+                        <img class="user-img" src="{{ asset('/img/heimdall-icon-small.png') }}" />
+                        @endif
+                        {{ $current_user->username }}
+                        <a class="btn" href="{{ route('user.select') }}">Switch User</a>
+                    </div>
+                    @endif
                     @yield('content')
                     <div id="config-buttons">
+
+                        
                         @if(Route::is('dash') || Route::is('tags.show'))
                         <a id="config-button" class="config" href=""><i class="fas fa-exchange"></i></a>
                         @endif
     
                         <a id="dash" class="config" href="{{ route('dash', [], false) }}"><i class="fas fa-th"></i></a>
+                        @if($current_user->id === 1)
+                        <a id="users" class="config" href="{{ route('users.index', [], false) }}"><i class="fas fa-user"></i></a>
+                        @endif
                         <a id="items" class="config" href="{{ route('items.index', [], false) }}"><i class="fas fa-list"></i></a>
                         <a id="folder" class="config" href="{{ route('tags.index', [], false) }}"><i class="fas fa-tag"></i></a>
                         <a id="settings" class="config" href="{{ route('settings.index', [], false) }}"><i class="fas fa-cogs"></i></a>
@@ -87,9 +103,8 @@
 
             </div>
         </div>
-        <script src="//ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-        <script>!window.jQuery && document.write('<script src="/js/jquery-3.3.1.min.js"><\/script>')</script>
-        <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
+        <script src="{{ asset('js/jquery-3.3.1.min.js') }}"></script>
+        <script src="{{ asset('js/jquery-ui.min.js') }}"></script>
         <script src="{{ asset('js/app.js?v=2') }}"></script>
         @yield('scripts')
         
diff --git a/resources/views/layouts/users.blade.php b/resources/views/layouts/users.blade.php
new file mode 100644
index 00000000..5ef75868
--- /dev/null
+++ b/resources/views/layouts/users.blade.php
@@ -0,0 +1,65 @@
+<!doctype html>
+<html lang="{{ app()->getLocale() }}">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <title>{{ config('app.name') }}</title>
+        <link rel="apple-touch-icon" sizes="57x57" href="/apple-icon-57x57.png">
+        <link rel="apple-touch-icon" sizes="60x60" href="/apple-icon-60x60.png">
+        <link rel="apple-touch-icon" sizes="72x72" href="/apple-icon-72x72.png">
+        <link rel="apple-touch-icon" sizes="76x76" href="/apple-icon-76x76.png">
+        <link rel="apple-touch-icon" sizes="114x114" href="/apple-icon-114x114.png">
+        <link rel="apple-touch-icon" sizes="120x120" href="/apple-icon-120x120.png">
+        <link rel="apple-touch-icon" sizes="144x144" href="/apple-icon-144x144.png">
+        <link rel="apple-touch-icon" sizes="152x152" href="/apple-icon-152x152.png">
+        <link rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180x180.png">
+        <link rel="icon" type="image/png" sizes="192x192"  href="/android-icon-192x192.png">
+        <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
+        <link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png">
+        <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+        <link rel="manifest" href="/manifest.json">
+        <meta name="msapplication-TileColor" content="#ffffff">
+        <meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
+        <meta name="theme-color" content="#ffffff">
+        <meta name="mobile-web-app-capable" content="yes">
+        <meta name="apple-mobile-web-app-capable" content="yes">
+        <link rel="stylesheet" href="{{ asset('css/app.css') }}" type="text/css" />
+
+    </head>
+    <body>
+        <div id="app"{!! $alt_bg !!}>
+            <div class="content">
+                <main>
+                    @if ($message = Session::get('success'))
+                    <div class="message-container">
+                        <div class="alert alert-success">
+                            <p>{{ $message }}</p>
+                        </div>
+                    </div>
+                    @endif
+                    @if (count($errors) > 0)
+                    <div class="message-container">
+                        <div class="alert alert-danger">
+                            <ul>
+                                @foreach ($errors->all() as $error)
+                                    <li>{{ $error }}</li>
+                                @endforeach
+                            </ul>
+                        </div>
+                    </div>
+                    @endif
+                    @yield('content')
+                </main>
+
+            </div>
+        </div>
+        <script src="//ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+        <script>!window.jQuery && document.write('<script src="/js/jquery-3.3.1.min.js"><\/script>')</script>
+        <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
+        <script src="{{ asset('js/app.js?v=2') }}"></script>
+        @yield('scripts')
+        
+    </body>
+</html>
diff --git a/resources/views/settings/edit.blade.php b/resources/views/settings/edit.blade.php
index 66289441..9170bd93 100644
--- a/resources/views/settings/edit.blade.php
+++ b/resources/views/settings/edit.blade.php
@@ -1,4 +1,4 @@
-@extends('app')
+@extends('layouts.app')
 
 @section('content')
 
diff --git a/resources/views/settings/list.blade.php b/resources/views/settings/list.blade.php
index 665b36c3..81ce2432 100644
--- a/resources/views/settings/list.blade.php
+++ b/resources/views/settings/list.blade.php
@@ -1,4 +1,4 @@
-@extends('app')
+@extends('layouts.app')
 
 @section('content')
 
diff --git a/resources/views/tags/create.blade.php b/resources/views/tags/create.blade.php
index 1c9757dd..2e8a966b 100644
--- a/resources/views/tags/create.blade.php
+++ b/resources/views/tags/create.blade.php
@@ -1,4 +1,4 @@
-@extends('app')
+@extends('layouts.app')
 
 @section('content')
 
diff --git a/resources/views/tags/edit.blade.php b/resources/views/tags/edit.blade.php
index 18ec1454..78a0e9db 100644
--- a/resources/views/tags/edit.blade.php
+++ b/resources/views/tags/edit.blade.php
@@ -1,4 +1,4 @@
-@extends('app')
+@extends('layouts.app')
 
 @section('content')
 
diff --git a/resources/views/tags/list.blade.php b/resources/views/tags/list.blade.php
index 0e079bde..d3701a46 100644
--- a/resources/views/tags/list.blade.php
+++ b/resources/views/tags/list.blade.php
@@ -1,4 +1,4 @@
-@extends('app')
+@extends('layouts.app')
 
 @section('content')
         <section class="module-container">
diff --git a/resources/views/tags/trash.blade.php b/resources/views/tags/trash.blade.php
index df9fb0f7..85c834c0 100644
--- a/resources/views/tags/trash.blade.php
+++ b/resources/views/tags/trash.blade.php
@@ -1,4 +1,4 @@
-@extends('app')
+@extends('layouts.app')
 
 @section('content')
         <section class="module-container">
diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php
new file mode 100644
index 00000000..8ba7e1b1
--- /dev/null
+++ b/resources/views/users/create.blade.php
@@ -0,0 +1,11 @@
+@extends('layouts.app')
+
+@section('content')
+
+    {!! Form::open(array('route' => 'users.store', 'id' => 'userform', 'files' => true, 'method'=>'POST')) !!}
+    @include('users.form')
+    {!! Form::close() !!}
+
+@endsection
+@section('scripts')
+@endsection
\ No newline at end of file
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
new file mode 100644
index 00000000..8d6c0361
--- /dev/null
+++ b/resources/views/users/edit.blade.php
@@ -0,0 +1,11 @@
+@extends('layouts.app')
+
+@section('content')
+
+    {!! Form::model($user, ['method' => 'PATCH', 'id' => 'userform', 'files' => true, 'route' => ['users.update', $user->id]]) !!}
+    @include('users.form')
+    {!! Form::close() !!}
+
+@endsection
+@section('scripts')
+@endsection
\ No newline at end of file
diff --git a/resources/views/users/form.blade.php b/resources/views/users/form.blade.php
new file mode 100644
index 00000000..f7b1d4b0
--- /dev/null
+++ b/resources/views/users/form.blade.php
@@ -0,0 +1,97 @@
+    <section class="module-container">
+        <header>
+            <div class="section-title">{{ __('app.user.add_user') }}</div>
+            <div class="module-actions">
+                <button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button>
+                <a href="{{ route('users.index', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
+            </div>
+        </header>
+        <div id="create" class="create">
+            {!! csrf_field() !!}
+
+            <div class="input">
+                <label>{{ __('app.user.username') }} *</label>
+                {!! Form::text('username', null, array('placeholder' => __('app.user.username'), 'id' => 'appname', 'class' => 'form-control')) !!}
+                <hr />
+            </div>
+            <div class="input">
+                <label>{{ __('app.user.email') }} *</label>
+                {!! Form::text('email', null, array('placeholder' => 'email@test.com','class' => 'form-control')) !!}
+                <hr />
+            </div>
+            <div class="input">
+            <label>{{ __('app.user.avatar') }}</label>
+                <div class="icon-container">
+                    <div id="appimage">
+                    @if(isset($user->avatar) && !empty($user->avatar) || old('avatar'))
+                    <?php
+                        if(isset($user->avatar)) $avatar = $user->avatar;
+                        else $avatar = old('avatar');
+                    ?>
+                    <img style="max-width: 115px" src="{{ asset('storage/'.$avatar) }}" />
+                    {!! Form::hidden('avatar', $avatar, ['class' => 'form-control']) !!}
+                    @else
+                    <img style="max-width: 115px" src="/img/heimdall-icon-small.png" />
+                    @endif
+                    </div>
+                    <div class="upload-btn-wrapper">
+                        <button class="btn">{{ __('app.buttons.upload')}} </button>
+                        <input type="file" id="upload" name="file" />
+                    </div>
+                </div>
+            </div>
+
+        <div style="margin-top: -40px; width: 100%; padding: 0" class="create">
+            <div class="input">
+                <label>{{ __('app.apps.password') }} *</label>
+                {!! Form::password('password', null, array('class' => 'form-control')) !!}
+                <hr />
+
+            </div>
+            <div class="input">
+                <label>{{ __('app.user.password_confirm') }} *</label>
+                {!! Form::password('password_confirmation', null, array('class' => 'form-control')) !!}
+            </div>
+        </div>
+
+        <div class="input">
+                <label>{{ __('app.user.secure_front') }}</label>
+                {!! Form::hidden('public_front', '0') !!}
+                <label class="switch">
+                    <?php
+                    $checked = true;
+                    if(isset($user->public_front) && (bool)$user->public_front === false) $checked = false;
+                    $set_checked = ($checked) ? ' checked="checked"' : '';
+                    ?>                   
+                    <input type="checkbox" name="public_front" value="1"<?php echo $set_checked;?> />
+                    <span class="slider round"></span>
+                </label>
+            </div>
+            <div class="input">
+                    <label>{{ __('app.user.autologin') }}</label>
+                    {!! Form::hidden('autologin_allow', '0') !!}
+                    <label class="switch">
+                        <?php
+                        $checked = false;
+                        if(isset($user->autologin) && !empty($user->autologin)) $checked = true;
+                        $set_checked = ($checked) ? ' checked="checked"' : '';
+                        ?>                   
+                        <input type="checkbox" name="autologin_allow" value="1"<?php echo $set_checked;?> />
+                        <span class="slider round"></span>
+                    </label>
+                    
+                </div>
+    
+                        
+        </div>
+        <footer>
+            <div class="section-title">&nbsp;</div>
+            <div class="module-actions">
+                <button type="submit"class="button"><i class="fa fa-save"></i><span>{{ __('app.buttons.save') }}</span></button>
+                <a href="{{ route('users.index', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
+            </div>
+        </footer>
+
+    </section>
+
+
diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
new file mode 100644
index 00000000..3384a023
--- /dev/null
+++ b/resources/views/users/index.blade.php
@@ -0,0 +1,66 @@
+@extends('layouts.app')
+
+@section('content')
+        <section class="module-container">
+            <header>
+                <div class="section-title">
+                    {{ __('app.user.user_list') }}
+                    @if( isset($trash) && $trash->count() > 0 )
+                        <a class="trashed" href="{{ route('users.index', ['trash' => true], false) }}">{{ __('app.apps.view_trash') }} ({{ $trash->count() }})</a>
+                    @endif
+
+                </div>
+                <div class="module-actions">
+                    <a href="{{ route('users.create', [], false) }}" title="" class="button"><i class="fa fa-plus"></i><span>{{ __('app.buttons.add') }}</span></a>
+                    <a href="{{ route('dash', [], false) }}" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
+                </div>
+            </header>
+
+            <table class="table table-hover">
+                <thead>
+                    <tr>
+                        <th>{{ __('app.user.username') }}</th>
+                        <th>{{ __('app.apps.password') }}</th>
+                        <th>{{ __('app.apps.autologin_url') }}</th>
+                        <th class="text-center" width="100">{{ __('app.settings.edit') }}</th>
+                        <th class="text-center" width="100">{{ __('app.delete') }}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @if($users->first())
+                        @foreach($users as $user)
+                            <tr>
+                                <td>{{ $user->username }}</td>
+                                <td><i class="fa {{ (!is_null($user->password) ? 'fa-check' : 'fa-times') }}" /></td>
+                                <td>
+                                @if(is_null($user->autologin))
+                                    <i class="fa fa-times" />
+                                @else
+                                    <a href="{{ route('user.autologin', $user->autologin) }}">{{ route('user.autologin', $user->autologin) }}</a>
+                                @endif
+                                </td>
+                                <td class="text-center"><a{{ $user->target }} href="{!! route('users.edit', [$user->id], false) !!}" title="{{ __('user.settings.edit') }} {!! $user->title !!}"><i class="fas fa-edit"></i></a></td>
+                                <td class="text-center">
+                                    @if($user->id !== 1)
+                                        {!! Form::open(['method' => 'DELETE','route' => ['users.destroy', $user->id],'style'=>'display:inline']) !!}
+                                        <button class="link" type="submit"><i class="fa fa-trash-alt"></i></button>
+                                        {!! Form::close() !!}
+                                    @endif
+                                </td>
+                            </tr>
+                        @endforeach
+                    @else
+                        <tr>
+                            <td colspan="4" class="form-error text-center">
+                                <strong>{{ __('app.user.settings.no_items') }}</strong>
+                            </td>
+                        </tr>
+                    @endif
+
+                
+                </tbody>
+            </table>
+        </section>
+
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/users/scripts.blade.php b/resources/views/users/scripts.blade.php
new file mode 100644
index 00000000..7dcf402a
--- /dev/null
+++ b/resources/views/users/scripts.blade.php
@@ -0,0 +1,32 @@
+<script src="/js/select2.min.js"></script>
+<script>
+        $( function() {
+
+            var elem = $('.color-picker')[0];
+            var hueb = new Huebee( elem, {
+              // options
+            });
+
+            var availableTags = @json(App\Item::supportedOptions());
+
+            $( "#appname" ).autocomplete({
+                source: availableTags,
+                select: function( event, ui ) {
+                    $.post('/appload', { app: ui.item.value }, function(data) {
+                        $('#appimage').html("<img src='/storage/"+data.icon+"' /><input type='hidden' name='icon' value='"+data.icon+"' />");
+                        $('input[name=colour]').val(data.colour);
+                        hueb.setColor( data.colour );
+                        $('input[name=pinned]').prop('checked', true);
+                        if(data.config != null) {
+                            $.get('/view/'+data.config, function(getdata) {
+                                $('#sapconfig').html(getdata).show();
+                            });
+                        }
+                    }, "json");
+                }
+            });
+
+            $('.tags').select2();
+
+        });
+</script>
diff --git a/resources/views/users/trash.blade.php b/resources/views/users/trash.blade.php
new file mode 100644
index 00000000..caed294d
--- /dev/null
+++ b/resources/views/users/trash.blade.php
@@ -0,0 +1,52 @@
+@extends('layouts.app')
+
+@section('content')
+        <section class="module-container">
+            <header>
+                <div class="section-title">
+                    Showing Deleted Applications
+                </div>
+                <div class="module-actions">
+                    <a href="{{ route('items.index', [], false) }}" title="" class="button"><i class="fa fa-ban"></i><span>{{ __('app.buttons.cancel') }}</span></a>
+                </div>
+            </header>
+
+            <table class="table table-hover">
+                <thead>
+                    <tr>
+                        <th>{{ __('app.title') }}</th>
+                        <th>Url</th>
+                        <th class="text-center" width="100">{{ __('app.restore') }}</th>
+                        <th class="text-center" width="100">{{ __('app.delete') }}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @if($trash->first())
+                        @foreach($trash as $app)
+                            <tr>
+                                <td>{{ $app->title }}</td>
+                                <td>{{ __('app.url') }}</td>
+                                <td class="text-center"><a href="{!! route('items.restore', [$app->id], false) !!}" title="{{ __('app.restore') }} {!! $app->title !!}"><i class="fas fa-undo"></i></a></td>
+                                <td class="text-center">
+                                        {!! Form::open(['method' => 'DELETE','route' => ['items.destroy', $app->id],'style'=>'display:inline']) !!}
+                                        <input type="hidden" name="force" value="1" />
+                                        <button type="submit"><i class="fa fa-trash-alt"></i></button>
+                                        {!! Form::close() !!}
+                                </td>
+                            </tr>
+                        @endforeach
+                    @else
+                        <tr>
+                            <td colspan="5" class="form-error text-center">
+                                <strong>{{ __('app.settings.no_items') }}</strong>
+                            </td>
+                        </tr>
+                    @endif
+
+                
+                </tbody>
+            </table>
+        </section>
+
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/userselect.blade.php b/resources/views/userselect.blade.php
new file mode 100644
index 00000000..97f67db8
--- /dev/null
+++ b/resources/views/userselect.blade.php
@@ -0,0 +1,18 @@
+@extends('layouts.users')
+
+@section('content')
+
+<div class="userlist">
+@foreach($users as $user)
+    <a class="user" href="{{ route('user.set', [$user->id]) }}">
+        @if($user->avatar)
+        <img class="user-img" src="{{ asset('/storage/'.$user->avatar) }}" />
+        @else
+        <img class="user-img" src="{{ asset('/img/heimdall-icon-small.png') }}" />
+        @endif
+        {{ $user->username }}
+    </a>
+@endforeach
+</div>
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 45108c4e..e1527f7e 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -1,4 +1,4 @@
-@extends('app')
+@extends('layouts.app')
 
 @section('content')
     @include('partials.search')
diff --git a/routes/web.php b/routes/web.php
index 8d180d29..58d4b62a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -11,6 +11,10 @@
 |
 */
 
+Route::get('/userselect/{user}', 'Auth\LoginController@setUser')->name('user.set');
+Route::get('/userselect', 'UserController@selectUser')->name('user.select');
+Route::get('/autologin/{uuid}', 'Auth\LoginController@autologin')->name('user.autologin');
+
 Route::get('/', 'ItemController@dash')->name('dash');
 
 Route::resources([
@@ -36,6 +40,8 @@ Route::get('view/{name_view}', function ($name_view) {
     return view('supportedapps.'.$name_view);
 });
 
+Route::resource('users', 'UserController');
+
 /**
  * Settings.
  */
@@ -54,4 +60,7 @@ Route::group([
 
     Route::patch('edit/{id}', 'SettingsController@update');
 
-});
\ No newline at end of file
+});
+Auth::routes();
+
+Route::get('/home', 'HomeController@index')->name('home');
diff --git a/storage/app/public/supportedapps/mailcow.svg b/storage/app/public/supportedapps/mailcow.svg
new file mode 100644
index 00000000..6ba98e46
--- /dev/null
+++ b/storage/app/public/supportedapps/mailcow.svg
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="layer1"
+   x="0px"
+   y="0px"
+   width="434.82101"
+   height="376.871"
+   viewBox="0 0 434.82101 376.871"
+   enable-background="new 0 0 374.82 356.871"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="cow_mailcow.svg"><metadata
+     id="metadata77"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title><cc:license
+           rdf:resource="" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs75" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1721"
+     inkscape:window-height="1177"
+     id="namedview73"
+     showgrid="false"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="219.01206"
+     inkscape:cy="236.74714"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     fit-margin-top="10"
+     fit-margin-left="50"
+     fit-margin-bottom="10"
+     fit-margin-right="10"
+     showguides="true" /><g
+     id="g3"
+     transform="translate(50,10)"><g
+       id="grey_5_"><path
+         d="m 55.948,213.25 c 0.07331,-20.26146 -0.716379,-17.26061 -3.655806,-39.26743 2.227824,-22.4392 -7.627923,-38.85857 -7.669233,-58.34044 0,-4.715 -5.805961,-6.78013 -4.760961,-11.13713 -6.292,13.037 -9.833,27.707 -9.833,43.222 0,25.946 9.89,49.533 26.027,67.059 -0.048,-0.511 -0.082,-1.023 -0.108,-1.536 z"
+         id="path6"
+         inkscape:connector-curvature="0"
+         style="fill:#3d5263"
+         sodipodi:nodetypes="ccccscc" /></g><g
+       id="yellow"><path
+         d="m 254.808,180.412 -0.567,0.455 c -10.49,39.88 -40.951,71.658 -80.048,83.996 l 10.952,9.206 53.296,44.799 31.601,26.563 c 0.783,-2.011 1.229,-4.19 1.231,-6.478 0,-0.007 10e-4,-0.013 10e-4,-0.02 l 0,-16.836 0,-10e-4 0,-28.141 0,-126.736 -16.466,13.193 z"
+         id="path9"
+         inkscape:connector-curvature="0"
+         style="fill:#f9e82d" /><path
+         d="m 23.027,185.52 -6.574,-5.225 -16.452,-13.076 0,90.407 0,81.307 c 0,2.295 0.447,4.481 1.233,6.499 l 58.39,-48.683 26.964,-22.481 12.38,-10.321 C 62.73,251.524 34.307,222.274 23.027,185.52 Z"
+         id="path11"
+         inkscape:connector-curvature="0"
+         style="fill:#f9e82d" /><path
+         d="m 238.441,318.868 -53.296,-44.799 -10.952,-9.206 c -11.431,3.607 -23.597,5.558 -36.22,5.558 -13.653,0 -26.772,-2.28 -39.004,-6.474 l -12.38,10.321 -26.965,22.482 -58.39,48.683 c 2.605,6.69 9.094,11.438 16.706,11.438 l 235.394,0 c 7.613,0 14.103,-4.749 16.707,-11.44 l -31.6,-26.563 z"
+         id="path13"
+         inkscape:connector-curvature="0"
+         style="fill:#edd514;fill-opacity:0.89499996" /></g><g
+       id="grey_4_"><path
+         enable-background="new    "
+         d="M 238.441,318.868 C 196.984,322.876 123.368,324.434 59.625,296.75 38.082,287.394 17.666,274.7 0.002,257.627 l 0,81.307 c 0,2.295 0.447,4.481 1.233,6.499 2.605,6.69 9.094,11.438 16.706,11.438 l 235.394,0 c 7.613,0 14.103,-4.749 16.707,-11.44 0.783,-2.011 1.229,-4.19 1.231,-6.478 l 0,-24.584 c 0,0 -12.58,2.541 -32.832,4.499 z"
+         id="path16"
+         inkscape:connector-curvature="0"
+         style="opacity:0.1;fill:#3d5263" /><path
+         enable-background="new    "
+         d="m 86.588,274.268 c 14.979,6.703 31.579,10.435 49.051,10.435 17.648,0 34.408,-3.803 49.505,-10.634 37.082,-16.777 64.125,-51.824 69.664,-93.657 l -0.567,0.455 c -10.49,39.88 -40.951,71.658 -80.048,83.996 -11.431,3.607 -23.597,5.558 -36.22,5.558 -13.653,0 -26.772,-2.28 -39.004,-6.474 C 62.731,251.524 34.308,222.274 23.028,185.52 l -6.574,-5.225 c 5.525,42.054 32.786,77.261 70.134,93.973 z"
+         id="path18"
+         inkscape:connector-curvature="0"
+         style="opacity:0.1;fill:#3d5263" /></g><g
+       id="white_1_"><path
+         d="m 54.293,63.875 c -1.799,1.745 -3.541,3.548 -5.229,5.402 -0.042,0.046 -0.085,0.092 -0.127,0.139 -0.234,0.258 -0.473,0.51 -0.705,0.77 0.055,-0.055 0.111,-0.108 0.166,-0.163 21.76,-21.782 51.828,-35.259 85.046,-35.259 66.396,0 120.222,53.826 120.222,120.223 0,30.718 -11.526,58.74 -30.482,79.991 21.633,-21.737 35.006,-51.7 35.01,-84.791 0,-0.004 0,-0.009 0,-0.013 0,-21.143 -5.465,-41.007 -15.049,-58.269 -1.449,-2.608 -2.991,-5.157 -4.624,-7.643 -5.377,-8.187 -11.727,-15.676 -18.885,-22.307 -5.903,-5.467 -12.351,-10.354 -19.26,-14.558 -4.278,-2.604 -8.734,-4.944 -13.341,-7.006 -10.627,-4.756 -22.07,-8.016 -34.062,-9.509 -4.915,-0.612 -9.921,-0.931 -15.001,-0.931 -5.747,0 -11.398,0.409 -16.93,1.189 -12.291,1.733 -23.981,5.329 -34.784,10.487 -4.742,2.264 -9.313,4.83 -13.688,7.672 -6.561,4.266 -12.682,9.149 -18.277,14.576 z"
+         id="path21"
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff" /><path
+         d="m 95.828,118.535 c 2.559,0 4.63,-2.071 4.63,-4.629 0,-2.553 -2.071,-4.626 -4.63,-4.626 -2.558,0 -4.634,2.074 -4.634,4.626 10e-4,2.557 2.076,4.629 4.634,4.629 z"
+         id="path23"
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff" /><path
+         d="m 186.85,118.535 c 2.556,0 4.629,-2.071 4.629,-4.629 0,-2.553 -2.074,-4.626 -4.629,-4.626 -2.559,0 -4.631,2.074 -4.631,4.626 0,2.557 2.073,4.629 4.631,4.629 z"
+         id="path25"
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff" /></g><g
+       id="grey_3_"><g
+         id="g28"><path
+           d="m 223.701,234.394 c 18.648,-21.18 29.965,-48.971 29.965,-79.408 0,-66.396 -53.825,-120.223 -120.222,-120.223 -33.218,0 -63.286,13.477 -85.046,35.259 -4.591,5.125 -8.746,10.647 -12.413,16.507 -1.524,2.437 -2.963,4.931 -4.314,7.48 -7.067,13.341 -11.704,28.167 -13.301,43.893 -0.411,4.043 -0.622,8.146 -0.622,12.298 0,3.849 0.188,7.653 0.542,11.409 0.776,8.241 2.38,16.24 4.735,23.912 11.281,36.754 39.703,66.004 75.941,78.427 12.231,4.193 25.351,6.474 39.004,6.474 12.623,0 24.79,-1.95 36.22,-5.558 18.139,-5.725 34.412,-15.64 47.7,-28.603 0.536,-0.522 1.811,-1.867 1.811,-1.867 z m -5.788,-58.356 c -2.132,7.217 -5.052,14.085 -8.668,20.495 -16.571,29.372 -47.64,49.146 -83.233,49.146 -27.584,0 -52.447,-11.88 -69.956,-30.895 C 39.919,197.26 30.03,173.673 30.03,147.726 c 0,-15.515 3.54,-30.185 9.833,-43.222 15.648,-32.42 48.344,-54.73 86.15,-54.73 3.967,0 7.876,0.25 11.717,0.728 47.479,5.898 84.262,47.175 84.262,97.224 -0.002,9.846 -1.431,19.348 -4.079,28.312 z"
+           id="path30"
+           inkscape:connector-curvature="0"
+           style="fill:#f1f2f2" /></g><path
+         d="m 49.064,69.277 c -0.042,0.046 -0.085,0.092 -0.127,0.139 0.042,-0.047 0.085,-0.093 0.127,-0.139 z"
+         id="path32"
+         inkscape:connector-curvature="0"
+         style="fill:#f1f2f2" /></g><g
+       id="darkbrown_1_"><path
+         d="m 257.626,161.89 c -0.488,5.062 -1.29,10.032 -2.387,14.89 -0.31,1.371 -0.643,2.733 -0.999,4.086 l 0.567,-0.455 16.466,-13.193 0,-0.023 -13.647,-5.305 z"
+         id="path35"
+         inkscape:connector-curvature="0"
+         style="fill:#5a3620" /><path
+         d="m 0.001,167.219 16.451,13.076 6.574,5.225 c -2.354,-7.672 -3.959,-15.671 -4.735,-23.912 l -2.85,0.871 L 0,167.196"
+         id="path37"
+         inkscape:connector-curvature="0"
+         style="fill:#5a3620" /><path
+         d="m 87.491,192.337 c -6.21,0 -11.254,5.034 -11.254,11.257 0,6.216 5.043,11.257 11.254,11.257 6.221,0 11.261,-5.041 11.261,-11.257 0,-6.223 -5.041,-11.257 -11.261,-11.257 z"
+         id="path39"
+         inkscape:connector-curvature="0"
+         style="fill:#5a3620" /><path
+         d="m 181.307,192.337 c -6.218,0 -11.259,5.034 -11.259,11.257 0,6.216 5.041,11.257 11.259,11.257 6.22,0 11.257,-5.041 11.257,-11.257 0,-6.223 -5.037,-11.257 -11.257,-11.257 z"
+         id="path41"
+         inkscape:connector-curvature="0"
+         style="fill:#5a3620" /><path
+         d="m 182.997,102.25057 c -6.963,0 -15.44243,7.76632 -15.44243,14.73532 0,6.965 8.12588,17.2072 15.08888,17.2072 6.968,0 15.79898,-9.53609 15.79898,-16.50009 0.001,-6.97 -8.47743,-15.44243 -15.44543,-15.44243 z m 3.853,16.28443 c -2.558,0 -4.631,-2.072 -4.631,-4.629 0,-2.552 2.072,-4.626 4.631,-4.626 2.555,0 4.629,2.073 4.629,4.626 0,2.558 -2.073,4.629 -4.629,4.629 z"
+         id="path43"
+         inkscape:connector-curvature="0"
+         style="fill:#5a3620"
+         sodipodi:nodetypes="ssscssssss" /><path
+         d="m 89.709786,102.60413 c -6.971,0 -14.379767,8.11987 -14.379767,15.08887 0,6.965 8.824981,16.14653 15.793981,16.14653 6.963,0 15.79298,-9.18253 15.79298,-16.14653 0.001,-6.97 -10.243194,-15.08887 -17.207194,-15.08887 z M 95.828,118.535 c -2.559,0 -4.634,-2.072 -4.634,-4.629 0,-2.552 2.076,-4.626 4.634,-4.626 2.559,0 4.63,2.073 4.63,4.626 0,2.558 -2.071,4.629 -4.63,4.629 z"
+         id="path45"
+         inkscape:connector-curvature="0"
+         style="fill:#5a3620"
+         sodipodi:nodetypes="ssscssssss" /></g><g
+       id="cream"><path
+         d="m 336.302,256.425 c 3.59,-9.155 7.701,-11 9.346,-11.346 -40.757,3.757 -36.661,27.769 -34.026,35.96 0.55,1.712 1.037,2.733 1.037,2.733 0,0 2.031,4.787 7.536,8.748 4.149,2.986 10.27,5.503 18.995,5.144 27.063,0.461 35.631,-50.166 35.631,-50.166 -6.654,11.655 -26.404,9.876 -38.519,8.927 z"
+         id="path48"
+         inkscape:connector-curvature="0"
+         style="fill:#fef3df" /><path
+         d="m 48.937,69.415 c 0.042,-0.046 0.085,-0.092 0.127,-0.139 1.688,-1.854 3.43,-3.657 5.229,-5.402 -8.915,-6.977 -24.344,-15.826 -41.744,-11.633 0,0 2.814,20.458 23.437,34.287 3.667,-5.86 7.822,-11.381 12.413,-16.507 -0.055,0.055 -0.111,0.108 -0.166,0.163 0.231,-0.258 0.47,-0.511 0.704,-0.769 z"
+         id="path50"
+         inkscape:connector-curvature="0"
+         style="fill:#fef3df" /><path
+         d="m 258.812,52.242 c -15.831,-3.815 -30.029,3.169 -39.176,9.714 7.158,6.63 13.508,14.12 18.885,22.307 17.763,-13.689 20.291,-32.021 20.291,-32.021 z"
+         id="path52"
+         inkscape:connector-curvature="0"
+         style="fill:#fef3df" /><path
+         d="m 134.269,160.225 c -43.299,0 -78.388,22.964 -78.388,51.289 0,0.582 0.038,1.157 0.067,1.735 0.026,0.514 0.06,1.025 0.108,1.535 17.508,19.015 42.371,30.895 69.956,30.895 35.594,0 66.662,-19.774 83.233,-49.146 -9.796,-21.016 -39.651,-36.308 -74.976,-36.308 z M 87.491,214.85 c -6.211,0 -11.254,-5.041 -11.254,-11.257 0,-6.223 5.044,-11.257 11.254,-11.257 6.22,0 11.261,5.034 11.261,11.257 0,6.216 -5.04,11.257 -11.261,11.257 z m 93.816,0 c -6.218,0 -11.259,-5.041 -11.259,-11.257 0,-6.223 5.041,-11.257 11.259,-11.257 6.22,0 11.257,5.034 11.257,11.257 0,6.216 -5.037,11.257 -11.257,11.257 z"
+         id="path54"
+         inkscape:connector-curvature="0"
+         style="fill:#fef3df" /><path
+         d="M 86.265,0 C 68.102,16.373 86.113,41.427 86.258,41.628 97.061,36.47 108.751,32.874 121.042,31.141 97.629,27.686 86.265,0 86.265,0 Z"
+         id="path56"
+         inkscape:connector-curvature="0"
+         style="fill:#fef3df" /><path
+         d="m 186.204,0 c 0,0 -10.863,26.476 -33.231,30.883 11.992,1.493 23.435,4.752 34.062,9.509 C 190.383,35.136 202.036,14.271 186.204,0 Z"
+         id="path58"
+         inkscape:connector-curvature="0"
+         style="fill:#fef3df" /></g><g
+       id="g60"><path
+         d="m 217.913,176.038 c 2.647,-8.964 6.55187,-25.89162 6.55187,-35.73662 C 224.46487,90.252379 185.208,56.4 137.728,50.502 c -2.157,28.03 3.629,87.043 80.185,125.536 z m -47.53,-58.345 c 0,-6.97 5.651,-12.614 12.614,-12.614 6.968,0 12.617,5.645 12.617,12.614 0,6.964 -5.649,12.611 -12.617,12.611 -6.963,0 -12.614,-5.646 -12.614,-12.611 z"
+         id="path62"
+         inkscape:connector-curvature="0"
+         style="fill:#87654a"
+         sodipodi:nodetypes="csccsssss" /></g><g
+       id="brown"><path
+         d="m 312.658,283.772 c 0,0 -0.487,-1.021 -1.037,-2.733 -3.758,3.317 -13.036,10.236 -27.03,12.416 l 0,-10e-4 c -0.009,0.002 -0.019,0.003 -0.027,0.005 -4.044,0.628 -8.479,0.863 -13.29,0.497 l 0,28.141 c 2.059,-0.801 4.607,-1.834 7.477,-3.083 5.462,-2.377 12.093,-5.542 18.771,-9.395 0.027,-0.016 0.054,-0.031 0.081,-0.047 8.158,-4.713 16.37,-10.452 22.593,-17.052 -5.506,-3.961 -7.538,-8.748 -7.538,-8.748 z"
+         id="path65"
+         inkscape:connector-curvature="0"
+         style="fill:#b58765" /><path
+         d="m 12.549,52.242 c 17.4,-4.193 32.83,4.656 41.744,11.633 C 59.888,58.449 66.009,53.565 72.57,49.301 48.272,18.498 2.169,37.201 2.169,37.201 -1.114,67.502 15.288,84.594 31.672,94.01 33.023,91.461 34.462,88.966 35.986,86.53 15.363,72.699 12.549,52.242 12.549,52.242 Z"
+         id="path67"
+         inkscape:connector-curvature="0"
+         style="fill:#b58765" /><path
+         d="m 200.376,47.398 c 6.909,4.205 13.356,9.091 19.26,14.558 9.146,-6.545 23.345,-13.529 39.176,-9.714 0,0 -2.527,18.332 -20.291,32.021 1.633,2.485 3.175,5.034 4.624,7.643 15.141,-9.784 29.097,-26.539 26.046,-54.704 0,-10e-4 -44.152,-17.909 -68.815,10.196 z"
+         id="path69"
+         inkscape:connector-curvature="0"
+         style="fill:#b58765" /><path
+         d="m 138.854,50.502 c -3.841,-0.478 -8.875,-0.728 -12.842,-0.728 -37.806,0 -70.502,22.31 -86.15,54.73 -1.045,4.357 -1.603,8.897 -1.603,13.612 0,1.454 0.085,2.787 0.121,4.175 0.127,3.935 0.448,7.585 0.855,11.135 4.291755,24.95762 7.959057,42.49186 13.464,66.758 0.056,0.407 0.164,0.804 0.224,1.211 0.617,4.028 1.642,7.992 3.025,11.854 -0.029,-0.578 -0.067,-1.153 -0.067,-1.735 0,-28.325 35.089,-51.289 78.388,-51.289 35.325,0 65.181,15.292 74.977,36.308 3.616,-6.409 6.536,-13.277 8.668,-20.495 C 179.98905,152.54886 163.9995,134.88987 153.25313,111.82124 142.50675,88.752624 137.775,64.517 138.854,50.502 Z m -47.73,79.802 c -6.97,0 -12.612,-5.646 -12.612,-12.611 0,-6.97 5.642,-12.614 12.612,-12.614 6.964,0 12.611,5.645 12.611,12.614 0.001,6.964 -5.648,12.611 -12.611,12.611 z"
+         id="path71"
+         inkscape:connector-curvature="0"
+         style="fill:#b58765"
+         sodipodi:nodetypes="cscscccccssccscssscs" /></g></g></svg>
\ No newline at end of file
diff --git a/storage/app/public/supportedapps/virtualmin.svg b/storage/app/public/supportedapps/virtualmin.svg
new file mode 100644
index 00000000..0dd9c9e2
--- /dev/null
+++ b/storage/app/public/supportedapps/virtualmin.svg
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="256"
+   height="256"
+   viewBox="0 0 256 256"
+   id="svg11348"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="virtualmin-logo.svg">
+  <defs
+     id="defs11350" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="-152.14286"
+     inkscape:cy="120"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1014"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata11353">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-796.36216)">
+    <g
+       transform="matrix(1.8847506,0,0,1.8847506,-7.5616217,723.79512)"
+       id="g11301">
+      <path
+         id="path52016"
+         style="fill:#58cc00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.41678113;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         d="m 27.194158,128.87328 c -7.591935,-0.0315 -22.642271,-19.6752 -22.631146,-22.21653 0.00689,-1.57949 15.101227,9.82267 22.685139,9.85409 7.609924,0.0316 22.903197,-11.24654 22.89633,-9.66505 -0.01112,2.53934 -15.348422,22.05904 -22.950323,22.02749 z"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 116.65687,83.958107 c 7.59187,0.03146 22.64221,19.675223 22.63111,22.216503 -0.007,1.57949 -15.10123,-9.822639 -22.68515,-9.854089 -7.6099,-0.03155 -22.90321,11.246549 -22.89633,9.665069 0.01111,-2.53935 15.34843,-22.059056 22.95037,-22.027483 z"
+         style="fill:#005ebd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.41678113;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         id="path52014"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 106.27829,70.013421 c 7.14481,-2.567011 28.00607,10.744539 28.86477,13.136441 0.53378,1.486542 -17.55004,-4.065419 -24.68735,-1.501056 -7.16178,2.57305 -17.67541,18.401624 -18.20985,16.913175 -0.85806,-2.39005 6.87813,-25.97818 14.03243,-28.54856 z"
+         style="fill:#005ebd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.41678113;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         id="path52018"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 37.572732,142.81793 c -7.144866,2.56704 -28.006083,-10.74454 -28.864808,-13.1364 -0.533754,-1.48655 17.550076,4.06539 24.687354,1.50105 7.161757,-2.57309 17.67543,-18.40165 18.209865,-16.91318 0.858062,2.38997 -6.878128,25.97815 -14.032411,28.54853 z"
+         style="fill:#005ebd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.41678113;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         id="path52020"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 91.75626,60.459403 c 5.83595,-4.85588 29.99193,0.517941 31.61692,2.471852 1.01006,1.214378 -17.88204,2.18228 -23.71191,7.033055 -5.8498,4.867383 -10.31571,23.337269 -11.32702,22.12134 -1.62374,-1.952418 -2.42175,-26.763988 3.42201,-31.626247 z"
+         style="fill:#005ebd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.41678113;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         id="path52022"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 52.09476,152.37198 c -5.835949,4.85586 -29.991929,-0.51799 -31.616956,-2.47181 -1.010017,-1.21451 17.882079,-2.18226 23.711919,-7.03313 5.849796,-4.86735 10.315705,-23.33723 11.327045,-22.12132 1.623704,1.95243 2.421698,26.76395 -3.422008,31.62626 z"
+         style="fill:#005ebd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.41678113;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         id="path52024"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 74.84235,56.448437 c 3.82318,-6.559102 28.36034,-9.771206 30.55561,-8.490897 1.36445,0.795723 -16.05727,8.166703 -19.87647,14.718861 -3.83228,6.574575 -1.71175,25.458046 -3.07795,24.661319 -2.1936,-1.279287 -11.429477,-24.321633 -7.60119,-30.889283 z"
+         style="fill:#005ebd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.41678113;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         id="path52026"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 69.008616,156.38291 c -3.823144,6.55907 -28.360279,9.77125 -30.555596,8.4909 -1.364422,-0.79559 16.057289,-8.16659 19.876479,-14.71892 3.832261,-6.57446 1.711809,-25.45795 3.077971,-24.66124 2.193593,1.2793 11.42951,24.32168 7.601146,30.88926 z"
+         style="fill:#005ebd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.41678113;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         id="path52028"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 57.576608,58.464174 C 58.925932,50.993056 80.88467,39.582483 83.38548,40.034719 84.93977,40.315776 71.089739,53.200821 69.741851,60.664106 68.389347,68.152914 76.84042,85.172279 75.28414,84.890899 72.785332,84.438986 56.225466,65.945148 57.576608,58.464174 Z"
+         style="fill:#005ebd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.41678113;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         id="path52030"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 86.27438,154.36714 c -1.34933,7.47111 -23.308079,18.88178 -25.80884,18.42953 -1.554327,-0.281 12.295765,-13.16609 13.64363,-20.62937 1.35253,-7.48881 -7.098584,-24.50821 -5.542308,-24.22681 2.498791,0.45189 19.058658,18.94571 17.707518,26.42665 z"
+         style="fill:#005ebd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.41678113;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         id="path52032"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 42.041571,66.263476 C 40.754224,58.781461 57.486082,40.548683 59.990737,40.118338 61.547411,39.850828 52.939561,56.695798 54.225545,64.170019 55.515899,71.669741 69.278339,84.772296 67.719661,85.04015 65.216952,85.470135 43.330544,73.755422 42.041571,66.263476 Z"
+         style="fill:#005ebd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.41678113;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         id="path52034"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 101.80938,146.56763 c 1.28734,7.48193 -15.44447,25.71481 -17.94913,26.14508 -1.55669,0.26768 7.05114,-16.57741 5.76516,-24.05153 -1.29036,-7.49978 -15.05278,-20.60232 -13.49412,-20.87021 2.50271,-0.43002 24.38915,11.28475 25.67809,18.77666 z"
+         style="fill:#005ebd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.41678113;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         id="path52036"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 30.110959,78.905851 c -3.768714,-6.590524 5.718103,-29.446369 7.924524,-30.707381 1.371308,-0.783785 -0.956096,17.989388 2.808663,24.572987 3.777605,6.606095 21.191388,14.21146 19.818341,14.996248 -2.204663,1.260067 -26.777896,-2.26257 -30.551528,-8.861854 z"
+         style="fill:#005ebd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.41678113;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         id="path52038"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 113.74001,133.92529 c 3.76866,6.5905 -5.71811,29.44623 -7.92453,30.70728 -1.37132,0.78387 0.9561,-17.98927 -2.8087,-24.57291 -3.77758,-6.60609 -21.19137,-14.21146 -19.8183,-14.99628 2.20468,-1.26001 26.77788,2.26262 30.55153,8.86191 z"
+         style="fill:#005ebd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.41678113;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         id="path52040"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 23.223788,94.866314 c -5.795481,-4.904126 -4.697947,-29.626268 -3.055873,-31.565859 1.020517,-1.20556 5.254271,17.231484 11.043681,22.130424 5.809218,4.915681 24.77402,6.106543 23.752216,7.313618 -1.640787,1.938077 -25.936841,7.032464 -31.740024,2.121817 z"
+         style="fill:#005ebd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.41678113;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         id="path52042"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 120.62712,117.96483 c 5.79552,4.90407 4.69803,29.62617 3.05593,31.5658 -1.02049,1.2056 -5.25429,-17.23141 -11.0437,-22.13039 -5.80925,-4.9157 -24.774,-6.10652 -23.75217,-7.31364 1.64074,-1.93807 25.93684,-7.03241 31.73994,-2.12177 z"
+         style="fill:#005ebd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.41678113;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         id="path52044"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 22.21084,112.21978 C 15.087504,109.59359 7.663364,85.987032 8.543011,83.602758 9.089707,82.120888 19.37395,97.997971 26.489793,100.62138 33.629927,103.25378 51.858294,97.886431 51.310917,99.370171 50.431991,101.75261 29.3435,114.84944 22.21084,112.21978 Z"
+         style="fill:#005ebd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.41678113;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         id="path52046"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 121.64017,100.61136 c 7.12331,2.62613 14.5474,26.23278 13.66775,28.617 -0.54664,1.48191 -10.83092,-14.39521 -17.94675,-17.0186 -7.14015,-2.63236 -25.3685,2.73493 -24.82112,1.25117 0.87895,-2.38242 21.96742,-15.479249 29.10012,-12.84957 z"
+         style="fill:#005ebd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.41678113;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         id="path52048"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/storage/app/public/supportedapps/webmin.svg b/storage/app/public/supportedapps/webmin.svg
new file mode 100644
index 00000000..382932f5
--- /dev/null
+++ b/storage/app/public/supportedapps/webmin.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="256px" height="281px" viewBox="0 0 256 281" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
+    <g fill-opacity="0.94">
+        <path d="M233.858448,123.628491 C224.931398,116.242985 217.841621,110.211434 208.437873,102.48606 C206.261836,90.1956416 204.137662,78.1203998 202.023418,66.3110936 C198.442667,46.1220573 180.969264,24.8781064 162.519292,19.0109712 C154.06894,16.3129938 146.202322,17.1527324 138.68771,21.6283954 C129.575278,11.9774711 120.047942,5.48356654 109.664316,2.16323367 C85.0205821,-5.72214308 64.8138904,8.55120541 67.0793086,35.1944215 C68.3725722,50.0316417 69.6481803,66.1334354 70.7086123,78.9093789 C56.7607866,84.6981679 42.3936434,90.7926174 30.5865441,95.7913239 C15.8894642,102.060121 5.73977273,114.629716 1.8290849,129.559628 C-2.1533283,144.799614 0.235678234,162.445158 10.2926785,178.06915 C19.2329699,192.064425 32.022155,201.555347 48.3876773,206.699711 C47.0326196,225.149683 50.3430213,241.08706 58.6124046,254.149905 C67.958772,269.00147 81.7808024,277.900933 95.8864238,280.316423 C109.753696,282.696602 123.752282,278.802466 134.453707,268.630705 C145.927559,257.558515 156.779055,247.113094 167.122957,237.206166 C179.37365,244.569602 191.188474,251.673724 202.679981,258.595774 C221.469821,269.80038 240.655806,257.615895 245.185539,233.83728 C247.079089,223.925938 246.244867,212.849334 242.713772,200.324981 C249.401887,196.205737 253.556441,189.773627 255.246953,180.767128 C258.818876,161.641834 249.353334,136.486092 233.857344,123.626285 L233.858448,123.628491 Z M236.988984,166.562194 C235.969381,171.162549 232.997743,173.913493 229.281266,173.475416 C226.225765,173.109065 223.670135,171.868768 218.460666,168.036426 C209.86907,161.599902 201.093196,155.004478 192.01166,148.31526 C191.208336,147.754699 190.316735,147.132343 189.500169,146.536471 C181.95135,140.969479 175.354823,142.033221 172.834504,149.649352 C170.22039,157.445348 173.893832,166.606333 181.668862,172.058564 C182.498669,172.627953 183.452065,173.303275 184.264217,173.899148 C193.738587,180.53871 203.062885,187.014959 212.134489,193.328998 C215.980072,196.012631 218.844673,198.525226 220.734912,200.798368 C224.915949,205.584105 226.90219,213.459551 225.463269,220.034009 C223.909587,226.9693 219.437235,230.585362 214.007072,229.349479 C211.260543,228.766848 209.194852,227.650139 204.263457,224.457809 C194.70081,218.259633 184.868917,211.831937 174.723639,205.298307 C173.792313,204.702435 172.860987,204.084493 171.95504,203.435655 C168.753882,201.484725 165.673001,200.596434 162.952955,200.702366 L162.939713,200.702366 C159.901868,200.502639 156.719468,201.602796 153.668381,204.049182 C152.820919,204.746574 151.964628,205.413068 151.174545,206.163426 C141.709004,213.951697 131.894766,222.259702 121.493484,230.996955 C115.873526,235.694415 113.343275,237.526171 109.591487,238.847021 C102.03384,241.733692 93.6805929,238.493912 88.4534687,230.18039 C83.5309014,222.087561 83.7427671,211.58476 88.8418891,204.962853 C91.0090987,202.017699 94.6737134,198.649917 99.7242828,195.069166 C110.730265,187.197031 121.15803,179.785042 131.060545,172.677609 C131.960974,172.064082 132.826093,171.459382 133.727625,170.822681 C141.23672,165.489624 142.676744,156.059393 137.378998,147.270277 C132.218082,138.502126 123.683867,135.840563 115.583314,140.732233 C114.669643,141.283967 113.760386,141.835701 112.850025,142.440401 C102.369294,148.863683 91.3765533,155.650007 79.7879406,162.797164 C72.3141571,167.304828 68.3670548,168.761404 62.7868211,169.017409 C55.8912544,169.374932 48.6723719,165.127687 44.4703687,158.439572 C39.7111146,150.987858 39.5522153,141.729768 44.1216731,135.986221 C46.6905448,132.608508 49.4414885,130.560473 57.335693,126.511851 C69.5643168,120.18126 81.2908629,114.230261 92.4160194,108.645614 C93.3650012,108.067397 94.3228108,107.670149 95.308207,107.189037 C95.9879428,106.853583 96.6147122,106.456335 97.1664458,106.054672 C102.146393,103.856566 104.569607,98.3601956 103.792766,90.9162057 C103.66035,89.6670808 103.572073,88.4620946 103.364621,87.2692465 C102.009563,74.0552266 100.66223,61.1071422 99.2542058,48.4503732 C98.4376401,40.7161714 98.5170897,37.9961247 99.4969686,34.9273824 C101.059478,30.0533677 106.577918,27.9302967 112.768369,29.5987392 C118.2206,31.0685575 123.438897,35.3422861 126.282532,40.5208577 C128.604227,44.8298972 129.673487,48.3797513 130.613641,55.7211187 C132.154081,67.7731877 133.739763,80.0073288 135.337584,92.5272678 C135.496483,93.6704599 135.655382,94.7959964 135.796626,95.9447058 C137.142856,106.354816 143.332204,113.841841 151.354411,114.902273 C159.084199,115.930704 163.185786,109.873773 161.777762,100.143399 C161.64976,99.0752423 161.486447,97.9497058 161.340789,96.9025154 C159.592897,84.9254822 157.865971,73.1901083 156.179873,61.7030145 C155.442757,56.7363085 155.186752,52.9304501 155.588414,50.476339 C156.188701,45.0285213 160.528637,42.1893002 166.077974,43.6867052 C171.680277,45.2227316 176.92947,50.3880616 179.353788,56.5420983 C180.594085,59.6549793 181.15906,62.0649517 182.117973,67.8261541 C183.954143,78.8453778 185.553067,89.9043263 187.433375,101.342867 L188.091041,104.52637 C188.673672,107.343522 188.907607,107.904084 189.415202,109.431282 L189.291614,108.928101 L189.260717,108.848651 L189.220992,108.769202 L189.203336,108.61913 L189.203336,108.595958 L189.256303,108.582716 C190.227354,112.918239 193.084231,117.196381 197.490375,120.65244 C198.258388,121.265968 199.114679,121.86184 199.887106,122.523921 C208.434563,129.238519 216.773465,135.865943 224.963399,142.27157 C229.89038,146.143637 231.664755,147.940081 233.612375,150.668956 C236.769394,155.110411 238.093555,161.591074 236.994502,166.562194 L236.988984,166.562194 Z" fill="#97BEEF" fill-rule="nonzero"></path>
+    </g>
+</svg>
diff --git a/vendor/bin/var-dump-server b/vendor/bin/var-dump-server
new file mode 120000
index 00000000..6bd4e93d
--- /dev/null
+++ b/vendor/bin/var-dump-server
@@ -0,0 +1 @@
+../symfony/var-dumper/Resources/bin/var-dump-server
\ No newline at end of file
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 1b3ea7ce..346d1918 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -13,10 +13,13 @@ return array(
     'App\\Http\\Controllers\\Auth\\RegisterController' => $baseDir . '/app/Http/Controllers/Auth/RegisterController.php',
     'App\\Http\\Controllers\\Auth\\ResetPasswordController' => $baseDir . '/app/Http/Controllers/Auth/ResetPasswordController.php',
     'App\\Http\\Controllers\\Controller' => $baseDir . '/app/Http/Controllers/Controller.php',
+    'App\\Http\\Controllers\\HomeController' => $baseDir . '/app/Http/Controllers/HomeController.php',
     'App\\Http\\Controllers\\ItemController' => $baseDir . '/app/Http/Controllers/ItemController.php',
     'App\\Http\\Controllers\\SettingsController' => $baseDir . '/app/Http/Controllers/SettingsController.php',
     'App\\Http\\Controllers\\TagController' => $baseDir . '/app/Http/Controllers/TagController.php',
+    'App\\Http\\Controllers\\UserController' => $baseDir . '/app/Http/Controllers/UserController.php',
     'App\\Http\\Kernel' => $baseDir . '/app/Http/Kernel.php',
+    'App\\Http\\Middleware\\CheckAllowed' => $baseDir . '/app/Http/Middleware/CheckAllowed.php',
     'App\\Http\\Middleware\\EncryptCookies' => $baseDir . '/app/Http/Middleware/EncryptCookies.php',
     'App\\Http\\Middleware\\RedirectIfAuthenticated' => $baseDir . '/app/Http/Middleware/RedirectIfAuthenticated.php',
     'App\\Http\\Middleware\\TrimStrings' => $baseDir . '/app/Http/Middleware/TrimStrings.php',
@@ -30,7 +33,11 @@ return array(
     'App\\Providers\\RouteServiceProvider' => $baseDir . '/app/Providers/RouteServiceProvider.php',
     'App\\Setting' => $baseDir . '/app/Setting.php',
     'App\\SettingGroup' => $baseDir . '/app/SettingGroup.php',
+    'App\\SettingUser' => $baseDir . '/app/SettingUser.php',
     'App\\SupportedApps\\AirSonic' => $baseDir . '/app/SupportedApps/AirSonic.php',
+    'App\\SupportedApps\\Bazarr' => $baseDir . '/app/SupportedApps/Bazarr.php',
+    'App\\SupportedApps\\Bitwarden' => $baseDir . '/app/SupportedApps/Bitwarden.php',
+    'App\\SupportedApps\\BookStack' => $baseDir . '/app/SupportedApps/BookStack.php',
     'App\\SupportedApps\\Booksonic' => $baseDir . '/app/SupportedApps/Booksonic.php',
     'App\\SupportedApps\\Cardigann' => $baseDir . '/app/SupportedApps/Cardigann.php',
     'App\\SupportedApps\\Contracts\\Applications' => $baseDir . '/app/SupportedApps/Contracts/Applications.php',
@@ -41,6 +48,7 @@ return array(
     'App\\SupportedApps\\Duplicati' => $baseDir . '/app/SupportedApps/Duplicati.php',
     'App\\SupportedApps\\Emby' => $baseDir . '/app/SupportedApps/Emby.php',
     'App\\SupportedApps\\Flood' => $baseDir . '/app/SupportedApps/Flood.php',
+    'App\\SupportedApps\\FreshRSS' => $baseDir . '/app/SupportedApps/FreshRSS.php',
     'App\\SupportedApps\\Gitea' => $baseDir . '/app/SupportedApps/Gitea.php',
     'App\\SupportedApps\\Glances' => $baseDir . '/app/SupportedApps/Glances.php',
     'App\\SupportedApps\\Grafana' => $baseDir . '/app/SupportedApps/Grafana.php',
@@ -51,8 +59,10 @@ return array(
     'App\\SupportedApps\\Jdownloader' => $baseDir . '/app/SupportedApps/Jdownloader.php',
     'App\\SupportedApps\\Krusader' => $baseDir . '/app/SupportedApps/Krusader.php',
     'App\\SupportedApps\\Lidarr' => $baseDir . '/app/SupportedApps/Lidarr.php',
+    'App\\SupportedApps\\Mailcow' => $baseDir . '/app/SupportedApps/Mailcow.php',
     'App\\SupportedApps\\Mcmyadmin' => $baseDir . '/app/SupportedApps/Mcmyadmin.php',
     'App\\SupportedApps\\Medusa' => $baseDir . '/app/SupportedApps/Medusa.php',
+    'App\\SupportedApps\\Monica' => $baseDir . '/app/SupportedApps/Monica.php',
     'App\\SupportedApps\\MusicBrainz' => $baseDir . '/app/SupportedApps/MusicBrainz.php',
     'App\\SupportedApps\\Mylar' => $baseDir . '/app/SupportedApps/Mylar.php',
     'App\\SupportedApps\\Netdata' => $baseDir . '/app/SupportedApps/Netdata.php',
@@ -78,23 +88,25 @@ return array(
     'App\\SupportedApps\\Sickrage' => $baseDir . '/app/SupportedApps/Sickrage.php',
     'App\\SupportedApps\\Sonarr' => $baseDir . '/app/SupportedApps/Sonarr.php',
     'App\\SupportedApps\\Syncthing' => $baseDir . '/app/SupportedApps/Syncthing.php',
+    'App\\SupportedApps\\TVheadend' => $baseDir . '/app/SupportedApps/TVheadend.php',
     'App\\SupportedApps\\Tautulli' => $baseDir . '/app/SupportedApps/Tautulli.php',
     'App\\SupportedApps\\Traefik' => $baseDir . '/app/SupportedApps/Traefik.php',
     'App\\SupportedApps\\Transmission' => $baseDir . '/app/SupportedApps/Transmission.php',
     'App\\SupportedApps\\Ttrss' => $baseDir . '/app/SupportedApps/Ttrss.php',
     'App\\SupportedApps\\Unifi' => $baseDir . '/app/SupportedApps/Unifi.php',
     'App\\SupportedApps\\Unraid' => $baseDir . '/app/SupportedApps/Unraid.php',
+    'App\\SupportedApps\\Virtualmin' => $baseDir . '/app/SupportedApps/Virtualmin.php',
     'App\\SupportedApps\\Watcher3' => $baseDir . '/app/SupportedApps/Watcher3.php',
     'App\\SupportedApps\\WebTools' => $baseDir . '/app/SupportedApps/WebTools.php',
+    'App\\SupportedApps\\Webmin' => $baseDir . '/app/SupportedApps/Webmin.php',
     'App\\SupportedApps\\pyLoad' => $baseDir . '/app/SupportedApps/pyLoad.php',
     'App\\SupportedApps\\ruTorrent' => $baseDir . '/app/SupportedApps/ruTorrent.php',
     'App\\User' => $baseDir . '/app/User.php',
-    'ArithmeticError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/ArithmeticError.php',
-    'AssertionError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/AssertionError.php',
     'Carbon\\Carbon' => $vendorDir . '/nesbot/carbon/src/Carbon/Carbon.php',
     'Carbon\\CarbonInterval' => $vendorDir . '/nesbot/carbon/src/Carbon/CarbonInterval.php',
     'Carbon\\CarbonPeriod' => $vendorDir . '/nesbot/carbon/src/Carbon/CarbonPeriod.php',
     'Carbon\\Exceptions\\InvalidDateException' => $vendorDir . '/nesbot/carbon/src/Carbon/Exceptions/InvalidDateException.php',
+    'Carbon\\Laravel\\ServiceProvider' => $vendorDir . '/nesbot/carbon/src/Carbon/Laravel/ServiceProvider.php',
     'Carbon\\Translator' => $vendorDir . '/nesbot/carbon/src/Carbon/Translator.php',
     'Collective\\Html\\Componentable' => $vendorDir . '/laravelcollective/html/src/Componentable.php',
     'Collective\\Html\\Eloquent\\FormAccessible' => $vendorDir . '/laravelcollective/html/src/Eloquent/FormAccessible.php',
@@ -103,16 +115,15 @@ return array(
     'Collective\\Html\\HtmlBuilder' => $vendorDir . '/laravelcollective/html/src/HtmlBuilder.php',
     'Collective\\Html\\HtmlFacade' => $vendorDir . '/laravelcollective/html/src/HtmlFacade.php',
     'Collective\\Html\\HtmlServiceProvider' => $vendorDir . '/laravelcollective/html/src/HtmlServiceProvider.php',
-    'Cron\\AbstractField' => $vendorDir . '/mtdowling/cron-expression/src/Cron/AbstractField.php',
-    'Cron\\CronExpression' => $vendorDir . '/mtdowling/cron-expression/src/Cron/CronExpression.php',
-    'Cron\\DayOfMonthField' => $vendorDir . '/mtdowling/cron-expression/src/Cron/DayOfMonthField.php',
-    'Cron\\DayOfWeekField' => $vendorDir . '/mtdowling/cron-expression/src/Cron/DayOfWeekField.php',
-    'Cron\\FieldFactory' => $vendorDir . '/mtdowling/cron-expression/src/Cron/FieldFactory.php',
-    'Cron\\FieldInterface' => $vendorDir . '/mtdowling/cron-expression/src/Cron/FieldInterface.php',
-    'Cron\\HoursField' => $vendorDir . '/mtdowling/cron-expression/src/Cron/HoursField.php',
-    'Cron\\MinutesField' => $vendorDir . '/mtdowling/cron-expression/src/Cron/MinutesField.php',
-    'Cron\\MonthField' => $vendorDir . '/mtdowling/cron-expression/src/Cron/MonthField.php',
-    'Cron\\YearField' => $vendorDir . '/mtdowling/cron-expression/src/Cron/YearField.php',
+    'Cron\\AbstractField' => $vendorDir . '/dragonmantank/cron-expression/src/Cron/AbstractField.php',
+    'Cron\\CronExpression' => $vendorDir . '/dragonmantank/cron-expression/src/Cron/CronExpression.php',
+    'Cron\\DayOfMonthField' => $vendorDir . '/dragonmantank/cron-expression/src/Cron/DayOfMonthField.php',
+    'Cron\\DayOfWeekField' => $vendorDir . '/dragonmantank/cron-expression/src/Cron/DayOfWeekField.php',
+    'Cron\\FieldFactory' => $vendorDir . '/dragonmantank/cron-expression/src/Cron/FieldFactory.php',
+    'Cron\\FieldInterface' => $vendorDir . '/dragonmantank/cron-expression/src/Cron/FieldInterface.php',
+    'Cron\\HoursField' => $vendorDir . '/dragonmantank/cron-expression/src/Cron/HoursField.php',
+    'Cron\\MinutesField' => $vendorDir . '/dragonmantank/cron-expression/src/Cron/MinutesField.php',
+    'Cron\\MonthField' => $vendorDir . '/dragonmantank/cron-expression/src/Cron/MonthField.php',
     'DatabaseSeeder' => $baseDir . '/database/seeds/DatabaseSeeder.php',
     'DeepCopy\\DeepCopy' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/DeepCopy.php',
     'DeepCopy\\Exception\\CloneException' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/Exception/CloneException.php',
@@ -137,7 +148,6 @@ return array(
     'DeepCopy\\TypeFilter\\Spl\\SplDoublyLinkedListFilter' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/TypeFilter/Spl/SplDoublyLinkedListFilter.php',
     'DeepCopy\\TypeFilter\\TypeFilter' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/TypeFilter/TypeFilter.php',
     'DeepCopy\\TypeMatcher\\TypeMatcher' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/TypeMatcher/TypeMatcher.php',
-    'DivisionByZeroError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/DivisionByZeroError.php',
     'Doctrine\\Common\\Inflector\\Inflector' => $vendorDir . '/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php',
     'Doctrine\\Common\\Lexer\\AbstractLexer' => $vendorDir . '/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php',
     'Doctrine\\Instantiator\\Exception\\ExceptionInterface' => $vendorDir . '/doctrine/instantiator/src/Doctrine/Instantiator/Exception/ExceptionInterface.php',
@@ -216,10 +226,10 @@ return array(
     'Egulias\\EmailValidator\\Warning\\QuotedString' => $vendorDir . '/egulias/email-validator/EmailValidator/Warning/QuotedString.php',
     'Egulias\\EmailValidator\\Warning\\TLD' => $vendorDir . '/egulias/email-validator/EmailValidator/Warning/TLD.php',
     'Egulias\\EmailValidator\\Warning\\Warning' => $vendorDir . '/egulias/email-validator/EmailValidator/Warning/Warning.php',
-    'Error' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/Error.php',
     'Faker\\Calculator\\Iban' => $vendorDir . '/fzaninotto/faker/src/Faker/Calculator/Iban.php',
     'Faker\\Calculator\\Inn' => $vendorDir . '/fzaninotto/faker/src/Faker/Calculator/Inn.php',
     'Faker\\Calculator\\Luhn' => $vendorDir . '/fzaninotto/faker/src/Faker/Calculator/Luhn.php',
+    'Faker\\Calculator\\TCNo' => $vendorDir . '/fzaninotto/faker/src/Faker/Calculator/TCNo.php',
     'Faker\\DefaultGenerator' => $vendorDir . '/fzaninotto/faker/src/Faker/DefaultGenerator.php',
     'Faker\\Documentor' => $vendorDir . '/fzaninotto/faker/src/Faker/Documentor.php',
     'Faker\\Factory' => $vendorDir . '/fzaninotto/faker/src/Faker/Factory.php',
@@ -524,6 +534,12 @@ return array(
     'Faker\\Provider\\me_ME\\PhoneNumber' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/me_ME/PhoneNumber.php',
     'Faker\\Provider\\mn_MN\\Person' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/mn_MN/Person.php',
     'Faker\\Provider\\mn_MN\\PhoneNumber' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/mn_MN/PhoneNumber.php',
+    'Faker\\Provider\\ms_MY\\Address' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/ms_MY/Address.php',
+    'Faker\\Provider\\ms_MY\\Company' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/ms_MY/Company.php',
+    'Faker\\Provider\\ms_MY\\Miscellaneous' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/ms_MY/Miscellaneous.php',
+    'Faker\\Provider\\ms_MY\\Payment' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/ms_MY/Payment.php',
+    'Faker\\Provider\\ms_MY\\Person' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/ms_MY/Person.php',
+    'Faker\\Provider\\ms_MY\\PhoneNumber' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/ms_MY/PhoneNumber.php',
     'Faker\\Provider\\nb_NO\\Address' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/nb_NO/Address.php',
     'Faker\\Provider\\nb_NO\\Company' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/nb_NO/Company.php',
     'Faker\\Provider\\nb_NO\\Payment' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/nb_NO/Payment.php',
@@ -589,6 +605,7 @@ return array(
     'Faker\\Provider\\sk_SK\\Person' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/sk_SK/Person.php',
     'Faker\\Provider\\sk_SK\\PhoneNumber' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/sk_SK/PhoneNumber.php',
     'Faker\\Provider\\sl_SI\\Address' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/sl_SI/Address.php',
+    'Faker\\Provider\\sl_SI\\Company' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/sl_SI/Company.php',
     'Faker\\Provider\\sl_SI\\Internet' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/sl_SI/Internet.php',
     'Faker\\Provider\\sl_SI\\Payment' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/sl_SI/Payment.php',
     'Faker\\Provider\\sl_SI\\Person' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/sl_SI/Person.php',
@@ -608,12 +625,14 @@ return array(
     'Faker\\Provider\\sv_SE\\Person' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/sv_SE/Person.php',
     'Faker\\Provider\\sv_SE\\PhoneNumber' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/sv_SE/PhoneNumber.php',
     'Faker\\Provider\\th_TH\\Address' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/th_TH/Address.php',
+    'Faker\\Provider\\th_TH\\Color' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/th_TH/Color.php',
     'Faker\\Provider\\th_TH\\Company' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/th_TH/Company.php',
     'Faker\\Provider\\th_TH\\Internet' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/th_TH/Internet.php',
     'Faker\\Provider\\th_TH\\Payment' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/th_TH/Payment.php',
     'Faker\\Provider\\th_TH\\PhoneNumber' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/th_TH/PhoneNumber.php',
     'Faker\\Provider\\tr_TR\\Address' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/tr_TR/Address.php',
     'Faker\\Provider\\tr_TR\\Color' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/tr_TR/Color.php',
+    'Faker\\Provider\\tr_TR\\Company' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/tr_TR/Company.php',
     'Faker\\Provider\\tr_TR\\DateTime' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/tr_TR/DateTime.php',
     'Faker\\Provider\\tr_TR\\Internet' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/tr_TR/Internet.php',
     'Faker\\Provider\\tr_TR\\Payment' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/tr_TR/Payment.php',
@@ -623,10 +642,10 @@ return array(
     'Faker\\Provider\\uk_UA\\Color' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/uk_UA/Color.php',
     'Faker\\Provider\\uk_UA\\Company' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/uk_UA/Company.php',
     'Faker\\Provider\\uk_UA\\Internet' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/uk_UA/Internet.php',
+    'Faker\\Provider\\uk_UA\\Payment' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/uk_UA/Payment.php',
     'Faker\\Provider\\uk_UA\\Person' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/uk_UA/Person.php',
     'Faker\\Provider\\uk_UA\\PhoneNumber' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/uk_UA/PhoneNumber.php',
     'Faker\\Provider\\uk_UA\\Text' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/uk_UA/Text.php',
-    'Faker\\Provider\\uk_Ua\\Payment' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/uk_UA/Payment.php',
     'Faker\\Provider\\vi_VN\\Address' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/vi_VN/Address.php',
     'Faker\\Provider\\vi_VN\\Color' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/vi_VN/Color.php',
     'Faker\\Provider\\vi_VN\\Internet' => $vendorDir . '/fzaninotto/faker/src/Faker/Provider/vi_VN/Internet.php',
@@ -813,12 +832,17 @@ return array(
     'Illuminate\\Auth\\Events\\Logout' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/Events/Logout.php',
     'Illuminate\\Auth\\Events\\PasswordReset' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/Events/PasswordReset.php',
     'Illuminate\\Auth\\Events\\Registered' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/Events/Registered.php',
+    'Illuminate\\Auth\\Events\\Verified' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/Events/Verified.php',
     'Illuminate\\Auth\\GenericUser' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/GenericUser.php',
     'Illuminate\\Auth\\GuardHelpers' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/GuardHelpers.php',
+    'Illuminate\\Auth\\Listeners\\SendEmailVerificationNotification' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/Listeners/SendEmailVerificationNotification.php',
     'Illuminate\\Auth\\Middleware\\Authenticate' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/Middleware/Authenticate.php',
     'Illuminate\\Auth\\Middleware\\AuthenticateWithBasicAuth' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/Middleware/AuthenticateWithBasicAuth.php',
     'Illuminate\\Auth\\Middleware\\Authorize' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/Middleware/Authorize.php',
+    'Illuminate\\Auth\\Middleware\\EnsureEmailIsVerified' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/Middleware/EnsureEmailIsVerified.php',
+    'Illuminate\\Auth\\MustVerifyEmail' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/MustVerifyEmail.php',
     'Illuminate\\Auth\\Notifications\\ResetPassword' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/Notifications/ResetPassword.php',
+    'Illuminate\\Auth\\Notifications\\VerifyEmail' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/Notifications/VerifyEmail.php',
     'Illuminate\\Auth\\Passwords\\CanResetPassword' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/Passwords/CanResetPassword.php',
     'Illuminate\\Auth\\Passwords\\DatabaseTokenRepository' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/Passwords/DatabaseTokenRepository.php',
     'Illuminate\\Auth\\Passwords\\PasswordBroker' => $vendorDir . '/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBroker.php',
@@ -887,15 +911,17 @@ return array(
     'Illuminate\\Console\\GeneratorCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Console/GeneratorCommand.php',
     'Illuminate\\Console\\OutputStyle' => $vendorDir . '/laravel/framework/src/Illuminate/Console/OutputStyle.php',
     'Illuminate\\Console\\Parser' => $vendorDir . '/laravel/framework/src/Illuminate/Console/Parser.php',
-    'Illuminate\\Console\\Scheduling\\CacheMutex' => $vendorDir . '/laravel/framework/src/Illuminate/Console/Scheduling/CacheMutex.php',
+    'Illuminate\\Console\\Scheduling\\CacheEventMutex' => $vendorDir . '/laravel/framework/src/Illuminate/Console/Scheduling/CacheEventMutex.php',
+    'Illuminate\\Console\\Scheduling\\CacheSchedulingMutex' => $vendorDir . '/laravel/framework/src/Illuminate/Console/Scheduling/CacheSchedulingMutex.php',
     'Illuminate\\Console\\Scheduling\\CallbackEvent' => $vendorDir . '/laravel/framework/src/Illuminate/Console/Scheduling/CallbackEvent.php',
     'Illuminate\\Console\\Scheduling\\CommandBuilder' => $vendorDir . '/laravel/framework/src/Illuminate/Console/Scheduling/CommandBuilder.php',
     'Illuminate\\Console\\Scheduling\\Event' => $vendorDir . '/laravel/framework/src/Illuminate/Console/Scheduling/Event.php',
+    'Illuminate\\Console\\Scheduling\\EventMutex' => $vendorDir . '/laravel/framework/src/Illuminate/Console/Scheduling/EventMutex.php',
     'Illuminate\\Console\\Scheduling\\ManagesFrequencies' => $vendorDir . '/laravel/framework/src/Illuminate/Console/Scheduling/ManagesFrequencies.php',
-    'Illuminate\\Console\\Scheduling\\Mutex' => $vendorDir . '/laravel/framework/src/Illuminate/Console/Scheduling/Mutex.php',
     'Illuminate\\Console\\Scheduling\\Schedule' => $vendorDir . '/laravel/framework/src/Illuminate/Console/Scheduling/Schedule.php',
     'Illuminate\\Console\\Scheduling\\ScheduleFinishCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Console/Scheduling/ScheduleFinishCommand.php',
     'Illuminate\\Console\\Scheduling\\ScheduleRunCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Console/Scheduling/ScheduleRunCommand.php',
+    'Illuminate\\Console\\Scheduling\\SchedulingMutex' => $vendorDir . '/laravel/framework/src/Illuminate/Console/Scheduling/SchedulingMutex.php',
     'Illuminate\\Container\\BoundMethod' => $vendorDir . '/laravel/framework/src/Illuminate/Container/BoundMethod.php',
     'Illuminate\\Container\\Container' => $vendorDir . '/laravel/framework/src/Illuminate/Container/Container.php',
     'Illuminate\\Container\\ContextualBindingBuilder' => $vendorDir . '/laravel/framework/src/Illuminate/Container/ContextualBindingBuilder.php',
@@ -906,6 +932,7 @@ return array(
     'Illuminate\\Contracts\\Auth\\CanResetPassword' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Auth/CanResetPassword.php',
     'Illuminate\\Contracts\\Auth\\Factory' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Auth/Factory.php',
     'Illuminate\\Contracts\\Auth\\Guard' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Auth/Guard.php',
+    'Illuminate\\Contracts\\Auth\\MustVerifyEmail' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Auth/MustVerifyEmail.php',
     'Illuminate\\Contracts\\Auth\\PasswordBroker' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Auth/PasswordBroker.php',
     'Illuminate\\Contracts\\Auth\\PasswordBrokerFactory' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Auth/PasswordBrokerFactory.php',
     'Illuminate\\Contracts\\Auth\\StatefulGuard' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Auth/StatefulGuard.php',
@@ -939,12 +966,12 @@ return array(
     'Illuminate\\Contracts\\Events\\Dispatcher' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Events/Dispatcher.php',
     'Illuminate\\Contracts\\Filesystem\\Cloud' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Filesystem/Cloud.php',
     'Illuminate\\Contracts\\Filesystem\\Factory' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Filesystem/Factory.php',
+    'Illuminate\\Contracts\\Filesystem\\FileExistsException' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Filesystem/FileExistsException.php',
     'Illuminate\\Contracts\\Filesystem\\FileNotFoundException' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Filesystem/FileNotFoundException.php',
     'Illuminate\\Contracts\\Filesystem\\Filesystem' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Filesystem/Filesystem.php',
     'Illuminate\\Contracts\\Foundation\\Application' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Foundation/Application.php',
     'Illuminate\\Contracts\\Hashing\\Hasher' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Hashing/Hasher.php',
     'Illuminate\\Contracts\\Http\\Kernel' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Http/Kernel.php',
-    'Illuminate\\Contracts\\Logging\\Log' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Logging/Log.php',
     'Illuminate\\Contracts\\Mail\\MailQueue' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Mail/MailQueue.php',
     'Illuminate\\Contracts\\Mail\\Mailable' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Mail/Mailable.php',
     'Illuminate\\Contracts\\Mail\\Mailer' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Mail/Mailer.php',
@@ -963,6 +990,7 @@ return array(
     'Illuminate\\Contracts\\Queue\\QueueableCollection' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Queue/QueueableCollection.php',
     'Illuminate\\Contracts\\Queue\\QueueableEntity' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Queue/QueueableEntity.php',
     'Illuminate\\Contracts\\Queue\\ShouldQueue' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Queue/ShouldQueue.php',
+    'Illuminate\\Contracts\\Redis\\Connection' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Redis/Connection.php',
     'Illuminate\\Contracts\\Redis\\Factory' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Redis/Factory.php',
     'Illuminate\\Contracts\\Redis\\LimiterTimeoutException' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Redis/LimiterTimeoutException.php',
     'Illuminate\\Contracts\\Routing\\BindingRegistrar' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Routing/BindingRegistrar.php',
@@ -978,6 +1006,7 @@ return array(
     'Illuminate\\Contracts\\Support\\MessageProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Support/MessageProvider.php',
     'Illuminate\\Contracts\\Support\\Renderable' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Support/Renderable.php',
     'Illuminate\\Contracts\\Support\\Responsable' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Support/Responsable.php',
+    'Illuminate\\Contracts\\Translation\\HasLocalePreference' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Translation/HasLocalePreference.php',
     'Illuminate\\Contracts\\Translation\\Loader' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Translation/Loader.php',
     'Illuminate\\Contracts\\Translation\\Translator' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Translation/Translator.php',
     'Illuminate\\Contracts\\Validation\\Factory' => $vendorDir . '/laravel/framework/src/Illuminate/Contracts/Validation/Factory.php',
@@ -1016,6 +1045,7 @@ return array(
     'Illuminate\\Database\\Console\\Migrations\\ResetCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Console/Migrations/ResetCommand.php',
     'Illuminate\\Database\\Console\\Migrations\\RollbackCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Console/Migrations/RollbackCommand.php',
     'Illuminate\\Database\\Console\\Migrations\\StatusCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Console/Migrations/StatusCommand.php',
+    'Illuminate\\Database\\Console\\Migrations\\TableGuesser' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Console/Migrations/TableGuesser.php',
     'Illuminate\\Database\\Console\\Seeds\\SeedCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Console/Seeds/SeedCommand.php',
     'Illuminate\\Database\\Console\\Seeds\\SeederMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php',
     'Illuminate\\Database\\DatabaseManager' => $vendorDir . '/laravel/framework/src/Illuminate/Database/DatabaseManager.php',
@@ -1042,6 +1072,7 @@ return array(
     'Illuminate\\Database\\Eloquent\\RelationNotFoundException' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Eloquent/RelationNotFoundException.php',
     'Illuminate\\Database\\Eloquent\\Relations\\BelongsTo' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php',
     'Illuminate\\Database\\Eloquent\\Relations\\BelongsToMany' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php',
+    'Illuminate\\Database\\Eloquent\\Relations\\Concerns\\AsPivot' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Concerns/AsPivot.php',
     'Illuminate\\Database\\Eloquent\\Relations\\Concerns\\InteractsWithPivotTable' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Concerns/InteractsWithPivotTable.php',
     'Illuminate\\Database\\Eloquent\\Relations\\Concerns\\SupportsDefaultModels' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Concerns/SupportsDefaultModels.php',
     'Illuminate\\Database\\Eloquent\\Relations\\HasMany' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasMany.php',
@@ -1092,6 +1123,7 @@ return array(
     'Illuminate\\Database\\SQLiteConnection' => $vendorDir . '/laravel/framework/src/Illuminate/Database/SQLiteConnection.php',
     'Illuminate\\Database\\Schema\\Blueprint' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Schema/Blueprint.php',
     'Illuminate\\Database\\Schema\\Builder' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Schema/Builder.php',
+    'Illuminate\\Database\\Schema\\ColumnDefinition' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Schema/ColumnDefinition.php',
     'Illuminate\\Database\\Schema\\Grammars\\ChangeColumn' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Schema/Grammars/ChangeColumn.php',
     'Illuminate\\Database\\Schema\\Grammars\\Grammar' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Schema/Grammars/Grammar.php',
     'Illuminate\\Database\\Schema\\Grammars\\MySqlGrammar' => $vendorDir . '/laravel/framework/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php',
@@ -1126,6 +1158,7 @@ return array(
     'Illuminate\\Foundation\\Auth\\SendsPasswordResetEmails' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Auth/SendsPasswordResetEmails.php',
     'Illuminate\\Foundation\\Auth\\ThrottlesLogins' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Auth/ThrottlesLogins.php',
     'Illuminate\\Foundation\\Auth\\User' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Auth/User.php',
+    'Illuminate\\Foundation\\Auth\\VerifiesEmails' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Auth/VerifiesEmails.php',
     'Illuminate\\Foundation\\Bootstrap\\BootProviders' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Bootstrap/BootProviders.php',
     'Illuminate\\Foundation\\Bootstrap\\HandleExceptions' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Bootstrap/HandleExceptions.php',
     'Illuminate\\Foundation\\Bootstrap\\LoadConfiguration' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php',
@@ -1139,6 +1172,7 @@ return array(
     'Illuminate\\Foundation\\Bus\\PendingDispatch' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Bus/PendingDispatch.php',
     'Illuminate\\Foundation\\ComposerScripts' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/ComposerScripts.php',
     'Illuminate\\Foundation\\Console\\AppNameCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/AppNameCommand.php',
+    'Illuminate\\Foundation\\Console\\ChannelMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/ChannelMakeCommand.php',
     'Illuminate\\Foundation\\Console\\ClearCompiledCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/ClearCompiledCommand.php',
     'Illuminate\\Foundation\\Console\\ClosureCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/ClosureCommand.php',
     'Illuminate\\Foundation\\Console\\ConfigCacheCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/ConfigCacheCommand.php',
@@ -1156,6 +1190,8 @@ return array(
     'Illuminate\\Foundation\\Console\\MailMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/MailMakeCommand.php',
     'Illuminate\\Foundation\\Console\\ModelMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/ModelMakeCommand.php',
     'Illuminate\\Foundation\\Console\\NotificationMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/NotificationMakeCommand.php',
+    'Illuminate\\Foundation\\Console\\ObserverMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/ObserverMakeCommand.php',
+    'Illuminate\\Foundation\\Console\\OptimizeClearCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/OptimizeClearCommand.php',
     'Illuminate\\Foundation\\Console\\OptimizeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/OptimizeCommand.php',
     'Illuminate\\Foundation\\Console\\PackageDiscoverCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/PackageDiscoverCommand.php',
     'Illuminate\\Foundation\\Console\\PolicyMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/PolicyMakeCommand.php',
@@ -1178,11 +1214,13 @@ return array(
     'Illuminate\\Foundation\\Console\\TestMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/TestMakeCommand.php',
     'Illuminate\\Foundation\\Console\\UpCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/UpCommand.php',
     'Illuminate\\Foundation\\Console\\VendorPublishCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/VendorPublishCommand.php',
+    'Illuminate\\Foundation\\Console\\ViewCacheCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/ViewCacheCommand.php',
     'Illuminate\\Foundation\\Console\\ViewClearCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/ViewClearCommand.php',
     'Illuminate\\Foundation\\EnvironmentDetector' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/EnvironmentDetector.php',
     'Illuminate\\Foundation\\Events\\Dispatchable' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Events/Dispatchable.php',
     'Illuminate\\Foundation\\Events\\LocaleUpdated' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Events/LocaleUpdated.php',
     'Illuminate\\Foundation\\Exceptions\\Handler' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Exceptions/Handler.php',
+    'Illuminate\\Foundation\\Exceptions\\WhoopsHandler' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Exceptions/WhoopsHandler.php',
     'Illuminate\\Foundation\\Http\\Events\\RequestHandled' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Http/Events/RequestHandled.php',
     'Illuminate\\Foundation\\Http\\Exceptions\\MaintenanceModeException' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Http/Exceptions/MaintenanceModeException.php',
     'Illuminate\\Foundation\\Http\\FormRequest' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Http/FormRequest.php',
@@ -1214,10 +1252,12 @@ return array(
     'Illuminate\\Foundation\\Testing\\Concerns\\MakesHttpRequests' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php',
     'Illuminate\\Foundation\\Testing\\Concerns\\MocksApplicationServices' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/MocksApplicationServices.php',
     'Illuminate\\Foundation\\Testing\\Constraints\\HasInDatabase' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/Constraints/HasInDatabase.php',
+    'Illuminate\\Foundation\\Testing\\Constraints\\SeeInOrder' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/Constraints/SeeInOrder.php',
     'Illuminate\\Foundation\\Testing\\Constraints\\SoftDeletedInDatabase' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/Constraints/SoftDeletedInDatabase.php',
     'Illuminate\\Foundation\\Testing\\DatabaseMigrations' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/DatabaseMigrations.php',
     'Illuminate\\Foundation\\Testing\\DatabaseTransactions' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/DatabaseTransactions.php',
     'Illuminate\\Foundation\\Testing\\HttpException' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/HttpException.php',
+    'Illuminate\\Foundation\\Testing\\PendingCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/PendingCommand.php',
     'Illuminate\\Foundation\\Testing\\RefreshDatabase' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/RefreshDatabase.php',
     'Illuminate\\Foundation\\Testing\\RefreshDatabaseState' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/RefreshDatabaseState.php',
     'Illuminate\\Foundation\\Testing\\TestCase' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/TestCase.php',
@@ -1226,24 +1266,31 @@ return array(
     'Illuminate\\Foundation\\Testing\\WithoutEvents' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/WithoutEvents.php',
     'Illuminate\\Foundation\\Testing\\WithoutMiddleware' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/WithoutMiddleware.php',
     'Illuminate\\Foundation\\Validation\\ValidatesRequests' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php',
+    'Illuminate\\Hashing\\AbstractHasher' => $vendorDir . '/laravel/framework/src/Illuminate/Hashing/AbstractHasher.php',
+    'Illuminate\\Hashing\\Argon2IdHasher' => $vendorDir . '/laravel/framework/src/Illuminate/Hashing/Argon2IdHasher.php',
+    'Illuminate\\Hashing\\ArgonHasher' => $vendorDir . '/laravel/framework/src/Illuminate/Hashing/ArgonHasher.php',
     'Illuminate\\Hashing\\BcryptHasher' => $vendorDir . '/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php',
+    'Illuminate\\Hashing\\HashManager' => $vendorDir . '/laravel/framework/src/Illuminate/Hashing/HashManager.php',
     'Illuminate\\Hashing\\HashServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Hashing/HashServiceProvider.php',
     'Illuminate\\Http\\Concerns\\InteractsWithContentTypes' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Concerns/InteractsWithContentTypes.php',
     'Illuminate\\Http\\Concerns\\InteractsWithFlashData' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Concerns/InteractsWithFlashData.php',
     'Illuminate\\Http\\Concerns\\InteractsWithInput' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Concerns/InteractsWithInput.php',
     'Illuminate\\Http\\Exceptions\\HttpResponseException' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Exceptions/HttpResponseException.php',
     'Illuminate\\Http\\Exceptions\\PostTooLargeException' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Exceptions/PostTooLargeException.php',
+    'Illuminate\\Http\\Exceptions\\ThrottleRequestsException' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Exceptions/ThrottleRequestsException.php',
     'Illuminate\\Http\\File' => $vendorDir . '/laravel/framework/src/Illuminate/Http/File.php',
     'Illuminate\\Http\\FileHelpers' => $vendorDir . '/laravel/framework/src/Illuminate/Http/FileHelpers.php',
     'Illuminate\\Http\\JsonResponse' => $vendorDir . '/laravel/framework/src/Illuminate/Http/JsonResponse.php',
     'Illuminate\\Http\\Middleware\\CheckResponseForModifications' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Middleware/CheckResponseForModifications.php',
     'Illuminate\\Http\\Middleware\\FrameGuard' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Middleware/FrameGuard.php',
+    'Illuminate\\Http\\Middleware\\SetCacheHeaders' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Middleware/SetCacheHeaders.php',
     'Illuminate\\Http\\RedirectResponse' => $vendorDir . '/laravel/framework/src/Illuminate/Http/RedirectResponse.php',
     'Illuminate\\Http\\Request' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Request.php',
     'Illuminate\\Http\\Resources\\CollectsResources' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Resources/CollectsResources.php',
     'Illuminate\\Http\\Resources\\ConditionallyLoadsAttributes' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Resources/ConditionallyLoadsAttributes.php',
     'Illuminate\\Http\\Resources\\DelegatesToResource' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Resources/DelegatesToResource.php',
     'Illuminate\\Http\\Resources\\Json\\AnonymousResourceCollection' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Resources/Json/AnonymousResourceCollection.php',
+    'Illuminate\\Http\\Resources\\Json\\JsonResource' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Resources/Json/JsonResource.php',
     'Illuminate\\Http\\Resources\\Json\\PaginatedResourceResponse' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Resources/Json/PaginatedResourceResponse.php',
     'Illuminate\\Http\\Resources\\Json\\Resource' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Resources/Json/Resource.php',
     'Illuminate\\Http\\Resources\\Json\\ResourceCollection' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Resources/Json/ResourceCollection.php',
@@ -1258,8 +1305,10 @@ return array(
     'Illuminate\\Http\\Testing\\MimeType' => $vendorDir . '/laravel/framework/src/Illuminate/Http/Testing/MimeType.php',
     'Illuminate\\Http\\UploadedFile' => $vendorDir . '/laravel/framework/src/Illuminate/Http/UploadedFile.php',
     'Illuminate\\Log\\Events\\MessageLogged' => $vendorDir . '/laravel/framework/src/Illuminate/Log/Events/MessageLogged.php',
+    'Illuminate\\Log\\LogManager' => $vendorDir . '/laravel/framework/src/Illuminate/Log/LogManager.php',
     'Illuminate\\Log\\LogServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Log/LogServiceProvider.php',
-    'Illuminate\\Log\\Writer' => $vendorDir . '/laravel/framework/src/Illuminate/Log/Writer.php',
+    'Illuminate\\Log\\Logger' => $vendorDir . '/laravel/framework/src/Illuminate/Log/Logger.php',
+    'Illuminate\\Log\\ParsesLogConfiguration' => $vendorDir . '/laravel/framework/src/Illuminate/Log/ParsesLogConfiguration.php',
     'Illuminate\\Mail\\Events\\MessageSending' => $vendorDir . '/laravel/framework/src/Illuminate/Mail/Events/MessageSending.php',
     'Illuminate\\Mail\\Events\\MessageSent' => $vendorDir . '/laravel/framework/src/Illuminate/Mail/Events/MessageSent.php',
     'Illuminate\\Mail\\MailServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Mail/MailServiceProvider.php',
@@ -1316,6 +1365,7 @@ return array(
     'Illuminate\\Pipeline\\Pipeline' => $vendorDir . '/laravel/framework/src/Illuminate/Pipeline/Pipeline.php',
     'Illuminate\\Pipeline\\PipelineServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Pipeline/PipelineServiceProvider.php',
     'Illuminate\\Queue\\BeanstalkdQueue' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/BeanstalkdQueue.php',
+    'Illuminate\\Queue\\CallQueuedClosure' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/CallQueuedClosure.php',
     'Illuminate\\Queue\\CallQueuedHandler' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/CallQueuedHandler.php',
     'Illuminate\\Queue\\Capsule\\Manager' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/Capsule/Manager.php',
     'Illuminate\\Queue\\Connectors\\BeanstalkdConnector' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/Connectors/BeanstalkdConnector.php',
@@ -1365,6 +1415,7 @@ return array(
     'Illuminate\\Queue\\QueueManager' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/QueueManager.php',
     'Illuminate\\Queue\\QueueServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/QueueServiceProvider.php',
     'Illuminate\\Queue\\RedisQueue' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/RedisQueue.php',
+    'Illuminate\\Queue\\SerializableClosure' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/SerializableClosure.php',
     'Illuminate\\Queue\\SerializesAndRestoresModelIdentifiers' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/SerializesAndRestoresModelIdentifiers.php',
     'Illuminate\\Queue\\SerializesModels' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/SerializesModels.php',
     'Illuminate\\Queue\\SqsQueue' => $vendorDir . '/laravel/framework/src/Illuminate/Queue/SqsQueue.php',
@@ -1378,6 +1429,7 @@ return array(
     'Illuminate\\Redis\\Connections\\PredisConnection' => $vendorDir . '/laravel/framework/src/Illuminate/Redis/Connections/PredisConnection.php',
     'Illuminate\\Redis\\Connectors\\PhpRedisConnector' => $vendorDir . '/laravel/framework/src/Illuminate/Redis/Connectors/PhpRedisConnector.php',
     'Illuminate\\Redis\\Connectors\\PredisConnector' => $vendorDir . '/laravel/framework/src/Illuminate/Redis/Connectors/PredisConnector.php',
+    'Illuminate\\Redis\\Events\\CommandExecuted' => $vendorDir . '/laravel/framework/src/Illuminate/Redis/Events/CommandExecuted.php',
     'Illuminate\\Redis\\Limiters\\ConcurrencyLimiter' => $vendorDir . '/laravel/framework/src/Illuminate/Redis/Limiters/ConcurrencyLimiter.php',
     'Illuminate\\Redis\\Limiters\\ConcurrencyLimiterBuilder' => $vendorDir . '/laravel/framework/src/Illuminate/Redis/Limiters/ConcurrencyLimiterBuilder.php',
     'Illuminate\\Redis\\Limiters\\DurationLimiter' => $vendorDir . '/laravel/framework/src/Illuminate/Redis/Limiters/DurationLimiter.php',
@@ -1391,6 +1443,7 @@ return array(
     'Illuminate\\Routing\\ControllerDispatcher' => $vendorDir . '/laravel/framework/src/Illuminate/Routing/ControllerDispatcher.php',
     'Illuminate\\Routing\\ControllerMiddlewareOptions' => $vendorDir . '/laravel/framework/src/Illuminate/Routing/ControllerMiddlewareOptions.php',
     'Illuminate\\Routing\\Events\\RouteMatched' => $vendorDir . '/laravel/framework/src/Illuminate/Routing/Events/RouteMatched.php',
+    'Illuminate\\Routing\\Exceptions\\InvalidSignatureException' => $vendorDir . '/laravel/framework/src/Illuminate/Routing/Exceptions/InvalidSignatureException.php',
     'Illuminate\\Routing\\Exceptions\\UrlGenerationException' => $vendorDir . '/laravel/framework/src/Illuminate/Routing/Exceptions/UrlGenerationException.php',
     'Illuminate\\Routing\\ImplicitRouteBinding' => $vendorDir . '/laravel/framework/src/Illuminate/Routing/ImplicitRouteBinding.php',
     'Illuminate\\Routing\\Matching\\HostValidator' => $vendorDir . '/laravel/framework/src/Illuminate/Routing/Matching/HostValidator.php',
@@ -1402,6 +1455,7 @@ return array(
     'Illuminate\\Routing\\Middleware\\SubstituteBindings' => $vendorDir . '/laravel/framework/src/Illuminate/Routing/Middleware/SubstituteBindings.php',
     'Illuminate\\Routing\\Middleware\\ThrottleRequests' => $vendorDir . '/laravel/framework/src/Illuminate/Routing/Middleware/ThrottleRequests.php',
     'Illuminate\\Routing\\Middleware\\ThrottleRequestsWithRedis' => $vendorDir . '/laravel/framework/src/Illuminate/Routing/Middleware/ThrottleRequestsWithRedis.php',
+    'Illuminate\\Routing\\Middleware\\ValidateSignature' => $vendorDir . '/laravel/framework/src/Illuminate/Routing/Middleware/ValidateSignature.php',
     'Illuminate\\Routing\\PendingResourceRegistration' => $vendorDir . '/laravel/framework/src/Illuminate/Routing/PendingResourceRegistration.php',
     'Illuminate\\Routing\\Pipeline' => $vendorDir . '/laravel/framework/src/Illuminate/Routing/Pipeline.php',
     'Illuminate\\Routing\\RedirectController' => $vendorDir . '/laravel/framework/src/Illuminate/Routing/RedirectController.php',
@@ -1443,8 +1497,6 @@ return array(
     'Illuminate\\Support\\Carbon' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Carbon.php',
     'Illuminate\\Support\\Collection' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Collection.php',
     'Illuminate\\Support\\Composer' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Composer.php',
-    'Illuminate\\Support\\Debug\\Dumper' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Debug/Dumper.php',
-    'Illuminate\\Support\\Debug\\HtmlDumper' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Debug/HtmlDumper.php',
     'Illuminate\\Support\\Facades\\App' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Facades/App.php',
     'Illuminate\\Support\\Facades\\Artisan' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Facades/Artisan.php',
     'Illuminate\\Support\\Facades\\Auth' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Facades/Auth.php',
@@ -1499,6 +1551,8 @@ return array(
     'Illuminate\\Support\\Testing\\Fakes\\PendingMailFake' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Testing/Fakes/PendingMailFake.php',
     'Illuminate\\Support\\Testing\\Fakes\\QueueFake' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Testing/Fakes/QueueFake.php',
     'Illuminate\\Support\\Traits\\CapsuleManagerTrait' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Traits/CapsuleManagerTrait.php',
+    'Illuminate\\Support\\Traits\\ForwardsCalls' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Traits/ForwardsCalls.php',
+    'Illuminate\\Support\\Traits\\Localizable' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Traits/Localizable.php',
     'Illuminate\\Support\\Traits\\Macroable' => $vendorDir . '/laravel/framework/src/Illuminate/Support/Traits/Macroable.php',
     'Illuminate\\Support\\ViewErrorBag' => $vendorDir . '/laravel/framework/src/Illuminate/Support/ViewErrorBag.php',
     'Illuminate\\Translation\\ArrayLoader' => $vendorDir . '/laravel/framework/src/Illuminate/Translation/ArrayLoader.php',
@@ -1519,6 +1573,7 @@ return array(
     'Illuminate\\Validation\\Rules\\Exists' => $vendorDir . '/laravel/framework/src/Illuminate/Validation/Rules/Exists.php',
     'Illuminate\\Validation\\Rules\\In' => $vendorDir . '/laravel/framework/src/Illuminate/Validation/Rules/In.php',
     'Illuminate\\Validation\\Rules\\NotIn' => $vendorDir . '/laravel/framework/src/Illuminate/Validation/Rules/NotIn.php',
+    'Illuminate\\Validation\\Rules\\RequiredIf' => $vendorDir . '/laravel/framework/src/Illuminate/Validation/Rules/RequiredIf.php',
     'Illuminate\\Validation\\Rules\\Unique' => $vendorDir . '/laravel/framework/src/Illuminate/Validation/Rules/Unique.php',
     'Illuminate\\Validation\\UnauthorizedException' => $vendorDir . '/laravel/framework/src/Illuminate/Validation/UnauthorizedException.php',
     'Illuminate\\Validation\\ValidatesWhenResolvedTrait' => $vendorDir . '/laravel/framework/src/Illuminate/Validation/ValidatesWhenResolvedTrait.php',
@@ -1535,6 +1590,7 @@ return array(
     'Illuminate\\View\\Compilers\\Concerns\\CompilesComponents' => $vendorDir . '/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesComponents.php',
     'Illuminate\\View\\Compilers\\Concerns\\CompilesConditionals' => $vendorDir . '/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesConditionals.php',
     'Illuminate\\View\\Compilers\\Concerns\\CompilesEchos' => $vendorDir . '/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesEchos.php',
+    'Illuminate\\View\\Compilers\\Concerns\\CompilesHelpers' => $vendorDir . '/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesHelpers.php',
     'Illuminate\\View\\Compilers\\Concerns\\CompilesIncludes' => $vendorDir . '/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesIncludes.php',
     'Illuminate\\View\\Compilers\\Concerns\\CompilesInjections' => $vendorDir . '/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesInjections.php',
     'Illuminate\\View\\Compilers\\Concerns\\CompilesJson' => $vendorDir . '/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesJson.php',
@@ -1561,9 +1617,9 @@ return array(
     'Illuminate\\View\\ViewFinderInterface' => $vendorDir . '/laravel/framework/src/Illuminate/View/ViewFinderInterface.php',
     'Illuminate\\View\\ViewName' => $vendorDir . '/laravel/framework/src/Illuminate/View/ViewName.php',
     'Illuminate\\View\\ViewServiceProvider' => $vendorDir . '/laravel/framework/src/Illuminate/View/ViewServiceProvider.php',
-    'JakubOnderka\\PhpConsoleColor\\ConsoleColor' => $vendorDir . '/jakub-onderka/php-console-color/src/JakubOnderka/PhpConsoleColor/ConsoleColor.php',
-    'JakubOnderka\\PhpConsoleColor\\InvalidStyleException' => $vendorDir . '/jakub-onderka/php-console-color/src/JakubOnderka/PhpConsoleColor/InvalidStyleException.php',
-    'JakubOnderka\\PhpConsoleHighlighter\\Highlighter' => $vendorDir . '/jakub-onderka/php-console-highlighter/src/JakubOnderka/PhpConsoleHighlighter/Highlighter.php',
+    'JakubOnderka\\PhpConsoleColor\\ConsoleColor' => $vendorDir . '/jakub-onderka/php-console-color/src/ConsoleColor.php',
+    'JakubOnderka\\PhpConsoleColor\\InvalidStyleException' => $vendorDir . '/jakub-onderka/php-console-color/src/InvalidStyleException.php',
+    'JakubOnderka\\PhpConsoleHighlighter\\Highlighter' => $vendorDir . '/jakub-onderka/php-console-highlighter/src/Highlighter.php',
     'JsonSerializable' => $vendorDir . '/nesbot/carbon/src/JsonSerializable.php',
     'Laravel\\Tinker\\ClassAliasAutoloader' => $vendorDir . '/laravel/tinker/src/ClassAliasAutoloader.php',
     'Laravel\\Tinker\\Console\\TinkerCommand' => $vendorDir . '/laravel/tinker/src/Console/TinkerCommand.php',
@@ -1616,9 +1672,14 @@ return array(
     'League\\Flysystem\\Util\\MimeType' => $vendorDir . '/league/flysystem/src/Util/MimeType.php',
     'League\\Flysystem\\Util\\StreamHasher' => $vendorDir . '/league/flysystem/src/Util/StreamHasher.php',
     'Mockery' => $vendorDir . '/mockery/mockery/library/Mockery.php',
+    'Mockery\\Adapter\\Phpunit\\Legacy\\TestListenerForV5' => $vendorDir . '/mockery/mockery/library/Mockery/Adapter/Phpunit/Legacy/TestListenerForV5.php',
+    'Mockery\\Adapter\\Phpunit\\Legacy\\TestListenerForV6' => $vendorDir . '/mockery/mockery/library/Mockery/Adapter/Phpunit/Legacy/TestListenerForV6.php',
+    'Mockery\\Adapter\\Phpunit\\Legacy\\TestListenerForV7' => $vendorDir . '/mockery/mockery/library/Mockery/Adapter/Phpunit/Legacy/TestListenerForV7.php',
+    'Mockery\\Adapter\\Phpunit\\Legacy\\TestListenerTrait' => $vendorDir . '/mockery/mockery/library/Mockery/Adapter/Phpunit/Legacy/TestListenerTrait.php',
     'Mockery\\Adapter\\Phpunit\\MockeryPHPUnitIntegration' => $vendorDir . '/mockery/mockery/library/Mockery/Adapter/Phpunit/MockeryPHPUnitIntegration.php',
     'Mockery\\Adapter\\Phpunit\\MockeryTestCase' => $vendorDir . '/mockery/mockery/library/Mockery/Adapter/Phpunit/MockeryTestCase.php',
     'Mockery\\Adapter\\Phpunit\\TestListener' => $vendorDir . '/mockery/mockery/library/Mockery/Adapter/Phpunit/TestListener.php',
+    'Mockery\\ClosureWrapper' => $vendorDir . '/mockery/mockery/library/Mockery/ClosureWrapper.php',
     'Mockery\\CompositeExpectation' => $vendorDir . '/mockery/mockery/library/Mockery/CompositeExpectation.php',
     'Mockery\\Configuration' => $vendorDir . '/mockery/mockery/library/Mockery/Configuration.php',
     'Mockery\\Container' => $vendorDir . '/mockery/mockery/library/Mockery/Container.php',
@@ -1782,6 +1843,16 @@ return array(
     'Monolog\\Processor\\UidProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/UidProcessor.php',
     'Monolog\\Processor\\WebProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/WebProcessor.php',
     'Monolog\\Registry' => $vendorDir . '/monolog/monolog/src/Monolog/Registry.php',
+    'Opis\\Closure\\Analyzer' => $vendorDir . '/opis/closure/src/Analyzer.php',
+    'Opis\\Closure\\ClosureContext' => $vendorDir . '/opis/closure/src/ClosureContext.php',
+    'Opis\\Closure\\ClosureScope' => $vendorDir . '/opis/closure/src/ClosureScope.php',
+    'Opis\\Closure\\ClosureStream' => $vendorDir . '/opis/closure/src/ClosureStream.php',
+    'Opis\\Closure\\ISecurityProvider' => $vendorDir . '/opis/closure/src/ISecurityProvider.php',
+    'Opis\\Closure\\ReflectionClosure' => $vendorDir . '/opis/closure/src/ReflectionClosure.php',
+    'Opis\\Closure\\SecurityException' => $vendorDir . '/opis/closure/src/SecurityException.php',
+    'Opis\\Closure\\SecurityProvider' => $vendorDir . '/opis/closure/src/SecurityProvider.php',
+    'Opis\\Closure\\SelfReference' => $vendorDir . '/opis/closure/src/SelfReference.php',
+    'Opis\\Closure\\SerializableClosure' => $vendorDir . '/opis/closure/src/SerializableClosure.php',
     'PHPUnit\\Exception' => $vendorDir . '/phpunit/phpunit/src/Exception.php',
     'PHPUnit\\Framework\\Assert' => $vendorDir . '/phpunit/phpunit/src/Framework/Assert.php',
     'PHPUnit\\Framework\\AssertionFailedError' => $vendorDir . '/phpunit/phpunit/src/Framework/AssertionFailedError.php',
@@ -2154,7 +2225,6 @@ return array(
     'PHP_Token_XOR_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
     'PHP_Token_YIELD' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
     'PHP_Token_YIELD_FROM' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'ParseError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/ParseError.php',
     'Parsedown' => $vendorDir . '/erusev/parsedown/Parsedown.php',
     'PharIo\\Manifest\\Application' => $vendorDir . '/phar-io/manifest/src/values/Application.php',
     'PharIo\\Manifest\\ApplicationName' => $vendorDir . '/phar-io/manifest/src/values/ApplicationName.php',
@@ -2234,6 +2304,8 @@ return array(
     'PhpParser\\Builder\\Namespace_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Namespace_.php',
     'PhpParser\\Builder\\Param' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Param.php',
     'PhpParser\\Builder\\Property' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Property.php',
+    'PhpParser\\Builder\\TraitUse' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/TraitUse.php',
+    'PhpParser\\Builder\\TraitUseAdaptation' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/TraitUseAdaptation.php',
     'PhpParser\\Builder\\Trait_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Trait_.php',
     'PhpParser\\Builder\\Use_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Use_.php',
     'PhpParser\\Comment' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Comment.php',
@@ -2466,6 +2538,7 @@ return array(
     'Prophecy\\Doubler\\ClassPatch\\ProphecySubjectPatch' => $vendorDir . '/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/ProphecySubjectPatch.php',
     'Prophecy\\Doubler\\ClassPatch\\ReflectionClassNewInstancePatch' => $vendorDir . '/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/ReflectionClassNewInstancePatch.php',
     'Prophecy\\Doubler\\ClassPatch\\SplFileInfoPatch' => $vendorDir . '/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/SplFileInfoPatch.php',
+    'Prophecy\\Doubler\\ClassPatch\\ThrowablePatch' => $vendorDir . '/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/ThrowablePatch.php',
     'Prophecy\\Doubler\\ClassPatch\\TraversablePatch' => $vendorDir . '/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/TraversablePatch.php',
     'Prophecy\\Doubler\\DoubleInterface' => $vendorDir . '/phpspec/prophecy/src/Prophecy/Doubler/DoubleInterface.php',
     'Prophecy\\Doubler\\Doubler' => $vendorDir . '/phpspec/prophecy/src/Prophecy/Doubler/Doubler.php',
@@ -2822,7 +2895,6 @@ return array(
     'SebastianBergmann\\RecursionContext\\InvalidArgumentException' => $vendorDir . '/sebastian/recursion-context/src/InvalidArgumentException.php',
     'SebastianBergmann\\ResourceOperations\\ResourceOperations' => $vendorDir . '/sebastian/resource-operations/src/ResourceOperations.php',
     'SebastianBergmann\\Version' => $vendorDir . '/sebastian/version/src/Version.php',
-    'SessionUpdateTimestampHandlerInterface' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/SessionUpdateTimestampHandlerInterface.php',
     'SettingsSeeder' => $baseDir . '/database/seeds/SettingsSeeder.php',
     'Symfony\\Component\\Console\\Application' => $vendorDir . '/symfony/console/Application.php',
     'Symfony\\Component\\Console\\CommandLoader\\CommandLoaderInterface' => $vendorDir . '/symfony/console/CommandLoader/CommandLoaderInterface.php',
@@ -2845,13 +2917,13 @@ return array(
     'Symfony\\Component\\Console\\Event\\ConsoleCommandEvent' => $vendorDir . '/symfony/console/Event/ConsoleCommandEvent.php',
     'Symfony\\Component\\Console\\Event\\ConsoleErrorEvent' => $vendorDir . '/symfony/console/Event/ConsoleErrorEvent.php',
     'Symfony\\Component\\Console\\Event\\ConsoleEvent' => $vendorDir . '/symfony/console/Event/ConsoleEvent.php',
-    'Symfony\\Component\\Console\\Event\\ConsoleExceptionEvent' => $vendorDir . '/symfony/console/Event/ConsoleExceptionEvent.php',
     'Symfony\\Component\\Console\\Event\\ConsoleTerminateEvent' => $vendorDir . '/symfony/console/Event/ConsoleTerminateEvent.php',
     'Symfony\\Component\\Console\\Exception\\CommandNotFoundException' => $vendorDir . '/symfony/console/Exception/CommandNotFoundException.php',
     'Symfony\\Component\\Console\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/console/Exception/ExceptionInterface.php',
     'Symfony\\Component\\Console\\Exception\\InvalidArgumentException' => $vendorDir . '/symfony/console/Exception/InvalidArgumentException.php',
     'Symfony\\Component\\Console\\Exception\\InvalidOptionException' => $vendorDir . '/symfony/console/Exception/InvalidOptionException.php',
     'Symfony\\Component\\Console\\Exception\\LogicException' => $vendorDir . '/symfony/console/Exception/LogicException.php',
+    'Symfony\\Component\\Console\\Exception\\NamespaceNotFoundException' => $vendorDir . '/symfony/console/Exception/NamespaceNotFoundException.php',
     'Symfony\\Component\\Console\\Exception\\RuntimeException' => $vendorDir . '/symfony/console/Exception/RuntimeException.php',
     'Symfony\\Component\\Console\\Formatter\\OutputFormatter' => $vendorDir . '/symfony/console/Formatter/OutputFormatter.php',
     'Symfony\\Component\\Console\\Formatter\\OutputFormatterInterface' => $vendorDir . '/symfony/console/Formatter/OutputFormatterInterface.php',
@@ -2872,6 +2944,7 @@ return array(
     'Symfony\\Component\\Console\\Helper\\SymfonyQuestionHelper' => $vendorDir . '/symfony/console/Helper/SymfonyQuestionHelper.php',
     'Symfony\\Component\\Console\\Helper\\Table' => $vendorDir . '/symfony/console/Helper/Table.php',
     'Symfony\\Component\\Console\\Helper\\TableCell' => $vendorDir . '/symfony/console/Helper/TableCell.php',
+    'Symfony\\Component\\Console\\Helper\\TableRows' => $vendorDir . '/symfony/console/Helper/TableRows.php',
     'Symfony\\Component\\Console\\Helper\\TableSeparator' => $vendorDir . '/symfony/console/Helper/TableSeparator.php',
     'Symfony\\Component\\Console\\Helper\\TableStyle' => $vendorDir . '/symfony/console/Helper/TableStyle.php',
     'Symfony\\Component\\Console\\Input\\ArgvInput' => $vendorDir . '/symfony/console/Input/ArgvInput.php',
@@ -2888,6 +2961,7 @@ return array(
     'Symfony\\Component\\Console\\Output\\BufferedOutput' => $vendorDir . '/symfony/console/Output/BufferedOutput.php',
     'Symfony\\Component\\Console\\Output\\ConsoleOutput' => $vendorDir . '/symfony/console/Output/ConsoleOutput.php',
     'Symfony\\Component\\Console\\Output\\ConsoleOutputInterface' => $vendorDir . '/symfony/console/Output/ConsoleOutputInterface.php',
+    'Symfony\\Component\\Console\\Output\\ConsoleSectionOutput' => $vendorDir . '/symfony/console/Output/ConsoleSectionOutput.php',
     'Symfony\\Component\\Console\\Output\\NullOutput' => $vendorDir . '/symfony/console/Output/NullOutput.php',
     'Symfony\\Component\\Console\\Output\\Output' => $vendorDir . '/symfony/console/Output/Output.php',
     'Symfony\\Component\\Console\\Output\\OutputInterface' => $vendorDir . '/symfony/console/Output/OutputInterface.php',
@@ -2901,6 +2975,7 @@ return array(
     'Symfony\\Component\\Console\\Terminal' => $vendorDir . '/symfony/console/Terminal.php',
     'Symfony\\Component\\Console\\Tester\\ApplicationTester' => $vendorDir . '/symfony/console/Tester/ApplicationTester.php',
     'Symfony\\Component\\Console\\Tester\\CommandTester' => $vendorDir . '/symfony/console/Tester/CommandTester.php',
+    'Symfony\\Component\\Console\\Tester\\TesterTrait' => $vendorDir . '/symfony/console/Tester/TesterTrait.php',
     'Symfony\\Component\\CssSelector\\CssSelectorConverter' => $vendorDir . '/symfony/css-selector/CssSelectorConverter.php',
     'Symfony\\Component\\CssSelector\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/css-selector/Exception/ExceptionInterface.php',
     'Symfony\\Component\\CssSelector\\Exception\\ExpressionErrorException' => $vendorDir . '/symfony/css-selector/Exception/ExpressionErrorException.php',
@@ -2955,7 +3030,6 @@ return array(
     'Symfony\\Component\\Debug\\ErrorHandler' => $vendorDir . '/symfony/debug/ErrorHandler.php',
     'Symfony\\Component\\Debug\\ExceptionHandler' => $vendorDir . '/symfony/debug/ExceptionHandler.php',
     'Symfony\\Component\\Debug\\Exception\\ClassNotFoundException' => $vendorDir . '/symfony/debug/Exception/ClassNotFoundException.php',
-    'Symfony\\Component\\Debug\\Exception\\ContextErrorException' => $vendorDir . '/symfony/debug/Exception/ContextErrorException.php',
     'Symfony\\Component\\Debug\\Exception\\FatalErrorException' => $vendorDir . '/symfony/debug/Exception/FatalErrorException.php',
     'Symfony\\Component\\Debug\\Exception\\FatalThrowableError' => $vendorDir . '/symfony/debug/Exception/FatalThrowableError.php',
     'Symfony\\Component\\Debug\\Exception\\FlattenException' => $vendorDir . '/symfony/debug/Exception/FlattenException.php',
@@ -2982,7 +3056,6 @@ return array(
     'Symfony\\Component\\Finder\\Comparator\\DateComparator' => $vendorDir . '/symfony/finder/Comparator/DateComparator.php',
     'Symfony\\Component\\Finder\\Comparator\\NumberComparator' => $vendorDir . '/symfony/finder/Comparator/NumberComparator.php',
     'Symfony\\Component\\Finder\\Exception\\AccessDeniedException' => $vendorDir . '/symfony/finder/Exception/AccessDeniedException.php',
-    'Symfony\\Component\\Finder\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/finder/Exception/ExceptionInterface.php',
     'Symfony\\Component\\Finder\\Finder' => $vendorDir . '/symfony/finder/Finder.php',
     'Symfony\\Component\\Finder\\Glob' => $vendorDir . '/symfony/finder/Glob.php',
     'Symfony\\Component\\Finder\\Iterator\\CustomFilterIterator' => $vendorDir . '/symfony/finder/Iterator/CustomFilterIterator.php',
@@ -2992,7 +3065,6 @@ return array(
     'Symfony\\Component\\Finder\\Iterator\\FileTypeFilterIterator' => $vendorDir . '/symfony/finder/Iterator/FileTypeFilterIterator.php',
     'Symfony\\Component\\Finder\\Iterator\\FilecontentFilterIterator' => $vendorDir . '/symfony/finder/Iterator/FilecontentFilterIterator.php',
     'Symfony\\Component\\Finder\\Iterator\\FilenameFilterIterator' => $vendorDir . '/symfony/finder/Iterator/FilenameFilterIterator.php',
-    'Symfony\\Component\\Finder\\Iterator\\FilterIterator' => $vendorDir . '/symfony/finder/Iterator/FilterIterator.php',
     'Symfony\\Component\\Finder\\Iterator\\MultiplePcreFilterIterator' => $vendorDir . '/symfony/finder/Iterator/MultiplePcreFilterIterator.php',
     'Symfony\\Component\\Finder\\Iterator\\PathFilterIterator' => $vendorDir . '/symfony/finder/Iterator/PathFilterIterator.php',
     'Symfony\\Component\\Finder\\Iterator\\RecursiveDirectoryIterator' => $vendorDir . '/symfony/finder/Iterator/RecursiveDirectoryIterator.php',
@@ -3010,8 +3082,15 @@ return array(
     'Symfony\\Component\\HttpFoundation\\ExpressionRequestMatcher' => $vendorDir . '/symfony/http-foundation/ExpressionRequestMatcher.php',
     'Symfony\\Component\\HttpFoundation\\FileBag' => $vendorDir . '/symfony/http-foundation/FileBag.php',
     'Symfony\\Component\\HttpFoundation\\File\\Exception\\AccessDeniedException' => $vendorDir . '/symfony/http-foundation/File/Exception/AccessDeniedException.php',
+    'Symfony\\Component\\HttpFoundation\\File\\Exception\\CannotWriteFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/CannotWriteFileException.php',
+    'Symfony\\Component\\HttpFoundation\\File\\Exception\\ExtensionFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/ExtensionFileException.php',
     'Symfony\\Component\\HttpFoundation\\File\\Exception\\FileException' => $vendorDir . '/symfony/http-foundation/File/Exception/FileException.php',
     'Symfony\\Component\\HttpFoundation\\File\\Exception\\FileNotFoundException' => $vendorDir . '/symfony/http-foundation/File/Exception/FileNotFoundException.php',
+    'Symfony\\Component\\HttpFoundation\\File\\Exception\\FormSizeFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/FormSizeFileException.php',
+    'Symfony\\Component\\HttpFoundation\\File\\Exception\\IniSizeFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/IniSizeFileException.php',
+    'Symfony\\Component\\HttpFoundation\\File\\Exception\\NoFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/NoFileException.php',
+    'Symfony\\Component\\HttpFoundation\\File\\Exception\\NoTmpDirFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/NoTmpDirFileException.php',
+    'Symfony\\Component\\HttpFoundation\\File\\Exception\\PartialFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/PartialFileException.php',
     'Symfony\\Component\\HttpFoundation\\File\\Exception\\UnexpectedTypeException' => $vendorDir . '/symfony/http-foundation/File/Exception/UnexpectedTypeException.php',
     'Symfony\\Component\\HttpFoundation\\File\\Exception\\UploadException' => $vendorDir . '/symfony/http-foundation/File/Exception/UploadException.php',
     'Symfony\\Component\\HttpFoundation\\File\\File' => $vendorDir . '/symfony/http-foundation/File/File.php',
@@ -3025,6 +3104,7 @@ return array(
     'Symfony\\Component\\HttpFoundation\\File\\Stream' => $vendorDir . '/symfony/http-foundation/File/Stream.php',
     'Symfony\\Component\\HttpFoundation\\File\\UploadedFile' => $vendorDir . '/symfony/http-foundation/File/UploadedFile.php',
     'Symfony\\Component\\HttpFoundation\\HeaderBag' => $vendorDir . '/symfony/http-foundation/HeaderBag.php',
+    'Symfony\\Component\\HttpFoundation\\HeaderUtils' => $vendorDir . '/symfony/http-foundation/HeaderUtils.php',
     'Symfony\\Component\\HttpFoundation\\IpUtils' => $vendorDir . '/symfony/http-foundation/IpUtils.php',
     'Symfony\\Component\\HttpFoundation\\JsonResponse' => $vendorDir . '/symfony/http-foundation/JsonResponse.php',
     'Symfony\\Component\\HttpFoundation\\ParameterBag' => $vendorDir . '/symfony/http-foundation/ParameterBag.php',
@@ -3047,22 +3127,20 @@ return array(
     'Symfony\\Component\\HttpFoundation\\Session\\SessionBagProxy' => $vendorDir . '/symfony/http-foundation/Session/SessionBagProxy.php',
     'Symfony\\Component\\HttpFoundation\\Session\\SessionInterface' => $vendorDir . '/symfony/http-foundation/Session/SessionInterface.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\AbstractSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/AbstractSessionHandler.php',
-    'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MemcacheSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MemcachedSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php',
+    'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MigratingSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/MigratingSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MongoDbSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php',
-    'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/NativeSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NullSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/NullSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\PdoSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php',
+    'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\RedisSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/RedisSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\StrictSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/StrictSessionHandler.php',
-    'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\WriteCheckSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/WriteCheckSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MetadataBag' => $vendorDir . '/symfony/http-foundation/Session/Storage/MetadataBag.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MockArraySessionStorage' => $vendorDir . '/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MockFileSessionStorage' => $vendorDir . '/symfony/http-foundation/Session/Storage/MockFileSessionStorage.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\NativeSessionStorage' => $vendorDir . '/symfony/http-foundation/Session/Storage/NativeSessionStorage.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\PhpBridgeSessionStorage' => $vendorDir . '/symfony/http-foundation/Session/Storage/PhpBridgeSessionStorage.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\AbstractProxy' => $vendorDir . '/symfony/http-foundation/Session/Storage/Proxy/AbstractProxy.php',
-    'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\NativeProxy' => $vendorDir . '/symfony/http-foundation/Session/Storage/Proxy/NativeProxy.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\SessionHandlerProxy' => $vendorDir . '/symfony/http-foundation/Session/Storage/Proxy/SessionHandlerProxy.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\SessionStorageInterface' => $vendorDir . '/symfony/http-foundation/Session/Storage/SessionStorageInterface.php',
     'Symfony\\Component\\HttpFoundation\\StreamedResponse' => $vendorDir . '/symfony/http-foundation/StreamedResponse.php',
@@ -3076,7 +3154,6 @@ return array(
     'Symfony\\Component\\HttpKernel\\CacheWarmer\\CacheWarmerInterface' => $vendorDir . '/symfony/http-kernel/CacheWarmer/CacheWarmerInterface.php',
     'Symfony\\Component\\HttpKernel\\CacheWarmer\\WarmableInterface' => $vendorDir . '/symfony/http-kernel/CacheWarmer/WarmableInterface.php',
     'Symfony\\Component\\HttpKernel\\Client' => $vendorDir . '/symfony/http-kernel/Client.php',
-    'Symfony\\Component\\HttpKernel\\Config\\EnvParametersResource' => $vendorDir . '/symfony/http-kernel/Config/EnvParametersResource.php',
     'Symfony\\Component\\HttpKernel\\Config\\FileLocator' => $vendorDir . '/symfony/http-kernel/Config/FileLocator.php',
     'Symfony\\Component\\HttpKernel\\ControllerMetadata\\ArgumentMetadata' => $vendorDir . '/symfony/http-kernel/ControllerMetadata/ArgumentMetadata.php',
     'Symfony\\Component\\HttpKernel\\ControllerMetadata\\ArgumentMetadataFactory' => $vendorDir . '/symfony/http-kernel/ControllerMetadata/ArgumentMetadataFactory.php',
@@ -3088,6 +3165,7 @@ return array(
     'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\RequestValueResolver' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentResolver/RequestValueResolver.php',
     'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\ServiceValueResolver' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentResolver/ServiceValueResolver.php',
     'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\SessionValueResolver' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentResolver/SessionValueResolver.php',
+    'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\TraceableValueResolver' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentResolver/TraceableValueResolver.php',
     'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\VariadicValueResolver' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentResolver/VariadicValueResolver.php',
     'Symfony\\Component\\HttpKernel\\Controller\\ArgumentValueResolverInterface' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentValueResolverInterface.php',
     'Symfony\\Component\\HttpKernel\\Controller\\ContainerControllerResolver' => $vendorDir . '/symfony/http-kernel/Controller/ContainerControllerResolver.php',
@@ -3109,11 +3187,9 @@ return array(
     'Symfony\\Component\\HttpKernel\\DataCollector\\RequestDataCollector' => $vendorDir . '/symfony/http-kernel/DataCollector/RequestDataCollector.php',
     'Symfony\\Component\\HttpKernel\\DataCollector\\RouterDataCollector' => $vendorDir . '/symfony/http-kernel/DataCollector/RouterDataCollector.php',
     'Symfony\\Component\\HttpKernel\\DataCollector\\TimeDataCollector' => $vendorDir . '/symfony/http-kernel/DataCollector/TimeDataCollector.php',
-    'Symfony\\Component\\HttpKernel\\DataCollector\\Util\\ValueExporter' => $vendorDir . '/symfony/http-kernel/DataCollector/Util/ValueExporter.php',
     'Symfony\\Component\\HttpKernel\\Debug\\FileLinkFormatter' => $vendorDir . '/symfony/http-kernel/Debug/FileLinkFormatter.php',
     'Symfony\\Component\\HttpKernel\\Debug\\TraceableEventDispatcher' => $vendorDir . '/symfony/http-kernel/Debug/TraceableEventDispatcher.php',
     'Symfony\\Component\\HttpKernel\\DependencyInjection\\AddAnnotatedClassesToCachePass' => $vendorDir . '/symfony/http-kernel/DependencyInjection/AddAnnotatedClassesToCachePass.php',
-    'Symfony\\Component\\HttpKernel\\DependencyInjection\\AddClassesToCachePass' => $vendorDir . '/symfony/http-kernel/DependencyInjection/AddClassesToCachePass.php',
     'Symfony\\Component\\HttpKernel\\DependencyInjection\\ConfigurableExtension' => $vendorDir . '/symfony/http-kernel/DependencyInjection/ConfigurableExtension.php',
     'Symfony\\Component\\HttpKernel\\DependencyInjection\\ControllerArgumentValueResolverPass' => $vendorDir . '/symfony/http-kernel/DependencyInjection/ControllerArgumentValueResolverPass.php',
     'Symfony\\Component\\HttpKernel\\DependencyInjection\\Extension' => $vendorDir . '/symfony/http-kernel/DependencyInjection/Extension.php',
@@ -3185,6 +3261,7 @@ return array(
     'Symfony\\Component\\HttpKernel\\HttpCache\\Ssi' => $vendorDir . '/symfony/http-kernel/HttpCache/Ssi.php',
     'Symfony\\Component\\HttpKernel\\HttpCache\\Store' => $vendorDir . '/symfony/http-kernel/HttpCache/Store.php',
     'Symfony\\Component\\HttpKernel\\HttpCache\\StoreInterface' => $vendorDir . '/symfony/http-kernel/HttpCache/StoreInterface.php',
+    'Symfony\\Component\\HttpKernel\\HttpCache\\SubRequestHandler' => $vendorDir . '/symfony/http-kernel/HttpCache/SubRequestHandler.php',
     'Symfony\\Component\\HttpKernel\\HttpCache\\SurrogateInterface' => $vendorDir . '/symfony/http-kernel/HttpCache/SurrogateInterface.php',
     'Symfony\\Component\\HttpKernel\\HttpKernel' => $vendorDir . '/symfony/http-kernel/HttpKernel.php',
     'Symfony\\Component\\HttpKernel\\HttpKernelInterface' => $vendorDir . '/symfony/http-kernel/HttpKernelInterface.php',
@@ -3204,6 +3281,7 @@ return array(
     'Symfony\\Component\\Process\\Exception\\InvalidArgumentException' => $vendorDir . '/symfony/process/Exception/InvalidArgumentException.php',
     'Symfony\\Component\\Process\\Exception\\LogicException' => $vendorDir . '/symfony/process/Exception/LogicException.php',
     'Symfony\\Component\\Process\\Exception\\ProcessFailedException' => $vendorDir . '/symfony/process/Exception/ProcessFailedException.php',
+    'Symfony\\Component\\Process\\Exception\\ProcessSignaledException' => $vendorDir . '/symfony/process/Exception/ProcessSignaledException.php',
     'Symfony\\Component\\Process\\Exception\\ProcessTimedOutException' => $vendorDir . '/symfony/process/Exception/ProcessTimedOutException.php',
     'Symfony\\Component\\Process\\Exception\\RuntimeException' => $vendorDir . '/symfony/process/Exception/RuntimeException.php',
     'Symfony\\Component\\Process\\ExecutableFinder' => $vendorDir . '/symfony/process/ExecutableFinder.php',
@@ -3215,7 +3293,6 @@ return array(
     'Symfony\\Component\\Process\\Pipes\\UnixPipes' => $vendorDir . '/symfony/process/Pipes/UnixPipes.php',
     'Symfony\\Component\\Process\\Pipes\\WindowsPipes' => $vendorDir . '/symfony/process/Pipes/WindowsPipes.php',
     'Symfony\\Component\\Process\\Process' => $vendorDir . '/symfony/process/Process.php',
-    'Symfony\\Component\\Process\\ProcessBuilder' => $vendorDir . '/symfony/process/ProcessBuilder.php',
     'Symfony\\Component\\Process\\ProcessUtils' => $vendorDir . '/symfony/process/ProcessUtils.php',
     'Symfony\\Component\\Routing\\Annotation\\Route' => $vendorDir . '/symfony/routing/Annotation/Route.php',
     'Symfony\\Component\\Routing\\CompiledRoute' => $vendorDir . '/symfony/routing/CompiledRoute.php',
@@ -3251,8 +3328,6 @@ return array(
     'Symfony\\Component\\Routing\\Loader\\ProtectedPhpFileLoader' => $vendorDir . '/symfony/routing/Loader/PhpFileLoader.php',
     'Symfony\\Component\\Routing\\Loader\\XmlFileLoader' => $vendorDir . '/symfony/routing/Loader/XmlFileLoader.php',
     'Symfony\\Component\\Routing\\Loader\\YamlFileLoader' => $vendorDir . '/symfony/routing/Loader/YamlFileLoader.php',
-    'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperCollection' => $vendorDir . '/symfony/routing/Matcher/Dumper/DumperCollection.php',
-    'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperRoute' => $vendorDir . '/symfony/routing/Matcher/Dumper/DumperRoute.php',
     'Symfony\\Component\\Routing\\Matcher\\Dumper\\MatcherDumper' => $vendorDir . '/symfony/routing/Matcher/Dumper/MatcherDumper.php',
     'Symfony\\Component\\Routing\\Matcher\\Dumper\\MatcherDumperInterface' => $vendorDir . '/symfony/routing/Matcher/Dumper/MatcherDumperInterface.php',
     'Symfony\\Component\\Routing\\Matcher\\Dumper\\PhpMatcherDumper' => $vendorDir . '/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php',
@@ -3351,8 +3426,8 @@ return array(
     'Symfony\\Component\\VarDumper\\Caster\\EnumStub' => $vendorDir . '/symfony/var-dumper/Caster/EnumStub.php',
     'Symfony\\Component\\VarDumper\\Caster\\ExceptionCaster' => $vendorDir . '/symfony/var-dumper/Caster/ExceptionCaster.php',
     'Symfony\\Component\\VarDumper\\Caster\\FrameStub' => $vendorDir . '/symfony/var-dumper/Caster/FrameStub.php',
+    'Symfony\\Component\\VarDumper\\Caster\\GmpCaster' => $vendorDir . '/symfony/var-dumper/Caster/GmpCaster.php',
     'Symfony\\Component\\VarDumper\\Caster\\LinkStub' => $vendorDir . '/symfony/var-dumper/Caster/LinkStub.php',
-    'Symfony\\Component\\VarDumper\\Caster\\MongoCaster' => $vendorDir . '/symfony/var-dumper/Caster/MongoCaster.php',
     'Symfony\\Component\\VarDumper\\Caster\\PdoCaster' => $vendorDir . '/symfony/var-dumper/Caster/PdoCaster.php',
     'Symfony\\Component\\VarDumper\\Caster\\PgSqlCaster' => $vendorDir . '/symfony/var-dumper/Caster/PgSqlCaster.php',
     'Symfony\\Component\\VarDumper\\Caster\\RedisCaster' => $vendorDir . '/symfony/var-dumper/Caster/RedisCaster.php',
@@ -3371,17 +3446,29 @@ return array(
     'Symfony\\Component\\VarDumper\\Cloner\\DumperInterface' => $vendorDir . '/symfony/var-dumper/Cloner/DumperInterface.php',
     'Symfony\\Component\\VarDumper\\Cloner\\Stub' => $vendorDir . '/symfony/var-dumper/Cloner/Stub.php',
     'Symfony\\Component\\VarDumper\\Cloner\\VarCloner' => $vendorDir . '/symfony/var-dumper/Cloner/VarCloner.php',
+    'Symfony\\Component\\VarDumper\\Command\\Descriptor\\CliDescriptor' => $vendorDir . '/symfony/var-dumper/Command/Descriptor/CliDescriptor.php',
+    'Symfony\\Component\\VarDumper\\Command\\Descriptor\\DumpDescriptorInterface' => $vendorDir . '/symfony/var-dumper/Command/Descriptor/DumpDescriptorInterface.php',
+    'Symfony\\Component\\VarDumper\\Command\\Descriptor\\HtmlDescriptor' => $vendorDir . '/symfony/var-dumper/Command/Descriptor/HtmlDescriptor.php',
+    'Symfony\\Component\\VarDumper\\Command\\ServerDumpCommand' => $vendorDir . '/symfony/var-dumper/Command/ServerDumpCommand.php',
     'Symfony\\Component\\VarDumper\\Dumper\\AbstractDumper' => $vendorDir . '/symfony/var-dumper/Dumper/AbstractDumper.php',
     'Symfony\\Component\\VarDumper\\Dumper\\CliDumper' => $vendorDir . '/symfony/var-dumper/Dumper/CliDumper.php',
+    'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\CliContextProvider' => $vendorDir . '/symfony/var-dumper/Dumper/ContextProvider/CliContextProvider.php',
+    'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\ContextProviderInterface' => $vendorDir . '/symfony/var-dumper/Dumper/ContextProvider/ContextProviderInterface.php',
+    'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\RequestContextProvider' => $vendorDir . '/symfony/var-dumper/Dumper/ContextProvider/RequestContextProvider.php',
+    'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\SourceContextProvider' => $vendorDir . '/symfony/var-dumper/Dumper/ContextProvider/SourceContextProvider.php',
     'Symfony\\Component\\VarDumper\\Dumper\\DataDumperInterface' => $vendorDir . '/symfony/var-dumper/Dumper/DataDumperInterface.php',
     'Symfony\\Component\\VarDumper\\Dumper\\HtmlDumper' => $vendorDir . '/symfony/var-dumper/Dumper/HtmlDumper.php',
+    'Symfony\\Component\\VarDumper\\Dumper\\ServerDumper' => $vendorDir . '/symfony/var-dumper/Dumper/ServerDumper.php',
     'Symfony\\Component\\VarDumper\\Exception\\ThrowingCasterException' => $vendorDir . '/symfony/var-dumper/Exception/ThrowingCasterException.php',
+    'Symfony\\Component\\VarDumper\\Server\\Connection' => $vendorDir . '/symfony/var-dumper/Server/Connection.php',
+    'Symfony\\Component\\VarDumper\\Server\\DumpServer' => $vendorDir . '/symfony/var-dumper/Server/DumpServer.php',
     'Symfony\\Component\\VarDumper\\Test\\VarDumperTestTrait' => $vendorDir . '/symfony/var-dumper/Test/VarDumperTestTrait.php',
     'Symfony\\Component\\VarDumper\\VarDumper' => $vendorDir . '/symfony/var-dumper/VarDumper.php',
     'Symfony\\Polyfill\\Ctype\\Ctype' => $vendorDir . '/symfony/polyfill-ctype/Ctype.php',
     'Symfony\\Polyfill\\Mbstring\\Mbstring' => $vendorDir . '/symfony/polyfill-mbstring/Mbstring.php',
-    'Symfony\\Polyfill\\Php70\\Php70' => $vendorDir . '/symfony/polyfill-php70/Php70.php',
+    'Symfony\\Polyfill\\Php72\\Php72' => $vendorDir . '/symfony/polyfill-php72/Php72.php',
     'Symfony\\Thanks\\Command\\ThanksCommand' => $vendorDir . '/symfony/thanks/src/Command/ThanksCommand.php',
+    'Symfony\\Thanks\\GitHubClient' => $vendorDir . '/symfony/thanks/src/GitHubClient.php',
     'Symfony\\Thanks\\Thanks' => $vendorDir . '/symfony/thanks/src/Thanks.php',
     'Tests\\CreatesApplication' => $baseDir . '/tests/CreatesApplication.php',
     'Tests\\Feature\\ExampleTest' => $baseDir . '/tests/Feature/ExampleTest.php',
@@ -3402,7 +3489,7 @@ return array(
     'TijsVerkoyen\\CssToInlineStyles\\Css\\Property\\Property' => $vendorDir . '/tijsverkoyen/css-to-inline-styles/src/Css/Property/Property.php',
     'TijsVerkoyen\\CssToInlineStyles\\Css\\Rule\\Processor' => $vendorDir . '/tijsverkoyen/css-to-inline-styles/src/Css/Rule/Processor.php',
     'TijsVerkoyen\\CssToInlineStyles\\Css\\Rule\\Rule' => $vendorDir . '/tijsverkoyen/css-to-inline-styles/src/Css/Rule/Rule.php',
-    'TypeError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/TypeError.php',
+    'UsersSeeder' => $baseDir . '/database/seeds/UsersSeeder.php',
     'Webmozart\\Assert\\Assert' => $vendorDir . '/webmozart/assert/src/Assert.php',
     'Whoops\\Exception\\ErrorException' => $vendorDir . '/filp/whoops/src/Whoops/Exception/ErrorException.php',
     'Whoops\\Exception\\Formatter' => $vendorDir . '/filp/whoops/src/Whoops/Exception/Formatter.php',
diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
index 1d1d477c..3f81cfbb 100644
--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -7,15 +7,15 @@ $baseDir = dirname($vendorDir);
 
 return array(
     '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
-    '5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',
-    '023d27dca8066ef29e6739335ea73bad' => $vendorDir . '/symfony/polyfill-php70/bootstrap.php',
+    '25072dd6e2470089de65ae7bf11d3109' => $vendorDir . '/symfony/polyfill-php72/bootstrap.php',
     '667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php',
-    '2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
     '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
+    '2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
     'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php',
     'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php',
-    '801c31d8ed748cfa537fa45402288c95' => $vendorDir . '/psy/psysh/src/functions.php',
     '6124b4c8570aa390c21fafd04a26c69f' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
+    '538ca81a9a966a6716601ecf48f4eaef' => $vendorDir . '/opis/closure/functions.php',
+    '801c31d8ed748cfa537fa45402288c95' => $vendorDir . '/psy/psysh/src/functions.php',
     '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
     'f0906e6318348a765ffb6eb24e0d0938' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/helpers.php',
     '58571171fd5812e6e447dce228f52f4d' => $vendorDir . '/laravel/framework/src/Illuminate/Support/helpers.php',
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index 058a3a17..36551427 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -9,7 +9,5 @@ return array(
     'Prophecy\\' => array($vendorDir . '/phpspec/prophecy/src'),
     'Parsedown' => array($vendorDir . '/erusev/parsedown'),
     'Mockery' => array($vendorDir . '/mockery/mockery/library'),
-    'JakubOnderka\\PhpConsoleHighlighter' => array($vendorDir . '/jakub-onderka/php-console-highlighter/src'),
-    'JakubOnderka\\PhpConsoleColor' => array($vendorDir . '/jakub-onderka/php-console-color/src'),
     'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/lib'),
 );
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index 4c0b1f17..57ffb583 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -13,7 +13,7 @@ return array(
     'TijsVerkoyen\\CssToInlineStyles\\' => array($vendorDir . '/tijsverkoyen/css-to-inline-styles/src'),
     'Tests\\' => array($baseDir . '/tests'),
     'Symfony\\Thanks\\' => array($vendorDir . '/symfony/thanks/src'),
-    'Symfony\\Polyfill\\Php70\\' => array($vendorDir . '/symfony/polyfill-php70'),
+    'Symfony\\Polyfill\\Php72\\' => array($vendorDir . '/symfony/polyfill-php72'),
     'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'),
     'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'),
     'Symfony\\Component\\VarDumper\\' => array($vendorDir . '/symfony/var-dumper'),
@@ -34,9 +34,12 @@ return array(
     'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src'),
     'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
     'PhpParser\\' => array($vendorDir . '/nikic/php-parser/lib/PhpParser'),
+    'Opis\\Closure\\' => array($vendorDir . '/opis/closure/src'),
     'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
     'League\\Flysystem\\' => array($vendorDir . '/league/flysystem/src'),
     'Laravel\\Tinker\\' => array($vendorDir . '/laravel/tinker/src'),
+    'JakubOnderka\\PhpConsoleHighlighter\\' => array($vendorDir . '/jakub-onderka/php-console-highlighter/src'),
+    'JakubOnderka\\PhpConsoleColor\\' => array($vendorDir . '/jakub-onderka/php-console-color/src'),
     'Illuminate\\' => array($vendorDir . '/laravel/framework/src/Illuminate'),
     'GuzzleHttp\\Psr7\\' => array($vendorDir . '/guzzlehttp/psr7/src'),
     'GuzzleHttp\\Promise\\' => array($vendorDir . '/guzzlehttp/promises/src'),
@@ -48,7 +51,7 @@ return array(
     'Doctrine\\Instantiator\\' => array($vendorDir . '/doctrine/instantiator/src/Doctrine/Instantiator'),
     'Doctrine\\Common\\Inflector\\' => array($vendorDir . '/doctrine/inflector/lib/Doctrine/Common/Inflector'),
     'DeepCopy\\' => array($vendorDir . '/myclabs/deep-copy/src/DeepCopy'),
-    'Cron\\' => array($vendorDir . '/mtdowling/cron-expression/src/Cron'),
+    'Cron\\' => array($vendorDir . '/dragonmantank/cron-expression/src/Cron'),
     'Collective\\Html\\' => array($vendorDir . '/laravelcollective/html/src'),
     'App\\' => array($baseDir . '/app'),
     '' => array($vendorDir . '/nesbot/carbon/src'),
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 4eb048a0..8c3108e8 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -8,15 +8,15 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
 {
     public static $files = array (
         '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
-        '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php',
-        '023d27dca8066ef29e6739335ea73bad' => __DIR__ . '/..' . '/symfony/polyfill-php70/bootstrap.php',
+        '25072dd6e2470089de65ae7bf11d3109' => __DIR__ . '/..' . '/symfony/polyfill-php72/bootstrap.php',
         '667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php',
-        '2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php',
         '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
+        '2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php',
         'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php',
         'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php',
-        '801c31d8ed748cfa537fa45402288c95' => __DIR__ . '/..' . '/psy/psysh/src/functions.php',
         '6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
+        '538ca81a9a966a6716601ecf48f4eaef' => __DIR__ . '/..' . '/opis/closure/functions.php',
+        '801c31d8ed748cfa537fa45402288c95' => __DIR__ . '/..' . '/psy/psysh/src/functions.php',
         '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
         'f0906e6318348a765ffb6eb24e0d0938' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/helpers.php',
         '58571171fd5812e6e447dce228f52f4d' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/helpers.php',
@@ -46,7 +46,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'S' => 
         array (
             'Symfony\\Thanks\\' => 15,
-            'Symfony\\Polyfill\\Php70\\' => 23,
+            'Symfony\\Polyfill\\Php72\\' => 23,
             'Symfony\\Polyfill\\Mbstring\\' => 26,
             'Symfony\\Polyfill\\Ctype\\' => 23,
             'Symfony\\Component\\VarDumper\\' => 28,
@@ -74,6 +74,10 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
             'Psr\\Container\\' => 14,
             'PhpParser\\' => 10,
         ),
+        'O' => 
+        array (
+            'Opis\\Closure\\' => 13,
+        ),
         'M' => 
         array (
             'Monolog\\' => 8,
@@ -83,6 +87,11 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
             'League\\Flysystem\\' => 17,
             'Laravel\\Tinker\\' => 15,
         ),
+        'J' => 
+        array (
+            'JakubOnderka\\PhpConsoleHighlighter\\' => 35,
+            'JakubOnderka\\PhpConsoleColor\\' => 29,
+        ),
         'I' => 
         array (
             'Illuminate\\' => 11,
@@ -151,9 +160,9 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         array (
             0 => __DIR__ . '/..' . '/symfony/thanks/src',
         ),
-        'Symfony\\Polyfill\\Php70\\' => 
+        'Symfony\\Polyfill\\Php72\\' => 
         array (
-            0 => __DIR__ . '/..' . '/symfony/polyfill-php70',
+            0 => __DIR__ . '/..' . '/symfony/polyfill-php72',
         ),
         'Symfony\\Polyfill\\Mbstring\\' => 
         array (
@@ -235,6 +244,10 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         array (
             0 => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser',
         ),
+        'Opis\\Closure\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/opis/closure/src',
+        ),
         'Monolog\\' => 
         array (
             0 => __DIR__ . '/..' . '/monolog/monolog/src/Monolog',
@@ -247,6 +260,14 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         array (
             0 => __DIR__ . '/..' . '/laravel/tinker/src',
         ),
+        'JakubOnderka\\PhpConsoleHighlighter\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/jakub-onderka/php-console-highlighter/src',
+        ),
+        'JakubOnderka\\PhpConsoleColor\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/jakub-onderka/php-console-color/src',
+        ),
         'Illuminate\\' => 
         array (
             0 => __DIR__ . '/..' . '/laravel/framework/src/Illuminate',
@@ -293,7 +314,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         ),
         'Cron\\' => 
         array (
-            0 => __DIR__ . '/..' . '/mtdowling/cron-expression/src/Cron',
+            0 => __DIR__ . '/..' . '/dragonmantank/cron-expression/src/Cron',
         ),
         'Collective\\Html\\' => 
         array (
@@ -328,17 +349,6 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
                 0 => __DIR__ . '/..' . '/mockery/mockery/library',
             ),
         ),
-        'J' => 
-        array (
-            'JakubOnderka\\PhpConsoleHighlighter' => 
-            array (
-                0 => __DIR__ . '/..' . '/jakub-onderka/php-console-highlighter/src',
-            ),
-            'JakubOnderka\\PhpConsoleColor' => 
-            array (
-                0 => __DIR__ . '/..' . '/jakub-onderka/php-console-color/src',
-            ),
-        ),
         'D' => 
         array (
             'Doctrine\\Common\\Lexer\\' => 
@@ -356,10 +366,13 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'App\\Http\\Controllers\\Auth\\RegisterController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/RegisterController.php',
         'App\\Http\\Controllers\\Auth\\ResetPasswordController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/ResetPasswordController.php',
         'App\\Http\\Controllers\\Controller' => __DIR__ . '/../..' . '/app/Http/Controllers/Controller.php',
+        'App\\Http\\Controllers\\HomeController' => __DIR__ . '/../..' . '/app/Http/Controllers/HomeController.php',
         'App\\Http\\Controllers\\ItemController' => __DIR__ . '/../..' . '/app/Http/Controllers/ItemController.php',
         'App\\Http\\Controllers\\SettingsController' => __DIR__ . '/../..' . '/app/Http/Controllers/SettingsController.php',
         'App\\Http\\Controllers\\TagController' => __DIR__ . '/../..' . '/app/Http/Controllers/TagController.php',
+        'App\\Http\\Controllers\\UserController' => __DIR__ . '/../..' . '/app/Http/Controllers/UserController.php',
         'App\\Http\\Kernel' => __DIR__ . '/../..' . '/app/Http/Kernel.php',
+        'App\\Http\\Middleware\\CheckAllowed' => __DIR__ . '/../..' . '/app/Http/Middleware/CheckAllowed.php',
         'App\\Http\\Middleware\\EncryptCookies' => __DIR__ . '/../..' . '/app/Http/Middleware/EncryptCookies.php',
         'App\\Http\\Middleware\\RedirectIfAuthenticated' => __DIR__ . '/../..' . '/app/Http/Middleware/RedirectIfAuthenticated.php',
         'App\\Http\\Middleware\\TrimStrings' => __DIR__ . '/../..' . '/app/Http/Middleware/TrimStrings.php',
@@ -373,7 +386,11 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'App\\Providers\\RouteServiceProvider' => __DIR__ . '/../..' . '/app/Providers/RouteServiceProvider.php',
         'App\\Setting' => __DIR__ . '/../..' . '/app/Setting.php',
         'App\\SettingGroup' => __DIR__ . '/../..' . '/app/SettingGroup.php',
+        'App\\SettingUser' => __DIR__ . '/../..' . '/app/SettingUser.php',
         'App\\SupportedApps\\AirSonic' => __DIR__ . '/../..' . '/app/SupportedApps/AirSonic.php',
+        'App\\SupportedApps\\Bazarr' => __DIR__ . '/../..' . '/app/SupportedApps/Bazarr.php',
+        'App\\SupportedApps\\Bitwarden' => __DIR__ . '/../..' . '/app/SupportedApps/Bitwarden.php',
+        'App\\SupportedApps\\BookStack' => __DIR__ . '/../..' . '/app/SupportedApps/BookStack.php',
         'App\\SupportedApps\\Booksonic' => __DIR__ . '/../..' . '/app/SupportedApps/Booksonic.php',
         'App\\SupportedApps\\Cardigann' => __DIR__ . '/../..' . '/app/SupportedApps/Cardigann.php',
         'App\\SupportedApps\\Contracts\\Applications' => __DIR__ . '/../..' . '/app/SupportedApps/Contracts/Applications.php',
@@ -384,6 +401,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'App\\SupportedApps\\Duplicati' => __DIR__ . '/../..' . '/app/SupportedApps/Duplicati.php',
         'App\\SupportedApps\\Emby' => __DIR__ . '/../..' . '/app/SupportedApps/Emby.php',
         'App\\SupportedApps\\Flood' => __DIR__ . '/../..' . '/app/SupportedApps/Flood.php',
+        'App\\SupportedApps\\FreshRSS' => __DIR__ . '/../..' . '/app/SupportedApps/FreshRSS.php',
         'App\\SupportedApps\\Gitea' => __DIR__ . '/../..' . '/app/SupportedApps/Gitea.php',
         'App\\SupportedApps\\Glances' => __DIR__ . '/../..' . '/app/SupportedApps/Glances.php',
         'App\\SupportedApps\\Grafana' => __DIR__ . '/../..' . '/app/SupportedApps/Grafana.php',
@@ -394,8 +412,10 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'App\\SupportedApps\\Jdownloader' => __DIR__ . '/../..' . '/app/SupportedApps/Jdownloader.php',
         'App\\SupportedApps\\Krusader' => __DIR__ . '/../..' . '/app/SupportedApps/Krusader.php',
         'App\\SupportedApps\\Lidarr' => __DIR__ . '/../..' . '/app/SupportedApps/Lidarr.php',
+        'App\\SupportedApps\\Mailcow' => __DIR__ . '/../..' . '/app/SupportedApps/Mailcow.php',
         'App\\SupportedApps\\Mcmyadmin' => __DIR__ . '/../..' . '/app/SupportedApps/Mcmyadmin.php',
         'App\\SupportedApps\\Medusa' => __DIR__ . '/../..' . '/app/SupportedApps/Medusa.php',
+        'App\\SupportedApps\\Monica' => __DIR__ . '/../..' . '/app/SupportedApps/Monica.php',
         'App\\SupportedApps\\MusicBrainz' => __DIR__ . '/../..' . '/app/SupportedApps/MusicBrainz.php',
         'App\\SupportedApps\\Mylar' => __DIR__ . '/../..' . '/app/SupportedApps/Mylar.php',
         'App\\SupportedApps\\Netdata' => __DIR__ . '/../..' . '/app/SupportedApps/Netdata.php',
@@ -421,23 +441,25 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'App\\SupportedApps\\Sickrage' => __DIR__ . '/../..' . '/app/SupportedApps/Sickrage.php',
         'App\\SupportedApps\\Sonarr' => __DIR__ . '/../..' . '/app/SupportedApps/Sonarr.php',
         'App\\SupportedApps\\Syncthing' => __DIR__ . '/../..' . '/app/SupportedApps/Syncthing.php',
+        'App\\SupportedApps\\TVheadend' => __DIR__ . '/../..' . '/app/SupportedApps/TVheadend.php',
         'App\\SupportedApps\\Tautulli' => __DIR__ . '/../..' . '/app/SupportedApps/Tautulli.php',
         'App\\SupportedApps\\Traefik' => __DIR__ . '/../..' . '/app/SupportedApps/Traefik.php',
         'App\\SupportedApps\\Transmission' => __DIR__ . '/../..' . '/app/SupportedApps/Transmission.php',
         'App\\SupportedApps\\Ttrss' => __DIR__ . '/../..' . '/app/SupportedApps/Ttrss.php',
         'App\\SupportedApps\\Unifi' => __DIR__ . '/../..' . '/app/SupportedApps/Unifi.php',
         'App\\SupportedApps\\Unraid' => __DIR__ . '/../..' . '/app/SupportedApps/Unraid.php',
+        'App\\SupportedApps\\Virtualmin' => __DIR__ . '/../..' . '/app/SupportedApps/Virtualmin.php',
         'App\\SupportedApps\\Watcher3' => __DIR__ . '/../..' . '/app/SupportedApps/Watcher3.php',
         'App\\SupportedApps\\WebTools' => __DIR__ . '/../..' . '/app/SupportedApps/WebTools.php',
+        'App\\SupportedApps\\Webmin' => __DIR__ . '/../..' . '/app/SupportedApps/Webmin.php',
         'App\\SupportedApps\\pyLoad' => __DIR__ . '/../..' . '/app/SupportedApps/pyLoad.php',
         'App\\SupportedApps\\ruTorrent' => __DIR__ . '/../..' . '/app/SupportedApps/ruTorrent.php',
         'App\\User' => __DIR__ . '/../..' . '/app/User.php',
-        'ArithmeticError' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/ArithmeticError.php',
-        'AssertionError' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/AssertionError.php',
         'Carbon\\Carbon' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/Carbon.php',
         'Carbon\\CarbonInterval' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/CarbonInterval.php',
         'Carbon\\CarbonPeriod' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/CarbonPeriod.php',
         'Carbon\\Exceptions\\InvalidDateException' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/Exceptions/InvalidDateException.php',
+        'Carbon\\Laravel\\ServiceProvider' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/Laravel/ServiceProvider.php',
         'Carbon\\Translator' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/Translator.php',
         'Collective\\Html\\Componentable' => __DIR__ . '/..' . '/laravelcollective/html/src/Componentable.php',
         'Collective\\Html\\Eloquent\\FormAccessible' => __DIR__ . '/..' . '/laravelcollective/html/src/Eloquent/FormAccessible.php',
@@ -446,16 +468,15 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Collective\\Html\\HtmlBuilder' => __DIR__ . '/..' . '/laravelcollective/html/src/HtmlBuilder.php',
         'Collective\\Html\\HtmlFacade' => __DIR__ . '/..' . '/laravelcollective/html/src/HtmlFacade.php',
         'Collective\\Html\\HtmlServiceProvider' => __DIR__ . '/..' . '/laravelcollective/html/src/HtmlServiceProvider.php',
-        'Cron\\AbstractField' => __DIR__ . '/..' . '/mtdowling/cron-expression/src/Cron/AbstractField.php',
-        'Cron\\CronExpression' => __DIR__ . '/..' . '/mtdowling/cron-expression/src/Cron/CronExpression.php',
-        'Cron\\DayOfMonthField' => __DIR__ . '/..' . '/mtdowling/cron-expression/src/Cron/DayOfMonthField.php',
-        'Cron\\DayOfWeekField' => __DIR__ . '/..' . '/mtdowling/cron-expression/src/Cron/DayOfWeekField.php',
-        'Cron\\FieldFactory' => __DIR__ . '/..' . '/mtdowling/cron-expression/src/Cron/FieldFactory.php',
-        'Cron\\FieldInterface' => __DIR__ . '/..' . '/mtdowling/cron-expression/src/Cron/FieldInterface.php',
-        'Cron\\HoursField' => __DIR__ . '/..' . '/mtdowling/cron-expression/src/Cron/HoursField.php',
-        'Cron\\MinutesField' => __DIR__ . '/..' . '/mtdowling/cron-expression/src/Cron/MinutesField.php',
-        'Cron\\MonthField' => __DIR__ . '/..' . '/mtdowling/cron-expression/src/Cron/MonthField.php',
-        'Cron\\YearField' => __DIR__ . '/..' . '/mtdowling/cron-expression/src/Cron/YearField.php',
+        'Cron\\AbstractField' => __DIR__ . '/..' . '/dragonmantank/cron-expression/src/Cron/AbstractField.php',
+        'Cron\\CronExpression' => __DIR__ . '/..' . '/dragonmantank/cron-expression/src/Cron/CronExpression.php',
+        'Cron\\DayOfMonthField' => __DIR__ . '/..' . '/dragonmantank/cron-expression/src/Cron/DayOfMonthField.php',
+        'Cron\\DayOfWeekField' => __DIR__ . '/..' . '/dragonmantank/cron-expression/src/Cron/DayOfWeekField.php',
+        'Cron\\FieldFactory' => __DIR__ . '/..' . '/dragonmantank/cron-expression/src/Cron/FieldFactory.php',
+        'Cron\\FieldInterface' => __DIR__ . '/..' . '/dragonmantank/cron-expression/src/Cron/FieldInterface.php',
+        'Cron\\HoursField' => __DIR__ . '/..' . '/dragonmantank/cron-expression/src/Cron/HoursField.php',
+        'Cron\\MinutesField' => __DIR__ . '/..' . '/dragonmantank/cron-expression/src/Cron/MinutesField.php',
+        'Cron\\MonthField' => __DIR__ . '/..' . '/dragonmantank/cron-expression/src/Cron/MonthField.php',
         'DatabaseSeeder' => __DIR__ . '/../..' . '/database/seeds/DatabaseSeeder.php',
         'DeepCopy\\DeepCopy' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/DeepCopy.php',
         'DeepCopy\\Exception\\CloneException' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/Exception/CloneException.php',
@@ -480,7 +501,6 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'DeepCopy\\TypeFilter\\Spl\\SplDoublyLinkedListFilter' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/TypeFilter/Spl/SplDoublyLinkedListFilter.php',
         'DeepCopy\\TypeFilter\\TypeFilter' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/TypeFilter/TypeFilter.php',
         'DeepCopy\\TypeMatcher\\TypeMatcher' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/TypeMatcher/TypeMatcher.php',
-        'DivisionByZeroError' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/DivisionByZeroError.php',
         'Doctrine\\Common\\Inflector\\Inflector' => __DIR__ . '/..' . '/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php',
         'Doctrine\\Common\\Lexer\\AbstractLexer' => __DIR__ . '/..' . '/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php',
         'Doctrine\\Instantiator\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/doctrine/instantiator/src/Doctrine/Instantiator/Exception/ExceptionInterface.php',
@@ -559,10 +579,10 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Egulias\\EmailValidator\\Warning\\QuotedString' => __DIR__ . '/..' . '/egulias/email-validator/EmailValidator/Warning/QuotedString.php',
         'Egulias\\EmailValidator\\Warning\\TLD' => __DIR__ . '/..' . '/egulias/email-validator/EmailValidator/Warning/TLD.php',
         'Egulias\\EmailValidator\\Warning\\Warning' => __DIR__ . '/..' . '/egulias/email-validator/EmailValidator/Warning/Warning.php',
-        'Error' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/Error.php',
         'Faker\\Calculator\\Iban' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Calculator/Iban.php',
         'Faker\\Calculator\\Inn' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Calculator/Inn.php',
         'Faker\\Calculator\\Luhn' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Calculator/Luhn.php',
+        'Faker\\Calculator\\TCNo' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Calculator/TCNo.php',
         'Faker\\DefaultGenerator' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/DefaultGenerator.php',
         'Faker\\Documentor' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Documentor.php',
         'Faker\\Factory' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Factory.php',
@@ -867,6 +887,12 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Faker\\Provider\\me_ME\\PhoneNumber' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/me_ME/PhoneNumber.php',
         'Faker\\Provider\\mn_MN\\Person' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/mn_MN/Person.php',
         'Faker\\Provider\\mn_MN\\PhoneNumber' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/mn_MN/PhoneNumber.php',
+        'Faker\\Provider\\ms_MY\\Address' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ms_MY/Address.php',
+        'Faker\\Provider\\ms_MY\\Company' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ms_MY/Company.php',
+        'Faker\\Provider\\ms_MY\\Miscellaneous' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ms_MY/Miscellaneous.php',
+        'Faker\\Provider\\ms_MY\\Payment' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ms_MY/Payment.php',
+        'Faker\\Provider\\ms_MY\\Person' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ms_MY/Person.php',
+        'Faker\\Provider\\ms_MY\\PhoneNumber' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ms_MY/PhoneNumber.php',
         'Faker\\Provider\\nb_NO\\Address' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/nb_NO/Address.php',
         'Faker\\Provider\\nb_NO\\Company' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/nb_NO/Company.php',
         'Faker\\Provider\\nb_NO\\Payment' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/nb_NO/Payment.php',
@@ -932,6 +958,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Faker\\Provider\\sk_SK\\Person' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/sk_SK/Person.php',
         'Faker\\Provider\\sk_SK\\PhoneNumber' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/sk_SK/PhoneNumber.php',
         'Faker\\Provider\\sl_SI\\Address' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/sl_SI/Address.php',
+        'Faker\\Provider\\sl_SI\\Company' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/sl_SI/Company.php',
         'Faker\\Provider\\sl_SI\\Internet' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/sl_SI/Internet.php',
         'Faker\\Provider\\sl_SI\\Payment' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/sl_SI/Payment.php',
         'Faker\\Provider\\sl_SI\\Person' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/sl_SI/Person.php',
@@ -951,12 +978,14 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Faker\\Provider\\sv_SE\\Person' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/sv_SE/Person.php',
         'Faker\\Provider\\sv_SE\\PhoneNumber' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/sv_SE/PhoneNumber.php',
         'Faker\\Provider\\th_TH\\Address' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/th_TH/Address.php',
+        'Faker\\Provider\\th_TH\\Color' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/th_TH/Color.php',
         'Faker\\Provider\\th_TH\\Company' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/th_TH/Company.php',
         'Faker\\Provider\\th_TH\\Internet' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/th_TH/Internet.php',
         'Faker\\Provider\\th_TH\\Payment' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/th_TH/Payment.php',
         'Faker\\Provider\\th_TH\\PhoneNumber' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/th_TH/PhoneNumber.php',
         'Faker\\Provider\\tr_TR\\Address' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/tr_TR/Address.php',
         'Faker\\Provider\\tr_TR\\Color' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/tr_TR/Color.php',
+        'Faker\\Provider\\tr_TR\\Company' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/tr_TR/Company.php',
         'Faker\\Provider\\tr_TR\\DateTime' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/tr_TR/DateTime.php',
         'Faker\\Provider\\tr_TR\\Internet' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/tr_TR/Internet.php',
         'Faker\\Provider\\tr_TR\\Payment' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/tr_TR/Payment.php',
@@ -966,10 +995,10 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Faker\\Provider\\uk_UA\\Color' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/uk_UA/Color.php',
         'Faker\\Provider\\uk_UA\\Company' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/uk_UA/Company.php',
         'Faker\\Provider\\uk_UA\\Internet' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/uk_UA/Internet.php',
+        'Faker\\Provider\\uk_UA\\Payment' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/uk_UA/Payment.php',
         'Faker\\Provider\\uk_UA\\Person' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/uk_UA/Person.php',
         'Faker\\Provider\\uk_UA\\PhoneNumber' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/uk_UA/PhoneNumber.php',
         'Faker\\Provider\\uk_UA\\Text' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/uk_UA/Text.php',
-        'Faker\\Provider\\uk_Ua\\Payment' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/uk_UA/Payment.php',
         'Faker\\Provider\\vi_VN\\Address' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/vi_VN/Address.php',
         'Faker\\Provider\\vi_VN\\Color' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/vi_VN/Color.php',
         'Faker\\Provider\\vi_VN\\Internet' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/vi_VN/Internet.php',
@@ -1156,12 +1185,17 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Auth\\Events\\Logout' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Events/Logout.php',
         'Illuminate\\Auth\\Events\\PasswordReset' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Events/PasswordReset.php',
         'Illuminate\\Auth\\Events\\Registered' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Events/Registered.php',
+        'Illuminate\\Auth\\Events\\Verified' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Events/Verified.php',
         'Illuminate\\Auth\\GenericUser' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/GenericUser.php',
         'Illuminate\\Auth\\GuardHelpers' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/GuardHelpers.php',
+        'Illuminate\\Auth\\Listeners\\SendEmailVerificationNotification' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Listeners/SendEmailVerificationNotification.php',
         'Illuminate\\Auth\\Middleware\\Authenticate' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Middleware/Authenticate.php',
         'Illuminate\\Auth\\Middleware\\AuthenticateWithBasicAuth' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Middleware/AuthenticateWithBasicAuth.php',
         'Illuminate\\Auth\\Middleware\\Authorize' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Middleware/Authorize.php',
+        'Illuminate\\Auth\\Middleware\\EnsureEmailIsVerified' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Middleware/EnsureEmailIsVerified.php',
+        'Illuminate\\Auth\\MustVerifyEmail' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/MustVerifyEmail.php',
         'Illuminate\\Auth\\Notifications\\ResetPassword' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Notifications/ResetPassword.php',
+        'Illuminate\\Auth\\Notifications\\VerifyEmail' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Notifications/VerifyEmail.php',
         'Illuminate\\Auth\\Passwords\\CanResetPassword' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Passwords/CanResetPassword.php',
         'Illuminate\\Auth\\Passwords\\DatabaseTokenRepository' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Passwords/DatabaseTokenRepository.php',
         'Illuminate\\Auth\\Passwords\\PasswordBroker' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBroker.php',
@@ -1230,15 +1264,17 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Console\\GeneratorCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/GeneratorCommand.php',
         'Illuminate\\Console\\OutputStyle' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/OutputStyle.php',
         'Illuminate\\Console\\Parser' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/Parser.php',
-        'Illuminate\\Console\\Scheduling\\CacheMutex' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/Scheduling/CacheMutex.php',
+        'Illuminate\\Console\\Scheduling\\CacheEventMutex' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/Scheduling/CacheEventMutex.php',
+        'Illuminate\\Console\\Scheduling\\CacheSchedulingMutex' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/Scheduling/CacheSchedulingMutex.php',
         'Illuminate\\Console\\Scheduling\\CallbackEvent' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/Scheduling/CallbackEvent.php',
         'Illuminate\\Console\\Scheduling\\CommandBuilder' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/Scheduling/CommandBuilder.php',
         'Illuminate\\Console\\Scheduling\\Event' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/Scheduling/Event.php',
+        'Illuminate\\Console\\Scheduling\\EventMutex' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/Scheduling/EventMutex.php',
         'Illuminate\\Console\\Scheduling\\ManagesFrequencies' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/Scheduling/ManagesFrequencies.php',
-        'Illuminate\\Console\\Scheduling\\Mutex' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/Scheduling/Mutex.php',
         'Illuminate\\Console\\Scheduling\\Schedule' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/Scheduling/Schedule.php',
         'Illuminate\\Console\\Scheduling\\ScheduleFinishCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/Scheduling/ScheduleFinishCommand.php',
         'Illuminate\\Console\\Scheduling\\ScheduleRunCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/Scheduling/ScheduleRunCommand.php',
+        'Illuminate\\Console\\Scheduling\\SchedulingMutex' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Console/Scheduling/SchedulingMutex.php',
         'Illuminate\\Container\\BoundMethod' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Container/BoundMethod.php',
         'Illuminate\\Container\\Container' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Container/Container.php',
         'Illuminate\\Container\\ContextualBindingBuilder' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Container/ContextualBindingBuilder.php',
@@ -1249,6 +1285,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Contracts\\Auth\\CanResetPassword' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Auth/CanResetPassword.php',
         'Illuminate\\Contracts\\Auth\\Factory' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Auth/Factory.php',
         'Illuminate\\Contracts\\Auth\\Guard' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Auth/Guard.php',
+        'Illuminate\\Contracts\\Auth\\MustVerifyEmail' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Auth/MustVerifyEmail.php',
         'Illuminate\\Contracts\\Auth\\PasswordBroker' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Auth/PasswordBroker.php',
         'Illuminate\\Contracts\\Auth\\PasswordBrokerFactory' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Auth/PasswordBrokerFactory.php',
         'Illuminate\\Contracts\\Auth\\StatefulGuard' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Auth/StatefulGuard.php',
@@ -1282,12 +1319,12 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Contracts\\Events\\Dispatcher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Events/Dispatcher.php',
         'Illuminate\\Contracts\\Filesystem\\Cloud' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Filesystem/Cloud.php',
         'Illuminate\\Contracts\\Filesystem\\Factory' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Filesystem/Factory.php',
+        'Illuminate\\Contracts\\Filesystem\\FileExistsException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Filesystem/FileExistsException.php',
         'Illuminate\\Contracts\\Filesystem\\FileNotFoundException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Filesystem/FileNotFoundException.php',
         'Illuminate\\Contracts\\Filesystem\\Filesystem' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Filesystem/Filesystem.php',
         'Illuminate\\Contracts\\Foundation\\Application' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Foundation/Application.php',
         'Illuminate\\Contracts\\Hashing\\Hasher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Hashing/Hasher.php',
         'Illuminate\\Contracts\\Http\\Kernel' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Http/Kernel.php',
-        'Illuminate\\Contracts\\Logging\\Log' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Logging/Log.php',
         'Illuminate\\Contracts\\Mail\\MailQueue' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Mail/MailQueue.php',
         'Illuminate\\Contracts\\Mail\\Mailable' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Mail/Mailable.php',
         'Illuminate\\Contracts\\Mail\\Mailer' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Mail/Mailer.php',
@@ -1306,6 +1343,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Contracts\\Queue\\QueueableCollection' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Queue/QueueableCollection.php',
         'Illuminate\\Contracts\\Queue\\QueueableEntity' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Queue/QueueableEntity.php',
         'Illuminate\\Contracts\\Queue\\ShouldQueue' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Queue/ShouldQueue.php',
+        'Illuminate\\Contracts\\Redis\\Connection' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Redis/Connection.php',
         'Illuminate\\Contracts\\Redis\\Factory' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Redis/Factory.php',
         'Illuminate\\Contracts\\Redis\\LimiterTimeoutException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Redis/LimiterTimeoutException.php',
         'Illuminate\\Contracts\\Routing\\BindingRegistrar' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Routing/BindingRegistrar.php',
@@ -1321,6 +1359,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Contracts\\Support\\MessageProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Support/MessageProvider.php',
         'Illuminate\\Contracts\\Support\\Renderable' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Support/Renderable.php',
         'Illuminate\\Contracts\\Support\\Responsable' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Support/Responsable.php',
+        'Illuminate\\Contracts\\Translation\\HasLocalePreference' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Translation/HasLocalePreference.php',
         'Illuminate\\Contracts\\Translation\\Loader' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Translation/Loader.php',
         'Illuminate\\Contracts\\Translation\\Translator' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Translation/Translator.php',
         'Illuminate\\Contracts\\Validation\\Factory' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Contracts/Validation/Factory.php',
@@ -1359,6 +1398,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Database\\Console\\Migrations\\ResetCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Console/Migrations/ResetCommand.php',
         'Illuminate\\Database\\Console\\Migrations\\RollbackCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Console/Migrations/RollbackCommand.php',
         'Illuminate\\Database\\Console\\Migrations\\StatusCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Console/Migrations/StatusCommand.php',
+        'Illuminate\\Database\\Console\\Migrations\\TableGuesser' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Console/Migrations/TableGuesser.php',
         'Illuminate\\Database\\Console\\Seeds\\SeedCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Console/Seeds/SeedCommand.php',
         'Illuminate\\Database\\Console\\Seeds\\SeederMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php',
         'Illuminate\\Database\\DatabaseManager' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/DatabaseManager.php',
@@ -1385,6 +1425,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Database\\Eloquent\\RelationNotFoundException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/RelationNotFoundException.php',
         'Illuminate\\Database\\Eloquent\\Relations\\BelongsTo' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php',
         'Illuminate\\Database\\Eloquent\\Relations\\BelongsToMany' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php',
+        'Illuminate\\Database\\Eloquent\\Relations\\Concerns\\AsPivot' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Concerns/AsPivot.php',
         'Illuminate\\Database\\Eloquent\\Relations\\Concerns\\InteractsWithPivotTable' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Concerns/InteractsWithPivotTable.php',
         'Illuminate\\Database\\Eloquent\\Relations\\Concerns\\SupportsDefaultModels' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Concerns/SupportsDefaultModels.php',
         'Illuminate\\Database\\Eloquent\\Relations\\HasMany' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasMany.php',
@@ -1435,6 +1476,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Database\\SQLiteConnection' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/SQLiteConnection.php',
         'Illuminate\\Database\\Schema\\Blueprint' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Schema/Blueprint.php',
         'Illuminate\\Database\\Schema\\Builder' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Schema/Builder.php',
+        'Illuminate\\Database\\Schema\\ColumnDefinition' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Schema/ColumnDefinition.php',
         'Illuminate\\Database\\Schema\\Grammars\\ChangeColumn' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Schema/Grammars/ChangeColumn.php',
         'Illuminate\\Database\\Schema\\Grammars\\Grammar' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Schema/Grammars/Grammar.php',
         'Illuminate\\Database\\Schema\\Grammars\\MySqlGrammar' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php',
@@ -1469,6 +1511,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Foundation\\Auth\\SendsPasswordResetEmails' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Auth/SendsPasswordResetEmails.php',
         'Illuminate\\Foundation\\Auth\\ThrottlesLogins' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Auth/ThrottlesLogins.php',
         'Illuminate\\Foundation\\Auth\\User' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Auth/User.php',
+        'Illuminate\\Foundation\\Auth\\VerifiesEmails' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Auth/VerifiesEmails.php',
         'Illuminate\\Foundation\\Bootstrap\\BootProviders' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Bootstrap/BootProviders.php',
         'Illuminate\\Foundation\\Bootstrap\\HandleExceptions' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Bootstrap/HandleExceptions.php',
         'Illuminate\\Foundation\\Bootstrap\\LoadConfiguration' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php',
@@ -1482,6 +1525,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Foundation\\Bus\\PendingDispatch' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Bus/PendingDispatch.php',
         'Illuminate\\Foundation\\ComposerScripts' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/ComposerScripts.php',
         'Illuminate\\Foundation\\Console\\AppNameCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/AppNameCommand.php',
+        'Illuminate\\Foundation\\Console\\ChannelMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/ChannelMakeCommand.php',
         'Illuminate\\Foundation\\Console\\ClearCompiledCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/ClearCompiledCommand.php',
         'Illuminate\\Foundation\\Console\\ClosureCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/ClosureCommand.php',
         'Illuminate\\Foundation\\Console\\ConfigCacheCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/ConfigCacheCommand.php',
@@ -1499,6 +1543,8 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Foundation\\Console\\MailMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/MailMakeCommand.php',
         'Illuminate\\Foundation\\Console\\ModelMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/ModelMakeCommand.php',
         'Illuminate\\Foundation\\Console\\NotificationMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/NotificationMakeCommand.php',
+        'Illuminate\\Foundation\\Console\\ObserverMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/ObserverMakeCommand.php',
+        'Illuminate\\Foundation\\Console\\OptimizeClearCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/OptimizeClearCommand.php',
         'Illuminate\\Foundation\\Console\\OptimizeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/OptimizeCommand.php',
         'Illuminate\\Foundation\\Console\\PackageDiscoverCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/PackageDiscoverCommand.php',
         'Illuminate\\Foundation\\Console\\PolicyMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/PolicyMakeCommand.php',
@@ -1521,11 +1567,13 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Foundation\\Console\\TestMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/TestMakeCommand.php',
         'Illuminate\\Foundation\\Console\\UpCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/UpCommand.php',
         'Illuminate\\Foundation\\Console\\VendorPublishCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/VendorPublishCommand.php',
+        'Illuminate\\Foundation\\Console\\ViewCacheCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/ViewCacheCommand.php',
         'Illuminate\\Foundation\\Console\\ViewClearCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/ViewClearCommand.php',
         'Illuminate\\Foundation\\EnvironmentDetector' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/EnvironmentDetector.php',
         'Illuminate\\Foundation\\Events\\Dispatchable' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Events/Dispatchable.php',
         'Illuminate\\Foundation\\Events\\LocaleUpdated' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Events/LocaleUpdated.php',
         'Illuminate\\Foundation\\Exceptions\\Handler' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Exceptions/Handler.php',
+        'Illuminate\\Foundation\\Exceptions\\WhoopsHandler' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Exceptions/WhoopsHandler.php',
         'Illuminate\\Foundation\\Http\\Events\\RequestHandled' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Http/Events/RequestHandled.php',
         'Illuminate\\Foundation\\Http\\Exceptions\\MaintenanceModeException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Http/Exceptions/MaintenanceModeException.php',
         'Illuminate\\Foundation\\Http\\FormRequest' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Http/FormRequest.php',
@@ -1557,10 +1605,12 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Foundation\\Testing\\Concerns\\MakesHttpRequests' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php',
         'Illuminate\\Foundation\\Testing\\Concerns\\MocksApplicationServices' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/MocksApplicationServices.php',
         'Illuminate\\Foundation\\Testing\\Constraints\\HasInDatabase' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/Constraints/HasInDatabase.php',
+        'Illuminate\\Foundation\\Testing\\Constraints\\SeeInOrder' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/Constraints/SeeInOrder.php',
         'Illuminate\\Foundation\\Testing\\Constraints\\SoftDeletedInDatabase' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/Constraints/SoftDeletedInDatabase.php',
         'Illuminate\\Foundation\\Testing\\DatabaseMigrations' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/DatabaseMigrations.php',
         'Illuminate\\Foundation\\Testing\\DatabaseTransactions' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/DatabaseTransactions.php',
         'Illuminate\\Foundation\\Testing\\HttpException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/HttpException.php',
+        'Illuminate\\Foundation\\Testing\\PendingCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/PendingCommand.php',
         'Illuminate\\Foundation\\Testing\\RefreshDatabase' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/RefreshDatabase.php',
         'Illuminate\\Foundation\\Testing\\RefreshDatabaseState' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/RefreshDatabaseState.php',
         'Illuminate\\Foundation\\Testing\\TestCase' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/TestCase.php',
@@ -1569,24 +1619,31 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Foundation\\Testing\\WithoutEvents' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/WithoutEvents.php',
         'Illuminate\\Foundation\\Testing\\WithoutMiddleware' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/WithoutMiddleware.php',
         'Illuminate\\Foundation\\Validation\\ValidatesRequests' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php',
+        'Illuminate\\Hashing\\AbstractHasher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Hashing/AbstractHasher.php',
+        'Illuminate\\Hashing\\Argon2IdHasher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Hashing/Argon2IdHasher.php',
+        'Illuminate\\Hashing\\ArgonHasher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Hashing/ArgonHasher.php',
         'Illuminate\\Hashing\\BcryptHasher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php',
+        'Illuminate\\Hashing\\HashManager' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Hashing/HashManager.php',
         'Illuminate\\Hashing\\HashServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Hashing/HashServiceProvider.php',
         'Illuminate\\Http\\Concerns\\InteractsWithContentTypes' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Concerns/InteractsWithContentTypes.php',
         'Illuminate\\Http\\Concerns\\InteractsWithFlashData' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Concerns/InteractsWithFlashData.php',
         'Illuminate\\Http\\Concerns\\InteractsWithInput' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Concerns/InteractsWithInput.php',
         'Illuminate\\Http\\Exceptions\\HttpResponseException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Exceptions/HttpResponseException.php',
         'Illuminate\\Http\\Exceptions\\PostTooLargeException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Exceptions/PostTooLargeException.php',
+        'Illuminate\\Http\\Exceptions\\ThrottleRequestsException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Exceptions/ThrottleRequestsException.php',
         'Illuminate\\Http\\File' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/File.php',
         'Illuminate\\Http\\FileHelpers' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/FileHelpers.php',
         'Illuminate\\Http\\JsonResponse' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/JsonResponse.php',
         'Illuminate\\Http\\Middleware\\CheckResponseForModifications' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Middleware/CheckResponseForModifications.php',
         'Illuminate\\Http\\Middleware\\FrameGuard' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Middleware/FrameGuard.php',
+        'Illuminate\\Http\\Middleware\\SetCacheHeaders' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Middleware/SetCacheHeaders.php',
         'Illuminate\\Http\\RedirectResponse' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/RedirectResponse.php',
         'Illuminate\\Http\\Request' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Request.php',
         'Illuminate\\Http\\Resources\\CollectsResources' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Resources/CollectsResources.php',
         'Illuminate\\Http\\Resources\\ConditionallyLoadsAttributes' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Resources/ConditionallyLoadsAttributes.php',
         'Illuminate\\Http\\Resources\\DelegatesToResource' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Resources/DelegatesToResource.php',
         'Illuminate\\Http\\Resources\\Json\\AnonymousResourceCollection' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Resources/Json/AnonymousResourceCollection.php',
+        'Illuminate\\Http\\Resources\\Json\\JsonResource' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Resources/Json/JsonResource.php',
         'Illuminate\\Http\\Resources\\Json\\PaginatedResourceResponse' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Resources/Json/PaginatedResourceResponse.php',
         'Illuminate\\Http\\Resources\\Json\\Resource' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Resources/Json/Resource.php',
         'Illuminate\\Http\\Resources\\Json\\ResourceCollection' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Resources/Json/ResourceCollection.php',
@@ -1601,8 +1658,10 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Http\\Testing\\MimeType' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/Testing/MimeType.php',
         'Illuminate\\Http\\UploadedFile' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Http/UploadedFile.php',
         'Illuminate\\Log\\Events\\MessageLogged' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Log/Events/MessageLogged.php',
+        'Illuminate\\Log\\LogManager' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Log/LogManager.php',
         'Illuminate\\Log\\LogServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Log/LogServiceProvider.php',
-        'Illuminate\\Log\\Writer' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Log/Writer.php',
+        'Illuminate\\Log\\Logger' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Log/Logger.php',
+        'Illuminate\\Log\\ParsesLogConfiguration' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Log/ParsesLogConfiguration.php',
         'Illuminate\\Mail\\Events\\MessageSending' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Mail/Events/MessageSending.php',
         'Illuminate\\Mail\\Events\\MessageSent' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Mail/Events/MessageSent.php',
         'Illuminate\\Mail\\MailServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Mail/MailServiceProvider.php',
@@ -1659,6 +1718,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Pipeline\\Pipeline' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Pipeline/Pipeline.php',
         'Illuminate\\Pipeline\\PipelineServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Pipeline/PipelineServiceProvider.php',
         'Illuminate\\Queue\\BeanstalkdQueue' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/BeanstalkdQueue.php',
+        'Illuminate\\Queue\\CallQueuedClosure' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/CallQueuedClosure.php',
         'Illuminate\\Queue\\CallQueuedHandler' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/CallQueuedHandler.php',
         'Illuminate\\Queue\\Capsule\\Manager' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Capsule/Manager.php',
         'Illuminate\\Queue\\Connectors\\BeanstalkdConnector' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/Connectors/BeanstalkdConnector.php',
@@ -1708,6 +1768,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Queue\\QueueManager' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/QueueManager.php',
         'Illuminate\\Queue\\QueueServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/QueueServiceProvider.php',
         'Illuminate\\Queue\\RedisQueue' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/RedisQueue.php',
+        'Illuminate\\Queue\\SerializableClosure' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/SerializableClosure.php',
         'Illuminate\\Queue\\SerializesAndRestoresModelIdentifiers' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/SerializesAndRestoresModelIdentifiers.php',
         'Illuminate\\Queue\\SerializesModels' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/SerializesModels.php',
         'Illuminate\\Queue\\SqsQueue' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Queue/SqsQueue.php',
@@ -1721,6 +1782,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Redis\\Connections\\PredisConnection' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Redis/Connections/PredisConnection.php',
         'Illuminate\\Redis\\Connectors\\PhpRedisConnector' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Redis/Connectors/PhpRedisConnector.php',
         'Illuminate\\Redis\\Connectors\\PredisConnector' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Redis/Connectors/PredisConnector.php',
+        'Illuminate\\Redis\\Events\\CommandExecuted' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Redis/Events/CommandExecuted.php',
         'Illuminate\\Redis\\Limiters\\ConcurrencyLimiter' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Redis/Limiters/ConcurrencyLimiter.php',
         'Illuminate\\Redis\\Limiters\\ConcurrencyLimiterBuilder' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Redis/Limiters/ConcurrencyLimiterBuilder.php',
         'Illuminate\\Redis\\Limiters\\DurationLimiter' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Redis/Limiters/DurationLimiter.php',
@@ -1734,6 +1796,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Routing\\ControllerDispatcher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/ControllerDispatcher.php',
         'Illuminate\\Routing\\ControllerMiddlewareOptions' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/ControllerMiddlewareOptions.php',
         'Illuminate\\Routing\\Events\\RouteMatched' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/Events/RouteMatched.php',
+        'Illuminate\\Routing\\Exceptions\\InvalidSignatureException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/Exceptions/InvalidSignatureException.php',
         'Illuminate\\Routing\\Exceptions\\UrlGenerationException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/Exceptions/UrlGenerationException.php',
         'Illuminate\\Routing\\ImplicitRouteBinding' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/ImplicitRouteBinding.php',
         'Illuminate\\Routing\\Matching\\HostValidator' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/Matching/HostValidator.php',
@@ -1745,6 +1808,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Routing\\Middleware\\SubstituteBindings' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/Middleware/SubstituteBindings.php',
         'Illuminate\\Routing\\Middleware\\ThrottleRequests' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/Middleware/ThrottleRequests.php',
         'Illuminate\\Routing\\Middleware\\ThrottleRequestsWithRedis' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/Middleware/ThrottleRequestsWithRedis.php',
+        'Illuminate\\Routing\\Middleware\\ValidateSignature' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/Middleware/ValidateSignature.php',
         'Illuminate\\Routing\\PendingResourceRegistration' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/PendingResourceRegistration.php',
         'Illuminate\\Routing\\Pipeline' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/Pipeline.php',
         'Illuminate\\Routing\\RedirectController' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Routing/RedirectController.php',
@@ -1786,8 +1850,6 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Support\\Carbon' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Carbon.php',
         'Illuminate\\Support\\Collection' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Collection.php',
         'Illuminate\\Support\\Composer' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Composer.php',
-        'Illuminate\\Support\\Debug\\Dumper' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Debug/Dumper.php',
-        'Illuminate\\Support\\Debug\\HtmlDumper' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Debug/HtmlDumper.php',
         'Illuminate\\Support\\Facades\\App' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/App.php',
         'Illuminate\\Support\\Facades\\Artisan' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Artisan.php',
         'Illuminate\\Support\\Facades\\Auth' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Facades/Auth.php',
@@ -1842,6 +1904,8 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Support\\Testing\\Fakes\\PendingMailFake' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Testing/Fakes/PendingMailFake.php',
         'Illuminate\\Support\\Testing\\Fakes\\QueueFake' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Testing/Fakes/QueueFake.php',
         'Illuminate\\Support\\Traits\\CapsuleManagerTrait' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Traits/CapsuleManagerTrait.php',
+        'Illuminate\\Support\\Traits\\ForwardsCalls' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Traits/ForwardsCalls.php',
+        'Illuminate\\Support\\Traits\\Localizable' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Traits/Localizable.php',
         'Illuminate\\Support\\Traits\\Macroable' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/Traits/Macroable.php',
         'Illuminate\\Support\\ViewErrorBag' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/ViewErrorBag.php',
         'Illuminate\\Translation\\ArrayLoader' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Translation/ArrayLoader.php',
@@ -1862,6 +1926,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\Validation\\Rules\\Exists' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Validation/Rules/Exists.php',
         'Illuminate\\Validation\\Rules\\In' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Validation/Rules/In.php',
         'Illuminate\\Validation\\Rules\\NotIn' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Validation/Rules/NotIn.php',
+        'Illuminate\\Validation\\Rules\\RequiredIf' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Validation/Rules/RequiredIf.php',
         'Illuminate\\Validation\\Rules\\Unique' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Validation/Rules/Unique.php',
         'Illuminate\\Validation\\UnauthorizedException' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Validation/UnauthorizedException.php',
         'Illuminate\\Validation\\ValidatesWhenResolvedTrait' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Validation/ValidatesWhenResolvedTrait.php',
@@ -1878,6 +1943,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\View\\Compilers\\Concerns\\CompilesComponents' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesComponents.php',
         'Illuminate\\View\\Compilers\\Concerns\\CompilesConditionals' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesConditionals.php',
         'Illuminate\\View\\Compilers\\Concerns\\CompilesEchos' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesEchos.php',
+        'Illuminate\\View\\Compilers\\Concerns\\CompilesHelpers' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesHelpers.php',
         'Illuminate\\View\\Compilers\\Concerns\\CompilesIncludes' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesIncludes.php',
         'Illuminate\\View\\Compilers\\Concerns\\CompilesInjections' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesInjections.php',
         'Illuminate\\View\\Compilers\\Concerns\\CompilesJson' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesJson.php',
@@ -1904,9 +1970,9 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Illuminate\\View\\ViewFinderInterface' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/ViewFinderInterface.php',
         'Illuminate\\View\\ViewName' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/ViewName.php',
         'Illuminate\\View\\ViewServiceProvider' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/View/ViewServiceProvider.php',
-        'JakubOnderka\\PhpConsoleColor\\ConsoleColor' => __DIR__ . '/..' . '/jakub-onderka/php-console-color/src/JakubOnderka/PhpConsoleColor/ConsoleColor.php',
-        'JakubOnderka\\PhpConsoleColor\\InvalidStyleException' => __DIR__ . '/..' . '/jakub-onderka/php-console-color/src/JakubOnderka/PhpConsoleColor/InvalidStyleException.php',
-        'JakubOnderka\\PhpConsoleHighlighter\\Highlighter' => __DIR__ . '/..' . '/jakub-onderka/php-console-highlighter/src/JakubOnderka/PhpConsoleHighlighter/Highlighter.php',
+        'JakubOnderka\\PhpConsoleColor\\ConsoleColor' => __DIR__ . '/..' . '/jakub-onderka/php-console-color/src/ConsoleColor.php',
+        'JakubOnderka\\PhpConsoleColor\\InvalidStyleException' => __DIR__ . '/..' . '/jakub-onderka/php-console-color/src/InvalidStyleException.php',
+        'JakubOnderka\\PhpConsoleHighlighter\\Highlighter' => __DIR__ . '/..' . '/jakub-onderka/php-console-highlighter/src/Highlighter.php',
         'JsonSerializable' => __DIR__ . '/..' . '/nesbot/carbon/src/JsonSerializable.php',
         'Laravel\\Tinker\\ClassAliasAutoloader' => __DIR__ . '/..' . '/laravel/tinker/src/ClassAliasAutoloader.php',
         'Laravel\\Tinker\\Console\\TinkerCommand' => __DIR__ . '/..' . '/laravel/tinker/src/Console/TinkerCommand.php',
@@ -1959,9 +2025,14 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'League\\Flysystem\\Util\\MimeType' => __DIR__ . '/..' . '/league/flysystem/src/Util/MimeType.php',
         'League\\Flysystem\\Util\\StreamHasher' => __DIR__ . '/..' . '/league/flysystem/src/Util/StreamHasher.php',
         'Mockery' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery.php',
+        'Mockery\\Adapter\\Phpunit\\Legacy\\TestListenerForV5' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Adapter/Phpunit/Legacy/TestListenerForV5.php',
+        'Mockery\\Adapter\\Phpunit\\Legacy\\TestListenerForV6' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Adapter/Phpunit/Legacy/TestListenerForV6.php',
+        'Mockery\\Adapter\\Phpunit\\Legacy\\TestListenerForV7' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Adapter/Phpunit/Legacy/TestListenerForV7.php',
+        'Mockery\\Adapter\\Phpunit\\Legacy\\TestListenerTrait' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Adapter/Phpunit/Legacy/TestListenerTrait.php',
         'Mockery\\Adapter\\Phpunit\\MockeryPHPUnitIntegration' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Adapter/Phpunit/MockeryPHPUnitIntegration.php',
         'Mockery\\Adapter\\Phpunit\\MockeryTestCase' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Adapter/Phpunit/MockeryTestCase.php',
         'Mockery\\Adapter\\Phpunit\\TestListener' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Adapter/Phpunit/TestListener.php',
+        'Mockery\\ClosureWrapper' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/ClosureWrapper.php',
         'Mockery\\CompositeExpectation' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/CompositeExpectation.php',
         'Mockery\\Configuration' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Configuration.php',
         'Mockery\\Container' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Container.php',
@@ -2125,6 +2196,16 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Monolog\\Processor\\UidProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/UidProcessor.php',
         'Monolog\\Processor\\WebProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/WebProcessor.php',
         'Monolog\\Registry' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Registry.php',
+        'Opis\\Closure\\Analyzer' => __DIR__ . '/..' . '/opis/closure/src/Analyzer.php',
+        'Opis\\Closure\\ClosureContext' => __DIR__ . '/..' . '/opis/closure/src/ClosureContext.php',
+        'Opis\\Closure\\ClosureScope' => __DIR__ . '/..' . '/opis/closure/src/ClosureScope.php',
+        'Opis\\Closure\\ClosureStream' => __DIR__ . '/..' . '/opis/closure/src/ClosureStream.php',
+        'Opis\\Closure\\ISecurityProvider' => __DIR__ . '/..' . '/opis/closure/src/ISecurityProvider.php',
+        'Opis\\Closure\\ReflectionClosure' => __DIR__ . '/..' . '/opis/closure/src/ReflectionClosure.php',
+        'Opis\\Closure\\SecurityException' => __DIR__ . '/..' . '/opis/closure/src/SecurityException.php',
+        'Opis\\Closure\\SecurityProvider' => __DIR__ . '/..' . '/opis/closure/src/SecurityProvider.php',
+        'Opis\\Closure\\SelfReference' => __DIR__ . '/..' . '/opis/closure/src/SelfReference.php',
+        'Opis\\Closure\\SerializableClosure' => __DIR__ . '/..' . '/opis/closure/src/SerializableClosure.php',
         'PHPUnit\\Exception' => __DIR__ . '/..' . '/phpunit/phpunit/src/Exception.php',
         'PHPUnit\\Framework\\Assert' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/Assert.php',
         'PHPUnit\\Framework\\AssertionFailedError' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/AssertionFailedError.php',
@@ -2497,7 +2578,6 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'PHP_Token_XOR_EQUAL' => __DIR__ . '/..' . '/phpunit/php-token-stream/src/Token.php',
         'PHP_Token_YIELD' => __DIR__ . '/..' . '/phpunit/php-token-stream/src/Token.php',
         'PHP_Token_YIELD_FROM' => __DIR__ . '/..' . '/phpunit/php-token-stream/src/Token.php',
-        'ParseError' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/ParseError.php',
         'Parsedown' => __DIR__ . '/..' . '/erusev/parsedown/Parsedown.php',
         'PharIo\\Manifest\\Application' => __DIR__ . '/..' . '/phar-io/manifest/src/values/Application.php',
         'PharIo\\Manifest\\ApplicationName' => __DIR__ . '/..' . '/phar-io/manifest/src/values/ApplicationName.php',
@@ -2577,6 +2657,8 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'PhpParser\\Builder\\Namespace_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Namespace_.php',
         'PhpParser\\Builder\\Param' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Param.php',
         'PhpParser\\Builder\\Property' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Property.php',
+        'PhpParser\\Builder\\TraitUse' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/TraitUse.php',
+        'PhpParser\\Builder\\TraitUseAdaptation' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/TraitUseAdaptation.php',
         'PhpParser\\Builder\\Trait_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Trait_.php',
         'PhpParser\\Builder\\Use_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Use_.php',
         'PhpParser\\Comment' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Comment.php',
@@ -2809,6 +2891,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Prophecy\\Doubler\\ClassPatch\\ProphecySubjectPatch' => __DIR__ . '/..' . '/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/ProphecySubjectPatch.php',
         'Prophecy\\Doubler\\ClassPatch\\ReflectionClassNewInstancePatch' => __DIR__ . '/..' . '/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/ReflectionClassNewInstancePatch.php',
         'Prophecy\\Doubler\\ClassPatch\\SplFileInfoPatch' => __DIR__ . '/..' . '/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/SplFileInfoPatch.php',
+        'Prophecy\\Doubler\\ClassPatch\\ThrowablePatch' => __DIR__ . '/..' . '/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/ThrowablePatch.php',
         'Prophecy\\Doubler\\ClassPatch\\TraversablePatch' => __DIR__ . '/..' . '/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/TraversablePatch.php',
         'Prophecy\\Doubler\\DoubleInterface' => __DIR__ . '/..' . '/phpspec/prophecy/src/Prophecy/Doubler/DoubleInterface.php',
         'Prophecy\\Doubler\\Doubler' => __DIR__ . '/..' . '/phpspec/prophecy/src/Prophecy/Doubler/Doubler.php',
@@ -3165,7 +3248,6 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'SebastianBergmann\\RecursionContext\\InvalidArgumentException' => __DIR__ . '/..' . '/sebastian/recursion-context/src/InvalidArgumentException.php',
         'SebastianBergmann\\ResourceOperations\\ResourceOperations' => __DIR__ . '/..' . '/sebastian/resource-operations/src/ResourceOperations.php',
         'SebastianBergmann\\Version' => __DIR__ . '/..' . '/sebastian/version/src/Version.php',
-        'SessionUpdateTimestampHandlerInterface' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/SessionUpdateTimestampHandlerInterface.php',
         'SettingsSeeder' => __DIR__ . '/../..' . '/database/seeds/SettingsSeeder.php',
         'Symfony\\Component\\Console\\Application' => __DIR__ . '/..' . '/symfony/console/Application.php',
         'Symfony\\Component\\Console\\CommandLoader\\CommandLoaderInterface' => __DIR__ . '/..' . '/symfony/console/CommandLoader/CommandLoaderInterface.php',
@@ -3188,13 +3270,13 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Symfony\\Component\\Console\\Event\\ConsoleCommandEvent' => __DIR__ . '/..' . '/symfony/console/Event/ConsoleCommandEvent.php',
         'Symfony\\Component\\Console\\Event\\ConsoleErrorEvent' => __DIR__ . '/..' . '/symfony/console/Event/ConsoleErrorEvent.php',
         'Symfony\\Component\\Console\\Event\\ConsoleEvent' => __DIR__ . '/..' . '/symfony/console/Event/ConsoleEvent.php',
-        'Symfony\\Component\\Console\\Event\\ConsoleExceptionEvent' => __DIR__ . '/..' . '/symfony/console/Event/ConsoleExceptionEvent.php',
         'Symfony\\Component\\Console\\Event\\ConsoleTerminateEvent' => __DIR__ . '/..' . '/symfony/console/Event/ConsoleTerminateEvent.php',
         'Symfony\\Component\\Console\\Exception\\CommandNotFoundException' => __DIR__ . '/..' . '/symfony/console/Exception/CommandNotFoundException.php',
         'Symfony\\Component\\Console\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/symfony/console/Exception/ExceptionInterface.php',
         'Symfony\\Component\\Console\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/symfony/console/Exception/InvalidArgumentException.php',
         'Symfony\\Component\\Console\\Exception\\InvalidOptionException' => __DIR__ . '/..' . '/symfony/console/Exception/InvalidOptionException.php',
         'Symfony\\Component\\Console\\Exception\\LogicException' => __DIR__ . '/..' . '/symfony/console/Exception/LogicException.php',
+        'Symfony\\Component\\Console\\Exception\\NamespaceNotFoundException' => __DIR__ . '/..' . '/symfony/console/Exception/NamespaceNotFoundException.php',
         'Symfony\\Component\\Console\\Exception\\RuntimeException' => __DIR__ . '/..' . '/symfony/console/Exception/RuntimeException.php',
         'Symfony\\Component\\Console\\Formatter\\OutputFormatter' => __DIR__ . '/..' . '/symfony/console/Formatter/OutputFormatter.php',
         'Symfony\\Component\\Console\\Formatter\\OutputFormatterInterface' => __DIR__ . '/..' . '/symfony/console/Formatter/OutputFormatterInterface.php',
@@ -3215,6 +3297,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Symfony\\Component\\Console\\Helper\\SymfonyQuestionHelper' => __DIR__ . '/..' . '/symfony/console/Helper/SymfonyQuestionHelper.php',
         'Symfony\\Component\\Console\\Helper\\Table' => __DIR__ . '/..' . '/symfony/console/Helper/Table.php',
         'Symfony\\Component\\Console\\Helper\\TableCell' => __DIR__ . '/..' . '/symfony/console/Helper/TableCell.php',
+        'Symfony\\Component\\Console\\Helper\\TableRows' => __DIR__ . '/..' . '/symfony/console/Helper/TableRows.php',
         'Symfony\\Component\\Console\\Helper\\TableSeparator' => __DIR__ . '/..' . '/symfony/console/Helper/TableSeparator.php',
         'Symfony\\Component\\Console\\Helper\\TableStyle' => __DIR__ . '/..' . '/symfony/console/Helper/TableStyle.php',
         'Symfony\\Component\\Console\\Input\\ArgvInput' => __DIR__ . '/..' . '/symfony/console/Input/ArgvInput.php',
@@ -3231,6 +3314,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Symfony\\Component\\Console\\Output\\BufferedOutput' => __DIR__ . '/..' . '/symfony/console/Output/BufferedOutput.php',
         'Symfony\\Component\\Console\\Output\\ConsoleOutput' => __DIR__ . '/..' . '/symfony/console/Output/ConsoleOutput.php',
         'Symfony\\Component\\Console\\Output\\ConsoleOutputInterface' => __DIR__ . '/..' . '/symfony/console/Output/ConsoleOutputInterface.php',
+        'Symfony\\Component\\Console\\Output\\ConsoleSectionOutput' => __DIR__ . '/..' . '/symfony/console/Output/ConsoleSectionOutput.php',
         'Symfony\\Component\\Console\\Output\\NullOutput' => __DIR__ . '/..' . '/symfony/console/Output/NullOutput.php',
         'Symfony\\Component\\Console\\Output\\Output' => __DIR__ . '/..' . '/symfony/console/Output/Output.php',
         'Symfony\\Component\\Console\\Output\\OutputInterface' => __DIR__ . '/..' . '/symfony/console/Output/OutputInterface.php',
@@ -3244,6 +3328,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Symfony\\Component\\Console\\Terminal' => __DIR__ . '/..' . '/symfony/console/Terminal.php',
         'Symfony\\Component\\Console\\Tester\\ApplicationTester' => __DIR__ . '/..' . '/symfony/console/Tester/ApplicationTester.php',
         'Symfony\\Component\\Console\\Tester\\CommandTester' => __DIR__ . '/..' . '/symfony/console/Tester/CommandTester.php',
+        'Symfony\\Component\\Console\\Tester\\TesterTrait' => __DIR__ . '/..' . '/symfony/console/Tester/TesterTrait.php',
         'Symfony\\Component\\CssSelector\\CssSelectorConverter' => __DIR__ . '/..' . '/symfony/css-selector/CssSelectorConverter.php',
         'Symfony\\Component\\CssSelector\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/symfony/css-selector/Exception/ExceptionInterface.php',
         'Symfony\\Component\\CssSelector\\Exception\\ExpressionErrorException' => __DIR__ . '/..' . '/symfony/css-selector/Exception/ExpressionErrorException.php',
@@ -3298,7 +3383,6 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Symfony\\Component\\Debug\\ErrorHandler' => __DIR__ . '/..' . '/symfony/debug/ErrorHandler.php',
         'Symfony\\Component\\Debug\\ExceptionHandler' => __DIR__ . '/..' . '/symfony/debug/ExceptionHandler.php',
         'Symfony\\Component\\Debug\\Exception\\ClassNotFoundException' => __DIR__ . '/..' . '/symfony/debug/Exception/ClassNotFoundException.php',
-        'Symfony\\Component\\Debug\\Exception\\ContextErrorException' => __DIR__ . '/..' . '/symfony/debug/Exception/ContextErrorException.php',
         'Symfony\\Component\\Debug\\Exception\\FatalErrorException' => __DIR__ . '/..' . '/symfony/debug/Exception/FatalErrorException.php',
         'Symfony\\Component\\Debug\\Exception\\FatalThrowableError' => __DIR__ . '/..' . '/symfony/debug/Exception/FatalThrowableError.php',
         'Symfony\\Component\\Debug\\Exception\\FlattenException' => __DIR__ . '/..' . '/symfony/debug/Exception/FlattenException.php',
@@ -3325,7 +3409,6 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Symfony\\Component\\Finder\\Comparator\\DateComparator' => __DIR__ . '/..' . '/symfony/finder/Comparator/DateComparator.php',
         'Symfony\\Component\\Finder\\Comparator\\NumberComparator' => __DIR__ . '/..' . '/symfony/finder/Comparator/NumberComparator.php',
         'Symfony\\Component\\Finder\\Exception\\AccessDeniedException' => __DIR__ . '/..' . '/symfony/finder/Exception/AccessDeniedException.php',
-        'Symfony\\Component\\Finder\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/symfony/finder/Exception/ExceptionInterface.php',
         'Symfony\\Component\\Finder\\Finder' => __DIR__ . '/..' . '/symfony/finder/Finder.php',
         'Symfony\\Component\\Finder\\Glob' => __DIR__ . '/..' . '/symfony/finder/Glob.php',
         'Symfony\\Component\\Finder\\Iterator\\CustomFilterIterator' => __DIR__ . '/..' . '/symfony/finder/Iterator/CustomFilterIterator.php',
@@ -3335,7 +3418,6 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Symfony\\Component\\Finder\\Iterator\\FileTypeFilterIterator' => __DIR__ . '/..' . '/symfony/finder/Iterator/FileTypeFilterIterator.php',
         'Symfony\\Component\\Finder\\Iterator\\FilecontentFilterIterator' => __DIR__ . '/..' . '/symfony/finder/Iterator/FilecontentFilterIterator.php',
         'Symfony\\Component\\Finder\\Iterator\\FilenameFilterIterator' => __DIR__ . '/..' . '/symfony/finder/Iterator/FilenameFilterIterator.php',
-        'Symfony\\Component\\Finder\\Iterator\\FilterIterator' => __DIR__ . '/..' . '/symfony/finder/Iterator/FilterIterator.php',
         'Symfony\\Component\\Finder\\Iterator\\MultiplePcreFilterIterator' => __DIR__ . '/..' . '/symfony/finder/Iterator/MultiplePcreFilterIterator.php',
         'Symfony\\Component\\Finder\\Iterator\\PathFilterIterator' => __DIR__ . '/..' . '/symfony/finder/Iterator/PathFilterIterator.php',
         'Symfony\\Component\\Finder\\Iterator\\RecursiveDirectoryIterator' => __DIR__ . '/..' . '/symfony/finder/Iterator/RecursiveDirectoryIterator.php',
@@ -3353,8 +3435,15 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Symfony\\Component\\HttpFoundation\\ExpressionRequestMatcher' => __DIR__ . '/..' . '/symfony/http-foundation/ExpressionRequestMatcher.php',
         'Symfony\\Component\\HttpFoundation\\FileBag' => __DIR__ . '/..' . '/symfony/http-foundation/FileBag.php',
         'Symfony\\Component\\HttpFoundation\\File\\Exception\\AccessDeniedException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/AccessDeniedException.php',
+        'Symfony\\Component\\HttpFoundation\\File\\Exception\\CannotWriteFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/CannotWriteFileException.php',
+        'Symfony\\Component\\HttpFoundation\\File\\Exception\\ExtensionFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/ExtensionFileException.php',
         'Symfony\\Component\\HttpFoundation\\File\\Exception\\FileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/FileException.php',
         'Symfony\\Component\\HttpFoundation\\File\\Exception\\FileNotFoundException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/FileNotFoundException.php',
+        'Symfony\\Component\\HttpFoundation\\File\\Exception\\FormSizeFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/FormSizeFileException.php',
+        'Symfony\\Component\\HttpFoundation\\File\\Exception\\IniSizeFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/IniSizeFileException.php',
+        'Symfony\\Component\\HttpFoundation\\File\\Exception\\NoFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/NoFileException.php',
+        'Symfony\\Component\\HttpFoundation\\File\\Exception\\NoTmpDirFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/NoTmpDirFileException.php',
+        'Symfony\\Component\\HttpFoundation\\File\\Exception\\PartialFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/PartialFileException.php',
         'Symfony\\Component\\HttpFoundation\\File\\Exception\\UnexpectedTypeException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/UnexpectedTypeException.php',
         'Symfony\\Component\\HttpFoundation\\File\\Exception\\UploadException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/UploadException.php',
         'Symfony\\Component\\HttpFoundation\\File\\File' => __DIR__ . '/..' . '/symfony/http-foundation/File/File.php',
@@ -3368,6 +3457,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Symfony\\Component\\HttpFoundation\\File\\Stream' => __DIR__ . '/..' . '/symfony/http-foundation/File/Stream.php',
         'Symfony\\Component\\HttpFoundation\\File\\UploadedFile' => __DIR__ . '/..' . '/symfony/http-foundation/File/UploadedFile.php',
         'Symfony\\Component\\HttpFoundation\\HeaderBag' => __DIR__ . '/..' . '/symfony/http-foundation/HeaderBag.php',
+        'Symfony\\Component\\HttpFoundation\\HeaderUtils' => __DIR__ . '/..' . '/symfony/http-foundation/HeaderUtils.php',
         'Symfony\\Component\\HttpFoundation\\IpUtils' => __DIR__ . '/..' . '/symfony/http-foundation/IpUtils.php',
         'Symfony\\Component\\HttpFoundation\\JsonResponse' => __DIR__ . '/..' . '/symfony/http-foundation/JsonResponse.php',
         'Symfony\\Component\\HttpFoundation\\ParameterBag' => __DIR__ . '/..' . '/symfony/http-foundation/ParameterBag.php',
@@ -3390,22 +3480,20 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Symfony\\Component\\HttpFoundation\\Session\\SessionBagProxy' => __DIR__ . '/..' . '/symfony/http-foundation/Session/SessionBagProxy.php',
         'Symfony\\Component\\HttpFoundation\\Session\\SessionInterface' => __DIR__ . '/..' . '/symfony/http-foundation/Session/SessionInterface.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\AbstractSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/AbstractSessionHandler.php',
-        'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MemcacheSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MemcachedSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php',
+        'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MigratingSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/MigratingSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MongoDbSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php',
-        'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/NativeSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NullSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/NullSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\PdoSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php',
+        'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\RedisSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/RedisSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\StrictSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/StrictSessionHandler.php',
-        'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\WriteCheckSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/WriteCheckSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MetadataBag' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/MetadataBag.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MockArraySessionStorage' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MockFileSessionStorage' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/MockFileSessionStorage.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\NativeSessionStorage' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/NativeSessionStorage.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\PhpBridgeSessionStorage' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/PhpBridgeSessionStorage.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\AbstractProxy' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Proxy/AbstractProxy.php',
-        'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\NativeProxy' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Proxy/NativeProxy.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\SessionHandlerProxy' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Proxy/SessionHandlerProxy.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\SessionStorageInterface' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/SessionStorageInterface.php',
         'Symfony\\Component\\HttpFoundation\\StreamedResponse' => __DIR__ . '/..' . '/symfony/http-foundation/StreamedResponse.php',
@@ -3419,7 +3507,6 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Symfony\\Component\\HttpKernel\\CacheWarmer\\CacheWarmerInterface' => __DIR__ . '/..' . '/symfony/http-kernel/CacheWarmer/CacheWarmerInterface.php',
         'Symfony\\Component\\HttpKernel\\CacheWarmer\\WarmableInterface' => __DIR__ . '/..' . '/symfony/http-kernel/CacheWarmer/WarmableInterface.php',
         'Symfony\\Component\\HttpKernel\\Client' => __DIR__ . '/..' . '/symfony/http-kernel/Client.php',
-        'Symfony\\Component\\HttpKernel\\Config\\EnvParametersResource' => __DIR__ . '/..' . '/symfony/http-kernel/Config/EnvParametersResource.php',
         'Symfony\\Component\\HttpKernel\\Config\\FileLocator' => __DIR__ . '/..' . '/symfony/http-kernel/Config/FileLocator.php',
         'Symfony\\Component\\HttpKernel\\ControllerMetadata\\ArgumentMetadata' => __DIR__ . '/..' . '/symfony/http-kernel/ControllerMetadata/ArgumentMetadata.php',
         'Symfony\\Component\\HttpKernel\\ControllerMetadata\\ArgumentMetadataFactory' => __DIR__ . '/..' . '/symfony/http-kernel/ControllerMetadata/ArgumentMetadataFactory.php',
@@ -3431,6 +3518,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\RequestValueResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentResolver/RequestValueResolver.php',
         'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\ServiceValueResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentResolver/ServiceValueResolver.php',
         'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\SessionValueResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentResolver/SessionValueResolver.php',
+        'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\TraceableValueResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentResolver/TraceableValueResolver.php',
         'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\VariadicValueResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentResolver/VariadicValueResolver.php',
         'Symfony\\Component\\HttpKernel\\Controller\\ArgumentValueResolverInterface' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentValueResolverInterface.php',
         'Symfony\\Component\\HttpKernel\\Controller\\ContainerControllerResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ContainerControllerResolver.php',
@@ -3452,11 +3540,9 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Symfony\\Component\\HttpKernel\\DataCollector\\RequestDataCollector' => __DIR__ . '/..' . '/symfony/http-kernel/DataCollector/RequestDataCollector.php',
         'Symfony\\Component\\HttpKernel\\DataCollector\\RouterDataCollector' => __DIR__ . '/..' . '/symfony/http-kernel/DataCollector/RouterDataCollector.php',
         'Symfony\\Component\\HttpKernel\\DataCollector\\TimeDataCollector' => __DIR__ . '/..' . '/symfony/http-kernel/DataCollector/TimeDataCollector.php',
-        'Symfony\\Component\\HttpKernel\\DataCollector\\Util\\ValueExporter' => __DIR__ . '/..' . '/symfony/http-kernel/DataCollector/Util/ValueExporter.php',
         'Symfony\\Component\\HttpKernel\\Debug\\FileLinkFormatter' => __DIR__ . '/..' . '/symfony/http-kernel/Debug/FileLinkFormatter.php',
         'Symfony\\Component\\HttpKernel\\Debug\\TraceableEventDispatcher' => __DIR__ . '/..' . '/symfony/http-kernel/Debug/TraceableEventDispatcher.php',
         'Symfony\\Component\\HttpKernel\\DependencyInjection\\AddAnnotatedClassesToCachePass' => __DIR__ . '/..' . '/symfony/http-kernel/DependencyInjection/AddAnnotatedClassesToCachePass.php',
-        'Symfony\\Component\\HttpKernel\\DependencyInjection\\AddClassesToCachePass' => __DIR__ . '/..' . '/symfony/http-kernel/DependencyInjection/AddClassesToCachePass.php',
         'Symfony\\Component\\HttpKernel\\DependencyInjection\\ConfigurableExtension' => __DIR__ . '/..' . '/symfony/http-kernel/DependencyInjection/ConfigurableExtension.php',
         'Symfony\\Component\\HttpKernel\\DependencyInjection\\ControllerArgumentValueResolverPass' => __DIR__ . '/..' . '/symfony/http-kernel/DependencyInjection/ControllerArgumentValueResolverPass.php',
         'Symfony\\Component\\HttpKernel\\DependencyInjection\\Extension' => __DIR__ . '/..' . '/symfony/http-kernel/DependencyInjection/Extension.php',
@@ -3528,6 +3614,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Symfony\\Component\\HttpKernel\\HttpCache\\Ssi' => __DIR__ . '/..' . '/symfony/http-kernel/HttpCache/Ssi.php',
         'Symfony\\Component\\HttpKernel\\HttpCache\\Store' => __DIR__ . '/..' . '/symfony/http-kernel/HttpCache/Store.php',
         'Symfony\\Component\\HttpKernel\\HttpCache\\StoreInterface' => __DIR__ . '/..' . '/symfony/http-kernel/HttpCache/StoreInterface.php',
+        'Symfony\\Component\\HttpKernel\\HttpCache\\SubRequestHandler' => __DIR__ . '/..' . '/symfony/http-kernel/HttpCache/SubRequestHandler.php',
         'Symfony\\Component\\HttpKernel\\HttpCache\\SurrogateInterface' => __DIR__ . '/..' . '/symfony/http-kernel/HttpCache/SurrogateInterface.php',
         'Symfony\\Component\\HttpKernel\\HttpKernel' => __DIR__ . '/..' . '/symfony/http-kernel/HttpKernel.php',
         'Symfony\\Component\\HttpKernel\\HttpKernelInterface' => __DIR__ . '/..' . '/symfony/http-kernel/HttpKernelInterface.php',
@@ -3547,6 +3634,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Symfony\\Component\\Process\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/symfony/process/Exception/InvalidArgumentException.php',
         'Symfony\\Component\\Process\\Exception\\LogicException' => __DIR__ . '/..' . '/symfony/process/Exception/LogicException.php',
         'Symfony\\Component\\Process\\Exception\\ProcessFailedException' => __DIR__ . '/..' . '/symfony/process/Exception/ProcessFailedException.php',
+        'Symfony\\Component\\Process\\Exception\\ProcessSignaledException' => __DIR__ . '/..' . '/symfony/process/Exception/ProcessSignaledException.php',
         'Symfony\\Component\\Process\\Exception\\ProcessTimedOutException' => __DIR__ . '/..' . '/symfony/process/Exception/ProcessTimedOutException.php',
         'Symfony\\Component\\Process\\Exception\\RuntimeException' => __DIR__ . '/..' . '/symfony/process/Exception/RuntimeException.php',
         'Symfony\\Component\\Process\\ExecutableFinder' => __DIR__ . '/..' . '/symfony/process/ExecutableFinder.php',
@@ -3558,7 +3646,6 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Symfony\\Component\\Process\\Pipes\\UnixPipes' => __DIR__ . '/..' . '/symfony/process/Pipes/UnixPipes.php',
         'Symfony\\Component\\Process\\Pipes\\WindowsPipes' => __DIR__ . '/..' . '/symfony/process/Pipes/WindowsPipes.php',
         'Symfony\\Component\\Process\\Process' => __DIR__ . '/..' . '/symfony/process/Process.php',
-        'Symfony\\Component\\Process\\ProcessBuilder' => __DIR__ . '/..' . '/symfony/process/ProcessBuilder.php',
         'Symfony\\Component\\Process\\ProcessUtils' => __DIR__ . '/..' . '/symfony/process/ProcessUtils.php',
         'Symfony\\Component\\Routing\\Annotation\\Route' => __DIR__ . '/..' . '/symfony/routing/Annotation/Route.php',
         'Symfony\\Component\\Routing\\CompiledRoute' => __DIR__ . '/..' . '/symfony/routing/CompiledRoute.php',
@@ -3594,8 +3681,6 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Symfony\\Component\\Routing\\Loader\\ProtectedPhpFileLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/PhpFileLoader.php',
         'Symfony\\Component\\Routing\\Loader\\XmlFileLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/XmlFileLoader.php',
         'Symfony\\Component\\Routing\\Loader\\YamlFileLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/YamlFileLoader.php',
-        'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperCollection' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/DumperCollection.php',
-        'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperRoute' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/DumperRoute.php',
         'Symfony\\Component\\Routing\\Matcher\\Dumper\\MatcherDumper' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/MatcherDumper.php',
         'Symfony\\Component\\Routing\\Matcher\\Dumper\\MatcherDumperInterface' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/MatcherDumperInterface.php',
         'Symfony\\Component\\Routing\\Matcher\\Dumper\\PhpMatcherDumper' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php',
@@ -3694,8 +3779,8 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Symfony\\Component\\VarDumper\\Caster\\EnumStub' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/EnumStub.php',
         'Symfony\\Component\\VarDumper\\Caster\\ExceptionCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/ExceptionCaster.php',
         'Symfony\\Component\\VarDumper\\Caster\\FrameStub' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/FrameStub.php',
+        'Symfony\\Component\\VarDumper\\Caster\\GmpCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/GmpCaster.php',
         'Symfony\\Component\\VarDumper\\Caster\\LinkStub' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/LinkStub.php',
-        'Symfony\\Component\\VarDumper\\Caster\\MongoCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/MongoCaster.php',
         'Symfony\\Component\\VarDumper\\Caster\\PdoCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/PdoCaster.php',
         'Symfony\\Component\\VarDumper\\Caster\\PgSqlCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/PgSqlCaster.php',
         'Symfony\\Component\\VarDumper\\Caster\\RedisCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/RedisCaster.php',
@@ -3714,17 +3799,29 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'Symfony\\Component\\VarDumper\\Cloner\\DumperInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/DumperInterface.php',
         'Symfony\\Component\\VarDumper\\Cloner\\Stub' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/Stub.php',
         'Symfony\\Component\\VarDumper\\Cloner\\VarCloner' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/VarCloner.php',
+        'Symfony\\Component\\VarDumper\\Command\\Descriptor\\CliDescriptor' => __DIR__ . '/..' . '/symfony/var-dumper/Command/Descriptor/CliDescriptor.php',
+        'Symfony\\Component\\VarDumper\\Command\\Descriptor\\DumpDescriptorInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Command/Descriptor/DumpDescriptorInterface.php',
+        'Symfony\\Component\\VarDumper\\Command\\Descriptor\\HtmlDescriptor' => __DIR__ . '/..' . '/symfony/var-dumper/Command/Descriptor/HtmlDescriptor.php',
+        'Symfony\\Component\\VarDumper\\Command\\ServerDumpCommand' => __DIR__ . '/..' . '/symfony/var-dumper/Command/ServerDumpCommand.php',
         'Symfony\\Component\\VarDumper\\Dumper\\AbstractDumper' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/AbstractDumper.php',
         'Symfony\\Component\\VarDumper\\Dumper\\CliDumper' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/CliDumper.php',
+        'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\CliContextProvider' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/ContextProvider/CliContextProvider.php',
+        'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\ContextProviderInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/ContextProvider/ContextProviderInterface.php',
+        'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\RequestContextProvider' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/ContextProvider/RequestContextProvider.php',
+        'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\SourceContextProvider' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/ContextProvider/SourceContextProvider.php',
         'Symfony\\Component\\VarDumper\\Dumper\\DataDumperInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/DataDumperInterface.php',
         'Symfony\\Component\\VarDumper\\Dumper\\HtmlDumper' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/HtmlDumper.php',
+        'Symfony\\Component\\VarDumper\\Dumper\\ServerDumper' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/ServerDumper.php',
         'Symfony\\Component\\VarDumper\\Exception\\ThrowingCasterException' => __DIR__ . '/..' . '/symfony/var-dumper/Exception/ThrowingCasterException.php',
+        'Symfony\\Component\\VarDumper\\Server\\Connection' => __DIR__ . '/..' . '/symfony/var-dumper/Server/Connection.php',
+        'Symfony\\Component\\VarDumper\\Server\\DumpServer' => __DIR__ . '/..' . '/symfony/var-dumper/Server/DumpServer.php',
         'Symfony\\Component\\VarDumper\\Test\\VarDumperTestTrait' => __DIR__ . '/..' . '/symfony/var-dumper/Test/VarDumperTestTrait.php',
         'Symfony\\Component\\VarDumper\\VarDumper' => __DIR__ . '/..' . '/symfony/var-dumper/VarDumper.php',
         'Symfony\\Polyfill\\Ctype\\Ctype' => __DIR__ . '/..' . '/symfony/polyfill-ctype/Ctype.php',
         'Symfony\\Polyfill\\Mbstring\\Mbstring' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/Mbstring.php',
-        'Symfony\\Polyfill\\Php70\\Php70' => __DIR__ . '/..' . '/symfony/polyfill-php70/Php70.php',
+        'Symfony\\Polyfill\\Php72\\Php72' => __DIR__ . '/..' . '/symfony/polyfill-php72/Php72.php',
         'Symfony\\Thanks\\Command\\ThanksCommand' => __DIR__ . '/..' . '/symfony/thanks/src/Command/ThanksCommand.php',
+        'Symfony\\Thanks\\GitHubClient' => __DIR__ . '/..' . '/symfony/thanks/src/GitHubClient.php',
         'Symfony\\Thanks\\Thanks' => __DIR__ . '/..' . '/symfony/thanks/src/Thanks.php',
         'Tests\\CreatesApplication' => __DIR__ . '/../..' . '/tests/CreatesApplication.php',
         'Tests\\Feature\\ExampleTest' => __DIR__ . '/../..' . '/tests/Feature/ExampleTest.php',
@@ -3745,7 +3842,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'TijsVerkoyen\\CssToInlineStyles\\Css\\Property\\Property' => __DIR__ . '/..' . '/tijsverkoyen/css-to-inline-styles/src/Css/Property/Property.php',
         'TijsVerkoyen\\CssToInlineStyles\\Css\\Rule\\Processor' => __DIR__ . '/..' . '/tijsverkoyen/css-to-inline-styles/src/Css/Rule/Processor.php',
         'TijsVerkoyen\\CssToInlineStyles\\Css\\Rule\\Rule' => __DIR__ . '/..' . '/tijsverkoyen/css-to-inline-styles/src/Css/Rule/Rule.php',
-        'TypeError' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/TypeError.php',
+        'UsersSeeder' => __DIR__ . '/../..' . '/database/seeds/UsersSeeder.php',
         'Webmozart\\Assert\\Assert' => __DIR__ . '/..' . '/webmozart/assert/src/Assert.php',
         'Whoops\\Exception\\ErrorException' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Exception/ErrorException.php',
         'Whoops\\Exception\\Formatter' => __DIR__ . '/..' . '/filp/whoops/src/Whoops/Exception/Formatter.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index ab2ebd4a..9b13027c 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -55,58 +55,6 @@
             "parser"
         ]
     },
-    {
-        "name": "vlucas/phpdotenv",
-        "version": "v2.4.0",
-        "version_normalized": "2.4.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/vlucas/phpdotenv.git",
-            "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
-            "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "^4.8 || ^5.0"
-        },
-        "time": "2016-09-01T10:05:43+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.4-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Dotenv\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause-Attribution"
-        ],
-        "authors": [
-            {
-                "name": "Vance Lucas",
-                "email": "vance@vancelucas.com",
-                "homepage": "http://www.vancelucas.com"
-            }
-        ],
-        "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
-        "keywords": [
-            "dotenv",
-            "env",
-            "environment"
-        ]
-    },
     {
         "name": "tijsverkoyen/css-to-inline-styles",
         "version": "2.2.1",
@@ -205,145 +153,6 @@
             "psr-3"
         ]
     },
-    {
-        "name": "swiftmailer/swiftmailer",
-        "version": "v6.0.2",
-        "version_normalized": "6.0.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/swiftmailer/swiftmailer.git",
-            "reference": "412333372fb6c8ffb65496a2bbd7321af75733fc"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/412333372fb6c8ffb65496a2bbd7321af75733fc",
-            "reference": "412333372fb6c8ffb65496a2bbd7321af75733fc",
-            "shasum": ""
-        },
-        "require": {
-            "egulias/email-validator": "~2.0",
-            "php": ">=7.0.0"
-        },
-        "require-dev": {
-            "mockery/mockery": "~0.9.1",
-            "symfony/phpunit-bridge": "~3.3@dev"
-        },
-        "time": "2017-09-30T22:39:41+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "6.0-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "files": [
-                "lib/swift_required.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Chris Corbyn"
-            },
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            }
-        ],
-        "description": "Swiftmailer, free feature-rich PHP mailer",
-        "homepage": "http://swiftmailer.symfony.com",
-        "keywords": [
-            "email",
-            "mail",
-            "mailer"
-        ]
-    },
-    {
-        "name": "ramsey/uuid",
-        "version": "3.7.3",
-        "version_normalized": "3.7.3.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/ramsey/uuid.git",
-            "reference": "44abcdad877d9a46685a3a4d221e3b2c4b87cb76"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/ramsey/uuid/zipball/44abcdad877d9a46685a3a4d221e3b2c4b87cb76",
-            "reference": "44abcdad877d9a46685a3a4d221e3b2c4b87cb76",
-            "shasum": ""
-        },
-        "require": {
-            "paragonie/random_compat": "^1.0|^2.0",
-            "php": "^5.4 || ^7.0"
-        },
-        "replace": {
-            "rhumsaa/uuid": "self.version"
-        },
-        "require-dev": {
-            "codeception/aspect-mock": "^1.0 | ~2.0.0",
-            "doctrine/annotations": "~1.2.0",
-            "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.9",
-            "moontoast/math": "^1.1",
-            "php-mock/php-mock-phpunit": "^0.3|^1.1",
-            "phpunit/phpunit": "^4.7|^5.0",
-            "squizlabs/php_codesniffer": "^2.3"
-        },
-        "suggest": {
-            "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator",
-            "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator",
-            "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
-            "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).",
-            "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid",
-            "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type."
-        },
-        "time": "2018-01-20T00:28:24+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "3.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Ramsey\\Uuid\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Marijn Huizendveld",
-                "email": "marijn.huizendveld@gmail.com"
-            },
-            {
-                "name": "Thibaud Fabre",
-                "email": "thibaud@aztech.io"
-            },
-            {
-                "name": "Ben Ramsey",
-                "email": "ben@benramsey.com",
-                "homepage": "https://benramsey.com"
-            }
-        ],
-        "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
-        "homepage": "https://github.com/ramsey/uuid",
-        "keywords": [
-            "guid",
-            "identifier",
-            "uuid"
-        ]
-    },
     {
         "name": "psr/container",
         "version": "1.0.0",
@@ -395,52 +204,6 @@
             "psr"
         ]
     },
-    {
-        "name": "mtdowling/cron-expression",
-        "version": "v1.2.1",
-        "version_normalized": "1.2.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/mtdowling/cron-expression.git",
-            "reference": "9504fa9ea681b586028adaaa0877db4aecf32bad"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/9504fa9ea681b586028adaaa0877db4aecf32bad",
-            "reference": "9504fa9ea681b586028adaaa0877db4aecf32bad",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.2"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.0|~5.0"
-        },
-        "time": "2017-01-23T04:29:33+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Cron\\": "src/Cron/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Michael Dowling",
-                "email": "mtdowling@gmail.com",
-                "homepage": "https://github.com/mtdowling"
-            }
-        ],
-        "description": "CRON for PHP: Calculate the next or previous run date and determine if a CRON expression is due",
-        "keywords": [
-            "cron",
-            "schedule"
-        ]
-    },
     {
         "name": "monolog/monolog",
         "version": "1.23.0",
@@ -522,255 +285,53 @@
         ]
     },
     {
-        "name": "fideloper/proxy",
-        "version": "3.3.4",
-        "version_normalized": "3.3.4.0",
+        "name": "dnoegel/php-xdg-base-dir",
+        "version": "0.1",
+        "version_normalized": "0.1.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/fideloper/TrustedProxy.git",
-            "reference": "9cdf6f118af58d89764249bbcc7bb260c132924f"
+            "url": "https://github.com/dnoegel/php-xdg-base-dir.git",
+            "reference": "265b8593498b997dc2d31e75b89f053b5cc9621a"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/9cdf6f118af58d89764249bbcc7bb260c132924f",
-            "reference": "9cdf6f118af58d89764249bbcc7bb260c132924f",
+            "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/265b8593498b997dc2d31e75b89f053b5cc9621a",
+            "reference": "265b8593498b997dc2d31e75b89f053b5cc9621a",
             "shasum": ""
         },
         "require": {
-            "illuminate/contracts": "~5.0",
-            "php": ">=5.4.0"
+            "php": ">=5.3.2"
         },
         "require-dev": {
-            "illuminate/http": "~5.0",
-            "mockery/mockery": "~0.9.3",
-            "phpunit/phpunit": "^5.7"
-        },
-        "time": "2017-06-15T17:19:42+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "3.3-dev"
-            },
-            "laravel": {
-                "providers": [
-                    "Fideloper\\Proxy\\TrustedProxyServiceProvider"
-                ]
-            }
+            "phpunit/phpunit": "@stable"
         },
+        "time": "2014-10-24T07:27:01+00:00",
+        "type": "project",
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
-                "Fideloper\\Proxy\\": "src/"
+                "XdgBaseDir\\": "src/"
             }
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
             "MIT"
         ],
-        "authors": [
-            {
-                "name": "Chris Fidao",
-                "email": "fideloper@gmail.com"
-            }
-        ],
-        "description": "Set trusted proxies for Laravel",
-        "keywords": [
-            "load balancing",
-            "proxy",
-            "trusted proxy"
-        ]
+        "description": "implementation of xdg base directory specification for php"
     },
     {
-        "name": "jakub-onderka/php-console-color",
-        "version": "0.1",
-        "version_normalized": "0.1.0.0",
+        "name": "hamcrest/hamcrest-php",
+        "version": "v2.0.0",
+        "version_normalized": "2.0.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/JakubOnderka/PHP-Console-Color.git",
-            "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1"
+            "url": "https://github.com/hamcrest/hamcrest-php.git",
+            "reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/e0b393dacf7703fc36a4efc3df1435485197e6c1",
-            "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.2"
-        },
-        "require-dev": {
-            "jakub-onderka/php-code-style": "1.0",
-            "jakub-onderka/php-parallel-lint": "0.*",
-            "jakub-onderka/php-var-dump-check": "0.*",
-            "phpunit/phpunit": "3.7.*",
-            "squizlabs/php_codesniffer": "1.*"
-        },
-        "time": "2014-04-08T15:00:19+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "JakubOnderka\\PhpConsoleColor": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-2-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Jakub Onderka",
-                "email": "jakub.onderka@gmail.com",
-                "homepage": "http://www.acci.cz"
-            }
-        ]
-    },
-    {
-        "name": "jakub-onderka/php-console-highlighter",
-        "version": "v0.3.2",
-        "version_normalized": "0.3.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git",
-            "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/7daa75df45242c8d5b75a22c00a201e7954e4fb5",
-            "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5",
-            "shasum": ""
-        },
-        "require": {
-            "jakub-onderka/php-console-color": "~0.1",
-            "php": ">=5.3.0"
-        },
-        "require-dev": {
-            "jakub-onderka/php-code-style": "~1.0",
-            "jakub-onderka/php-parallel-lint": "~0.5",
-            "jakub-onderka/php-var-dump-check": "~0.1",
-            "phpunit/phpunit": "~4.0",
-            "squizlabs/php_codesniffer": "~1.5"
-        },
-        "time": "2015-04-20T18:58:01+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "JakubOnderka\\PhpConsoleHighlighter": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Jakub Onderka",
-                "email": "acci@acci.cz",
-                "homepage": "http://www.acci.cz/"
-            }
-        ]
-    },
-    {
-        "name": "dnoegel/php-xdg-base-dir",
-        "version": "0.1",
-        "version_normalized": "0.1.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/dnoegel/php-xdg-base-dir.git",
-            "reference": "265b8593498b997dc2d31e75b89f053b5cc9621a"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/265b8593498b997dc2d31e75b89f053b5cc9621a",
-            "reference": "265b8593498b997dc2d31e75b89f053b5cc9621a",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.2"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "@stable"
-        },
-        "time": "2014-10-24T07:27:01+00:00",
-        "type": "project",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "XdgBaseDir\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "description": "implementation of xdg base directory specification for php"
-    },
-    {
-        "name": "fzaninotto/faker",
-        "version": "v1.7.1",
-        "version_normalized": "1.7.1.0",
-        "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"
-        },
-        "time": "2017-08-15T16:48:10+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.8-dev"
-            }
-        },
-        "installation-source": "dist",
-        "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"
-        ]
-    },
-    {
-        "name": "hamcrest/hamcrest-php",
-        "version": "v2.0.0",
-        "version_normalized": "2.0.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",
+            "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/776503d3a8e85d4f9a1148614f95b7a608b046ad",
+            "reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad",
             "shasum": ""
         },
         "require": {
@@ -2113,51 +1674,6 @@
             "url"
         ]
     },
-    {
-        "name": "symfony/thanks",
-        "version": "v1.0.7",
-        "version_normalized": "1.0.7.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/thanks.git",
-            "reference": "bade4992c46ed722162694b4af8d72f84402819a"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/thanks/zipball/bade4992c46ed722162694b4af8d72f84402819a",
-            "reference": "bade4992c46ed722162694b4af8d72f84402819a",
-            "shasum": ""
-        },
-        "require": {
-            "composer-plugin-api": "^1.0",
-            "php": "^5.5.9|^7.0.0"
-        },
-        "time": "2018-03-14T21:51:39+00:00",
-        "type": "composer-plugin",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0-dev"
-            },
-            "class": "Symfony\\Thanks\\Thanks"
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Thanks\\": "src"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Nicolas Grekas",
-                "email": "p@tchwork.com"
-            }
-        ],
-        "description": "Give thanks (in the form of a GitHub ⭐) to your fellow PHP package maintainers (not limited to Symfony components)!"
-    },
     {
         "name": "guzzlehttp/guzzle",
         "version": "6.3.3",
@@ -2226,41 +1742,35 @@
         ]
     },
     {
-        "name": "symfony/polyfill-mbstring",
-        "version": "v1.8.0",
-        "version_normalized": "1.8.0.0",
+        "name": "psr/simple-cache",
+        "version": "1.0.1",
+        "version_normalized": "1.0.1.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/polyfill-mbstring.git",
-            "reference": "3296adf6a6454a050679cde90f95350ad604b171"
+            "url": "https://github.com/php-fig/simple-cache.git",
+            "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171",
-            "reference": "3296adf6a6454a050679cde90f95350ad604b171",
+            "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
+            "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.3"
-        },
-        "suggest": {
-            "ext-mbstring": "For best performance"
+            "php": ">=5.3.0"
         },
-        "time": "2018-04-26T10:06:28+00:00",
+        "time": "2017-10-23T01:57:42+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "1.8-dev"
+                "dev-master": "1.0.x-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
-                "Symfony\\Polyfill\\Mbstring\\": ""
-            },
-            "files": [
-                "bootstrap.php"
-            ]
+                "Psr\\SimpleCache\\": "src/"
+            }
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
@@ -2268,72 +1778,555 @@
         ],
         "authors": [
             {
-                "name": "Nicolas Grekas",
-                "email": "p@tchwork.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
+                "name": "PHP-FIG",
+                "homepage": "http://www.php-fig.org/"
             }
         ],
-        "description": "Symfony polyfill for the Mbstring extension",
-        "homepage": "https://symfony.com",
+        "description": "Common interfaces for simple caching",
         "keywords": [
-            "compatibility",
-            "mbstring",
-            "polyfill",
-            "portable",
-            "shim"
+            "cache",
+            "caching",
+            "psr",
+            "psr-16",
+            "simple-cache"
         ]
     },
     {
-        "name": "symfony/var-dumper",
-        "version": "v3.4.11",
-        "version_normalized": "3.4.11.0",
+        "name": "erusev/parsedown",
+        "version": "1.7.1",
+        "version_normalized": "1.7.1.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/var-dumper.git",
-            "reference": "0e6545672d8c9ce70dd472adc2f8b03155a46f73"
+            "url": "https://github.com/erusev/parsedown.git",
+            "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0e6545672d8c9ce70dd472adc2f8b03155a46f73",
-            "reference": "0e6545672d8c9ce70dd472adc2f8b03155a46f73",
+            "url": "https://api.github.com/repos/erusev/parsedown/zipball/92e9c27ba0e74b8b028b111d1b6f956a15c01fc1",
+            "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1",
             "shasum": ""
         },
         "require": {
-            "php": "^5.5.9|>=7.0.8",
-            "symfony/polyfill-mbstring": "~1.0"
-        },
-        "conflict": {
-            "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
+            "ext-mbstring": "*",
+            "php": ">=5.3.0"
         },
         "require-dev": {
-            "ext-iconv": "*",
-            "twig/twig": "~1.34|~2.4"
+            "phpunit/phpunit": "^4.8.35"
+        },
+        "time": "2018-03-08T01:11:30+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Parsedown": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Emanuil Rusev",
+                "email": "hello@erusev.com",
+                "homepage": "http://erusev.com"
+            }
+        ],
+        "description": "Parser for Markdown.",
+        "homepage": "http://parsedown.org",
+        "keywords": [
+            "markdown",
+            "parser"
+        ]
+    },
+    {
+        "name": "doctrine/inflector",
+        "version": "v1.3.0",
+        "version_normalized": "1.3.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/doctrine/inflector.git",
+            "reference": "5527a48b7313d15261292c149e55e26eae771b0a"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a",
+            "reference": "5527a48b7313d15261292c149e55e26eae771b0a",
+            "shasum": ""
+        },
+        "require": {
+            "php": "^7.1"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "^6.2"
+        },
+        "time": "2018-01-09T20:05:19+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.3.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Roman Borschel",
+                "email": "roman@code-factory.org"
+            },
+            {
+                "name": "Benjamin Eberlei",
+                "email": "kontakt@beberlei.de"
+            },
+            {
+                "name": "Guilherme Blanco",
+                "email": "guilhermeblanco@gmail.com"
+            },
+            {
+                "name": "Jonathan Wage",
+                "email": "jonwage@gmail.com"
+            },
+            {
+                "name": "Johannes Schmitt",
+                "email": "schmittjoh@gmail.com"
+            }
+        ],
+        "description": "Common String Manipulations with regard to casing and singular/plural rules.",
+        "homepage": "http://www.doctrine-project.org",
+        "keywords": [
+            "inflection",
+            "pluralize",
+            "singularize",
+            "string"
+        ]
+    },
+    {
+        "name": "doctrine/instantiator",
+        "version": "1.1.0",
+        "version_normalized": "1.1.0.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"
+        },
+        "time": "2017-07-22T11:58:36+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.2.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Marco Pivetta",
+                "email": "ocramius@gmail.com",
+                "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"
+        ]
+    },
+    {
+        "name": "phpunit/php-code-coverage",
+        "version": "5.3.2",
+        "version_normalized": "5.3.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+            "reference": "c89677919c5dd6d3b3852f230a663118762218ac"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac",
+            "reference": "c89677919c5dd6d3b3852f230a663118762218ac",
+            "shasum": ""
+        },
+        "require": {
+            "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.1",
+            "sebastian/code-unit-reverse-lookup": "^1.0.1",
+            "sebastian/environment": "^3.0",
+            "sebastian/version": "^2.0.1",
+            "theseer/tokenizer": "^1.1"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "^6.0"
+        },
+        "suggest": {
+            "ext-xdebug": "^2.5.5"
+        },
+        "time": "2018-04-06T15:36:58+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "5.3.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "src/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Sebastian Bergmann",
+                "email": "sebastian@phpunit.de",
+                "role": "lead"
+            }
+        ],
+        "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+        "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+        "keywords": [
+            "coverage",
+            "testing",
+            "xunit"
+        ]
+    },
+    {
+        "name": "myclabs/deep-copy",
+        "version": "1.8.1",
+        "version_normalized": "1.8.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/myclabs/DeepCopy.git",
+            "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
+            "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
+            "shasum": ""
+        },
+        "require": {
+            "php": "^7.1"
+        },
+        "replace": {
+            "myclabs/deep-copy": "self.version"
+        },
+        "require-dev": {
+            "doctrine/collections": "^1.0",
+            "doctrine/common": "^2.6",
+            "phpunit/phpunit": "^7.1"
+        },
+        "time": "2018-06-11T23:09:50+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "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"
+        ]
+    },
+    {
+        "name": "symfony/thanks",
+        "version": "v1.1.0",
+        "version_normalized": "1.1.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/thanks.git",
+            "reference": "9474a631b52737c623b6aeba22f00bbc003251da"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/thanks/zipball/9474a631b52737c623b6aeba22f00bbc003251da",
+            "reference": "9474a631b52737c623b6aeba22f00bbc003251da",
+            "shasum": ""
+        },
+        "require": {
+            "composer-plugin-api": "^1.0",
+            "php": "^5.5.9|^7.0.0"
+        },
+        "time": "2018-08-24T14:08:13+00:00",
+        "type": "composer-plugin",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0-dev"
+            },
+            "class": "Symfony\\Thanks\\Thanks"
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Thanks\\": "src"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Nicolas Grekas",
+                "email": "p@tchwork.com"
+            }
+        ],
+        "description": "Give thanks (in the form of a GitHub ⭐) to your fellow PHP package maintainers (not limited to Symfony components)!"
+    },
+    {
+        "name": "vlucas/phpdotenv",
+        "version": "v2.5.1",
+        "version_normalized": "2.5.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/vlucas/phpdotenv.git",
+            "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e",
+            "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "^4.8.35 || ^5.0"
+        },
+        "time": "2018-07-29T20:33:41+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.5-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Dotenv\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Vance Lucas",
+                "email": "vance@vancelucas.com",
+                "homepage": "http://www.vancelucas.com"
+            }
+        ],
+        "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
+        "keywords": [
+            "dotenv",
+            "env",
+            "environment"
+        ]
+    },
+    {
+        "name": "symfony/css-selector",
+        "version": "v4.1.6",
+        "version_normalized": "4.1.6.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/css-selector.git",
+            "reference": "d67de79a70a27d93c92c47f37ece958bf8de4d8a"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/css-selector/zipball/d67de79a70a27d93c92c47f37ece958bf8de4d8a",
+            "reference": "d67de79a70a27d93c92c47f37ece958bf8de4d8a",
+            "shasum": ""
+        },
+        "require": {
+            "php": "^7.1.3"
+        },
+        "time": "2018-10-02T16:36:10+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "4.1-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\CssSelector\\": ""
+            },
+            "exclude-from-classmap": [
+                "/Tests/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Jean-François Simon",
+                "email": "jeanfrancois.simon@sensiolabs.com"
+            },
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony CssSelector Component",
+        "homepage": "https://symfony.com"
+    },
+    {
+        "name": "symfony/polyfill-mbstring",
+        "version": "v1.9.0",
+        "version_normalized": "1.9.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/polyfill-mbstring.git",
+            "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8",
+            "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3"
+        },
+        "suggest": {
+            "ext-mbstring": "For best performance"
+        },
+        "time": "2018-08-06T14:22:27+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.9-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Polyfill\\Mbstring\\": ""
+            },
+            "files": [
+                "bootstrap.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Nicolas Grekas",
+                "email": "p@tchwork.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony polyfill for the Mbstring extension",
+        "homepage": "https://symfony.com",
+        "keywords": [
+            "compatibility",
+            "mbstring",
+            "polyfill",
+            "portable",
+            "shim"
+        ]
+    },
+    {
+        "name": "symfony/polyfill-ctype",
+        "version": "v1.9.0",
+        "version_normalized": "1.9.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/polyfill-ctype.git",
+            "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
+            "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3"
         },
         "suggest": {
-            "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
-            "ext-intl": "To show region name in time zone dump",
-            "ext-symfony_debug": ""
+            "ext-ctype": "For best performance"
         },
-        "time": "2018-04-26T12:42:15+00:00",
+        "time": "2018-08-06T14:22:27+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "3.4-dev"
+                "dev-master": "1.9-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
-            "files": [
-                "Resources/functions/dump.php"
-            ],
             "psr-4": {
-                "Symfony\\Component\\VarDumper\\": ""
+                "Symfony\\Polyfill\\Ctype\\": ""
             },
-            "exclude-from-classmap": [
-                "/Tests/"
+            "files": [
+                "bootstrap.php"
             ]
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -2341,58 +2334,105 @@
             "MIT"
         ],
         "authors": [
-            {
-                "name": "Nicolas Grekas",
-                "email": "p@tchwork.com"
-            },
             {
                 "name": "Symfony Community",
                 "homepage": "https://symfony.com/contributors"
+            },
+            {
+                "name": "Gert de Pagter",
+                "email": "BackEndTea@gmail.com"
             }
         ],
-        "description": "Symfony mechanism for exploring and dumping PHP variables",
+        "description": "Symfony polyfill for ctype functions",
         "homepage": "https://symfony.com",
         "keywords": [
-            "debug",
-            "dump"
+            "compatibility",
+            "ctype",
+            "polyfill",
+            "portable"
         ]
     },
     {
-        "name": "symfony/debug",
-        "version": "v3.4.11",
-        "version_normalized": "3.4.11.0",
+        "name": "paragonie/random_compat",
+        "version": "v9.99.99",
+        "version_normalized": "9.99.99.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/debug.git",
-            "reference": "b28fd73fefbac341f673f5efd707d539d6a19f68"
+            "url": "https://github.com/paragonie/random_compat.git",
+            "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/debug/zipball/b28fd73fefbac341f673f5efd707d539d6a19f68",
-            "reference": "b28fd73fefbac341f673f5efd707d539d6a19f68",
+            "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+            "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
             "shasum": ""
         },
         "require": {
-            "php": "^5.5.9|>=7.0.8",
-            "psr/log": "~1.0"
+            "php": "^7"
         },
-        "conflict": {
-            "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
+        "require-dev": {
+            "phpunit/phpunit": "4.*|5.*",
+            "vimeo/psalm": "^1"
+        },
+        "suggest": {
+            "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+        },
+        "time": "2018-07-02T15:55:56+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Paragon Initiative Enterprises",
+                "email": "security@paragonie.com",
+                "homepage": "https://paragonie.com"
+            }
+        ],
+        "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+        "keywords": [
+            "csprng",
+            "polyfill",
+            "pseudorandom",
+            "random"
+        ]
+    },
+    {
+        "name": "symfony/http-foundation",
+        "version": "v4.1.6",
+        "version_normalized": "4.1.6.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/http-foundation.git",
+            "reference": "d528136617ff24f530e70df9605acc1b788b08d4"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d528136617ff24f530e70df9605acc1b788b08d4",
+            "reference": "d528136617ff24f530e70df9605acc1b788b08d4",
+            "shasum": ""
+        },
+        "require": {
+            "php": "^7.1.3",
+            "symfony/polyfill-mbstring": "~1.1"
         },
         "require-dev": {
-            "symfony/http-kernel": "~2.8|~3.0|~4.0"
+            "predis/predis": "~1.0",
+            "symfony/expression-language": "~3.4|~4.0"
         },
-        "time": "2018-05-16T14:03:39+00:00",
+        "time": "2018-10-03T08:48:45+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "3.4-dev"
+                "dev-master": "4.1-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
-                "Symfony\\Component\\Debug\\": ""
+                "Symfony\\Component\\HttpFoundation\\": ""
             },
             "exclude-from-classmap": [
                 "/Tests/"
@@ -2412,58 +2452,52 @@
                 "homepage": "https://symfony.com/contributors"
             }
         ],
-        "description": "Symfony Debug Component",
+        "description": "Symfony HttpFoundation Component",
         "homepage": "https://symfony.com"
     },
     {
-        "name": "symfony/console",
-        "version": "v3.4.11",
-        "version_normalized": "3.4.11.0",
+        "name": "symfony/event-dispatcher",
+        "version": "v4.1.6",
+        "version_normalized": "4.1.6.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/console.git",
-            "reference": "36f83f642443c46f3cf751d4d2ee5d047d757a27"
+            "url": "https://github.com/symfony/event-dispatcher.git",
+            "reference": "bfb30c2ad377615a463ebbc875eba64a99f6aa3e"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/console/zipball/36f83f642443c46f3cf751d4d2ee5d047d757a27",
-            "reference": "36f83f642443c46f3cf751d4d2ee5d047d757a27",
+            "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/bfb30c2ad377615a463ebbc875eba64a99f6aa3e",
+            "reference": "bfb30c2ad377615a463ebbc875eba64a99f6aa3e",
             "shasum": ""
         },
         "require": {
-            "php": "^5.5.9|>=7.0.8",
-            "symfony/debug": "~2.8|~3.0|~4.0",
-            "symfony/polyfill-mbstring": "~1.0"
+            "php": "^7.1.3"
         },
         "conflict": {
-            "symfony/dependency-injection": "<3.4",
-            "symfony/process": "<3.3"
+            "symfony/dependency-injection": "<3.4"
         },
         "require-dev": {
             "psr/log": "~1.0",
-            "symfony/config": "~3.3|~4.0",
+            "symfony/config": "~3.4|~4.0",
             "symfony/dependency-injection": "~3.4|~4.0",
-            "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
-            "symfony/lock": "~3.4|~4.0",
-            "symfony/process": "~3.3|~4.0"
+            "symfony/expression-language": "~3.4|~4.0",
+            "symfony/stopwatch": "~3.4|~4.0"
         },
         "suggest": {
-            "psr/log-implementation": "For using the console logger",
-            "symfony/event-dispatcher": "",
-            "symfony/lock": "",
-            "symfony/process": ""
+            "symfony/dependency-injection": "",
+            "symfony/http-kernel": ""
         },
-        "time": "2018-05-16T08:49:21+00:00",
+        "time": "2018-07-26T09:10:45+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "3.4-dev"
+                "dev-master": "4.1-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
-                "Symfony\\Component\\Console\\": ""
+                "Symfony\\Component\\EventDispatcher\\": ""
             },
             "exclude-from-classmap": [
                 "/Tests/"
@@ -2483,114 +2517,105 @@
                 "homepage": "https://symfony.com/contributors"
             }
         ],
-        "description": "Symfony Console Component",
+        "description": "Symfony EventDispatcher Component",
         "homepage": "https://symfony.com"
     },
     {
-        "name": "nikic/php-parser",
-        "version": "v4.0.2",
-        "version_normalized": "4.0.2.0",
+        "name": "symfony/debug",
+        "version": "v4.1.6",
+        "version_normalized": "4.1.6.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/nikic/PHP-Parser.git",
-            "reference": "35b8caf75e791ba1b2d24fec1552168d72692b12"
+            "url": "https://github.com/symfony/debug.git",
+            "reference": "e3f76ce6198f81994e019bb2b4e533e9de1b9b90"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/35b8caf75e791ba1b2d24fec1552168d72692b12",
-            "reference": "35b8caf75e791ba1b2d24fec1552168d72692b12",
+            "url": "https://api.github.com/repos/symfony/debug/zipball/e3f76ce6198f81994e019bb2b4e533e9de1b9b90",
+            "reference": "e3f76ce6198f81994e019bb2b4e533e9de1b9b90",
             "shasum": ""
         },
         "require": {
-            "ext-tokenizer": "*",
-            "php": ">=7.0"
+            "php": "^7.1.3",
+            "psr/log": "~1.0"
+        },
+        "conflict": {
+            "symfony/http-kernel": "<3.4"
         },
         "require-dev": {
-            "phpunit/phpunit": "^6.5 || ^7.0"
+            "symfony/http-kernel": "~3.4|~4.0"
         },
-        "time": "2018-06-03T11:33:10+00:00",
-        "bin": [
-            "bin/php-parse"
-        ],
+        "time": "2018-10-02T16:36:10+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "4.0-dev"
+                "dev-master": "4.1-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
-                "PhpParser\\": "lib/PhpParser"
-            }
+                "Symfony\\Component\\Debug\\": ""
+            },
+            "exclude-from-classmap": [
+                "/Tests/"
+            ]
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
-            "BSD-3-Clause"
+            "MIT"
         ],
         "authors": [
             {
-                "name": "Nikita Popov"
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
             }
         ],
-        "description": "A PHP parser written in PHP",
-        "keywords": [
-            "parser",
-            "php"
-        ]
+        "description": "Symfony Debug Component",
+        "homepage": "https://symfony.com"
     },
     {
-        "name": "psy/psysh",
-        "version": "v0.9.6",
-        "version_normalized": "0.9.6.0",
+        "name": "egulias/email-validator",
+        "version": "2.1.6",
+        "version_normalized": "2.1.6.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/bobthecow/psysh.git",
-            "reference": "4a2ce86f199d51b6e2524214dc06835e872f4fce"
+            "url": "https://github.com/egulias/EmailValidator.git",
+            "reference": "0578b32b30b22de3e8664f797cf846fc9246f786"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/bobthecow/psysh/zipball/4a2ce86f199d51b6e2524214dc06835e872f4fce",
-            "reference": "4a2ce86f199d51b6e2524214dc06835e872f4fce",
+            "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/0578b32b30b22de3e8664f797cf846fc9246f786",
+            "reference": "0578b32b30b22de3e8664f797cf846fc9246f786",
             "shasum": ""
         },
         "require": {
-            "dnoegel/php-xdg-base-dir": "0.1",
-            "jakub-onderka/php-console-highlighter": "0.3.*",
-            "nikic/php-parser": "~1.3|~2.0|~3.0|~4.0",
-            "php": ">=5.4.0",
-            "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0",
-            "symfony/var-dumper": "~2.7|~3.0|~4.0"
+            "doctrine/lexer": "^1.0.1",
+            "php": ">= 5.5"
         },
         "require-dev": {
-            "bamarni/composer-bin-plugin": "^1.2",
-            "hoa/console": "~2.15|~3.16",
-            "phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0"
+            "dominicsayers/isemail": "dev-master",
+            "phpunit/phpunit": "^4.8.35||^5.7||^6.0",
+            "satooshi/php-coveralls": "^1.0.1"
         },
         "suggest": {
-            "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
-            "ext-pdo-sqlite": "The doc command requires SQLite to work.",
-            "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.",
-            "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history.",
-            "hoa/console": "A pure PHP readline implementation. You'll want this if your PHP install doesn't already support readline or libedit."
+            "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
         },
-        "time": "2018-06-10T17:57:20+00:00",
-        "bin": [
-            "bin/psysh"
-        ],
+        "time": "2018-09-25T20:47:26+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-develop": "0.9.x-dev"
+                "dev-master": "2.0.x-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
-            "files": [
-                "src/functions.php"
-            ],
             "psr-4": {
-                "Psy\\": "src/"
+                "Egulias\\EmailValidator\\": "EmailValidator"
             }
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -2599,52 +2624,57 @@
         ],
         "authors": [
             {
-                "name": "Justin Hileman",
-                "email": "justin@justinhileman.info",
-                "homepage": "http://justinhileman.com"
+                "name": "Eduardo Gulias Davis"
             }
         ],
-        "description": "An interactive shell for modern PHP.",
-        "homepage": "http://psysh.org",
+        "description": "A library for validating emails against several RFCs",
+        "homepage": "https://github.com/egulias/EmailValidator",
         "keywords": [
-            "REPL",
-            "console",
-            "interactive",
-            "shell"
+            "email",
+            "emailvalidation",
+            "emailvalidator",
+            "validation",
+            "validator"
         ]
     },
     {
-        "name": "symfony/css-selector",
-        "version": "v4.1.0",
-        "version_normalized": "4.1.0.0",
+        "name": "swiftmailer/swiftmailer",
+        "version": "v6.1.3",
+        "version_normalized": "6.1.3.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/css-selector.git",
-            "reference": "03ac71606ecb0b0ce792faa17d74cc32c2949ef4"
+            "url": "https://github.com/swiftmailer/swiftmailer.git",
+            "reference": "8ddcb66ac10c392d3beb54829eef8ac1438595f4"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/css-selector/zipball/03ac71606ecb0b0ce792faa17d74cc32c2949ef4",
-            "reference": "03ac71606ecb0b0ce792faa17d74cc32c2949ef4",
+            "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8ddcb66ac10c392d3beb54829eef8ac1438595f4",
+            "reference": "8ddcb66ac10c392d3beb54829eef8ac1438595f4",
             "shasum": ""
         },
         "require": {
-            "php": "^7.1.3"
+            "egulias/email-validator": "~2.0",
+            "php": ">=7.0.0"
         },
-        "time": "2018-05-30T07:26:09+00:00",
+        "require-dev": {
+            "mockery/mockery": "~0.9.1",
+            "symfony/phpunit-bridge": "~3.3@dev"
+        },
+        "suggest": {
+            "ext-intl": "Needed to support internationalized email addresses",
+            "true/punycode": "Needed to support internationalized email addresses, if ext-intl is not installed"
+        },
+        "time": "2018-09-11T07:12:52+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "4.1-dev"
+                "dev-master": "6.1-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\CssSelector\\": ""
-            },
-            "exclude-from-classmap": [
-                "/Tests/"
+            "files": [
+                "lib/swift_required.php"
             ]
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -2653,77 +2683,77 @@
         ],
         "authors": [
             {
-                "name": "Jean-François Simon",
-                "email": "jeanfrancois.simon@sensiolabs.com"
+                "name": "Chris Corbyn"
             },
             {
                 "name": "Fabien Potencier",
                 "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
             }
         ],
-        "description": "Symfony CssSelector Component",
-        "homepage": "https://symfony.com"
+        "description": "Swiftmailer, free feature-rich PHP mailer",
+        "homepage": "https://swiftmailer.symfony.com",
+        "keywords": [
+            "email",
+            "mail",
+            "mailer"
+        ]
     },
     {
-        "name": "symfony/routing",
-        "version": "v3.4.11",
-        "version_normalized": "3.4.11.0",
+        "name": "ramsey/uuid",
+        "version": "3.8.0",
+        "version_normalized": "3.8.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/routing.git",
-            "reference": "e382da877f5304aabc12ec3073eec430670c8296"
+            "url": "https://github.com/ramsey/uuid.git",
+            "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/routing/zipball/e382da877f5304aabc12ec3073eec430670c8296",
-            "reference": "e382da877f5304aabc12ec3073eec430670c8296",
+            "url": "https://api.github.com/repos/ramsey/uuid/zipball/d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
+            "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
             "shasum": ""
         },
         "require": {
-            "php": "^5.5.9|>=7.0.8"
+            "paragonie/random_compat": "^1.0|^2.0|9.99.99",
+            "php": "^5.4 || ^7.0",
+            "symfony/polyfill-ctype": "^1.8"
         },
-        "conflict": {
-            "symfony/config": "<3.3.1",
-            "symfony/dependency-injection": "<3.3",
-            "symfony/yaml": "<3.4"
+        "replace": {
+            "rhumsaa/uuid": "self.version"
         },
         "require-dev": {
-            "doctrine/annotations": "~1.0",
-            "doctrine/common": "~2.2",
-            "psr/log": "~1.0",
-            "symfony/config": "^3.3.1|~4.0",
-            "symfony/dependency-injection": "~3.3|~4.0",
-            "symfony/expression-language": "~2.8|~3.0|~4.0",
-            "symfony/http-foundation": "~2.8|~3.0|~4.0",
-            "symfony/yaml": "~3.4|~4.0"
+            "codeception/aspect-mock": "^1.0 | ~2.0.0",
+            "doctrine/annotations": "~1.2.0",
+            "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ~2.1.0",
+            "ircmaxell/random-lib": "^1.1",
+            "jakub-onderka/php-parallel-lint": "^0.9.0",
+            "mockery/mockery": "^0.9.9",
+            "moontoast/math": "^1.1",
+            "php-mock/php-mock-phpunit": "^0.3|^1.1",
+            "phpunit/phpunit": "^4.7|^5.0|^6.5",
+            "squizlabs/php_codesniffer": "^2.3"
         },
         "suggest": {
-            "doctrine/annotations": "For using the annotation loader",
-            "symfony/config": "For using the all-in-one router or any loader",
-            "symfony/dependency-injection": "For loading routes from a service",
-            "symfony/expression-language": "For using expression matching",
-            "symfony/http-foundation": "For using a Symfony Request object",
-            "symfony/yaml": "For using the YAML loader"
+            "ext-ctype": "Provides support for PHP Ctype functions",
+            "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator",
+            "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator",
+            "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
+            "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).",
+            "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid",
+            "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type."
         },
-        "time": "2018-05-16T12:49:49+00:00",
+        "time": "2018-07-19T23:38:55+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "3.4-dev"
+                "dev-master": "3.x-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
-                "Symfony\\Component\\Routing\\": ""
-            },
-            "exclude-from-classmap": [
-                "/Tests/"
-            ]
+                "Ramsey\\Uuid\\": "src/"
+            }
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
@@ -2731,52 +2761,76 @@
         ],
         "authors": [
             {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
+                "name": "Marijn Huizendveld",
+                "email": "marijn.huizendveld@gmail.com"
             },
             {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
+                "name": "Thibaud Fabre",
+                "email": "thibaud@aztech.io"
+            },
+            {
+                "name": "Ben Ramsey",
+                "email": "ben@benramsey.com",
+                "homepage": "https://benramsey.com"
             }
         ],
-        "description": "Symfony Routing Component",
-        "homepage": "https://symfony.com",
+        "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
+        "homepage": "https://github.com/ramsey/uuid",
         "keywords": [
-            "router",
-            "routing",
-            "uri",
-            "url"
+            "guid",
+            "identifier",
+            "uuid"
         ]
     },
     {
-        "name": "symfony/process",
-        "version": "v3.4.11",
-        "version_normalized": "3.4.11.0",
+        "name": "symfony/translation",
+        "version": "v4.1.6",
+        "version_normalized": "4.1.6.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/process.git",
-            "reference": "4cbf2db9abcb01486a21b7a059e03a62fae63187"
+            "url": "https://github.com/symfony/translation.git",
+            "reference": "9f0b61e339160a466ebcde167a6c5521c810e304"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/process/zipball/4cbf2db9abcb01486a21b7a059e03a62fae63187",
-            "reference": "4cbf2db9abcb01486a21b7a059e03a62fae63187",
+            "url": "https://api.github.com/repos/symfony/translation/zipball/9f0b61e339160a466ebcde167a6c5521c810e304",
+            "reference": "9f0b61e339160a466ebcde167a6c5521c810e304",
             "shasum": ""
         },
         "require": {
-            "php": "^5.5.9|>=7.0.8"
+            "php": "^7.1.3",
+            "symfony/polyfill-mbstring": "~1.0"
+        },
+        "conflict": {
+            "symfony/config": "<3.4",
+            "symfony/dependency-injection": "<3.4",
+            "symfony/yaml": "<3.4"
+        },
+        "require-dev": {
+            "psr/log": "~1.0",
+            "symfony/config": "~3.4|~4.0",
+            "symfony/console": "~3.4|~4.0",
+            "symfony/dependency-injection": "~3.4|~4.0",
+            "symfony/finder": "~2.8|~3.0|~4.0",
+            "symfony/intl": "~3.4|~4.0",
+            "symfony/yaml": "~3.4|~4.0"
         },
-        "time": "2018-05-16T08:49:21+00:00",
+        "suggest": {
+            "psr/log-implementation": "To use logging capability in translator",
+            "symfony/config": "",
+            "symfony/yaml": ""
+        },
+        "time": "2018-10-02T16:36:10+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "3.4-dev"
+                "dev-master": "4.1-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
-                "Symfony\\Component\\Process\\": ""
+                "Symfony\\Component\\Translation\\": ""
             },
             "exclude-from-classmap": [
                 "/Tests/"
@@ -2796,40 +2850,46 @@
                 "homepage": "https://symfony.com/contributors"
             }
         ],
-        "description": "Symfony Process Component",
+        "description": "Symfony Translation Component",
         "homepage": "https://symfony.com"
     },
     {
-        "name": "paragonie/random_compat",
-        "version": "v2.0.15",
-        "version_normalized": "2.0.15.0",
+        "name": "nesbot/carbon",
+        "version": "1.34.0",
+        "version_normalized": "1.34.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/paragonie/random_compat.git",
-            "reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09"
+            "url": "https://github.com/briannesbitt/Carbon.git",
+            "reference": "1dbd3cb01c5645f3e7deda7aa46ef780d95fcc33"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/paragonie/random_compat/zipball/10bcb46e8f3d365170f6de9d05245aa066b81f09",
-            "reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09",
+            "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/1dbd3cb01c5645f3e7deda7aa46ef780d95fcc33",
+            "reference": "1dbd3cb01c5645f3e7deda7aa46ef780d95fcc33",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.2.0"
+            "php": ">=5.3.9",
+            "symfony/translation": "~2.6 || ~3.0 || ~4.0"
         },
         "require-dev": {
-            "phpunit/phpunit": "4.*|5.*"
-        },
-        "suggest": {
-            "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+            "friendsofphp/php-cs-fixer": "~2",
+            "phpunit/phpunit": "^4.8.35 || ^5.7"
         },
-        "time": "2018-06-08T15:26:40+00:00",
+        "time": "2018-09-20T19:36:25+00:00",
         "type": "library",
+        "extra": {
+            "laravel": {
+                "providers": [
+                    "Carbon\\Laravel\\ServiceProvider"
+                ]
+            }
+        },
         "installation-source": "dist",
         "autoload": {
-            "files": [
-                "lib/random.php"
-            ]
+            "psr-4": {
+                "": "src/"
+            }
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
@@ -2837,55 +2897,51 @@
         ],
         "authors": [
             {
-                "name": "Paragon Initiative Enterprises",
-                "email": "security@paragonie.com",
-                "homepage": "https://paragonie.com"
+                "name": "Brian Nesbitt",
+                "email": "brian@nesbot.com",
+                "homepage": "http://nesbot.com"
             }
         ],
-        "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+        "description": "A simple API extension for DateTime.",
+        "homepage": "http://carbon.nesbot.com",
         "keywords": [
-            "csprng",
-            "polyfill",
-            "pseudorandom",
-            "random"
+            "date",
+            "datetime",
+            "time"
         ]
     },
     {
-        "name": "symfony/polyfill-php70",
-        "version": "v1.8.0",
-        "version_normalized": "1.8.0.0",
+        "name": "symfony/polyfill-php72",
+        "version": "v1.9.0",
+        "version_normalized": "1.9.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/polyfill-php70.git",
-            "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6"
+            "url": "https://github.com/symfony/polyfill-php72.git",
+            "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/77454693d8f10dd23bb24955cffd2d82db1007a6",
-            "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6",
+            "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/95c50420b0baed23852452a7f0c7b527303ed5ae",
+            "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae",
             "shasum": ""
         },
         "require": {
-            "paragonie/random_compat": "~1.0|~2.0",
             "php": ">=5.3.3"
         },
-        "time": "2018-04-26T10:06:28+00:00",
+        "time": "2018-08-06T14:22:27+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "1.8-dev"
+                "dev-master": "1.9-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
-                "Symfony\\Polyfill\\Php70\\": ""
+                "Symfony\\Polyfill\\Php72\\": ""
             },
             "files": [
                 "bootstrap.php"
-            ],
-            "classmap": [
-                "Resources/stubs"
             ]
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -2902,7 +2958,7 @@
                 "homepage": "https://symfony.com/contributors"
             }
         ],
-        "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
+        "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
         "homepage": "https://symfony.com",
         "keywords": [
             "compatibility",
@@ -2912,39 +2968,56 @@
         ]
     },
     {
-        "name": "symfony/http-foundation",
-        "version": "v3.4.11",
-        "version_normalized": "3.4.11.0",
+        "name": "symfony/var-dumper",
+        "version": "v4.1.6",
+        "version_normalized": "4.1.6.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/http-foundation.git",
-            "reference": "a7b5fc605d1c215cea1122359044b1e682eb70c0"
+            "url": "https://github.com/symfony/var-dumper.git",
+            "reference": "60319b45653580b0cdacca499344577d87732f16"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a7b5fc605d1c215cea1122359044b1e682eb70c0",
-            "reference": "a7b5fc605d1c215cea1122359044b1e682eb70c0",
+            "url": "https://api.github.com/repos/symfony/var-dumper/zipball/60319b45653580b0cdacca499344577d87732f16",
+            "reference": "60319b45653580b0cdacca499344577d87732f16",
             "shasum": ""
         },
         "require": {
-            "php": "^5.5.9|>=7.0.8",
-            "symfony/polyfill-mbstring": "~1.1",
-            "symfony/polyfill-php70": "~1.6"
+            "php": "^7.1.3",
+            "symfony/polyfill-mbstring": "~1.0",
+            "symfony/polyfill-php72": "~1.5"
+        },
+        "conflict": {
+            "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
+            "symfony/console": "<3.4"
         },
         "require-dev": {
-            "symfony/expression-language": "~2.8|~3.0|~4.0"
+            "ext-iconv": "*",
+            "symfony/process": "~3.4|~4.0",
+            "twig/twig": "~1.34|~2.4"
+        },
+        "suggest": {
+            "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
+            "ext-intl": "To show region name in time zone dump",
+            "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script"
         },
-        "time": "2018-05-25T11:07:31+00:00",
+        "time": "2018-10-02T16:36:10+00:00",
+        "bin": [
+            "Resources/bin/var-dump-server"
+        ],
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "3.4-dev"
+                "dev-master": "4.1-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
+            "files": [
+                "Resources/functions/dump.php"
+            ],
             "psr-4": {
-                "Symfony\\Component\\HttpFoundation\\": ""
+                "Symfony\\Component\\VarDumper\\": ""
             },
             "exclude-from-classmap": [
                 "/Tests/"
@@ -2956,50 +3029,62 @@
         ],
         "authors": [
             {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
+                "name": "Nicolas Grekas",
+                "email": "p@tchwork.com"
             },
             {
                 "name": "Symfony Community",
                 "homepage": "https://symfony.com/contributors"
             }
         ],
-        "description": "Symfony HttpFoundation Component",
-        "homepage": "https://symfony.com"
+        "description": "Symfony mechanism for exploring and dumping PHP variables",
+        "homepage": "https://symfony.com",
+        "keywords": [
+            "debug",
+            "dump"
+        ]
     },
     {
-        "name": "symfony/event-dispatcher",
-        "version": "v4.1.0",
-        "version_normalized": "4.1.0.0",
+        "name": "symfony/routing",
+        "version": "v4.1.6",
+        "version_normalized": "4.1.6.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/event-dispatcher.git",
-            "reference": "2391ed210a239868e7256eb6921b1bd83f3087b5"
+            "url": "https://github.com/symfony/routing.git",
+            "reference": "537803f0bdfede36b9acef052d2e4d447d9fa0e9"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2391ed210a239868e7256eb6921b1bd83f3087b5",
-            "reference": "2391ed210a239868e7256eb6921b1bd83f3087b5",
+            "url": "https://api.github.com/repos/symfony/routing/zipball/537803f0bdfede36b9acef052d2e4d447d9fa0e9",
+            "reference": "537803f0bdfede36b9acef052d2e4d447d9fa0e9",
             "shasum": ""
         },
         "require": {
             "php": "^7.1.3"
         },
         "conflict": {
-            "symfony/dependency-injection": "<3.4"
+            "symfony/config": "<3.4",
+            "symfony/dependency-injection": "<3.4",
+            "symfony/yaml": "<3.4"
         },
         "require-dev": {
+            "doctrine/annotations": "~1.0",
             "psr/log": "~1.0",
             "symfony/config": "~3.4|~4.0",
             "symfony/dependency-injection": "~3.4|~4.0",
             "symfony/expression-language": "~3.4|~4.0",
-            "symfony/stopwatch": "~3.4|~4.0"
+            "symfony/http-foundation": "~3.4|~4.0",
+            "symfony/yaml": "~3.4|~4.0"
         },
         "suggest": {
-            "symfony/dependency-injection": "",
-            "symfony/http-kernel": ""
+            "doctrine/annotations": "For using the annotation loader",
+            "symfony/config": "For using the all-in-one router or any loader",
+            "symfony/dependency-injection": "For loading routes from a service",
+            "symfony/expression-language": "For using expression matching",
+            "symfony/http-foundation": "For using a Symfony Request object",
+            "symfony/yaml": "For using the YAML loader"
         },
-        "time": "2018-04-06T07:35:57+00:00",
+        "time": "2018-10-02T12:40:59+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -3009,7 +3094,7 @@
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
-                "Symfony\\Component\\EventDispatcher\\": ""
+                "Symfony\\Component\\Routing\\": ""
             },
             "exclude-from-classmap": [
                 "/Tests/"
@@ -3029,41 +3114,47 @@
                 "homepage": "https://symfony.com/contributors"
             }
         ],
-        "description": "Symfony EventDispatcher Component",
-        "homepage": "https://symfony.com"
+        "description": "Symfony Routing Component",
+        "homepage": "https://symfony.com",
+        "keywords": [
+            "router",
+            "routing",
+            "uri",
+            "url"
+        ]
     },
     {
-        "name": "symfony/polyfill-ctype",
-        "version": "v1.8.0",
-        "version_normalized": "1.8.0.0",
+        "name": "symfony/process",
+        "version": "v4.1.6",
+        "version_normalized": "4.1.6.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/polyfill-ctype.git",
-            "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae"
+            "url": "https://github.com/symfony/process.git",
+            "reference": "ee33c0322a8fee0855afcc11fff81e6b1011b529"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
-            "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
+            "url": "https://api.github.com/repos/symfony/process/zipball/ee33c0322a8fee0855afcc11fff81e6b1011b529",
+            "reference": "ee33c0322a8fee0855afcc11fff81e6b1011b529",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.3"
+            "php": "^7.1.3"
         },
-        "time": "2018-04-30T19:57:29+00:00",
+        "time": "2018-10-02T12:40:59+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "1.8-dev"
+                "dev-master": "4.1-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
-                "Symfony\\Polyfill\\Ctype\\": ""
+                "Symfony\\Component\\Process\\": ""
             },
-            "files": [
-                "bootstrap.php"
+            "exclude-from-classmap": [
+                "/Tests/"
             ]
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -3072,50 +3163,44 @@
         ],
         "authors": [
             {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
             },
             {
-                "name": "Gert de Pagter",
-                "email": "BackEndTea@gmail.com"
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
             }
         ],
-        "description": "Symfony polyfill for ctype functions",
-        "homepage": "https://symfony.com",
-        "keywords": [
-            "compatibility",
-            "ctype",
-            "polyfill",
-            "portable"
-        ]
+        "description": "Symfony Process Component",
+        "homepage": "https://symfony.com"
     },
     {
         "name": "symfony/http-kernel",
-        "version": "v3.4.11",
-        "version_normalized": "3.4.11.0",
+        "version": "v4.1.6",
+        "version_normalized": "4.1.6.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/http-kernel.git",
-            "reference": "3dac45df55ee0c5134c457a730cd68e2a2ce0445"
+            "reference": "f5e7c15a5d010be0e16ce798594c5960451d4220"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3dac45df55ee0c5134c457a730cd68e2a2ce0445",
-            "reference": "3dac45df55ee0c5134c457a730cd68e2a2ce0445",
+            "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f5e7c15a5d010be0e16ce798594c5960451d4220",
+            "reference": "f5e7c15a5d010be0e16ce798594c5960451d4220",
             "shasum": ""
         },
         "require": {
-            "php": "^5.5.9|>=7.0.8",
+            "php": "^7.1.3",
             "psr/log": "~1.0",
-            "symfony/debug": "~2.8|~3.0|~4.0",
-            "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
-            "symfony/http-foundation": "^3.4.4|^4.0.4",
+            "symfony/debug": "~3.4|~4.0",
+            "symfony/event-dispatcher": "~4.1",
+            "symfony/http-foundation": "^4.1.1",
             "symfony/polyfill-ctype": "~1.8"
         },
         "conflict": {
-            "symfony/config": "<2.8",
-            "symfony/dependency-injection": "<3.4.5|<4.0.5,>=4",
-            "symfony/var-dumper": "<3.3",
+            "symfony/config": "<3.4",
+            "symfony/dependency-injection": "<4.1",
+            "symfony/var-dumper": "<4.1.1",
             "twig/twig": "<1.34|<2.4,>=2"
         },
         "provide": {
@@ -3123,41 +3208,90 @@
         },
         "require-dev": {
             "psr/cache": "~1.0",
-            "symfony/browser-kit": "~2.8|~3.0|~4.0",
-            "symfony/class-loader": "~2.8|~3.0",
-            "symfony/config": "~2.8|~3.0|~4.0",
-            "symfony/console": "~2.8|~3.0|~4.0",
-            "symfony/css-selector": "~2.8|~3.0|~4.0",
-            "symfony/dependency-injection": "^3.4.5|^4.0.5",
-            "symfony/dom-crawler": "~2.8|~3.0|~4.0",
-            "symfony/expression-language": "~2.8|~3.0|~4.0",
-            "symfony/finder": "~2.8|~3.0|~4.0",
-            "symfony/process": "~2.8|~3.0|~4.0",
+            "symfony/browser-kit": "~3.4|~4.0",
+            "symfony/config": "~3.4|~4.0",
+            "symfony/console": "~3.4|~4.0",
+            "symfony/css-selector": "~3.4|~4.0",
+            "symfony/dependency-injection": "^4.1",
+            "symfony/dom-crawler": "~3.4|~4.0",
+            "symfony/expression-language": "~3.4|~4.0",
+            "symfony/finder": "~3.4|~4.0",
+            "symfony/process": "~3.4|~4.0",
             "symfony/routing": "~3.4|~4.0",
-            "symfony/stopwatch": "~2.8|~3.0|~4.0",
-            "symfony/templating": "~2.8|~3.0|~4.0",
-            "symfony/translation": "~2.8|~3.0|~4.0",
-            "symfony/var-dumper": "~3.3|~4.0"
+            "symfony/stopwatch": "~3.4|~4.0",
+            "symfony/templating": "~3.4|~4.0",
+            "symfony/translation": "~3.4|~4.0",
+            "symfony/var-dumper": "^4.1.1"
         },
         "suggest": {
             "symfony/browser-kit": "",
             "symfony/config": "",
             "symfony/console": "",
             "symfony/dependency-injection": "",
-            "symfony/finder": "",
             "symfony/var-dumper": ""
         },
-        "time": "2018-05-25T13:16:28+00:00",
+        "time": "2018-10-03T12:53:38+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "4.1-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\HttpKernel\\": ""
+            },
+            "exclude-from-classmap": [
+                "/Tests/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony HttpKernel Component",
+        "homepage": "https://symfony.com"
+    },
+    {
+        "name": "symfony/finder",
+        "version": "v4.1.6",
+        "version_normalized": "4.1.6.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/finder.git",
+            "reference": "1f17195b44543017a9c9b2d437c670627e96ad06"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/finder/zipball/1f17195b44543017a9c9b2d437c670627e96ad06",
+            "reference": "1f17195b44543017a9c9b2d437c670627e96ad06",
+            "shasum": ""
+        },
+        "require": {
+            "php": "^7.1.3"
+        },
+        "time": "2018-10-03T08:47:56+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "3.4-dev"
+                "dev-master": "4.1-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
-                "Symfony\\Component\\HttpKernel\\": ""
+                "Symfony\\Component\\Finder\\": ""
             },
             "exclude-from-classmap": [
                 "/Tests/"
@@ -3177,38 +3311,57 @@
                 "homepage": "https://symfony.com/contributors"
             }
         ],
-        "description": "Symfony HttpKernel Component",
+        "description": "Symfony Finder Component",
         "homepage": "https://symfony.com"
     },
     {
-        "name": "symfony/finder",
-        "version": "v3.4.11",
-        "version_normalized": "3.4.11.0",
+        "name": "symfony/console",
+        "version": "v4.1.6",
+        "version_normalized": "4.1.6.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/finder.git",
-            "reference": "472a92f3df8b247b49ae364275fb32943b9656c6"
+            "url": "https://github.com/symfony/console.git",
+            "reference": "dc7122fe5f6113cfaba3b3de575d31112c9aa60b"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/finder/zipball/472a92f3df8b247b49ae364275fb32943b9656c6",
-            "reference": "472a92f3df8b247b49ae364275fb32943b9656c6",
+            "url": "https://api.github.com/repos/symfony/console/zipball/dc7122fe5f6113cfaba3b3de575d31112c9aa60b",
+            "reference": "dc7122fe5f6113cfaba3b3de575d31112c9aa60b",
             "shasum": ""
         },
         "require": {
-            "php": "^5.5.9|>=7.0.8"
+            "php": "^7.1.3",
+            "symfony/polyfill-mbstring": "~1.0"
+        },
+        "conflict": {
+            "symfony/dependency-injection": "<3.4",
+            "symfony/process": "<3.3"
+        },
+        "require-dev": {
+            "psr/log": "~1.0",
+            "symfony/config": "~3.4|~4.0",
+            "symfony/dependency-injection": "~3.4|~4.0",
+            "symfony/event-dispatcher": "~3.4|~4.0",
+            "symfony/lock": "~3.4|~4.0",
+            "symfony/process": "~3.4|~4.0"
+        },
+        "suggest": {
+            "psr/log-implementation": "For using the console logger",
+            "symfony/event-dispatcher": "",
+            "symfony/lock": "",
+            "symfony/process": ""
         },
-        "time": "2018-05-16T08:49:21+00:00",
+        "time": "2018-10-03T08:15:46+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "3.4-dev"
+                "dev-master": "4.1-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
-                "Symfony\\Component\\Finder\\": ""
+                "Symfony\\Component\\Console\\": ""
             },
             "exclude-from-classmap": [
                 "/Tests/"
@@ -3228,48 +3381,46 @@
                 "homepage": "https://symfony.com/contributors"
             }
         ],
-        "description": "Symfony Finder Component",
+        "description": "Symfony Console Component",
         "homepage": "https://symfony.com"
     },
     {
-        "name": "egulias/email-validator",
-        "version": "2.1.4",
-        "version_normalized": "2.1.4.0",
+        "name": "opis/closure",
+        "version": "3.1.1",
+        "version_normalized": "3.1.1.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/egulias/EmailValidator.git",
-            "reference": "8790f594151ca6a2010c6218e09d96df67173ad3"
+            "url": "https://github.com/opis/closure.git",
+            "reference": "d3209e46ad6c69a969b705df0738fd0dbe26ef9e"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/8790f594151ca6a2010c6218e09d96df67173ad3",
-            "reference": "8790f594151ca6a2010c6218e09d96df67173ad3",
+            "url": "https://api.github.com/repos/opis/closure/zipball/d3209e46ad6c69a969b705df0738fd0dbe26ef9e",
+            "reference": "d3209e46ad6c69a969b705df0738fd0dbe26ef9e",
             "shasum": ""
         },
         "require": {
-            "doctrine/lexer": "^1.0.1",
-            "php": ">= 5.5"
+            "php": "^5.4 || ^7.0"
         },
         "require-dev": {
-            "dominicsayers/isemail": "dev-master",
-            "phpunit/phpunit": "^4.8.35||^5.7||^6.0",
-            "satooshi/php-coveralls": "^1.0.1"
-        },
-        "suggest": {
-            "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
+            "jeremeamia/superclosure": "^2.0",
+            "phpunit/phpunit": "^4.0"
         },
-        "time": "2018-04-10T10:11:19+00:00",
+        "time": "2018-10-02T13:36:53+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "2.0.x-dev"
+                "dev-master": "3.0.x-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
-                "Egulias\\EmailValidator\\": "EmailValidator"
-            }
+                "Opis\\Closure\\": "src/"
+            },
+            "files": [
+                "functions.php"
+            ]
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
@@ -3277,48 +3428,52 @@
         ],
         "authors": [
             {
-                "name": "Eduardo Gulias Davis"
+                "name": "Marius Sarca",
+                "email": "marius.sarca@gmail.com"
+            },
+            {
+                "name": "Sorin Sarca",
+                "email": "sarca_sorin@hotmail.com"
             }
         ],
-        "description": "A library for validating emails against several RFCs",
-        "homepage": "https://github.com/egulias/EmailValidator",
+        "description": "A library that can be used to serialize closures (anonymous functions) and arbitrary objects.",
+        "homepage": "https://opis.io/closure",
         "keywords": [
-            "email",
-            "emailvalidation",
-            "emailvalidator",
-            "validation",
-            "validator"
+            "anonymous functions",
+            "closure",
+            "function",
+            "serializable",
+            "serialization",
+            "serialize"
         ]
     },
     {
-        "name": "psr/simple-cache",
-        "version": "1.0.1",
-        "version_normalized": "1.0.1.0",
+        "name": "dragonmantank/cron-expression",
+        "version": "v2.2.0",
+        "version_normalized": "2.2.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/php-fig/simple-cache.git",
-            "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
+            "url": "https://github.com/dragonmantank/cron-expression.git",
+            "reference": "92a2c3768d50e21a1f26a53cb795ce72806266c5"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
-            "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
+            "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/92a2c3768d50e21a1f26a53cb795ce72806266c5",
+            "reference": "92a2c3768d50e21a1f26a53cb795ce72806266c5",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.0"
+            "php": ">=7.0.0"
         },
-        "time": "2017-10-23T01:57:42+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
+        "require-dev": {
+            "phpunit/phpunit": "~6.4"
         },
+        "time": "2018-06-06T03:12:17+00:00",
+        "type": "library",
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
-                "Psr\\SimpleCache\\": "src/"
+                "Cron\\": "src/Cron/"
             }
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -3327,72 +3482,148 @@
         ],
         "authors": [
             {
-                "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
+                "name": "Michael Dowling",
+                "email": "mtdowling@gmail.com",
+                "homepage": "https://github.com/mtdowling"
+            },
+            {
+                "name": "Chris Tankersley",
+                "email": "chris@ctankersley.com",
+                "homepage": "https://github.com/dragonmantank"
             }
         ],
-        "description": "Common interfaces for simple caching",
+        "description": "CRON for PHP: Calculate the next or previous run date and determine if a CRON expression is due",
         "keywords": [
-            "cache",
-            "caching",
-            "psr",
-            "psr-16",
-            "simple-cache"
+            "cron",
+            "schedule"
         ]
     },
     {
-        "name": "symfony/translation",
-        "version": "v4.1.0",
-        "version_normalized": "4.1.0.0",
+        "name": "laravel/framework",
+        "version": "v5.7.9",
+        "version_normalized": "5.7.9.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/translation.git",
-            "reference": "16328f5b217cebc8dd4adfe4aeeaa8c377581f5a"
+            "url": "https://github.com/laravel/framework.git",
+            "reference": "172f69f86bb86e107fb9fafff293b4b01291cf05"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/translation/zipball/16328f5b217cebc8dd4adfe4aeeaa8c377581f5a",
-            "reference": "16328f5b217cebc8dd4adfe4aeeaa8c377581f5a",
+            "url": "https://api.github.com/repos/laravel/framework/zipball/172f69f86bb86e107fb9fafff293b4b01291cf05",
+            "reference": "172f69f86bb86e107fb9fafff293b4b01291cf05",
             "shasum": ""
         },
         "require": {
+            "doctrine/inflector": "^1.1",
+            "dragonmantank/cron-expression": "^2.0",
+            "erusev/parsedown": "^1.7",
+            "ext-mbstring": "*",
+            "ext-openssl": "*",
+            "league/flysystem": "^1.0.8",
+            "monolog/monolog": "^1.12",
+            "nesbot/carbon": "^1.26.3",
+            "opis/closure": "^3.1",
             "php": "^7.1.3",
-            "symfony/polyfill-mbstring": "~1.0"
+            "psr/container": "^1.0",
+            "psr/simple-cache": "^1.0",
+            "ramsey/uuid": "^3.7",
+            "swiftmailer/swiftmailer": "^6.0",
+            "symfony/console": "^4.1",
+            "symfony/debug": "^4.1",
+            "symfony/finder": "^4.1",
+            "symfony/http-foundation": "^4.1",
+            "symfony/http-kernel": "^4.1",
+            "symfony/process": "^4.1",
+            "symfony/routing": "^4.1",
+            "symfony/var-dumper": "^4.1",
+            "tijsverkoyen/css-to-inline-styles": "^2.2.1",
+            "vlucas/phpdotenv": "^2.2"
         },
         "conflict": {
-            "symfony/config": "<3.4",
-            "symfony/dependency-injection": "<3.4",
-            "symfony/yaml": "<3.4"
+            "tightenco/collect": "<5.5.33"
+        },
+        "replace": {
+            "illuminate/auth": "self.version",
+            "illuminate/broadcasting": "self.version",
+            "illuminate/bus": "self.version",
+            "illuminate/cache": "self.version",
+            "illuminate/config": "self.version",
+            "illuminate/console": "self.version",
+            "illuminate/container": "self.version",
+            "illuminate/contracts": "self.version",
+            "illuminate/cookie": "self.version",
+            "illuminate/database": "self.version",
+            "illuminate/encryption": "self.version",
+            "illuminate/events": "self.version",
+            "illuminate/filesystem": "self.version",
+            "illuminate/hashing": "self.version",
+            "illuminate/http": "self.version",
+            "illuminate/log": "self.version",
+            "illuminate/mail": "self.version",
+            "illuminate/notifications": "self.version",
+            "illuminate/pagination": "self.version",
+            "illuminate/pipeline": "self.version",
+            "illuminate/queue": "self.version",
+            "illuminate/redis": "self.version",
+            "illuminate/routing": "self.version",
+            "illuminate/session": "self.version",
+            "illuminate/support": "self.version",
+            "illuminate/translation": "self.version",
+            "illuminate/validation": "self.version",
+            "illuminate/view": "self.version"
         },
         "require-dev": {
-            "psr/log": "~1.0",
-            "symfony/config": "~3.4|~4.0",
-            "symfony/console": "~3.4|~4.0",
-            "symfony/dependency-injection": "~3.4|~4.0",
-            "symfony/finder": "~2.8|~3.0|~4.0",
-            "symfony/intl": "~3.4|~4.0",
-            "symfony/yaml": "~3.4|~4.0"
+            "aws/aws-sdk-php": "^3.0",
+            "doctrine/dbal": "^2.6",
+            "filp/whoops": "^2.1.4",
+            "league/flysystem-cached-adapter": "^1.0",
+            "mockery/mockery": "^1.0",
+            "moontoast/math": "^1.1",
+            "orchestra/testbench-core": "3.7.*",
+            "pda/pheanstalk": "^3.0",
+            "phpunit/phpunit": "^7.0",
+            "predis/predis": "^1.1.1",
+            "symfony/css-selector": "^4.1",
+            "symfony/dom-crawler": "^4.1",
+            "true/punycode": "^2.1"
         },
         "suggest": {
-            "psr/log-implementation": "To use logging capability in translator",
-            "symfony/config": "",
-            "symfony/yaml": ""
-        },
-        "time": "2018-05-30T07:26:09+00:00",
+            "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.6).",
+            "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).",
+            "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).",
+            "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).",
+            "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (^1.0).",
+            "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
+            "moontoast/math": "Required to use ordered UUIDs (^1.1).",
+            "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 (^3.0).",
+            "symfony/css-selector": "Required to use some of the crawler integration testing tools (^4.1).",
+            "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (^4.1).",
+            "symfony/psr-http-message-bridge": "Required to psr7 bridging features (^1.0)."
+        },
+        "time": "2018-10-09T13:28:28+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "4.1-dev"
+                "dev-master": "5.7-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
+            "files": [
+                "src/Illuminate/Foundation/helpers.php",
+                "src/Illuminate/Support/helpers.php"
+            ],
             "psr-4": {
-                "Symfony\\Component\\Translation\\": ""
-            },
-            "exclude-from-classmap": [
-                "/Tests/"
-            ]
+                "Illuminate\\": "src/Illuminate/"
+            }
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
@@ -3400,46 +3631,54 @@
         ],
         "authors": [
             {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
+                "name": "Taylor Otwell",
+                "email": "taylor@laravel.com"
             }
         ],
-        "description": "Symfony Translation Component",
-        "homepage": "https://symfony.com"
+        "description": "The Laravel Framework.",
+        "homepage": "https://laravel.com",
+        "keywords": [
+            "framework",
+            "laravel"
+        ]
     },
     {
-        "name": "nesbot/carbon",
-        "version": "1.29.2",
-        "version_normalized": "1.29.2.0",
+        "name": "fideloper/proxy",
+        "version": "4.0.0",
+        "version_normalized": "4.0.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/briannesbitt/Carbon.git",
-            "reference": "ed6aa898982f441ccc9b2acdec51490f2bc5d337"
+            "url": "https://github.com/fideloper/TrustedProxy.git",
+            "reference": "cf8a0ca4b85659b9557e206c90110a6a4dba980a"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/ed6aa898982f441ccc9b2acdec51490f2bc5d337",
-            "reference": "ed6aa898982f441ccc9b2acdec51490f2bc5d337",
+            "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/cf8a0ca4b85659b9557e206c90110a6a4dba980a",
+            "reference": "cf8a0ca4b85659b9557e206c90110a6a4dba980a",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.9",
-            "symfony/translation": "~2.6 || ~3.0 || ~4.0"
+            "illuminate/contracts": "~5.0",
+            "php": ">=5.4.0"
         },
         "require-dev": {
-            "friendsofphp/php-cs-fixer": "~2",
-            "phpunit/phpunit": "^4.8.35 || ^5.7"
+            "illuminate/http": "~5.6",
+            "mockery/mockery": "~1.0",
+            "phpunit/phpunit": "^6.0"
         },
-        "time": "2018-05-29T15:23:46+00:00",
+        "time": "2018-02-07T20:20:57+00:00",
         "type": "library",
+        "extra": {
+            "laravel": {
+                "providers": [
+                    "Fideloper\\Proxy\\TrustedProxyServiceProvider"
+                ]
+            }
+        },
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
-                "": "src/"
+                "Fideloper\\Proxy\\": "src/"
             }
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -3448,185 +3687,147 @@
         ],
         "authors": [
             {
-                "name": "Brian Nesbitt",
-                "email": "brian@nesbot.com",
-                "homepage": "http://nesbot.com"
+                "name": "Chris Fidao",
+                "email": "fideloper@gmail.com"
             }
         ],
-        "description": "A simple API extension for DateTime.",
-        "homepage": "http://carbon.nesbot.com",
+        "description": "Set trusted proxies for Laravel",
         "keywords": [
-            "date",
-            "datetime",
-            "time"
+            "load balancing",
+            "proxy",
+            "trusted proxy"
         ]
     },
     {
-        "name": "league/flysystem",
-        "version": "1.0.45",
-        "version_normalized": "1.0.45.0",
+        "name": "nikic/php-parser",
+        "version": "v4.1.0",
+        "version_normalized": "4.1.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/thephpleague/flysystem.git",
-            "reference": "a99f94e63b512d75f851b181afcdf0ee9ebef7e6"
+            "url": "https://github.com/nikic/PHP-Parser.git",
+            "reference": "d0230c5c77a7e3cfa69446febf340978540958c0"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a99f94e63b512d75f851b181afcdf0ee9ebef7e6",
-            "reference": "a99f94e63b512d75f851b181afcdf0ee9ebef7e6",
+            "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/d0230c5c77a7e3cfa69446febf340978540958c0",
+            "reference": "d0230c5c77a7e3cfa69446febf340978540958c0",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.5.9"
-        },
-        "conflict": {
-            "league/flysystem-sftp": "<1.0.6"
-        },
-        "require-dev": {
-            "ext-fileinfo": "*",
-            "phpspec/phpspec": "^3.4",
-            "phpunit/phpunit": "^5.7"
-        },
-        "suggest": {
-            "ext-fileinfo": "Required for MimeType",
-            "ext-ftp": "Allows you to use FTP server storage",
-            "ext-openssl": "Allows you to use FTPS server storage",
-            "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2",
-            "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-eventable-filesystem": "Allows you to use EventableFilesystem",
-            "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files",
-            "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib",
-            "league/flysystem-webdav": "Allows you to use WebDAV storage",
-            "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter",
-            "spatie/flysystem-dropbox": "Allows you to use Dropbox storage",
-            "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications"
+            "ext-tokenizer": "*",
+            "php": ">=7.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "^6.5 || ^7.0"
         },
-        "time": "2018-05-07T08:44:23+00:00",
+        "time": "2018-10-10T09:24:14+00:00",
+        "bin": [
+            "bin/php-parse"
+        ],
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "1.1-dev"
+                "dev-master": "4.1-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
-                "League\\Flysystem\\": "src/"
+                "PhpParser\\": "lib/PhpParser"
             }
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
-            "MIT"
+            "BSD-3-Clause"
         ],
         "authors": [
             {
-                "name": "Frank de Jonge",
-                "email": "info@frenky.net"
+                "name": "Nikita Popov"
             }
         ],
-        "description": "Filesystem abstraction: Many filesystems, one API.",
+        "description": "A PHP parser written in PHP",
         "keywords": [
-            "Cloud Files",
-            "WebDAV",
-            "abstraction",
-            "aws",
-            "cloud",
-            "copy.com",
-            "dropbox",
-            "file systems",
-            "files",
-            "filesystem",
-            "filesystems",
-            "ftp",
-            "rackspace",
-            "remote",
-            "s3",
-            "sftp",
-            "storage"
+            "parser",
+            "php"
         ]
     },
     {
-        "name": "erusev/parsedown",
-        "version": "1.7.1",
-        "version_normalized": "1.7.1.0",
+        "name": "jakub-onderka/php-console-color",
+        "version": "v0.2",
+        "version_normalized": "0.2.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/erusev/parsedown.git",
-            "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1"
+            "url": "https://github.com/JakubOnderka/PHP-Console-Color.git",
+            "reference": "d5deaecff52a0d61ccb613bb3804088da0307191"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/erusev/parsedown/zipball/92e9c27ba0e74b8b028b111d1b6f956a15c01fc1",
-            "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1",
+            "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/d5deaecff52a0d61ccb613bb3804088da0307191",
+            "reference": "d5deaecff52a0d61ccb613bb3804088da0307191",
             "shasum": ""
         },
         "require": {
-            "ext-mbstring": "*",
-            "php": ">=5.3.0"
+            "php": ">=5.4.0"
         },
         "require-dev": {
-            "phpunit/phpunit": "^4.8.35"
+            "jakub-onderka/php-code-style": "1.0",
+            "jakub-onderka/php-parallel-lint": "1.0",
+            "jakub-onderka/php-var-dump-check": "0.*",
+            "phpunit/phpunit": "~4.3",
+            "squizlabs/php_codesniffer": "1.*"
         },
-        "time": "2018-03-08T01:11:30+00:00",
+        "time": "2018-09-29T17:23:10+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
-            "psr-0": {
-                "Parsedown": ""
+            "psr-4": {
+                "JakubOnderka\\PhpConsoleColor\\": "src/"
             }
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
-            "MIT"
+            "BSD-2-Clause"
         ],
         "authors": [
             {
-                "name": "Emanuil Rusev",
-                "email": "hello@erusev.com",
-                "homepage": "http://erusev.com"
+                "name": "Jakub Onderka",
+                "email": "jakub.onderka@gmail.com"
             }
-        ],
-        "description": "Parser for Markdown.",
-        "homepage": "http://parsedown.org",
-        "keywords": [
-            "markdown",
-            "parser"
         ]
     },
     {
-        "name": "doctrine/inflector",
-        "version": "v1.3.0",
-        "version_normalized": "1.3.0.0",
+        "name": "jakub-onderka/php-console-highlighter",
+        "version": "v0.4",
+        "version_normalized": "0.4.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/doctrine/inflector.git",
-            "reference": "5527a48b7313d15261292c149e55e26eae771b0a"
+            "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git",
+            "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a",
-            "reference": "5527a48b7313d15261292c149e55e26eae771b0a",
+            "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/9f7a229a69d52506914b4bc61bfdb199d90c5547",
+            "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547",
             "shasum": ""
         },
         "require": {
-            "php": "^7.1"
+            "ext-tokenizer": "*",
+            "jakub-onderka/php-console-color": "~0.2",
+            "php": ">=5.4.0"
         },
         "require-dev": {
-            "phpunit/phpunit": "^6.2"
+            "jakub-onderka/php-code-style": "~1.0",
+            "jakub-onderka/php-parallel-lint": "~1.0",
+            "jakub-onderka/php-var-dump-check": "~0.1",
+            "phpunit/phpunit": "~4.0",
+            "squizlabs/php_codesniffer": "~1.5"
         },
-        "time": "2018-01-09T20:05:19+00:00",
+        "time": "2018-09-29T18:48:56+00:00",
         "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.3.x-dev"
-            }
-        },
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
-                "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector"
+                "JakubOnderka\\PhpConsoleHighlighter\\": "src/"
             }
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -3635,152 +3836,67 @@
         ],
         "authors": [
             {
-                "name": "Roman Borschel",
-                "email": "roman@code-factory.org"
-            },
-            {
-                "name": "Benjamin Eberlei",
-                "email": "kontakt@beberlei.de"
-            },
-            {
-                "name": "Guilherme Blanco",
-                "email": "guilhermeblanco@gmail.com"
-            },
-            {
-                "name": "Jonathan Wage",
-                "email": "jonwage@gmail.com"
-            },
-            {
-                "name": "Johannes Schmitt",
-                "email": "schmittjoh@gmail.com"
+                "name": "Jakub Onderka",
+                "email": "acci@acci.cz",
+                "homepage": "http://www.acci.cz/"
             }
         ],
-        "description": "Common String Manipulations with regard to casing and singular/plural rules.",
-        "homepage": "http://www.doctrine-project.org",
-        "keywords": [
-            "inflection",
-            "pluralize",
-            "singularize",
-            "string"
-        ]
+        "description": "Highlight PHP code in terminal"
     },
     {
-        "name": "laravel/framework",
-        "version": "v5.5.40",
-        "version_normalized": "5.5.40.0",
+        "name": "psy/psysh",
+        "version": "v0.9.9",
+        "version_normalized": "0.9.9.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/laravel/framework.git",
-            "reference": "d724ce0aa61bbd9adf658215eec484f5dd6711d6"
+            "url": "https://github.com/bobthecow/psysh.git",
+            "reference": "9aaf29575bb8293206bb0420c1e1c87ff2ffa94e"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/laravel/framework/zipball/d724ce0aa61bbd9adf658215eec484f5dd6711d6",
-            "reference": "d724ce0aa61bbd9adf658215eec484f5dd6711d6",
+            "url": "https://api.github.com/repos/bobthecow/psysh/zipball/9aaf29575bb8293206bb0420c1e1c87ff2ffa94e",
+            "reference": "9aaf29575bb8293206bb0420c1e1c87ff2ffa94e",
             "shasum": ""
         },
         "require": {
-            "doctrine/inflector": "~1.1",
-            "erusev/parsedown": "~1.7",
-            "ext-mbstring": "*",
-            "ext-openssl": "*",
-            "league/flysystem": "^1.0.8",
-            "monolog/monolog": "~1.12",
-            "mtdowling/cron-expression": "~1.0",
-            "nesbot/carbon": "^1.24.1",
-            "php": ">=7.0",
-            "psr/container": "~1.0",
-            "psr/simple-cache": "^1.0",
-            "ramsey/uuid": "~3.0",
-            "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"
-        },
-        "replace": {
-            "illuminate/auth": "self.version",
-            "illuminate/broadcasting": "self.version",
-            "illuminate/bus": "self.version",
-            "illuminate/cache": "self.version",
-            "illuminate/config": "self.version",
-            "illuminate/console": "self.version",
-            "illuminate/container": "self.version",
-            "illuminate/contracts": "self.version",
-            "illuminate/cookie": "self.version",
-            "illuminate/database": "self.version",
-            "illuminate/encryption": "self.version",
-            "illuminate/events": "self.version",
-            "illuminate/filesystem": "self.version",
-            "illuminate/hashing": "self.version",
-            "illuminate/http": "self.version",
-            "illuminate/log": "self.version",
-            "illuminate/mail": "self.version",
-            "illuminate/notifications": "self.version",
-            "illuminate/pagination": "self.version",
-            "illuminate/pipeline": "self.version",
-            "illuminate/queue": "self.version",
-            "illuminate/redis": "self.version",
-            "illuminate/routing": "self.version",
-            "illuminate/session": "self.version",
-            "illuminate/support": "self.version",
-            "illuminate/translation": "self.version",
-            "illuminate/validation": "self.version",
-            "illuminate/view": "self.version",
-            "tightenco/collect": "<5.5.33"
+            "dnoegel/php-xdg-base-dir": "0.1",
+            "ext-json": "*",
+            "ext-tokenizer": "*",
+            "jakub-onderka/php-console-highlighter": "0.3.*|0.4.*",
+            "nikic/php-parser": "~1.3|~2.0|~3.0|~4.0",
+            "php": ">=5.4.0",
+            "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0",
+            "symfony/var-dumper": "~2.7|~3.0|~4.0"
         },
         "require-dev": {
-            "aws/aws-sdk-php": "~3.0",
-            "doctrine/dbal": "~2.5",
-            "filp/whoops": "^2.1.4",
-            "mockery/mockery": "~1.0",
-            "orchestra/testbench-core": "3.5.*",
-            "pda/pheanstalk": "~3.0",
-            "phpunit/phpunit": "~6.0",
-            "predis/predis": "^1.1.1",
-            "symfony/css-selector": "~3.3",
-            "symfony/dom-crawler": "~3.3"
+            "bamarni/composer-bin-plugin": "^1.2",
+            "hoa/console": "~2.15|~3.16",
+            "phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0"
         },
         "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).",
-            "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).",
-            "league/flysystem-cached-adapter": "Required to use Flysystem caching (~1.0).",
-            "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~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 (~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)."
-        },
-        "time": "2018-03-30T13:29:30+00:00",
+            "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
+            "ext-pdo-sqlite": "The doc command requires SQLite to work.",
+            "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.",
+            "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history.",
+            "hoa/console": "A pure PHP readline implementation. You'll want this if your PHP install doesn't already support readline or libedit."
+        },
+        "time": "2018-10-13T15:16:03+00:00",
+        "bin": [
+            "bin/psysh"
+        ],
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "5.5-dev"
+                "dev-develop": "0.9.x-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
             "files": [
-                "src/Illuminate/Foundation/helpers.php",
-                "src/Illuminate/Support/helpers.php"
+                "src/functions.php"
             ],
             "psr-4": {
-                "Illuminate\\": "src/Illuminate/"
+                "Psy\\": "src/"
             }
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -3789,30 +3905,33 @@
         ],
         "authors": [
             {
-                "name": "Taylor Otwell",
-                "email": "taylor@laravel.com"
+                "name": "Justin Hileman",
+                "email": "justin@justinhileman.info",
+                "homepage": "http://justinhileman.com"
             }
         ],
-        "description": "The Laravel Framework.",
-        "homepage": "https://laravel.com",
+        "description": "An interactive shell for modern PHP.",
+        "homepage": "http://psysh.org",
         "keywords": [
-            "framework",
-            "laravel"
+            "REPL",
+            "console",
+            "interactive",
+            "shell"
         ]
     },
     {
         "name": "laravel/tinker",
-        "version": "v1.0.7",
-        "version_normalized": "1.0.7.0",
+        "version": "v1.0.8",
+        "version_normalized": "1.0.8.0",
         "source": {
             "type": "git",
             "url": "https://github.com/laravel/tinker.git",
-            "reference": "e3086ee8cb1f54a39ae8dcb72d1c37d10128997d"
+            "reference": "cafbf598a90acde68985660e79b2b03c5609a405"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/laravel/tinker/zipball/e3086ee8cb1f54a39ae8dcb72d1c37d10128997d",
-            "reference": "e3086ee8cb1f54a39ae8dcb72d1c37d10128997d",
+            "url": "https://api.github.com/repos/laravel/tinker/zipball/cafbf598a90acde68985660e79b2b03c5609a405",
+            "reference": "cafbf598a90acde68985660e79b2b03c5609a405",
             "shasum": ""
         },
         "require": {
@@ -3829,7 +3948,7 @@
         "suggest": {
             "illuminate/database": "The Illuminate Database package (~5.1)."
         },
-        "time": "2018-05-17T13:42:07+00:00",
+        "time": "2018-10-12T19:39:35+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -3867,37 +3986,37 @@
     },
     {
         "name": "laravelcollective/html",
-        "version": "v5.5.4",
-        "version_normalized": "5.5.4.0",
+        "version": "v5.7.1",
+        "version_normalized": "5.7.1.0",
         "source": {
             "type": "git",
             "url": "https://github.com/LaravelCollective/html.git",
-            "reference": "04c596a69975b901f2223eb6eb4adf55354121c2"
+            "reference": "777b6d390811ba249255ed5750bf17a019cd88a5"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/LaravelCollective/html/zipball/04c596a69975b901f2223eb6eb4adf55354121c2",
-            "reference": "04c596a69975b901f2223eb6eb4adf55354121c2",
+            "url": "https://api.github.com/repos/LaravelCollective/html/zipball/777b6d390811ba249255ed5750bf17a019cd88a5",
+            "reference": "777b6d390811ba249255ed5750bf17a019cd88a5",
             "shasum": ""
         },
         "require": {
-            "illuminate/http": "5.5.*",
-            "illuminate/routing": "5.5.*",
-            "illuminate/session": "5.5.*",
-            "illuminate/support": "5.5.*",
-            "illuminate/view": "5.5.*",
-            "php": ">=7.0.0"
+            "illuminate/http": "5.7.*",
+            "illuminate/routing": "5.7.*",
+            "illuminate/session": "5.7.*",
+            "illuminate/support": "5.7.*",
+            "illuminate/view": "5.7.*",
+            "php": ">=7.1.3"
         },
         "require-dev": {
-            "illuminate/database": "5.5.*",
-            "mockery/mockery": "~0.9.4",
-            "phpunit/phpunit": "~5.4"
+            "illuminate/database": "5.7.*",
+            "mockery/mockery": "~1.0",
+            "phpunit/phpunit": "~7.1"
         },
-        "time": "2018-03-24T00:39:21+00:00",
+        "time": "2018-09-05T18:32:53+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "5.5-dev"
+                "dev-master": "5.7-dev"
             },
             "laravel": {
                 "providers": [
@@ -3937,17 +4056,17 @@
     },
     {
         "name": "filp/whoops",
-        "version": "2.2.0",
-        "version_normalized": "2.2.0.0",
+        "version": "2.2.1",
+        "version_normalized": "2.2.1.0",
         "source": {
             "type": "git",
             "url": "https://github.com/filp/whoops.git",
-            "reference": "181c4502d8f34db7aed7bfe88d4f87875b8e947a"
+            "reference": "e79cd403fb77fc8963a99ecc30e80ddd885b3311"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/filp/whoops/zipball/181c4502d8f34db7aed7bfe88d4f87875b8e947a",
-            "reference": "181c4502d8f34db7aed7bfe88d4f87875b8e947a",
+            "url": "https://api.github.com/repos/filp/whoops/zipball/e79cd403fb77fc8963a99ecc30e80ddd885b3311",
+            "reference": "e79cd403fb77fc8963a99ecc30e80ddd885b3311",
             "shasum": ""
         },
         "require": {
@@ -3963,11 +4082,11 @@
             "symfony/var-dumper": "Pretty print complex values better with var-dumper available",
             "whoops/soap": "Formats errors as SOAP responses"
         },
-        "time": "2018-03-03T17:56:25+00:00",
+        "time": "2018-06-30T13:14:06+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "2.1-dev"
+                "dev-master": "2.2-dev"
             }
         },
         "installation-source": "dist",
@@ -3998,19 +4117,71 @@
             "whoops"
         ]
     },
+    {
+        "name": "fzaninotto/faker",
+        "version": "v1.8.0",
+        "version_normalized": "1.8.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/fzaninotto/Faker.git",
+            "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de",
+            "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de",
+            "shasum": ""
+        },
+        "require": {
+            "php": "^5.3.3 || ^7.0"
+        },
+        "require-dev": {
+            "ext-intl": "*",
+            "phpunit/phpunit": "^4.8.35 || ^5.7",
+            "squizlabs/php_codesniffer": "^1.5"
+        },
+        "time": "2018-07-12T10:23:15+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.8-dev"
+            }
+        },
+        "installation-source": "dist",
+        "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"
+        ]
+    },
     {
         "name": "mockery/mockery",
-        "version": "1.1.0",
-        "version_normalized": "1.1.0.0",
+        "version": "1.2.0",
+        "version_normalized": "1.2.0.0",
         "source": {
             "type": "git",
             "url": "https://github.com/mockery/mockery.git",
-            "reference": "99e29d3596b16dabe4982548527d5ddf90232e99"
+            "reference": "100633629bf76d57430b86b7098cd6beb996a35a"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/mockery/mockery/zipball/99e29d3596b16dabe4982548527d5ddf90232e99",
-            "reference": "99e29d3596b16dabe4982548527d5ddf90232e99",
+            "url": "https://api.github.com/repos/mockery/mockery/zipball/100633629bf76d57430b86b7098cd6beb996a35a",
+            "reference": "100633629bf76d57430b86b7098cd6beb996a35a",
             "shasum": ""
         },
         "require": {
@@ -4019,10 +4190,9 @@
             "php": ">=5.6.0"
         },
         "require-dev": {
-            "phpdocumentor/phpdocumentor": "^2.9",
-            "phpunit/phpunit": "~5.7.10|~6.5"
+            "phpunit/phpunit": "~5.7.10|~6.5|~7.0"
         },
-        "time": "2018-05-08T08:54:48+00:00",
+        "time": "2018-10-02T21:52:37+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -4066,75 +4236,19 @@
             "testing"
         ]
     },
-    {
-        "name": "doctrine/instantiator",
-        "version": "1.1.0",
-        "version_normalized": "1.1.0.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"
-        },
-        "time": "2017-07-22T11:58:36+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.2.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Marco Pivetta",
-                "email": "ocramius@gmail.com",
-                "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"
-        ]
-    },
     {
         "name": "phpunit/phpunit-mock-objects",
-        "version": "5.0.7",
-        "version_normalized": "5.0.7.0",
+        "version": "5.0.10",
+        "version_normalized": "5.0.10.0",
         "source": {
             "type": "git",
             "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-            "reference": "3eaf040f20154d27d6da59ca2c6e28ac8fd56dce"
+            "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3eaf040f20154d27d6da59ca2c6e28ac8fd56dce",
-            "reference": "3eaf040f20154d27d6da59ca2c6e28ac8fd56dce",
+            "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/cd1cf05c553ecfec36b170070573e540b67d3f1f",
+            "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f",
             "shasum": ""
         },
         "require": {
@@ -4147,12 +4261,12 @@
             "phpunit/phpunit": "<6.0"
         },
         "require-dev": {
-            "phpunit/phpunit": "^6.5"
+            "phpunit/phpunit": "^6.5.11"
         },
         "suggest": {
             "ext-soap": "*"
         },
-        "time": "2018-05-29T13:50:43+00:00",
+        "time": "2018-08-09T05:50:03+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -4183,84 +4297,19 @@
             "xunit"
         ]
     },
-    {
-        "name": "phpunit/php-code-coverage",
-        "version": "5.3.2",
-        "version_normalized": "5.3.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-            "reference": "c89677919c5dd6d3b3852f230a663118762218ac"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac",
-            "reference": "c89677919c5dd6d3b3852f230a663118762218ac",
-            "shasum": ""
-        },
-        "require": {
-            "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.1",
-            "sebastian/code-unit-reverse-lookup": "^1.0.1",
-            "sebastian/environment": "^3.0",
-            "sebastian/version": "^2.0.1",
-            "theseer/tokenizer": "^1.1"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "^6.0"
-        },
-        "suggest": {
-            "ext-xdebug": "^2.5.5"
-        },
-        "time": "2018-04-06T15:36:58+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "5.3.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "src/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Sebastian Bergmann",
-                "email": "sebastian@phpunit.de",
-                "role": "lead"
-            }
-        ],
-        "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-        "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-        "keywords": [
-            "coverage",
-            "testing",
-            "xunit"
-        ]
-    },
     {
         "name": "phpspec/prophecy",
-        "version": "1.7.6",
-        "version_normalized": "1.7.6.0",
+        "version": "1.8.0",
+        "version_normalized": "1.8.0.0",
         "source": {
             "type": "git",
             "url": "https://github.com/phpspec/prophecy.git",
-            "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712"
+            "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
-            "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
+            "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+            "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
             "shasum": ""
         },
         "require": {
@@ -4272,13 +4321,13 @@
         },
         "require-dev": {
             "phpspec/phpspec": "^2.5|^3.2",
-            "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+            "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
         },
-        "time": "2018-04-18T13:57:24+00:00",
+        "time": "2018-08-05T17:53:17+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "1.7.x-dev"
+                "dev-master": "1.8.x-dev"
             }
         },
         "installation-source": "dist",
@@ -4313,69 +4362,19 @@
             "stub"
         ]
     },
-    {
-        "name": "myclabs/deep-copy",
-        "version": "1.8.1",
-        "version_normalized": "1.8.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/myclabs/DeepCopy.git",
-            "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
-            "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
-            "shasum": ""
-        },
-        "require": {
-            "php": "^7.1"
-        },
-        "replace": {
-            "myclabs/deep-copy": "self.version"
-        },
-        "require-dev": {
-            "doctrine/collections": "^1.0",
-            "doctrine/common": "^2.6",
-            "phpunit/phpunit": "^7.1"
-        },
-        "time": "2018-06-11T23:09:50+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "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"
-        ]
-    },
     {
         "name": "phpunit/phpunit",
-        "version": "6.5.8",
-        "version_normalized": "6.5.8.0",
+        "version": "6.5.13",
+        "version_normalized": "6.5.13.0",
         "source": {
             "type": "git",
             "url": "https://github.com/sebastianbergmann/phpunit.git",
-            "reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b"
+            "reference": "0973426fb012359b2f18d3bd1e90ef1172839693"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4f21a3c6b97c42952fd5c2837bb354ec0199b97b",
-            "reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b",
+            "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0973426fb012359b2f18d3bd1e90ef1172839693",
+            "reference": "0973426fb012359b2f18d3bd1e90ef1172839693",
             "shasum": ""
         },
         "require": {
@@ -4393,7 +4392,7 @@
             "phpunit/php-file-iterator": "^1.4.3",
             "phpunit/php-text-template": "^1.2.1",
             "phpunit/php-timer": "^1.0.9",
-            "phpunit/phpunit-mock-objects": "^5.0.5",
+            "phpunit/phpunit-mock-objects": "^5.0.9",
             "sebastian/comparator": "^2.1",
             "sebastian/diff": "^2.0",
             "sebastian/environment": "^3.1",
@@ -4414,7 +4413,7 @@
             "ext-xdebug": "*",
             "phpunit/php-invoker": "^1.1"
         },
-        "time": "2018-04-10T11:38:34+00:00",
+        "time": "2018-09-08T15:10:43+00:00",
         "bin": [
             "phpunit"
         ],
@@ -4448,5 +4447,91 @@
             "testing",
             "xunit"
         ]
+    },
+    {
+        "name": "league/flysystem",
+        "version": "1.0.48",
+        "version_normalized": "1.0.48.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/thephpleague/flysystem.git",
+            "reference": "a6ded5b2f6055e2db97b4b859fdfca2b952b78aa"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a6ded5b2f6055e2db97b4b859fdfca2b952b78aa",
+            "reference": "a6ded5b2f6055e2db97b4b859fdfca2b952b78aa",
+            "shasum": ""
+        },
+        "require": {
+            "ext-fileinfo": "*",
+            "php": ">=5.5.9"
+        },
+        "conflict": {
+            "league/flysystem-sftp": "<1.0.6"
+        },
+        "require-dev": {
+            "phpspec/phpspec": "^3.4",
+            "phpunit/phpunit": "^5.7.10"
+        },
+        "suggest": {
+            "ext-fileinfo": "Required for MimeType",
+            "ext-ftp": "Allows you to use FTP server storage",
+            "ext-openssl": "Allows you to use FTPS server storage",
+            "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2",
+            "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-eventable-filesystem": "Allows you to use EventableFilesystem",
+            "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files",
+            "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib",
+            "league/flysystem-webdav": "Allows you to use WebDAV storage",
+            "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter",
+            "spatie/flysystem-dropbox": "Allows you to use Dropbox storage",
+            "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications"
+        },
+        "time": "2018-10-15T13:53:10+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.1-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "League\\Flysystem\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Frank de Jonge",
+                "email": "info@frenky.net"
+            }
+        ],
+        "description": "Filesystem abstraction: Many filesystems, one API.",
+        "keywords": [
+            "Cloud Files",
+            "WebDAV",
+            "abstraction",
+            "aws",
+            "cloud",
+            "copy.com",
+            "dropbox",
+            "file systems",
+            "files",
+            "filesystem",
+            "filesystems",
+            "ftp",
+            "rackspace",
+            "remote",
+            "s3",
+            "sftp",
+            "storage"
+        ]
     }
 ]
diff --git a/vendor/mtdowling/cron-expression/.editorconfig b/vendor/dragonmantank/cron-expression/.editorconfig
similarity index 100%
rename from vendor/mtdowling/cron-expression/.editorconfig
rename to vendor/dragonmantank/cron-expression/.editorconfig
diff --git a/vendor/mtdowling/cron-expression/CHANGELOG.md b/vendor/dragonmantank/cron-expression/CHANGELOG.md
similarity index 58%
rename from vendor/mtdowling/cron-expression/CHANGELOG.md
rename to vendor/dragonmantank/cron-expression/CHANGELOG.md
index 8ddab905..8cb3a084 100644
--- a/vendor/mtdowling/cron-expression/CHANGELOG.md
+++ b/vendor/dragonmantank/cron-expression/CHANGELOG.md
@@ -1,5 +1,35 @@
 # Change Log
 
+## [2.2.0] - 2018-06-05
+### Added
+- Added support for steps larger than field ranges (#6)
+## Changed
+- N/A
+### Fixed
+- Fixed validation for numbers with leading 0s (#12)
+
+## [2.1.0] - 2018-04-06
+### Added
+- N/A
+### Changed
+- Upgraded to PHPUnit 6 (#2)
+### Fixed
+- Refactored timezones to deal with some inconsistent behavior (#3)
+- Allow ranges and lists in same expression (#5)
+- Fixed regression where literals were not converted to their numerical counterpart (#)
+
+## [2.0.0] - 2017-10-12
+### Added
+- N/A
+
+### Changed
+- Dropped support for PHP 5.x
+- Dropped support for the YEAR field, as it was not part of the cron standard
+
+### Fixed
+- Reworked validation for all the field types
+- Stepping should now work for 1-indexed fields like Month (#153)
+
 ## [1.2.0] - 2017-01-22
 ### Added
 - Added IDE, CodeSniffer, and StyleCI.IO support
diff --git a/vendor/mtdowling/cron-expression/LICENSE b/vendor/dragonmantank/cron-expression/LICENSE
similarity index 89%
rename from vendor/mtdowling/cron-expression/LICENSE
rename to vendor/dragonmantank/cron-expression/LICENSE
index c6d88ac6..3e38bbc8 100644
--- a/vendor/mtdowling/cron-expression/LICENSE
+++ b/vendor/dragonmantank/cron-expression/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011 Michael Dowling <mtdowling@gmail.com> and contributors
+Copyright (c) 2011 Michael Dowling <mtdowling@gmail.com>, 2016 Chris Tankersley <chris@ctankersley.com>, and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/mtdowling/cron-expression/README.md b/vendor/dragonmantank/cron-expression/README.md
similarity index 66%
rename from vendor/mtdowling/cron-expression/README.md
rename to vendor/dragonmantank/cron-expression/README.md
index c9e3bf3e..67992c7d 100644
--- a/vendor/mtdowling/cron-expression/README.md
+++ b/vendor/dragonmantank/cron-expression/README.md
@@ -1,7 +1,7 @@
 PHP Cron Expression Parser
 ==========================
 
-[![Latest Stable Version](https://poser.pugx.org/mtdowling/cron-expression/v/stable.png)](https://packagist.org/packages/mtdowling/cron-expression) [![Total Downloads](https://poser.pugx.org/mtdowling/cron-expression/downloads.png)](https://packagist.org/packages/mtdowling/cron-expression) [![Build Status](https://secure.travis-ci.org/mtdowling/cron-expression.png)](http://travis-ci.org/mtdowling/cron-expression)
+[![Latest Stable Version](https://poser.pugx.org/dragonmantank/cron-expression/v/stable.png)](https://packagist.org/packages/dragonmantank/cron-expression) [![Total Downloads](https://poser.pugx.org/dragonmantank/cron-expression/downloads.png)](https://packagist.org/packages/dragonmantank/cron-expression) [![Build Status](https://secure.travis-ci.org/dragonmantank/cron-expression.png)](http://travis-ci.org/dragonmantank/cron-expression)
 
 The PHP cron expression parser can parse a CRON expression, determine if it is
 due to run, calculate the next run date of the expression, and calculate the previous
@@ -13,13 +13,15 @@ lists (e.g. 1,2,3), W to find the nearest weekday for a given day of the month,
 find the last day of the month, L to find the last given weekday of a month, and hash
 (#) to find the nth weekday of a given month.
 
+More information about this fork can be found in the blog post [here](http://ctankersley.com/2017/10/12/cron-expression-update/). tl;dr - v2.0.0 is a major breaking change, and @dragonmantank can better take care of the project in a separate fork.
+
 Installing
 ==========
 
 Add the dependency to your project:
 
 ```bash
-composer require mtdowling/cron-expression
+composer require dragonmantank/cron-expression
 ```
 
 Usage
@@ -36,7 +38,7 @@ echo $cron->getNextRunDate()->format('Y-m-d H:i:s');
 echo $cron->getPreviousRunDate()->format('Y-m-d H:i:s');
 
 // Works with complex expressions
-$cron = Cron\CronExpression::factory('3-59/15 2,6-12 */15 1 2-5');
+$cron = Cron\CronExpression::factory('3-59/15 6-12 */15 1 2-5');
 echo $cron->getNextRunDate()->format('Y-m-d H:i:s');
 
 // Calculate a run date two iterations into the future
@@ -53,10 +55,10 @@ CRON Expressions
 
 A CRON expression is a string representing the schedule for a particular command to execute.  The parts of a CRON schedule are as follows:
 
-    *    *    *    *    *    *
-    -    -    -    -    -    -
-    |    |    |    |    |    |
-    |    |    |    |    |    + year [optional]
+    *    *    *    *    *
+    -    -    -    -    -
+    |    |    |    |    |
+    |    |    |    |    |
     |    |    |    |    +----- day of week (0 - 7) (Sunday=0 or 7)
     |    |    |    +---------- month (1 - 12)
     |    |    +--------------- day of month (1 - 31)
@@ -66,6 +68,6 @@ A CRON expression is a string representing the schedule for a particular command
 Requirements
 ============
 
-- PHP 5.3+
+- PHP 7.0+
 - PHPUnit is required to run the unit tests
-- Composer is required to run the unit tests
\ No newline at end of file
+- Composer is required to run the unit tests
diff --git a/vendor/dragonmantank/cron-expression/composer.json b/vendor/dragonmantank/cron-expression/composer.json
new file mode 100644
index 00000000..d9997ead
--- /dev/null
+++ b/vendor/dragonmantank/cron-expression/composer.json
@@ -0,0 +1,35 @@
+{
+    "name": "dragonmantank/cron-expression",
+    "type": "library",
+    "description": "CRON for PHP: Calculate the next or previous run date and determine if a CRON expression is due",
+    "keywords": ["cron", "schedule"],
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Michael Dowling",
+            "email": "mtdowling@gmail.com",
+            "homepage": "https://github.com/mtdowling"
+        },
+        {
+            "name": "Chris Tankersley",
+            "email": "chris@ctankersley.com",
+            "homepage": "https://github.com/dragonmantank"
+        }
+    ],
+    "require": {
+        "php": ">=7.0.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~6.4"
+    },
+    "autoload": {
+        "psr-4": {
+            "Cron\\": "src/Cron/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\": "tests/Cron/"
+        }
+    }
+}
diff --git a/vendor/dragonmantank/cron-expression/src/Cron/AbstractField.php b/vendor/dragonmantank/cron-expression/src/Cron/AbstractField.php
new file mode 100644
index 00000000..262ab63c
--- /dev/null
+++ b/vendor/dragonmantank/cron-expression/src/Cron/AbstractField.php
@@ -0,0 +1,278 @@
+<?php
+
+namespace Cron;
+
+/**
+ * Abstract CRON expression field
+ */
+abstract class AbstractField implements FieldInterface
+{
+    /**
+     * Full range of values that are allowed for this field type
+     * @var array
+     */
+    protected $fullRange = [];
+
+    /**
+     * Literal values we need to convert to integers
+     * @var array
+     */
+    protected $literals = [];
+
+    /**
+     * Start value of the full range
+     * @var integer
+     */
+    protected $rangeStart;
+
+    /**
+     * End value of the full range
+     * @var integer
+     */
+    protected $rangeEnd;
+
+
+    public function __construct()
+    {
+        $this->fullRange = range($this->rangeStart, $this->rangeEnd);
+    }
+
+    /**
+     * Check to see if a field is satisfied by a value
+     *
+     * @param string $dateValue Date value to check
+     * @param string $value     Value to test
+     *
+     * @return bool
+     */
+    public function isSatisfied($dateValue, $value)
+    {
+        if ($this->isIncrementsOfRanges($value)) {
+            return $this->isInIncrementsOfRanges($dateValue, $value);
+        } elseif ($this->isRange($value)) {
+            return $this->isInRange($dateValue, $value);
+        }
+
+        return $value == '*' || $dateValue == $value;
+    }
+
+    /**
+     * Check if a value is a range
+     *
+     * @param string $value Value to test
+     *
+     * @return bool
+     */
+    public function isRange($value)
+    {
+        return strpos($value, '-') !== false;
+    }
+
+    /**
+     * Check if a value is an increments of ranges
+     *
+     * @param string $value Value to test
+     *
+     * @return bool
+     */
+    public function isIncrementsOfRanges($value)
+    {
+        return strpos($value, '/') !== false;
+    }
+
+    /**
+     * Test if a value is within a range
+     *
+     * @param string $dateValue Set date value
+     * @param string $value     Value to test
+     *
+     * @return bool
+     */
+    public function isInRange($dateValue, $value)
+    {
+        $parts = array_map(function($value) {
+                $value = trim($value);
+                $value = $this->convertLiterals($value);
+                return $value;
+            },
+            explode('-', $value, 2)
+        );
+
+
+        return $dateValue >= $parts[0] && $dateValue <= $parts[1];
+    }
+
+    /**
+     * Test if a value is within an increments of ranges (offset[-to]/step size)
+     *
+     * @param string $dateValue Set date value
+     * @param string $value     Value to test
+     *
+     * @return bool
+     */
+    public function isInIncrementsOfRanges($dateValue, $value)
+    {
+        $chunks = array_map('trim', explode('/', $value, 2));
+        $range = $chunks[0];
+        $step = isset($chunks[1]) ? $chunks[1] : 0;
+
+        // No step or 0 steps aren't cool
+        if (is_null($step) || '0' === $step || 0 === $step) {
+            return false;
+        }
+
+        // Expand the * to a full range
+        if ('*' == $range) {
+            $range = $this->rangeStart . '-' . $this->rangeEnd;
+        }
+
+        // Generate the requested small range
+        $rangeChunks = explode('-', $range, 2);
+        $rangeStart = $rangeChunks[0];
+        $rangeEnd = isset($rangeChunks[1]) ? $rangeChunks[1] : $rangeStart;
+
+        if ($rangeStart < $this->rangeStart || $rangeStart > $this->rangeEnd || $rangeStart > $rangeEnd) {
+            throw new \OutOfRangeException('Invalid range start requested');
+        }
+
+        if ($rangeEnd < $this->rangeStart || $rangeEnd > $this->rangeEnd || $rangeEnd < $rangeStart) {
+            throw new \OutOfRangeException('Invalid range end requested');
+        }
+
+        // Steps larger than the range need to wrap around and be handled slightly differently than smaller steps
+        if ($step >= $this->rangeEnd) {
+            $thisRange = [$this->fullRange[$step % count($this->fullRange)]];
+        } else {
+            $thisRange = range($rangeStart, $rangeEnd, $step);
+        }
+
+        return in_array($dateValue, $thisRange);
+    }
+
+    /**
+     * Returns a range of values for the given cron expression
+     *
+     * @param string $expression The expression to evaluate
+     * @param int $max           Maximum offset for range
+     *
+     * @return array
+     */
+    public function getRangeForExpression($expression, $max)
+    {
+        $values = array();
+        $expression = $this->convertLiterals($expression);
+
+        if (strpos($expression, ',') !== false) {
+            $ranges = explode(',', $expression);
+            $values = [];
+            foreach ($ranges as $range) {
+                $expanded = $this->getRangeForExpression($range, $this->rangeEnd);
+                $values = array_merge($values, $expanded);
+            }
+            return $values;
+        }
+
+        if ($this->isRange($expression) || $this->isIncrementsOfRanges($expression)) {
+            if (!$this->isIncrementsOfRanges($expression)) {
+                list ($offset, $to) = explode('-', $expression);
+                $offset = $this->convertLiterals($offset);
+                $to = $this->convertLiterals($to);
+                $stepSize = 1;
+            }
+            else {
+                $range = array_map('trim', explode('/', $expression, 2));
+                $stepSize = isset($range[1]) ? $range[1] : 0;
+                $range = $range[0];
+                $range = explode('-', $range, 2);
+                $offset = $range[0];
+                $to = isset($range[1]) ? $range[1] : $max;
+            }
+            $offset = $offset == '*' ? $this->rangeStart : $offset;
+            if ($stepSize >= $this->rangeEnd) {
+                $values = [$this->fullRange[$stepSize % count($this->fullRange)]];
+            } else {
+                for ($i = $offset; $i <= $to; $i += $stepSize) {
+                    $values[] = (int)$i;
+                }
+            }
+            sort($values);
+        }
+        else {
+            $values = array($expression);
+        }
+
+        return $values;
+    }
+
+    protected function convertLiterals($value)
+    {
+        if (count($this->literals)) {
+            $key = array_search($value, $this->literals);
+            if ($key !== false) {
+                return $key;
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * Checks to see if a value is valid for the field
+     *
+     * @param string $value
+     * @return bool
+     */
+    public function validate($value)
+    {
+        $value = $this->convertLiterals($value);
+
+        // All fields allow * as a valid value
+        if ('*' === $value) {
+            return true;
+        }
+
+        if (strpos($value, '/') !== false) {
+            list($range, $step) = explode('/', $value);
+            return $this->validate($range) && filter_var($step, FILTER_VALIDATE_INT);
+        }
+
+        // Validate each chunk of a list individually
+        if (strpos($value, ',') !== false) {
+            foreach (explode(',', $value) as $listItem) {
+                if (!$this->validate($listItem)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        if (strpos($value, '-') !== false) {
+            if (substr_count($value, '-') > 1) {
+                return false;
+            }
+
+            $chunks = explode('-', $value);
+            $chunks[0] = $this->convertLiterals($chunks[0]);
+            $chunks[1] = $this->convertLiterals($chunks[1]);
+
+            if ('*' == $chunks[0] || '*' == $chunks[1]) {
+                return false;
+            }
+
+            return $this->validate($chunks[0]) && $this->validate($chunks[1]);
+        }
+
+        if (!is_numeric($value)) {
+            return false;
+        }
+
+        if (is_float($value) || strpos($value, '.') !== false) {
+            return false;
+        }
+
+        // We should have a numeric by now, so coerce this into an integer
+        $value = (int) $value;
+
+        return in_array($value, $this->fullRange, true);
+    }
+}
diff --git a/vendor/mtdowling/cron-expression/src/Cron/CronExpression.php b/vendor/dragonmantank/cron-expression/src/Cron/CronExpression.php
similarity index 85%
rename from vendor/mtdowling/cron-expression/src/Cron/CronExpression.php
rename to vendor/dragonmantank/cron-expression/src/Cron/CronExpression.php
index d69b4154..b7ba7da0 100644
--- a/vendor/mtdowling/cron-expression/src/Cron/CronExpression.php
+++ b/vendor/dragonmantank/cron-expression/src/Cron/CronExpression.php
@@ -171,7 +171,7 @@ class CronExpression
     public function setMaxIterationCount($maxIterationCount)
     {
         $this->maxIterationCount = $maxIterationCount;
-        
+
         return $this;
     }
 
@@ -187,13 +187,14 @@ class CronExpression
      *                                           matches and so on.
      * @param bool             $allowCurrentDate Set to TRUE to return the current date if
      *                                           it matches the cron expression.
+     * @param null|string      $timeZone         TimeZone to use instead of the system default
      *
      * @return \DateTime
      * @throws \RuntimeException on too many iterations
      */
-    public function getNextRunDate($currentTime = 'now', $nth = 0, $allowCurrentDate = false)
+    public function getNextRunDate($currentTime = 'now', $nth = 0, $allowCurrentDate = false, $timeZone = null)
     {
-        return $this->getRunDate($currentTime, $nth, false, $allowCurrentDate);
+        return $this->getRunDate($currentTime, $nth, false, $allowCurrentDate, $timeZone);
     }
 
     /**
@@ -203,14 +204,15 @@ class CronExpression
      * @param int              $nth              Number of matches to skip before returning
      * @param bool             $allowCurrentDate Set to TRUE to return the
      *                                           current date if it matches the cron expression
+     * @param null|string      $timeZone         TimeZone to use instead of the system default
      *
      * @return \DateTime
      * @throws \RuntimeException on too many iterations
      * @see \Cron\CronExpression::getNextRunDate
      */
-    public function getPreviousRunDate($currentTime = 'now', $nth = 0, $allowCurrentDate = false)
+    public function getPreviousRunDate($currentTime = 'now', $nth = 0, $allowCurrentDate = false, $timeZone = null)
     {
-        return $this->getRunDate($currentTime, $nth, true, $allowCurrentDate);
+        return $this->getRunDate($currentTime, $nth, true, $allowCurrentDate, $timeZone);
     }
 
     /**
@@ -221,15 +223,16 @@ class CronExpression
      * @param bool             $invert           Set to TRUE to retrieve previous dates
      * @param bool             $allowCurrentDate Set to TRUE to return the
      *                                           current date if it matches the cron expression
+     * @param null|string      $timeZone         TimeZone to use instead of the system default
      *
      * @return array Returns an array of run dates
      */
-    public function getMultipleRunDates($total, $currentTime = 'now', $invert = false, $allowCurrentDate = false)
+    public function getMultipleRunDates($total, $currentTime = 'now', $invert = false, $allowCurrentDate = false, $timeZone = null)
     {
         $matches = array();
         for ($i = 0; $i < max(0, $total); $i++) {
             try {
-                $matches[] = $this->getRunDate($currentTime, $i, $invert, $allowCurrentDate);
+                $matches[] = $this->getRunDate($currentTime, $i, $invert, $allowCurrentDate, $timeZone);
             } catch (RuntimeException $e) {
                 break;
             }
@@ -274,34 +277,30 @@ class CronExpression
      * seconds are irrelevant, and should be called once per minute.
      *
      * @param string|\DateTime $currentTime Relative calculation date
+     * @param null|string      $timeZone    TimeZone to use instead of the system default
      *
      * @return bool Returns TRUE if the cron is due to run or FALSE if not
      */
-    public function isDue($currentTime = 'now')
+    public function isDue($currentTime = 'now', $timeZone = null)
     {
+        $timeZone = $this->determineTimeZone($currentTime, $timeZone);
+
         if ('now' === $currentTime) {
-            $currentDate = date('Y-m-d H:i');
-            $currentTime = strtotime($currentDate);
+            $currentTime = new DateTime();
         } elseif ($currentTime instanceof DateTime) {
-            $currentDate = clone $currentTime;
-            // Ensure time in 'current' timezone is used
-            $currentDate->setTimezone(new DateTimeZone(date_default_timezone_get()));
-            $currentDate = $currentDate->format('Y-m-d H:i');
-            $currentTime = strtotime($currentDate);
+            //
         } elseif ($currentTime instanceof DateTimeImmutable) {
-            $currentDate = DateTime::createFromFormat('U', $currentTime->format('U'));
-            $currentDate->setTimezone(new DateTimeZone(date_default_timezone_get()));
-            $currentDate = $currentDate->format('Y-m-d H:i');
-            $currentTime = strtotime($currentDate);
+            $currentTime = DateTime::createFromFormat('U', $currentTime->format('U'));
         } else {
             $currentTime = new DateTime($currentTime);
-            $currentTime->setTime($currentTime->format('H'), $currentTime->format('i'), 0);
-            $currentDate = $currentTime->format('Y-m-d H:i');
-            $currentTime = $currentTime->getTimeStamp();
         }
+        $currentTime->setTimeZone(new DateTimeZone($timeZone));
+
+        // drop the seconds to 0
+        $currentTime = DateTime::createFromFormat('Y-m-d H:i', $currentTime->format('Y-m-d H:i'));
 
         try {
-            return $this->getNextRunDate($currentDate, 0, true)->getTimestamp() == $currentTime;
+            return $this->getNextRunDate($currentTime, 0, true)->getTimestamp() === $currentTime->getTimestamp();
         } catch (Exception $e) {
             return false;
         }
@@ -315,22 +314,24 @@ class CronExpression
      * @param bool             $invert           Set to TRUE to go backwards in time
      * @param bool             $allowCurrentDate Set to TRUE to return the
      *                                           current date if it matches the cron expression
+     * @param string|null      $timeZone         TimeZone to use instead of the system default
      *
      * @return \DateTime
      * @throws \RuntimeException on too many iterations
      */
-    protected function getRunDate($currentTime = null, $nth = 0, $invert = false, $allowCurrentDate = false)
+    protected function getRunDate($currentTime = null, $nth = 0, $invert = false, $allowCurrentDate = false, $timeZone = null)
     {
+        $timeZone = $this->determineTimeZone($currentTime, $timeZone);
+
         if ($currentTime instanceof DateTime) {
             $currentDate = clone $currentTime;
         } elseif ($currentTime instanceof DateTimeImmutable) {
             $currentDate = DateTime::createFromFormat('U', $currentTime->format('U'));
-            $currentDate->setTimezone($currentTime->getTimezone());
         } else {
             $currentDate = new DateTime($currentTime ?: 'now');
-            $currentDate->setTimezone(new DateTimeZone(date_default_timezone_get()));
         }
 
+        $currentDate->setTimeZone(new DateTimeZone($timeZone));
         $currentDate->setTime($currentDate->format('H'), $currentDate->format('i'), 0);
         $nextRun = clone $currentDate;
         $nth = (int) $nth;
@@ -386,4 +387,25 @@ class CronExpression
         throw new RuntimeException('Impossible CRON expression');
         // @codeCoverageIgnoreEnd
     }
+
+    /**
+     * Workout what timeZone should be used.
+     *
+     * @param string|\DateTime $currentTime      Relative calculation date
+     * @param string|null      $timeZone         TimeZone to use instead of the system default
+     *
+     * @return string
+     */
+    protected function determineTimeZone($currentTime, $timeZone)
+    {
+        if (! is_null($timeZone)) {
+            return $timeZone;
+        }
+
+        if ($currentTime instanceOf Datetime) {
+            return $currentTime->getTimeZone()->getName();
+        }
+
+        return date_default_timezone_get();
+    }
 }
diff --git a/vendor/mtdowling/cron-expression/src/Cron/DayOfMonthField.php b/vendor/dragonmantank/cron-expression/src/Cron/DayOfMonthField.php
similarity index 62%
rename from vendor/mtdowling/cron-expression/src/Cron/DayOfMonthField.php
rename to vendor/dragonmantank/cron-expression/src/Cron/DayOfMonthField.php
index 53e15bc4..abf59690 100644
--- a/vendor/mtdowling/cron-expression/src/Cron/DayOfMonthField.php
+++ b/vendor/dragonmantank/cron-expression/src/Cron/DayOfMonthField.php
@@ -24,6 +24,9 @@ use DateTime;
  */
 class DayOfMonthField extends AbstractField
 {
+    protected $rangeStart = 1;
+    protected $rangeEnd = 31;
+
     /**
      * Get the nearest day of the week for a given day in a month
      *
@@ -99,75 +102,30 @@ class DayOfMonthField extends AbstractField
     }
 
     /**
-     * Validates that the value is valid for the Day of the Month field
-     * Days of the month can contain values of 1-31, *, L, or ? by default. This can be augmented with lists via a ',',
-     * ranges via a '-', or with a '[0-9]W' to specify the closest weekday.
-     *
-     * @param string $value
-     * @return bool
+     * @inheritDoc
      */
     public function validate($value)
     {
-        // Allow wildcards and a single L
-        if ($value === '?' || $value === '*' || $value === 'L') {
-            return true;
-        }
-
-        // If you only contain numbers and are within 1-31
-        if ((bool) preg_match('/^\d{1,2}$/', $value) && ($value >= 1 && $value <= 31)) {
-            return true;
-        }
-
-        // If you have a -, we will deal with each of your chunks
-        if ((bool) preg_match('/-/', $value)) {
-            // We cannot have a range within a list or vice versa
-            if ((bool) preg_match('/,/', $value)) {
-                return false;
-            }
-
-            $chunks = explode('-', $value);
-            foreach ($chunks as $chunk) {
-                if (!$this->validate($chunk)) {
-                    return false;
-                }
-            }
+        $basicChecks = parent::validate($value);
 
-            return true;
+        // Validate that a list don't have W or L
+        if (strpos($value, ',') !== false && (strpos($value, 'W') !== false || strpos($value, 'L') !== false)) {
+            return false;
         }
 
-        // If you have a comma, we will deal with each value
-        if ((bool) preg_match('/,/', $value)) {
-            // We cannot have a range within a list or vice versa
-            if ((bool) preg_match('/-/', $value)) {
-                return false;
-            }
+        if (!$basicChecks) {
 
-            $chunks = explode(',', $value);
-            foreach ($chunks as $chunk) {
-                if (!$this->validate($chunk)) {
-                    return false;
-                }
+            if ($value === 'L') {
+                return true;
             }
 
-            return true;
-        }
-
-        // If you contain a /, we'll deal with it
-        if ((bool) preg_match('/\//', $value)) {
-            $chunks = explode('/', $value);
-            foreach ($chunks as $chunk) {
-                if (!$this->validate($chunk)) {
-                    return false;
-                }
+            if (preg_match('/^(.*)W$/', $value, $matches)) {
+                return $this->validate($matches[1]);
             }
-            return true;
-        }
 
-        // If you end in W, make sure that it has a numeric in front of it
-        if ((bool) preg_match('/^\d{1,2}W$/', $value)) {
-            return true;
+            return false;
         }
 
-        return false;
+        return $basicChecks;
     }
 }
diff --git a/vendor/mtdowling/cron-expression/src/Cron/DayOfWeekField.php b/vendor/dragonmantank/cron-expression/src/Cron/DayOfWeekField.php
similarity index 72%
rename from vendor/mtdowling/cron-expression/src/Cron/DayOfWeekField.php
rename to vendor/dragonmantank/cron-expression/src/Cron/DayOfWeekField.php
index 83e2f4c1..e1780134 100644
--- a/vendor/mtdowling/cron-expression/src/Cron/DayOfWeekField.php
+++ b/vendor/dragonmantank/cron-expression/src/Cron/DayOfWeekField.php
@@ -21,6 +21,19 @@ use InvalidArgumentException;
  */
 class DayOfWeekField extends AbstractField
 {
+    protected $rangeStart = 0;
+    protected $rangeEnd = 7;
+
+    protected $nthRange;
+
+    protected $literals = [1 => 'MON', 2 => 'TUE', 3 => 'WED', 4 => 'THU', 5 => 'FRI', 6 => 'SAT', 7 => 'SUN'];
+
+    public function __construct()
+    {
+        $this->nthRange = range(1, 5);
+        parent::__construct();
+    }
+
     public function isSatisfiedBy(DateTime $date, $value)
     {
         if ($value == '?') {
@@ -53,18 +66,28 @@ class DayOfWeekField extends AbstractField
         if (strpos($value, '#')) {
             list($weekday, $nth) = explode('#', $value);
 
+            if (!is_numeric($nth)) {
+                throw new InvalidArgumentException("Hashed weekdays must be numeric, {$nth} given");
+            } else {
+                $nth = (int) $nth;
+            }
+
             // 0 and 7 are both Sunday, however 7 matches date('N') format ISO-8601
             if ($weekday === '0') {
                 $weekday = 7;
             }
 
+            $weekday = $this->convertLiterals($weekday);
+
             // Validate the hash fields
             if ($weekday < 0 || $weekday > 7) {
                 throw new InvalidArgumentException("Weekday must be a value between 0 and 7. {$weekday} given");
             }
-            if ($nth > 5) {
-                throw new InvalidArgumentException('There are never more than 5 of a given weekday in a month');
+
+            if (!in_array($nth, $this->nthRange)) {
+                throw new InvalidArgumentException("There are never more than 5 or less than 1 of a given weekday in a month, {$nth} given");
             }
+
             // The current weekday must match the targeted weekday to proceed
             if ($date->format('N') != $weekday) {
                 return false;
@@ -117,25 +140,31 @@ class DayOfWeekField extends AbstractField
         return $this;
     }
 
+    /**
+     * @inheritDoc
+     */
     public function validate($value)
     {
-        $value = $this->convertLiterals($value);
+        $basicChecks = parent::validate($value);
 
-        foreach (explode(',', $value) as $expr) {
-            if (!preg_match('/^(\*|[0-7](L?|#[1-5]))([\/\,\-][0-7]+)*$/', $expr)) {
-                return false;
+        if (!$basicChecks) {
+            // Handle the # value
+            if (strpos($value, '#') !== false) {
+                $chunks = explode('#', $value);
+                $chunks[0] = $this->convertLiterals($chunks[0]);
+
+                if (parent::validate($chunks[0]) && is_numeric($chunks[1]) && in_array($chunks[1], $this->nthRange)) {
+                    return true;
+                }
             }
-        }
 
-        return true;
-    }
+            if (preg_match('/^(.*)L$/', $value, $matches)) {
+                return $this->validate($matches[1]);
+            }
 
-    private function convertLiterals($string)
-    {
-        return str_ireplace(
-            array('SUN', 'MON', 'TUE', 'WED', 'THU', 'FRI', 'SAT'),
-            range(0, 6),
-            $string
-        );
+            return false;
+        }
+
+        return $basicChecks;
     }
 }
diff --git a/vendor/mtdowling/cron-expression/src/Cron/FieldFactory.php b/vendor/dragonmantank/cron-expression/src/Cron/FieldFactory.php
similarity index 92%
rename from vendor/mtdowling/cron-expression/src/Cron/FieldFactory.php
rename to vendor/dragonmantank/cron-expression/src/Cron/FieldFactory.php
index fa0e6fe2..fd27352d 100644
--- a/vendor/mtdowling/cron-expression/src/Cron/FieldFactory.php
+++ b/vendor/dragonmantank/cron-expression/src/Cron/FieldFactory.php
@@ -42,9 +42,6 @@ class FieldFactory
                 case 4:
                     $this->fields[$position] = new DayOfWeekField();
                     break;
-                case 5:
-                    $this->fields[$position] = new YearField();
-                    break;
                 default:
                     throw new InvalidArgumentException(
                         $position . ' is not a valid position'
diff --git a/vendor/mtdowling/cron-expression/src/Cron/FieldInterface.php b/vendor/dragonmantank/cron-expression/src/Cron/FieldInterface.php
similarity index 100%
rename from vendor/mtdowling/cron-expression/src/Cron/FieldInterface.php
rename to vendor/dragonmantank/cron-expression/src/Cron/FieldInterface.php
diff --git a/vendor/mtdowling/cron-expression/src/Cron/HoursField.php b/vendor/dragonmantank/cron-expression/src/Cron/HoursField.php
similarity index 94%
rename from vendor/mtdowling/cron-expression/src/Cron/HoursField.php
rename to vendor/dragonmantank/cron-expression/src/Cron/HoursField.php
index 107f1300..4def9ca1 100644
--- a/vendor/mtdowling/cron-expression/src/Cron/HoursField.php
+++ b/vendor/dragonmantank/cron-expression/src/Cron/HoursField.php
@@ -10,6 +10,9 @@ use DateTimeZone;
  */
 class HoursField extends AbstractField
 {
+    protected $rangeStart = 0;
+    protected $rangeEnd = 23;
+
     public function isSatisfiedBy(DateTime $date, $value)
     {
         return $this->isSatisfied($date->format('H'), $value);
@@ -63,9 +66,4 @@ class HoursField extends AbstractField
 
         return $this;
     }
-
-    public function validate($value)
-    {
-        return (bool) preg_match('/^[\*,\/\-0-9]+$/', $value);
-    }
 }
diff --git a/vendor/mtdowling/cron-expression/src/Cron/MinutesField.php b/vendor/dragonmantank/cron-expression/src/Cron/MinutesField.php
similarity index 93%
rename from vendor/mtdowling/cron-expression/src/Cron/MinutesField.php
rename to vendor/dragonmantank/cron-expression/src/Cron/MinutesField.php
index d8432b55..59bb386f 100644
--- a/vendor/mtdowling/cron-expression/src/Cron/MinutesField.php
+++ b/vendor/dragonmantank/cron-expression/src/Cron/MinutesField.php
@@ -10,6 +10,9 @@ use DateTime;
  */
 class MinutesField extends AbstractField
 {
+    protected $rangeStart = 0;
+    protected $rangeEnd = 59;
+
     public function isSatisfiedBy(DateTime $date, $value)
     {
         return $this->isSatisfied($date->format('i'), $value);
@@ -54,9 +57,4 @@ class MinutesField extends AbstractField
 
         return $this;
     }
-
-    public function validate($value)
-    {
-        return (bool) preg_match('/^[\*,\/\-0-9]+$/', $value);
-    }
 }
diff --git a/vendor/mtdowling/cron-expression/src/Cron/MonthField.php b/vendor/dragonmantank/cron-expression/src/Cron/MonthField.php
similarity index 59%
rename from vendor/mtdowling/cron-expression/src/Cron/MonthField.php
rename to vendor/dragonmantank/cron-expression/src/Cron/MonthField.php
index 0205c171..79fdf3cf 100644
--- a/vendor/mtdowling/cron-expression/src/Cron/MonthField.php
+++ b/vendor/dragonmantank/cron-expression/src/Cron/MonthField.php
@@ -9,17 +9,14 @@ use DateTime;
  */
 class MonthField extends AbstractField
 {
+    protected $rangeStart = 1;
+    protected $rangeEnd = 12;
+    protected $literals = [1 => 'JAN', 2 => 'FEB', 3 => 'MAR', 4 => 'APR', 5 => 'MAY', 6 => 'JUN', 7 => 'JUL',
+        8 => 'AUG', 9 => 'SEP', 10 => 'OCT', 11 => 'NOV', 12 => 'DEC'];
+
     public function isSatisfiedBy(DateTime $date, $value)
     {
-        // Convert text month values to integers
-        $value = str_ireplace(
-            array(
-                'JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN',
-                'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC'
-            ),
-            range(1, 12),
-            $value
-        );
+        $value = $this->convertLiterals($value);
 
         return $this->isSatisfied($date->format('m'), $value);
     }
@@ -37,8 +34,5 @@ class MonthField extends AbstractField
         return $this;
     }
 
-    public function validate($value)
-    {
-        return (bool) preg_match('/^[\*,\/\-0-9A-Z]+$/', $value);
-    }
+
 }
diff --git a/vendor/dragonmantank/cron-expression/tests/Cron/AbstractFieldTest.php b/vendor/dragonmantank/cron-expression/tests/Cron/AbstractFieldTest.php
new file mode 100644
index 00000000..38114392
--- /dev/null
+++ b/vendor/dragonmantank/cron-expression/tests/Cron/AbstractFieldTest.php
@@ -0,0 +1,139 @@
+<?php
+
+namespace Cron\Tests;
+
+use Cron\DayOfWeekField;
+use Cron\HoursField;
+use Cron\MinutesField;
+use Cron\MonthField;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @author Michael Dowling <mtdowling@gmail.com>
+ */
+class AbstractFieldTest extends TestCase
+{
+    /**
+     * @covers \Cron\AbstractField::isRange
+     */
+    public function testTestsIfRange()
+    {
+        $f = new DayOfWeekField();
+        $this->assertTrue($f->isRange('1-2'));
+        $this->assertFalse($f->isRange('2'));
+    }
+
+    /**
+     * @covers \Cron\AbstractField::isIncrementsOfRanges
+     */
+    public function testTestsIfIncrementsOfRanges()
+    {
+        $f = new DayOfWeekField();
+        $this->assertFalse($f->isIncrementsOfRanges('1-2'));
+        $this->assertTrue($f->isIncrementsOfRanges('1/2'));
+        $this->assertTrue($f->isIncrementsOfRanges('*/2'));
+        $this->assertTrue($f->isIncrementsOfRanges('3-12/2'));
+    }
+
+    /**
+     * @covers \Cron\AbstractField::isInRange
+     */
+    public function testTestsIfInRange()
+    {
+        $f = new DayOfWeekField();
+        $this->assertTrue($f->isInRange('1', '1-2'));
+        $this->assertTrue($f->isInRange('2', '1-2'));
+        $this->assertTrue($f->isInRange('5', '4-12'));
+        $this->assertFalse($f->isInRange('3', '4-12'));
+        $this->assertFalse($f->isInRange('13', '4-12'));
+    }
+
+    /**
+     * @covers \Cron\AbstractField::isInIncrementsOfRanges
+     */
+    public function testTestsIfInIncrementsOfRangesOnZeroStartRange()
+    {
+        $f = new MinutesField();
+        $this->assertTrue($f->isInIncrementsOfRanges('3', '3-59/2'));
+        $this->assertTrue($f->isInIncrementsOfRanges('13', '3-59/2'));
+        $this->assertTrue($f->isInIncrementsOfRanges('15', '3-59/2'));
+        $this->assertTrue($f->isInIncrementsOfRanges('14', '*/2'));
+        $this->assertFalse($f->isInIncrementsOfRanges('2', '3-59/13'));
+        $this->assertFalse($f->isInIncrementsOfRanges('14', '*/13'));
+        $this->assertFalse($f->isInIncrementsOfRanges('14', '3-59/2'));
+        $this->assertFalse($f->isInIncrementsOfRanges('3', '2-59'));
+        $this->assertFalse($f->isInIncrementsOfRanges('3', '2'));
+        $this->assertFalse($f->isInIncrementsOfRanges('3', '*'));
+        $this->assertFalse($f->isInIncrementsOfRanges('0', '*/0'));
+        $this->assertFalse($f->isInIncrementsOfRanges('1', '*/0'));
+
+        $this->assertTrue($f->isInIncrementsOfRanges('4', '4/1'));
+        $this->assertFalse($f->isInIncrementsOfRanges('14', '4/1'));
+        $this->assertFalse($f->isInIncrementsOfRanges('34', '4/1'));
+    }
+
+    /**
+     * @covers \Cron\AbstractField::isInIncrementsOfRanges
+     */
+    public function testTestsIfInIncrementsOfRangesOnOneStartRange()
+    {
+        $f = new MonthField();
+        $this->assertTrue($f->isInIncrementsOfRanges('3', '3-12/2'));
+        $this->assertFalse($f->isInIncrementsOfRanges('13', '3-12/2'));
+        $this->assertFalse($f->isInIncrementsOfRanges('15', '3-12/2'));
+        $this->assertTrue($f->isInIncrementsOfRanges('3', '*/2'));
+        $this->assertFalse($f->isInIncrementsOfRanges('3', '*/3'));
+        $this->assertTrue($f->isInIncrementsOfRanges('7', '*/3'));
+        $this->assertFalse($f->isInIncrementsOfRanges('14', '3-12/2'));
+        $this->assertFalse($f->isInIncrementsOfRanges('3', '2-12'));
+        $this->assertFalse($f->isInIncrementsOfRanges('3', '2'));
+        $this->assertFalse($f->isInIncrementsOfRanges('3', '*'));
+        $this->assertFalse($f->isInIncrementsOfRanges('0', '*/0'));
+        $this->assertFalse($f->isInIncrementsOfRanges('1', '*/0'));
+
+        $this->assertTrue($f->isInIncrementsOfRanges('4', '4/1'));
+        $this->assertFalse($f->isInIncrementsOfRanges('14', '4/1'));
+        $this->assertFalse($f->isInIncrementsOfRanges('34', '4/1'));
+    }
+
+    /**
+     * @covers \Cron\AbstractField::isSatisfied
+     */
+    public function testTestsIfSatisfied()
+    {
+        $f = new DayOfWeekField();
+        $this->assertTrue($f->isSatisfied('12', '3-13'));
+        $this->assertFalse($f->isSatisfied('15', '3-7/2'));
+        $this->assertTrue($f->isSatisfied('12', '*'));
+        $this->assertTrue($f->isSatisfied('12', '12'));
+        $this->assertFalse($f->isSatisfied('12', '3-11'));
+        $this->assertFalse($f->isSatisfied('12', '3-7/2'));
+        $this->assertFalse($f->isSatisfied('12', '11'));
+    }
+
+    /**
+     * Allows ranges and lists to coexist in the same expression
+     *
+     * @see https://github.com/dragonmantank/cron-expression/issues/5
+     */
+    public function testAllowRangesAndLists()
+    {
+        $expression = '5-7,11-13';
+        $f = new HoursField();
+        $this->assertTrue($f->validate($expression));
+    }
+
+    /**
+     * Makes sure that various types of ranges expand out properly
+     *
+     * @see https://github.com/dragonmantank/cron-expression/issues/5
+     */
+    public function testGetRangeForExpressionExpandsCorrectly()
+    {
+        $f = new HoursField();
+        $this->assertSame([5, 6, 7, 11, 12, 13], $f->getRangeForExpression('5-7,11-13', 23));
+        $this->assertSame(['5', '6', '7', '11', '12', '13'], $f->getRangeForExpression('5,6,7,11,12,13', 23));
+        $this->assertSame([0, 6, 12, 18], $f->getRangeForExpression('*/6', 23));
+        $this->assertSame([5, 11], $f->getRangeForExpression('5-13/6', 23));
+    }
+}
diff --git a/vendor/mtdowling/cron-expression/tests/Cron/CronExpressionTest.php b/vendor/dragonmantank/cron-expression/tests/Cron/CronExpressionTest.php
similarity index 52%
rename from vendor/mtdowling/cron-expression/tests/Cron/CronExpressionTest.php
rename to vendor/dragonmantank/cron-expression/tests/Cron/CronExpressionTest.php
index f6fedb98..5d46644b 100644
--- a/vendor/mtdowling/cron-expression/tests/Cron/CronExpressionTest.php
+++ b/vendor/dragonmantank/cron-expression/tests/Cron/CronExpressionTest.php
@@ -3,65 +3,71 @@
 namespace Cron\Tests;
 
 use Cron\CronExpression;
+use Cron\MonthField;
 use DateTime;
 use DateTimeZone;
 use InvalidArgumentException;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Michael Dowling <mtdowling@gmail.com>
  */
-class CronExpressionTest extends PHPUnit_Framework_TestCase
+class CronExpressionTest extends TestCase
 {
     /**
-     * @covers Cron\CronExpression::factory
+     * @covers \Cron\CronExpression::factory
      */
     public function testFactoryRecognizesTemplates()
     {
-        $this->assertEquals('0 0 1 1 *', CronExpression::factory('@annually')->getExpression());
-        $this->assertEquals('0 0 1 1 *', CronExpression::factory('@yearly')->getExpression());
-        $this->assertEquals('0 0 * * 0', CronExpression::factory('@weekly')->getExpression());
+        $this->assertSame('0 0 1 1 *', CronExpression::factory('@annually')->getExpression());
+        $this->assertSame('0 0 1 1 *', CronExpression::factory('@yearly')->getExpression());
+        $this->assertSame('0 0 * * 0', CronExpression::factory('@weekly')->getExpression());
     }
 
     /**
-     * @covers Cron\CronExpression::__construct
-     * @covers Cron\CronExpression::getExpression
-     * @covers Cron\CronExpression::__toString
+     * @covers \Cron\CronExpression::__construct
+     * @covers \Cron\CronExpression::getExpression
+     * @covers \Cron\CronExpression::__toString
      */
     public function testParsesCronSchedule()
     {
         // '2010-09-10 12:00:00'
         $cron = CronExpression::factory('1 2-4 * 4,5,6 */3');
-        $this->assertEquals('1', $cron->getExpression(CronExpression::MINUTE));
-        $this->assertEquals('2-4', $cron->getExpression(CronExpression::HOUR));
-        $this->assertEquals('*', $cron->getExpression(CronExpression::DAY));
-        $this->assertEquals('4,5,6', $cron->getExpression(CronExpression::MONTH));
-        $this->assertEquals('*/3', $cron->getExpression(CronExpression::WEEKDAY));
-        $this->assertEquals('1 2-4 * 4,5,6 */3', $cron->getExpression());
-        $this->assertEquals('1 2-4 * 4,5,6 */3', (string) $cron);
+        $this->assertSame('1', $cron->getExpression(CronExpression::MINUTE));
+        $this->assertSame('2-4', $cron->getExpression(CronExpression::HOUR));
+        $this->assertSame('*', $cron->getExpression(CronExpression::DAY));
+        $this->assertSame('4,5,6', $cron->getExpression(CronExpression::MONTH));
+        $this->assertSame('*/3', $cron->getExpression(CronExpression::WEEKDAY));
+        $this->assertSame('1 2-4 * 4,5,6 */3', $cron->getExpression());
+        $this->assertSame('1 2-4 * 4,5,6 */3', (string) $cron);
         $this->assertNull($cron->getExpression('foo'));
+    }
 
-        try {
-            $cron = CronExpression::factory('A 1 2 3 4');
-            $this->fail('Validation exception not thrown');
-        } catch (InvalidArgumentException $e) {
-        }
+    /**
+     * @covers \Cron\CronExpression::__construct
+     * @covers \Cron\CronExpression::getExpression
+     * @covers \Cron\CronExpression::__toString
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Invalid CRON field value A at position 0
+     */
+    public function testParsesCronScheduleThrowsAnException()
+    {
+        CronExpression::factory('A 1 2 3 4');
     }
 
     /**
-     * @covers Cron\CronExpression::__construct
-     * @covers Cron\CronExpression::getExpression
+     * @covers \Cron\CronExpression::__construct
+     * @covers \Cron\CronExpression::getExpression
      * @dataProvider scheduleWithDifferentSeparatorsProvider
      */
     public function testParsesCronScheduleWithAnySpaceCharsAsSeparators($schedule, array $expected)
     {
         $cron = CronExpression::factory($schedule);
-        $this->assertEquals($expected[0], $cron->getExpression(CronExpression::MINUTE));
-        $this->assertEquals($expected[1], $cron->getExpression(CronExpression::HOUR));
-        $this->assertEquals($expected[2], $cron->getExpression(CronExpression::DAY));
-        $this->assertEquals($expected[3], $cron->getExpression(CronExpression::MONTH));
-        $this->assertEquals($expected[4], $cron->getExpression(CronExpression::WEEKDAY));
-        $this->assertEquals($expected[5], $cron->getExpression(CronExpression::YEAR));
+        $this->assertSame($expected[0], $cron->getExpression(CronExpression::MINUTE));
+        $this->assertSame($expected[1], $cron->getExpression(CronExpression::HOUR));
+        $this->assertSame($expected[2], $cron->getExpression(CronExpression::DAY));
+        $this->assertSame($expected[3], $cron->getExpression(CronExpression::MONTH));
+        $this->assertSame($expected[4], $cron->getExpression(CronExpression::WEEKDAY));
     }
 
     /**
@@ -72,17 +78,17 @@ class CronExpressionTest extends PHPUnit_Framework_TestCase
     public static function scheduleWithDifferentSeparatorsProvider()
     {
         return array(
-            array("*\t*\t*\t*\t*\t*", array('*', '*', '*', '*', '*', '*')),
-            array("*  *  *  *  *  *", array('*', '*', '*', '*', '*', '*')),
-            array("* \t * \t * \t * \t * \t *", array('*', '*', '*', '*', '*', '*')),
-            array("*\t \t*\t \t*\t \t*\t \t*\t \t*", array('*', '*', '*', '*', '*', '*')),
+            array("*\t*\t*\t*\t*\t", array('*', '*', '*', '*', '*', '*')),
+            array("*  *  *  *  *  ", array('*', '*', '*', '*', '*', '*')),
+            array("* \t * \t * \t * \t * \t", array('*', '*', '*', '*', '*', '*')),
+            array("*\t \t*\t \t*\t \t*\t \t*\t \t", array('*', '*', '*', '*', '*', '*')),
         );
     }
 
     /**
-     * @covers Cron\CronExpression::__construct
-     * @covers Cron\CronExpression::setExpression
-     * @covers Cron\CronExpression::setPart
+     * @covers \Cron\CronExpression::__construct
+     * @covers \Cron\CronExpression::setExpression
+     * @covers \Cron\CronExpression::setPart
      * @expectedException InvalidArgumentException
      */
     public function testInvalidCronsWillFail()
@@ -92,7 +98,7 @@ class CronExpressionTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * @covers Cron\CronExpression::setPart
+     * @covers \Cron\CronExpression::setPart
      * @expectedException InvalidArgumentException
      */
     public function testInvalidPartsWillFail()
@@ -116,8 +122,7 @@ class CronExpressionTest extends PHPUnit_Framework_TestCase
             // Handles CSV values
             array('* 20,22 * * *', '2015-08-10 21:50:00', '2015-08-10 22:00:00', false),
             // CSV values can be complex
-            array('* 5,21-22 * * *', '2015-08-10 21:50:00', '2015-08-10 21:50:00', true),
-            array('7-9 * */9 * *', '2015-08-10 22:02:33', '2015-08-18 00:07:00', false),
+            array('7-9 * */9 * *', '2015-08-10 22:02:33', '2015-08-10 22:07:00', false),
             // 15th minute, of the second hour, every 15 days, in January, every Friday
             array('1 * * * 7', '2015-08-10 21:47:27', '2015-08-16 00:01:00', false),
             // Test with exact times
@@ -138,7 +143,6 @@ class CronExpressionTest extends PHPUnit_Framework_TestCase
             array('0 0 * * 3-7', strtotime('2011-06-18 23:09:00'), '2011-06-19 00:00:00', false),
             // Test lists of values and ranges (Abhoryo)
             array('0 0 * * 2-7', strtotime('2011-06-20 23:09:00'), '2011-06-21 00:00:00', false),
-            array('0 0 * * 0,2-6', strtotime('2011-06-20 23:09:00'), '2011-06-21 00:00:00', false),
             array('0 0 * * 2-7', strtotime('2011-06-18 23:09:00'), '2011-06-19 00:00:00', false),
             array('0 0 * * 4-7', strtotime('2011-07-19 00:00:00'), '2011-07-21 00:00:00', false),
             // Test increments of ranges
@@ -146,12 +150,10 @@ class CronExpressionTest extends PHPUnit_Framework_TestCase
             array('4-59/2 * * * *', strtotime('2011-06-20 12:04:00'), '2011-06-20 12:04:00', true),
             array('4-59/2 * * * *', strtotime('2011-06-20 12:06:00'), '2011-06-20 12:06:00', true),
             array('4-59/3 * * * *', strtotime('2011-06-20 12:06:00'), '2011-06-20 12:07:00', false),
-            //array('0 0 * * 0,2-6', strtotime('2011-06-20 23:09:00'), '2011-06-21 00:00:00', false),
             // Test Day of the Week and the Day of the Month (issue #1)
             array('0 0 1 1 0', strtotime('2011-06-15 23:09:00'), '2012-01-01 00:00:00', false),
             array('0 0 1 JAN 0', strtotime('2011-06-15 23:09:00'), '2012-01-01 00:00:00', false),
             array('0 0 1 * 0', strtotime('2011-06-15 23:09:00'), '2012-01-01 00:00:00', false),
-            array('0 0 L * *', strtotime('2011-07-15 00:00:00'), '2011-07-31 00:00:00', false),
             // Test the W day of the week modifier for day of the month field
             array('0 0 2W * *', strtotime('2011-07-01 00:00:00'), '2011-07-01 00:00:00', true),
             array('0 0 1W * *', strtotime('2011-05-01 00:00:00'), '2011-05-02 00:00:00', false),
@@ -161,32 +163,35 @@ class CronExpressionTest extends PHPUnit_Framework_TestCase
             array('0 0 28W * *', strtotime('2011-07-01 00:00:00'), '2011-07-28 00:00:00', false),
             array('0 0 30W * *', strtotime('2011-07-01 00:00:00'), '2011-07-29 00:00:00', false),
             array('0 0 31W * *', strtotime('2011-07-01 00:00:00'), '2011-07-29 00:00:00', false),
-            // Test the year field
-            array('* * * * * 2012', strtotime('2011-05-01 00:00:00'), '2012-01-01 00:00:00', false),
             // Test the last weekday of a month
             array('* * * * 5L', strtotime('2011-07-01 00:00:00'), '2011-07-29 00:00:00', false),
             array('* * * * 6L', strtotime('2011-07-01 00:00:00'), '2011-07-30 00:00:00', false),
             array('* * * * 7L', strtotime('2011-07-01 00:00:00'), '2011-07-31 00:00:00', false),
             array('* * * * 1L', strtotime('2011-07-24 00:00:00'), '2011-07-25 00:00:00', false),
-            array('* * * * TUEL', strtotime('2011-07-24 00:00:00'), '2011-07-26 00:00:00', false),
             array('* * * 1 5L', strtotime('2011-12-25 00:00:00'), '2012-01-27 00:00:00', false),
             // Test the hash symbol for the nth weekday of a given month
             array('* * * * 5#2', strtotime('2011-07-01 00:00:00'), '2011-07-08 00:00:00', false),
             array('* * * * 5#1', strtotime('2011-07-01 00:00:00'), '2011-07-01 00:00:00', true),
             array('* * * * 3#4', strtotime('2011-07-01 00:00:00'), '2011-07-27 00:00:00', false),
+
+            // Issue #7, documented example failed
+            ['3-59/15 6-12 */15 1 2-5', strtotime('2017-01-08 00:00:00'), '2017-01-31 06:03:00', false],
+
+            // https://github.com/laravel/framework/commit/07d160ac3cc9764d5b429734ffce4fa311385403
+            ['* * * * MON-FRI', strtotime('2017-01-08 00:00:00'), strtotime('2017-01-09 00:00:00'), false],
+            ['* * * * TUE', strtotime('2017-01-08 00:00:00'), strtotime('2017-01-10 00:00:00'), false],
         );
     }
 
     /**
-     * @covers Cron\CronExpression::isDue
-     * @covers Cron\CronExpression::getNextRunDate
-     * @covers Cron\DayOfMonthField
-     * @covers Cron\DayOfWeekField
-     * @covers Cron\MinutesField
-     * @covers Cron\HoursField
-     * @covers Cron\MonthField
-     * @covers Cron\YearField
-     * @covers Cron\CronExpression::getRunDate
+     * @covers \Cron\CronExpression::isDue
+     * @covers \Cron\CronExpression::getNextRunDate
+     * @covers \Cron\DayOfMonthField
+     * @covers \Cron\DayOfWeekField
+     * @covers \Cron\MinutesField
+     * @covers \Cron\HoursField
+     * @covers \Cron\MonthField
+     * @covers \Cron\CronExpression::getRunDate
      * @dataProvider scheduleProvider
      */
     public function testDeterminesIfCronIsDue($schedule, $relativeTime, $nextRun, $isDue)
@@ -200,13 +205,21 @@ class CronExpressionTest extends PHPUnit_Framework_TestCase
         } elseif (is_int($relativeTime)) {
             $relativeTime = date('Y-m-d H:i:s', $relativeTime);
         }
-        $this->assertEquals($isDue, $cron->isDue($relativeTime));
+
+        if (is_string($nextRun)) {
+            $nextRunDate = new DateTime($nextRun);
+        } elseif (is_int($nextRun)) {
+            $nextRunDate = new DateTime();
+            $nextRunDate->setTimestamp($nextRun);
+        }
+        $this->assertSame($isDue, $cron->isDue($relativeTime));
         $next = $cron->getNextRunDate($relativeTime, 0, true);
-        $this->assertEquals(new DateTime($nextRun), $next);
+
+        $this->assertEquals($nextRunDate, $next);
     }
 
     /**
-     * @covers Cron\CronExpression::isDue
+     * @covers \Cron\CronExpression::isDue
      */
     public function testIsDueHandlesDifferentDates()
     {
@@ -218,34 +231,104 @@ class CronExpressionTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * @covers Cron\CronExpression::isDue
+     * @covers \Cron\CronExpression::isDue
      */
-    public function testIsDueHandlesDifferentTimezones()
+    public function testIsDueHandlesDifferentDefaultTimezones()
     {
+        $originalTimezone = date_default_timezone_get();
         $cron = CronExpression::factory('0 15 * * 3'); //Wednesday at 15:00
         $date = '2014-01-01 15:00'; //Wednesday
-        $utc = new DateTimeZone('UTC');
-        $amsterdam =  new DateTimeZone('Europe/Amsterdam');
-        $tokyo = new DateTimeZone('Asia/Tokyo');
 
         date_default_timezone_set('UTC');
-        $this->assertTrue($cron->isDue(new DateTime($date, $utc)));
-        $this->assertFalse($cron->isDue(new DateTime($date, $amsterdam)));
-        $this->assertFalse($cron->isDue(new DateTime($date, $tokyo)));
+        $this->assertTrue($cron->isDue(new DateTime($date), 'UTC'));
+        $this->assertFalse($cron->isDue(new DateTime($date), 'Europe/Amsterdam'));
+        $this->assertFalse($cron->isDue(new DateTime($date), 'Asia/Tokyo'));
 
         date_default_timezone_set('Europe/Amsterdam');
-        $this->assertFalse($cron->isDue(new DateTime($date, $utc)));
-        $this->assertTrue($cron->isDue(new DateTime($date, $amsterdam)));
-        $this->assertFalse($cron->isDue(new DateTime($date, $tokyo)));
+        $this->assertFalse($cron->isDue(new DateTime($date), 'UTC'));
+        $this->assertTrue($cron->isDue(new DateTime($date), 'Europe/Amsterdam'));
+        $this->assertFalse($cron->isDue(new DateTime($date), 'Asia/Tokyo'));
 
         date_default_timezone_set('Asia/Tokyo');
-        $this->assertFalse($cron->isDue(new DateTime($date, $utc)));
-        $this->assertFalse($cron->isDue(new DateTime($date, $amsterdam)));
-        $this->assertTrue($cron->isDue(new DateTime($date, $tokyo)));
+        $this->assertFalse($cron->isDue(new DateTime($date), 'UTC'));
+        $this->assertFalse($cron->isDue(new DateTime($date), 'Europe/Amsterdam'));
+        $this->assertTrue($cron->isDue(new DateTime($date), 'Asia/Tokyo'));
+
+        date_default_timezone_set($originalTimezone);
+    }
+
+    /**
+     * @covers \Cron\CronExpression::isDue
+     */
+    public function testIsDueHandlesDifferentSuppliedTimezones()
+    {
+        $cron = CronExpression::factory('0 15 * * 3'); //Wednesday at 15:00
+        $date = '2014-01-01 15:00'; //Wednesday
+
+        $this->assertTrue($cron->isDue(new DateTime($date, new DateTimeZone('UTC')), 'UTC'));
+        $this->assertFalse($cron->isDue(new DateTime($date, new DateTimeZone('UTC')), 'Europe/Amsterdam'));
+        $this->assertFalse($cron->isDue(new DateTime($date, new DateTimeZone('UTC')), 'Asia/Tokyo'));
+
+        $this->assertFalse($cron->isDue(new DateTime($date, new DateTimeZone('Europe/Amsterdam')), 'UTC'));
+        $this->assertTrue($cron->isDue(new DateTime($date, new DateTimeZone('Europe/Amsterdam')), 'Europe/Amsterdam'));
+        $this->assertFalse($cron->isDue(new DateTime($date, new DateTimeZone('Europe/Amsterdam')), 'Asia/Tokyo'));
+
+        $this->assertFalse($cron->isDue(new DateTime($date, new DateTimeZone('Asia/Tokyo')), 'UTC'));
+        $this->assertFalse($cron->isDue(new DateTime($date, new DateTimeZone('Asia/Tokyo')), 'Europe/Amsterdam'));
+        $this->assertTrue($cron->isDue(new DateTime($date, new DateTimeZone('Asia/Tokyo')), 'Asia/Tokyo'));
+    }
+
+   /**
+     * @covers Cron\CronExpression::isDue
+     */
+    public function testIsDueHandlesDifferentTimezonesAsArgument()
+    {
+        $cron      = CronExpression::factory('0 15 * * 3'); //Wednesday at 15:00
+        $date      = '2014-01-01 15:00'; //Wednesday
+        $utc       = new \DateTimeZone('UTC');
+        $amsterdam = new \DateTimeZone('Europe/Amsterdam');
+        $tokyo     = new \DateTimeZone('Asia/Tokyo');
+        $this->assertTrue($cron->isDue(new DateTime($date, $utc), 'UTC'));
+        $this->assertFalse($cron->isDue(new DateTime($date, $amsterdam), 'UTC'));
+        $this->assertFalse($cron->isDue(new DateTime($date, $tokyo), 'UTC'));
+        $this->assertFalse($cron->isDue(new DateTime($date, $utc), 'Europe/Amsterdam'));
+        $this->assertTrue($cron->isDue(new DateTime($date, $amsterdam), 'Europe/Amsterdam'));
+        $this->assertFalse($cron->isDue(new DateTime($date, $tokyo), 'Europe/Amsterdam'));
+        $this->assertFalse($cron->isDue(new DateTime($date, $utc), 'Asia/Tokyo'));
+        $this->assertFalse($cron->isDue(new DateTime($date, $amsterdam), 'Asia/Tokyo'));
+        $this->assertTrue($cron->isDue(new DateTime($date, $tokyo), 'Asia/Tokyo'));
     }
 
     /**
-     * @covers Cron\CronExpression::getPreviousRunDate
+     * @covers Cron\CronExpression::isDue
+     */
+    public function testRecognisesTimezonesAsPartOfDateTime()
+    {
+        $cron = CronExpression::factory("0 7 * * *");
+        $tzCron = "America/New_York";
+        $tzServer = new \DateTimeZone("Europe/London");
+
+        $dtCurrent = \DateTime::createFromFormat("!Y-m-d H:i:s", "2017-10-17 10:00:00", $tzServer);
+        $dtPrev = $cron->getPreviousRunDate($dtCurrent, 0, true, $tzCron);
+        $this->assertEquals('1508151600 : 2017-10-16T07:00:00-04:00 : America/New_York', $dtPrev->format("U \: c \: e"));
+
+        $dtCurrent = \DateTimeImmutable::createFromFormat("!Y-m-d H:i:s", "2017-10-17 10:00:00", $tzServer);
+        $dtPrev = $cron->getPreviousRunDate($dtCurrent, 0, true, $tzCron);
+        $this->assertEquals('1508151600 : 2017-10-16T07:00:00-04:00 : America/New_York', $dtPrev->format("U \: c \: e"));
+
+        $dtCurrent = \DateTimeImmutable::createFromFormat("!Y-m-d H:i:s", "2017-10-17 10:00:00", $tzServer);
+        $dtPrev = $cron->getPreviousRunDate($dtCurrent->format("c"), 0, true, $tzCron);
+        $this->assertEquals('1508151600 : 2017-10-16T07:00:00-04:00 : America/New_York', $dtPrev->format("U \: c \: e"));
+
+        $dtCurrent = \DateTimeImmutable::createFromFormat("!Y-m-d H:i:s", "2017-10-17 10:00:00", $tzServer);
+        $dtPrev = $cron->getPreviousRunDate($dtCurrent->format("\@U"), 0, true, $tzCron);
+        $this->assertEquals('1508151600 : 2017-10-16T07:00:00-04:00 : America/New_York', $dtPrev->format("U \: c \: e"));
+
+    }
+
+
+    /**
+     * @covers \Cron\CronExpression::getPreviousRunDate
      */
     public function testCanGetPreviousRunDates()
     {
@@ -266,7 +349,7 @@ class CronExpressionTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * @covers Cron\CronExpression::getMultipleRunDates
+     * @covers \Cron\CronExpression::getMultipleRunDates
      */
     public function testProvidesMultipleRunDates()
     {
@@ -280,28 +363,28 @@ class CronExpressionTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * @covers Cron\CronExpression::getMultipleRunDates
-     * @covers Cron\CronExpression::setMaxIterationCount
+     * @covers \Cron\CronExpression::getMultipleRunDates
+     * @covers \Cron\CronExpression::setMaxIterationCount
      */
     public function testProvidesMultipleRunDatesForTheFarFuture() {
         // Fails with the default 1000 iteration limit
-        $cron = CronExpression::factory('0 0 12 1 * */2');
+        $cron = CronExpression::factory('0 0 12 1 *');
         $cron->setMaxIterationCount(2000);
         $this->assertEquals(array(
             new DateTime('2016-01-12 00:00:00'),
+            new DateTime('2017-01-12 00:00:00'),
             new DateTime('2018-01-12 00:00:00'),
+            new DateTime('2019-01-12 00:00:00'),
             new DateTime('2020-01-12 00:00:00'),
+            new DateTime('2021-01-12 00:00:00'),
             new DateTime('2022-01-12 00:00:00'),
+            new DateTime('2023-01-12 00:00:00'),
             new DateTime('2024-01-12 00:00:00'),
-            new DateTime('2026-01-12 00:00:00'),
-            new DateTime('2028-01-12 00:00:00'),
-            new DateTime('2030-01-12 00:00:00'),
-            new DateTime('2032-01-12 00:00:00'),
         ), $cron->getMultipleRunDates(9, '2015-04-28 00:00:00', false, true));
     }
 
     /**
-     * @covers Cron\CronExpression
+     * @covers \Cron\CronExpression
      */
     public function testCanIterateOverNextRuns()
     {
@@ -325,7 +408,7 @@ class CronExpressionTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * @covers Cron\CronExpression::getRunDate
+     * @covers \Cron\CronExpression::getRunDate
      */
     public function testSkipsCurrentDateByDefault()
     {
@@ -333,33 +416,33 @@ class CronExpressionTest extends PHPUnit_Framework_TestCase
         $current = new DateTime('now');
         $next = $cron->getNextRunDate($current);
         $nextPrev = $cron->getPreviousRunDate($next);
-        $this->assertEquals($current->format('Y-m-d H:i:00'), $nextPrev->format('Y-m-d H:i:s'));
+        $this->assertSame($current->format('Y-m-d H:i:00'), $nextPrev->format('Y-m-d H:i:s'));
     }
 
     /**
-     * @covers Cron\CronExpression::getRunDate
+     * @covers \Cron\CronExpression::getRunDate
      * @ticket 7
      */
     public function testStripsForSeconds()
     {
         $cron = CronExpression::factory('* * * * *');
         $current = new DateTime('2011-09-27 10:10:54');
-        $this->assertEquals('2011-09-27 10:11:00', $cron->getNextRunDate($current)->format('Y-m-d H:i:s'));
+        $this->assertSame('2011-09-27 10:11:00', $cron->getNextRunDate($current)->format('Y-m-d H:i:s'));
     }
 
     /**
-     * @covers Cron\CronExpression::getRunDate
+     * @covers \Cron\CronExpression::getRunDate
      */
     public function testFixesPhpBugInDateIntervalMonth()
     {
         $cron = CronExpression::factory('0 0 27 JAN *');
-        $this->assertEquals('2011-01-27 00:00:00', $cron->getPreviousRunDate('2011-08-22 00:00:00')->format('Y-m-d H:i:s'));
+        $this->assertSame('2011-01-27 00:00:00', $cron->getPreviousRunDate('2011-08-22 00:00:00')->format('Y-m-d H:i:s'));
     }
 
     public function testIssue29()
     {
         $cron = CronExpression::factory('@weekly');
-        $this->assertEquals(
+        $this->assertSame(
             '2013-03-10 00:00:00',
             $cron->getPreviousRunDate('2013-03-17 00:00:00')->format('Y-m-d H:i:s')
         );
@@ -386,7 +469,7 @@ class CronExpressionTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * @covers Cron\CronExpression::getRunDate
+     * @covers \Cron\CronExpression::getRunDate
      */
     public function testKeepOriginalTime()
     {
@@ -394,15 +477,15 @@ class CronExpressionTest extends PHPUnit_Framework_TestCase
         $strNow = $now->format(DateTime::ISO8601);
         $cron = CronExpression::factory('0 0 * * *');
         $cron->getPreviousRunDate($now);
-        $this->assertEquals($strNow, $now->format(DateTime::ISO8601));
+        $this->assertSame($strNow, $now->format(DateTime::ISO8601));
     }
 
     /**
-     * @covers Cron\CronExpression::__construct
-     * @covers Cron\CronExpression::factory
-     * @covers Cron\CronExpression::isValidExpression
-     * @covers Cron\CronExpression::setExpression
-     * @covers Cron\CronExpression::setPart
+     * @covers \Cron\CronExpression::__construct
+     * @covers \Cron\CronExpression::factory
+     * @covers \Cron\CronExpression::isValidExpression
+     * @covers \Cron\CronExpression::setExpression
+     * @covers \Cron\CronExpression::setPart
      */
     public function testValidationWorks()
     {
@@ -410,5 +493,68 @@ class CronExpressionTest extends PHPUnit_Framework_TestCase
         $this->assertFalse(CronExpression::isValidExpression('* * * 1'));
         // Valid
         $this->assertTrue(CronExpression::isValidExpression('* * * * 1'));
+
+        // Issue #156, 13 is an invalid month
+        $this->assertFalse(CronExpression::isValidExpression("* * * 13 * "));
+
+        // Issue #155, 90 is an invalid second
+        $this->assertFalse(CronExpression::isValidExpression('90 * * * *'));
+
+        // Issue #154, 24 is an invalid hour
+        $this->assertFalse(CronExpression::isValidExpression("0 24 1 12 0"));
+
+        // Issue #125, this is just all sorts of wrong
+        $this->assertFalse(CronExpression::isValidExpression('990 14 * * mon-fri0345345'));
+
+        // see https://github.com/dragonmantank/cron-expression/issues/5
+        $this->assertTrue(CronExpression::isValidExpression('2,17,35,47 5-7,11-13 * * *'));
+    }
+
+    /**
+     * Makes sure that 00 is considered a valid value for 0-based fields
+     * cronie allows numbers with a leading 0, so adding support for this as well
+     *
+     * @see https://github.com/dragonmantank/cron-expression/issues/12
+     */
+    public function testDoubleZeroIsValid()
+    {
+        $this->assertTrue(CronExpression::isValidExpression('00 * * * *'));
+        $this->assertTrue(CronExpression::isValidExpression('01 * * * *'));
+        $this->assertTrue(CronExpression::isValidExpression('* 00 * * *'));
+        $this->assertTrue(CronExpression::isValidExpression('* 01 * * *'));
+
+        $e = CronExpression::factory('00 * * * *');
+        $this->assertTrue($e->isDue(new DateTime('2014-04-07 00:00:00')));
+        $e = CronExpression::factory('01 * * * *');
+        $this->assertTrue($e->isDue(new DateTime('2014-04-07 00:01:00')));
+
+        $e = CronExpression::factory('* 00 * * *');
+        $this->assertTrue($e->isDue(new DateTime('2014-04-07 00:00:00')));
+        $e = CronExpression::factory('* 01 * * *');
+        $this->assertTrue($e->isDue(new DateTime('2014-04-07 01:00:00')));
+    }
+
+
+    /**
+     * Ranges with large steps should "wrap around" to the appropriate value
+     * cronie allows for steps that are larger than the range of a field, with it wrapping around like a ring buffer. We
+     * should do the same.
+     *
+     * @see https://github.com/dragonmantank/cron-expression/issues/6
+     */
+    public function testRangesWrapAroundWithLargeSteps()
+    {
+        $f = new MonthField();
+        $this->assertTrue($f->validate('*/123'));
+        $this->assertSame([4], $f->getRangeForExpression('*/123', 12));
+
+        $e = CronExpression::factory('* * * */123 *');
+        $this->assertTrue($e->isDue(new DateTime('2014-04-07 00:00:00')));
+
+        $nextRunDate = $e->getNextRunDate(new DateTime('2014-04-07 00:00:00'));
+        $this->assertSame('2014-04-07 00:01:00', $nextRunDate->format('Y-m-d H:i:s'));
+
+        $nextRunDate = $e->getNextRunDate(new DateTime('2014-05-07 00:00:00'));
+        $this->assertSame('2015-04-01 00:00:00', $nextRunDate->format('Y-m-d H:i:s'));
     }
 }
diff --git a/vendor/mtdowling/cron-expression/tests/Cron/DayOfMonthFieldTest.php b/vendor/dragonmantank/cron-expression/tests/Cron/DayOfMonthFieldTest.php
similarity index 66%
rename from vendor/mtdowling/cron-expression/tests/Cron/DayOfMonthFieldTest.php
rename to vendor/dragonmantank/cron-expression/tests/Cron/DayOfMonthFieldTest.php
index eff04557..0dae4ed6 100644
--- a/vendor/mtdowling/cron-expression/tests/Cron/DayOfMonthFieldTest.php
+++ b/vendor/dragonmantank/cron-expression/tests/Cron/DayOfMonthFieldTest.php
@@ -4,27 +4,30 @@ namespace Cron\Tests;
 
 use Cron\DayOfMonthField;
 use DateTime;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Michael Dowling <mtdowling@gmail.com>
  */
-class DayOfMonthFieldTest extends PHPUnit_Framework_TestCase
+class DayOfMonthFieldTest extends TestCase
 {
     /**
-     * @covers Cron\DayOfMonthField::validate
+     * @covers \Cron\DayOfMonthField::validate
      */
     public function testValidatesField()
     {
         $f = new DayOfMonthField();
         $this->assertTrue($f->validate('1'));
         $this->assertTrue($f->validate('*'));
-        $this->assertTrue($f->validate('5W,L'));
+        $this->assertTrue($f->validate('L'));
+        $this->assertTrue($f->validate('5W'));
+        $this->assertTrue($f->validate('01'));
+        $this->assertFalse($f->validate('5W,L'));
         $this->assertFalse($f->validate('1.'));
     }
 
     /**
-     * @covers Cron\DayOfMonthField::isSatisfiedBy
+     * @covers \Cron\DayOfMonthField::isSatisfiedBy
      */
     public function testChecksIfSatisfied()
     {
@@ -33,18 +36,18 @@ class DayOfMonthFieldTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * @covers Cron\DayOfMonthField::increment
+     * @covers \Cron\DayOfMonthField::increment
      */
     public function testIncrementsDate()
     {
         $d = new DateTime('2011-03-15 11:15:00');
         $f = new DayOfMonthField();
         $f->increment($d);
-        $this->assertEquals('2011-03-16 00:00:00', $d->format('Y-m-d H:i:s'));
+        $this->assertSame('2011-03-16 00:00:00', $d->format('Y-m-d H:i:s'));
 
         $d = new DateTime('2011-03-15 11:15:00');
         $f->increment($d, true);
-        $this->assertEquals('2011-03-14 23:59:00', $d->format('Y-m-d H:i:s'));
+        $this->assertSame('2011-03-14 23:59:00', $d->format('Y-m-d H:i:s'));
     }
 
     /**
diff --git a/vendor/mtdowling/cron-expression/tests/Cron/DayOfWeekFieldTest.php b/vendor/dragonmantank/cron-expression/tests/Cron/DayOfWeekFieldTest.php
similarity index 72%
rename from vendor/mtdowling/cron-expression/tests/Cron/DayOfWeekFieldTest.php
rename to vendor/dragonmantank/cron-expression/tests/Cron/DayOfWeekFieldTest.php
index 182d5e90..d27c34df 100644
--- a/vendor/mtdowling/cron-expression/tests/Cron/DayOfWeekFieldTest.php
+++ b/vendor/dragonmantank/cron-expression/tests/Cron/DayOfWeekFieldTest.php
@@ -4,28 +4,30 @@ namespace Cron\Tests;
 
 use Cron\DayOfWeekField;
 use DateTime;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Michael Dowling <mtdowling@gmail.com>
  */
-class DayOfWeekFieldTest extends PHPUnit_Framework_TestCase
+class DayOfWeekFieldTest extends TestCase
 {
     /**
-     * @covers Cron\DayOfWeekField::validate
+     * @covers \Cron\DayOfWeekField::validate
      */
     public function testValidatesField()
     {
         $f = new DayOfWeekField();
         $this->assertTrue($f->validate('1'));
+        $this->assertTrue($f->validate('01'));
+        $this->assertTrue($f->validate('00'));
         $this->assertTrue($f->validate('*'));
-        $this->assertTrue($f->validate('*/3,1,1-12'));
+        $this->assertFalse($f->validate('*/3,1,1-12'));
         $this->assertTrue($f->validate('SUN-2'));
         $this->assertFalse($f->validate('1.'));
     }
 
     /**
-     * @covers Cron\DayOfWeekField::isSatisfiedBy
+     * @covers \Cron\DayOfWeekField::isSatisfiedBy
      */
     public function testChecksIfSatisfied()
     {
@@ -34,22 +36,22 @@ class DayOfWeekFieldTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * @covers Cron\DayOfWeekField::increment
+     * @covers \Cron\DayOfWeekField::increment
      */
     public function testIncrementsDate()
     {
         $d = new DateTime('2011-03-15 11:15:00');
         $f = new DayOfWeekField();
         $f->increment($d);
-        $this->assertEquals('2011-03-16 00:00:00', $d->format('Y-m-d H:i:s'));
+        $this->assertSame('2011-03-16 00:00:00', $d->format('Y-m-d H:i:s'));
 
         $d = new DateTime('2011-03-15 11:15:00');
         $f->increment($d, true);
-        $this->assertEquals('2011-03-14 23:59:00', $d->format('Y-m-d H:i:s'));
+        $this->assertSame('2011-03-14 23:59:00', $d->format('Y-m-d H:i:s'));
     }
 
     /**
-     * @covers Cron\DayOfWeekField::isSatisfiedBy
+     * @covers \Cron\DayOfWeekField::isSatisfiedBy
      * @expectedException InvalidArgumentException
      * @expectedExceptionMessage Weekday must be a value between 0 and 7. 12 given
      */
@@ -60,9 +62,9 @@ class DayOfWeekFieldTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * @covers Cron\DayOfWeekField::isSatisfiedBy
+     * @covers \Cron\DayOfWeekField::isSatisfiedBy
      * @expectedException InvalidArgumentException
-     * @expectedExceptionMessage There are never more than 5 of a given weekday in a month
+     * @expectedExceptionMessage There are never more than 5 or less than 1 of a given weekday in a month
      */
     public function testValidatesHashValueNth()
     {
@@ -71,7 +73,7 @@ class DayOfWeekFieldTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * @covers Cron\DayOfWeekField::validate
+     * @covers \Cron\DayOfWeekField::validate
      */
     public function testValidateWeekendHash()
     {
@@ -87,7 +89,7 @@ class DayOfWeekFieldTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * @covers Cron\DayOfWeekField::isSatisfiedBy
+     * @covers \Cron\DayOfWeekField::isSatisfiedBy
      */
     public function testHandlesZeroAndSevenDayOfTheWeekValues()
     {
@@ -114,4 +116,14 @@ class DayOfWeekFieldTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($f->validate('*-'));
         $this->assertFalse($f->validate(',-'));
     }
+
+    /**
+     * @see https://github.com/laravel/framework/commit/07d160ac3cc9764d5b429734ffce4fa311385403
+     */
+    public function testLiteralsExpandProperly()
+    {
+        $f = new DayOfWeekField();
+        $this->assertTrue($f->validate('MON-FRI'));
+        $this->assertSame([1,2,3,4,5], $f->getRangeForExpression('MON-FRI', 7));
+    }
 }
diff --git a/vendor/mtdowling/cron-expression/tests/Cron/FieldFactoryTest.php b/vendor/dragonmantank/cron-expression/tests/Cron/FieldFactoryTest.php
similarity index 71%
rename from vendor/mtdowling/cron-expression/tests/Cron/FieldFactoryTest.php
rename to vendor/dragonmantank/cron-expression/tests/Cron/FieldFactoryTest.php
index f34cc9b5..a6e66b0e 100644
--- a/vendor/mtdowling/cron-expression/tests/Cron/FieldFactoryTest.php
+++ b/vendor/dragonmantank/cron-expression/tests/Cron/FieldFactoryTest.php
@@ -3,15 +3,15 @@
 namespace Cron\Tests;
 
 use Cron\FieldFactory;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Michael Dowling <mtdowling@gmail.com>
  */
-class FieldFactoryTest extends PHPUnit_Framework_TestCase
+class FieldFactoryTest extends TestCase
 {
     /**
-     * @covers Cron\FieldFactory::getField
+     * @covers \Cron\FieldFactory::getField
      */
     public function testRetrievesFieldInstances()
     {
@@ -21,18 +21,17 @@ class FieldFactoryTest extends PHPUnit_Framework_TestCase
             2 => 'Cron\DayOfMonthField',
             3 => 'Cron\MonthField',
             4 => 'Cron\DayOfWeekField',
-            5 => 'Cron\YearField'
         );
 
         $f = new FieldFactory();
 
         foreach ($mappings as $position => $class) {
-            $this->assertEquals($class, get_class($f->getField($position)));
+            $this->assertSame($class, get_class($f->getField($position)));
         }
     }
 
     /**
-     * @covers Cron\FieldFactory::getField
+     * @covers \Cron\FieldFactory::getField
      * @expectedException InvalidArgumentException
      */
     public function testValidatesFieldPosition()
diff --git a/vendor/mtdowling/cron-expression/tests/Cron/HoursFieldTest.php b/vendor/dragonmantank/cron-expression/tests/Cron/HoursFieldTest.php
similarity index 61%
rename from vendor/mtdowling/cron-expression/tests/Cron/HoursFieldTest.php
rename to vendor/dragonmantank/cron-expression/tests/Cron/HoursFieldTest.php
index d2d8a22a..e936d11a 100644
--- a/vendor/mtdowling/cron-expression/tests/Cron/HoursFieldTest.php
+++ b/vendor/dragonmantank/cron-expression/tests/Cron/HoursFieldTest.php
@@ -4,41 +4,43 @@ namespace Cron\Tests;
 
 use Cron\HoursField;
 use DateTime;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Michael Dowling <mtdowling@gmail.com>
  */
-class HoursFieldTest extends PHPUnit_Framework_TestCase
+class HoursFieldTest extends TestCase
 {
     /**
-     * @covers Cron\HoursField::validate
+     * @covers \Cron\HoursField::validate
      */
     public function testValidatesField()
     {
         $f = new HoursField();
         $this->assertTrue($f->validate('1'));
+        $this->assertTrue($f->validate('00'));
+        $this->assertTrue($f->validate('01'));
         $this->assertTrue($f->validate('*'));
-        $this->assertTrue($f->validate('*/3,1,1-12'));
+        $this->assertFalse($f->validate('*/3,1,1-12'));
      }
 
     /**
-     * @covers Cron\HoursField::increment
+     * @covers \Cron\HoursField::increment
      */
     public function testIncrementsDate()
     {
         $d = new DateTime('2011-03-15 11:15:00');
         $f = new HoursField();
         $f->increment($d);
-        $this->assertEquals('2011-03-15 12:00:00', $d->format('Y-m-d H:i:s'));
+        $this->assertSame('2011-03-15 12:00:00', $d->format('Y-m-d H:i:s'));
 
         $d->setTime(11, 15, 0);
         $f->increment($d, true);
-        $this->assertEquals('2011-03-15 10:59:00', $d->format('Y-m-d H:i:s'));
+        $this->assertSame('2011-03-15 10:59:00', $d->format('Y-m-d H:i:s'));
     }
 
     /**
-     * @covers Cron\HoursField::increment
+     * @covers \Cron\HoursField::increment
      */
     public function testIncrementsDateWithThirtyMinuteOffsetTimezone()
     {
@@ -47,16 +49,16 @@ class HoursFieldTest extends PHPUnit_Framework_TestCase
         $d = new DateTime('2011-03-15 11:15:00');
         $f = new HoursField();
         $f->increment($d);
-        $this->assertEquals('2011-03-15 12:00:00', $d->format('Y-m-d H:i:s'));
+        $this->assertSame('2011-03-15 12:00:00', $d->format('Y-m-d H:i:s'));
 
         $d->setTime(11, 15, 0);
         $f->increment($d, true);
-        $this->assertEquals('2011-03-15 10:59:00', $d->format('Y-m-d H:i:s'));
+        $this->assertSame('2011-03-15 10:59:00', $d->format('Y-m-d H:i:s'));
         date_default_timezone_set($tz);
     }
 
     /**
-     * @covers Cron\HoursField::increment
+     * @covers \Cron\HoursField::increment
      */
     public function testIncrementDateWithFifteenMinuteOffsetTimezone()
     {
@@ -65,11 +67,11 @@ class HoursFieldTest extends PHPUnit_Framework_TestCase
         $d = new DateTime('2011-03-15 11:15:00');
         $f = new HoursField();
         $f->increment($d);
-        $this->assertEquals('2011-03-15 12:00:00', $d->format('Y-m-d H:i:s'));
+        $this->assertSame('2011-03-15 12:00:00', $d->format('Y-m-d H:i:s'));
 
         $d->setTime(11, 15, 0);
         $f->increment($d, true);
-        $this->assertEquals('2011-03-15 10:59:00', $d->format('Y-m-d H:i:s'));
+        $this->assertSame('2011-03-15 10:59:00', $d->format('Y-m-d H:i:s'));
         date_default_timezone_set($tz);
     }
 }
diff --git a/vendor/dragonmantank/cron-expression/tests/Cron/MinutesFieldTest.php b/vendor/dragonmantank/cron-expression/tests/Cron/MinutesFieldTest.php
new file mode 100644
index 00000000..b91bffac
--- /dev/null
+++ b/vendor/dragonmantank/cron-expression/tests/Cron/MinutesFieldTest.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Cron\Tests;
+
+use Cron\MinutesField;
+use DateTime;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @author Michael Dowling <mtdowling@gmail.com>
+ */
+class MinutesFieldTest extends TestCase
+{
+    /**
+     * @covers \Cron\MinutesField::validate
+     */
+    public function testValidatesField()
+    {
+        $f = new MinutesField();
+        $this->assertTrue($f->validate('1'));
+        $this->assertTrue($f->validate('*'));
+        $this->assertFalse($f->validate('*/3,1,1-12'));
+    }
+
+    /**
+     * @covers \Cron\MinutesField::increment
+     */
+    public function testIncrementsDate()
+    {
+        $d = new DateTime('2011-03-15 11:15:00');
+        $f = new MinutesField();
+        $f->increment($d);
+        $this->assertSame('2011-03-15 11:16:00', $d->format('Y-m-d H:i:s'));
+        $f->increment($d, true);
+        $this->assertSame('2011-03-15 11:15:00', $d->format('Y-m-d H:i:s'));
+    }
+
+    /**
+     * Various bad syntaxes that are reported to work, but shouldn't.
+     *
+     * @author Chris Tankersley
+     * @since 2017-08-18
+     */
+    public function testBadSyntaxesShouldNotValidate()
+    {
+        $f = new MinutesField();
+        $this->assertFalse($f->validate('*-1'));
+        $this->assertFalse($f->validate('1-2-3'));
+        $this->assertFalse($f->validate('-1'));
+    }
+}
diff --git a/vendor/mtdowling/cron-expression/tests/Cron/MonthFieldTest.php b/vendor/dragonmantank/cron-expression/tests/Cron/MonthFieldTest.php
similarity index 63%
rename from vendor/mtdowling/cron-expression/tests/Cron/MonthFieldTest.php
rename to vendor/dragonmantank/cron-expression/tests/Cron/MonthFieldTest.php
index 2d9b0ad2..83f0f164 100644
--- a/vendor/mtdowling/cron-expression/tests/Cron/MonthFieldTest.php
+++ b/vendor/dragonmantank/cron-expression/tests/Cron/MonthFieldTest.php
@@ -4,42 +4,42 @@ namespace Cron\Tests;
 
 use Cron\MonthField;
 use DateTime;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Michael Dowling <mtdowling@gmail.com>
  */
-class MonthFieldTest extends PHPUnit_Framework_TestCase
+class MonthFieldTest extends TestCase
 {
     /**
-     * @covers Cron\MonthField::validate
+     * @covers \Cron\MonthField::validate
      */
     public function testValidatesField()
     {
         $f = new MonthField();
         $this->assertTrue($f->validate('12'));
         $this->assertTrue($f->validate('*'));
-        $this->assertTrue($f->validate('*/10,2,1-12'));
+        $this->assertFalse($f->validate('*/10,2,1-12'));
         $this->assertFalse($f->validate('1.fix-regexp'));
     }
 
     /**
-     * @covers Cron\MonthField::increment
+     * @covers \Cron\MonthField::increment
      */
     public function testIncrementsDate()
     {
         $d = new DateTime('2011-03-15 11:15:00');
         $f = new MonthField();
         $f->increment($d);
-        $this->assertEquals('2011-04-01 00:00:00', $d->format('Y-m-d H:i:s'));
+        $this->assertSame('2011-04-01 00:00:00', $d->format('Y-m-d H:i:s'));
 
         $d = new DateTime('2011-03-15 11:15:00');
         $f->increment($d, true);
-        $this->assertEquals('2011-02-28 23:59:00', $d->format('Y-m-d H:i:s'));
+        $this->assertSame('2011-02-28 23:59:00', $d->format('Y-m-d H:i:s'));
     }
 
     /**
-     * @covers Cron\MonthField::increment
+     * @covers \Cron\MonthField::increment
      */
     public function testIncrementsDateWithThirtyMinuteTimezone()
     {
@@ -48,34 +48,34 @@ class MonthFieldTest extends PHPUnit_Framework_TestCase
         $d = new DateTime('2011-03-31 11:59:59');
         $f = new MonthField();
         $f->increment($d);
-        $this->assertEquals('2011-04-01 00:00:00', $d->format('Y-m-d H:i:s'));
+        $this->assertSame('2011-04-01 00:00:00', $d->format('Y-m-d H:i:s'));
 
         $d = new DateTime('2011-03-15 11:15:00');
         $f->increment($d, true);
-        $this->assertEquals('2011-02-28 23:59:00', $d->format('Y-m-d H:i:s'));
+        $this->assertSame('2011-02-28 23:59:00', $d->format('Y-m-d H:i:s'));
         date_default_timezone_set($tz);
     }
 
 
     /**
-     * @covers Cron\MonthField::increment
+     * @covers \Cron\MonthField::increment
      */
     public function testIncrementsYearAsNeeded()
     {
         $f = new MonthField();
         $d = new DateTime('2011-12-15 00:00:00');
         $f->increment($d);
-        $this->assertEquals('2012-01-01 00:00:00', $d->format('Y-m-d H:i:s'));
+        $this->assertSame('2012-01-01 00:00:00', $d->format('Y-m-d H:i:s'));
     }
 
     /**
-     * @covers Cron\MonthField::increment
+     * @covers \Cron\MonthField::increment
      */
     public function testDecrementsYearAsNeeded()
     {
         $f = new MonthField();
         $d = new DateTime('2011-01-15 00:00:00');
         $f->increment($d, true);
-        $this->assertEquals('2010-12-31 23:59:00', $d->format('Y-m-d H:i:s'));
+        $this->assertSame('2010-12-31 23:59:00', $d->format('Y-m-d H:i:s'));
     }
 }
diff --git a/vendor/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php b/vendor/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php
index a03a5874..e5c3e5df 100644
--- a/vendor/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php
+++ b/vendor/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php
@@ -18,6 +18,13 @@ class DNSCheckValidation implements EmailValidation
      * @var InvalidEmail
      */
     private $error;
+    
+    public function __construct()
+    {
+        if (!extension_loaded('intl')) {
+            throw new \LogicException(sprintf('The %s class requires the Intl extension.', __CLASS__));
+        }
+    }
 
     public function isValid($email, EmailLexer $emailLexer)
     {
@@ -44,7 +51,11 @@ class DNSCheckValidation implements EmailValidation
 
     protected function checkDNS($host)
     {
-        $host = rtrim(idn_to_ascii($host, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46), '.') . '.';
+        $variant = INTL_IDNA_VARIANT_2003;
+        if ( defined('INTL_IDNA_VARIANT_UTS46') ) {
+            $variant = INTL_IDNA_VARIANT_UTS46;
+        }
+        $host = rtrim(idn_to_ascii($host, IDNA_DEFAULT, $variant), '.') . '.';
 
         $Aresult = true;
         $MXresult = checkdnsrr($host, 'MX');
diff --git a/vendor/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php b/vendor/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php
index fe712f08..4721f0d8 100644
--- a/vendor/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php
+++ b/vendor/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php
@@ -16,7 +16,7 @@ class SpoofCheckValidation implements EmailValidation
 
     public function __construct()
     {
-        if (!class_exists(Spoofchecker::class)) {
+        if (!extension_loaded('intl')) {
             throw new \LogicException(sprintf('The %s class requires the Intl extension.', __CLASS__));
         }
     }
diff --git a/vendor/egulias/email-validator/README.md b/vendor/egulias/email-validator/README.md
index 67bb69ab..8fcd2a6f 100644
--- a/vendor/egulias/email-validator/README.md
+++ b/vendor/egulias/email-validator/README.md
@@ -6,7 +6,7 @@ With the help of [PHPStorm](https://www.jetbrains.com/phpstorm/)
 ## Requirements ##
 
  * [Composer](https://getcomposer.org) is required for installation
- * [Spoofchecking](https://github.com/egulias/EmailValidator/blob/master/EmailValidator/Validation/SpoofCheckValidation.php) validation requires that your PHP system have the [PHP Internationalization Libraries](https://php.net/manual/en/book.intl.php) (also known as PHP Intl)
+ * [Spoofchecking](https://github.com/egulias/EmailValidator/blob/master/EmailValidator/Validation/SpoofCheckValidation.php) and [DNSCheckValidation](https://github.com/egulias/EmailValidator/blob/master/EmailValidator/Validation/DNSCheckValidation.php) validation requires that your PHP system have the [PHP Internationalization Libraries](https://php.net/manual/en/book.intl.php) (also known as PHP Intl)
 
 ## Installation ##
 
diff --git a/vendor/egulias/email-validator/composer.json b/vendor/egulias/email-validator/composer.json
index 7cc836f0..5423e9f0 100644
--- a/vendor/egulias/email-validator/composer.json
+++ b/vendor/egulias/email-validator/composer.json
@@ -35,5 +35,10 @@
     "psr-4": {
       "Egulias\\EmailValidator\\": "EmailValidator"
     }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Egulias\\Tests\\": "test"
+    }
   }
 }
diff --git a/vendor/fideloper/proxy/composer.json b/vendor/fideloper/proxy/composer.json
index 8594e3fc..136877d9 100755
--- a/vendor/fideloper/proxy/composer.json
+++ b/vendor/fideloper/proxy/composer.json
@@ -14,9 +14,9 @@
         "illuminate/contracts": "~5.0"
     },
     "require-dev": {
-        "illuminate/http": "~5.0",
-        "mockery/mockery": "~0.9.3",
-        "phpunit/phpunit": "^5.7"
+        "illuminate/http": "~5.6",
+        "mockery/mockery": "~1.0",
+        "phpunit/phpunit": "^6.0"
     },
     "autoload": {
         "psr-4": {
@@ -24,9 +24,6 @@
         }
     },
     "extra": {
-        "branch-alias": {
-            "dev-master": "3.3-dev"
-        },
         "laravel": {
             "providers": [
                 "Fideloper\\Proxy\\TrustedProxyServiceProvider"
diff --git a/vendor/fideloper/proxy/config/trustedproxy.php b/vendor/fideloper/proxy/config/trustedproxy.php
index fab11a0e..acda8d51 100644
--- a/vendor/fideloper/proxy/config/trustedproxy.php
+++ b/vendor/fideloper/proxy/config/trustedproxy.php
@@ -12,60 +12,34 @@ return [
      * within TrustedProxy to trust any proxy
      * that connects directly to your server,
      * a requirement when you cannot know the address
-     * of your proxy (e.g. if using Rackspace balancers).
+     * of your proxy (e.g. if using ELB or similar).
      *
-     * The "**" character is syntactic sugar within
-     * TrustedProxy to trust not just any proxy that
-     * connects directly to your server, but also
-     * proxies that connect to those proxies, and all
-     * the way back until you reach the original source
-     * IP. It will mean that $request->getClientIp()
-     * always gets the originating client IP, no matter
-     * how many proxies that client's request has
-     * subsequently passed through.
      */
-    'proxies' => [
-        '192.168.1.10',
-    ],
+    'proxies' => null, // [<ip addresses>,], '*'
 
     /*
-     * Or, to trust all proxies that connect
-     * directly to your server, uncomment this:
+     * To trust one or more specific proxies that connect
+     * directly to your server, use an array of IP addresses:
      */
-     # 'proxies' => '*',
+     # 'proxies' => ['192.168.1.1'],
 
     /*
-     * Or, to trust ALL proxies, including those that
-     * are in a chain of forwarding, uncomment this:
-    */
-    # 'proxies' => '**',
+     * Or, to trust all proxies that connect
+     * directly to your server, use a "*"
+     */
+     # 'proxies' => '*',
 
     /*
-     * Default Header Names
-     *
-     * Change these if the proxy does
-     * not send the default header names.
-     *
-     * Note that headers such as X-Forwarded-For
-     * are transformed to HTTP_X_FORWARDED_FOR format.
-     *
-     * The following are Symfony defaults, found in
-     * \Symfony\Component\HttpFoundation\Request::$trustedHeaders
-     *
-     * You may optionally set headers to 'null' here if you'd like
-     * for them to be considered untrusted instead. Ex:
-     *
-     * Illuminate\Http\Request::HEADER_CLIENT_HOST  => null,
+     * Which headers to use to detect proxy related data (For, Host, Proto, Port)
      * 
-     * WARNING: If you're using AWS Elastic Load Balancing or Heroku,
-     * the FORWARDED and X_FORWARDED_HOST headers should be set to null 
-     * as they are currently unsupported there.
+     * Options include:
+     * 
+     * - Illuminate\Http\Request::HEADER_X_FORWARDED_ALL (use all x-forwarded-* headers to establish trust)
+     * - Illuminate\Http\Request::HEADER_FORWARDED (use the FORWARDED header to establish trust)
+     * 
+     * @link https://symfony.com/doc/current/deployment/proxies.html
      */
-    'headers' => [
-        (defined('Illuminate\Http\Request::HEADER_FORWARDED') ? Illuminate\Http\Request::HEADER_FORWARDED : 'forwarded') => 'FORWARDED',
-        Illuminate\Http\Request::HEADER_CLIENT_IP    => 'X_FORWARDED_FOR',
-        Illuminate\Http\Request::HEADER_CLIENT_HOST  => 'X_FORWARDED_HOST',
-        Illuminate\Http\Request::HEADER_CLIENT_PROTO => 'X_FORWARDED_PROTO',
-        Illuminate\Http\Request::HEADER_CLIENT_PORT  => 'X_FORWARDED_PORT',
-    ]
+    'headers' => Illuminate\Http\Request::HEADER_X_FORWARDED_ALL,
+
+    
 ];
diff --git a/vendor/fideloper/proxy/src/TrustProxies.php b/vendor/fideloper/proxy/src/TrustProxies.php
index edd7d7c1..cf6f5d50 100644
--- a/vendor/fideloper/proxy/src/TrustProxies.php
+++ b/vendor/fideloper/proxy/src/TrustProxies.php
@@ -3,6 +3,7 @@
 namespace Fideloper\Proxy;
 
 use Closure;
+use Illuminate\Http\Request;
 use Illuminate\Contracts\Config\Repository;
 
 class TrustProxies
@@ -48,9 +49,9 @@ class TrustProxies
      *
      * @return mixed
      */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)
     {
-        $this->setTrustedProxyHeaderNames($request);
+        $request::setTrustedProxies([], $this->getTrustedHeaderNames()); // Reset trusted proxies between requests
         $this->setTrustedProxyIpAddresses($request);
 
         return $next($request);
@@ -61,88 +62,45 @@ class TrustProxies
      *
      * @param \Illuminate\Http\Request $request
      */
-    protected function setTrustedProxyIpAddresses($request)
+    protected function setTrustedProxyIpAddresses(Request $request)
     {
         $trustedIps = $this->proxies ?: $this->config->get('trustedproxy.proxies');
 
-        // We only trust specific IP addresses
+        // Only trust specific IP addresses
         if (is_array($trustedIps)) {
             return $this->setTrustedProxyIpAddressesToSpecificIps($request, $trustedIps);
         }
 
-        // We trust any IP address that calls us, but not proxies further
-        // up the forwarding chain.
-        // TODO: Determine if this should only trust the first IP address
-        //       Currently it trusts the entire chain (array of IPs),
-        //       potentially making the "**" convention redundant.
-        if ($trustedIps === '*') {
+        // Trust any IP address that calls us
+        // `**` for backwards compatibility, but is depreciated
+        if ($trustedIps === '*' || $trustedIps === '**') {
             return $this->setTrustedProxyIpAddressesToTheCallingIp($request);
         }
-
-        // We trust all proxies. Those that call us, and those that are
-        // further up the calling chain (e.g., where the X-FORWARDED-FOR
-        // header has multiple IP addresses listed);
-        if ($trustedIps === '**') {
-            return $this->setTrustedProxyIpAddressesToAllIps($request);
-        }
     }
 
     /**
-     * We specify the IP addresses to trust explicitly.
+     * Specify the IP addresses to trust explicitly.
      *
      * @param \Illuminate\Http\Request $request
      * @param array                    $trustedIps
      */
-    private function setTrustedProxyIpAddressesToSpecificIps($request, $trustedIps)
-    {
-        $request->setTrustedProxies((array) $trustedIps, $this->getTrustedHeaderSet());
-    }
-
-    /**
-     * We set the trusted proxy to be the first IP addresses received.
-     *
-     * @param \Illuminate\Http\Request $request
-     */
-    private function setTrustedProxyIpAddressesToTheCallingIp($request)
-    {
-        $request->setTrustedProxies($request->getClientIps(), $this->getTrustedHeaderSet());
-    }
-
-    /**
-     * Trust all IP Addresses.
-     *
-     * @param \Illuminate\Http\Request $request
-     */
-    private function setTrustedProxyIpAddressesToAllIps($request)
+    private function setTrustedProxyIpAddressesToSpecificIps(Request $request, $trustedIps)
     {
-        // 0.0.0.0/0 is the CIDR for all ipv4 addresses
-        // 2000:0:0:0:0:0:0:0/3 is the CIDR for all ipv6 addresses currently
-        // allocated http://www.iana.org/assignments/ipv6-unicast-address-assignments/ipv6-unicast-address-assignments.xhtml
-        $request->setTrustedProxies(['0.0.0.0/0', '2000:0:0:0:0:0:0:0/3'], $this->getTrustedHeaderSet());
+        $request->setTrustedProxies((array) $trustedIps, $this->getTrustedHeaderNames());
     }
 
     /**
-     * Set the trusted header names based on the content of trustedproxy.headers.
-     *
-     * Note: Depreciated in Symfony 3.3+, but available for backwards compatibility.
-     *
-     * @depreciated
+     * Set the trusted proxy to be the IP address calling this servers
      *
      * @param \Illuminate\Http\Request $request
      */
-    protected function setTrustedProxyHeaderNames($request)
+    private function setTrustedProxyIpAddressesToTheCallingIp(Request $request)
     {
-        $trustedHeaderNames = $this->getTrustedHeaderNames();
-
-        if(!is_array($trustedHeaderNames)) { return; } // Leave the defaults
-
-        foreach ($trustedHeaderNames as $headerKey => $headerName) {
-            $request->setTrustedHeaderName($headerKey, $headerName);
-        }
+        $request->setTrustedProxies([$request->server->get('REMOTE_ADDR')], $this->getTrustedHeaderNames());
     }
 
     /**
-     * Retrieve trusted header names, falling back to defaults if config not set.
+     * Retrieve trusted header name(s), falling back to defaults if config not set.
      *
      * @return array
      */
@@ -150,32 +108,4 @@ class TrustProxies
     {
         return $this->headers ?: $this->config->get('trustedproxy.headers');
     }
-
-    /**
-     * Construct bit field integer of the header set that setTrustedProxies() expects.
-     *
-     * @return int
-     */
-    protected function getTrustedHeaderSet()
-    {
-        $trustedHeaderNames = $this->getTrustedHeaderNames();
-        $headerKeys = array_keys($this->getTrustedHeaderNames());
-
-        return array_reduce($headerKeys, function ($set, $key) use ($trustedHeaderNames) {
-            // PHP 7+ gives a warning if non-numeric value is used
-            // resulting in a thrown ErrorException within Laravel
-            // This error occurs with Symfony < 3.3, PHP7+
-            if(! is_numeric($key)) {
-                return $set;
-            }
-
-            // If the header value is null, it is a distrusted header,
-            // so we will ignore it and move on.
-            if (is_null($trustedHeaderNames[$key])) {
-                return $set;
-            }
-
-            return $set | $key;
-        }, 0);
-    }
 }
diff --git a/vendor/fideloper/proxy/src/TrustedProxyServiceProvider.php b/vendor/fideloper/proxy/src/TrustedProxyServiceProvider.php
index dc299e32..26f2631a 100644
--- a/vendor/fideloper/proxy/src/TrustedProxyServiceProvider.php
+++ b/vendor/fideloper/proxy/src/TrustedProxyServiceProvider.php
@@ -15,7 +15,7 @@ class TrustedProxyServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $source = realpath(__DIR__.'/../config/trustedproxy.php');
+        $source = realpath($raw = __DIR__.'/../config/trustedproxy.php') ?: $raw;
 
         if ($this->app instanceof LaravelApplication && $this->app->runningInConsole()) {
             $this->publishes([$source => config_path('trustedproxy.php')]);
@@ -23,7 +23,10 @@ class TrustedProxyServiceProvider extends ServiceProvider
             $this->app->configure('trustedproxy');
         }
 
-        $this->mergeConfigFrom($source, 'trustedproxy');
+
+        if ($this->app instanceof LaravelApplication && ! $this->app->configurationIsCached()) {
+            $this->mergeConfigFrom($source, 'trustedproxy');
+        }
     }
 
     /**
diff --git a/vendor/filp/whoops/CHANGELOG.md b/vendor/filp/whoops/CHANGELOG.md
index 4bbd620b..d7693f0f 100644
--- a/vendor/filp/whoops/CHANGELOG.md
+++ b/vendor/filp/whoops/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.2.0
+
+* Support PHP 7.2
+
 # 2.1.0
 
 * Add a `SystemFacade` to allow clients to override Whoops behavior.
diff --git a/vendor/filp/whoops/composer.json b/vendor/filp/whoops/composer.json
index 7b2c3a6e..51ab373f 100644
--- a/vendor/filp/whoops/composer.json
+++ b/vendor/filp/whoops/composer.json
@@ -36,7 +36,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1-dev"
+            "dev-master": "2.2-dev"
         }
     }
 }
diff --git a/vendor/filp/whoops/src/Whoops/Handler/PrettyPageHandler.php b/vendor/filp/whoops/src/Whoops/Handler/PrettyPageHandler.php
index 08197b4d..99ebe2bc 100644
--- a/vendor/filp/whoops/src/Whoops/Handler/PrettyPageHandler.php
+++ b/vendor/filp/whoops/src/Whoops/Handler/PrettyPageHandler.php
@@ -507,6 +507,10 @@ class PrettyPageHandler extends Handler
                 $callback = call_user_func($this->editors[$this->editor], $filePath, $line);
             }
 
+            if (empty($callback)) {
+                return [];
+            }
+
             if (is_string($callback)) {
                 return [
                     'ajax' => false,
diff --git a/vendor/fzaninotto/faker/.travis.yml b/vendor/fzaninotto/faker/.travis.yml
index 7d19fa75..a719ba81 100644
--- a/vendor/fzaninotto/faker/.travis.yml
+++ b/vendor/fzaninotto/faker/.travis.yml
@@ -9,6 +9,7 @@ php:
     - 5.6
     - 7.0
     - 7.1
+    - 7.2
     - nightly
 
 sudo: false
diff --git a/vendor/fzaninotto/faker/CHANGELOG.md b/vendor/fzaninotto/faker/CHANGELOG.md
index 611470f3..df218b00 100644
--- a/vendor/fzaninotto/faker/CHANGELOG.md
+++ b/vendor/fzaninotto/faker/CHANGELOG.md
@@ -1,6 +1,86 @@
 CHANGELOG
 =========
 
+2018-07-12, v1.8.0
+------------------
+
+- Typo in readme [\#1521](https://github.com/fzaninotto/Faker/pull/1521) ([jmhobbs](https://github.com/jmhobbs))
+- Replaced Hilll with Hill [\#1516](https://github.com/fzaninotto/Faker/pull/1516) ([MarkVaughn](https://github.com/MarkVaughn))
+- \[it\_IT\] Improve vat ID generated using official rules [\#1508](https://github.com/fzaninotto/Faker/pull/1508) ([mavimo](https://github.com/mavimo))
+- \[hu\_HU\] Address: Fix unnecessary new line in string [\#1507](https://github.com/fzaninotto/Faker/pull/1507) ([ntomka](https://github.com/ntomka))
+- add phone numer format [\#1506](https://github.com/fzaninotto/Faker/pull/1506) ([Enosh-Yu](https://github.com/Enosh-Yu))
+- Fix typo in fr\_CA Provider [\#1505](https://github.com/fzaninotto/Faker/pull/1505) ([ultreson](https://github.com/ultreson))
+- Add fake-car provider link [\#1497](https://github.com/fzaninotto/Faker/pull/1497) ([pelmered](https://github.com/pelmered))
+- create `passthrough` function [\#1493](https://github.com/fzaninotto/Faker/pull/1493) ([browner12](https://github.com/browner12))
+- update Polish bank list [\#1482](https://github.com/fzaninotto/Faker/pull/1482) ([IonBazan](https://github.com/IonBazan))
+- Update the parameters to check if the setter is callable [\#1470](https://github.com/fzaninotto/Faker/pull/1470) ([rossmitchell](https://github.com/rossmitchell))
+- Push the max date far into the future so the test can pass [\#1469](https://github.com/fzaninotto/Faker/pull/1469) ([rossmitchell](https://github.com/rossmitchell))
+- Update Address.php [\#1465](https://github.com/fzaninotto/Faker/pull/1465) ([Saibamen](https://github.com/Saibamen))
+- Turkish identity number for tr\_TR [\#1462](https://github.com/fzaninotto/Faker/pull/1462) ([aykutaras](https://github.com/aykutaras))
+- Fixing rare iin with 13-digits. [\#1450](https://github.com/fzaninotto/Faker/pull/1450) ([vadimonus](https://github.com/vadimonus))
+- Fix Polish PESEL faker [\#1449](https://github.com/fzaninotto/Faker/pull/1449) ([Dartui](https://github.com/Dartui))
+- Adds valid 08 number formats for fr\_FR [\#1439](https://github.com/fzaninotto/Faker/pull/1439) ([ppelgrims](https://github.com/ppelgrims))
+- Add YouTube provider link [\#1422](https://github.com/fzaninotto/Faker/pull/1422) ([aalaap](https://github.com/aalaap))
+- Update PHPDoc of the DateTime provider. [\#1419](https://github.com/fzaninotto/Faker/pull/1419) ([tomzx](https://github.com/tomzx))
+- Normalize name of variable [\#1412](https://github.com/fzaninotto/Faker/pull/1412) ([eaglewu](https://github.com/eaglewu))
+- Added "blockchain" to en-us company provider catchPhrase method [\#1411](https://github.com/fzaninotto/Faker/pull/1411) ([samoldenburg](https://github.com/samoldenburg))
+- Fix for Spot2 ORM EntityPopulator [\#1408](https://github.com/fzaninotto/Faker/pull/1408) ([michal-borek](https://github.com/michal-borek))
+- TH color name [\#1404](https://github.com/fzaninotto/Faker/pull/1404) ([Naruedom](https://github.com/Naruedom))
+- added Malaysia \[ms\_MY\] locale [\#1403](https://github.com/fzaninotto/Faker/pull/1403) ([kenfai](https://github.com/kenfai))
+- Implementation of the function that generates Brazilian area codes fixed. [\#1401](https://github.com/fzaninotto/Faker/pull/1401) ([jackmiras](https://github.com/jackmiras))
+- VISA retired the 13 digit PAN moved to new cardParams [\#1400](https://github.com/fzaninotto/Faker/pull/1400) ([hppycoder](https://github.com/hppycoder))
+- Remove unused variable inside closure [\#1395](https://github.com/fzaninotto/Faker/pull/1395) ([carusogabriel](https://github.com/carusogabriel))
+- .nz domain updates [\#1393](https://github.com/fzaninotto/Faker/pull/1393) ([xurizaemon](https://github.com/xurizaemon))
+- Add licenceCode method in the to es\_ES person provider [\#1392](https://github.com/fzaninotto/Faker/pull/1392) ([ffiguereo](https://github.com/ffiguereo))
+- allow `randomElements` to accept a Traversable object [\#1389](https://github.com/fzaninotto/Faker/pull/1389) ([browner12](https://github.com/browner12))
+- Doc: rg remove formatting [\#1387](https://github.com/fzaninotto/Faker/pull/1387) ([emtudo](https://github.com/emtudo))
+- Add numbers with start 4 [\#1386](https://github.com/fzaninotto/Faker/pull/1386) ([emtudo](https://github.com/emtudo))
+- update th\_TH mobile number format [\#1385](https://github.com/fzaninotto/Faker/pull/1385) ([earthpyy](https://github.com/earthpyy))
+- Translate country names for lv\_LV provider. [\#1383](https://github.com/fzaninotto/Faker/pull/1383) ([ronaldsgailis](https://github.com/ronaldsgailis))
+- Clean elses [\#1382](https://github.com/fzaninotto/Faker/pull/1382) ([carusogabriel](https://github.com/carusogabriel))
+- French vat formatter [\#1381](https://github.com/fzaninotto/Faker/pull/1381) ([ppelgrims](https://github.com/ppelgrims))
+- Replaces rtrim with preg\_replace [\#1380](https://github.com/fzaninotto/Faker/pull/1380) ([ppelgrims](https://github.com/ppelgrims))
+- Refactoring tests [\#1375](https://github.com/fzaninotto/Faker/pull/1375) ([carusogabriel](https://github.com/carusogabriel))
+- Added link in readme to provider FakerRestaurant [\#1374](https://github.com/fzaninotto/Faker/pull/1374) ([jzonta](https://github.com/jzonta))
+- Remove obsolete currency codes [\#1373](https://github.com/fzaninotto/Faker/pull/1373) ([tpraxl](https://github.com/tpraxl))
+- \[ru\_RU\] Updated countries and added source link [\#1372](https://github.com/fzaninotto/Faker/pull/1372) ([ilyahoilik](https://github.com/ilyahoilik))
+- Test against PHP 7.2 [\#1371](https://github.com/fzaninotto/Faker/pull/1371) ([carusogabriel](https://github.com/carusogabriel))
+- Feature: nl\_BE text provider [\#1370](https://github.com/fzaninotto/Faker/pull/1370) ([rauwebieten](https://github.com/rauwebieten))
+- default value for Payment::iban\(\) country code [\#1369](https://github.com/fzaninotto/Faker/pull/1369) ([madmanmax](https://github.com/madmanmax))
+- skip test failing on bigendian [\#1365](https://github.com/fzaninotto/Faker/pull/1365) ([remicollet](https://github.com/remicollet))
+- Update Person.php [\#1364](https://github.com/fzaninotto/Faker/pull/1364) ([majamusan](https://github.com/majamusan))
+- Prevent errors on private methods [\#1363](https://github.com/fzaninotto/Faker/pull/1363) ([petecoop](https://github.com/petecoop))
+- adds rijksregisternummer [\#1361](https://github.com/fzaninotto/Faker/pull/1361) ([ppelgrims](https://github.com/ppelgrims))
+- Add secondary address to fr\_FR provider [\#1356](https://github.com/fzaninotto/Faker/pull/1356) ([nicodmf](https://github.com/nicodmf))
+- Add company provider for tr\_TR [\#1355](https://github.com/fzaninotto/Faker/pull/1355) ([yuks](https://github.com/yuks))
+- nb\_NO provider updates [\#1350](https://github.com/fzaninotto/Faker/pull/1350) ([alexqhj](https://github.com/alexqhj))
+- only test available date range on 32-bit [\#1348](https://github.com/fzaninotto/Faker/pull/1348) ([remicollet](https://github.com/remicollet))
+- Bump PHPUnit version for namespace compatibility [\#1345](https://github.com/fzaninotto/Faker/pull/1345) ([carusogabriel](https://github.com/carusogabriel))
+- Use PSR-1 for PHPUnit TestCase [\#1344](https://github.com/fzaninotto/Faker/pull/1344) ([carusogabriel](https://github.com/carusogabriel))
+- Fix FR\_fr 07 prefix mobile number generation [\#1343](https://github.com/fzaninotto/Faker/pull/1343) ([svanpoeck](https://github.com/svanpoeck))
+- Update Text.php [\#1339](https://github.com/fzaninotto/Faker/pull/1339) ([gulaandrij](https://github.com/gulaandrij))
+- Add two new company type in the Swiss Provider [\#1336](https://github.com/fzaninotto/Faker/pull/1336) ([pvullioud](https://github.com/pvullioud))
+- Change symbol 'minus' with code 226 to 'minus' with code 45 [\#1333](https://github.com/fzaninotto/Faker/pull/1333) ([Negasus](https://github.com/Negasus))
+- \[sl\_SI\] Created provider for Company [\#1331](https://github.com/fzaninotto/Faker/pull/1331) ([alesvaupotic](https://github.com/alesvaupotic))
+- Update city name [\#1328](https://github.com/fzaninotto/Faker/pull/1328) ([s9801077](https://github.com/s9801077))
+- Fix \#1305 realText in some cases breaks last character [\#1326](https://github.com/fzaninotto/Faker/pull/1326) ([iamraccoon](https://github.com/iamraccoon))
+- Real Dutch postal codes [\#1323](https://github.com/fzaninotto/Faker/pull/1323) ([ametad](https://github.com/ametad))
+- Added male and female titles for the en\_ZA locale [\#1321](https://github.com/fzaninotto/Faker/pull/1321) ([ViGouRCanberra](https://github.com/ViGouRCanberra))
+- Add German Email Providers [\#1320](https://github.com/fzaninotto/Faker/pull/1320) ([Stoffo](https://github.com/Stoffo))
+- Fix "Resource temporarily unavailable" [\#1319](https://github.com/fzaninotto/Faker/pull/1319) ([eberkund](https://github.com/eberkund))
+- Introduced the ability to specify a default timezone... [\#1316](https://github.com/fzaninotto/Faker/pull/1316) ([telkins](https://github.com/telkins))
+- South African licence codes [\#1315](https://github.com/fzaninotto/Faker/pull/1315) ([royalmitten](https://github.com/royalmitten))
+- Fix with incorrect name city. [\#1309](https://github.com/fzaninotto/Faker/pull/1309) ([zzenmate](https://github.com/zzenmate))
+- Fixed type-o in readme under section about Language specific formatters [\#1302](https://github.com/fzaninotto/Faker/pull/1302) ([espenkn](https://github.com/espenkn))
+- Update Person.php [\#1298](https://github.com/fzaninotto/Faker/pull/1298) ([yappkahowe](https://github.com/yappkahowe))
+- Allow children classes to access self::$suffix [\#1296](https://github.com/fzaninotto/Faker/pull/1296) ([greg0ire](https://github.com/greg0ire))
+- Fix with namespace payment provider for uk\_UA [\#1293](https://github.com/fzaninotto/Faker/pull/1293) ([zzenmate](https://github.com/zzenmate))
+- Update zh\_TW text provider [\#1292](https://github.com/fzaninotto/Faker/pull/1292) ([s9801077](https://github.com/s9801077))
+- Fix CURL status code in ImageTest.php [\#1290](https://github.com/fzaninotto/Faker/pull/1290) ([Sanfra1407](https://github.com/Sanfra1407))
+- Tax Id for companies and new formats for es\_VE [\#1287](https://github.com/fzaninotto/Faker/pull/1287) ([DIOHz0r](https://github.com/DIOHz0r))
+- Added idNumber for nl\_NL [\#1283](https://github.com/fzaninotto/Faker/pull/1283) ([artorozenga](https://github.com/artorozenga))
+- Feature/en us company ein [\#1273](https://github.com/fzaninotto/Faker/pull/1273) ([zachflower](https://github.com/zachflower))
+
 2017-08-15, v1.7.0
 ------------------
 
diff --git a/vendor/fzaninotto/faker/composer.json b/vendor/fzaninotto/faker/composer.json
index d3bfd6c6..e52016ee 100644
--- a/vendor/fzaninotto/faker/composer.json
+++ b/vendor/fzaninotto/faker/composer.json
@@ -13,7 +13,7 @@
         "php": "^5.3.3 || ^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.0 || ^5.0",
+        "phpunit/phpunit": "^4.8.35 || ^5.7",
         "squizlabs/php_codesniffer": "^1.5",
         "ext-intl": "*"
     },
diff --git a/vendor/fzaninotto/faker/readme.md b/vendor/fzaninotto/faker/readme.md
index 6e75ce77..c3754901 100644
--- a/vendor/fzaninotto/faker/readme.md
+++ b/vendor/fzaninotto/faker/readme.md
@@ -180,17 +180,17 @@ Each of the generator properties (like `name`, `address`, and `lorem`) are calle
 ### `Faker\Provider\DateTime`
 
     unixTime($max = 'now')                // 58781813
-    dateTime($max = 'now', $timezone = date_default_timezone_get()) // DateTime('2008-04-25 08:37:17', 'UTC')
-    dateTimeAD($max = 'now', $timezone = date_default_timezone_get()) // DateTime('1800-04-29 20:38:49', 'Europe/Paris')
+    dateTime($max = 'now', $timezone = null) // DateTime('2008-04-25 08:37:17', 'UTC')
+    dateTimeAD($max = 'now', $timezone = null) // DateTime('1800-04-29 20:38:49', 'Europe/Paris')
     iso8601($max = 'now')                 // '1978-12-09T10:10:29+0000'
     date($format = 'Y-m-d', $max = 'now') // '1979-06-09'
     time($format = 'H:i:s', $max = 'now') // '20:49:42'
-    dateTimeBetween($startDate = '-30 years', $endDate = 'now', $timezone = date_default_timezone_get()) // DateTime('2003-03-15 02:00:49', 'Africa/Lagos')
-    dateTimeInInterval($startDate = '-30 years', $interval = '+ 5 days', $timezone = date_default_timezone_get()) // DateTime('2003-03-15 02:00:49', 'Antartica/Vostok')
-    dateTimeThisCentury($max = 'now', $timezone = date_default_timezone_get())     // DateTime('1915-05-30 19:28:21', 'UTC')
-    dateTimeThisDecade($max = 'now', $timezone = date_default_timezone_get())      // DateTime('2007-05-29 22:30:48', 'Europe/Paris')
-    dateTimeThisYear($max = 'now', $timezone = date_default_timezone_get())        // DateTime('2011-02-27 20:52:14', 'Africa/Lagos')
-    dateTimeThisMonth($max = 'now', $timezone = date_default_timezone_get())       // DateTime('2011-10-23 13:46:23', 'Antarctica/Vostok')
+    dateTimeBetween($startDate = '-30 years', $endDate = 'now', $timezone = null) // DateTime('2003-03-15 02:00:49', 'Africa/Lagos')
+    dateTimeInInterval($startDate = '-30 years', $interval = '+ 5 days', $timezone = null) // DateTime('2003-03-15 02:00:49', 'Antartica/Vostok')
+    dateTimeThisCentury($max = 'now', $timezone = null)     // DateTime('1915-05-30 19:28:21', 'UTC')
+    dateTimeThisDecade($max = 'now', $timezone = null)      // DateTime('2007-05-29 22:30:48', 'Europe/Paris')
+    dateTimeThisYear($max = 'now', $timezone = null)        // DateTime('2011-02-27 20:52:14', 'Africa/Lagos')
+    dateTimeThisMonth($max = 'now', $timezone = null)       // DateTime('2011-10-23 13:46:23', 'Antarctica/Vostok')
     amPm($max = 'now')                    // 'pm'
     dayOfMonth($max = 'now')              // '04'
     dayOfWeek($max = 'now')               // 'Friday'
@@ -200,6 +200,8 @@ Each of the generator properties (like `name`, `address`, and `lorem`) are calle
     century                               // 'VI'
     timezone                              // 'Europe/Paris'
 
+Methods accepting a `$timezone` argument default to `date_default_timezone_get()`. You can pass a custom timezone string to each method, or define a custom timezone for all time methods at once using `$faker::setDefaultTimezone($timezone)`.
+
 ### `Faker\Provider\Internet`
 
     email                   // 'tkshlerin@collins.com'
@@ -369,6 +371,12 @@ try {
 }
 ```
 
+If you would like to use a modifier with a value not generated by Faker, use the `passthrough()` method. `passthrough()` simply returns whatever value it was given.
+
+```php
+$faker->optional()->passthrough(mt_rand(5, 15));
+```
+
 ## Localization
 
 `Faker\Factory` can take a locale as an argument, to return localized data. If no localized provider is found, the factory fallbacks to the default locale (en_US).
@@ -926,6 +934,15 @@ echo $faker->tollFreeNumber; // "0800 123 456"
 echo $faker->areaCode; // "03"
 ```
 
+### `Faker\Provider\en_US\Company`
+
+```php
+<?php
+
+// Generate a random Employer Identification Number
+echo $faker->ein; // '12-3456789'
+```
+
 ### `Faker\Provider\en_US\Payment`
 
 ```php
@@ -960,6 +977,9 @@ echo $faker->companyNumber; // 1999/789634/01
 
 // Generates a random national identification number
 echo $faker->idNumber; // 6606192211041
+
+// Generates a random valid licence code
+echo $faker->licenceCode; // EB
 ```
 
 ### `Faker\Provider\en_ZA\PhoneNumber`
@@ -981,6 +1001,9 @@ echo $faker->mobileNumber; // 082 123 5555
 
 // Generates a Documento Nacional de Identidad (DNI) number
 echo $faker->dni; // '77446565E'
+
+// Generates a random valid licence code
+echo $faker->licenceCode; // B
 ```
 
 ### `Faker\Provider\es_ES\Payment`
@@ -1051,6 +1074,24 @@ echo $faker->vat;           // "BE 0123456789" - Belgian Value Added Tax number
 echo $faker->vat(false);    // "BE0123456789" - unspaced Belgian Value Added Tax number
 ```
 
+### `Faker\Provider\es_VE\Person`
+
+```php
+<?php
+
+// Generate a Cédula de identidad number, you can pass one argument to add separator
+echo $faker->nationalId; // 'V11223344'
+```
+
+### `Faker\Provider\es_VE\Company`
+
+```php
+<?php
+
+// Generates a R.I.F. number, you can pass one argument to add separators
+echo $faker->taxpayerIdentificationNumber; // 'J1234567891'
+```
+
 ### `Faker\Provider\fr_FR\Address`
 
 ```php
@@ -1067,6 +1108,9 @@ $faker->department; // array('18' => 'Cher');
 
 // Generates a random region
 echo $faker->region; // "Saint-Pierre-et-Miquelon"
+
+// Generates a random appartement,stair
+echo $faker->secondaryAddress; // "Bat. 961"
 ```
 
 ### `Faker\Provider\fr_FR\Company`
@@ -1099,6 +1143,18 @@ echo $faker->vat; // FR 12 123 456 789
 echo $faker->nir; // 1 88 07 35 127 571 - 19
 ```
 
+### `Faker\Provider\fr_FR\PhoneNumber`
+
+```php
+<?php
+
+// Generates phone numbers
+echo $faker->phoneNumber; // +33 (0)1 67 97 01 31
+echo $faker->mobileNumber; // +33 6 21 12 72 84
+echo $faker->serviceNumber // 08 98 04 84 46
+```
+
+
 ### `Faker\Provider\he_IL\Payment`
 
 ```php
@@ -1229,6 +1285,18 @@ echo $faker->metropolitanCity; // "서울특별시"
 echo $faker->borough; // "강남구"
 ```
 
+### `Faker\Provider\ko_KR\PhoneNumber`
+
+```php
+<?php
+
+// Generates a local area phone numer
+echo $faker->localAreaPhoneNumber; // "02-1234-4567"
+
+// Generates a cell phone number
+echo $faker->cellPhoneNumber; // "010-9876-5432"
+```
+
 ### `Faker\Provider\lt_LT\Payment`
 
 ```php
@@ -1246,6 +1314,69 @@ echo $faker->bankAccountNumber // "LT300848876740317118"
 echo $faker->personalIdentityNumber; // "140190-12301"
 ```
 
+### `Faker\Provider\ms_MY\Address`
+
+```php
+<?php
+
+// Generates a random Malaysian township
+echo $faker->township; // "Taman Bahagia"
+
+// Generates a random Malaysian town address with matching postcode and state
+echo $faker->townState; // "55100 Bukit Bintang, Kuala Lumpur"
+```
+
+### `Faker\Provider\ms_MY\Miscellaneous`
+
+```php
+<?php
+
+// Generates a random vehicle license plate number
+echo $faker->jpjNumberPlate; // "WPL 5169"
+```
+
+### `Faker\Provider\ms_MY\Payment`
+
+```php
+<?php
+
+// Generates a random Malaysian bank
+echo $faker->bank; // "Maybank"
+
+// Generates a random Malaysian bank account number (10-16 digits)
+echo $faker->bankAccountNumber; // "1234567890123456"
+
+// Generates a random Malaysian insurance company
+echo $faker->insurance; // "AIA Malaysia"
+
+// Generates a random Malaysian bank SWIFT Code
+echo $faker->swiftCode; // "MBBEMYKLXXX"
+```
+
+### `Faker\Provider\ms_MY\Person`
+
+```php
+<?php
+
+// Generates a random personal identity card (myKad) number
+echo $faker->myKadNumber($gender = null|'male'|'female', $hyphen = null|true|false); // "710703471796"
+```
+
+### `Faker\Provider\ms_MY\PhoneNumber`
+
+```php
+<?php
+
+// Generates a random Malaysian mobile number
+echo $faker->mobileNumber($countryCodePrefix = null|true|false, $formatting = null|true|false); // "+6012-705 3767"
+
+// Generates a random Malaysian landline number
+echo $faker->fixedLineNumber($countryCodePrefix = null|true|false, $formatting = null|true|false); // "03-7112 0455"
+
+// Generates a random Malaysian voip number
+echo $faker->voipNumber($countryCodePrefix = null|true|false, $formatting = null|true|false); // "015-458 7099"
+```
+
 ### `Faker\Provider\ne_NP\Address`
 
 ```php
@@ -1267,6 +1398,15 @@ echo $faker->vat;           // "BE 0123456789" - Belgian Value Added Tax number
 echo $faker->vat(false);    // "BE0123456789" - unspaced Belgian Value Added Tax number
 ```
 
+### `Faker\Provider\nl_BE\Person`
+
+```php
+<?php
+
+echo $faker->rrn();         // "83051711784" - Belgian Rijksregisternummer
+echo $faker->rrn('female'); // "50032089858" - Belgian Rijksregisternummer for a female
+```
+
 ### `Faker\Provider\nl_NL\Company`
 
 ```php
@@ -1276,7 +1416,15 @@ echo $faker->vat; // "NL123456789B01" - Dutch Value Added Tax number
 echo $faker->btw; // "NL123456789B01" - Dutch Value Added Tax number (alias)
 ```
 
-### `Faker\Provider\no_NO\Payment`
+### `Faker\Provider\nl_NL\Person`
+
+```php
+<?php
+
+echo $faker->idNumber; // "111222333" - Dutch Personal identification number (BSN)
+```
+
+### `Faker\Provider\nb_NO\Payment`
 
 ```php
 <?php
@@ -1376,6 +1524,7 @@ echo $faker->name; // 'Sr. Luis Adriano Sepúlveda Filho'
 echo $faker->cpf;        // '145.343.345-76'
 echo $faker->cpf(false); // '45623467866'
 echo $faker->rg;         // '84.405.736-3'
+echo $faker->rg(false);  // '844057363'
 ```
 
 ### `Faker\Provider\pt_BR\Company`
@@ -1479,6 +1628,15 @@ echo $faker->personalIdentityNumber() // '950910-0799'
 //Since the numbers are different for male and female persons, optionally you can specify gender.
 echo $faker->personalIdentityNumber('female') // '950910-0781'
 ```
+### `Faker\Provider\tr_TR\Person`
+
+```php
+<?php
+
+//Generates a valid Turkish identity number (in Turkish - T.C. Kimlik No)
+echo $faker->tcNo // '55300634882'
+
+```
 
 
 ### `Faker\Provider\zh_CN\Payment`
@@ -1540,6 +1698,9 @@ echo $faker->VAT; //23456789
 * [pattern-lab/plugin-php-faker](https://github.com/pattern-lab/plugin-php-faker): Pattern Lab is a Styleguide, Component Library, and Prototyping tool. This creates unique content each time Pattern Lab is generated.
 * [guidocella/eloquent-populator](https://github.com/guidocella/eloquent-populator): Adapter for Laravel's Eloquent ORM.
 * [tamperdata/exiges](https://github.com/tamperdata/exiges): Faker provider for generating random temperatures
+* [jzonta/FakerRestaurant](https://github.com/jzonta/FakerRestaurant): Faker for Food and Beverage names generate
+* [aalaap/faker-youtube](https://github.com/aalaap/faker-youtube): Faker for YouTube URLs in various formats
+* [pelmered/fake-car](https://github.com/pelmered/fake-car): Faker for cars and car data
 
 ## License
 
diff --git a/vendor/fzaninotto/faker/src/Faker/Calculator/TCNo.php b/vendor/fzaninotto/faker/src/Faker/Calculator/TCNo.php
new file mode 100644
index 00000000..392d4552
--- /dev/null
+++ b/vendor/fzaninotto/faker/src/Faker/Calculator/TCNo.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Faker\Calculator;
+
+use InvalidArgumentException;
+
+class TCNo
+{
+    /**
+     * Generates Turkish Identity Number Checksum
+     * Gets first 9 digit as prefix and calcuates checksums
+     *
+     * https://en.wikipedia.org/wiki/Turkish_Identification_Number
+     *
+     * @param string $identityPrefix
+     * @return string Checksum (two digit)
+     */
+    public static function checksum($identityPrefix)
+    {
+        if (strlen((string)$identityPrefix) !== 9) {
+            throw new InvalidArgumentException('Argument should be an integer and should be 9 digits.');
+        }
+
+        $oddSum = 0;
+        $evenSum = 0;
+
+        $identityArray = array_map('intval', str_split($identityPrefix)); // Creates array from int
+        foreach ($identityArray as $index => $digit) {
+            if ($index % 2 == 0) {
+                $evenSum += $digit;
+            } else {
+                $oddSum += $digit;
+            }
+        }
+
+        $tenthDigit = (7 * $evenSum - $oddSum) % 10;
+        $eleventhDigit = ($evenSum + $oddSum + $tenthDigit) % 10;
+
+        return $tenthDigit . $eleventhDigit;
+    }
+
+    /**
+     * Checks whether an TCNo has a valid checksum
+     *
+     * @param string $tcNo
+     * @return boolean
+     */
+    public static function isValid($tcNo)
+    {
+        return self::checksum(substr($tcNo, 0, -2)) === substr($tcNo, -2, 2);
+    }
+}
diff --git a/vendor/fzaninotto/faker/src/Faker/Generator.php b/vendor/fzaninotto/faker/src/Faker/Generator.php
index 01158704..0a4e0502 100644
--- a/vendor/fzaninotto/faker/src/Faker/Generator.php
+++ b/vendor/fzaninotto/faker/src/Faker/Generator.php
@@ -94,12 +94,12 @@ namespace Faker;
  * @property \DateTime $dateTimeThisYear
  * @property \DateTime $dateTimeThisMonth
  * @property string    $amPm
- * @property int       $dayOfMonth
- * @property int       $dayOfWeek
- * @property int       $month
+ * @property string    $dayOfMonth
+ * @property string    $dayOfWeek
+ * @property string    $month
  * @property string    $monthName
- * @property int       $year
- * @property int       $century
+ * @property string    $year
+ * @property string    $century
  * @property string    $timezone
  * @method string amPm($max = 'now')
  * @method string date($format = 'Y-m-d', $max = 'now')
@@ -109,7 +109,7 @@ namespace Faker;
  * @method string month($max = 'now')
  * @method string monthName($max = 'now')
  * @method string time($format = 'H:i:s', $max = 'now')
- * @method string unixTime($max = 'now')
+ * @method int unixTime($max = 'now')
  * @method string year($max = 'now')
  * @method \DateTime dateTime($max = 'now', $timezone = null)
  * @method \DateTime dateTimeAd($max = 'now', $timezone = null)
diff --git a/vendor/fzaninotto/faker/src/Faker/ORM/Doctrine/EntityPopulator.php b/vendor/fzaninotto/faker/src/Faker/ORM/Doctrine/EntityPopulator.php
index 31c8125b..bc703e54 100644
--- a/vendor/fzaninotto/faker/src/Faker/ORM/Doctrine/EntityPopulator.php
+++ b/vendor/fzaninotto/faker/src/Faker/ORM/Doctrine/EntityPopulator.php
@@ -211,7 +211,7 @@ class EntityPopulator
                 }
                 // Try a standard setter if it's available, otherwise fall back on reflection
                 $setter = sprintf("set%s", ucfirst($field));
-                if (method_exists($obj, $setter)) {
+                if (is_callable(array($obj, $setter))) {
                     $obj->$setter($value);
                 } else {
                     $this->class->reflFields[$field]->setValue($obj, $value);
diff --git a/vendor/fzaninotto/faker/src/Faker/ORM/Propel/ColumnTypeGuesser.php b/vendor/fzaninotto/faker/src/Faker/ORM/Propel/ColumnTypeGuesser.php
index ac9cdb42..1df70494 100644
--- a/vendor/fzaninotto/faker/src/Faker/ORM/Propel/ColumnTypeGuesser.php
+++ b/vendor/fzaninotto/faker/src/Faker/ORM/Propel/ColumnTypeGuesser.php
@@ -29,11 +29,11 @@ class ColumnTypeGuesser
                 return function () use ($generator) {
                     return $generator->dateTime;
                 };
-            } else {
-                return function () use ($generator) {
-                    return $generator->dateTimeAD;
-                };
             }
+
+            return function () use ($generator) {
+                return $generator->dateTimeAD;
+            };
         }
         $type = $column->getType();
         switch ($type) {
diff --git a/vendor/fzaninotto/faker/src/Faker/ORM/Propel2/ColumnTypeGuesser.php b/vendor/fzaninotto/faker/src/Faker/ORM/Propel2/ColumnTypeGuesser.php
index 13e4ee40..024965a7 100644
--- a/vendor/fzaninotto/faker/src/Faker/ORM/Propel2/ColumnTypeGuesser.php
+++ b/vendor/fzaninotto/faker/src/Faker/ORM/Propel2/ColumnTypeGuesser.php
@@ -29,11 +29,11 @@ class ColumnTypeGuesser
                 return function () use ($generator) {
                     return $generator->dateTime;
                 };
-            } else {
-                return function () use ($generator) {
-                    return $generator->dateTimeAD;
-                };
             }
+
+            return function () use ($generator) {
+                return $generator->dateTimeAD;
+            };
         }
         $type = $column->getType();
         switch ($type) {
diff --git a/vendor/fzaninotto/faker/src/Faker/ORM/Spot/EntityPopulator.php b/vendor/fzaninotto/faker/src/Faker/ORM/Spot/EntityPopulator.php
index d59cf56f..ba5bddb5 100644
--- a/vendor/fzaninotto/faker/src/Faker/ORM/Spot/EntityPopulator.php
+++ b/vendor/fzaninotto/faker/src/Faker/ORM/Spot/EntityPopulator.php
@@ -151,23 +151,23 @@ class EntityPopulator
 
                 $formatters[$fieldName] = function ($inserted) use ($required, $entityName, $locator) {
                     if (!empty($inserted[$entityName])) {
-                        return $inserted[$entityName][mt_rand(0, count($inserted[$entityName]) - 1)]->getId();
-                    } else {
-                        if ($required && $this->useExistingData) {
-                            // We did not add anything like this, but it's required,
-                            // So let's find something existing in DB.
-                            $mapper = $this->locator->mapper($entityName);
-                            $records = $mapper->all()->limit(self::RELATED_FETCH_COUNT)->toArray();
-                            if (empty($records)) {
-                                return null;
-                            }
-                            $id = $records[mt_rand(0, count($records) - 1)]['id'];
-
-                            return $id;
-                        } else {
+                        return $inserted[$entityName][mt_rand(0, count($inserted[$entityName]) - 1)]->get('id');
+                    }
+
+                    if ($required && $this->useExistingData) {
+                        // We did not add anything like this, but it's required,
+                        // So let's find something existing in DB.
+                        $mapper = $locator->mapper($entityName);
+                        $records = $mapper->all()->limit(self::RELATED_FETCH_COUNT)->toArray();
+                        if (empty($records)) {
                             return null;
                         }
+                        $id = $records[mt_rand(0, count($records) - 1)]['id'];
+
+                        return $id;
                     }
+
+                    return null;
                 };
 
             }
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/Base.php b/vendor/fzaninotto/faker/src/Faker/Provider/Base.php
index d314be71..fa321ee0 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/Base.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/Base.php
@@ -139,6 +139,18 @@ class Base
         $max = $int1 < $int2 ? $int2 : $int1;
         return mt_rand($min, $max);
     }
+    
+    /**
+     * Returns the passed value
+     *
+     * @param mixed $value
+     *
+     * @return mixed
+     */
+    public static function passthrough($value)
+    {
+        return $value;
+    }
 
     /**
      * Returns a random letter from a to z
@@ -168,9 +180,19 @@ class Base
      *
      * @return array New array with $count elements from $array
      */
-    public static function randomElements(array $array = array('a', 'b', 'c'), $count = 1, $allowDuplicates = false)
+    public static function randomElements($array = array('a', 'b', 'c'), $count = 1, $allowDuplicates = false)
     {
-        $allKeys = array_keys($array);
+        $traversables = array();
+
+        if ($array instanceof \Traversable) {
+            foreach ($array as $element) {
+                $traversables[] = $element;
+            }
+        }
+
+        $arr = count($traversables) ? $traversables : $array;
+
+        $allKeys = array_keys($arr);
         $numKeys = count($allKeys);
 
         if (!$allowDuplicates && $numKeys < $count) {
@@ -191,7 +213,7 @@ class Base
                 $keys[$num] = true;
             }
 
-            $elements[] = $array[$allKeys[$num]];
+            $elements[] = $arr[$allKeys[$num]];
             $numElements++;
         }
 
@@ -206,7 +228,7 @@ class Base
      */
     public static function randomElement($array = array('a', 'b', 'c'))
     {
-        if (!$array) {
+        if (!$array || ($array instanceof \Traversable && !count($array))) {
             return null;
         }
         $elements = static::randomElements($array, 1);
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/DateTime.php b/vendor/fzaninotto/faker/src/Faker/Provider/DateTime.php
index 3bbdd1cc..fb0f474b 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/DateTime.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/DateTime.php
@@ -6,6 +6,12 @@ class DateTime extends Base
 {
     protected static $century = array('I','II','III','IV','V','VI','VII','VIII','IX','X','XI','XII','XIII','XIV','XV','XVI','XVII','XVIII','XIX','XX','XXI');
 
+    protected static $defaultTimezone = null;
+
+    /**
+     * @param string|float|int $max
+     * @return int|false
+     */
     protected static function getMaxTimestamp($max = 'now')
     {
         if (is_numeric($max)) {
@@ -36,7 +42,7 @@ class DateTime extends Base
      * Get a datetime object for a date between January 1, 1970 and now
      *
      * @param \DateTime|int|string $max maximum timestamp used as random end limit, default to "now"
-     * @param string $timezone time zone in which the date time should be set, default to result of `date_default_timezone_get`
+     * @param string $timezone time zone in which the date time should be set, default to DateTime::$defaultTimezone, if set, otherwise the result of `date_default_timezone_get`
      * @example DateTime('2005-08-16 20:39:21')
      * @return \DateTime
      * @see http://php.net/manual/en/timezones.php
@@ -46,7 +52,7 @@ class DateTime extends Base
     {
         return static::setTimezone(
             new \DateTime('@' . static::unixTime($max)),
-            (null === $timezone ? date_default_timezone_get() : $timezone)
+            $timezone
         );
     }
 
@@ -54,7 +60,7 @@ class DateTime extends Base
      * Get a datetime object for a date between January 1, 001 and now
      *
      * @param \DateTime|int|string $max maximum timestamp used as random end limit, default to "now"
-     * @param string $timezone time zone in which the date time should be set, default to result of `date_default_timezone_get`
+     * @param string|null $timezone time zone in which the date time should be set, default to DateTime::$defaultTimezone, if set, otherwise the result of `date_default_timezone_get`
      * @example DateTime('1265-03-22 21:15:52')
      * @return \DateTime
      * @see http://php.net/manual/en/timezones.php
@@ -65,7 +71,7 @@ class DateTime extends Base
         $min = (PHP_INT_SIZE>4 ? -62135597361 : -PHP_INT_MAX);
         return static::setTimezone(
             new \DateTime('@' . mt_rand($min, static::getMaxTimestamp($max))),
-            (null === $timezone ? date_default_timezone_get() : $timezone)
+            $timezone
         );
     }
 
@@ -113,7 +119,7 @@ class DateTime extends Base
      *
      * @param \DateTime|string $startDate Defaults to 30 years ago
      * @param \DateTime|string $endDate   Defaults to "now"
-     * @param string $timezone time zone in which the date time should be set, default to result of `date_default_timezone_get`
+     * @param string|null $timezone time zone in which the date time should be set, default to DateTime::$defaultTimezone, if set, otherwise the result of `date_default_timezone_get`
      * @example DateTime('1999-02-02 11:42:52')
      * @return \DateTime
      * @see http://php.net/manual/en/timezones.php
@@ -132,7 +138,7 @@ class DateTime extends Base
 
         return static::setTimezone(
             new \DateTime('@' . $timestamp),
-            (null === $timezone ? date_default_timezone_get() : $timezone)
+            $timezone
         );
     }
 
@@ -143,7 +149,7 @@ class DateTime extends Base
      *
      * @param string $date      Defaults to 30 years ago
      * @param string $interval  Defaults to 5 days after
-     * @param string $timezone time zone in which the date time should be set, default to result of `date_default_timezone_get`
+     * @param string|null $timezone time zone in which the date time should be set, default to DateTime::$defaultTimezone, if set, otherwise the result of `date_default_timezone_get`
      * @example dateTimeInInterval('1999-02-02 11:42:52', '+ 5 days')
      * @return \DateTime
      * @see http://php.net/manual/en/timezones.php
@@ -162,13 +168,13 @@ class DateTime extends Base
         return static::dateTimeBetween(
             $begin,
             $end,
-            (null === $timezone ? date_default_timezone_get() : $timezone)
+            $timezone
         );
     }
 
     /**
      * @param \DateTime|int|string $max maximum timestamp used as random end limit, default to "now"
-     * @param string $timezone time zone in which the date time should be set, default to result of `date_default_timezone_get`
+     * @param string|null $timezone time zone in which the date time should be set, default to DateTime::$defaultTimezone, if set, otherwise the result of `date_default_timezone_get`
      * @example DateTime('1964-04-04 11:02:02')
      * @return \DateTime
      */
@@ -179,7 +185,7 @@ class DateTime extends Base
 
     /**
      * @param \DateTime|int|string $max maximum timestamp used as random end limit, default to "now"
-     * @param string $timezone time zone in which the date time should be set, default to result of `date_default_timezone_get`
+     * @param string|null $timezone time zone in which the date time should be set, default to DateTime::$defaultTimezone, if set, otherwise the result of `date_default_timezone_get`
      * @example DateTime('2010-03-10 05:18:58')
      * @return \DateTime
      */
@@ -190,7 +196,7 @@ class DateTime extends Base
 
     /**
      * @param \DateTime|int|string $max maximum timestamp used as random end limit, default to "now"
-     * @param string $timezone time zone in which the date time should be set, default to result of `date_default_timezone_get`
+     * @param string|null $timezone time zone in which the date time should be set, default to DateTime::$defaultTimezone, if set, otherwise the result of `date_default_timezone_get`
      * @example DateTime('2011-09-19 09:24:37')
      * @return \DateTime
      */
@@ -201,7 +207,7 @@ class DateTime extends Base
 
     /**
      * @param \DateTime|int|string $max maximum timestamp used as random end limit, default to "now"
-     * @param string $timezone time zone in which the date time should be set, default to result of `date_default_timezone_get`
+     * @param string|null $timezone time zone in which the date time should be set, default to DateTime::$defaultTimezone, if set, otherwise the result of `date_default_timezone_get`
      * @example DateTime('2011-10-05 12:51:46')
      * @return \DateTime
      */
@@ -262,8 +268,8 @@ class DateTime extends Base
 
     /**
      * @param \DateTime|int|string $max maximum timestamp used as random end limit, default to "now"
-     * @return int
-     * @example 1673
+     * @return string
+     * @example '1673'
      */
     public static function year($max = 'now')
     {
@@ -292,12 +298,43 @@ class DateTime extends Base
      * Internal method to set the time zone on a DateTime.
      *
      * @param \DateTime $dt
-     * @param string $timezone
+     * @param string|null $timezone
      *
-     * @return $this
+     * @return \DateTime
      */
     private static function setTimezone(\DateTime $dt, $timezone)
     {
-        return $dt->setTimezone(new \DateTimeZone($timezone));
+        return $dt->setTimezone(new \DateTimeZone(static::resolveTimezone($timezone)));
+    }
+
+    /**
+     * Sets default time zone.
+     *
+     * @param string $timezone
+     *
+     * @return void
+     */
+    public static function setDefaultTimezone($timezone = null)
+    {
+        static::$defaultTimezone = $timezone;
+    }
+
+    /**
+     * Gets default time zone.
+     *
+     * @return string|null
+     */
+    public static function getDefaultTimezone()
+    {
+        return static::$defaultTimezone;
+    }
+
+    /**
+     * @param string|null $timezone
+     * @return null|string
+     */
+    private static function resolveTimezone($timezone)
+    {
+        return ((null === $timezone) ? ((null === static::$defaultTimezone) ? date_default_timezone_get() : static::$defaultTimezone) : $timezone);
     }
 }
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/Image.php b/vendor/fzaninotto/faker/src/Faker/Provider/Image.php
index 404a45a0..0458ceb9 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/Image.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/Image.php
@@ -84,14 +84,15 @@ class Image extends Base
             $ch = curl_init($url);
             curl_setopt($ch, CURLOPT_FILE, $fp);
             $success = curl_exec($ch) && curl_getinfo($ch, CURLINFO_HTTP_CODE) === 200;
+            fclose($fp);
+            curl_close($ch);
 
-            if ($success) {
-                fclose($fp);
-            } else {
+            if (!$success) {
                 unlink($filepath);
-            }
 
-            curl_close($ch);
+                // could not contact the distant URL or HTTP error - fail silently.
+                return false;
+            }
         } elseif (ini_get('allow_url_fopen')) {
             // use remote fopen() via copy()
             $success = copy($url, $filepath);
@@ -99,11 +100,6 @@ class Image extends Base
             return new \RuntimeException('The image formatter downloads an image from a remote HTTP server. Therefore, it requires that PHP can request remote hosts, either via cURL or fopen()');
         }
 
-        if (!$success) {
-            // could not contact the distant URL or HTTP error - fail silently.
-            return false;
-        }
-
         return $fullPath ? $filepath : $filename;
     }
 }
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/Miscellaneous.php b/vendor/fzaninotto/faker/src/Faker/Provider/Miscellaneous.php
index b15b0e79..55586d11 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/Miscellaneous.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/Miscellaneous.php
@@ -203,6 +203,10 @@ class Miscellaneous extends Base
     /**
      * @link https://en.wikipedia.org/wiki/ISO_4217
      * On date of 2017-07-07
+     *
+     * With the following exceptions:
+     * SVC has been replaced by the USD in 2001: https://en.wikipedia.org/wiki/Salvadoran_col%C3%B3n
+     * ZWL has been suspended since 2009: https://en.wikipedia.org/wiki/Zimbabwean_dollar
      */
     protected static $currencyCode = array(
         'AED', 'AFN', 'ALL', 'AMD', 'ANG', 'AOA', 'ARS', 'AUD', 'AWG', 'AZN',
@@ -217,10 +221,10 @@ class Miscellaneous extends Base
         'MRO', 'MUR', 'MVR', 'MWK', 'MXN', 'MYR', 'MZN', 'NAD', 'NGN', 'NIO',
         'NOK', 'NPR', 'NZD', 'OMR', 'PAB', 'PEN', 'PGK', 'PHP', 'PKR', 'PLN',
         'PYG', 'QAR', 'RON', 'RSD', 'RUB', 'RWF', 'SAR', 'SBD', 'SCR', 'SDG',
-        'SEK', 'SGD', 'SHP', 'SLL', 'SOS', 'SRD', 'SSP', 'STD', 'SVC', 'SYP',
-        'SZL', 'THB', 'TJS', 'TMT', 'TND', 'TOP', 'TRY', 'TTD', 'TWD', 'TZS',
-        'UAH', 'UGX', 'USD', 'UYU', 'UZS', 'VEF', 'VND', 'VUV', 'WST', 'XAF',
-        'XCD', 'XOF', 'XPF', 'YER', 'ZAR', 'ZMW', 'ZWL',
+        'SEK', 'SGD', 'SHP', 'SLL', 'SOS', 'SRD', 'SSP', 'STD', 'SYP', 'SZL',
+        'THB', 'TJS', 'TMT', 'TND', 'TOP', 'TRY', 'TTD', 'TWD', 'TZS', 'UAH',
+        'UGX', 'USD', 'UYU', 'UZS', 'VEF', 'VND', 'VUV', 'WST', 'XAF', 'XCD',
+        'XOF', 'XPF', 'YER', 'ZAR', 'ZMW',
     );
 
     /**
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/Payment.php b/vendor/fzaninotto/faker/src/Faker/Provider/Payment.php
index 27ce838c..c4c08581 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/Payment.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/Payment.php
@@ -12,7 +12,7 @@ class Payment extends Base
     protected static $cardVendors = array(
         'Visa', 'Visa', 'Visa', 'Visa', 'Visa',
         'MasterCard', 'MasterCard', 'MasterCard', 'MasterCard', 'MasterCard',
-        'American Express', 'Discover Card'
+        'American Express', 'Discover Card', 'Visa Retired'
     );
 
     /**
@@ -22,25 +22,27 @@ class Payment extends Base
      */
     protected static $cardParams = array(
         'Visa' => array(
-            "4539########",
             "4539###########",
-            "4556########",
             "4556###########",
-            "4916########",
             "4916###########",
-            "4532########",
             "4532###########",
-            "4929########",
             "4929###########",
-            "40240071####",
             "40240071#######",
-            "4485########",
             "4485###########",
-            "4716########",
             "4716###########",
-            "4###########",
             "4##############"
         ),
+        'Visa Retired' => array(
+            "4539########",
+            "4556########",
+            "4916########",
+            "4532########",
+            "4929########",
+            "40240071####",
+            "4485########",
+            "4716########",
+            "4###########",
+        ),
         'MasterCard' => array(
             "2221###########",
             "23#############",
@@ -222,7 +224,7 @@ class Payment extends Base
      * @param  integer $length      total length without country code and 2 check digits
      * @return string
      */
-    public static function iban($countryCode, $prefix = '', $length = null)
+    public static function iban($countryCode = null, $prefix = '', $length = null)
     {
         $countryCode = is_null($countryCode) ? self::randomKey(self::$ibanFormats) : strtoupper($countryCode);
 
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/Text.php b/vendor/fzaninotto/faker/src/Faker/Provider/Text.php
index 36fafe35..db8c800a 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/Text.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/Text.php
@@ -136,6 +136,6 @@ abstract class Text extends Base
 
     protected static function appendEnd($text)
     {
-        return rtrim($text, ',— ').'.';
+        return preg_replace("/([ ,-:;\x{2013}\x{2014}]+$)/us", '', $text).'.';
     }
 }
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/de_CH/Internet.php b/vendor/fzaninotto/faker/src/Faker/Provider/de_CH/Internet.php
index 2f5cd2cd..ec96ea21 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/de_CH/Internet.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/de_CH/Internet.php
@@ -4,6 +4,14 @@ namespace Faker\Provider\de_CH;
 
 class Internet extends \Faker\Provider\Internet
 {
-    protected static $freeEmailDomain = array('gmail.com', 'hotmail.com', 'yahoo.com', 'googlemail.com', 'gmx.ch', 'bluewin.ch', 'swissonline.ch');
+    protected static $freeEmailDomain = array(
+        'gmail.com',
+        'hotmail.com',
+        'yahoo.com',
+        'googlemail.com',
+        'gmx.ch',
+        'bluewin.ch',
+        'swissonline.ch'
+    );
     protected static $tld = array('com', 'com', 'com', 'net', 'org', 'li', 'ch', 'ch');
 }
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/de_DE/Address.php b/vendor/fzaninotto/faker/src/Faker/Provider/de_DE/Address.php
index 8f30322d..eff738d0 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/de_DE/Address.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/de_DE/Address.php
@@ -25,7 +25,7 @@ class Address extends \Faker\Provider\Address
         'Calw', 'Castrop-Rauxel', 'Celle',
         'Chemnitz', 'Cloppenburg', 'Coburg', 'Coesfeld', 'Coswig', 'Cottbus', 'Crailsheim', 'Cuxhaven',
         'Dachau', 'Darmstadt', 'Datteln', 'Deggendorf', 'Delbrück', 'Delitzsch', 'Delmenhorst', 'Dessau-Roßlau', 'Detmold', 'Dietzenbach', 'Dillenburg', 'Dillingen/Saar', 'Dinslaken', 'Ditzingen', 'Döbeln', 'Donaueschingen', 'Dormagen', 'Dorsten', 'Dortmund', 'Dreieich', 'Dresden', 'Duderstadt', 'Duisburg', 'Dülmen', 'Düren', 'Düsseldorf',
-        'Eberswalde', 'Eckernförde', 'Edewecht', 'Ehingen', 'Einbeck', 'Eisenach', 'Eisenhüttenstadt', 'Eisleben, Lutherstadt', 'Eislingen/Fils', 'Ellwangen (Jagst)', 'Elmshorn', 'Elsdorf', 'Emden', 'Emmendingen', 'Emmerich am Rhein', 'Emsdetten', 'Enger', 'Ennepetal', 'Ennigerloh', 'Eppingen', 'Erding', 'Erftstadt', 'Erfurt', 'Erkelenz', 'Erkrath', 'Erlangen', 'Eschborn', 'Eschweiler', 'Espelkamp', 'Essen', 'Esslingen am Neckar', 'Ettlingen', 'Euskirchen',
+        'Eberswalde', 'Eckernförde', 'Edewecht', 'Ehingen', 'Einbeck', 'Eisenach', 'Eisenhüttenstadt', 'Lutherstadt Eisleben', 'Eislingen/Fils', 'Ellwangen (Jagst)', 'Elmshorn', 'Elsdorf', 'Emden', 'Emmendingen', 'Emmerich am Rhein', 'Emsdetten', 'Enger', 'Ennepetal', 'Ennigerloh', 'Eppingen', 'Erding', 'Erftstadt', 'Erfurt', 'Erkelenz', 'Erkrath', 'Erlangen', 'Eschborn', 'Eschweiler', 'Espelkamp', 'Essen', 'Esslingen am Neckar', 'Ettlingen', 'Euskirchen',
         'Falkensee', 'Fellbach', 'Filderstadt', 'Flensburg', 'Flörsheim am Main', 'Forchheim', 'Frankenthal (Pfalz)', 'Frankfurt (Oder)', 'Frankfurt am Main', 'Frechen', 'Freiberg', 'Freiburg im Breisgau', 'Freising', 'Freital', 'Freudenstadt', 'Friedberg', 'Friedberg (Hessen)', 'Friedrichsdorf', 'Friedrichshafen', 'Friesoythe', 'Fröndenberg/Ruhr', 'Fulda', 'Fürstenfeldbruck', 'Fürstenwalde/Spree', 'Fürth',
         'Gaggenau', 'Ganderkesee', 'Garbsen', 'Gardelegen', 'Garmisch-Partenkirchen', 'Gauting', 'Geesthacht', 'Geestland', 'Geilenkirchen', 'Geislingen an der Steige', 'Geldern', 'Gelnhausen', 'Gelsenkirchen', 'Georgsmarienhütte', 'Gera', 'Geretsried', 'Germering', 'Germersheim', 'Gersthofen', 'Geseke', 'Gevelsberg', 'Gießen', 'Gifhorn', 'Gladbeck', 'Glauchau', 'Goch', 'Göppingen', 'Görlitz', 'Goslar', 'Gotha', 'Göttingen', 'Greifswald', 'Greiz', 'Greven', 'Grevenbroich', 'Griesheim', 'Grimma', 'Gronau (Westf.)', 'Groß-Gerau', 'Groß-Umstadt', 'Gummersbach', 'Günzburg', 'Güstrow', 'Gütersloh',
         'Haan', 'Haar', 'Hagen', 'Halberstadt', 'Halle (Saale)', 'Halle (Westf.)', 'Haltern am See', 'Hamburg', 'Hameln', 'Hamm', 'Hamminkeln', 'Hanau', 'Hann. Münden', 'Hannover', 'Haren (Ems)', 'Harsewinkel', 'Haßloch', 'Hattersheim am Main', 'Hattingen', 'Heide', 'Heidelberg', 'Heidenheim an der Brenz', 'Heilbronn', 'Heiligenhaus', 'Heinsberg', 'Helmstedt', 'Hemer', 'Hennef (Sieg)', 'Hennigsdorf', 'Henstedt-Ulzburg', 'Heppenheim (Bergstraße)', 'Herborn', 'Herdecke', 'Herford', 'Herne', 'Herrenberg', 'Herten', 'Herzogenaurach', 'Herzogenrath', 'Hilden', 'Hildesheim', 'Hockenheim', 'Hof', 'Hofheim am Taunus', 'Hohen Neuendorf', 'Holzminden', 'Homburg', 'Horb am Neckar', 'Höxter', 'Hoyerswerda', 'Hückelhoven', 'Hürth', 'Husum',
@@ -44,7 +44,7 @@ class Address extends \Faker\Provider\Address
         'Übach-Palenberg', 'Überlingen',
         'Uelzen', 'Uetze', 'Ulm', 'Unna', 'Unterhaching', 'Unterschleißheim',
         'Vaihingen an der Enz', 'Varel', 'Vaterstetten', 'Vechta', 'Velbert', 'Verden (Aller)', 'Verl', 'Versmold', 'Viernheim', 'Viersen', 'Villingen-Schwenningen', 'Voerde (Niederrhein)', 'Völklingen', 'Vreden',
-        'Wachtberg', 'Waghäusel', 'Waiblingen', 'Waldkirch', 'Waldkraiburg', 'Waldshut-Tiengen', 'Wallenhorst', 'Walsrode', 'Waltrop', 'Wandlitz', 'Wangen im Allgäu', 'Warburg', 'Waren (Müritz)', 'Warendorf', 'Warstein', 'Wedel', 'Wedemark', 'Wegberg', 'Weiden in der Oberpfalz', 'Weil am Rhein', 'Weilheim in Oberbayern', 'Weimar', 'Weingarten', 'Weinheim', 'Weinstadt', 'Weißenfels', 'Weiterstadt', 'Werdau', 'Werder (Havel)', 'Werl', 'Wermelskirchen', 'Werne', 'Wernigerode', 'Wertheim', 'Wesel', 'Wesseling', 'Westerstede', 'Westoverledingen', 'Wetter (Ruhr)', 'Wetzlar', 'Weyhe', 'Wiehl', 'Wiesbaden', 'Wiesloch', 'Wilhelmshaven', 'Willich', 'Wilnsdorf', 'Winnenden', 'Winsen (Luhe)', 'Wipperfürth', 'Wismar', 'Witten', 'Wittenberg, Lutherstadt', 'Wittmund', 'Wolfenbüttel', 'Wolfsburg', 'Worms', 'Wülfrath', 'Wunstorf', 'Wuppertal', 'Würselen', 'Würzburg',
+        'Wachtberg', 'Waghäusel', 'Waiblingen', 'Waldkirch', 'Waldkraiburg', 'Waldshut-Tiengen', 'Wallenhorst', 'Walsrode', 'Waltrop', 'Wandlitz', 'Wangen im Allgäu', 'Warburg', 'Waren (Müritz)', 'Warendorf', 'Warstein', 'Wedel', 'Wedemark', 'Wegberg', 'Weiden in der Oberpfalz', 'Weil am Rhein', 'Weilheim in Oberbayern', 'Weimar', 'Weingarten', 'Weinheim', 'Weinstadt', 'Weißenfels', 'Weiterstadt', 'Werdau', 'Werder (Havel)', 'Werl', 'Wermelskirchen', 'Werne', 'Wernigerode', 'Wertheim', 'Wesel', 'Wesseling', 'Westerstede', 'Westoverledingen', 'Wetter (Ruhr)', 'Wetzlar', 'Weyhe', 'Wiehl', 'Wiesbaden', 'Wiesloch', 'Wilhelmshaven', 'Willich', 'Wilnsdorf', 'Winnenden', 'Winsen (Luhe)', 'Wipperfürth', 'Wismar', 'Witten', 'Lutherstadt Wittenberg', 'Wittmund', 'Wolfenbüttel', 'Wolfsburg', 'Worms', 'Wülfrath', 'Wunstorf', 'Wuppertal', 'Würselen', 'Würzburg',
         'Xanten',
         'Zeitz', 'Zerbst/Anhalt', 'Zirndorf', 'Zittau', 'Zülpich', 'Zweibrücken', 'Zwickau',
     );
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/de_DE/Internet.php b/vendor/fzaninotto/faker/src/Faker/Provider/de_DE/Internet.php
index 7dc33358..2e99de33 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/de_DE/Internet.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/de_DE/Internet.php
@@ -4,6 +4,23 @@ namespace Faker\Provider\de_DE;
 
 class Internet extends \Faker\Provider\Internet
 {
-    protected static $freeEmailDomain = array('web.de', 'gmail.com', 'hotmail.de', 'yahoo.de', 'googlemail.com', 'aol.de', 'gmx.de');
+    /**
+     * @link https://www.statista.com/statistics/446418/most-popular-e-mail-providers-germany/
+     * @link http://blog.shuttlecloud.com/the-10-most-popular-email-providers-in-germany
+     */
+    protected static $freeEmailDomain = array(
+        'web.de',
+        'gmail.com',
+        'hotmail.de',
+        'yahoo.de',
+        'googlemail.com',
+        'aol.de',
+        'gmx.de',
+        'freenet.de',
+        'posteo.de',
+        'mail.de',
+        'live.de',
+        't-online.de'
+    );
     protected static $tld = array('com', 'com', 'com', 'net', 'org', 'de', 'de', 'de');
 }
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/el_GR/Company.php b/vendor/fzaninotto/faker/src/Faker/Provider/el_GR/Company.php
index 24b621fe..5801cafa 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/el_GR/Company.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/el_GR/Company.php
@@ -42,7 +42,7 @@ class Company extends \Faker\Provider\Company
     );
 
 
-    protected static $οbject = array(
+    protected static $object = array(
         'Προγραμματιστής',
         'Δικηγόρος',
         'Γιατρός',
@@ -79,6 +79,6 @@ class Company extends \Faker\Provider\Company
      */
     public static function object()
     {
-        return static::randomElement(static::$οbject);
+        return static::randomElement(static::$object);
     }
 }
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/en_NZ/Internet.php b/vendor/fzaninotto/faker/src/Faker/Provider/en_NZ/Internet.php
index b32e6685..8a9af3ad 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/en_NZ/Internet.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/en_NZ/Internet.php
@@ -5,10 +5,12 @@ namespace Faker\Provider\en_NZ;
 class Internet extends \Faker\Provider\Internet
 {
     /**
-     * An array of common en_NZ (New Zeland) TLD's
+     * An array of New Zealand TLDs.
+     *
+     * @link https://en.wikipedia.org/wiki/.nz
      * @var array
      */
     protected static $tld = array(
-        'com', 'co.nz', 'ac.nz', 'geek.nz', 'gen.nz', 'kiwi.nz', 'maori.nz', 'net.nz', 'org.nz', 'school.nz', 'govt.nz', 'iwi.nz', 'mil.nz', 'health.nz', 'parliment.nz'
+        'com', 'nz', 'ac.nz', 'co.nz', 'geek.nz', 'gen.nz', 'kiwi.nz', 'maori.nz', 'net.nz', 'org.nz', 'school.nz', 'cri.nz', 'govt.nz', 'health.nz', 'iwi.nz', 'mil.nz', 'parliament.nz',
     );
 }
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/en_US/Company.php b/vendor/fzaninotto/faker/src/Faker/Provider/en_US/Company.php
index 3aaf2a31..dff1635e 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/en_US/Company.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/en_US/Company.php
@@ -18,7 +18,7 @@ class Company extends \Faker\Provider\Company
             '24hour', '24/7', '3rdgeneration', '4thgeneration', '5thgeneration', '6thgeneration', 'actuating', 'analyzing', 'assymetric', 'asynchronous', 'attitude-oriented', 'background', 'bandwidth-monitored', 'bi-directional', 'bifurcated', 'bottom-line', 'clear-thinking', 'client-driven', 'client-server', 'coherent', 'cohesive', 'composite', 'context-sensitive', 'contextually-based', 'content-based', 'dedicated', 'demand-driven', 'didactic', 'directional', 'discrete', 'disintermediate', 'dynamic', 'eco-centric', 'empowering', 'encompassing', 'even-keeled', 'executive', 'explicit', 'exuding', 'fault-tolerant', 'foreground', 'fresh-thinking', 'full-range', 'global', 'grid-enabled', 'heuristic', 'high-level', 'holistic', 'homogeneous', 'human-resource', 'hybrid', 'impactful', 'incremental', 'intangible', 'interactive', 'intermediate', 'leadingedge', 'local', 'logistical', 'maximized', 'methodical', 'mission-critical', 'mobile', 'modular', 'motivating', 'multimedia', 'multi-state', 'multi-tasking', 'national', 'needs-based', 'neutral', 'nextgeneration', 'non-volatile', 'object-oriented', 'optimal', 'optimizing', 'radical', 'real-time', 'reciprocal', 'regional', 'responsive', 'scalable', 'secondary', 'solution-oriented', 'stable', 'static', 'systematic', 'systemic', 'system-worthy', 'tangible', 'tertiary', 'transitional', 'uniform', 'upward-trending', 'user-facing', 'value-added', 'web-enabled', 'well-modulated', 'zeroadministration', 'zerodefect', 'zerotolerance',
         ),
         array(
-            'ability', 'access', 'adapter', 'algorithm', 'alliance', 'analyzer', 'application', 'approach', 'architecture', 'archive', 'artificialintelligence', 'array', 'attitude', 'benchmark', 'budgetarymanagement', 'capability', 'capacity', 'challenge', 'circuit', 'collaboration', 'complexity', 'concept', 'conglomeration', 'contingency', 'core', 'customerloyalty', 'database', 'data-warehouse', 'definition', 'emulation', 'encoding', 'encryption', 'extranet', 'firmware', 'flexibility', 'focusgroup', 'forecast', 'frame', 'framework', 'function', 'functionalities', 'GraphicInterface', 'groupware', 'GraphicalUserInterface', 'hardware', 'help-desk', 'hierarchy', 'hub', 'implementation', 'info-mediaries', 'infrastructure', 'initiative', 'installation', 'instructionset', 'interface', 'internetsolution', 'intranet', 'knowledgeuser', 'knowledgebase', 'localareanetwork', 'leverage', 'matrices', 'matrix', 'methodology', 'middleware', 'migration', 'model', 'moderator', 'monitoring', 'moratorium', 'neural-net', 'openarchitecture', 'opensystem', 'orchestration', 'paradigm', 'parallelism', 'policy', 'portal', 'pricingstructure', 'processimprovement', 'product', 'productivity', 'project', 'projection', 'protocol', 'securedline', 'service-desk', 'software', 'solution', 'standardization', 'strategy', 'structure', 'success', 'superstructure', 'support', 'synergy', 'systemengine', 'task-force', 'throughput', 'time-frame', 'toolset', 'utilisation', 'website', 'workforce',
+            'ability', 'access', 'adapter', 'algorithm', 'alliance', 'analyzer', 'application', 'approach', 'architecture', 'archive', 'artificialintelligence', 'array', 'attitude', 'benchmark', 'blockchain', 'budgetarymanagement', 'capability', 'capacity', 'challenge', 'circuit', 'collaboration', 'complexity', 'concept', 'conglomeration', 'contingency', 'core', 'customerloyalty', 'database', 'data-warehouse', 'definition', 'emulation', 'encoding', 'encryption', 'extranet', 'firmware', 'flexibility', 'focusgroup', 'forecast', 'frame', 'framework', 'function', 'functionalities', 'GraphicInterface', 'groupware', 'GraphicalUserInterface', 'hardware', 'help-desk', 'hierarchy', 'hub', 'implementation', 'info-mediaries', 'infrastructure', 'initiative', 'installation', 'instructionset', 'interface', 'internetsolution', 'intranet', 'knowledgeuser', 'knowledgebase', 'localareanetwork', 'leverage', 'matrices', 'matrix', 'methodology', 'middleware', 'migration', 'model', 'moderator', 'monitoring', 'moratorium', 'neural-net', 'openarchitecture', 'opensystem', 'orchestration', 'paradigm', 'parallelism', 'policy', 'portal', 'pricingstructure', 'processimprovement', 'product', 'productivity', 'project', 'projection', 'protocol', 'securedline', 'service-desk', 'software', 'solution', 'standardization', 'strategy', 'structure', 'success', 'superstructure', 'support', 'synergy', 'systemengine', 'task-force', 'throughput', 'time-frame', 'toolset', 'utilisation', 'website', 'workforce',
         ),
     );
 
@@ -65,6 +65,15 @@ class Company extends \Faker\Provider\Company
 
     protected static $companySuffix = array('Inc', 'and Sons', 'LLC', 'Group', 'PLC', 'Ltd');
 
+    /**
+     * @link https://www.irs.gov/businesses/small-businesses-self-employed/how-eins-are-assigned-and-valid-ein-prefixes
+     */
+    protected static $einPrefixes = array(
+        01, 02, 03, 04, 05, 06, 10, 11, 12, 13, 14, 15, 16, 20, 21, 22, 23, 24, 25, 26, 27, 30, 31, 32, 33, 34, 35, 36,
+        37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+        66, 67, 68, 71, 72, 73, 74, 75, 76, 77, 80, 81, 82, 83, 84, 85, 86, 87, 88, 90, 91, 92, 93, 94, 95, 98, 99
+    );
+
     /**
      * @example 'Robust full-range hub'
      */
@@ -90,4 +99,18 @@ class Company extends \Faker\Provider\Company
 
         return join($result, ' ');
     }
+
+    /**
+     * Employer Identification Number (EIN)
+     *
+     * @link https://en.wikipedia.org/wiki/Employer_Identification_Number
+     * @example '12-3456789'
+     */
+    public static function ein()
+    {
+        $prefix = static::randomElement(static::$einPrefixes);
+        $suffix = static::numberBetween(0, 9999999);
+
+        return sprintf("%02d-%07d", $prefix, $suffix);
+    }
 }
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/en_US/Person.php b/vendor/fzaninotto/faker/src/Faker/Provider/en_US/Person.php
index edfd6351..47054ffb 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/en_US/Person.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/en_US/Person.php
@@ -88,7 +88,7 @@ class Person extends \Faker\Provider\Person
         'Ebert', 'Effertz', 'Eichmann', 'Emard', 'Emmerich', 'Erdman', 'Ernser', 'Fadel',
         'Fahey', 'Farrell', 'Fay', 'Feeney', 'Feest', 'Feil', 'Ferry', 'Fisher', 'Flatley', 'Frami', 'Franecki', 'Friesen', 'Fritsch', 'Funk',
         'Gaylord', 'Gerhold', 'Gerlach', 'Gibson', 'Gislason', 'Gleason', 'Gleichner', 'Glover', 'Goldner', 'Goodwin', 'Gorczany', 'Gottlieb', 'Goyette', 'Grady', 'Graham', 'Grant', 'Green', 'Greenfelder', 'Greenholt', 'Grimes', 'Gulgowski', 'Gusikowski', 'Gutkowski', 'Gutmann',
-        'Haag', 'Hackett', 'Hagenes', 'Hahn', 'Haley', 'Halvorson', 'Hamill', 'Hammes', 'Hand', 'Hane', 'Hansen', 'Harber', 'Harris', 'Hartmann', 'Harvey', 'Hauck', 'Hayes', 'Heaney', 'Heathcote', 'Hegmann', 'Heidenreich', 'Heller', 'Herman', 'Hermann', 'Hermiston', 'Herzog', 'Hessel', 'Hettinger', 'Hickle', 'Hilll', 'Hills', 'Hilpert', 'Hintz', 'Hirthe', 'Hodkiewicz', 'Hoeger', 'Homenick', 'Hoppe', 'Howe', 'Howell', 'Hudson', 'Huel', 'Huels', 'Hyatt',
+        'Haag', 'Hackett', 'Hagenes', 'Hahn', 'Haley', 'Halvorson', 'Hamill', 'Hammes', 'Hand', 'Hane', 'Hansen', 'Harber', 'Harris', 'Hartmann', 'Harvey', 'Hauck', 'Hayes', 'Heaney', 'Heathcote', 'Hegmann', 'Heidenreich', 'Heller', 'Herman', 'Hermann', 'Hermiston', 'Herzog', 'Hessel', 'Hettinger', 'Hickle', 'Hill', 'Hills', 'Hilpert', 'Hintz', 'Hirthe', 'Hodkiewicz', 'Hoeger', 'Homenick', 'Hoppe', 'Howe', 'Howell', 'Hudson', 'Huel', 'Huels', 'Hyatt',
         'Jacobi', 'Jacobs', 'Jacobson', 'Jakubowski', 'Jaskolski', 'Jast', 'Jenkins', 'Jerde', 'Johns', 'Johnson', 'Johnston', 'Jones',
         'Kassulke', 'Kautzer', 'Keebler', 'Keeling', 'Kemmer', 'Kerluke', 'Kertzmann', 'Kessler', 'Kiehn', 'Kihn', 'Kilback', 'King', 'Kirlin', 'Klein', 'Kling', 'Klocko', 'Koch', 'Koelpin', 'Koepp', 'Kohler', 'Konopelski', 'Koss', 'Kovacek', 'Kozey', 'Krajcik', 'Kreiger', 'Kris', 'Kshlerin', 'Kub', 'Kuhic', 'Kuhlman', 'Kuhn', 'Kulas', 'Kunde', 'Kunze', 'Kuphal', 'Kutch', 'Kuvalis',
         'Labadie', 'Lakin', 'Lang', 'Langosh', 'Langworth', 'Larkin', 'Larson', 'Leannon', 'Lebsack', 'Ledner', 'Leffler', 'Legros', 'Lehner', 'Lemke', 'Lesch', 'Leuschke', 'Lind', 'Lindgren', 'Littel', 'Little', 'Lockman', 'Lowe', 'Lubowitz', 'Lueilwitz', 'Luettgen', 'Lynch',
@@ -107,7 +107,7 @@ class Person extends \Faker\Provider\Person
         'Zboncak', 'Zemlak', 'Ziemann', 'Zieme', 'Zulauf'
     );
 
-    private static $suffix = array('Jr.', 'Sr.', 'I', 'II', 'III', 'IV', 'V', 'MD', 'DDS', 'PhD', 'DVM');
+    protected static $suffix = array('Jr.', 'Sr.', 'I', 'II', 'III', 'IV', 'V', 'MD', 'DDS', 'PhD', 'DVM');
 
     /**
      * @example 'PhD'
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/en_ZA/Person.php b/vendor/fzaninotto/faker/src/Faker/Provider/en_ZA/Person.php
index 97492511..d44d4731 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/en_ZA/Person.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/en_ZA/Person.php
@@ -3,7 +3,6 @@
 namespace Faker\Provider\en_ZA;
 
 use Faker\Calculator\Luhn;
-use Faker\Provider\DateTime;
 
 class Person extends \Faker\Provider\Person
 {
@@ -127,13 +126,18 @@ class Person extends \Faker\Provider\Person
         'Pule', 'Hlophe', 'Miya', 'Moagi',
     );
 
+    protected static $titleMale = array('Mr.', 'Dr.', 'Prof.', 'Rev.', 'Hon.');
+
+    protected static $titleFemale = array('Mrs.', 'Ms.', 'Miss', 'Dr.', 'Prof.', 'Rev.', 'Hon.');
+
+    protected static $licenceCodes = array('A', 'A1', 'B', 'C', 'C1', 'C2', 'EB', 'EC', 'EC1', 'I', 'L', 'L1');
+
     /**
      * @link https://en.wikipedia.org/wiki/National_identification_number#South_Africa
      *
-     * @param int    $minAge
-     * @param int    $maxAge
-     * @param bool   $citizen
-     * @param string $gender
+     * @param \DateTime $birthdate
+     * @param bool      $citizen
+     * @param string    $gender
      *
      * @return string
      */
@@ -155,10 +159,20 @@ class Person extends \Faker\Provider\Person
         }
         $sequenceDigits = str_pad(self::randomNumber(3), 3, 0, STR_PAD_BOTH);
         $citizenDigit = ($citizen === true) ? '0' : '1';
-        $raceDigit = self::randomNumber(1);
+        $raceDigit = self::numberBetween(8, 9);
 
         $partialIdNumber = $birthDateString . $genderDigit . $sequenceDigits . $citizenDigit . $raceDigit;
 
         return $partialIdNumber . Luhn::computeCheckDigit($partialIdNumber);
     }
+
+    /**
+     * @see https://en.wikipedia.org/wiki/Driving_licence_in_South_Africa
+     *
+     * @return string
+     */
+    public function licenceCode()
+    {
+        return static::randomElement(static::$licenceCodes);
+    }
 }
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/es_ES/Person.php b/vendor/fzaninotto/faker/src/Faker/Provider/es_ES/Person.php
index 2ee0c393..9787bf92 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/es_ES/Person.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/es_ES/Person.php
@@ -63,6 +63,8 @@ class Person extends \Faker\Provider\Person
 
     private static $suffix = array('Hijo', 'Segundo', 'Tercero');
 
+    protected static $licenceCodes = array('AM', 'A1', 'A2', 'A','B', 'B+E', 'C1', 'C1+E', 'C', 'C+E', 'D1', 'D1+E', 'D', 'D+E');
+
     /**
      * @example 'Hijo'
      */
@@ -85,4 +87,14 @@ class Person extends \Faker\Provider\Person
 
         return $number . $letter;
     }
+
+    /**
+     * @see https://sede.dgt.gob.es/es/tramites-y-multas/permiso-de-conduccion/obtencion-permiso-licencia-conduccion/clases-permiso-conduccion-edad.shtml
+     *
+     * @return string
+     */
+    public function licenceCode()
+    {
+        return static::randomElement(static::$licenceCodes);
+    }
 }
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/es_VE/Company.php b/vendor/fzaninotto/faker/src/Faker/Provider/es_VE/Company.php
index 7793842d..e2e57383 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/es_VE/Company.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/es_VE/Company.php
@@ -27,4 +27,14 @@ class Company extends \Faker\Provider\Company
     {
         return static::randomElement(static::$companyPrefix);
     }
+
+    /**
+     * Generate random Taxpayer Identification Number (RIF in Venezuela). Ex J-123456789-1
+     * @param string $separator
+     * @return string
+     */
+    public function taxpayerIdentificationNumber($separator = '')
+    {
+        return static::randomElement(array('J', 'G', 'V', 'E', 'P', 'C')) . $separator . static::numerify('########') . $separator . static::numerify('#');
+    }
 }
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/es_VE/Person.php b/vendor/fzaninotto/faker/src/Faker/Provider/es_VE/Person.php
index b1da57c1..93e6c9fa 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/es_VE/Person.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/es_VE/Person.php
@@ -137,7 +137,7 @@ class Person extends \Faker\Provider\Person
     protected static $titleFemale = array('Sra.', 'Srita.', 'Dra.', 'Lcda.', 'Ing.');
 
     private static $suffix = array('Hijo');
-    
+
     private static $nationalityId = array('V', 'E');
 
     /**
@@ -149,18 +149,19 @@ class Person extends \Faker\Provider\Person
     }
 
     /**
-     * Generate random national identification number including nationalized foreigns. Ex V-8756432 or E-82803827
-     * @return string
+     * Generate random national identification number (cédula de identidad). Ex V-8756432
+     * @param string $separator
+     * @return string CNE is the official national election registry org.
      * CNE is the official national election registry org.
      * @link http://www.cne.gob.ve/web/registro_electoral/ciudadanos_111_129_2011.php
      */
-    public function nationalId()
+    public function nationalId($separator = '')
     {
         $id = static::randomElement(static::$nationalityId);
         if ($id == 'V') {
-            return $id.$this->numberBetween(10000, 100000000);
-        } else {
-            return $id.$this->numberBetween(80000000, 100000000);
+            return $id . $separator . $this->numberBetween(10000, 100000000);
         }
+
+        return $id . $separator . $this->numberBetween(80000000, 100000000);
     }
 }
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/fr_CA/Address.php b/vendor/fzaninotto/faker/src/Faker/Provider/fr_CA/Address.php
index 9dfe4470..4930b54f 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/fr_CA/Address.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/fr_CA/Address.php
@@ -76,7 +76,7 @@ class Address extends \Faker\Provider\fr_FR\Address
     protected static $secondaryAddressFormats = array('Apt. ###', 'Suite ###', 'Bureau ###');
 
     protected static $state = array(
-        'Alberta', 'Colombie-Brittanique', 'Manitoba', 'Nouveau-Brunswick', 'Terre-Neuve-et-Labrador', 'Nouvelle-Écosse', 'Ontario', 'Île-du-Prince-Édouard', 'Québec', 'Saskatchewan'
+        'Alberta', 'Colombie-Britannique', 'Manitoba', 'Nouveau-Brunswick', 'Terre-Neuve-et-Labrador', 'Nouvelle-Écosse', 'Ontario', 'Île-du-Prince-Édouard', 'Québec', 'Saskatchewan'
     );
 
     protected static $stateAbbr = array(
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/fr_CH/Company.php b/vendor/fzaninotto/faker/src/Faker/Provider/fr_CH/Company.php
index e2b4d4e8..a4e91eaf 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/fr_CH/Company.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/fr_CH/Company.php
@@ -11,5 +11,5 @@ class Company extends \Faker\Provider\fr_FR\Company
         '{{lastName}}',
     );
 
-    protected static $companySuffix = array('AG', 'Sàrl');
+    protected static $companySuffix = array('AG', 'Sàrl', 'SA', 'GmbH');
 }
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/fr_FR/Address.php b/vendor/fzaninotto/faker/src/Faker/Provider/fr_FR/Address.php
index 537a9932..5cd1f4e5 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/fr_FR/Address.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/fr_FR/Address.php
@@ -75,6 +75,16 @@ class Address extends \Faker\Provider\Address
         array('971' => 'Guadeloupe'), array('972' => 'Martinique'), array('973' => 'Guyane'), array('974' => 'La Réunion'), array('976' => 'Mayotte')
      );
 
+    protected static $secondaryAddressFormats = array('Apt. ###', 'Suite ###', 'Étage ###', "Bât. ###", "Chambre ###");
+
+    /**
+     * @example 'Appt. 350'
+     */
+    public static function secondaryAddress()
+    {
+        return static::numerify(static::randomElement(static::$secondaryAddressFormats));
+    }
+
      /**
      * @example 'rue'
      */
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/fr_FR/Company.php b/vendor/fzaninotto/faker/src/Faker/Provider/fr_FR/Company.php
index e1aca223..9112802c 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/fr_FR/Company.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/fr_FR/Company.php
@@ -112,7 +112,7 @@ class Company extends \Faker\Provider\Company
      */
     public function siret($formatted = true)
     {
-        $siret = $this->siren(false);
+        $siret = self::siren(false);
         $nicFormat = static::randomElement(static::$siretNicFormats);
         $siret .= $this->numerify($nicFormat);
         $siret .= Luhn::computeCheckDigit($siret);
@@ -129,9 +129,9 @@ class Company extends \Faker\Provider\Company
      * @see http://fr.wikipedia.org/wiki/Syst%C3%A8me_d%27identification_du_r%C3%A9pertoire_des_entreprises
      * @return string
      */
-    public function siren($formatted = true)
+    public static function siren($formatted = true)
     {
-        $siren = $this->numerify('%#######');
+        $siren = self::numerify('%#######');
         $siren .= Luhn::computeCheckDigit($siren);
         if ($formatted) {
             $siren = substr($siren, 0, 3) . ' ' . substr($siren, 3, 3) . ' ' . substr($siren, 6, 3);
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/fr_FR/Payment.php b/vendor/fzaninotto/faker/src/Faker/Provider/fr_FR/Payment.php
index 5d5ff895..d436dfe3 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/fr_FR/Payment.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/fr_FR/Payment.php
@@ -19,9 +19,14 @@ class Payment extends \Faker\Provider\Payment
      */
     public function vat($spacedNationalPrefix = true)
     {
-        $prefix = ($spacedNationalPrefix) ? "FR " : "FR";
-
-        return sprintf("%s%s%s%s", $prefix, self::randomNumber(2, true), $this->siren($spacedNationalPrefix));
+        $siren = Company::siren(false);
+        $key = (12 + 3 * ($siren % 97)) % 97;
+        $pattern = "%s%'.02d%s";
+        if ($spacedNationalPrefix) {
+            $siren = trim(chunk_split($siren, 3, ' '));
+            $pattern = "%s %'.02d %s";
+        }
+        return sprintf($pattern, 'FR', $key, $siren);
     }
 
     /**
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/fr_FR/PhoneNumber.php b/vendor/fzaninotto/faker/src/Faker/Provider/fr_FR/PhoneNumber.php
index 52736050..7c0bd9d5 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/fr_FR/PhoneNumber.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/fr_FR/PhoneNumber.php
@@ -15,7 +15,7 @@ class PhoneNumber extends \Faker\Provider\PhoneNumber
         '+33 (0)5 ## ## ## ##',
         '+33 (0)6 ## ## ## ##',
         '+33 (0)7 {{phoneNumber07WithSeparator}}',
-        '+33 (0)8 ## ## ## ##',
+        '+33 (0)8 {{phoneNumber08WithSeparator}}',
         '+33 (0)9 ## ## ## ##',
         '+33 1 ## ## ## ##',
         '+33 1 ## ## ## ##',
@@ -25,7 +25,7 @@ class PhoneNumber extends \Faker\Provider\PhoneNumber
         '+33 5 ## ## ## ##',
         '+33 6 ## ## ## ##',
         '+33 7 {{phoneNumber07WithSeparator}}',
-        '+33 8 ## ## ## ##',
+        '+33 8 {{phoneNumber08WithSeparator}}',
         '+33 9 ## ## ## ##',
         '01########',
         '01########',
@@ -35,7 +35,7 @@ class PhoneNumber extends \Faker\Provider\PhoneNumber
         '05########',
         '06########',
         '07{{phoneNumber07}}',
-        '08########',
+        '08{{phoneNumber08}}',
         '09########',
         '01 ## ## ## ##',
         '01 ## ## ## ##',
@@ -45,19 +45,28 @@ class PhoneNumber extends \Faker\Provider\PhoneNumber
         '05 ## ## ## ##',
         '06 ## ## ## ##',
         '07 {{phoneNumber07WithSeparator}}',
-        '08 ## ## ## ##',
+        '08 {{phoneNumber08WithSeparator}}',
         '09 ## ## ## ##',
     );
 
     // Mobile phone numbers start by 06 and 07
     // 06 is the most common prefix
     protected static $mobileFormats  = array(
+        '+33 (0)6 ## ## ## ##',
         '+33 6 ## ## ## ##',
+        '+33 (0)7 {{phoneNumber07WithSeparator}}',
         '+33 7 {{phoneNumber07WithSeparator}}',
         '06########',
-        '07########',
+        '07{{phoneNumber07}}',
         '06 ## ## ## ##',
-        '07 ## ## ## ##',
+        '07 {{phoneNumber07WithSeparator}}',
+    );
+
+    protected static $serviceFormats = array(
+        '+33 (0)8 {{phoneNumber08WithSeparator}}',
+        '+33 8 {{phoneNumber08WithSeparator}}',
+        '08 {{phoneNumber08WithSeparator}}',
+        '08{{phoneNumber08}}',
     );
 
     public function phoneNumber07()
@@ -79,11 +88,54 @@ class PhoneNumber extends \Faker\Provider\PhoneNumber
         return $phoneNumber;
     }
 
+    public function phoneNumber08()
+    {
+        $phoneNumber = $this->phoneNumber08WithSeparator();
+        $phoneNumber = str_replace(' ', '', $phoneNumber);
+        return $phoneNumber;
+    }
+
+    /**
+     *  Valid formats for 08:
+     *
+     *  0# ## ## ##
+     *  1# ## ## ##
+     *  2# ## ## ##
+     *  91 ## ## ##
+     *  92 ## ## ##
+     *  93 ## ## ##
+     *  97 ## ## ##
+     *  98 ## ## ##
+     *  99 ## ## ##
+     *
+     *  Formats 089(4|6)## ## ## are valid, but will be
+     *  attributed when other 089 resource ranges are exhausted.
+     *
+     * @see https://www.arcep.fr/index.php?id=8146#c9625
+     * @see https://issuetracker.google.com/u/1/issues/73269839
+     */
+    public function phoneNumber08WithSeparator()
+    {
+        $regex = '([012]{1}\d{1}|(9[1-357-9])( \d{2}){3}';
+        return $this->regexify($regex);
+    }
+
     /**
      * @example '0601020304'
      */
-    public static function mobileNumber()
+    public function mobileNumber()
     {
-        return static::numerify(static::randomElement(static::$mobileFormats));
+        $format = static::randomElement(static::$mobileFormats);
+
+        return static::numerify($this->generator->parse($format));
+    }
+    /**
+     * @example '0891951357'
+     */
+    public function serviceNumber()
+    {
+        $format = static::randomElement(static::$serviceFormats);
+
+        return static::numerify($this->generator->parse($format));
     }
 }
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/hu_HU/Address.php b/vendor/fzaninotto/faker/src/Faker/Provider/hu_HU/Address.php
index 7c4f4903..47abe74e 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/hu_HU/Address.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/hu_HU/Address.php
@@ -120,8 +120,8 @@ class Address extends \Faker\Provider\Address
      * Source: https://hu.wikipedia.org/wiki/Magyarorsz%C3%A1g_v%C3%A1rosainak_list%C3%A1ja
      */
     protected static $capitals = array('Budapest');
-    protected static $bigCities = array('
-        Békéscsaba', 'Debrecen', 'Dunaújváros', 'Eger', 'Érd', 'Győr', 'Hódmezővásárhely', 'Kaposvár', 'Kecskemét', 'Miskolc', 'Nagykanizsa', 'Nyíregyháza', 'Pécs', 'Salgótarján', 'Sopron', 'Szeged', 'Székesfehérvár', 'Szekszárd', 'Szolnok', 'Szombathely', 'Tatabánya', 'Veszprém', 'Zalaegerszeg'
+    protected static $bigCities = array(
+        'Békéscsaba', 'Debrecen', 'Dunaújváros', 'Eger', 'Érd', 'Győr', 'Hódmezővásárhely', 'Kaposvár', 'Kecskemét', 'Miskolc', 'Nagykanizsa', 'Nyíregyháza', 'Pécs', 'Salgótarján', 'Sopron', 'Szeged', 'Székesfehérvár', 'Szekszárd', 'Szolnok', 'Szombathely', 'Tatabánya', 'Veszprém', 'Zalaegerszeg'
     );
     protected static $smallerCities = array(
         'Ajka', 'Aszód', 'Bácsalmás',
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/it_IT/Company.php b/vendor/fzaninotto/faker/src/Faker/Provider/it_IT/Company.php
index f27499a3..6acb6daa 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/it_IT/Company.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/it_IT/Company.php
@@ -2,6 +2,8 @@
 
 namespace Faker\Provider\it_IT;
 
+use Faker\Calculator\Luhn;
+
 class Company extends \Faker\Provider\Company
 {
     protected static $formats = array(
@@ -69,6 +71,8 @@ class Company extends \Faker\Provider\Company
      */
     public static function vatId()
     {
-        return static::numerify('IT###########');
+        $code = sprintf('%s%03d', static::numerify('#######'), static::numberBetween(1, 121));
+
+        return sprintf('IT%s%d', $code, Luhn::computeCheckDigit($code));
     }
 }
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/kk_KZ/Person.php b/vendor/fzaninotto/faker/src/Faker/Provider/kk_KZ/Person.php
index 7e52f74b..4e1e6811 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/kk_KZ/Person.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/kk_KZ/Person.php
@@ -209,14 +209,17 @@ class Person extends \Faker\Provider\Person
             $birthDate = DateTime::dateTimeBetween();
         }
 
-        $population = mt_rand(1000, 2000);
-        $century    = self::getCenturyByYear((int) $birthDate->format('Y'));
+        do {
+            $population = mt_rand(1000, 2000);
+            $century = self::getCenturyByYear((int) $birthDate->format('Y'));
 
-        $iin  = $birthDate->format('ymd');
-        $iin .= (string) self::$genderCenturyMap[$gender][$century];
-        $iin .= (string) $population;
+            $iin = $birthDate->format('ymd');
+            $iin .= (string) self::$genderCenturyMap[$gender][$century];
+            $iin .= (string) $population;
+            $checksum = self::checkSum($iin);
+        } while ($checksum === 10);
 
-        return  $iin . (string) self::checkSum($iin);
+        return $iin . (string) $checksum;
     }
 
     /**
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/ko_KR/PhoneNumber.php b/vendor/fzaninotto/faker/src/Faker/Provider/ko_KR/PhoneNumber.php
index c1c0a2e9..6008bbf3 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/ko_KR/PhoneNumber.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/ko_KR/PhoneNumber.php
@@ -4,14 +4,39 @@ namespace Faker\Provider\ko_KR;
 
 class PhoneNumber extends \Faker\Provider\PhoneNumber
 {
+    //reference : https://ko.wikipedia.org/wiki/%EB%8C%80%ED%95%9C%EB%AF%BC%EA%B5%AD%EC%9D%98_%EC%A0%84%ED%99%94%EB%B2%88%ED%98%B8_%EC%B2%B4%EA%B3%84
+    
     protected static $formats = array(
-        '010-####-####',
+        //local area phone format
         '070-####-####',
         '02-####-####',
         '03#-####-####',
         '04#-####-####',
         '05#-####-####',
         '06#-####-####',
-        '1588-####',
+        
+        //cell phone format
+        '010-####-####',
+        
+        //others: Intelligent Network(기간통신사업자)
+        '15##-####',
+        '16##-####',
+        '18##-####',
     );
+    
+    public function localAreaPhoneNumber()
+    {
+        $format = self::randomElement(array_slice(static::$formats, 0, 6));
+
+        return self::numerify($this->generator->parse($format));
+    }
+    
+    
+    
+    public function cellPhoneNumber()
+    {
+        $format = self::randomElement(array_slice(static::$formats, 6, 1));
+
+        return self::numerify($this->generator->parse($format));
+    }
 }
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/lv_LV/Address.php b/vendor/fzaninotto/faker/src/Faker/Provider/lv_LV/Address.php
index 9b098491..6f53770b 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/lv_LV/Address.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/lv_LV/Address.php
@@ -13,32 +13,35 @@ class Address extends \Faker\Provider\Address
 
     protected static $buildingNumber = array('##');
     protected static $postcode = array('LV ####');
+
+    /**
+     * @link https://lv.wikipedia.org/wiki/Suver%C4%93no_valstu_uzskait%C4%ABjums
+     */
     protected static $country = array(
-        'Afghanistan', 'Albania', 'Algeria', 'American Samoa', 'Andorra', 'Angola', 'Anguilla', 'Antarctica (the territory South of 60 deg S)', 'Antigua and Barbuda', 'Argentina', 'Armenia', 'Aruba', 'Australia', 'Austria', 'Azerbaijan',
-        'Bahamas', 'Bahrain', 'Bangladesh', 'Barbados', 'Belarus', 'Belgium', 'Belize', 'Benin', 'Bermuda', 'Bhutan', 'Bolivia', 'Bosnia and Herzegovina', 'Botswana', 'Bouvet Island (Bouvetoya)', 'Brazil', 'British Indian Ocean Territory (Chagos Archipelago)', 'British Virgin Islands', 'Brunei Darussalam', 'Bulgaria', 'Burkina Faso', 'Burundi',
-        'Cambodia', 'Cameroon', 'Canada', 'Cape Verde', 'Cayman Islands', 'Central African Republic', 'Chad', 'Chile', 'China', 'Christmas Island', 'Cocos (Keeling) Islands', 'Colombia', 'Comoros', 'Congo', 'Congo', 'Cook Islands', 'Costa Rica', 'Cote d\'Ivoire', 'Croatia', 'Cuba', 'Cyprus', 'Czech Republic',
-        'Denmark', 'Djibouti', 'Dominica', 'Dominican Republic',
-        'Ecuador', 'Egypt', 'El Salvador', 'Equatorial Guinea', 'Eritrea', 'Estonia', 'Ethiopia',
-        'Faroe Islands', 'Falkland Islands (Malvinas)', 'Fiji', 'Finland', 'France', 'French Guiana', 'French Polynesia', 'French Southern Territories',
-        'Gabon', 'Gambia', 'Georgia', 'Germany', 'Ghana', 'Gibraltar', 'Greece', 'Greenland', 'Grenada', 'Guadeloupe', 'Guam', 'Guatemala', 'Guernsey', 'Guinea', 'Guinea-Bissau', 'Guyana',
-        'Haiti', 'Heard Island and McDonald Islands', 'Holy See (Vatican City State)', 'Honduras', 'Hong Kong', 'Hungary',
-        'Iceland', 'India', 'Indonesia', 'Iran', 'Iraq', 'Ireland', 'Isle of Man', 'Israel', 'Italy',
-        'Jamaica', 'Japan', 'Jersey', 'Jordan',
-        'Kazakhstan', 'Kenya', 'Kiribati', 'Korea', 'Korea', 'Kuwait', 'Kyrgyz Republic',
-        'Lao People\'s Democratic Republic', 'Latvia', 'Lebanon', 'Lesotho', 'Liberia', 'Libyan Arab Jamahiriya', 'Liechtenstein', 'Lithuania', 'Luxembourg',
-        'Macao', 'Macedonia', 'Madagascar', 'Malawi', 'Malaysia', 'Maldives', 'Mali', 'Malta', 'Marshall Islands', 'Martinique', 'Mauritania', 'Mauritius', 'Mayotte', 'Mexico', 'Micronesia', 'Moldova', 'Monaco', 'Mongolia', 'Montenegro', 'Montserrat', 'Morocco', 'Mozambique', 'Myanmar',
-        'Namibia', 'Nauru', 'Nepal', 'Netherlands Antilles', 'Netherlands', 'New Caledonia', 'New Zealand', 'Nicaragua', 'Niger', 'Nigeria', 'Niue', 'Norfolk Island', 'Northern Mariana Islands', 'Norway',
-        'Oman',
-        'Pakistan', 'Palau', 'Palestinian Territories', 'Panama', 'Papua New Guinea', 'Paraguay', 'Peru', 'Philippines', 'Pitcairn Islands', 'Poland', 'Portugal', 'Puerto Rico',
-        'Qatar',
-        'Reunion', 'Romania', 'Russian Federation', 'Rwanda',
-        'Saint Barthelemy', 'Saint Helena', 'Saint Kitts and Nevis', 'Saint Lucia', 'Saint Martin', 'Saint Pierre and Miquelon', 'Saint Vincent and the Grenadines', 'Samoa', 'San Marino', 'Sao Tome and Principe', 'Saudi Arabia', 'Senegal', 'Serbia', 'Seychelles', 'Sierra Leone', 'Singapore', 'Slovakia (Slovak Republic)', 'Slovenia', 'Solomon Islands', 'Somalia', 'South Africa', 'South Georgia and the South Sandwich Islands', 'Spain', 'Sri Lanka', 'Sudan', 'Suriname', 'Svalbard & Jan Mayen Islands', 'Swaziland', 'Sweden', 'Switzerland', 'Syrian Arab Republic',
-        'Taiwan', 'Tajikistan', 'Tanzania', 'Thailand', 'Timor-Leste', 'Togo', 'Tokelau', 'Tonga', 'Trinidad and Tobago', 'Tunisia', 'Turkey', 'Turkmenistan', 'Turks and Caicos Islands', 'Tuvalu',
-        'Uganda', 'Ukraine', 'United Arab Emirates', 'United Kingdom', 'United States of America', 'United States Minor Outlying Islands', 'United States Virgin Islands', 'Uruguay', 'Uzbekistan',
-        'Vanuatu', 'Venezuela', 'Vietnam',
-        'Wallis and Futuna', 'Western Sahara',
-        'Yemen',
-        'Zambia', 'Zimbabwe'
+        'Afganistāna', 'Albānija', 'Alžīrija', 'Amerikas Savienotās Valstis', 'Andora', 'Angola', 'Antigva un Barbuda',
+        'Apvienotie Arābu Emirāti', 'Argentīna', 'Armēnija', 'Austrālija', 'Austrija', 'Austrumtimora', 'Azerbaidžāna',
+        'Bahamas', 'Bahreina', 'Baltkrievija', 'Bangladeša', 'Barbadosa', 'Beliza', 'Beļģija', 'Benina', 'Bolīvija',
+        'Bosnija un Hercegovina', 'Botsvana', 'Brazīlija', 'Bruneja', 'Bulgārija', 'Burkinafaso', 'Burundi', 'Butāna',
+        'Centrālāfrikas Republika', 'Čada', 'Čehija', 'Čīle', 'Dānija', 'Dienvidāfrikas Republika', 'Dienvidkoreja',
+        'Dienvidsudāna', 'Dominika', 'Dominikāna', 'Džibutija', 'Ekvadora', 'Ekvatoriālā Gvineja', 'Eritreja',
+        'Etiopija', 'Ēģipte', 'Fidži', 'Filipīnas', 'Francija', 'Gabona', 'Gajāna', 'Gambija', 'Gana', 'Grenada',
+        'Grieķija', 'Gruzija', 'Gvatemala', 'Gvineja', 'Gvineja-Bisava', 'Haiti', 'Hondurasa', 'Horvātija', 'Igaunija',
+        'Indija', 'Indonēzija', 'Irāka', 'Irāna', 'Islande', 'Itālija', 'Izraēla', 'Īrija', 'Jamaika', 'Japāna',
+        'Jaunzēlande', 'Jemena', 'Jordānija', 'Kaboverde', 'Kambodža', 'Kamerūna', 'Kanāda', 'Katara', 'Kazahstāna',
+        'Kenija', 'Kipra', 'Kirgizstāna', 'Kiribati', 'Kolumbija', 'Komoru Salas', 'Kongo', 'Kongo DR', 'Kostarika',
+        'Kotdivuāra', 'Krievija', 'Kuba', 'Kuveita', 'Ķīna', 'Laosa', 'Latvija', 'Lesoto', 'Libāna', 'Libērija',
+        'Lībija', 'Lielbritānija', 'Lietuva', 'Lihtenšteina', 'Luksemburga', 'Madagaskara', 'Maķedonijas Republika',
+        'Malaizija', 'Malāvija', 'Maldīvija', 'Mali', 'Malta', 'Maroka', 'Māršala Salas', 'Maurīcija', 'Mauritānija',
+        'Meksika', 'Melnkalne', 'Mikronēzija', 'Mjanma', 'Moldova', 'Monako', 'Mongolija', 'Mozambika', 'Namībija',
+        'Nauru', 'Nepāla', 'Nīderlande', 'Nigēra', 'Nigērija', 'Nikaragva', 'Norvēģija', 'Omāna', 'Pakistāna', 'Palau',
+        'Panama', 'Papua-Jaungvineja', 'Paragvaja', 'Peru', 'Polija', 'Portugāle', 'Ruanda', 'Rumānija', 'Salvadora',
+        'Samoa', 'Sanmarīno', 'Santome un Prinsipi', 'Saūda Arābija', 'Seišelu Salas', 'Senegāla',
+        'Sentkitsa un Nevisa', 'Sentlūsija', 'Sentvinsenta un Grenadīnas', 'Serbija', 'Singapūra', 'Sīrija',
+        'Sjerraleone', 'Slovākija', 'Slovēnija', 'Somālija', 'Somija', 'Spānija', 'Sudāna', 'Surinama', 'Svazilenda',
+        'Šrilanka', 'Šveice', 'Tadžikistāna', 'Taizeme', 'Tanzānija', 'Togo', 'Tonga', 'Trinidāda un Tobāgo',
+        'Tunisija', 'Turcija', 'Turkmenistāna', 'Tuvalu', 'Uganda', 'Ukraina', 'Ungārija', 'Urugvaja', 'Uzbekistāna',
+        'Vācija', 'Vanuatu', 'Vatikāns', 'Venecuēla', 'Vjetnama', 'Zālamana Salas', 'Zambija', 'Ziemeļkoreja',
+        'Zimbabve', 'Zviedrija',
     );
 
     protected static $region = array(
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/ms_MY/Address.php b/vendor/fzaninotto/faker/src/Faker/Provider/ms_MY/Address.php
new file mode 100644
index 00000000..5ec2f751
--- /dev/null
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/ms_MY/Address.php
@@ -0,0 +1,708 @@
+<?php
+
+namespace Faker\Provider\ms_MY;
+
+use \Faker\Generator;
+
+class Address extends \Faker\Provider\Address
+{
+    /**
+     * @link https://en.wikipedia.org/wiki/Addresses_in_Malaysia
+     */
+    protected static $addressFormats = array(
+        '{{streetAddress}}, {{township}}, {{townState}}',
+    );
+
+    protected static $streetAddressFormats = array(
+        '{{buildingPrefix}}{{buildingNumber}}, {{streetName}}'
+    );
+
+    /**
+     * Most of the time 'No.' is not needed, and 'Lot' is less used.
+     */
+    protected static $buildingPrefix = array(
+        '','','','','','',
+        'No. ','No. ','No. ',
+        'Lot ',
+    );
+
+    protected static $buildingNumber = array(
+        '%','%','%',
+        '%#','%#','%#','%#',
+        '%##',
+        '%-%',
+        '?-##-##',
+        '%?-##'
+    );
+
+    protected static $streetNameFormats = array(
+        '{{streetPrefix}} %',
+        '{{streetPrefix}} %/%',
+        '{{streetPrefix}} %/%#',
+        '{{streetPrefix}} %/%?',
+        '{{streetPrefix}} %/%#?',
+        '{{streetPrefix}} %?',
+        '{{streetPrefix}} %#?',
+        '{{streetPrefix}} {{streetSuffix}}',
+        '{{streetPrefix}} {{streetSuffix}} %',
+        '{{streetPrefix}} {{streetSuffix}} %/%',
+        '{{streetPrefix}} {{streetSuffix}} %/%#',
+        '{{streetPrefix}} {{streetSuffix}} %/%?',
+        '{{streetPrefix}} {{streetSuffix}} %/%#?',
+        '{{streetPrefix}} {{streetSuffix}} %?',
+        '{{streetPrefix}} {{streetSuffix}} %#?',
+    );
+
+    protected static $townshipFormats = array(
+        '{{townshipPrefix}} {{townshipSuffix}}',
+        '{{townshipPrefix}} {{townshipSuffix}}',
+        '{{townshipPrefix}} {{townshipSuffix}}',
+        '{{townshipPrefix}} {{townshipSuffix}}',
+        '{{townshipPrefix}} {{townshipSuffix}}',
+        '{{townshipPrefix}} {{townshipSuffix}}',
+        '{{townshipPrefixAbbr}}%',
+        '{{townshipPrefixAbbr}}%#',
+        '{{townshipPrefixAbbr}}%#?',
+    );
+
+    /**
+     * 'Jalan' & 'Jln' are more frequently used than 'Lorong'
+     * 
+     * @link https://en.wikipedia.org/wiki/List_of_roads_in_Kuala_Lumpur#Standard_translations
+     */
+    protected static $streetPrefix = array(
+        'Jln','Jln',
+        'Jalan','Jalan','Jalan',
+        'Lorong'
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/List_of_roads_in_Kuala_Lumpur
+     * @link https://en.wikipedia.org/wiki/List_of_roads_in_Ipoh
+     * @link https://en.wikipedia.org/wiki/Transportation_in_Seremban#Inner_city_roads
+     * @link https://en.wikipedia.org/wiki/List_of_streets_in_George_Town,_Penang
+     */
+    protected static $streetSuffix = array(
+        'Air Itam','Alor','Ampang','Ampang Hilir','Anson','Ariffin',
+        'Bangsar','Baru','Bellamy','Birch','Bijih Timah','Bukit Aman','Bukit Bintang','Bukit Petaling','Bukit Tunku',
+        'Cantonment','Cenderawasih','Chan Sow Lin','Chow Kit','Cinta','Cochrane','Conlay',
+        'D. S. Ramanathan','Damansara','Dang Wangi','Davis','Dewan Bahasa','Dato Abdul Rahman','Dato\'Keramat','Dato\' Maharaja Lela','Doraisamy',
+        'Eaton',
+        'Faraday',
+        'Galloway','Genting Klang','Gereja',
+        'Hang Jebat','Hang Kasturi','Hang Lekir','Hang Lekiu','Hang Tuah','Hospital',
+        'Imbi','Istana',
+        'Jelutong',
+        'Kampung Attap','Kebun Bunga','Kedah','Keliling','Kia Peng','Kinabalu','Kuala Kangsar','Kuching',
+        'Ledang','Lembah Permai','Loke Yew','Lt. Adnan','Lumba Kuda',
+        'Madras','Magazine','Maharajalela','Masjid','Maxwell','Mohana Chandran','Muda',
+        'P. Ramlee','Padang Kota Lama','Pahang','Pantai Baharu','Parlimen','Pasar','Pasar Besar','Perak','Perdana','Petaling','Prangin','Pudu','Pudu Lama',
+        'Raja','Raja Abdullah','Raja Chulan','Raja Laut','Rakyat','Residensi','Robson',
+        'S.P. Seenivasagam','Samarahan 1','Selamat','Sempadan','Sentul','Serian 1','Sasaran','Sin Chee','Sultan Abdul Samad','Sultan Azlan Shah','Sultan Iskandar','Sultan Ismail','Sultan Sulaiman','Sungai Besi','Syed Putra',
+        'Tan Cheng Lock','Thambipillay','Tugu','Tuanku Abdul Halim','Tuanku Abdul Rahman','Tun Abdul Razak','Tun Dr Ismail','Tun H S Lee','Tun Ismail','Tun Perak','Tun Razak','Tun Sambanthan',
+        'U-Thant','Utama',
+        'Vermont','Vivekananda',
+        'Wan Kadir','Wesley','Wisma Putra',
+        'Yaacob Latif','Yap Ah Loy','Yap Ah Shak','Yap Kwan Seng','Yew',
+        'Zaaba','Zainal Abidin'
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/List_of_Petaling_Jaya_city_sections
+     * @link https://en.wikipedia.org/wiki/UEP_Subang_Jaya#History
+     */
+    protected static $townshipPrefixAbbr = array(
+        'SS','Seksyen ','PJS','PJU','USJ ',
+    );
+
+    /**
+     * 'Bandar' and 'Taman' are the most common township prefix
+     * 
+     * @link https://en.wikipedia.org/wiki/Template:Greater_Kuala_Lumpur > Townships
+     * @link https://en.wikipedia.org/wiki/Template:Johor > Townships
+     * @link https://en.wikipedia.org/wiki/Template:Kedah > Townships
+     * @link https://en.wikipedia.org/wiki/Template:Kelantan > Townships
+     * @link https://en.wikipedia.org/wiki/Template:Melaka > Townships
+     * @link https://en.wikipedia.org/wiki/Template:Negeri_Sembilan > Townships
+     * @link https://en.wikipedia.org/wiki/Template:Perak > Townships
+     * @link https://en.wikipedia.org/wiki/Template:Penang > Townships
+     * @link https://en.wikipedia.org/wiki/Template:Selangor > Townships
+     * @link https://en.wikipedia.org/wiki/Template:Terengganu > Townships
+     */
+    protected static $townshipPrefix = array(
+        'Alam','Apartment','Ara',
+        'Bandar','Bandar','Bandar','Bandar','Bandar','Bandar',
+        'Bandar Bukit','Bandar Seri','Bandar Sri','Bandar Baru','Batu','Bukit',
+        'Desa','Damansara',
+        'Kampung','Kampung Baru','Kampung Baru','Kondominium','Kota',
+        'Laman','Lembah',
+        'Medan',
+        'Pandan','Pangsapuri','Petaling','Puncak',
+        'Seri','Sri',
+        'Taman','Taman','Taman','Taman','Taman','Taman',
+        'Taman Desa',
+    );
+    protected static $townshipSuffix = array(
+        'Aman','Amanjaya','Anggerik','Angkasa','Antarabangsa','Awan',
+        'Bahagia','Bangsar','Baru','Belakong','Bendahara','Bestari','Bintang','Brickfields',
+        'Casa','Changkat','Country Heights',
+        'Damansara','Damai','Dato Harun','Delima','Duta',
+        'Flora',
+        'Gembira','Genting',
+        'Harmoni','Hartamas',
+        'Impian','Indah','Intan',
+        'Jasa','Jaya',
+        'Keramat','Kerinchi','Kiara','Kinrara','Kuchai',
+        'Laksamana',
+        'Mahkota','Maluri','Manggis','Maxwell','Medan','Melawati','Menjalara','Meru','Mulia','Mutiara',
+        'Pahlawan','Perdana','Pertama','Permai','Pelangi','Petaling','Pinang','Puchong','Puteri','Putra',
+        'Rahman','Rahmat','Raya','Razak','Ria',
+        'Saujana','Segambut','Selamat','Selatan','Semarak','Sentosa','Seputeh','Setapak','Setia Jaya','Sinar','Sungai Besi','Sungai Buaya','Sungai Long','Suria',
+        'Tasik Puteri','Tengah','Timur','Tinggi','Tropika','Tun Hussein Onn','Tun Perak','Tunku',
+        'Ulu','Utama','Utara',
+        'Wangi',
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/Template:Greater_Kuala_Lumpur
+     * @link https://en.wikipedia.org/wiki/Template:Johor
+     * @link https://en.wikipedia.org/wiki/Template:Kedah
+     * @link https://en.wikipedia.org/wiki/Template:Kelantan
+     * @link https://en.wikipedia.org/wiki/Template:Labuan
+     * @link https://en.wikipedia.org/wiki/Template:Melaka
+     * @link https://en.wikipedia.org/wiki/Template:Negeri_Sembilan
+     * @link https://en.wikipedia.org/wiki/Template:Pahang
+     * @link https://en.wikipedia.org/wiki/Template:Perak
+     * @link https://en.wikipedia.org/wiki/Template:Perlis
+     * @link https://en.wikipedia.org/wiki/Template:Penang
+     * @link https://en.wikipedia.org/wiki/Template:Sabah
+     * @link https://en.wikipedia.org/wiki/Template:Sarawak
+     * @link https://en.wikipedia.org/wiki/Template:Selangor
+     * @link https://en.wikipedia.org/wiki/Template:Terengganu
+     */
+    protected static $towns = array(
+        'johor' => array(
+            'Ayer Hitam',
+            'Batu Pahat','Bukit Gambir','Bukit Kepong','Bukit Naning',
+            'Desaru',
+            'Endau',
+            'Gelang Patah','Gemas Baharu',
+            'Iskandar Puteri',
+            'Jementah','Johor Lama','Johor Bahru',
+            'Kempas','Kluang','Kota Iskandar','Kota Tinggi','Kukup','Kulai',
+            'Labis ','Larkin','Layang-Layang',
+            'Mersing','Muar',
+            'Pagoh','Paloh','Parit Jawa','Pasir Gudang','Pekan Nanas','Permas Jaya','Pontian Kechil',
+            'Renggam',
+            'Segamat','Senai','Simpang Renggam','Skudai','Sri Gading',
+            'Tangkak','Tebrau',
+            'Ulu Tiram',
+            'Yong Peng',
+        ),
+        'kedah' => array(
+            'Alor Setar',
+            'Baling','Bukit Kayu Hitam',
+            'Changlun',
+            'Durian Burung',
+            'Gurun',
+            'Jitra',
+            'Kepala Batas','Kuah','Kuala Kedah','Kuala Ketil','Kulim',
+            'Langgar','Lunas',
+            'Merbok',
+            'Padang Serai','Pendang',
+            'Serdang','Sintok','Sungai Petani',
+            'Tawar, Baling',
+            'Yan',
+        ),
+        'kelantan' => array(
+            'Bachok','Bunut Payong',
+            'Dabong',
+            'Gua Musang',
+            'Jeli',
+            'Ketereh','Kota Bharu','Kuala Krai',
+            'Lojing',
+            'Machang',
+            'Pasir Mas','Pasir Puteh',
+            'Rantau Panjang',
+            'Salor',
+            'Tok Bali',
+            'Wakaf Bharu','Wakaf Che Yeh',
+        ),
+        'kl' => array(
+            'Ampang',
+            'Bandar Tasik Selatan','Bandar Tun Razak','Bangsar','Batu','Brickfields','Bukit Bintang','Bukit Jalil','Bukit Tunku',
+            'Cheras','Chow Kit',
+            'Damansara Town Centre','Dang Wangi','Desa Petaling','Desa Tun Hussein Onn',
+            'Jinjang',
+            'Kampung Baru','Kampung Kasipillay','Kampung Pandan','Kampung Sungai Penchala','Kepong','KLCC','Kuchai Lama',
+            'Lake Gardens','Lembah Pantai',
+            'Medan Tuanku','Mid Valley City','Mont Kiara',
+            'Pantai Dalam','Pudu',
+            'Salak South','Segambut','Semarak','Sentul','Setapak','Setiawangsa','Seputeh','Sri Hartamas','Sri Petaling','Sungai Besi',
+            'Taman Desa','Taman Melawati','Taman OUG','Taman Tun Dr Ismail','Taman U-Thant','Taman Wahyu','Titiwangsa','Tun Razak Exchange',
+            'Wangsa Maju',
+        ),
+        'labuan' => array(
+            'Batu Manikar',
+            'Kiamsam',
+            'Layang-Layang',
+            'Rancha-Rancha'
+        ),
+        'melaka' => array(
+            'Alor Gajah',
+            'Bandaraya Melaka','Batu Berendam','Bukit Beruang','Bukit Katil',
+            'Cheng',
+            'Durian Tunggal',
+            'Hang Tuah Jaya',
+            'Jasin',
+            'Klebang',
+            'Lubuk China',
+            'Masjid Tanah',
+            'Naning',
+            'Pekan Asahan',
+            'Ramuan China',
+            'Simpang Ampat',
+            'Tanjung Bidara','Telok Mas',
+            'Umbai',
+        ),
+        'nsembilan' => array(
+            'Ayer Kuning','Ampangan',
+            'Bahau','Batang Benar',
+            'Chembong',
+            'Dangi',
+            'Gemas',
+            'Juasseh',
+            'Kuala Pilah',
+            'Labu','Lenggeng','Linggi',
+            'Mantin',
+            'Nilai',
+            'Pajam','Pedas','Pengkalan Kempas','Port Dickson',
+            'Rantau','Rompin',
+            'Senawang','Seremban','Sungai Gadut',
+            'Tampin','Tiroi',
+        ),
+        'pahang' => array(
+            'Bandar Tun Razak','Bentong','Brinchang','Bukit Fraser','Bukit Tinggi',
+            'Chendor',
+            'Gambang','Genting Highlands','Genting Sempah',
+            'Jerantut',
+            'Karak','Kemayan','Kota Shahbandar','Kuala Lipis','Kuala Pahang','Kuala Rompin','Kuantan',
+            'Lanchang','Lubuk Paku',
+            'Maran','Mengkuang','Mentakab',
+            'Nenasi',
+            'Panching',
+            'Pekan','Penor',
+            'Raub',
+            'Sebertak','Sungai Lembing',
+            'Tanah Rata','Tanjung Sepat','Tasik Chini','Temerloh','Teriang','Tringkap',
+        ),
+        'penang' => array(
+            'Air Itam',
+            'Balik Pulau','Batu Ferringhi','Batu Kawan','Bayan Lepas','Bukit Mertajam','Butterworth',
+            'Gelugor','George Town',
+            'Jelutong',
+            'Kepala Batas',
+            'Nibong Tebal',
+            'Permatang Pauh','Pulau Tikus',
+            'Simpang Ampat',
+            'Tanjung Bungah','Tanjung Tokong',
+        ),
+        'perak' => array(
+            'Ayer Tawar',
+            'Bagan Serai','Batu Gajah','Behrang','Bidor','Bukit Gantang','Bukit Merah',
+            'Changkat Jering','Chemor','Chenderiang',
+            'Damar Laut',
+            'Gerik','Gopeng','Gua Tempurung',
+            'Hutan Melintang',
+            'Ipoh',
+            'Jelapang',
+            'Kamunting','Kampar','Kuala Kangsar',
+            'Lekir','Lenggong','Lumut',
+            'Malim Nawar','Manong','Menglembu',
+            'Pantai Remis','Parit','Parit Buntar','Pasir Salak','Proton City',
+            'Simpang Pulai','Sitiawan','Slim River','Sungai Siput','Sungkai',
+            'Taiping','Tambun','Tanjung Malim','Tanjung Rambutan','Tapah','Teluk Intan',
+            'Ulu Bernam',
+        ),
+        'perlis' => array(
+            'Arau',
+            'Beseri',
+            'Chuping',
+            'Kaki Bukit','Kangar','Kuala Perlis',
+            'Mata Ayer',
+            'Padang Besar',
+            'Sanglang','Simpang Empat',
+            'Wang Kelian',
+        ),
+        'putrajaya' => array(
+            'Precinct 1','Precinct 4','Precinct 5',
+            'Precinct 6','Precinct 8','Precinct 10',
+            'Precinct 11','Precinct 12','Precinct 13',
+            'Precinct 16','Precinct 18','Precinct 19',
+        ),
+        'sabah' => array(
+            'Beaufort','Bingkor',
+            'Donggongon',
+            'Inanam',
+            'Kinabatangan','Kota Belud','Kota Kinabalu','Kuala Penyu','Kimanis','Kundasang',
+            'Lahad Datu','Likas','Lok Kawi',
+            'Manggatal',
+            'Nabawan',
+            'Papar','Pitas',
+            'Ranau',
+            'Sandakan','Sapulut','Semporna','Sepanggar',
+            'Tambunan','Tanjung Aru','Tawau','Tenom','Tuaran',
+            'Weston',
+        ),
+        'sarawak' => array(
+            'Asajaya',
+            'Ba\'kelalan','Bario','Batu Kawa','Batu Niah','Betong','Bintulu',
+            'Dalat','Daro',
+            'Engkilili',
+            'Julau',
+            'Kapit','Kota Samarahan','Kuching',
+            'Lawas','Limbang','Lubok Antu',
+            'Marudi','Matu','Miri',
+            'Oya',
+            'Pakan',
+            'Sadong Jaya','Sematan','Sibu','Siburan','Song','Sri Aman','Sungai Tujoh',
+            'Tanjung Kidurong','Tanjung Manis','Tatau',
+        ),
+        'selangor' => array(
+            'Ampang','Assam Jawa',
+            'Balakong','Bandar Baru Bangi','Bandar Baru Selayang','Bandar Sunway','Bangi','Banting','Batang Kali','Batu Caves','Bestari Jaya','Bukit Lanjan',
+            'Cheras','Cyberjaya',
+            'Damansara','Dengkil',
+            'Ijok',
+            'Jenjarom',
+            'Kajang','Kelana Jaya','Klang','Kuala Kubu Bharu','Kuala Selangor','Kuang',
+            'Lagong',
+            'Morib',
+            'Pandamaran','Paya Jaras','Petaling Jaya','Port Klang','Puchong',
+            'Rasa','Rawang',
+            'Salak Tinggi','Sekinchan','Selayang','Semenyih','Sepang','Serendah','Seri Kembangan','Shah Alam','Subang','Subang Jaya','Sungai Buloh',
+            'Tanjung Karang','Tanjung Sepat',
+            'Ulu Klang','Ulu Yam',
+        ),
+        'terengganu' => array(
+            'Ajil',
+            'Bandar Ketengah Jaya','Bandar Permaisuri','Bukit Besi','Bukit Payong',
+            'Chukai',
+            'Jerteh',
+            'Kampung Raja','Kerteh','Kijal','Kuala Besut','Kuala Berang','Kuala Dungun','Kuala Terengganu',
+            'Marang','Merchang',
+            'Pasir Raja',
+            'Rantau Abang',
+            'Teluk Kalung',
+            'Wakaf Tapai',
+        )
+    );
+    
+    /**
+     * @link https://en.wikipedia.org/wiki/States_and_federal_territories_of_Malaysia
+     */
+    protected static $states = array(
+        'johor' => array(
+            'Johor Darul Ta\'zim',
+            'Johor'
+        ),
+        'kedah' => array(
+            'Kedah Darul Aman',
+            'Kedah'
+        ),
+        'kelantan' => array(
+            'Kelantan Darul Naim',
+            'Kelantan'
+        ),
+        'kl' => array(
+            'KL',
+            'Kuala Lumpur',
+            'WP Kuala Lumpur'
+        ),
+        'labuan' => array(
+            'Labuan'
+        ),
+        'melaka' => array(
+            'Malacca',
+            'Melaka'
+        ),
+        'nsembilan' => array(
+            'Negeri Sembilan Darul Khusus',
+            'Negeri Sembilan'
+        ),
+        'pahang' => array(
+            'Pahang Darul Makmur',
+            'Pahang'
+        ),
+        'penang' => array(
+            'Penang',
+            'Pulau Pinang'
+        ),
+        'perak' => array(
+            'Perak Darul Ridzuan',
+            'Perak'
+        ),
+        'perlis' => array(
+            'Perlis Indera Kayangan',
+            'Perlis'
+        ),
+        'putrajaya' => array(
+            'Putrajaya'
+        ),
+        'sabah' => array(
+            'Sabah'
+        ),
+        'sarawak' => array(
+            'Sarawak'
+        ),
+        'selangor' => array(
+            'Selangor Darul Ehsan',
+            'Selangor'
+        ),
+        'terengganu' => array(
+            'Terengganu Darul Iman',
+            'Terengganu'
+        )
+    );
+
+    /**
+     * @link https://ms.wikipedia.org/wiki/Senarai_negara_berdaulat
+     */
+    protected static $country = array(
+        'Abkhazia','Afghanistan','Afrika Selatan','Republik Afrika Tengah','Akrotiri dan Dhekelia','Albania','Algeria','Amerika Syarikat','Andorra','Angola','Antigua dan Barbuda','Arab Saudi','Argentina','Armenia','Australia','Austria','Azerbaijan',
+        'Bahamas','Bahrain','Bangladesh','Barbados','Belanda','Belarus','Belgium','Belize','Benin','Bhutan','Bolivia','Bonaire','Bosnia dan Herzegovina','Botswana','Brazil','Brunei Darussalam','Bulgaria','Burkina Faso','Burundi',
+        'Cameroon','Chad','Chile','Republik Rakyat China','Republik China di Taiwan','Colombia','Comoros','Republik Demokratik Congo','Republik Congo','Kepulauan Cook','Costa Rica','Côte d\'Ivoire (Ivory Coast)','Croatia','Cuba','Curaçao','Cyprus','Republik Turki Cyprus Utara','Republik Czech',
+        'Denmark','Djibouti','Dominika','Republik Dominika',
+        'Ecuador','El Salvador','Emiriah Arab Bersatu','Eritrea','Estonia',
+        'Kepulauan Faroe','Fiji','Filipina','Finland',
+        'Gabon','Gambia','Georgia','Ghana','Grenada','Greece (Yunani)','Guatemala','Guinea','Guinea-Bissau','Guinea Khatulistiwa','Guiana Perancis','Guyana',
+        'Habsyah (Etiopia)','Haiti','Honduras','Hungary',
+        'Iceland','India','Indonesia','Iran','Iraq','Ireland','Israel','Itali',
+        'Jamaika','Jepun','Jerman','Jordan',
+        'Kanada','Kazakhstan','Kemboja','Kenya','Kiribati','Korea Selatan','Korea Utara','Kosovo','Kuwait','Kyrgyzstan',
+        'Laos','Latvia','Lesotho','Liberia','Libya','Liechtenstein','Lithuania','Lubnan','Luxembourg',
+        'Macedonia','Madagaskar','Maghribi','Malawi','Malaysia','Maldives','Mali','Malta','Kepulauan Marshall','Mauritania','Mauritius','Mesir','Mexico','Persekutuan Micronesia','Moldova','Monaco','Montenegro','Mongolia','Mozambique','Myanmar',
+        'Namibia','Nauru','Nepal','New Zealand','Nicaragua','Niger','Nigeria','Niue','Norway',
+        'Oman','Ossetia Selatan',
+        'Pakistan','Palau','Palestin','Panama','Papua New Guinea','Paraguay','Perancis','Peru','Poland','Portugal',
+        'Qatar',
+        'Romania','Russia','Rwanda',
+        'Sahara Barat','Saint Kitts dan Nevis','Saint Lucia','Saint Vincent dan Grenadines','Samoa','San Marino','São Tomé dan Príncipe','Scotland','Senegal','Sepanyol','Serbia','Seychelles','Sierra Leone','Singapura','Slovakia','Slovenia','Kepulauan Solomon','Somalia','Somaliland','Sri Lanka','Sudan','Sudan Selatan','Suriname','Swaziland','Sweden','Switzerland','Syria',
+        'Tajikistan','Tanjung Verde','Tanzania','Thailand','Timor Leste','Togo','Tonga','Transnistria','Trinidad dan Tobago','Tunisia','Turki','Turkmenistan','Tuvalu',
+        'Uganda','Ukraine','United Kingdom','Uruguay','Uzbekistan',
+        'Vanuatu','Kota Vatican','Venezuela','Vietnam',
+        'Yaman',
+        'Zambia','Zimbabwe',
+    );
+
+    /**
+     * Return a building prefix
+     * 
+     * @example 'No.'
+     * 
+     * @return @string
+     */
+    public static function buildingPrefix()
+    {
+        return static::randomElement(static::$buildingPrefix);
+    }
+
+    /**
+     * Return a building number
+     * 
+     * @example '123'
+     * 
+     * @return @string
+     */
+    public static function buildingNumber()
+    {
+        return static::toUpper(static::lexify(static::numerify(static::randomElement(static::$buildingNumber))));
+    }
+
+    /**
+     * Return a street prefix
+     * 
+     * @example 'Jalan'
+     */
+    public function streetPrefix()
+    {
+        $format = static::randomElement(static::$streetPrefix);
+
+        return $this->generator->parse($format);
+    }
+
+    /**
+     * Return a complete streename
+     * 
+     * @example 'Jalan Utama 7'
+     * 
+     * @return @string
+     */
+    public function streetName()
+    {
+        $format = static::toUpper(static::lexify(static::numerify(static::randomElement(static::$streetNameFormats))));
+
+        return $this->generator->parse($format);
+    }
+
+    /**
+     * Return a randown township
+     * 
+     * @example Taman Bahagia
+     * 
+     * @return @string
+     */
+    public function township()
+    {
+        $format = static::toUpper(static::lexify(static::numerify(static::randomElement(static::$townshipFormats))));
+
+        return $this->generator->parse($format);
+    }
+
+    /**
+     * Return a township prefix abbreviation
+     * 
+     * @example 'USJ'
+     * 
+     * @return @string
+     */
+    public function townshipPrefixAbbr()
+    {
+        return static::randomElement(static::$townshipPrefixAbbr);
+    }
+
+    /**
+     * Return a township prefix
+     * 
+     * @example 'Taman'
+     * 
+     * @return @string
+     */
+    public function townshipPrefix()
+    {
+        return static::randomElement(static::$townshipPrefix);
+    }
+
+    /**
+     * Return a township suffix
+     * 
+     * @example 'Bahagia'
+     */
+    public function townshipSuffix()
+    {
+        return static::randomElement(static::$townshipSuffix);
+    }
+
+    /**
+     * Return a postcode based on state
+     * 
+     * @example '55100'
+     * @link https://en.wikipedia.org/wiki/Postal_codes_in_Malaysia#States
+     * 
+     * @param null|string $state 'state' or null
+     * 
+     * @return @string
+     */
+    public static function postcode($state = null)
+    {
+        $format = array(
+            'perlis' => array( // (01000 - 02800)
+                '0' . mt_rand(1000, 2800)
+            ),
+            'kedah' => array( // (05000 - 09810)
+                '0' . mt_rand(5000, 9810)
+            ),
+            'penang' => array( // (10000 - 14400)
+                mt_rand(10000, 14400)
+            ),
+            'kelantan' => array( // (15000 - 18500)
+                mt_rand(15000, 18500)
+            ),
+            'terengganu' => array( // (20000 - 24300)
+                mt_rand(20000, 24300)
+            ),
+            'pahang' => array( // (25000 - 28800 | 39000 - 39200 | 49000, 69000)
+                mt_rand(25000, 28800),
+                mt_rand(39000, 39200),
+                mt_rand(49000, 69000)
+            ),
+            'perak' => array( // (30000 - 36810)
+                mt_rand(30000, 36810)
+            ),
+            'selangor' => array( // (40000 - 48300 | 63000 - 68100)
+                mt_rand(40000, 48300),
+                mt_rand(63000, 68100)
+            ),
+            'kl' => array( // (50000 - 60000)
+                mt_rand(50000, 60000),
+            ),
+            'putrajaya' => array( // (62000 - 62988)
+                mt_rand(62000, 62988)
+            ),
+            'nsembilan' => array( // (70000 - 73509)
+                mt_rand(70000, 73509)
+            ),
+            'melaka' => array( // (75000 - 78309)
+                mt_rand(75000, 78309)
+            ),
+            'johor' => array( // (79000 - 86900)
+                mt_rand(79000, 86900)
+            ),
+            'labuan' => array( // (87000 - 87033)
+                mt_rand(87000, 87033)
+            ),
+            'sabah' => array( // (88000 - 91309)
+                mt_rand(88000, 91309)
+            ),
+            'sarawak' => array( // (93000 - 98859)
+                mt_rand(93000, 98859)
+            )
+        );
+
+        $postcode = is_null($state) ? static::randomElement($format) : $format[$state];
+        return (string)static::randomElement($postcode);
+    }
+
+    /**
+     * Return the complete town address with matching postcode and state
+     * 
+     * @example 55100 Bukit Bintang, Kuala Lumpur
+     * 
+     * @return @string
+     */
+    public function townState()
+    {
+        $state = static::randomElement(array_keys(static::$states));
+        $postcode = static::postcode($state);
+        $town = static::randomElement(static::$towns[$state]);
+        $state = static::randomElement(static::$states[$state]);
+
+        return $postcode . ' ' . $town . ', ' . $state;
+    }
+    
+    /**
+     * Return a random city (town)
+     * 
+     * @example 'Ampang'
+     * 
+     * @return @string
+    */
+    public function city()
+    {
+        $state = static::randomElement(array_keys(static::$towns));
+        return static::randomElement(static::$towns[$state]);
+    }
+    
+    /**
+     * Return a random state
+     * 
+     * @example 'Johor'
+     * 
+     * @return @string
+    */
+    public function state()
+    {
+        $state = static::randomElement(array_keys(static::$states));
+        return static::randomElement(static::$states[$state]);
+    }
+}
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/ms_MY/Company.php b/vendor/fzaninotto/faker/src/Faker/Provider/ms_MY/Company.php
new file mode 100644
index 00000000..f2e2f5f4
--- /dev/null
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/ms_MY/Company.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace Faker\Provider\ms_MY;
+
+class Company extends \Faker\Provider\Company
+{
+    protected static $formats = array(
+        '{{companyName}} {{companySuffix}}',
+        '{{industry}} {{lastNameMalay}} {{companySuffix}}',
+        '{{industry}} {{firstNameMaleChinese}} {{companySuffix}}',
+        '{{industry}} {{firstNameMaleIndian}} {{companySuffix}}',
+    );
+
+    /**
+     * There are more Private Limited Companies(Sdn Bhd) than Public Listed Companies(Berhad)
+     * 
+     * @link http://www.risscorporateservices.com/types-of-business-entities.html
+     */
+    protected static $companySuffix = array(
+        'Berhad',
+        'Bhd',
+        'Bhd.',
+        'Enterprise',
+        'Sdn Bhd','Sdn Bhd','Sdn Bhd','Sdn Bhd',
+        'Sdn. Bhd.','Sdn. Bhd.','Sdn. Bhd.','Sdn. Bhd.'
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/List_of_companies_of_Malaysia
+     */
+    protected static $companies = array(
+        'Adventa','AirAsia','AmBank','Astro Malaysia Holdings','Astro Radio','Axiata',
+        'Berjaya Group','Bonia','Boustead Holdings','BSA Manufacturing','Bufori','Bumiputra-Commerce Holdings','Bursa Malaysia',
+        'Capital Dynamics','Celcom','CIMB',
+        'Digi Telecommunications','DRB-HICOM',
+        'Edaran Otomobil Nasional (EON)',
+        'Friendster',
+        'Gamuda','Genting Group','Golden Hope','Golden Screen Cinemas','Guthrie',
+        'HELP International Corporation',
+        'iMoney.my','IOI Group','Iskandar Investment','The Italian Baker',
+        'Jaring','JobStreet.com','Johor Corporation','Johor Land',
+        'Khazanah Nasional','Khind Holdings','KLCC Properties','Keretapi Tanah Melayu (KTM)','Konsortium Transnasional (KTB)','Kulim (Malaysia)',
+        'Lam Eng Rubber','Lion Group',
+        'Magnum Corporation','Maybank','Malaysia Airlines','Malaysia Airports','Marrybrown','Maxis Communications','MBO Cinemas','Media Prima','MIMOS','MISC','Modenas','MUI Group','Mydin',
+        'NAZA Group','New Straits Times Press',
+        'OYL Industries',
+        'Parkson','Pensonic','Permodalan Nasional','Perodua','Petronas','PLUS','Pos Malaysia','Prasarana Malaysia','Proton Holdings','Public Bank',
+        'Ramly Group','Ranhill Holdings','Resort World','RHB Bank','Royal Selangor',
+        'Scientex Incorporated','Scomi','Sime Darby','SIRIM','Sunway Group','Supermax',
+        'Tan Chong Motor','Tanjong','Tenaga Nasional','Telekom Malaysia(TM)','TGV Cinemas','Top Glove',
+        'U Mobile','UEM Group','UMW Holdings',
+        'VADS','ViTrox',
+        'Wasco Energy',
+        'YTL Corporation'
+    );
+
+    /**
+     * @link http://www.daftarsyarikat.biz/perkhidmatan-dan-konsultasi/pendaftaran-lesen-kementerian-kewangan/senarai-kod-bidang/
+     */
+    protected static $industry = array(
+        'Agen Pengembaraan','Agen Penghantaran','Agen Perkapalan','Agensi Kredit Dan Pemfaktoran','Air','Akseso Kenderaan','Aksesori','Aksesori Jentera Berat','Aksesori Penghubung Dan Telekomunikasi','Aksesori Senjata Api','Akuatik','Akustik Dan Gelombang','Alat Forensik Dan Aksesori','Alat Gani','Alat Ganti','Alat Ganti Dan Kelengkapan Bot','Alat Hawa Dingin','Alat Hawa Dingin Kenderaan','Alat Kebombaan','Alat Kelengkapan Perubatan','Alat Keselamatan, Perlindungan Dan Kawalan Perlindungan Dan Kawalan','Alat Muzik Dan Aksesori','Alat Muzik, Kesenian dan Aksesori','Alat Penghasil Nyalaan','Alat penyelamat','Alat Penyimpan Tenaga Dan Aksesori','Alat Perhubungan','Alat Semboyan','Alat-Alat Marin','Alatganti Dan Kelengkapan Pesawat','Alatulis','Animation','Anti Kakis','Artis Dan Penghibur Profesional','Audio Visual',
+        'Bagasi Dan Beg dari kulit','Bahan Api Nuklear','Bahan Bacaan','Bahan Bacaan Terbitan Luar Negara','Bahan Bakar','Bahan Binaan','Bahan dan Peralatan Solekan dan Andaman','Bahan Letupan','Bahan Peledak','Bahan Pelincir','Bahan pembungkusan','Bahan Pencuci Dan Pembersihan','Bahan Pendidikan','Bahan Penerbitan Elektronik Dan Muzik','Bahan Surih, Drafting Dan Alat Lukis','Bahan Tambah','Bahan Tarpaulin Dan Kanvas','Baik Pulih Kasut Dan Barangan Kulit','Baikpulih Barang-Barang Logam','Baja Dan Nutrien Tumbuhan','Baka','Bangunan','Bantuan Kecemasan DanAmbulan','Bantuan Kemanusiaan','Barangan Hiasan Dalaman Dan Aksesori','Barangan PVC','Barge','Bas','Basah','Basikal','Bekalan Pejabat Dan Alatulis','Bekas','Belon Panas','Benih Semaian','Bill Board','Bioteknologi','Bot','Bot Malim','Bot Tunda','Brangan Logam','Broker Insuran','Broker Perkapalan','Bunga Api Dan Mercun','Butang Dan Bekalan Jahitan',
+        'Cat','Cenderamata Dan Hadiah','Cetakan Hologram','Cetakan Keselamatan','Chalet','Cloud Seeding','Complete Rounds','Customization and maintenance including data',
+        'Dadah Berjadual','Dan Aksesori','Darat','Dasar Dan Peraturan','Data management –Provide services including Disaster','Dll','DNA','Dobi','Dokumentasi Dan Panduarah',
+        'Elektronik','Empangan','Enjin Kenderaan','Enjin, Komponen Enjin Dan Aksesori','Entry, data processing',
+        'Fabrik','Faksimili','Feri','Filem dan Mikrofilem','Filem Siap Untuk Tayangan','Fotografi',
+        'Gas','Gas Turbine','Geographic Information System','Geologi','Graphic Design',
+        'Habitat Dan Tempat Kurungan Haiwan','Haiwan Ternakan, Bukan Ternakan dan Akuatik','Hak Harta Intelek','Hardware','Hardware','Hardware and Software leasing','Hasil Sampingan Dan Sisa Perladangan','Helikopter','Hiasan Dalaman','Hiasan Jalan','Hidrografi','Homestay','Hortikultur','Hotel','Hubungan Antarabangsa','Hutan Dan Ladang Hutan',
+        'ICT security and firewall, Encryption, PKI, Anti Virus','Industri','Infrastructure','Internet',
+        'Jentera','Jentera Berat','Jentera Berat','Jet Ski',
+        'Kabel Elektrik Dan Aksesori','Kain','Kajian Telekomunikasi','Kakitangan Iktisas','Kakitangan Separa Iktisas','Kamera dan Aksesori','Kanvas','Kapal','Kapal Angkasa Dan Alatganti','Kapal Laut','Kapal Selam','Kapal Selam','Kapal Terbang','Kawalan Keselamatan','Kawalan Serangga Perosak, Anti Termite','Kawasan','Kayu','Kediaman','Kelengkapan','Kelengkapan Dan Aksesori','Kelengkapan Hospital Dan Makmal','Kelengkapan Pakaian','Kelengkapan Sasaran','Kemudahan Awam','Kemudahan Awam','Kenderaan','Kenderaan Bawah 3 Ton','Kenderaan Ber Rel Dan kereta Kabel','Kenderaan Jenazah','Kenderaan Kegunaan Khusus','Kenderaan Kegunaan Khusus','Kenderaan Melebihi 3Ton','Kenderaan Rekreasi','Kenderaan Udara','Kereta','Kerja Pembaikan Kapal Angkasa','Kerja-Kerja Khusus','Kerja-kerja Mengetuk dan Mengecat','Kerja-Kerja Pembaikan Kenderaan Ber Rel Dan Kereta Kabel','Kerja-Kerja Penyelenggaraan Sistem Kenderaan','Kertas','Kertas Komputer','Khidmat Guaman','Khidmat Latihan, Tenaga Pengajar dan Moderator','Khidmat Udara','Kit Pendidikan','Kodifikasi','Kolam Kumbahan','Komponen Dan Aksesori Elektrik','Komponen Enjin Pembakaran Dalaman','Kontena','Kotak','Kren','Kunci, Perkakasan Perlindungan Dan Aksesori','Kusyen dan Bumbung',
+        'Label','Ladang','Lagu','Lain-lain Media Pengiklanan','Laminating','Lampu, Komponen Lampu Dan Aksesori','Laut','Lesen','LIDAR','Lilin','Logam','Lokomotif Dan Troli Elektrik','Lori',
+        'Maintenance','Makanan','Makanan Bermasak','Makanan Bermasak','Makanan Dan Bahan Mentah Kering','Makanan dan Minuman','Makanan Haiwan','Makmal','Malim Kapal','Marker','Mechanisation System','Media Cetak','Media Elektronik','Medium Penyimpanan','Membaik Pulih Bateri','Membaik Pulih Tayar','Membaik Pulih TempatDuduk','Membaiki Buff Fuel Tank','Membaikpulih BahanTerbitan Dan Manuskrip','Membekal Air','Membeli Barang Lusuh Perlu Permit','Membeli Barang Lusuh Tanpa Permit','Membersih Kawasan','Membersih Kenderaan','Membersih Pantai','Memproses Air','Memproses Filem','Menangkap','Mencetak Borang','Mencetak Buku, Majalah, Laporan Akhbar','Mencetak Continuous Stationery Forms','Mencetak Fail, Kad Perniagaan Dan Kad Ucapan','Mencetak Label, Poster dan Pelekat','Mencetak Label, Poster, Pelekat dan Iron On','Mencuci Kolam Renang','Menembak Haiwan','Mengangkat Sampah','Mengangkut Mayat','Mengikat Dan Melepas Tali Kapal','Menjahit Bukan Pakaian','Menjahit Pakaian Dan Kelengkapan','Menjilid Kulit Keras','Menjilid Kulit Lembut','Menyelam','Mereka-Cipta Dan Seni Halus','Mesin Dan Kelengkapan Bengkel','Mesin dan Kelengkapan Khusus','Mesin dan peralatan makmal','Mesin dan Peralatan Pejabat','Mesin dan Peralatan Woksyop','Mesin Pengimbas','Mesin-Mesin Pejabat','Mesin-Mesin Pejabat Dan Aksesori','Minuman Tambahan','Motel','Motor Dan Alat Ubah','Motosikal','Multimedia-products services and maintenance','Multimodal Transport Operator',
+        'Negotiator','Networking-supply','Nylon',
+        'Oceanografi',
+        'P.A Sistem Dan Alat Muzik','Paip Air Dan Komponen','Paip Dan Kelengkapan','Pakaian','Pakaian Keselamatan, Kelengkapan Dan Aksesori','Pakaian Sukan Dan Aksesori','Palet','Pameran pertunjukan, taman hiburan dan karnival','Papan Tanda dan Aksesori','Pejabat','Pekakas Perubatan Pakai Buang','Pelancar Misil Dan Roket','Pelupusan Dan Perawatan Sisa berbahaya','Pelupusan Dan Perawatan Sisa tidak berbahaya','Pelupusan dan Rawatan Sisa Radio Aktif dan Nuklear','Peluru Berpandu','Peluru Dan Bom','Pemadam Api','Pembaikan Alat Keselamatan','Pembaikan Kenderaan Yang Tidak Berenjin','Pembajaan','Pembersihan Bangunan Dan Pejabat','Pembersihan Tumpahan Minyak','Pembuat','Pembuat','Pembuat Keselamatan','Pembungkusan','Pembungkusan Dan Penyimpanan','Pemeliharaan Bahan Bahan Sejarah Dan Tempat Bersejarah','Pemetaan','Pemetaan Utiliti Bawah Tanah','Pemilik Kapal','Pemungut Hutang','Pencahayaan','Pencelup','Pencucuh','Penerbitan Elektronik Atas Talian','Pengangkutan Lori','Pengatur Huruf','Pengeluaran Filem','Pengenalan Dan Pas Keselamatan Bersalut','Penghantar Notis','Penghantaran Dokumen','Pengkomersilan','Pengurusan Jenazah Dan Kelengkapan','Pengurusan Kewangan Dan Korporat','Pengurusan Pelabuhan','Penjana Kuasa','Pensijilan dan Pengiktirafan','Penterjemahan','Penulisan – Semua Jenis Penulisan','Penyediaan Akaun dan Pengauditan','Penyediaan Pentas','Penyelenggaraan','Penyelenggaraan Kapal Terbang','Penyelenggaraan Misil','Penyelenggaraan Simulator Helikopter','Penyelenggaraan Simulator Kapal','Penyelenggaraan Simulator Kapal Terbang','PenyelenggaraanHelikopter','Penyelenggaran Dan Pembaikan Senjata','Penyiaran','Penyiasat Persendirian','Penyimpanan Rekod',
+        'Perabot','Perabot Jalan Raya','Perabot Pejabat','Perabot, Perabot Makmal dan Kelengkapan Berasaskan','Peralatan','Peralatan Dan Kelengkapan Hospital','Peralatan Dan Kelengkapan Pertanian','Peralatan Dan Kelengkapan Perubatan','Peralatan Dan Perkakas Domestik','Peralatan Kawalan Api','Peralatan Kawalan Keselamatan','Peralatan Keselamatan','Peralatan Keselamatan dan Senjata','Peralatan Makmal Pengukuran, Pencerapan Dan Sukat','Peralatan Makmal serta Aksesori','Peralatan Marin','Peralatan Memancing','Peralatan Memburu','Peralatan Pemantauan Dan Pengesanan','Peralatan Pemprosesan Fotografi, Mikrofilem','Peralatan Pengawalan Perosak Tanaman','Peralatan Percetakan Serta Aksesori','Peralatan Perindustrian Hiliran','Peralatan Perindustrian Huluan','Peralatan Perkhemahan Dan Aktiviti Luar','Peralatan Servis Dan Selenggara','Peralatan Sistem Bunyi, Pembesar Suara dan Projektor','Peralatan Sistem Kumbahan Dan Aksesori','Peralatan Sukan','Peralatan Untuk Orang Kurang Upaya Dan Pemulihan','Perhubungan','Perikanan Dan Akuakultur','Perkakas','Perkakas Elektrik Dan Aksesori','Perkakas Elektronik Dan Aksesori','Perkakasan Dan Bahan Kebersihan Diri Dan Mandian, Kelengkapan Bilik Air','Perkakasan Penyuntingan','Perkhidmatan Fotostat','Perkhidmatan Mel Pukal','Permainan','Perosak, Rumpai','Persembahan','Pertanian','Perundingan','Pesakit','Pesawat','Pesawat Udara','Pest Control','Pestaria','Pewarna','Pisah Warna','Plastik','Plastik','Printers, storage area network','Production Testing, Surface Well Testing and Wire Line Services','Pump','Pusat Latihan','Pvc',
+        'Racun Berjadual','Racun Serangga','Radar Dan Alatganti','Rakaman','Rawatan Hutan','Reaktor dan Instrumen Nuklear','Rekabentuk Percetakan','Renting','Resort','Roket Dan Sub Sistem, Pelancar','Rotan','Ruang Niaga','Rumah Kediaman','Rumah Tumpangan',
+        'Salvage Boat','Sampan','Sampel dan Sampel Awetan Haiwan','Sand Blasting Dan Mengecat Untuk Kapal','Satelit','Satelit Dan Alatganti','Semua Peralatan Sukatan','Senjata Api','Serangga','Sesalur','Shelf packages including maintenance','Ship Chandling','Ship Trimming','Simulator','Simulator Bot','Simulator serta lain-lain','Sisa Perawatan','Sistem Elektrik','Sistem Elektronik','Sistem Pencegah Kebakaran','Sistem Perhubungan','Sistem, Peralatan, Alat Ganti Keretapi Dan Aksesori','Software','Solekan','Split','Stesen Janakuasa, Peralatan','Stevedor','Stor','Sub Sistem Roket','Sukan','Sumber Air','Sungai','Syarikat Insuran','Syarikat pelelong awam','System development',
+        'Tag','Talian Paip','Taman','Tanaman','Tanda Dan Stiker','Tangki','Tasik','Tatahias Haiwan','Teknologi Hijau','Teknologi Maklumat Dan Komunikasi','Tekstil','Tekstil Guna Semula Kakitangan','Tekstil Pakai Buang Kakitangan','Telecommunication','Telekomunikasi','Telly Clerk','Tempat Letak Kereta','Tenaga Buruh','Ternakan','Terusan','Topografi','Trailer Dan Aksesori','Tukun Tiruan','Tumbuhan',
+        'Ubat Haiwan','Ubat Tidak Berjadual','Ujian Makmal','Ukuran',
+        'Varnishing',
+        'WAN','Wayar Elektrik Dan Aksesori','Wireless'
+    );
+
+    /**
+     * Return a random company name
+     * 
+     * @example 'AirAsia'
+     */
+    public static function companyName()
+    {
+        return static::randomElement(static::$companies);
+    }
+
+    /**
+     * Return a random industry
+     * 
+     * @example 'Automobil'
+     */
+    public static function industry()
+    {
+        return static::randomElement(static::$industry);
+    }
+}
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/ms_MY/Miscellaneous.php b/vendor/fzaninotto/faker/src/Faker/Provider/ms_MY/Miscellaneous.php
new file mode 100644
index 00000000..22efd33b
--- /dev/null
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/ms_MY/Miscellaneous.php
@@ -0,0 +1,169 @@
+<?php
+
+namespace Faker\Provider\ms_MY;
+
+class Miscellaneous extends \Faker\Provider\Miscellaneous
+{
+    /**
+     * @link https://en.wikipedia.org/wiki/Vehicle_registration_plates_of_Malaysia
+     */
+    protected static $jpjNumberPlateFormats = array(
+        '{{peninsularPrefix}}{{validAlphabet}}{{validAlphabet}} {{numberSequence}}',
+        '{{peninsularPrefix}}{{validAlphabet}}{{validAlphabet}} {{numberSequence}}',
+        '{{peninsularPrefix}}{{validAlphabet}}{{validAlphabet}} {{numberSequence}}',
+        '{{peninsularPrefix}}{{validAlphabet}}{{validAlphabet}} {{numberSequence}}',
+        'W{{validAlphabet}}{{validAlphabet}} {{numberSequence}} {{validAlphabet}}',
+        'KV {{numberSequence}} {{validAlphabet}}',
+        '{{sarawakPrefix}} {{numberSequence}} {{validAlphabet}}',
+        '{{sabahPrefix}} {{numberSequence}} {{validAlphabet}}',
+        '{{specialPrefix}} {{numberSequence}}',
+    );
+
+    /**
+     * Some alphabet has higher frequency that coincides with the current number
+     * of registrations. E.g. W = Wilayah Persekutuan
+     * 
+     * @link https://en.wikipedia.org/wiki/Vehicle_registration_plates_of_Malaysia#Current_format
+     */
+    protected static $peninsularPrefix = array(
+        'A','A','B','C','D','F','J','J','K','M','N','P','P','R','T','V',
+        'W','W','W','W','W','W',
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/Vehicle_registration_plates_of_Malaysia#Current_format_2
+     */
+    protected static $sarawakPrefix = array(
+        'QA','QK','QB','QC','QL','QM','QP','QR','QS','QT'
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/Vehicle_registration_plates_of_Malaysia#Current_format_3
+     */
+    protected static $sabahPrefix = array(
+        'SA','SAA','SAB','SAC','SB','SD','SG',
+        'SK','SL','SS','SSA','ST','STA','SU'
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/Vehicle_registration_plates_of_Malaysia#Commemorative_plates
+     */
+    protected static $specialPrefix = array(
+        '1M4U',
+        'A1M',
+        'BAMbee',
+        'Chancellor',
+        'G','G1M','GP','GT',
+        'Jaguh',
+        'K1M','KRISS',
+        'LOTUS',
+        'NAAM','NAZA','NBOS',
+        'PATRIOT','Perdana','PERFECT','Perodua','Persona','Proton','Putra','PUTRAJAYA',
+        'RIMAU',
+        'SAM','SAS','Satria','SMS','SUKOM',
+        'T1M','Tiara','TTB',
+        'U','US',
+        'VIP',
+        'WAJA',
+        'XIIINAM','XOIC','XXVIASEAN','XXXIDB',
+        'Y'
+    );
+
+    /**
+     * Chances of having an empty alphabet will be 1/24
+     * 
+     * @link https://en.wikipedia.org/wiki/Vehicle_registration_plates_of_Malaysia#Current_format
+     */
+    protected static $validAlphabets = array(
+        'A','B','C','D','E','F',
+        'G','H','J','K','L','M',
+        'N','P','Q','R','S','T',
+        'U','V','W','X','Y',''
+    );
+
+    /**
+     * Return a valid Malaysia JPJ(Road Transport Department) vehicle licence plate number
+     * 
+     * @example 'WKN 2368'
+     * 
+     * @return @string
+     */
+    public function jpjNumberPlate()
+    {
+        $formats = static::toUpper(static::lexify(static::bothify(static::randomElement(static::$jpjNumberPlateFormats))));
+
+        return $this->generator->parse($formats);
+    }
+
+    /**
+     * Return Peninsular prefix alphabet
+     * 
+     * @example 'W'
+     * 
+     * @return @string
+     */
+    public static function peninsularPrefix()
+    {
+        return static::randomElement(static::$peninsularPrefix);
+    }
+
+    /**
+     * Return Sarawak state prefix alphabet
+     * 
+     * @example 'QA'
+     * 
+     * @return @string
+     */
+    public static function sarawakPrefix()
+    {
+        return static::randomElement(static::$sarawakPrefix);
+    }
+
+    /**
+     * Return Sabah state prefix alphabet
+     * 
+     * @example 'SA'
+     * 
+     * @return @string
+     */
+    public static function sabahPrefix()
+    {
+        return static::randomElement(static::$sabahPrefix);
+    }
+
+    /**
+     * Return specialty licence plate prefix
+     * 
+     * @example 'G1M'
+     * 
+     * @return @string
+     */
+    public static function specialPrefix()
+    {
+        return static::randomElement(static::$specialPrefix);
+    }
+
+    /**
+     * Return a valid license plate alphabet
+     * 
+     * @example 'A'
+     * 
+     * @return @string
+     */
+    public static function validAlphabet()
+    {
+        return static::randomElement(static::$validAlphabets);
+    }
+
+    /**
+     * Return a valid number sequence between 1 and 9999
+     * 
+     * @example '1234'
+     * 
+     * @return @integer
+     */
+    public static function numberSequence()
+    {
+        return mt_rand(1, 9999);
+    }
+}
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/ms_MY/Payment.php b/vendor/fzaninotto/faker/src/Faker/Provider/ms_MY/Payment.php
new file mode 100644
index 00000000..b70a590f
--- /dev/null
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/ms_MY/Payment.php
@@ -0,0 +1,244 @@
+<?php
+
+namespace Faker\Provider\ms_MY;
+
+class Payment extends \Faker\Provider\Payment
+{
+    protected static $bankFormats = array(
+        '{{localBank}}',
+        '{{foreignBank}}',
+        '{{governmentBank}}'
+    );
+
+    /**
+     * @link http://www.muamalat.com.my/consumer-banking/internet-banking/popup-ibg.html
+     */
+    protected static $bankAccountNumberFormats = array(
+        '##########',
+        '###########',
+        '############',
+        '#############',
+        '##############',
+        '###############',
+        '################',
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/List_of_banks_in_Malaysia
+     */
+    protected static $localBanks = array(
+        'Affin Bank',
+        'Alliance Bank',
+        'AmBank',
+        'CIMB Bank',
+        'Hong Leong Bank ',
+        'Maybank',
+        'Public Bank',
+        'RHB Bank'
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/List_of_banks_in_Malaysia#List_of_foreign_banks_(commercial)
+     */
+    protected static $foreignBanks = array(
+        'Bangkok Bank Berhad',
+        'Bank of America Malaysia Berhad',
+        'Bank of China (Malaysia) Berhad',
+        'Bank of Tokyo-Mitsubishi UFJ (Malaysia) Berhad',
+        'BNP Paribas Malaysia Berhad',
+        'China Construction Bank',
+        'Citibank Berhad',
+        'Deutsche Bank (Malaysia) Berhad',
+        'HSBC Bank Malaysia Berhad',
+        'India International Bank (Malaysia) Berhad',
+        'Industrial and Commercial Bank of China (Malaysia) Berhad',
+        'J.P. Morgan Chase Bank Berhad',
+        'Mizuho Bank (Malaysia) Berhad',
+        'National Bank of Abu Dhabi Malaysia Berhad',
+        'OCBC Bank (Malaysia) Berhad',
+        'Standard Chartered Bank Malaysia Berhad',
+        'Sumitomo Mitsui Banking Corporation Malaysia Berhad',
+        'The Bank of Nova Scotia Berhad',
+        'United Overseas Bank (Malaysia) Bhd.'
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/List_of_banks_in_Malaysia#Development_Financial_Institutions_(Government-owned_banks)_(full_list)
+     */
+    protected static $governmentBanks = array(
+        'Agro Bank Malaysia',
+        'Bank Pembangunan Malaysia Berhad (BPMB) (The development bank of Malaysia)',
+        'Bank Rakyat',
+        'Bank Simpanan Nasional',
+        'Credit Guarantee Corporation Malaysia Berhad (CGC)',
+        'Export-Import Bank of Malaysia Berhad (Exim Bank)',
+        'Malaysia Debt Ventures Berhad',
+        'Malaysian Industrial Development Finance Berhad (MIDF)',
+        'SME Bank Berhad',
+        'Sabah Development Bank Berhad (SDB)',
+        'Sabah Credit Corporation (SCC)',
+        'Tabung Haji',
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/List_of_banks_in_Malaysia#Investment-Link_Funds_(Insurance_Companies_-_Takaful_included)
+     */
+    protected static $insuranceCompanies = array(
+        'AIA Malaysia',
+        'AIG Malaysia',
+        'Allianz Malaysia',
+        'AXA AFFIN Life Insurance',
+        'Berjaya General Insurance',
+        'Etiqa Insurance',
+        'Great Eastern Insurance',
+        'Hong Leong Assurance',
+        'Kurnia Insurans Malaysia',
+        'Manulife Malaysia Insurance',
+        'MSIG Malaysia',
+        'Prudential Malaysia',
+        'Tokio Marine Life Malaysia Insurance',
+        'UNI.ASIA General Insurance',
+        'Zurich Insurance Malaysia',
+    );
+
+    /**
+     * @link http://www.bankswiftcode.org/malaysia/
+     */
+    protected static $swiftCodes = array(
+        'ABNAMY2AXXX','ABNAMYKLPNG','ABNAMYKLXXX','AFBQMYKLXXX','AIBBMYKLXXX',
+        'AISLMYKLXXX','AMMBMYKLXXX','ARBKMYKLXXX',
+        'BIMBMYKLXXX','BISLMYKAXXX','BKCHMYKLXXX','BKKBMYKLXXX','BMMBMYKLXXX',
+        'BNMAMYKLXXX','BNPAMYKAXXX','BOFAMY2XLBN','BOFAMY2XXXX','BOTKMYKAXXX',
+        'BOTKMYKXXXX',
+        'CHASMYKXKEY','CHASMYKXXXX','CIBBMYKAXXX','CIBBMYKLXXX','CITIMYKLJOD',
+        'CITIMYKLLAB','CITIMYKLPEN','CITIMYKLXXX','COIMMYKLXXX','CTBBMYKLXXX',
+        'DABEMYKLXXX','DBSSMY2AXXX','DEUTMYKLBLB','DEUTMYKLGMO','DEUTMYKLISB',
+        'DEUTMYKLXXX',
+        'EIBBMYKLXXX','EOBBMYKLXXX','EXMBMYKLXXX',
+        'FEEBMYKAXXX',
+        'HBMBMYKLXXX','HDSBMY2PSEL','HDSBMY2PXXX','HLBBMYKLIBU','HLBBMYKLJBU',
+        'HLBBMYKLKCH','HLBBMYKLPNG','HLBBMYKLXXX','HLIBMYKLXXX','HMABMYKLXXX',
+        'HSBCMYKAXXX','HSTMMYKLGWS','HSTMMYKLXXX',
+        'KAFBMYKLXXX','KFHOMYKLXXX',
+        'MBBEMYKAXXX','MBBEMYKLBAN','MBBEMYKLBBG','MBBEMYKLBWC','MBBEMYKLCSD',
+        'MBBEMYKLIPH','MBBEMYKLJOB','MBBEMYKLKEP','MBBEMYKLKIN','MBBEMYKLKLC',
+        'MBBEMYKLMAL','MBBEMYKLPEN','MBBEMYKLPGC','MBBEMYKLPJC','MBBEMYKLPJY',
+        'MBBEMYKLPKG','MBBEMYKLPSG','MBBEMYKLPUD','MBBEMYKLSAC','MBBEMYKLSBN',
+        'MBBEMYKLSHA','MBBEMYKLSUB','MBBEMYKLWSD','MBBEMYKLXXX','MBBEMYKLYSL',
+        'MFBBMYKLXXX','MHCBMYKAXXX',
+        'NOSCMY2LXXX','NOSCMYKLXXX',
+        'OABBMYKLXXX','OCBCMYKLXXX','OSKIMYKLXXX',
+        'PBBEMYKLXXX','PBLLMYKAXXX','PCGLMYKLXXX','PERMMYKLXXX','PHBMMYKLXXX',
+        'PTRDMYKLXXX','PTROMYKLFSD','PTROMYKLXXX',
+        'RHBAMYKLXXX','RHBBMYKAXXX','RHBBMYKLXXX','RJHIMYKLXXX',
+        'SCBLMYKXLAB','SCBLMYKXXXX','SMBCMYKAXXX',
+        'UIIBMYKLXXX','UOVBMYKLCND','UOVBMYKLXXX',
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/Malaysian_ringgit
+     */
+    protected static $currencySymbol = array(
+        'RM'
+    );
+
+    /**
+     * Return a Malaysian Bank
+     * 
+     * @example 'Maybank'
+     * 
+     * @return @string
+     */
+    public function bank()
+    {
+        $formats = static::randomElement(static::$bankFormats);
+
+        return $this->generator->parse($formats);
+    }
+
+    /**
+     * Return a Malaysian Bank account number
+     * 
+     * @example '1234567890123456'
+     * 
+     * @return @string
+     */
+    public function bankAccountNumber()
+    {
+        $formats = static::randomElement(static::$bankAccountNumberFormats);
+
+        return static::numerify($formats);
+    }
+
+    /**
+     * Return a Malaysian Local Bank
+     * 
+     * @example 'Public Bank'
+     * 
+     * @return @string
+     */
+    public static function localBank()
+    {
+        return static::randomElement(static::$localBanks);
+    }
+
+    /**
+     * Return a Malaysian Foreign Bank
+     * 
+     * @example 'Citibank Berhad'
+     * 
+     * @return @string
+     */
+    public static function foreignBank()
+    {
+        return static::randomElement(static::$foreignBanks);
+    }
+
+    /**
+     * Return a Malaysian Government Bank
+     * 
+     * @example 'Bank Simpanan Nasional'
+     * 
+     * @return @string
+     */
+    public static function governmentBank()
+    {
+        return static::randomElement(static::$governmentBanks);
+    }
+
+    /**
+     * Return a Malaysian insurance company
+     * 
+     * @example 'AIA Malaysia'
+     * 
+     * @return @string
+     */
+    public static function insurance()
+    {
+        return static::randomElement(static::$insuranceCompanies);
+    }
+
+    /**
+     * Return a Malaysian Bank SWIFT Code
+     * 
+     * @example 'MBBEMYKLXXX'
+     * 
+     * @return @string
+     */
+    public static function swiftCode()
+    {
+        return static::toUpper(static::lexify(static::randomElement(static::$swiftCodes)));
+    }
+
+    /**
+     * Return the Malaysian currency symbol
+     * 
+     * @example 'RM'
+     * 
+     * @return @string
+     */
+    public static function currencySymbol()
+    {
+        return static::randomElement(static::$currencySymbol);
+    }
+}
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/ms_MY/Person.php b/vendor/fzaninotto/faker/src/Faker/Provider/ms_MY/Person.php
new file mode 100644
index 00000000..7dfaaac5
--- /dev/null
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/ms_MY/Person.php
@@ -0,0 +1,813 @@
+<?php
+namespace Faker\Provider\ms_MY;
+
+use Faker\Provider\DateTime;
+use Faker\Generator;
+
+class Person extends \Faker\Provider\Person
+{
+    protected static $firstNameFormat = array(
+        '{{firstNameMaleMalay}}',
+        '{{firstNameFemaleMalay}}',
+        '{{firstNameMaleChinese}}',
+        '{{firstNameFemaleChinese}}',
+        '{{firstNameMaleIndian}}',
+        '{{firstNameFemaleIndian}}',
+        '{{firstNameMaleChristian}}',
+        '{{firstNameFemaleChristian}}',
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/Malaysian_names
+     */
+    protected static $maleNameFormats = array(
+        //Malay
+        '{{muhammadName}}{{haji}}{{titleMaleMalay}}{{firstNameMaleMalay}} {{lastNameMalay}} bin {{titleMaleMalay}}{{firstNameMaleMalay}} {{lastNameMalay}}',
+        '{{muhammadName}}{{haji}}{{titleMaleMalay}}{{firstNameMaleMalay}} {{lastNameMalay}} bin {{titleMaleMalay}}{{firstNameMaleMalay}}',
+        '{{muhammadName}}{{haji}}{{titleMaleMalay}}{{firstNameMaleMalay}} {{lastNameMalay}} bin {{titleMaleMalay}}{{lastNameMalay}}',
+        '{{muhammadName}}{{haji}}{{titleMaleMalay}}{{firstNameMaleMalay}} {{lastNameMalay}}',
+        '{{muhammadName}}{{haji}}{{titleMaleMalay}}{{firstNameMaleMalay}} bin {{titleMaleMalay}}{{firstNameMaleMalay}} {{lastNameMalay}}',
+        '{{muhammadName}}{{haji}}{{titleMaleMalay}}{{firstNameMaleMalay}} bin {{titleMaleMalay}}{{firstNameMaleMalay}}',
+        '{{muhammadName}}{{haji}}{{titleMaleMalay}}{{firstNameMaleMalay}} bin {{titleMaleMalay}}{{lastNameMalay}}',
+        //Chinese
+        '{{lastNameChinese}} {{firstNameMaleChinese}}',
+        '{{lastNameChinese}} {{firstNameMaleChinese}}',
+        '{{lastNameChinese}} {{firstNameMaleChinese}}',
+        '{{lastNameChinese}} {{firstNameMaleChinese}}',
+        '{{lastNameChinese}} {{firstNameMaleChinese}}',
+        '{{firstNameMaleChristian}} {{lastNameChinese}} {{firstNameMaleChinese}}',
+        //Indian
+        '{{initialIndian}} {{firstNameMaleIndian}}',
+        '{{initialIndian}} {{lastNameIndian}}',
+        '{{firstNameMaleIndian}} a/l {{firstNameMaleIndian}}',
+        '{{firstNameMaleIndian}} a/l {{firstNameMaleIndian}} {{lastNameIndian}}',
+        '{{firstNameMaleIndian}} {{lastNameIndian}} a/l {{lastNameIndian}}',
+        '{{firstNameMaleIndian}} {{lastNameIndian}} a/l {{firstNameMaleIndian}} {{lastNameIndian}}',
+        '{{firstNameMaleIndian}} {{lastNameIndian}}',
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/Malaysian_names
+     */
+    protected static $femaleNameFormats = array(
+        //Malay
+        '{{nurName}}{{hajjah}}{{firstNameFemaleMalay}} {{lastNameMalay}} binti {{titleMaleMalay}}{{firstNameMaleMalay}} {{lastNameMalay}}',
+        '{{nurName}}{{hajjah}}{{firstNameFemaleMalay}} {{lastNameMalay}} binti {{titleMaleMalay}}{{firstNameMaleMalay}}',
+        '{{nurName}}{{hajjah}}{{firstNameFemaleMalay}} {{lastNameMalay}} binti {{titleMaleMalay}}{{lastNameMalay}}',
+        '{{nurName}}{{hajjah}}{{firstNameFemaleMalay}} {{lastNameMalay}}',
+        '{{nurName}}{{hajjah}}{{firstNameFemaleMalay}} binti {{titleMaleMalay}}{{firstNameMaleMalay}} {{lastNameMalay}}',
+        '{{nurName}}{{hajjah}}{{firstNameFemaleMalay}} binti {{titleMaleMalay}}{{firstNameMaleMalay}}',
+        '{{nurName}}{{hajjah}}{{firstNameFemaleMalay}} binti {{titleMaleMalay}}{{lastNameMalay}}',
+        //Chinese
+        '{{lastNameChinese}} {{firstNameFemaleChinese}}',
+        '{{lastNameChinese}} {{firstNameFemaleChinese}}',
+        '{{lastNameChinese}} {{firstNameFemaleChinese}}',
+        '{{lastNameChinese}} {{firstNameFemaleChinese}}',
+        '{{lastNameChinese}} {{firstNameFemaleChinese}}',
+        '{{firstNameFemaleChristian}} {{lastNameChinese}} {{firstNameFemaleChinese}}',
+        //Indian
+        '{{initialIndian}}{{firstNameFemaleIndian}}',
+        '{{initialIndian}}{{lastNameIndian}}',
+        '{{firstNameFemaleIndian}} a/l {{firstNameMaleIndian}}',
+        '{{firstNameFemaleIndian}} a/l {{firstNameMaleIndian}} {{lastNameIndian}}',
+        '{{firstNameFemaleIndian}} {{lastNameIndian}} a/l {{firstNameMaleIndian}}',
+        '{{firstNameFemaleIndian}} {{lastNameIndian}} a/l {{firstNameMaleIndian}} {{lastNameIndian}}',
+        '{{firstNameFemaleIndian}} {{lastNameIndian}}',
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/List_of_Malay_people
+     * @link https://samttar.edu.my/senarai-nama-pelajar-2016/
+     * @link http://smkspkl.edu.my/senarai-nama-pelajar
+     */
+    protected static $firstNameMaleMalay = array(
+        'A','A.r','A\'fif','A\'zizul','Ab','Abadi','Abas','Abd','Abd.','Abd.rahim','Abdel','Abdul','Abdull','Abdullah','Abdulloh','Abu','Adam','Adi','Adib','Adil','Adnan','Ady','Adzmin','Afandy','Afif','Afiq','Afza','Agus','Ahmad','Ahmat','Ahmed','Ahwali','Ahyer','Aidid','Aidil','Aiman','Aimman','Ainol','Ainuddin','Ainul','Aizad','Aizam','Aizat','Aizuddin','Ajis','Ajmal','Ajwad','Akhmal','Akid','Akif','Akmal','Al','Al-afnan','Al-muazrar','Alfian','Ali','Alias','Alif','Aliff','Alilah','Alin','Allif','Amaanullah','Amami','Aman','Amar','Ameershah','Amier','Amierul','Amil','Amin','Aminuddin','Amir','Amiruddin','Amirul','Ammar','Amran','Amri','Amru','Amrullah','Amsyar','Anas','Andri','Aniq','Anuar','Anuwar','Anwar','Aqeel','Aqif','Aqil','Arash','Arbani','Arefin','Arief','Arif','Arifen','Ariff','Ariffin','Arifin','Armi','Ashraf','Ashraff','Ashrof','Ashrul','Aslam','Asmawi','Asmin','Asmuri','Asraf','Asri','Asrialif','Asror','Asrul','Asymawi','Asyraaf','Asyraf','Atan','Athari','Awaludin','Awira','Azam','Azely','Azfar','Azhan','Azhar','Azhari','Azib','Azim','Aziz','Azizan','Azizul','Azizulhasni','Azlan','Azlee','Azli','Azman','Azmi','Azmie','Azmin','Aznan','Aznizam','Azraai','Azri','Azrie','Azrien','Azril','Azrin','Azrul','Azry','Azuan',
+        'Badri','Badrullesham','Baharin','Baharuddin','Bahrul','Bakri','Basaruddin','Basiran','Basirin','Basri','Basyir','Bazli','Borhan','Buang','Budi','Bukhari','Bukharudin','Bustaman','Buyung',
+        'Chailan',
+        'Dahalan','Dailami','Dan','Danial','Danie','Daniel','Danien','Danish','Darimin','Darul','Darus','Darwisy','Dhiyaulhaq','Diah','Djuhandie','Dolbahrin','Dolkefli','Dzikri','Dzul','Dzulfahmi','Dzulfikri','Dzulkarnaen',
+        'Eazriq','Effendi','Ehza','Eizkandar','Ekhsan','Elyas','Enidzullah','Ezam','Ezani',
+        'Fadhil','Fadly','Fadzil','Fadziruddin','Fadzli','Fahmi','Faiq','Fairuz','Faisal','Faiz','Faizal','Faizurrahman','Fakhrul','Fakhrullah','Farham','Farhan','Farid','Faris','Farisan','Fariz','Fasil','Fateh','Fathi','Fathuddin','Fathul','Fauzan','Fauzi','Fauzul','Fawwaz','Fazal','Fazly','Fazreen','Fazril','Fendi','Fikri','Fikrie','Fikrul','Firdaus','Fithri','Fitiri','Fitri','Fuad',
+        'Ghazali',
+        'Habib','Haddad','Hadi','Hadif','Hadzir','Haffize','Haffizi','Hafidzuddin','Hafis','Hafiy','Hafiz','Hafizan','Hafizhan','Hafizi','Hafizsyakirin','Hafizuddin','Haikal','Haiqal','Hairol','Hairollkahar','Hairuddin','Hairul','Hairun','Haisyraf','Haizan','Hakeem','Hakim','Hakimi','Hakimie','Halidan','Haliem','Halim','Hamdani','Hamidoon','Hamizan','Hamka','Hamzah','Hanafi','Hanif','Hanit','Hannan','Haqeem','Haqimie','Harez','Haris','Harith','Hariz','Harmaini','Harraz','Harun','Hasan','Hashim','Hasif','Hasnul','Hasrin','Hasrol','Hassan','Hasyim','Haszlan','Hayani','Hazim','Haziq','Haziqh','Hazrie','Hazrul','Hazwan','Hazzam','Helmy','Hermansah','Hidayat','Hidayatullah','Hilmi','Hisam','Hisammudin','Hisyam','Hj','Hoirussalam','Humadu','Hurmin','Husain','Husaini','Husnul','Hussein','Hussin','Huzaifi','Huzaimi','Huzzaini',
+        'Ibnu','Ibrahim','Idham','Idlan','Idris','Idrus','Idzwan','Ielman','Ighfar','Ihsan','Ikhmal','Ikhwan','Ikmal','Ilham','Ilhan','Illias','Ilman','Iman','Imran','Indra','Innamul','Iqbal','Iqwan','Iraman','Irfan','Irman','Irsyad','Isa','Ishak','Ishaq','Iskandar','Isma','Ismail','Ismaon','Isyraq','Iwan','Iyad','Izam','Izdihar','Izlan','Izuhail','Izwan','Izz','Izzan','Izzat','Izzikry','Izzuddin','Izzul',
+        'Ja\'afer','Jaf','Jaferi','Jafree','Jafri','Jahari','Jalani','Jamal','Jamali','Jamalludin','Jamaluddin','Jamekon','Jamil','Jamsare','Jani','Jasin','Jasni','Jebat','Jefrie','Johari','Joharudin','Jumat','Junaidi',
+        'Kamal','Kamaruddin','Kamarudin','Kamarul','Kamaruzain','Kamaruzaman','Kamaruzzaman','Kasim','Kasturi','Kemat','Khadzromi','Khairi','Khairil','Khairin','Khairiz','Khairol','Khairubi','Khairudin','Khairul','Khairulnizam','Khairun','Khairurrazi','Khalilul','Khasmadi','Khasri','Khatta','Khirul','Khoirul','Kholis','Khusaini','Khuzairey','Kutni',
+        'Latiff','Lazim','Lokman','Loqman','Lufty','Lukman','Luqman','Luqmanul','Luthfi','Luthfie',
+        'M.','Maamor','Madfaizal','Mahadhir','Mahatdir','Mahmusin','Mansor','Marlizam','Martonis','Mastura','Mat','Mazlan','Mazmin','Mazwan','Md','Md.','Megat','Meor','Midoon','Mie','Mikhail','Mirza','Misbun','Miskan','Misran','Miza','Mohlim','Mohmad','Mokhtar','Mokhzani','Moktar','Mu\'izzuddin','Muazzam','Mubarak','Muhaimen','Muhaimi','Muhammad','Muhd','Muid','Muizzuddin','Muizzudin','Mukhtar','Mukhriz','Mukminin','Murad','Murshid','Mus\'ab','Musa','Musiran','Muslim','Mustafa','Mustain','Mustaqim','Musyrif','Muszaphar','Muzami','Muzamil','Muzhafar','Muzzammil',
+        'Na\'imullah','Nabil','Naderi','Nadzeri','Naim','Najhan','Najib','Najmi','Nakimie','Naqib','Naqiuddin','Narul','Nasaruddin','Nashrul','Nasimuddin','Nasir','Nasiruddin','Nasri','Nasrizal','Nasruddin','Nasrul','Nasrullah','Naufal','Nawawi','Nazari','Nazaruddin','Nazarul','Nazeem','Nazeri','Nazhan','Nazim','Nazlan','Nazmi','Nazren','Nazri','Nazril','Nazrin','Nazrul','Nazzab','Ngadinin','Ngasiman','Ngatri','Nik','Nizam','Nizan','Nizar','Noor','Noordin','Noorizman','Nor','Norain','Norazman','Norazmi','Nordanish','Nordiarman','Nordin','Norfadli','Norfahmi','Norhakim','Norhan','Norhisham','Norsilan','Nur','Nur\'irfaan','Nurakmal','Nurhanafi','Nurhazrul','Nurul','Nuwair','Nuzrul','Nuzul',
+        'Omar','Omri','Osama','Osman','Othman',
+        'Pauzi','Puadi','Putra',
+        'Qairil','Qays','Qusyairi',
+        'R','Radin','Radzi','Radzuan','Rafael','Raffioddin','Rafiee','Rafiq','Rafizal','Rahim','Raihan','Raja','Rakmat','Ramdan','Ramlan','Ramli','Rash','Rashdan','Rashid','Rashidi','Rasid','Raulah','Rausyan','Razak','Razali','Razemi','Razif','Razlan','Razuan','Redzuan','Redzuawan','Redzwan','Rehan','Rehman','Rezal','Ridhuan','Ridwan','Ridza','Ridzuan','Ridzwan','Rifqi','Rizal','Rizli','Rohaizad','Rohaizal','Rohman','Roosmadi','Roseli','Roslan','Roslee','Rosli','Roslin','Rosman','Rosnan','Rossafizal','Rozi','Rukaini','Rukmanihakim','Ruknuddin','Ruslan','Rusli','Rusman',
+        'S.rozli','Sabana','Sabqi','Sabri','Sadili','Sadri','Saf\'han','Saffrin','Safie','Safiy','Safrizal','Safuan','Safwan','Sahamudin','Saharil','Said','Saidan','Saidin','Saif','Saiful','Saifullah','Saifullizan','Saipol','Sakri','Salamon','Salihin','Salimi','Salleh','Samad','Samani','Sameer','Samiun','Samsul','Samsur','Sanorhizam','Sardine','Sarudin','Sarwati','Saufishazwi','Sazali','Selamat','Senon','Shafarizal','Shafie','Shafiq','Shah','Shahamirul','Shaharudin','Shaheila','Shaheizy','Shahfiq','Shahmi','Shahnon','Shahquzaifi','Shahril','Shahrin','Shahrizal','Shahrol','Shahru','Shahrul','Shahrulnaim','Shahrun','Shahrunizam','Shahzwan','Shaiful','Shaikh','Shakif','Shakir','Sham','Shameer','Shamhazli','Shamil','Shamizan','Shamizul','Shamsuddin','Shamsudin','Shamsul','Shamsuri','Shamsuzlynn','Shapiein','Sharafuddin','Shari','Sharif','Sharifuddin','Sharifudin','Sharil','Sharizal','Sharsham','Sharudin','Sharul','Shaugi','Shauqi','Shawal','Shazwan','Sheikh','Shmsul','Shohaimi','Shukri','Sirajuddin','Sofian','Sohaini','Solehen','Solekhan','Solleh','Sualman','Subbahi','Subkhiddin','Sudarrahman','Sudirman','Suhaimi','Sukarni','Sukhairi','Sukri','Sukymi','Sulaiman','Sulhan','Suzaili','Suzaman','Syafiq','Syahaziq','Syahid','Syahir','Syahmi','Syahrial','Syahriman','Syahru','Syahzuan','Syakir','Syakirin','Syakirul','Syamirul','Syamsol','Syaqirin','Syarafuddin','Syawal','Syawalludin','Syazani','Syazwan','Syed','Syid','Syukri','Syuqeri',
+        'Tajuddin','Takiudin','Talha','Tarmizi','Tasripin','Taufek','Taufik','Tayib','Termizi','Thalahuddin','Thaqif','Tunan',
+        'Umair','Umar','Usman',
+        'W','Wafi','Wafiq','Wan','Wazir','Wazzirul','Wi',
+        'Yani','Yaqzan','Yazid','Yunos','Yusaini','Yusfaisal','Yushafiq','Yusni','Yusof','Yusoff','Yusri','Yussof','Yusuf',
+        'Zabayudin','Zabidi','Zahari','Zahid','Zahiruddin','Zahrul','Zaid','Zaidi','Zainal','Zaini','Zainodin','Zainordin','Zainuddin','Zainul','Zairy','Zaiyon','Zakaria','Zaki','Zakii','Zakri','Zakwan','Zambri','Zamre','Zamri','Zamrul','Zan','Zaqiyuddin','Zar\'ai','Zarif','Zariq','Zarith','Zarul','Zaukepli','Zawawi','Zharaubi','Zikri','Zikril','Zikry','Zizi','Zol','Zolkifle','Zubair','Zubir','Zufayri','Zufrie','Zuheeryrizal','Zuhri','Zuki','Zul','Zulfadhli','Zulfadli','Zulfahmi','Zulfaqar','Zulfaqqar','Zulfikar','Zulhaikal','Zulhakim','Zulhakimi','Zulhelmi','Zulhilmi','Zulkapli','Zulkarnain','Zulkefli','Zulkfli','Zulkifli','Zulkipli','Zulman','Zuri'
+    );
+    protected static $firstNameFemaleMalay = array(
+        '\'Abidah','\'Alyaa','\'Aqilah','\'Atiqah','\'Afiqah','\'Alia','\'Aqilah','A\'ishah','A\'in','A\'zizah','Abdah','Abiatul','Adani','Adawiyah','Adha','Adharina','Adhwa','Adibah','Adilah','Adilla','Adina','Adini','Adira','Adlina','Adlyna','Adriana','Adzlyana','Afifa','Afifah','Afina','Afiqah','Afiza','Afrina','Afzan','Ahda','Aida','Aidatul','Aidila','Aifa','Aiman','Aimi','Aimuni','Ain','Aina','Ainaa','Ainaanasuha','Aini','Ainin','Ainn','Ainnaziha','Ainul','Ainun','Ainur','Airin','Aishah','Aisya','Aisyah','Aiza','Akmal','Aleeya','Aleeza','Aleya','Aleza','Alia','Aliaa','Aliah','Aliffa','Aliffatus','Alina','Alis','Alisya','Aliya','Alkubra','Alleisya','Ally','Alya','Alyaa','Amalia','Amalien','Amalin','Amalina','Amani','Amanina','Amiera','Aminy','Amira','Amirah','Amisha','Amrina','Amylia','Amyra','An-nur','Anas','Andani','Andi','Anesha','Ani','Aninafishah','Anis','Anisah','Anisha','Anissa','Aniza','Anna','Anne','Antaza','Aqeem','Aqeera','Aqila','Aqilah','Arfahrina','Ariana','Ariena','Ariessa','Arifah','Arina','Ariqah','Arissa','Arisya','Armira','Arwina','Aryani','Ashika','Ashriyana','Asiah','Asma\'rauha','Asmaa\'','Asmaleana','Asniati','Asnie','Asniza','Aswana','Asy','Asyiqin','Asykin','Athirah','Atifa','Atifah','Atifahajar','Atikah','Atiqa','Atiqah','Atirah','Atyqah','Auni','Awatif','Awatiff','Ayesha','Ayu','Ayuni','Ayunie','Az','Azashahira','Aziah','Aziemah','Azika','Azira','Azizah','Azliah','Azliatul','Azlin','Azlina','Azmina','Azni','Azrah','Azrina','Azua','Azuin','Azwa','Azwani','Azyan','Azyyati',
+        'Badrina','Bahirah','Balqis','Basyirah','Batrisya','Batrisyia','Bilqis','Bismillah',
+        'Camelia','Cempaka',
+        'Dalila','Dalili','Damia','Dania','Danish','Darlina','Darwisyah','Deni','Dhani','\'Dhiya','Diana','Dianah','Dini','Diyana','Diyanah','Dylaila',
+        'Eizzah','Eliya','Ellynur','Elpiya','Elyana','Elysha','Ema','Emylia','Erika','Eva','Ezzatul',
+        'Faathihah','Fadhilah','Fadzliana','Fahda','Fahimah','Fahira','Fairuz','Faizah','Faiznur','Faizyani','Fakhira','Falah','Faqihah','Fara','Faradieba','Farah','Faraheira','Farahin','Farahiyah','Farahtasha','Farha','Farhah','Farhana','Faridatul','Fariha','Farina','Farisah','Farisha','Farrah','Fartinah','Farzana','Fasehah','Fasha','Fateha','Fatehah','Fathiah','Fathiha','Fathihah','Fathimah','Fatiha','Fatihah','Fatimatul','Fatin','Fatini','Fauziah','Faza','Fazlina','Fezrina','Filza','Filzah','Firzanah','Fitrah','Fitri','Fitriah','Fizra',
+        'Hadfina','Hadiyatul','Hafezah','Hafidzah','Hafieza','Hafizah','Hahizah','Hajar','Hakimah','Halimatul','Halimatussa\'diah','Halisah','Hamira','Hamizah','Hana','Hanaani','Hanani','Hani','Hanim','Hanini','Hanis','Hanisah','Hanna','Hannan','Hannani','Hanni','Hanun','Harma','Hasmalinda','Hasya','Hasyimah','Hayani','Hayati','Hayatul','Hayaty','Hazira','Hazirah','Hazmeera','Hazwani','Hazwanie','Herlina','Herliyana','Hidayah','Hidzwati','Huda','Humaira','Hureen','Husna','Husnina',
+        'Ida','Iffah','Iklil','Ili','Ilyana','Iman','Imelda','Insyira','Insyirah','Intan','\'Irdhina','Irdina','\'Irdina','Irsa','Iryani','\'Isdmah','Islamiah','Isnur','Izaiti','Izati','Izatie','Izatul','Izaty','Izlin','\'Izzah','Izzah','Izzani','Izzati','Izzatul','Izzaty','Izziani',
+        'Jaf','Jajuenne','Jani','Jannah','Jannatul','Jaslina','Jihan','Ju','Julia','Juliana','Juliya',
+        'Kamarlia','Kamelia','Kausthar','Kauthar','Khadijah','Khahirah','Khairina','Khairun','Khairunisa','Khairunnisa','Khairunnisak','Khaleeda','Khaleisya','Khaliesah','Khalisa','Khodijah',
+        'Laila','Liana','Lina','Lisa','Liyana',
+        'Madihah','Maheran','Mahfuzah','Mahirah','Maisara','Maisarah','Maizatul','Malihah','Mardhiah','Mariam','Marina','Mariska','Marlina','Marni','Maryam','Mas','Mashitah','Masitah','Mastura','Maswah','Masyikah','Masyitah','Maszlina','Mawaddah','Maya','Mazdiyana','Mazlyn','Melisa','Melissa','Mimi','Mira','Mirsha','Miskon','Miza','Muazzah','Mumtaz','Mursyidah','Muti\'ah','Muyassarah','Muzainah','Mysara','Mysarah',
+        'Nabihah','Nabila','Nabilah','Nabilla','Nabillah','Nadhilah','Nadhirah','Nadhrah','Nadia','Nadiah','Nadiatun','Nadilla','Nadira','Nadirah','Nadwah','Nadzirah','Nafisah','Nafizah','Najah','Najian','Najiha','Najihah','Najla','Najwa','Najwani','Naliny','Naqibahuda','Nashrah','Nashuha','Nasliha','Nasrin','Nasuha','Natasa','Natasha','Natasya','Nathasa','Natrah','Naurah','Nayli','Nazatul','Nazihah','Nazira','Nazirah','Nazura','Nazurah','Nikmah','Nina','Nisa','Nisak','Nisrina','Noorain','Noorazmiera','Noorfarzanah','Noornazratul','Norafizah','Norain','Noraisyah','Noralia','Noranisa','Noratasha','Nordhiya','Nordiana','Norelliana','Norerina','Norfaezah','Norfahanna','Norhafiza','Norhamiza','Norhidayah','Noridayu','Norliyana','Norsakinah','Norshaera','Norshahirah','Norshuhailah','Norsolehah','Norsuhana','Norsyafiqah','Norsyahirah','Norsyamimie','Norsyarah','Norsyazmira','Norsyazwani','Norsyuhada','Norul','Noryshah',
+        'Nuradilah','Nurafifah','Nurafrina','Nurain','Nuraina','Nuralia','Nuraliah','Nuralifah','Nuralya','Nurani','Nuranisya','Nuraqilah','Nurarisha','Nurasyikin','Nuratiqah','Nuraveena','Nureen','Nurfaatihah','Nurfadlhlin','Nurfaizah','Nurfarah','Nurfarahin','Nurfarhana','Nurfarrah','Nurfatehah','Nurfatiha','Nurfatin','Nurfirzanah','Nurfitrah','Nurfizatul','Nurhafizah','Nurhajar','Nurhani','Nurhanida','Nurhanis','Nurhanisah','Nurhanna','Nurhawa','Nurhazwani','Nurhazzimah','Nurhidayah','Nurhidayatul','Nurhuda','Nurilyani','Nurin','Nurjazriena','Nurmuzdalifah','Nurnajiha','Nurnatasha','Nurnazhimah','Nurnazhirah','Nurqurratuain','Nursabrina','Nursahira','Nursarah','Nursarwindah','Nursham','Nurshammeza','Nursofiah','Nursuhaila','Nursyaffira','Nursyafika','Nursyahindah','Nursyakirah','Nursyarina','Nursyazwani','Nursyazwina','Nursyuhadah','Nurulhuda','Nurulsyahida','Nurun','Nurwadiyah','Nurwahidah','Nurzafira','Nurzarith','Nurzulaika',
+        'Pesona','Puteri','Putri',
+        'Qairina','Qamarina','Qasrina','Qhistina','Qistina','Quintasya','Qurratu','Qurratuaini','Qurratul',
+        'Rabi\'atul','Rabiatul','Rafidah','Rahiemah','Rahmah','Raihah','Raihana','Raihanah','Raja','Rashmi','Rasyaratul','Rasyiqah','Rasyiqqah','Raudatul','Ridiatul','Rieni','Rifhan','Rihhadatul','Ros','Rosalinda','Rosyadah','Rusyda','Rusydina',
+        'Sa\'adah','Saadiah','Sabrina','Safi','Safiah','Safiyah','Sahira','Saidatul','Sakinah','Sakirah','Salwa','Sameera','Sarah','Sarwati','Sasya','Serene','Sha','Shabariah','Shafiah','Shafiera','Shafikah','Shafinaz','Shafiqa','Shafiqah','Shah','Shahida','Shahidah','Shahiera','Shahila','Shahira','Shahirah','Shahrazy','Shahrina','Shakilah','Shakinah','Shalina','Shameera','Shamila','Shamimie','Shamira','Shar\'fiera','Sharifah','Sharizah','Shauqina','Shayira','Shazana','Shazieda','Shazlien','Shazwana','Shazwani','Shonia','Shuhada','Siti','Siti','Siti','Siti','Siti','Siti','Sitti','Sofea','Sofeah','Soffia','Sofia','Sofiya','Sofiyah','Sofya','Solehah','Sopie','Suaidah','Suhada','Suhadah','Suhaida','Suhaila','Suhailah','Suhaina','Suhana','Suhani','Sulaiha','Sumayyah','Suraya','Suziyanis','Syaffea','Syafika','Syafikah','Syafina','Syafiqa','Syafiqah','Syafirah','Syafiyah','Syafiyana','Syahada','Syahadatullah','Syahera','Syaherah','Syahidah','Syahidatul','Syahiera','Syahira','Syahirah','Syahmimi','Syahmina','Syahzani','Syaidatul','Syairah','Syakila','Syakira','Syakirah','Syamien','Syamilah','Syamimi','Syamina','Syamirah','Syara','Syarafana','Syarafina','Syarah','Syarina','Syasyabila','Syauqina','Syaza','Syazana','Syazliya','Syazmin','Syazryana','Syazwana','Syazwani','Syazwanie','Syazwina','Syifa\'','Syuhada','Syuhada`','Syuhaida','Syuhaidah',
+        'Taqiah','Tasnim','Tengku','Tihany',
+        'Umairah','Umi','Umira','Ummi',
+        'Wadiha','Wafa','Waheeda','Wahida','Wahidah','Wan','Wardatul','Wardina','Wardinah','Wazira','Weni',
+        'Yasmeen','Yasmin','Yetri','Yunalis','Yusra','Yusrinaa','Yusyilaaida',
+        'Zaffan','Zafirah','Zaharah','Zahirah','Zahrah','Zahrak','Zaidalina','Zaidatulkhoiriyah','Zainab','Zainatul','Zakdatul','Zatalini','Zati','Zayani','Zeqafazri','Zilhaiza','Zubaidah','Zulaika','Zulaikha'
+    );
+    protected static $lastNameMalay = array(
+        '\'Aizat','A\'liyyuddin','Abas','Abdillah','Abdullah','Abidin','Adam','Adha','Adham','Adi','Adieka','Adip','Adli','Adnan','Adrus','Afandi','Afiq','Afizi','Afnan','Afsyal','Ahmad','Ahwali','Aidi','Aidil','Aiman','Aizad','Aizam','Aizat','Ajllin','Ajmal','Akashah','Akasyah','Akbar','Akhmal','Akid','Akif','Akmal','Al-amin','Al-hakim','Albukhary','Ali','Alias','Alif','Alimi','Aliuddin','Amaluddin','Amin','Aminnudin','Aminrullah','Aminuddin','Amiran','Amiruddin','Amirul','Amirullah','Ammar','Ammer','Amni','Amran','Amri','Amry','Amsyar','Amzah','Anam','Anaqi','Andalis','Anuar','Anwar','Apizan','Aqashah','Aqil','Arfan','Arfandi','Arias','Arief','Arif','Ariff','Ariffin','Arifin','Arifuddin','Arman','Arshad','Arziman','As','Asa','Ashraf','Ashraff','Asmadi','Asmar','Asmawi','Asri','Asyraf','Asyran','Asyrani','Aszahari','Awal','Awalluddin','Awaluddin','Awaludin','Awira','Ayyadi','Azahar','Azahari','Azam','Azhan','Azhar','Azhari','Azim','Aziz','Azizan','Azizi','Azizy','Azlan','Azlansyhah','Azli','Azlim','Azman','Azmee','Azmi','Azmin','Aznai','Azni','Azraai','Azrai','Azri','Azril','Azrin','Azriq','Azrul','Azuan',
+        'Badrulhisham','Baha','Bahaman','Bahari','Baharin','Baharruddin','Baharuddin','Baharudin','Bahri','Bahrin','Bahrodin','Bakar','Bakri','Bakry','Bakti','Basaruddin','Bashah','Basri','Basyir','Batisah','Bella','Berman','Borhan','Buhari','Bukhari',
+        'Chai',
+        'Dahalan','Dahari','Dahlan','Daiman','Daneal','Daniael','Danial','Daniel','Danish','Darmawi','Daryusman','Daud','Dazila','Din','Dini','Djuhandie','Dolkefli','Draman','Dzikri','Dzolkefli','Dzulkifli','Dzullutfi',
+        'Effendi','Effindi','Ekhsan','Elfin','Erfan',
+        'Fadhil','Fadhilah','Fadil','Fadillah','Fadlullah','Fadzil','Faez','Fahi','Fahim','Fahmi','Fahmie','Fairos','Fairuz','Faiser','Faiz','Faizal','Faizul','Faizun','Fakhri','Fakhrurrazi','Fareesnizra','Fareez','Farhan','Farid','Farihan','Faris','Farris','Fathi','Fatullah','Faudzi','Fauzi','Fauzy','Fayyad','Fazal','Fazil','Fazira','Fikri','Firdaus','Firdoz','Fiteri','Fitri','Fuad','Fuart','Fuzi',
+        'Garapar','Ghani','Ghazi',
+        'Haddi','Hadi','Hadzis','Haeizan','Hafandi','Hafiz','Hafizam','Hafizee','Hafizh','Hafizi','Hafizuddin','Haidie','Haikal','Haiqal','Hairizan','Hairuddin','Hairulnizam','Hairunnezam','Haizam','Haizan','Hajar','Hakam','Hakiem','Hakim','Hakimi','Hakimie','Halib','Halil','Halim','Halin','Hamdan','Hamdani','Hamid','Hamidi','Hamizie','Hamizuddin','Hamjah','Hammani','Hamzah','Hanafi','Hanafia','Hanief','Hanif','Hanifah','Haniff','Hanim','Hapani','Haqim','Haqimi','Haramaini','Hardinal','Hariff','Haris','Harith','Hariz','Harmaini','Harman','Haron','Harris','Haruddin','Harun','Hasadi','Hasan','Hasbi','Hasbullah','Hashan','Hasif','Hasim','Hasmawi','Hasnan','Hasri','Hassan','Hassim','Hassimon','Haszlan','Hazambi','Hazaril','Hazim','Hazimie','Haziq','Hazizan','Hazlin','Hazre','Hazrin','Hazrol','Helmi','Hi\'qal','Hikmee','Hilmi','Hisam','Hisham','Hishhram','Hizam','Husaini','Husin','Husna','Husni','Hussin','Huzaify','Huzain',
+        'Ibrahim','Idham','Idris','\'Iffat','Ifwat','Ikhmal','Ikhram','Ikhwan','Ikmal','Ikram','Ilman','Iman','Imran','Imtiyaz','Iqbal','Iqmal','Irfan','Irham','Irsyad','Is\'ad','Isa','Isfarhan','Ishak','Ishsyal','Iskandar','Ismadi','Ismail','Ismayudin','Isroman','Isyrafi','Izad','Izam','Izani','Izman','Izwan','Izzat','Izzuddin','Izzudin',
+        'Jainal','Jaini','Jamahari','Jamal','Jamaluddin','Jamaludin','Jaman','Jamri','Jani','Jasni','Jaya','Jeffri','Jefri','Jelani','Jemadin','Johan','Johari','Juhari','Jumat','Junaidi',
+        'Kahar','Kamal','Kamaruddin','Kamarudin','Kamarul','Kamaruzaman','Kamil','Kamslian','Karzin','Kasim','Kasturi','Khafiz','Khairani','Khairuddin','Khaleed','Khaliq','Khan','Kharmain','Khatta','Khilmi','Khir-ruddin','Khirulrezal','Khusaini',
+        'Latif','Latip','Lazim','Lukman',
+        'Maarof','Mahadi','Mahat','Mahathir','Mahmudin','Mahmusin','Mahyuddin','Mahyus','Majid','Malek','Malik','Maliki','Mamhuri','Man','Manaf','Manan','Manap','Mansor','Margono','Martunus','Maruzi','Marzuki','Maserun','Maskor','Maslan','Maswari','Maszuni','Mazalan','Mazlan','Midali','Mikhail','Mirza','Miskan','Miskoulan','Mislan','Misnan','Mizan','Mohhidin','Mohsin','Mokhtar','Moktar','Molkan','Mon','Montahar','Mossanif','Mu','Muaddib','Muain','Muhaimi','Muhaimin','Muhdi','Muiz','Mujamek','Mukmin','Mukromin','Muneer','Muqriz','Murad','Murshed','Murshidi','Musa','Muslim','Musliman','Mustafa','Mustapha','Mustaqim','Musyrif','Mutaali','Mutalib','Muti\'i','Muzamil','Muzammil',
+        'Na\'im','Nabil','Nadzri','Nafiz','Naim','Najhi','Najib','Najmi','Najmuddin','Naqiyuddin','Nasaruddin','Nashriq','Nasiman','Nasir','Nasrodin','Nasrullah','Naufal','Nawawi','Nazairi','Nazar','Nazarudin','Nazeri','Nazhan','Nazirin','Nazmi','Nazree','Nazri','Nazrin','Nazry','Ngadenan','Ngadun','Niszan','Nizam','Noh','Noor','Noordin','Noorhakim','Noorismadi','Noorizman','Nor','Noradhzmi','Noraffendi','Noraslan','Norazam','Norazim','Norazman','Norazmi','Nordin','Norhisam','Norhisham','Norizal','Norizan','Norlisam','Normansah','Norrizam','Norsilan','Norzamri','Nurfairuz','Nurhaliza','Nurnaim',
+        'Omar','Osman','Othman',
+        'Pa\'aing','Pauzi','Pisol','Putra','Putra',
+        'Qayum','Qayyum','Qayyuum','Qusyairi',
+        'Ra\'ais','Radzi','Raffioddin','Raffiq','Rafi','Rafizal','Rahamad','Rahim','Rahman','Rahmat','Rais','Raizal','Raman','Ramdan','Ramdzan','Ramlan','Ramlee','Ramli','Ramly','Rani','Ranjit','Raqi','Rashid','Rashidi','Rashidin','Rasid','Rassid','Rasyid','Razak','Razali','Raze','Razi','Razin','Razlan','Razman','Redha','Redzuan','Rembli','Remi','Ridduan','Ridhwan','Ridzuan','Ridzwan','Rifin','Rifqi','Rifqie','Rithwan','Rizal','Rizuan','Rizwan','Robani','Rohaizan','Rohem','Rohman','Ros','Rosdan','Roshman','Roslan','Roslee','Rosli','Rosly','Rosmawi','Rosnan','Rossaimi','Rostam','Rostan','Roszainal','Rozi','Rubi','Rusdi','Ruslan','Rusli','Rustam','Rusyaidi',
+        'Sa\'ari','Saad','Sabaruddin','Sabarudin','Sabki','Sabri','Sabrie','Safee','Saffuan','Safie','Safingi','Safrifarizal','Safrizal','Safwan','Sahidi','Sahril','Sahroni','Saifuddin','Saifudin','Saifulzakher','Saifuzin','Saihun','Saizol','Sakdon','Sakri','Salam','Saleh','Salehudin','Salim','Salleh','Salman','Sam','Samad','Samae','Samah','Saman','Samsani','Samsuddin','Samsul','Samsuri','Sandha','Sani','Sanorhizam','Sapuan','Sarim','Satar','Saudi','Sazali','Sedek','Selamat','Senon','Sha\'ril','Shabana','Shafei','Shafie','Shafiq','Shah','Shaharuddin','Shaharudin','Shahiman','Shahrazy','Shahrizan','Shaidi','Shaifuddin','Shaihuddin','Sham','Shameer','Shamizan','Shamsuddin','Shamsudin','Shamsul','Shapiein','Sharasan','Sharif','Sharifudin','Shariman','Sharin','Sharollizam','Sharum','Shazani','Shazman','Shmsul','Shobi','Shueib','Shukor','Shukri','Sidek','Sinuzulan','Soberi','Sobirin','Sofi','Solehin','Solekhan','Sonan','Suami','Subhi','Subzan','Sudirman','Sueib','Sufi','Sufian','Suhaimi','Suhiman','Sukarsek','Sulaiman','Sulong','Suraji','Surya','Sutrisno','Suz\'ian','Suzaimi','Syafiq','Syafrin','Syahir','Syahmi','Syahril','Syahrin','Syakir','Syamil','Syauqi','Syazwan','Syukran','Syukri','Syuraih',
+        'Tajudin','Takiudin','Talib','Taqiuddin','Tarjuddin','Tarmizi','Tarudin','Taufek','Thaqif','Tuah','Tukimin','Tumiran',
+        'Ubaidillah','Ulum','Umar','Usman','Usri','Uzair',
+        'Wafi','Wahab','Wahbillah','Wahid','Wahidan','Wahidin','Wardi','Wasil','Wazif','Wildani',
+        'Ya\'accob','Yaacob','Yaakob','Yaacup','Yacob','Yahaya','Yahya','Yajid','Yamani','Yanis','Yaqin','Yasin','Yazid','Yunus','Yusaini','Yusihasbi','Yusni','Yusof','Yusoff','Yusri','Yusrin','Yusseri','Yussof','Yusuf','Yuszelan','Yuzli',
+        'Zafran','Zahani','Zahar','Zahareman','Zahari','Zahin','Zaid','Zaidi','Zailan','Zailani','Zaimi','Zaiminuddin','Zain','Zainal','Zaini','Zainorazman','Zainordin','Zainuddin','Zainudin','Zainul-\'alam','Zainun','Zainuri','Zairi','Zairulaizam','Zakaria','Zaki','Zakir','Zakuan','Zakwan','Zam','Zamanhuri','Zamani','Zamhari','Zamran','Zamre','Zamree','Zamri','Zamzuri','Zani','Zar\'ai','Zawawi','Zawi','Zazlan','Zehnei','Zhafran','Zihni','Zikry','Zin','Zizi','Zol','Zolkafeli','Zolkifli','Zuanuar','Zubair','Zubir','Zufayri','Zuhaili','Zuki','Zukri','Zulamin','Zulfadhli','Zulfikar','Zulfikri','Zulhazril','Zulhelmi','Zulkafli','Zulkanine','Zulkarnaen','Zulkefle','Zulkefli','Zulkernain','Zulkhairie','Zulkifli','Zulqurnainin','Zumali','Zuraidi','Zuri','Zuwairi',
+    );
+    
+    /**
+     * Note: The empty elements are for names without the title, chances increase by number of empty elements.
+     * 
+     * @link https://en.wikipedia.org/wiki/Muhammad_(name)
+     */
+    protected static $muhammadName = array('', '', '', '', 'Mohamad ','Mohamed ','Mohammad ','Mohammed ','Muhamad ','Muhamed ','Muhammad ','Muhammed ','Muhammet ','Mohd ');
+    /**
+     * 
+     * @link https://en.wikipedia.org/wiki/Noor_(name)
+     */
+    protected static $nurName = array('', '', '', '', 'Noor ', 'Nor ', 'Nur ', 'Nur ', 'Nur ', 'Nurul ','Nuur ');
+
+    /**
+     * @link https://en.wikipedia.org/wiki/Malaysian_names#Haji_or_Hajjah
+     */
+    protected static $haji = array('', '', '', '', 'Haji ', 'Hj ');
+    protected static $hajjah = array('', '', '', '', 'Hajjah ', 'Hjh ');
+
+    /**
+     * @link https://en.wikipedia.org/wiki/Malay_styles_and_titles
+     */
+    protected static $titleMaleMalay = array('', '', '', '', '', '', 'Syed ','Wan ','Nik ','Che ');
+
+    /**
+     * Chinese family name or surname
+     * 
+     * @link https://en.wikipedia.org/wiki/List_of_common_Chinese_surnames
+     * @link https://en.wikipedia.org/wiki/Hundred_Family_Surnames
+     * 
+     */
+    protected static $lastNameChinese = array(
+        'An','Ang','Au','Au-Yong','Aun','Aw',
+        'Bai','Ban','Bok','Bong',
+        'Ch\'ng','Cha','Chai','Cham','Chan','Chang','Cheah','Cheam','Chee','Chen','Cheng','Cheok','Cheong','Chew','Chia','Chiam','Chiang',
+        'Chieng','Chiew','Chin','Ching','Chong','Choong','Chou','Chow','Choy','Chu','Chua','Chuah','Chung',
+        'Dee','Die','Ding',
+        'Ee','En','Eng','Er','Ewe',
+        'Fam','Fan','Fang','Feng','Foo','Foong',
+        'Gan','Gao','Gee','Gnai','Go','Goh','Gong','Guan','Gun',
+        'H\'ng','Hang','Hao','Haw','Hee','Heng','Hew','Hiew','Hii','Ho','Hoo','Hong','Hooi','Hui',
+        'Jong',
+        'Kam','Kang','Kar','Kee','Khoo','Khor','Khu','Kia','Kim','King','Ko','Koay','Koh','Kok','Kong','Kow','Kwok','Kwong','Ku','Kua','Kuan','Kum',
+        'Lah','Lai','Lam','Lau','Law','Leau','Lee','Leng','Leong','Leow','Leung','Lew','Li','Lian','Liang','Liao','Liew','Lim','Ling','Liong','Liow',
+        'Lo','Loh','Loi','Lok','Loke','Loo','Looi','Low','Lu','Luo','Lum','Lye',
+        'Ma','Mah','Mak','Meng','Mok',
+        'Neo','Neoh','New','Ng','Nga','Ngan','Ngeh','Ngeow','Ngo','Ngu','Nguei','Nii',
+        'Ong','Oo','Ooi','Oon','Oong','OuYang',
+        'P\'ng','Pang','Phang','Phoon','Phor','Phua','Phuah','Poh','Poon',
+        'Qian','Qu','Quah','Quak','Quan','Quek',
+        'Sam','Sau','Seah','See','Seetho','Seng','Seoh','Seow','Shee','Shi','Shum','Sia','Siah','Siao','Siauw','Siaw','Siew','Sim','Sin','Sio','Siong','Siow','Siu','Soh','Song','Soo','Soon','Su','Sum',
+        'T\'ng','Tai','Tam','Tan','Tay','Tang','Tea','Tee','Teh','Tek','Teng','Teo','Teoh','Tern','Tew','Tey','Thang','Thew','Thong','Thoo','Thum','Thun','Ting','Tiong','Toh','Tong','Tse','Tung',
+        'Vong',
+        'Wah','Waiy','Wan','Wee','Wen','Wong','Woo','Woon','Wu',
+        'Xia','Xiong','Xu',
+        'Yam','Yao','Yiaw','Ying','Yip','Yang','Yap','Yau','Yee','Yen','Yeo','Yeoh','Yeong','Yeow','Yep','Yew','Yong','Yow','You','Yu','Yuan','Yuen',
+        'Zhong','Zhang','Zheng','Zhu','Zu'
+    );
+
+    /**
+     * Chinese second character
+     * 
+     * @link https://en.wikipedia.org/wiki/Chinese_given_name
+     * @link https://en.wikipedia.org/wiki/List_of_Malaysians_of_Chinese_descent
+     * @link https://en.wikipedia.org/wiki/Category:Malaysian_people_of_Cantonese_descent
+     * @link https://en.wikipedia.org/wiki/Category:Malaysian_politicians_of_Chinese_descent
+     */
+    protected static $firstNameChinese = array(
+        'Ah','Ai','Aik','An','Ann','Ang','Au','Aun','Aw',
+        'Bae','Bai','Bak','Ban','Bang','Bao','Bau','Bee','Beh','Bei','Ben','Beng','Bi','Bik','Bin','Bing','Bo','Bok','Bong','Boo','Boon','Bow','Bu','Bui','Buk','Bun','Bung',
+        'Cai','Car','Caw','Cee','Ceh','Cek','Cen','Cer',
+        'Cha','Chah','Chai','Chak','Cham','Chan','Chang','Chao','Chap','Char','Chat','Chau','Chaw',
+        'Chea','Cheah','Cheam','Chean','Cheang','Chee','Cheen','Chek','Chen','Cheng','Cheok','Cheong','Cher','Chet','Chew',
+        'Chi','Chia','Chih','Chik','Chin','Ching','Chio','Chit','Chiu',
+        'Cho','Choi','Chok','Chon','Chong','Choo','Chooi','Choon','Choong','Chor','Chou','Chow','Choy',
+        'Chu','Chua','Chuah','Chuan','Chua','Chui','Chuk','Chum','Chun','Chung','Chuo','Chye',
+        'Da','Dai','Dan','Dang','Dao','Dau','Dee','Deng','Di','Dim','Din','Ding','Diong','Do','Dong','Doo','Dou','Du','Dui','Duo',
+        'Ee','Eh','En','Enn','Er','Ern','Eu','Ew',
+        'Fa','Fah','Fai','Fam','Fan','Fang','Fat','Fatt','Fay','Faye','Fee','Fei','Fen','Feng','Fern','Fey','Fok','Fon','Fong','Foo','Foon','Foong','Fu','Fui','Fuk','Fun','Fung',
+        'Gai','Gak','Gam','Gan','Gao','Gau','Gee','Gek','Geng','Gi','Giap','Gin','Git','Go','Goh','Gok','Gon','Gong','Goo','Goon','Gu','Gui','Guk','Gun','Gung','Gunn',
+        'Ha','Haa','Hah','Hai','Han','Hang','Hao','Har','Haw','He','Hee','Hei','Hen','Heng','Heong','Her','Hew','Hi','Hii','Hin','Hing','Hiong','Hiu',
+        'Ho','Hoe','Hoi','Hok','Hom','Hon','Hong','Hoo','Hooi','Hook','Hoon','Hoong','Hor','Hou','How','Hoy','Hu','Hua','Huan','Huang','Hue','Hui','Hun','Hung','Huo','Hup',
+        'Jan','Jang','Jao','Jee','Jei','Jen','Jeng','Jeong','Jer','Jet','Jett','Jeu','Ji','Jia','Jian','Jiang','Jie','Jien','Jiet','Jim','Jin','Jing','Jio','Jiong','Jit','Jiu',
+        'Jo','Joe','Jong','Joo','Joon','Joong','Joy','Ju','Jun','Jung','Jye',
+        'Ka','Kaa','Kah','Kai','Kak','Kam','Kan','Kang','Kao','Kap','Kar','Kat','Kau','Kaw','Kay','Ke','Kean','Keang','Keat','Kee','Kei','Kek','Ken','Keng','Ker','Keu','Kew','Key',
+        'Kha','Khai','Khan','Khang','Khar','Khaw','Khay','Khean','Kheang','Khee','Khi','Khia','Khian','Khiang','Kho','Khoh','Khoi','Khoo','Khor','Khu','Khum','Khung',
+        'Ki','Kia','Kian','Kiang','Kiap','Kiat','Kien','Kiet','Kim','Kin','King','Kit','Ko','Koe','Koh','Koi','Kok','Kong','Koo','Koong','Koor','Kor','Kou','Kow','Koy',
+        'Ku','Kua','Kuang','Kui','Kum','Kun','Kung','Kuo','Kuong','Kuu',
+        'La','Lai','Lak','Lam','Lan','Lang','Lao','Lap','Lar','Lat','Lau','Law','Lay',
+        'Le','Lea','Lean','Leang','Leat','Lee','Leen','Leet','Lei','Lein','Leik','Leiu','Lek','Len','Leng','Leon','Leong','Leow','Ler','Leu','Leung','Lew','Lex','Ley',
+        'Li','Liah','Lian','Liang','Liao','Liat','Liau','Liaw','Lie','Liek','Liem','Lien','Liet','Lieu','Liew','Lih','Lik','Lim','Lin','Ling','Lio','Lion','Liong','Liow','Lip','Lit','Liu',
+        'Lo','Loh','Loi','Lok','Long','Loo','Looi','Look','Loon','Loong','Lor','Lou','Low','Loy',
+        'Lu','Lua','Lui','Luk','Lum','Lun','Lung','Luo','Lup','Luu',
+        'Ma','Mae','Mag','Mah','Mai','Mak','Man','Mang','Mao','Mar','Mat','Mau','Maw','May','Me','Mea','Mee','Meg','Meh','Mei','Mek','Mel','Men','Meu','Mew',
+        'Mi','Mie','Miin','Miing','Min','Ming','Miu','Mo','Moh','Moi','Mok','Mon','Mong','Moo','Moon','Moong','Mou','Mow','Moy','Mu','Mua','Mui','Mum','Mun','Muu',
+        'Na','Naa','Nah','Nai','Nam','Nan','Nao','Nau','Nee','Nei','Neng','Neo','Neu','New','Nga','Ngah','Ngai','Ngan','Ngao','Ngau','Ngaw','Ngo','Ngu','Ni','Nian','Niang','Niao','Niau','Nien','Nik','Nin','Niu','Nong','Nyet',
+        'Oh','Oi','Ong','Onn','Oo','Ooi',
+        'Pah','Pai','Pak','Pam','Pan','Pang','Pao','Pat','Pau','Paw','Pay','Peh','Pei','Peik','Pek','Pen','Peng','Pey',
+        'Phang','Pheng','Phong','Pik','Pin','Ping','Po','Poh','Pok','Pom','Pong','Pooi','Pou','Pow','Pu','Pua','Puah','Pui','Pun',
+        'Qi','Qin','Qing','Qiu','Qu','Quan','Quay','Quen','Qui','Quek','Quok',
+        'Rei','Ren','Rin','Ring','Rinn','Ron','Rong','Rou','Ru','Rui','Ruo',
+        'Sai','Sam','San','Sang','Say','Sha','Shak','Sham','Shan','Shang','Shao','Shar','Shau','Shaw','Shay','She','Shea','Shee','Shei','Shek','Shen','Sher','Shew','Shey','Shi','Shia','Shian','Shiang','Shiao','Shie','Shih','Shik','Shim','Shin','Shing','Shio','Shiu',
+        'Sho','Shok','Shong','Shoo','Shou','Show','Shu','Shui','Shuk','Shum','Shun','Shung','Shuo','Si','Sia','Siah','Siak','Siam','Sian','Siang','Siao','Siau','Siaw','Sien','Sieu','Siew','Sih','Sik','Sim','Sin','Sing','Sio','Siong','Siou','Siow','Sit','Siu',
+        'So','Soh','Soi','Sok','Son','Song','Soo','Soon','Soong','Sou','Sow','Su','Suan','Suang','Sue','Suen','Sui','Suk','Sum','Sun','Sung','Suo',
+        'Ta','Tai','Tak','Tam','Tan','Tang','Tao','Tar','Tat','Tatt','Tau','Tay','Tea','Teak','Tean','Tee','Teh','Tei','Tek','Ten','Teng','Teo','Teoh','Ter','Tet','Teu','Tew','Tey',
+        'Tha','Thai','Tham','Thang','Thau','Thay','Thee','Theo','Ther','Thew','They','Thia','Thian','Thien','Tho','Thok','Thong','Thoo','Thor','Thou','Thu','Thuk','Thum','Thung','Thur','Ti','Tia','Tiah','Tiak','Tiam','Tian','Tiang','Tiek','Tien','Tik','Tim','Tin','Ting','Tio','Tiong','Tiu',
+        'To','Toh','Tok','Tong','Too','Tor','Tou','Tow','Tu','Tuk','Tung',
+        'Ung',
+        'Vin','Von','Voon',
+        'Wa','Wah','Wai','Wan','Wang','Way','Wee','Wei','Wen','Weng','Wey','Whay','Whey','Wi','Win','Wing','Wo','Woh','Woi','Wok','Won','Wong','Woo','Woon','Wu','Wui',
+        'Xi','Xia','Xiah','Xian','Xiang','Xiao','Xiau','Xie','Xin','Xing','Xiong','Xiu','Xu','Xun',
+        'Yam','Yan','Yang','Yao','Yat','Yatt','Yau','Yaw','Ye','Yee','Yen','Yeng','Yeo','Yeoh','Yeong','Yep','Yet','Yeu','Yew','Yi','Yih','Yii','Yik','Yin','Ying','Yip','Yit','Yo','Yok','Yon','Yong','Yoo','You','Yow','Yu','Yuan','Yue','Yuen','Yuet','Yuk','Yun','Yung','Yup','Yut','Yutt',
+        'Za','Zai','Zang','Zao','Zau','Zea','Zeah','Zed','Zee','Zen','Zeng','Zeo','Zet',
+        'Zha','Zhai','Zhan','Zhang','Zhao','Zhau','Zhee','Zhen','Zheng','Zhet','Zhi','Zhong','Zhu','Zhung',
+        'Zi','Zia','Ziah','Ziak','Zian','Ziang','Ziao','Ziau','Zit','Zo','Zoe','Zou','Zu','Zui','Zuk','Zung',
+    );
+
+    /**
+     * Chinese male third character
+     * 
+     * @link https://en.wikipedia.org/wiki/Chinese_given_name
+     * @link https://en.wikipedia.org/wiki/List_of_Malaysians_of_Chinese_descent
+     * @link https://en.wikipedia.org/wiki/Category:Malaysian_people_of_Cantonese_descent
+     * @link https://en.wikipedia.org/wiki/Category:Malaysian_politicians_of_Chinese_descent
+     */
+    protected static $firstNameMaleChinese = array(
+        'Aik','Ang','Au','Aun',
+        'Bak','Ban','Bang','Bao','Bau','Ben','Beng','Bing','Bok','Bong','Boo','Boon','Bow','Buk','Bun','Bung',
+        'Chai','Chak','Chan','Chang','Chao','Chap','Chat','Chau','Chaw',
+        'Cheah','Chee','Cheen','Chek','Chen','Cheong','Cher','Chet','Chew',
+        'Chia','Chih','Chik','Chin','Ching','Chit','Chiu',
+        'Cho','Choi','Chok','Chon','Chong','Choo','Chooi','Choon','Choong','Chor','Chou','Chow','Choy',
+        'Chua','Chuah','Chuan','Chua','Chui','Chuk','Chum','Chun','Chung','Chuo','Chye',
+        'Dan','Dao','Dau','Dee','Deng','Di','Dim','Din','Diong','Dong','Dou','Du','Dui','Duo',
+        'Eu','Ew',
+        'Fai','Fam','Fat','Fatt','Fee','Feng','Fok','Fon','Fong','Foo','Foon','Foong','Fu','Fui','Fuk',
+        'Gai','Gak','Gam','Gan','Gao','Gau','Gee','Gek','Geng','Giap','Gin','Git','Go','Goh','Gok','Gon','Gong','Gu','Guk','Gun','Gung','Gunn',
+        'Hai','Han','Hang','Har','Haw','Hei','Hen','Heng','Hing',
+        'Ho','Hoe','Hoi','Hok','Hom','Hon','Hong','Hoo','Hook','Hoon','Hoong','Hor','Hou','How','Hoy','Hu','Huan','Huang','Hun','Hung','Huo','Hup',
+        'Jeong','Jer','Jet','Jett','Jeu','Ji','Jian','Jiang','Jiet','Jim','Jin','Jio','Jiong','Jit','Jiu','Jo','Joe','Joong','Jung','Jye',
+        'Kai','Kan','Kang','Kao','Kap','Kau','Kaw','Kean','Keang','Keat','Kek','Ken','Keng','Ker','Keu','Kew',
+        'Khai','Khan','Khang','Khaw','Khean','Kheang','Khia','Khian','Khiang','Kho','Khoh','Khoi','Khoo','Khu','Khung',
+        'Kia','Kian','Kiang','Kiap','Kiat','Kien','Kiet','Kin','King','Kit','Ko','Koi','Kok','Kong','Koo','Koong','Koor','Kou','Kow','Koy',
+        'Ku','Kuang','Kui','Kun','Kung','Kuo','Kuong','Kuu',
+        'Lak','Lam','Lang','Lao','Lap','Lar','Lat','Lau','Law',
+        'Lean','Leang','Leat','Lee','Leet','Leik','Leiu','Lek','Len','Leon','Leong','Leow','Leung','Lew','Lex',
+        'Liang','Liao','Liat','Liau','Liaw','Liek','Liem','Liet','Lieu','Liew','Lih','Lik','Lim','Lio','Lion','Liong','Liow','Lip','Lit','Liu',
+        'Lo','Loh','Loi','Lok','Long','Loo','Looi','Look','Loon','Loong','Lor','Lou','Low','Loy',
+        'Lu','Luk','Lum','Lun','Lung','Lup',
+        'Man','Mang','Mao','Mar','Mat','Mau','Maw','Mek','Men',
+        'Mo','Mok','Mon','Mong','Moong','Mou','Mow','Mu',
+        'Nam','Nan','Nau','Neng','Neo','Neu','Ngai','Ngao','Ngau','Ngaw','Ngo','Niao','Niau','Nien','Nik','Niu','Nyet',
+        'Oh','Oi','Ong','Onn','Oo',
+        'Pah','Pai','Pak','Pang','Pao','Pat','Pau','Paw','Pen','Peng',
+        'Phang','Pheng','Phong','Pok','Pou','Pow','Pu','Pua','Puah',
+        'Quan','Quen','Quek','Quok',
+        'Ren','Ron',
+        'Sai','Sam','San','Sang','Shak','Sham','Shang','Shao','Shau','Shaw','Shek','Shen','Shiang','Shih','Shik','Shim','Shing','Shio','Shiu',
+        'Sho','Shong','Shoo','Shou','Show','Shun','Shung','Shuo','Siam','Siang','Siau','Siaw','Sieu','Sih','Sik','Sing','Sio','Siong','Siou','Siow','Sit',
+        'Son','Song','Soon','Soong','Sou','Sow','Suang','Sum','Sung','Suo',
+        'Ta','Tak','Tan','Tang','Tao','Tar','Tat','Tatt','Tau','Teak','Tean','Tee','Teh','Tei','Tek','Ten','Teng','Teo','Teoh','Ter','Tet','Teu','Tew',
+        'Tha','Thai','Tham','Thang','Thau','Thay','Thee','Theo','Ther','Thew','They','Thian','Thien','Tho','Thok','Thong','Thoo','Thor','Thou','Thu','Thuk','Thum','Thung','Thur','Tiak','Tiam','Tian','Tiang','Tiek','Tien','Tik','Tim','Tin','Tio','Tiong','Tiu',
+        'To','Toh','Tok','Tong','Too','Tor','Tou','Tow','Tu','Tuk','Tung',
+        'Ung',
+        'Vin','Von',
+        'Wa','Wah','Wai','Wang','Way','Wee','Wei','Weng','Whay','Win','Wing','Wo','Woh','Woi','Wok','Won','Wong','Woo','Wu','Wui',
+        'Xiang','Xiong',
+        'Yang','Yao','Yat','Yatt','Yau','Yaw','Ye','Yeng','Yeo','Yeoh','Yeong','Yet','Yih','Yii','Yik','Yip','Yit','Yo','Yok','Yon','Yong','Yoo','You','Yow','Yu','Yuen','Yuet','Yuk','Yut','Yutt',
+        'Za','Zai','Zang','Zao','Zau','Zea','Zeah','Zed','Zee','Zen','Zeng','Zeo','Zet',
+        'Zha','Zhai','Zhan','Zhang','Zhao','Zhau','Zhee','Zheng','Zhet','Zhong','Zhu','Zhung',
+        'Ziak','Zian','Ziang','Ziao','Ziau','Zit','Zuk','Zung',
+    );
+
+    /**
+     * Chinese female third character
+     * 
+     * @link https://en.wikipedia.org/wiki/Chinese_given_name
+     * @link https://en.wikipedia.org/wiki/List_of_Malaysians_of_Chinese_descent
+     * @link https://en.wikipedia.org/wiki/Category:Malaysian_people_of_Cantonese_descent
+     * @link https://en.wikipedia.org/wiki/Category:Malaysian_politicians_of_Chinese_descent
+     */
+    protected static $firstNameFemaleChinese = array(
+        'Ai','An','Ann','Aw',
+        'Bae','Bai','Bee','Beh','Bei','Bi','Bik','Bin','Bui',
+        'Cai','Cee','Cen','Cham','Cheam','Chean','Cheang','Cheng','Cheok','Chi','Ching','Chio','Chu',
+        'Dai','Dang','Ding','Do','Doo',
+        'Ee','En','Enn','Er','Ern',
+        'Fah','Fan','Fang','Fay','Faye','Fei','Fen','Fern','Fey','Fong','Fun','Fung',
+        'Gi','Goo','Goon','Gui',
+        'Ha','Haa','Hah','Hao','He','Hee','Heong','Her','Hew','Hi','Hii','Hin','Hiong','Hiu','Hooi','Hua','Hue','Hui',
+        'Jan','Jang','Jao','Jee','Jei','Jen','Jeng','Jia','Jie','Jien','Jing','Jong','Joo','Joon','Joy','Ju','Jun',
+        'Ka','Kaa','Kah','Kak','Kam','Kar','Kat','Kay','Ke','Kee','Kei','Key',
+        'Kha','Khar','Khay','Khee','Khi','Khor','Khum',
+        'Ki','Kim','Koe','Koh','Kor','Kum','Kua',
+        'Lai','Lan','Lay',
+        'Le','Lea','Leen','Lei','Lein','Leng','Ler','Leu','Ley',
+        'Li','Liah','Lian','Lie','Lien','Lin','Ling',
+        'Lua','Lui','Luo','Luu',
+        'Ma','Mae','Mag','Mah','Mai','Mak','May','Me','Mea','Mee','Meg','Meh','Mei','Mel','Meu','Mew',
+        'Mi','Mie','Miin','Miing','Min','Ming','Miu','Moh','Moi','Moo','Moon','Moy','Mua','Mui','Mum','Mun','Muu',
+        'Na','Naa','Nah','Nai','Nao','Nee','Nei','New','Nga','Ngah','Ngan','Ngu','Ni','Nian','Niang','Nin','Nong',
+        'Ooi',
+        'Pam','Pan','Pay','Peh','Pei','Peik','Pek','Pey','Pik','Pin','Ping','Po','Poh','Pom','Pong','Pooi','Pui','Pun',
+        'Qi','Qin','Qing','Qiu','Qu','Quay','Qui',
+        'Rei','Rin','Ring','Rinn','Rong','Rou','Ru','Rui','Ruo',
+        'Say','Sha','Shan','Shar','Shay','She','Shea','Shee','Shei','Sher','Shew','Shey','Shi','Shia','Shian','Shiao','Shie','Shin',
+        'Shok','Shu','Shui','Shuk','Shum','Si','Sia','Siah','Siak','Sian','Siao','Sien','Siew','Sim','Sin','Siu',
+        'So','Soh','Soi','Sok','Soo','Su','Suan','Sue','Suen','Sui','Suk','Sun',
+        'Tai','Tam','Tay','Tea','Teng','Tey','Thia','Ti','Tia','Tiah','Ting',
+        'Voon',
+        'Wan','Wen','Wey','Whey','Wi','Woon',
+        'Xi','Xia','Xiah','Xian','Xiao','Xiau','Xie','Xin','Xing','Xiu','Xu','Xun',
+        'Yam','Yan','Yee','Yen','Yep','Yeu','Yew','Yi','Yin','Ying','Yong','Yuan','Yue','Yuen','Yun','Yung','Yup',
+        'Zhen','Zhi','Zi','Zia','Ziah','Zo','Zoe','Zou','Zu','Zui',
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/List_of_Malaysians_of_Chinese_descent
+     * @link https://en.wikipedia.org/wiki/Category:Malaysian_people_of_Cantonese_descent
+     * @link https://en.wikipedia.org/wiki/Category:Malaysian_people_of_Chaoshanese_descent
+     * @link https://en.wikipedia.org/wiki/Category:Malaysian_people_of_Chinese_descent
+     * @link https://en.wikipedia.org/wiki/Category:Malaysian_people_of_English_descent
+     * @link https://en.wikipedia.org/wiki/Category:Malaysian_people_of_Hakka_descent
+     * @link https://en.wikipedia.org/wiki/Category:Malaysian_people_of_Hockchew_descent
+     * @link https://en.wikipedia.org/wiki/Category:Malaysian_people_of_Hokkien_descent
+     * @link https://en.wikipedia.org/wiki/Category:Malaysian_people_of_Peranakan_descent
+     * @link https://en.wikipedia.org/wiki/Category:Malaysian_politicians_of_Chinese_descent
+     */
+    protected static $firstNameMaleChristian = array(
+        'Aaron','Addy','Adrian','Alex','Amos','Anthony',
+        'Bernard','Billy',
+        'Chris','Christopher','Colin',
+        'Danell','Daniel','Danny','David','Douglas',
+        'Eddie','Eddy','Edmund','Eric',
+        'Francis','Frankie',
+        'Gary','Gavin','George','Gregory',
+        'Henry',
+        'Isaac',
+        'James','Jason','Jeff','Jeffrey','Jimmy','John','Jonathan','Josiah','Julian',
+        'Kevin','Kris',
+        'Mark','Martin','Mavin','Melvin','Michael',
+        'Nathaniel','Nelson','Nicholas',
+        'Peter','Philip',
+        'Richard','Robert','Roger','Ronny','Rynn',
+        'Shaun','Simon','Stephen','Steven',
+        'Terry','Tony',
+        'Victor','Vince','Vincent',
+        'Welson','William','Willie',
+    );
+    protected static $firstNameFemaleChristian = array(
+        'Alice','Alyssa','Amber','Amy','Andrea','Angelica','Angie','Apple','Aslina',
+        'Bernice','Betty','Boey','Bonnie',
+        'Caemen','Carey','Carmen','Carrie','Cindy',
+        'Debbie',
+        'Elaine','Elena',
+        'Felixia','Fish','Freya',
+        'Genervie','Gin',
+        'Hannah','Heidi','Helena',
+        'Janet','Jemie','Jess','Jesseca','Jessie','Joanna','Jolene','Joyce','Juliana',
+        'Karen','Kathleen',
+        'Lilian','Linda','Lydia','Lyndel',
+        'Maria','Marilyn','Maya','Meeia','Melinda','Melissa','Michelle','Michele',
+        'Nadia','Natalie','Nicole',
+        'Penny',
+        'Phyllis',
+        'Quincy',
+        'Rachel','Rena','Rose',
+        'Samantha','Sarah','Sheena','Sherine','Shevon','Sonia','Stella',
+        'Teresa','Tiffany','Tracy','Tricia',
+        'Vera','Violet','Vivian','Vivien',
+        'Yvonne',
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/List_of_Malaysians_of_Indian_descent
+     * @link https://en.wikipedia.org/wiki/List_of_Malaysian_politicians_of_Indian_descent
+     * @link https://en.wikipedia.org/wiki/List_of_Malaysian_sportspeople_of_Indian_descent
+     * @link https://en.wikipedia.org/wiki/Tamil_Malaysians#Notable_people
+     */
+    protected static $initialIndian = array(
+        'B. ','B. C. ',
+        'C. ',
+        'D. ','D. R. ','D. S. ',
+        'E. ',
+        'G. ',
+        'K. ','K. L. ','K. R.','K. S. ',
+        'M. ','M. G. ','M. G. G. ','M. K. ',
+        'N. ','N. K. ',
+        'P. ',
+        'R. ','R. G. ','R. S. ',
+        'S. ','S. A. ',
+        'T. ',
+        'V. ','V. T. ',
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/List_of_Malaysians_of_Indian_descent
+     * @link https://en.wikipedia.org/wiki/K._L._Devaser
+     * @link https://en.wikipedia.org/wiki/List_of_Malaysian_politicians_of_Indian_descent
+     * @link https://en.wikipedia.org/wiki/List_of_Malaysian_sportspeople_of_Indian_descent
+     * @link https://en.wikipedia.org/wiki/Tamil_Malaysians#Notable_people
+     */
+    protected static $firstNameMaleIndian = array(
+        'Anbil','Ananda','Arasu','Arul','Arulraj','Arumugam','Ash',
+        'Babu','Balachandra','Balasubramaniam','Balden','Baljit','Baltej','Bishan',
+        'Canagasabai','Cecil','Chakra','Chanturu',
+        'Depan','Darma Raja','Devaki','Devamany','Devan','Devasagayam','Diljit','Doraisingam',
+        'Ganesh','Ganga','Gengadharan','Gobalakrishnan','Gobind','Gopinathan','Govindasamy','Gunasekaran','Gurmit',
+        'Haran','Harikrish','Hiresh','Huzir',
+        'Indi',
+        'Jagdeep','Janil','Jeevandran','Jegathesan','Jeyakumar','Jomo Kwame',
+        'Kamal','Kamalanathan','Kanagaraj','Kandasamy','Kandiah','Karamjit','Karnail','Karpal','Kasi','Kasinather','Kavi','Kavidhai','Kishor','Krishen','Krishnamoorthy','Krishnamurthi','Krishnasamy','Kulasegaran','Kumar','Kumutha','Kuhan','Kunanlan','Kundan Lal','Kunjiraman',
+        'Loganathan',
+        'Magendran','Maha','Mahadev','Mahaletchumy','Mahathir','Maniam','Manickavasagam','Manikavasagam','Manjit','Manogaran','Manoharan','Manrick','Marimuthu','Merican','Mogan','Mohanadas','Munshi','Murugayan','Murugesan','Mutahir',
+        'Nadarajan','Nandakumar','Nanthakumar','Naraina','Nethaji','Ninian',
+        'Padathan','Palanivel','Param','Paramjit','Pavandeep','Praboo','Pragash','Premnath','Prema','Pria','Puvaneswaran',
+        'Rabinder','Rajagobal','Rajesh','Rajeswary','Rajiv','Rakesh','Rama','Ramasamy','Ramesh','Ramkarpal','Ramon','Rattan','Ravichandran','Rehman','Renuga','Rohan','Rueben',
+        'Saarvindran','Samy','Sanisvara','Sanjay','Santhara','Santokh','Sarath','Saravanan','Sarjit','Sasikumar','Satwant','Selvakkumar','Selvaraju','Serbegeth','Shan','Shankar','Shanmugam','Sittampalam','Sivakumar','Sivarasa','Solamalay','Sothinathan','Subramaniam','Sukhjit','Sumisha','Surendran','Suresh','Suriaprakash',
+        'Tatparanandam','Tanasekharan','Thamboosamy','Thamil','Thayaparan','Thirumurugan','Thirunavuk',
+        'Uthayakumar',
+        'Varatharaju','Veenod','Veerappan','Veerappen','Veloo','Vasudevan','Vellu','Viatilingam','Vijandren','Vinod','Vishnu','Vivasvan',
+        'Waythamoorthy','Weeratunge',
+        'Yosri','Yugendran',
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/List_of_Malaysians_of_Indian_descent
+     * @link https://en.wikipedia.org/wiki/List_of_Malaysian_politicians_of_Indian_descent
+     * @link https://en.wikipedia.org/wiki/List_of_Malaysian_sportspeople_of_Indian_descent
+     * @link https://en.wikipedia.org/wiki/Tamil_Malaysians#Notable_people
+     */
+    protected static $firstNameFemaleIndian = array(
+        'Ambiga','Anaika','Anand','Anita','Asha','Athi',
+        'Gheetha',
+        'Haanii',
+        'Janaky',
+        'Kasthuriraani','Kavita','Kiran',
+        'Melinder',
+        'Nithya',
+        'Prashanthini','Preeta','Priya','Pushpa',
+        'Ramya','Rani','Rasammah','Renuga',
+        'Sangeeta','Sannatasah','Saraswati','Shamini','Shanthi','Shanti','Shoba','Shuba','Siva','Sutheaswari','Swarna','Sybil',
+        'Thanuja','Theiviya','Thripura',
+        'Umasundari','Uthaya',
+        'Vijaya',
+        'Zabrina',
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/List_of_Malaysians_of_Indian_descent
+     * @link https://en.wikipedia.org/wiki/List_of_Malaysian_politicians_of_Indian_descent
+     * @link https://en.wikipedia.org/wiki/List_of_Malaysian_sportspeople_of_Indian_descent
+     * @link https://en.wikipedia.org/wiki/Tamil_Malaysians#Notable_people
+     */
+    protected static $lastNameIndian = array(
+        'Alagaratnam','Ambumamee','Ammasee','Ampalavanar','Ananthan','Arivanathan','Arujunan','Arumugam','Asirvatham','Autherapady',
+        'Balakrishnan','Balan','Bamadhaj','Bastianpillai','Bhullar','Bhupalan',
+        'Chandran','Cumaraswamy','Chelvan','Chengara',
+        'Dairiam','Davies','Devaraj','Devandran','Devaser','Dhaliwal','Dharmalingam','Dhillon',
+        'Elavarasan',
+        'Fernandes','Fernandez',
+        'Ganapathy','Ganesan','Gnanalingam','Goundar','Govindasamy','Gunalan','Gurusamy',
+        'Haridas',
+        'Iyer',
+        'Jaidka','Jassal','Jayaram','Jayaseelan','Jayawardene','Jeevananthan',
+        'Kaliappan','Kamalesvaran','Kandasamy','Karathu','Kathigasu','Kathiripillai','Kaveri','Kayveas','Krishnan','Krishnasamy','Kumar','Kumaresan','Kumari','Kunalan','Kundargal','Kuppusamy',
+        'Lakshmi','Linggam','Lourdenadin',
+        'Madhavan','Mahathevan','Malayalam','Manicka','Manikavasagam','Marimuthu','Menon','Mohinder','Moorthy','Mudukasan','Muniandy','Munisamy','Munusamy','Murugan','Murugeson',
+        'Nadarajah','Nagapan','Nagappan','Nagaraj','Nagarajan','Nahappan','Naidu','Nair','Namasivayam','Narayan','Navaratnam','Navarednam','Nayar','Nijhar',
+        'Pakiam','Palaniappan','Palanisamy','Panchanathan','Pandithan','Parthiban','Pathmanaban','Patto','Pereira','Perera','Periasamy','Perumal','Pillai','Pillay','Ponnusamy','Prakash','Puaneswaran','Purushothaman','Puspanathan','Puthucheary',
+        'Raj Kaur','Rajakumar','Rajan','Rajannaidu','Rajendra','Rajendran','Rajhans','Raju','Ramachandra','Ramadas','Ramadass','Ramanathan','Ramani','Ramasamy','Raj','Rao','Rasiah','Ratnam','Ravindran','Rayer','Retinam','Rishyakaran','Robbat',
+        'Sachithanandan','Sakadivan','Sakwati','Samarasan','Sambanthan','Sandrakasi','Sangalimuthu','Saniru','Sankar','Saravanan','Sathasivam','Sathianathan','Saunthararajah','Seenivasagam','Sekhar','Sellan','Selvanayagam','Selvarajoo','Selvaratnam','Shanmuganathan','Shanmugaratnam','Shekhar','Shivraj','Shree','Sidhu','Sinnandavar','Sinnathamby','Sinnathuray','Sivanesan','Singh','Sivalingam','Sivanesan','Shankar','Sodhy','Somasundram','Sooryapparad','Soti','Sreenevasan','Subramaniam','Sundram','Suppiah','Surendran',
+        'Thajudeen','Thalalla','Thambu','Thanabalasingam','Thanenthiran','Theseira','Thevandran','Thiru','Thirunavukarasu','Thivy','Thuraisingham','Tikaram',
+        'Vadaketh','Vadiveloo','Vanajah','Varman','Vasudevan','Veeran','Veerasamy','Veerasenan','Veerathan','Veetil','Velappan','Vello','Vengatarakoo','Vethamuthu','Viswalingam',
+        'Xavier',
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/Malay_styles_and_titles
+     */
+    protected static $titleMale = array('En.','Dr.','Prof.','Datuk','Dato\'','Datuk Seri','Dato\' Sri','Tan Sri','Tun');
+    protected static $titleFemale = array('Pn.','Cik','Dr.','Prof.','Datin','Datin Paduka','Datin Paduka Seri','Puan Sri','Toh Puan');
+
+    /**
+     * Return a Malay male first name
+     * 
+     * @example 'Ahmad'
+     * 
+     * @return string
+     */
+    public static function firstNameMaleMalay()
+    {
+        return static::randomElement(static::$firstNameMaleMalay);
+    }
+
+    /**
+     * Return a Malay female first name
+     * 
+     * @example 'Adibah'
+     * 
+     * @return string
+     */
+    public static function firstNameFemaleMalay()
+    {
+        return static::randomElement(static::$firstNameFemaleMalay);
+    }
+
+    /**
+     * Return a Malay last name
+     * 
+     * @example 'Abdullah'
+     * 
+     * @return string
+     */
+    public function lastNameMalay()
+    {
+        return static::randomElement(static::$lastNameMalay);
+    }
+
+    /**
+     * Return a Malay male 'Muhammad' name
+     * 
+     * @example 'Muhammad'
+     * 
+     * @return string
+     */
+    public static function muhammadName()
+    {
+        return static::randomElement(static::$muhammadName);
+    }
+
+    /**
+     * Return a Malay female 'Nur' name
+     * 
+     * @example 'Nur'
+     * 
+     * @return string
+     */
+    public static function nurName()
+    {
+        return static::randomElement(static::$nurName);
+    }
+
+    /**
+     * Return a Malay male 'Haji' title
+     * 
+     * @example 'Haji'
+     * 
+     * @return string
+     */
+    public static function haji()
+    {
+        return static::randomElement(static::$haji);
+    }
+
+    /**
+     * Return a Malay female 'Hajjah' title
+     * 
+     * @example 'Hajjah'
+     * 
+     * @return string
+     */
+    public static function hajjah()
+    {
+        return static::randomElement(static::$hajjah);
+    }
+
+    /**
+     * Return a Malay title
+     * 
+     * @example 'Syed'
+     * 
+     * @return string
+     */
+    public static function titleMaleMalay()
+    {
+        return static::randomElement(static::$titleMaleMalay);
+    }
+
+    /**
+     * Return a Chinese last name
+     * 
+     * @example 'Lim'
+     * 
+     * @return string
+     */
+    public static function lastNameChinese()
+    {
+        return static::randomElement(static::$lastNameChinese);
+    }
+
+    /**
+     * Return a Chinese male first name
+     * 
+     * @example 'Goh Tong'
+     * 
+     * @return string
+     */
+    public static function firstNameMaleChinese()
+    {
+        return static::randomElement(static::$firstNameChinese) . ' ' . static::randomElement(static::$firstNameMaleChinese);
+    }
+
+    /**
+     * Return a Chinese female first name
+     * 
+     * @example 'Mew Choo'
+     * 
+     * @return string
+     */
+    public static function firstNameFemaleChinese()
+    {
+        return static::randomElement(static::$firstNameChinese) . ' ' . static::randomElement(static::$firstNameFemaleChinese);
+    }
+
+    /**
+     * Return a Christian male name
+     * 
+     * @example 'Aaron'
+     * 
+     * @return string
+     */
+    public static function firstNameMaleChristian()
+    {
+        return static::randomElement(static::$firstNameMaleChristian);
+    }
+
+    /**
+     * Return a Christian female name
+     * 
+     * @example 'Alice'
+     * 
+     * @return string
+     */
+    public static function firstNameFemaleChristian()
+    {
+        return static::randomElement(static::$firstNameFemaleChristian);
+    }
+
+    /**
+     * Return an Indian initial
+     * 
+     * @example 'S. '
+     * 
+     * @return string
+     */
+    public static function initialIndian()
+    {
+        return static::randomElement(static::$initialIndian);
+    }
+
+    /**
+     * Return an Indian male first name
+     * 
+     * @example 'Arumugam'
+     * 
+     * @return string
+     */
+    public static function firstNameMaleIndian()
+    {
+        return static::randomElement(static::$firstNameMaleIndian);
+    }
+
+    /**
+     * Return an Indian female first name
+     * 
+     * @example 'Ambiga'
+     * 
+     * @return string
+     */
+    public static function firstNameFemaleIndian()
+    {
+        return static::randomElement(static::$firstNameFemaleIndian);
+    }
+
+    /**
+     * Return an Indian last name
+     * 
+     * @example 'Subramaniam'
+     * 
+     * @return string
+     */
+    public static function lastNameIndian()
+    {
+        return static::randomElement(static::$lastNameIndian);
+    }
+
+    /**
+     * Return a random last name
+     * 
+     * @example 'Lee'
+     * 
+     * @return string
+     */
+    public function lastName()
+    {
+        $formats = array(
+            '{{lastNameMalay}}',
+            '{{lastNameChinese}}',
+            '{{lastNameIndian}}',
+        );
+
+        return $this->generator->parse(static::randomElement($formats));
+    }
+
+    /**
+     * Return a Malaysian I.C. No.
+     * 
+     * @example '890123-45-6789'
+     * 
+     * @link https://en.wikipedia.org/wiki/Malaysian_identity_card#Structure_of_the_National_Registration_Identity_Card_Number_(NRIC)
+     * 
+     * @param string|null      $gender 'male', 'female' or null for any
+     * @param bool|string|null $hyphen true, false, or any separator characters
+     * 
+     * @return string
+     */
+    public static function myKadNumber($gender = null, $hyphen = false)
+    {
+        // year of birth
+        $yy = mt_rand(0, 99);
+
+        // month of birth
+        $mm = DateTime::month();
+
+        // day of birth
+        $dd = DateTime::dayOfMonth();
+
+        // place of birth (1-59 except 17-20)
+        while (in_array(($pb = mt_rand(1, 59)), array(17, 18, 19, 20))) {
+        };
+
+        // random number
+        $nnn = mt_rand(0, 999);
+
+        // gender digit. Odd = MALE, Even = FEMALE
+        $g = mt_rand(0, 9);
+        //Credit: https://gist.github.com/mauris/3629548
+        if ($gender === static::GENDER_MALE) {
+            $g = $g | 1;
+        } elseif ($gender === static::GENDER_FEMALE) {
+            $g = $g & ~1;
+        }
+
+        // formatting with hyphen
+        if ($hyphen === true) {
+            $hyphen = "-";
+        } else if ($hyphen === false) {
+            $hyphen = "";
+        }
+
+        return sprintf("%02d%02d%02d%s%02d%s%03d%01d", $yy, $mm, $dd, $hyphen, $pb, $hyphen, $nnn, $g);
+    }
+}
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/ms_MY/PhoneNumber.php b/vendor/fzaninotto/faker/src/Faker/Provider/ms_MY/PhoneNumber.php
new file mode 100644
index 00000000..ad199c0d
--- /dev/null
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/ms_MY/PhoneNumber.php
@@ -0,0 +1,217 @@
+<?php
+
+namespace Faker\Provider\ms_MY;
+
+class PhoneNumber extends \Faker\Provider\PhoneNumber
+{
+    protected static $formats = array(
+        '{{mobileNumber}}',
+        '{{fixedLineNumber}}',
+        '{{voipNumber}}'
+    );
+
+    protected static $plusSymbol = array(
+        '+'
+    );
+
+    protected static $countryCodePrefix = array(
+        '6'
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/Telephone_numbers_in_Malaysia#Mobile_phone_codes_and_IP_telephony
+     */
+    protected static $zeroOneOnePrefix = array('10','11','12','13','14','15','16','17','18','19','20','22','23','32');
+    protected static $zeroOneFourPrefix = array('2','3','4','5','6','7','8','9');
+    protected static $zeroOneFivePrefix = array('1','2','3','4','5','6','9');
+
+    /**
+     * @link https://en.wikipedia.org/wiki/Telephone_numbers_in_Malaysia#Mobile_phone_codes_and_IP_telephony
+     */
+    protected static $mobileNumberFormatsWithFormatting = array(
+        '010-### ####',
+        '011-{{zeroOneOnePrefix}}## ####',
+        '012-### ####',
+        '013-### ####',
+        '014-{{zeroOneFourPrefix}}## ####',
+        '016-### ####',
+        '017-### ####',
+        '018-### ####',
+        '019-### ####',
+    );
+
+    protected static $mobileNumberFormats = array(
+        '010#######',
+        '011{{zeroOneOnePrefix}}######',
+        '012#######',
+        '013#######',
+        '014{{zeroOneFourPrefix}}######',
+        '016#######',
+        '017#######',
+        '018#######',
+        '019#######',
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/Telephone_numbers_in_Malaysia#Geographic_area_codes
+     */
+    protected static $fixedLineNumberFormatsWithFormatting = array(
+        '03-#### ####',
+        '04-### ####',
+        '05-### ####',
+        '06-### ####',
+        '07-### ####',
+        '08#-## ####',
+        '09-### ####',
+    );
+
+    protected static $fixedLineNumberFormats = array(
+        '03########',
+        '04#######',
+        '05#######',
+        '06#######',
+        '07#######',
+        '08#######',
+        '09#######',
+    );
+
+    /**
+     * @link https://en.wikipedia.org/wiki/Telephone_numbers_in_Malaysia#Mobile_phone_codes_and_IP_telephony
+     */
+    protected static $voipNumberWithFormatting = array(
+        '015-{{zeroOneFivePrefix}}## ####'
+    );
+
+    protected static $voipNumber = array(
+        '015{{zeroOneFivePrefix}}######'
+    );
+
+    /**
+     * Return a Malaysian Mobile Phone Number.
+     * 
+     * @example '+6012-345-6789'
+     * 
+     * @param bool $countryCodePrefix true, false
+     * @param bool $formatting true, false
+     * 
+     * @return string
+     */
+    public function mobileNumber($countryCodePrefix = true, $formatting = true)
+    {
+        if ($formatting) {
+            $format = static::randomElement(static::$mobileNumberFormatsWithFormatting);
+        } else {
+            $format = static::randomElement(static::$mobileNumberFormats);
+        }
+
+        if ($countryCodePrefix) {
+            return static::countryCodePrefix($formatting) . static::numerify($this->generator->parse($format));
+        } else {
+            return static::numerify($this->generator->parse($format));
+        }
+    }
+
+    /**
+     * Return prefix digits for 011 numbers
+     * 
+     * @example '10'
+     * 
+     * @return string
+     */
+    public static function zeroOneOnePrefix()
+    {
+        return static::numerify(static::randomElement(static::$zeroOneOnePrefix));
+    }
+
+    /**
+     * Return prefix digits for 014 numbers
+     * 
+     * @example '2'
+     * 
+     * @return string
+     */
+    public static function zeroOneFourPrefix()
+    {
+        return static::numerify(static::randomElement(static::$zeroOneFourPrefix));
+    }
+
+    /**
+     * Return prefix digits for 015 numbers
+     * 
+     * @example '1'
+     * 
+     * @return string
+     */
+    public static function zeroOneFivePrefix()
+    {
+        return static::numerify(static::randomElement(static::$zeroOneFivePrefix));
+    }
+
+    /**
+     * Return a Malaysian Fixed Line Phone Number.
+     * 
+     * @example '+603-4567-8912'
+     * 
+     * @param bool $countryCodePrefix true, false
+     * @param bool $formatting true, false
+     * 
+     * @return string
+     */
+    public function fixedLineNumber($countryCodePrefix = true, $formatting = true)
+    {
+        if ($formatting) {
+            $format = static::randomElement(static::$fixedLineNumberFormatsWithFormatting);
+        } else {
+            $format = static::randomElement(static::$fixedLineNumberFormats);
+        }
+
+        if ($countryCodePrefix) {
+            return static::countryCodePrefix($formatting) . static::numerify($this->generator->parse($format));
+        } else {
+            return static::numerify($this->generator->parse($format));
+        }
+    }
+
+    /**
+     * Return a Malaysian VoIP Phone Number.
+     * 
+     * @example '+6015-678-9234'
+     * 
+     * @param bool $countryCodePrefix true, false
+     * @param bool $formatting true, false
+     * 
+     * @return string
+     */
+    public function voipNumber($countryCodePrefix = true, $formatting = true)
+    {
+        if ($formatting) {
+            $format = static::randomElement(static::$voipNumberWithFormatting);
+        } else {
+            $format = static::randomElement(static::$voipNumber);
+        }
+
+        if ($countryCodePrefix) {
+            return static::countryCodePrefix($formatting) . static::numerify($this->generator->parse($format));
+        } else {
+            return static::numerify($this->generator->parse($format));
+        }
+    }
+
+    /**
+     * Return a Malaysian Country Code Prefix.
+     * 
+     * @example '+6'
+     * 
+     * @param bool $formatting true, false
+     * 
+     * @return string
+     */
+    public static function countryCodePrefix($formatting = true)
+    {
+        if ($formatting) {
+            return static::randomElement(static::$plusSymbol) . static::randomElement(static::$countryCodePrefix);
+        } else {
+            return static::randomElement(static::$countryCodePrefix);
+        }
+    }
+}
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/nb_NO/Company.php b/vendor/fzaninotto/faker/src/Faker/Provider/nb_NO/Company.php
index 027cc9b1..ac9a2a00 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/nb_NO/Company.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/nb_NO/Company.php
@@ -15,5 +15,41 @@ class Company extends \Faker\Provider\Company
         '{{lastName}} og {{lastName}} {{companySuffix}}'
     );
 
-    protected static $companySuffix = array('AS', 'DA', 'NUF');
+    /**
+     * Common suffixes
+     * @link https://www.brreg.no/bedrift/organisasjonsformer/
+     */
+    protected static $companySuffix = array('ANS', 'AS', 'ASA', 'BA', 'DA', 'ENK', 'GFS', 'KTRF', 'NUF', 'PK', 'SA', 'SPA', 'STI', 'VIFE');
+
+    /**
+     * 1500 random job titles from Statistisk Sentralbyrå
+     * @link http://www.ssb.no/a/yrke/yrke.csv
+     */
+    protected static $jobTitleFormat = array(
+        'Administrasjonsdirektør', 'Administrasjonskonsulent', 'Administrasjonssekretær', 'Administrasjonssjef', 'Administrerende Overlege', 'Admiral', 'Advokatassistent', 'Aerobicinstruktør', 'Afis-Fullmektig', 'Agrotekniker', 'Ais-Fullmektig', 'Akrobat', 'Aktivitør', 'Akupunktør', 'Alarmoperatør', 'Allmenningbestyrer', 'Allmennpraktiserende Lege', 'Amanuensis', 'Ambassaderåd', 'Ambassadesekretær', 'Ambulansemedhjelper', 'Ambulansesjef', 'Ambulerende Vaktmester', 'Ammoniakkoker', 'Anestesilege', 'Animatør', 'Anleggsdykker', 'Anleggsgartnermester', 'Anleggsmaskinkjører', 'Anleggsmaskinmekaniker', 'Anleggsoperatør', 'Annenflyger', 'Annonseakkvisitør', 'Annonsebehandler', 'Annonsekonsulent', 'Annonseselger', 'Annonsesjef', 'Anretningshjelp', 'Apotekmedarbeider', 'Arbeidsmedisiner', 'Arbeidssjef', 'Arbeidsstudieingeniør', 'Arbeidsterapeut', 'Arbeidstilrettelegger', 'Arbeidstilsynskontrollør', 'Arbeidstilsynsrådgiver', 'Arkivassistent', 'Arkivmedarbeider', 'Arrestforvarer', 'Asfaltarbeider', 'Asfaltverkarbeider', 'Asfaltør', 'Assistentfotograf', 'Assisterende Administrerende Direktør', 'Assisterende Banksjef', 'Assisterende Bestyrer', 'Assisterende Borer', 'Assisterende Byfogd', 'Assisterende Fylkeshelsesjef', 'Assisterende Fylkeslege', 'Assisterende Fylkesmann', 'Assisterende Helsedirektør', 'Assisterende Kjøkkensjef', 'Assisterende Kommunegartner', 'Assisterende Sjefflygeleder', 'Assisterende Sjefspsykolog', 'Assisterende Sykepleiesjef', 'Assisterende Vaktmester', 'Astrofysiker', 'Astronom', 'Atomfysiker', 'Attache', 'Autoklavoperatør', 'Autoklavpasser', 'Automasjonsingeniør', 'Automatiker', 'Automatiseringsmontør', 'Avdelingsarkitekt', 'Avdelingsbanksjef', 'Avdelingsbetjent', 'Avdelingsdirektør', 'Avdelingsergoterapeut', 'Avdelingsingeniør', 'Avdelingsleder/fysioterapeut', 'Avdelingspsykolog', 'Avdelingssekretær', 'Avdelingssjef', 'Avdelingssjef Akvakultur Mv.', 'Avdelingssjef Restaurant', 'Avdelingssykepleier', 'Avlaster', 'Avlskonsulent', 'Avløser',
+        'Babysvømmeinstruktør', 'Badeassistent', 'Badebetjent', 'Bakermester', 'Bakteriolog', 'Banearbeider', 'Bankassistent', 'Bankkonsulent', 'Banksjef', 'Barkeeper', 'Barmedarbeider', 'Barne- Og Ungdomssekretær', 'Barnehageassistent', 'Barnehjemsbestyrer', 'Barnepasser', 'Barnevernskonsulent', 'Bartender', 'Basketballtrener', 'Bedriftskonsulent', 'Bedriftspsykolog', 'Bedriftsrevisor', 'Bedriftsøkonom', 'Befrakter', 'Begravelsesbyråassistent', 'Begravelsesbyråmedarbeider', 'Begravelsesbyråsjåfør', 'Beleggskjærer', 'Bemanningskonsulent', 'Benkesnekker', 'Beregner', 'Bergmester', 'Bergverksarbeider', 'Beskjærer', 'Bestyrer Helsetjenester', 'Betjent', 'Betongindustriarbeider', 'Betongvarearbeider', 'Bibliotekleder', 'Biblioteksjef', 'Bilagskontrollør', 'Bilelektriker', 'Bilgummiarbeider', 'Bilinspektør', 'Bilklargjører', 'Billedkonsulent', 'Billedtekniker', 'Billettekspeditør', 'Billettkonsulent', 'Billettkontrollør', 'Billettselger', 'Billettør', 'Bilmegler', 'Bilmekaniker', 'Bilmottaker', 'Bilpleier', 'Bilrenser', 'Bilsakkyndig', 'Biltilsyninspektør', 'Biopat', 'Blandemaskinoperatør', 'Blander', 'Blogger', 'Blomsterdekoratør', 'Blåseinstrumentmaker', 'Bokbinder', 'Bokbinderassistent', 'Bokbussassistent', 'Bokbussfører', 'Bokhandlermedarbeider', 'Bokhandlermedhjelper', 'Bokholderassistent', 'Bokollektivmedarbeider', 'Boligleder', 'Boligsjef', 'Bomringvakt', 'Bomvakt', 'Bookingansvarlig', 'Bookingmedarbeider', 'Bookingsekretær', 'Borearbeider', 'Boredekksarbeider', 'Boreingeniør', 'Boreoperasjonsleder', 'Borer', 'Boresjef', 'Borevæskeingeniør', 'Botaniker', 'Boveileder', 'Bowlingvert', 'Branninspektør', 'Brannisolatør', 'Brannkonstabel', 'Brannmester', 'Brannvakt', 'Brannvarslerinstallatør', 'Brenner', 'Brolegger', 'Bromaler', 'Brooperatør', 'Brukskunstner', 'Brygger', 'Bryggeriformann', 'Bryggerimester', 'Brønnborer', 'Budsjåfør', 'Bukker', 'Bulldoserkjører', 'Bunadmedarbeider', 'Bunnlærstanser', 'Buntmaker', 'Business Controller', 'Bussfører', 'Butikkinnehaver', 'Butikkinspektør', 'Butikkmedarbeider', 'Butikkonsulent', 'Butikksjef', 'Butikkslakter', 'Byarkitekt', 'Bydelsdirektør', 'Byfogd', 'Byggekranfører', 'Byggesaksbehandler', 'Byggesjef', 'Byggtapetserer', 'Byggtapetsermester', 'Bygningsarbeider', 'Bygningskontrollør', 'Byplanlegger', 'Byplansjef', 'Byrettsdommer', 'Byråd', 'Byssegutt', 'Byssepike', 'Båndsager', 'Båtfører', 'Båtmekaniker', 'Bærplukker', 'Børsdirektør', 'Børsemakermester', 'Børstemaker', 'Bøter',
+        'Cabin Chief', 'Cafemedarbeider', 'Campingplassmedarbeider', 'Cash Management Controller', 'Cellulosearbeider', 'Charge D\'affaires', 'Cirkustekniker', 'Cnc-Operatør', 'Coach', 'Controller', 'Croupier', 'Cruiseassistent',
+        'Daglig Leder', 'Dagsenterleder', 'Damefrisør', 'Danselærer', 'Danser', 'Dataadministrator', 'Datamaskinoperatør', 'Dataservicetekniker', 'Datasjef', 'Datatekniker', 'Dekkbygger', 'Dekorkonsulent', 'Deleekspeditør', 'Delesjef', 'Departementsråd', 'Designer', 'Desksjef', 'Diakoniarbeider', 'Diettkokk', 'Direksjonssekretær', 'Dirigent', 'Discjockey', 'Distribusjonssjåfør', 'Distributør', 'Distriktsarbeidssjef', 'Distriktsbanksjef', 'Distriktsdirektør', 'Distriktsmusiker', 'Distriktsrevisor', 'Distriktstannlege', 'Divisjonsdirektør Akvakultur Mv.', 'Divisjonssjef Akavkultur Mv.', 'Dokumentarfilmfotograf', 'Dommer', 'Domorganist', 'Dp-Operatør', 'Dramalærer', 'Dramatiker', 'Driftsansvarlig Flyfrakt', 'Driftsfullmektig', 'Driftskonsulent', 'Driftskonsulent It', 'Driftskoordinator', 'Driftsplantekniker', 'Driftstekniker', 'Driftsøkonom', 'Droneoperatør', 'Drosjesjåfør', 'Dykkerleder', 'Dyrlege', 'Dørselger', 'Dørvert', 'Døvekapellan', 'Døveprest',
+        'Edb-Leder', 'Ekspedent', 'Ekspedisjonssjef', 'Eksportagent', 'Eksportkonsulent', 'Eldreomsorgssjef', 'Elektriker', 'Elektrikerformann', 'Elektrisk Kabeloperasjonstekniker', 'Elektroautomasjonstekniker', 'Elektroingeniør', 'Elektromontør', 'Elkraftingeniør', 'Elverksmontør', 'Emaljebrenner', 'Emaljør', 'Energisjef', 'Engasjementssjef', 'Enhetsleder', 'Entomolog', 'Entreprenør', 'Ergoterapeut', 'Etatsjef', 'Etterforsker',
+        'Fagbokforfatter', 'Faglaborant', 'Faglærer', 'Fagopplæringssjef', 'Fagsjef Skogbruk', 'Fagspesialist', 'Fagutdanningskonsulent', 'Faktureringssekretær', 'Familierådgiver', 'Fargekoker', 'Fargeriarbeider', 'Fasademontør', 'Fatter', 'Feierlærling', 'Feltarbeider', 'Feltassistent', 'Feltprest', 'Fengselsavdelingsbetjent', 'Fengselsbetjent', 'Fengselsinspektør', 'Fengselsoverbetjent', 'Fenrik', 'Ferdigstiller', 'Filetarbeider', 'Filialsjef', 'Filminspisient', 'Filmkontrollsjef', 'Filosof', 'Finansanalytiker', 'Finansråd', 'Finansrådgiver', 'Finanstilsynsdirektør', 'Fiolinbygger', 'Fiskehandler', 'Fiskeridirektør', 'Fiskerikonsulent', 'Fiskeriråd', 'Fiskeritekniker', 'Fiskerøkter', 'Fiskeskipper', 'Fiskeslakter', 'Fiskevraker', 'Fjøsmester', 'Flaskesorterer', 'Flekker', 'Flisarbeider', 'Fly-Radiotekniker', 'Flyattache', 'Flyeksportmedarbeider', 'Flyelektrotekniker', 'Flygeleder', 'Flygelederassistent', 'Flyinstruktør', 'Flymekaniker', 'Flyplassekspeditør', 'Flysystemavioniker', 'Flyteknisk Inspektør', 'Flytrafikkassistent', 'Flyvertinne', 'Fms-Operatør', 'Folklorist', 'Forbundssekretær', 'Forhandlingssjef', 'Forkynner', 'Forlagsmedarbeider', 'Formgiver', 'Formstøper', 'Formuesforvalter', 'Forsikringsassistent', 'Forsikringsrådgiver', 'Forsikringsselger', 'Forskalingsbas', 'Forsker', 'Forskjærer', 'Forskningsassistent', 'Forskningssjef', 'Forskningstekniker', 'Forstander', 'Forstkandidat', 'Forsvarsråd', 'Forsøksleder', 'Forvaltningsassistent', 'Forvaltningsingeniør', 'Forvaltningssjef', 'Fosterfar', 'Fotograf', 'Fotolaboratorieassistent', 'Fraktsjef', 'Freelancejournalist', 'Frisørlærling', 'Fritidsassistent', 'Fritidssjef', 'Frivillighetssentralleder', 'Fruktpressearbeider', 'Fruktprodusent', 'Fryseriarbeider', 'Fugearbeider', 'Fylkesagronom', 'Fylkesarkitekt', 'Fylkesbarnevernsjef', 'Fylkesbyggesjef', 'Fylkesingeniør', 'Fylkeskartsjef', 'Fylkeskontorsjef', 'Fylkeskoordinator I Fylkesarbeidskontoret', 'Fylkesmann', 'Fylkespersonalsjef', 'Fylkesstyrerepresentant', 'Fyrmester', 'Fyrtjenestermann', 'Fysiker', 'Fysiokjemiker', 'Fører', 'Førsteamanuensis', 'Førstefarmasøyt', 'Førstefotograf', 'Førstekonservator', 'Førstelagmann', 'Førstelektor', 'Førstemaskinist', 'Førstemeteorologifullmektig', 'Førstepasser', 'Førstepostbetjent', 'Førstepostfullmektig', 'Førstepreparant', 'Førsteprovisor', 'Førsterevisor', 'Førstesekretær', 'Førstestatsadvokat', 'Førstestyrmann', 'Førstetollinspektør',
+        'Gallerivakt', 'Garderobebetjening', 'Garnfisker', 'Garnisonstannlege', 'Gartnerassistent', 'Gartnerformann', 'Gassverksjef', 'Gateselger', 'General', 'Generalinspektør For Heimevernet', 'Generalinspektør For Hæren', 'Geodet', 'Geolog', 'Geomatiker', 'Geotekniker', 'Gjærhusarbeider', 'Glasiolog', 'Glassarbeider', 'Glassblåser', 'Glassblåsermester', 'Glasshåndverker', 'Glasurarbeider', 'Godstrafikkleder', 'Grafikerlærling', 'Grafisk Formgiver', 'Grafisk Ingeniør', 'Grafisk Trykkermester', 'Granitthogger', 'Grensekontrollør', 'Grovsliper', 'Gruppeleder I Arbeidsmarkedsetaten', 'Gruvemåler', 'Guide', 'Gullarbeider', 'Gullsmedmester', 'Gummivarearbeider', 'Gynekolog', 'Gårdbruker', 'Gårdsarbeider', 'Gårdshjelp',
+        'Hammerarbeider', 'Handelsagent', 'Handelsråd', 'Handlevognrydder', 'Hanskesyer', 'Hartskoker', 'Hattemaker', 'Havarisekretær', 'Havneassistent', 'Havnefogd', 'Havnekontrollør', 'Havnesjef', 'Havnetrafikkleder', 'Heisinstallatør', 'Heismontør', 'Heismontørlærling', 'Helse- Og Miljørådgiver', 'Helseinformatiker', 'Helseinspektør', 'Helsesøster', 'Herrefrisør', 'Hjelpekokk', 'Hjelpepleier', 'Hjelpepleiermedarbeider', 'Hjemmehjelper', 'Hjemmehjelpsleder', 'Hjemmekonsulent', 'Hjemmesykepleier', 'Hjullastersjåfør', 'Hms-Leder', 'Hoffmarskalk', 'Hollenderifører', 'Hostess', 'Hotellarbeider', 'Hotellmedarbeider', 'Hotellsjef', 'Hovedforvalter', 'Hovmester', 'Hr-Direktør', 'Hudarbeider', 'Hudterapeut', 'Hundefører', 'Husdyrkonsulent', 'Husholdsassistent', 'Husmorvikar', 'Hustrykker', 'Hvalfanger', 'Hydrograf', 'Hydrolog', 'Hylsemaker', 'Håndballtrener', 'Håndvever', 'Hørselsassistent', 'Høvelmester',
+        'Idrettsinstruktør', 'Idrettsseksjonsleder', 'Idrettstrener', 'Ikt-Lærling', 'Illustratør', 'Importsjef', 'Impregnerer', 'Industribokbinder', 'Industrimontør', 'Industripsykolog', 'Industrirørlegger', 'Industrisnekker', 'Industrisyer', 'Informasjonskonsulent', 'Informasjonsleder', 'Informasjonsmedarbeider', 'Informasjonsskrankemedarbeider', 'Inkassoassistent', 'Inkassokonsulent', 'Inkassoleder', 'Inkassosjef', 'Inneselger', 'Innkjøpsansvarlig', 'Innkjøpsingeniør', 'Innkjøpskonsulent', 'Innreder', 'Innredningskonsulent', 'Innredningsmontør', 'Innsjekkingsmedarbeider', 'Innspillingsleder', 'Inspeksjonsingeniør', 'Inspisient', 'Installasjonsingeniør', 'Instituttsjef', 'Instruktør', 'Instruktørtannlege', 'Instrumentavioniker', 'Instrumentmaker', 'Instrumentrørlegger', 'Interiørarkitekt', 'Internatgruppeassistent', 'Internatgruppeleder', 'Internatleder', 'Iskremarbeider', 'It-Ansvarlig', 'It-Konsulent', 'It-Koordinator', 'It-Leder', 'It-Medarbeider', 'It-Prosjektleder', 'It-Selger/account Manager', 'It-Sjef', 'It-Systemingeniør', 'It-Teknisk Konsulent',
+        'Jernbaneekspeditør', 'Jernbinderbas', 'Jordbrukssjef', 'Jordmor', 'Jordregistertekniker', 'Jordskifteassistent', 'Jordskiftedommer', 'Jordskifteingeniør', 'Jordskifteoverdommer', 'Jordskifterettsleder', 'Journalist', 'Juksafisker', 'Juridisk Rådgiver', 'Jurist', 'Juvelèr',
+        'Kabelarbeider', 'Kabelbanefører', 'Kabinettsekretær', 'Kafemedarbeider', 'Kaiarbeider', 'Kaibetjent', 'Kalanderarbeider', 'Kammeroperatørleder', 'Kanselist', 'Kapitalforvalter', 'Kapsler', 'Kaptein', 'Kapteinløytnant', 'Kardiolog', 'Karosserimekaniker', 'Kartsjef', 'Kasseleder', 'Kennelleder', 'Keramiker', 'Keramisk Former', 'Kinokontrollør', 'Kinomaskinist', 'Kinosjef', 'Kirkegårdsarbeider', 'Kiropraktor', 'Kjellermester', 'Kjemikaliedykker', 'Kjemiker', 'Kjevekirurg', 'Kjeveortoped', 'Kjole- Og Draktsyermester', 'Kjøkkenbestyrer', 'Kjølemaskinist', 'Kjølemaskinkjører', 'Kjørelærer', 'Kjøreskolelærer', 'Kjøttskjærer', 'Klinikkassistent', 'Klinisk Ernærinsfysiolog', 'Klinisk Sosionom', 'Klinisk Vernepleier', 'Klokkedykker', 'Klokker', 'Klubbarbeider', 'Klubbleder', 'Klubbtillitsmann', 'Koder', 'Kokillestøper', 'Koksbrenner', 'Koldkjøkkenassistent', 'Kolonialhandler', 'Komiker', 'Kommunaldirektør', 'Kommunalsjef', 'Kommuneadvokat', 'Kommuneergoterapeut', 'Kommunekasserer', 'Kommuneplansjef', 'Kommunestyrerepresentant', 'Kommunikasjonsrådgiver', 'Kommunikasjonsrådmann', 'Kommunikatør', 'Kompressoroperatør', 'Konditor', 'Konduktør', 'Konfektmaker', 'Konferansevert', 'Konferansevertinne', 'Konkurransedirektør', 'Konserndirektør', 'Konsernregnskapssjef', 'Konservator', 'Konstruksjonstegner', 'Kontaktmann', 'Kontoraspirant', 'Kontormedarbeider', 'Kontorrengjører', 'Kontraktsleder', 'Kontrollflyger', 'Kontrolloperatør', 'Kontrollromsassistent', 'Kontrollsjef', 'Kontrollveterinær', 'Kontrollør', 'Kopperslager', 'Koranlærer', 'Koreolog', 'Korrespondent', 'Korrosjonsbehandler', 'Kostholdskonsulent', 'Kostnadsingeniør', 'Kostymeformann', 'Kraftmegler', 'Kraftverksdirektør', 'Kraftverksoperatør', 'Kredittleder', 'Kreftsykepleier', 'Krematoriebetjent', 'Kretskortmontør', 'Kringkastingssjef', 'Kulturhussjef', 'Kulturkonsulent', 'Kulturminnekonsulent', 'Kundemegler', 'Kundesuppertleder', 'Kunststopper', 'Kurator', 'Kursmedarbeider', 'Kursveileder', 'Kurvfletter', 'Kurvmaker', 'Kurvmakermester',  'Kusk', 'Kvalitetsbedømmer', 'Kvalitetsmedarbeider', 'Kvalitetssikringsassistent', 'Kvalitetssikringsinspektør', 'Kvalitetssikringskoordinator', 'Kvalitetssikringsleder', 'Kybernetiker', 'Kystdirektør',
+        'Laboratorieleder', 'Laboratorierådgiver', 'Laboratorietekniker', 'Lagerformann', 'Lagerforvalter', 'Lagerfunksjonær', 'Lagerleder', 'Lagersjef', 'Lakkerer', 'Lakkoker', 'Landbruksdirektør', 'Landbruksmaskinmekaniker', 'Landbruksveileder', 'Landskapsarkitekt', 'Landssekretær', 'Landsstyremedlem', 'Ledende Aktivitør', 'Ledende Legesekretær', 'Leder', 'Leder It Brukerstøtte', 'Lege I Spesialisering', 'Legemiddelinspektør', 'Legesekretær', 'Legpredikant', 'Leigeskjærer', 'Lekotekleder', 'Lektor', 'Lensmannsbetjent', 'Lensmannsfullmektig', 'Leveransekoordinator', 'Ligningsrevisor', 'Ligningssekretær', 'Limarbeider', 'Limnolog', 'Lineegner', 'Linjeleder', 'Linjemontør', 'Litteraturagent', 'Litteraturkritiker', 'Location Scout', 'Locationassistent', 'Loddselger', 'Logistikkdirektør', 'Logistikkkoordinator', 'Logistikkleder', 'Logistikkmedarbeider', 'Logistikkonsulent', 'Logistikksjef', 'Logoped', 'Lokomotivfører', 'Lokomotivkontrollør', 'Losbåtfører', 'Losbåtsmann', 'Losinspektør', 'Lufthavnbetjent', 'Lufttrafikksjef', 'Lugarpike', 'Lydingeniør', 'Lydmester', 'Lydtekniker', 'Lysrigger', 'Lystekniker', 'Låsemontør', 'Lærervikar', 'Lærling', 'Lønningssekretær', 'Lønningssjef', 'Løypekjører', 'Løytnant',
+        'Malerlærling', 'Manikyrist', 'Mannekeng', 'Marinamedarbeider', 'Mariningeniør', 'Maritim Sjef', 'Markedsassistent', 'Markedsfører', 'Markedskoordinator', 'Markedsmedarbeider', 'Markedsovervåker', 'Markedssjef', 'Marketingsekretær', 'Marketingsjef', 'Marketingsplanlegger', 'Markisemontør', 'Maskinassistent', 'Maskinfører', 'Maskiningeniør', 'Maskininnbinder', 'Maskinmekaniker', 'Maskinoffiser', 'Maskinpakker', 'Maskinpasser', 'Maskintegner', 'Maskør', 'Masseoppløser', 'Matematikkinstruktør', 'Materialadministrasjonssjef', 'Materialforvalter', 'Medhjelper', 'Medisinalråd', 'Meglerassistent', 'Meierikonsulent', 'Mekaniker', 'Mekanisk Kabeloperasjonstekniker', 'Mengeblander', 'Menger', 'Menig', 'Menighetsarbeider', 'Menighetssekretær', 'Mensendiecker', 'Merkevaresjef', 'Messepike', 'Messeplanlegger', 'Metalliserer', 'Metallpusser', 'Meteorologikonsulent', 'Mikrofilmfotograf', 'Mikseoperatør', 'Militærattache', 'Militærpsykolog', 'Miljøsaneringsarbeider', 'Miljøvernsjef', 'Miljøvernsjef På Svalbard', 'Mineralvannarbeider', 'Minerer', 'Minerydder', 'Minigraverfører', 'Misjonsprest', 'Misjonssekretær', 'Mobilkranfører', 'Modellsnekker', 'Modellør', 'Molekylærbiolog', 'Montasjeingeniør', 'Montasjesjef', 'Moseplukker', 'Motormann', 'Motormannlærling', 'Motormekaniker', 'Motorsykkelbud', 'Motorsykkelreparatør', 'Mub Ingeniør', 'Multimediedesigner', 'Museumsdirektør', 'Museumstekniker', 'Musikkinstrumentreparatør', 'Musikkpedagog', 'Musikkprodusent', 'Musikkterapeut', 'Mykolog', 'Myntarbeider', 'Møbelmontør', 'Møbelsnekker', 'Møbeltapetserer', 'Møllemester', 'Mølleoperatør', 'Møller', 'Mønsteroperatør', 'Mønstersliper',
+        'Namsfullmektig', 'Natler', 'Nattportier', 'Nautisk Instrumentmaker', 'Ndt-Kontrollør', 'Neglskulptør', 'Nemndleder', 'Nestleder', 'Nettmann', 'Nettverksanalytiker', 'Nettverkstekniker', 'Notfisker', 'Nupper', 'Nyhetsredaktør', 'Nyhetsreporter', 'Nyhetssjef', 'Næringsmiddelkandidat', 'Næringsmiddelkontrollør', 'Næringsmiddelteknolog', 'Næringssjef',
+        'Odontolog', 'Odontologisk Forsker', 'Offentlig Godkjent Sykepleier', 'Offisersaspirant', 'Offshore Installation Manager', 'Oldfrue', 'Oljeanalytiker', 'Oljedestillatør', 'Oljedirektør', 'Oljekontraktkjøper', 'Oljekontraktmegler', 'Oljepressearbeider', 'Oljeraffinerer', 'Oljeseparatør', 'Ombud', 'Ombudsmann For Forsvaret', 'Områdebanksjef', 'Områdesjef', 'Omsorgsarbeider', 'Onkolog', 'Onkologisykepleier', 'Operatør', 'Operatør Av Pakkemaskiner', 'Opplæringsfarmasøyt', 'Opplæringskonsulent', 'Opplæringsleder', 'Opplæringssjef', 'Oppmålingstekniker', 'Oppredningsarbeider', 'Oppsynssjef', 'Oppvekstsjef', 'Opsjonsmegler', 'Optikermedarbeider', 'Ordensvakt', 'Ordreplukker', 'Organisasjonskonsulent', 'Organisasjonsleder', 'Organisasjonssekretær', 'Orgelbygger', 'Ortoped', 'Ortopeditekniker', 'Ortopediteknisk Sjef', 'Ortoptist', 'Oseanograf', 'Ostemaker', 'Overgartner', 'Overingeniør', 'Overinspektør', 'Overjordmor', 'Overkokk', 'Overlærskjærer', 'Overpleier', 'Overpostbetjent', 'Overpostmester', 'Overradiograf', 'Oversetter', 'Overstiger', 'Oversykepleier',
+        'Pantelåner', 'Pappsalarbeider', 'Paraplymaker', 'Parkettlegger', 'Parkettsliper', 'Parksjef', 'Parlamentarisk Leder', 'Partisekretær', 'Parykkmaker', 'Parykkmakermester', 'Passkontrollør', 'Pater', 'Patolog', 'Pedagog', 'Pedagogisk Psykolog', 'Pelsbereder', 'Pelsdyroppdretter', 'Pelsmaker', 'Pengeutlåner', 'Perforerer', 'Perfusjonist', 'Personal-Og Økonomidirektør', 'Personalassistent', 'Personalleder', 'Petrofysiker', 'Petroleumsarkitekt', 'Phytoterapeut', 'Pianoreparatør', 'Pianostemmer', 'Piping Ingeniør', 'Pizzabaker', 'Pizzasjåfør', 'Planlegger', 'Planleggingssjef', 'Planner', 'Plasseringsrådgiver', 'Pleiemedarbeider', 'Pleier', 'Poet', 'Polaritetsterapeut', 'Poliklinikksykepleier', 'Poliseprodusent', 'Politiadvokat', 'Politiavdelingssjef', 'Politiførstebetjent', 'Politimester', 'Politioverkonstabel', 'Politisk Sekretær', 'Popmusiker', 'Porteføljeforvalter', 'Porteføljeselger', 'Post Doc.', 'Postdoktor', 'Postfortoller', 'Postfullmektig', 'Postinspektør', 'Postmester', 'Poståpner', 'Preparantassistent', 'Preserveringstekniker', 'Pressebas', 'Pressefotograf', 'Presser', 'Privatassurandør', 'Prodekan', 'Production Supervisor', 'Produksjonsingeniør', 'Produksjonskoordinator', 'Produksjonsmedarbeider', 'Produksjonsoperatør', 'Produksjonsteknisk Leder', 'Produktsekretær', 'Produkttester', 'Produktutviklingskoordinator', 'Programleder', 'Programmerer', 'Programmeringssjef', 'Programsjef', 'Programvaretester', 'Programvareutvikler', 'Promotionkonsulent', 'Promotionmedarbeider', 'Prorektor', 'Prosjektmegler', 'Prosjektoppfølger', 'Prosjektstyringssjef', 'Prosjektøkonom', 'Protesetekniker', 'Protokollfører', 'Protokollsekretær', 'Pubvert', 'Purserassistent', 'Påkleder', 'Pølsemaker',
+        'Rabbiner', 'Radarreparatør', 'Radioingeniør', 'Radioleder', 'Radiosondeleder', 'Radiotekniker', 'Radiotelefonist', 'Raffinerer', 'Rammemaker', 'Redaksjonssekretær', 'Redaktør', 'Regionsekretær', 'Regionsjef', 'Regissør', 'Registrert Legemiddelkonsulent', 'Regningsinnkrever', 'Regnskapsansvarlig', 'Rehabiliteringsterapeut', 'Reineier', 'Reklamefotograf', 'Reklamekonsulent', 'Reklamesekretær', 'Rekrutteringskonsulent', 'Rektor', 'Rekvisitamaker', 'Rekvisittleder', 'Rembursjef', 'Renholdsbetjent', 'Renholdsinspektør', 'Renholdskonsulent', 'Renholdsleder', 'Renovasjonskjører', 'Renseriarbeider', 'Renseribestyrer', 'Renserimaskinarbeider', 'Reparatør', 'Resepsjonsfullmektig', 'Resepsjonsleder', 'Reservedelsekspeditør', 'Reservedykker', 'Reservesjåfør', 'Ressurskoordinator', 'Restaurantinspektør', 'Restaureringsassistent', 'Restaureringstekniker', 'Rettsgenetiker', 'Rettsskriver', 'Revisjonsleder', 'Revisjonsrådgiver', 'Revisjonssjef', 'Revisor', 'Revisormedarbeider', 'Ridelærer', 'Rigger', 'Riksantikvar', 'Riksarkivar', 'Riksbibliotekar', 'Risiko Controller', 'Rockemusiker', 'Rockesanger', 'Rodeleder', 'Romanforfatter', 'Rosenterapeut', 'Roughneck', 'Rullestolreparatør', 'Ryddehjelp', 'Rådgivende Overlege', 'Røkter', 'Røntgenassistent', 'Røringeniør', 'Rørsveiser',
+        'Sagbladstiller', 'Sagbruks- Og Høvleriarbeider', 'Sagsliper', 'Salatbarmedarbeider', 'Salgsanalytiker', 'Salgsassistent', 'Salgsingeniør', 'Salgskontrollør', 'Salgsrådgiver', 'Salgssekretær', 'Sambandsoffiser', 'Sametingspresident', 'Samfunnsgeograf', 'Saneringsarbeider', 'Scanner', 'Sceneinstruktør', 'Scenemester', 'Seismisk Personell', 'Sekretær', 'Seksjonsoverlege', 'Sektorsjef/assisterende Leder Av Politistyrke', 'Selfanger', 'Selger', 'Sementarbeider', 'Sementeringstekniker', 'Seminarholder', 'Senior Ingeniør', 'Senior Maskiningeniør', 'Senior Operatør', 'Senior Planleggsingsingeniør', 'Senior Økonomikonsulent', 'Senioranalytiker', 'Seniorinnkjøper', 'Seniorinspektør', 'Seniormetallurg', 'Seniorserviceingeniør', 'Senterleder', 'Sentralbanksjef', 'Sentralbordleder', 'Serigraf', 'Service Manager', 'Servicemontør',  'Servitør', 'Shopper', 'Shoveldoserkjører', 'Signalmann', 'Sikkerhetsansvarlig', 'Sikkerhetsdirektør', 'Sikkerhetsleder', 'Silketrykker', 'Sivilforsvarsinspektør', 'Sivilombud', 'Siviløkonom', 'Sjefbioingeniør', 'Sjeflege', 'Sjefsfysioterapeut', 'Sjefsingeniør', 'Sjefskokk', 'Sjefslandskapsarkitekt', 'Sjefssykepleier', 'Sjefsøkonom', 'Sjåfør Klasse B', 'Skadedyrkontrollør', 'Skadekonsulent', 'Skademedarbeider', 'Skaderegulerer', 'Skadesjef', 'Skatteregnskapssjef', 'Skatterevisor', 'Skiftekontrollør', 'Skiftingeniør', 'Skiftleder', 'Skilærer', 'Skimaker', 'Skinnsorterer', 'Skippingmedarbeider', 'Skipsradiomontør', 'Skipsreperatør', 'Skipsrørlegger', 'Skipssmed', 'Skjenkekontrollør', 'Skogbestyrer', 'Skogbruksplanlegger', 'Skogdirektør', 'Skogformann', 'Skogforvalter', 'Skogfullmektig', 'Skogsmaskinfører', 'Skogtaksator', 'Skoleassistent', 'Skoledirektør', 'Skolefritidsleder', 'Skoleinspektør', 'Skolepsykolog', 'Skolerådgiver', 'Skomakerlærling', 'Skopusser', 'Skoreparatør', 'Skrankeekspeditør', 'Skrankemedarbeider', 'Skredder', 'Skribent', 'Skript', 'Skuespiller', 'Skummer', 'Skøyteinstruktør', 'Slaktermester', 'Slankekonsulent', 'Sminkeassistent', 'Småbruker', 'Smører', 'Snekkermester', 'Snurrevadfisker', 'Snømåker', 'Snørelager', 'Soknediakon', 'Soneterapeut', 'Sortbytter', 'Sorterer', 'Sorteringsleder', 'Sortersalarbeider', 'Sosialfaglig Leder', 'Sosialinspektør', 'Sosialrådmann', 'Sosialsekretær', 'Sparklingsarbeider', 'Speditør', 'Spesialbioingeniør', 'Spesialergoterapeut', 'Spesialfysioterapeut', 'Spesiallærer', 'Spesialpedagog', 'Spesialpsykolog', 'Spesialrevisor', 'Spesialrådgiver', 'Spesialsykepleier', 'Spesialtannlege', 'Spoler', 'Sporveisdirektør', 'Spregningsarbeider', 'Spritdestillatør', 'Sprøytelakkerer', 'Spåkone/-Mann', 'Stabssjef', 'Staffcaptain', 'Stallkar', 'Stallmann', 'Stallpike', 'Stasjonsbetjent', 'Stasjonssjef', 'Statslosaspirant', 'Statsmeteorolog', 'Statsmykolog', 'Statssekretær', 'Statsskogsjef', 'Steinbruddsarbeider', 'Steinfagmester', 'Steward', 'Stillasbygger', 'Stipendiat', 'Stopper', 'Store Manager', 'Storkundeansvarlig', 'Stortingspresident', 'Storurmaker', 'Strategirådgiver', 'Stråleterapeut', 'Studieinspektør', 'Studieleder', 'Studiobetjent', 'Studioformann', 'Stuert', 'Styreleder', 'Styremedlem', 'Støttekontakt', 'Surveyer', 'Svakstrømsmontør', 'Sveiseinspektør', 'Sveiserlærling', 'Sykehusdirektør', 'Sykehusfarmasøyt', 'Sykehuslaborant', 'Sykehusprest', 'Sykehussjef', 'Sysselmann', 'Systemanalytiker', 'Systemarkitekt', 'Systemerer', 'Systemingeniør', 'Systemsjef', 'Systemtekniker', 'Systemtester', 'Systemutvikler', 'Sølvsiselør', 'Sølvsmed', 'Sølvtrykker', 'Søppelkjører',
+        'Taksteinlegger', 'Takstmann', 'Takstøkonom', 'Taktekker', 'Tallmagiker', 'Tannhelsesekretær', 'Tannhygieniker', 'Tannlegeassistent', 'Tannteknikermester', 'Tapper', 'Tapperiformann', 'Taubanefører', 'Taxisjåfør', 'Teglsorterer', 'Tegneassistent', 'Teknisk Ansvarlig', 'Teknisk Direktør', 'Teknisk Rådmann', 'Tekstilkonservator', 'Tekstilkunstner', 'Tekstiloperatør', 'Tekstiltrykker', 'Teleekspeditør', 'Telefonsentralmontør', 'Telefullmektig', 'Telegrafbetjent', 'Telekommunikasjonsingeniør', 'Telesjef', 'Teolog', 'Teppelegger', 'Terminalansvarlig', 'Terminalarbeider', 'Terminalleder', 'Termisk Sprøyter', 'Tilrettelegger', 'Tilsynslege', 'Tilsynsveterinær', 'Tiltakssjef', 'Tivoliarbeider', 'Togelektriker', 'Togkontrollør', 'Togsjef', 'Tolldistriktssjef', 'Tollkasserer', 'Tollstedsjef', 'Topograf', 'Torghandler', 'Total Service Manager', 'Totalisatorfunksjonær', 'Trafikkflyger', 'Trafikklærer', 'Trafikksjef', 'Trailersjåfør', 'Transformatormontør', 'Transportformann', 'Transportleder', 'Transportmedarbeider', 'Transportsjef', 'Transportør', 'Tredreier', 'Trepleier', 'Trikkefører', 'Truckfører', 'Trygdedirektør', 'Trygderevisor', 'Trygdesjef', 'Trykker', 'Trykktester', 'Trålbas', 'Turistvert', 'Turoperatør', 'Tvisteløseleder', 'Tvisteløser', 'Tårnarbeider', 'Tårnkranfører', 'Tårnmann', 'Tømmerberegner', 'Tømmerfløter', 'Tømmerhogger', 'Tømmermåler', 'Tømmermålingsinspektør', 'Tømmersjef', 'Tømmersorterer', 'Tørkepasser', 'Tørker', 'Tørrfisktilvirker', 'Tørrstoffkoker',
+        'Ullklassifisør', 'Undervisningsassistent', 'Underwriter', 'Utbyggingssjef', 'Utenrikskorrespondent', 'Utenriksredaktør', 'Utenriksråd', 'Utmarkstekniker', 'Utreder', 'Utredningsingeniør', 'Utrykningsleder', 'Utstyrsoperatør', 'Utviklingsdirektør', 'Utviklingssjef',
+        'Va-Ingeniør', 'Vakt', 'Vaktbetjent', 'Vaktmann', 'Vaktmesterassistent', 'Valutakoordinator', 'Valutasjef', 'Vannverkssjef', 'Varabrannmester', 'Vareautomatoperatør', 'Varemegler', 'Varmebehandler', 'Vaskeriassistent', 'Vedlikeholdsingeniør', 'Vedlikeholdstekniker', 'Vegvalsekjører', 'Vekterlærling', 'Vektkontrollør', 'Velferdssekretær', 'Velferdssjef', 'Verftssjef', 'Verkstedansvarlig', 'Verkstedarbeider', 'Verkstedformann', 'Verkstedingeniør', 'Verkstedmedarbeider', 'Verkstedsjef', 'Verktøyinnstiller', 'Verktøykonstruktør', 'Verktøymaker', 'Verktøysliper', 'Verneingeniør', 'Verneombud', 'Vervet', 'Veterinærinspektør', 'Vever', 'Vikarbyråkonsulent', 'Viltforvalter', 'Viltkonsulent', 'Vinduspusser', 'Viseadmiral', 'Visekonsernsjef', 'Visekonsul', 'Visesanger', 'Voksenopplæringssjef', 'Vraker', 'Vytnesjæjja', 'Værelsesbetjent', 'Værvarslingssjef',
+        'Web-Publisher', 'Webdesigner', 'Webmaster', 'Webredaktør',
+        'Yrkesfaglærer', 'Yrkesopplæringsleder', 'Yster',
+        'Økonom', 'Økonomiarbeider',
+        'Øre-Nese-Hals-Spesialist',
+    );
 }
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/nl_BE/Person.php b/vendor/fzaninotto/faker/src/Faker/Provider/nl_BE/Person.php
index c9ac865b..bde3bf64 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/nl_BE/Person.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/nl_BE/Person.php
@@ -2,6 +2,8 @@
 
 namespace Faker\Provider\nl_BE;
 
+use Faker\Provider\DateTime;
+
 class Person extends \Faker\Provider\Person
 {
     protected static $firstNameMale = array(
@@ -69,4 +71,36 @@ class Person extends \Faker\Provider\Person
         'Vermeersch', 'Vermeiren', 'Vermeulen', 'Verschueren', 'Verstraete', 'Verstraeten',
         'Vervoort', 'Wauters', 'Willems', 'Wouters', 'Wuyts', 'Yildirim', 'Yilmaz'
     );
+
+    /**
+     *  Belgian Rijksregister numbers are used to identify each citizen,
+     *  it consists of three parts, the person's day of birth, in the
+     *  format 'ymd', followed by a number between 1 and 997, odd for
+     *  males, even for females. The last part is used to check if it's
+     *  a valid number.
+     *
+     *  @link https://nl.wikipedia.org/wiki/Rijksregisternummer
+     *
+     *  @param string|null $gender 'male', 'female' or null for any
+     *  @return string
+     */
+    public static function rrn($gender = null)
+    {
+        $middle = self::numberBetween(1, 997);
+        if ($gender === static::GENDER_MALE) {
+            $middle = $middle %2 === 1 ? $middle : $middle+1;
+        } elseif ($gender === static::GENDER_FEMALE) {
+            $middle = $middle %2 === 0 ? $middle : $middle+1;
+        }
+        $middle = sprintf('%03d', $middle);
+        
+        $date = DateTime::dateTimeThisCentury();
+        $dob = sprintf('%06d', $date->format('ymd'));
+        $help = $date->format('Y') >= 2000 ? 2 : null;
+
+        $check = intval($help.$dob.$middle);
+        $rest = sprintf('%02d', 97 - ($check % 97));
+        
+        return $dob.$middle.$rest;
+    }
 }
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/nl_BE/Text.php b/vendor/fzaninotto/faker/src/Faker/Provider/nl_BE/Text.php
new file mode 100644
index 00000000..d41104d1
--- /dev/null
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/nl_BE/Text.php
@@ -0,0 +1,25347 @@
+<?php
+
+namespace Faker\Provider\nl_BE;
+
+class Text extends \Faker\Provider\Text
+{
+    /**
+     * The Project Gutenberg EBook of De legende en de heldhaftige, vroolijke en
+     * roemrijke daden van Uilenspiegel en Lamme Goedzak in Vlaanderenland en elders, by Charles de Coster
+     *
+     * This eBook is for the use of anyone anywhere at no cost and with
+     * almost no restrictions whatsoever.  You may copy it, give it away or
+     * re-use it under the terms of the Project Gutenberg License included
+     * with this eBook or online at www.gutenberg.org/license
+     *
+     *
+     * Title: De legende en de heldhaftige, vroolijke en roemrijke daden
+     * van Uilenspiegel en Lamme Goedzak in Vlaanderenland en elders
+     *
+     * Author: Charles de Coster
+     *
+     * Release Date: July 3, 2005 [EBook #11208]
+     * [Last updated: March 14, 2015]
+     *
+     * Language: Dutch
+     *
+     * @see http://www.gutenberg.org/cache/epub/11208/pg11208.txt
+     * @var string
+     */
+    protected static $baseText = <<<'EOT'
+  De legende en de heldhaftige,
+                    vroolijke en roemrijke daden van
+                     Uilenspiegel en Lamme Goedzak
+                      in Vlaanderenland en elders
+
+
+                                  door
+
+                           Charles de Coster
+
+
+
+                     in het Vlaamsch vertaald door
+
+                 Richard Delbecq   en   René de Clercq
+                 (voor het proza)     (voor de liederen)
+
+                               Derde druk
+                     met 22 platen van Jules Gondry
+                                  1919
+
+
+
+
+
+
+
+KORTE LEVENSBESCHRIJVING VAN CHARLES DE COSTER
+
+Bewerkt naar Ch. Potvin, Francis Nautet enz.
+
+
+Charles-Theodore-Henri De Coster werd geboren te München, den 20n
+Augustus 1827. Zijn vader was intendant van graaf Charles Mercy
+d'Argenteau, aartsbisschop van Tyrus, die peter des kunstenaars was en
+hem de markiezin Henriette de la Tour Dupin, vrouw van den Franschen
+gezant te Turijn, tot meter gaf.
+
+De kleine De Coster, een engeltje van een knaap, sleet dus zijne
+eerste levensjaren in het paleis van den aartsbisschop, midden in
+weelde, in bloemen, geliefkoosd door zijne ouders en zijnen peter. Zijn
+eerste opvoeding was dus zeer aristocratisch en die indrukken blijven
+gewoonlijk onuitwischbaar.
+
+Doch weinig tijds nadien verandert dit alles. Zijne ouders verlaten
+München en gaan naar Brussel, waar hun tweede kind ter wereld komt;
+dan sterft zijn vader te Ieperen, bij zijn broeder, die daar geneesheer
+was. Zijn moeder keert terug naar Brussel bij hare zuster en hare
+kinderen.
+
+Charles was reeds in eene kostschool te Etterbeek, waar "ik mij zal
+moeten schikken naar den wil van een ander", zegt hij, "na zoolang
+mijn zin te hebben gedaan". Als hij uit de kostschool komt, is het
+om in het "Collège Saint-Michel" te treden, waar men een oogenblik
+hoopte dat het kind, dat reeds de droomerijen boven de droge studiën
+verkoos, zich aan het priesterschap zou wijden.
+
+Eerst dacht hij in de balie te treden, doch een vriend deed hem
+opmerken dat de rechten en de kunst moeilijk samengaan, en De Coster,
+geholpen door machtige beschermers, aanvaardde eene bediening in de
+"Société Générale".
+
+In 't lot gevallen, stelde zijne moeder eenen plaatsvervanger, die
+wegliep; na eenige dagen in het regiment, bij zijn kolonel, vertoefd
+te hebben, "om den plaatsvervanger te vervangen", maakte de jonge
+bediende op zijne beurt van de gelegenheid gebruik om zijne plaats
+te ontloopen. "Het ambtenaarsleven bevalt mij in het geheel niet",
+zegde hij. In de Bank voelde hij zich als een vreemdeling te midden
+van de bureaucraten. Hij stikte in die atmosfeer en "overigens wilde
+hij voor zich zelven werken". De letterkundige roeping verkreeg de
+bovenhand en hij trad in 1850 in de Hoogeschool van Brussel, waar
+hij het diploma van candidaat in de letteren behaalde.
+
+Maar De Coster gaf aan de Hoogeschool noch zijn hart, noch zijnen
+geest, noch zijne pen. Toen hij ze verliet, was hij noch doctor,
+noch professor, noch dagbladschrijver, noch tooneeldichter. Maar hij
+was kunstenaar, meer dan ooit.
+
+Vervolgens wilde hij in de redactie van een dagblad treden, maar hij
+aanbad het schoone boven alles en weigerde "een werktuig te maken
+van zijne pen".
+
+Dan begint een jammerlijk leven van voortdurenden tegenspoed en
+onbegrepen arbeid. In 1856 weigert hij eene plaats bij een makelaar
+in wijnen,--alles wat men hem aanbood.
+
+Om het even, de jonge kunstenaar heeft wilskracht en, door al zijn
+kommer heen, maakt hij eervol naam in de Fransche letterkunde. Buiten
+en behalve menigvuldige gewaardeerde bijdragen in dagbladen en
+tijdschriften, levert hij, in 1856, les Frères de la bonne trogne
+(Brabantsche legende); in 1857, de Légendes flamandes et wallones,
+die een ongemeenen bijval ontmoeten en door de Fransche pers vleiend
+beoordeeld worden; in 1861, de Contes brabançons.
+
+Zijn peter, de aartsbisschop, had hem sedert lang zijne bescherming
+onttrokken, die hem zeker ware bijgebleven, hadde De Coster zijne
+studiën in de Hoogeschool van Leuven willen doen. Hij had Brussel
+verkozen, waar hij vrienden vond. Dat was eene keuze doen voor de
+algeheele vrijheid des geestes. In 1863 wordt het petekind van den
+aartsbisschop van Tyrus lid van de Vrije Gedachte van Brussel. Hij was
+toen in den vollen bloei van zijn eersten bijval en gansch vervoerd
+door zijne liefde voor het schoone.
+
+Zijne liefde voor het volk, voor het wakkere Vlaamsche volk, stuwt
+hem voorwaarts en houdt zijn machtig genie bezig. De schilder Dillens
+zijn vriend, bezat in zijn werkhuis een verzameling oude Vlaamsche
+boeken. De Coster en Dillens doen verscheidene reizen door Zeeland
+en Vlaanderen: de "Legende van Uilenspiegel" was van dan af geboren
+in De Coster's brein.
+
+De Legende van Uilenspiegel en Lamme Goedzak, in de letterwereld
+met ongeduld verwacht, verscheen in 1867 in een prachtige uitgave,
+opgeluisterd met twee en dertig etsen van negentien talentvolle
+kunstenaars.
+
+Ziehier wat onder meer drie Fransche bladen zeiden van dat gewrocht:
+
+La Liberté van 18 December 1868: "'t Is een heldendicht in proza,
+waarin het bloed zoo rijkelijk vloeit als het bier. Men zou zeggen
+een kermis rondom eenen brandstapel".
+
+Le Constitutionnel, 9 December 1868, wijdde drie groote kolommen
+aan Uilenspiegel, waarin de recensent het boek met Goethe's Faust
+vergelijkt.
+
+Le Corsaire: "'t Is een heldendicht in proza, 't is de verheerlijking
+van den Vlaamschen geest".
+
+Heel de Fransche pers deelde dit gevoelen en drukte hare bewondering
+in de vleiendste artikelen uit.
+
+Onze Busken Huët getuigde: "Hollanders noch Vlamingen bezitten een
+werk over de XVIe eeuw in Vlaanderen, dat met het meesterwerk van De
+Coster kan vergeleken worden".
+
+Na Uilenspiegel verscheen nog: Voyage de noce (1872) en le Mariage
+de Toulet (1879).
+
+Edoch De Coster, die in het volle succes van de Légendes flamandes
+zijne vriendin verloren had, zag zich op 29 Juli 1869, wanneer
+Uilenspiegel zoo gunstig onthaald werd, nu nog zijne moeder ontrukken.
+
+Die ramp schokte hem diep in zijn reeds droevig bestaan, want De Coster
+leefde veelal in armoede, niettegenstaande zijn talent en de gunst
+waarmede zijne werken ontvangen werden. Schrale schrijversrechten,
+karige toelagen, luttel betaalde lessen moesten hem vrijwaren voor
+ellende. Hij kloeg dan ook, steeds denzelfden strijd te moeten
+herbeginnen. In 1870 schreef hij: "Hoewel ik veel gewerkt heb
+uit lust en uit liefde, begrijp ik, sedert minder dan drie jaar,
+de schrikverwekkende waarde van het geld en de noodwendigheid van
+een arbeid, die, genoegzaam betaald, den mensch, met den welstand,
+ook vrijheid en vreugde schenkt".
+
+Maar daarom legde hij zijne fierheid niet af.
+
+Toen eindelijk de regeering, een tiental jaren vóór zijnen dood, er
+aan dacht de verstandelijke hulpmiddelen van den grooten schrijver
+ten behoeve van het onderwijs aan te wenden, was het te laat. Hij
+stak zoo diep in schulden, dat zijne benoeming geen anderen uitslag
+opleverde dan eene opschudding te verwekken onder zijne schuldeischers,
+die zijn traktement aansloegen en hunne prooi niet meer loslieten.
+
+Toen hij stierf, op 7 Mei 1879, verkeerde hij in de diepste ellende.
+
+                   *       *       *       *       *
+
+Den 22n Juli 1894 werd door het gemeentebestuur van Eisene een
+eenvoudig doch treffend gedenkteeken van den beeldhouwer Samuel ter
+nagedachtenis van De Coster ingehuldigd.
+
+
+
+
+
+
+
+DE LAATSTE OOGENBLIKKEN VAN CHARLES DE COSTER.
+
+
+Charles De Coster stierf op 7 Mei 1879, te Elsene, in het huis, dat
+den hoek uitmaakt van de Gewijde-Boomstraat, en toen gehuurd werd
+door een fruitverkooper. Heel de woning van den grooten kunstenaar
+bestond uit de twee kamers op de eerste verdieping: de grootste was
+zijn werkkabinet, de andere zijne slaapkamer; daarin stonden een
+ijzeren bed, een kleine tafel, een houten kast, eenige stoelen.
+
+Hij had zich den dag te voren te bed gelegd: de pisvloed waaraan
+hij leed, en diens noodlottige gezellin, de longtering, waren
+plotseling verergerd. Charles De Coster nam zelden zijne toevlucht tot
+geneesheeren; een zijner vrienden nochtans, M. Kirkpatrick, verschrikt
+over den voortgang van de kwaal, had den heer dokter Vaucleroy,
+geneesheer aan de Krijgsschool, ontboden. Toen deze kwam, vond hij
+aan de sponde van den zieke eene oppasster, die De Coster in zijn
+verheven en grenzenloos medelijden met de onterfden en ongelukkigen,
+bij zich genomen had. Deze arme vrouw, die bij den zieltogende waakte,
+was zelve het toonbeeld des doods; heel haar aangezicht was ingevreten
+door zweren. De geneesheer ging heen zonder hoop den zieke te redden,
+maar hij voorzag toch geen dreigenden dood: hij zou 's anderen daags
+namiddags terugkomen.
+
+'s Anderen daags scheen De Coster zijn nakend einde niet bewust te
+zijn, want hij vroeg noch naar zijnen schoonbroeder, noch naar zijne
+zuster, die hij aanbad. Doch hij wilde zich omringen van vrienden,
+als om zijn lichaam en zijn hart te verwarmen. Hij liet deze roepen,
+die in de nabijheid woonden: zoo werden Félix Bouré, de beeldhouwer,
+en later ik zelf geroepen. Bouré was ziek; hij verwittigde zijn
+broeder, mede een vriend van De Coster: de heer Bouré vond in het
+werkkabinet kapitein Mertens die, diep bedroefd, in de kamer van den
+zieke niet dorst gaan. Deze betoonde een levendige erkentelijkheid
+aan den heer Bouré, die zijn bed wat gemakkelijker schikte en hem te
+drinken gaf. Toen ik en mijne vrouw op onze beurt kwamen, richtte De
+Coster zich op in zijn bed en herkende mij heel goed. Kloekmoedig in
+het aanschijn van den dood, had hij nog het gedacht om den heer Bouré
+en mij aan elkander voor te stellen. De heer Bouré bevestigde mij dat
+hij, toespeling makend op mijn beroep van advocaat, eenige Latijnsche
+woorden mompelde. Maar zijn blik verduisterde, zijne ademhaling werd
+hijgend; toen mijne vrouw hem naderde om zijn hoofdkussen te schikken
+en zijn voorhoofd te verfrisschen, moest hij eene inspanning doen om
+heur te herkennen: "Hoe, gij ook, mevrouw, ik dank u zeer!" Daarna
+werd de ademhaling flauwer, een laatste naam, die zijner zuster,
+kwam pijnlijk over zijne lippen: "Ca...ro...line". Het was zijn hart,
+dat ontsnapte. Het was twee uren.
+
+
+Hector Denis.
+
+
+
+
+
+
+
+VOORREDE VAN DEN UIL [1]
+
+
+Heeren kunstenaars, heeren uitgevers, heer dichter, ik heb u eenige
+aanmerkingen te doen aangaande uwe eerste uitgave. Hoe! in dat
+lijvige boek, in dien olifant dien gij met achttienen naar den roem
+tracht te drijven, hebt gij het kleinste plaatsje niet gegund aan
+den vogel van Minerva, den wijzen, omzichtigen uil! In Duitschland
+en in dat Vlaanderen dat gij zoozeer bemint, reis ik gedurig op den
+schouder van Uilenspiegel, die maar aldus genoemd wordt, omdat zijn
+naam bediedt: Uil en Spiegel, wijsheid en komediespel. Die van Damme,
+waar hij geboren werd, naar men zegt, spreken uit: Ulenspiegel, door
+samentrekking en de gewoonte die zij hebben u in stee van Ui uit te
+spreken. Dat is hunne zaak.
+
+Gij hebt eene andere uitlegging uitgedacht: Ulen voor U lieden Spiegel,
+de Spiegel van U, boeren en heeren, geregeerden en regeerders, de
+spiegel van de dwaasheden, de belachelijkheden, de misdaden van een
+tijdstip. Dat was vernuftig, maar onredelijk. Men moet nooit afbreken
+met den slenter.
+
+Misschien vondt gij het vreemd de wijsheid te verbeelden door een--naar
+uwe meening--treurigen, belachelijken vogel, een gebrilden schoolvos,
+een kermis-grappenmaker, een vriend der duisternis, dien men niet
+hoort vliegen en die doodt zonder dat men hem hoort komen, evenals de
+Dood. Nochtans gelijkt gij op mij, huichelaars die lacht met mij. In
+menige uwer nachten stroomde het bloed onder de slagen der Moord,
+die op vilten zolen liep, opdat men heur ook niet zoude hooren komen.
+
+Brak, in uw aller geschiedenis, nooit geen bleeke dageraad aan, die met
+zijn vale schemering de met lijken van mannen, vrouwen en kinderen
+bedekte straatsteenen verlichtte? Waarvan leeft uwe Staatkunde,
+sedert dat gij over de wereld regeert? Van worgen en moorden.
+
+Ik, uil, de leelijke uil, ik dood om mij te spijzen, om mijne jongen
+te spijzen, ik dood niet om te dooden. Verwijt gij mij de vogeltjes
+op te peuzelen, dan kan ik u even goed de slachting verwijten die
+gij aanricht onder alles wat leeft. Gij hebt boeken geschreven waarin
+gij met verteedering spreekt over de lichtheid van de vogelen, over
+hunne minnarijen, over hunne schoonheid, over de kunst waarmede zij hun
+nestje bouwen, en over de angsten des moederschaps, vervolgens zegt gij
+met welke saus men ze moet opdienen en in welke maand van het jaar zij
+de vetste stoverij opleveren. Ik, ik maak geen boeken, God beware mij
+daarvoor, anders schreef ik dat, als gij den vogel niet kunt opeten,
+gij het nest opeet, uit vreeze dat gij een hap zoudt verliezen.
+
+Wat u betreft, onbesuisde dichter, het was uw belang mij terug te
+brengen in uw werk, waarvan ten minste twintig hoofdstukken mij
+toebehooren [2] de andere laat ik u in onbetwisten eigendom. Men mag
+toch wel het volstrekt meesterschap behouden over de domheden die
+men laat drukken. Schreeuwende dichter, gij slaat links en rechts op
+die welke gij de beulen des vaderlands heet, gij stelt Keizer Karel
+en Philips II aan den schandpaal der geschiedenis; gij zijt geen
+uil; gij zijt niet voorzichtig. Weet gij of er geen Keizer Karel
+of geen Philips II op de wereld meer bestaan? Vreest gij niet dat
+eene opmerkzame censuur uit den buik van uwen olifant toespelingen
+op doorluchtige tijdgenooten vinde? Waarom laat gij dien Keizer en
+dien Koning niet slapen in hun graf? Waarom moet gij al die majesteit
+aanblaffen? Die het zweerd trekt, zal door het zweerd vergaan. Er zijn
+menschen die het u nooit zullen vergeven, ik ook vergeef het u niet,
+gij stoort mijne burgerlijke spijsvertering.
+
+Wat beteekent die bestendige tegenstelling tusschen een verfoeiden
+koning, wreedaardig van jongs af--daarom is het een mensch--en
+dat Vlaamsche volk, dat gij ons wilt voorstellen als heldhaftig,
+gulhartig, eerlijk en werkzaam? Wie zegt u dat die koning slecht en
+dat volk goed was? Wijselijk zou ik u het tegenovergestelde kunnen
+bewijzen. Uwe hoofdpersonages zijn dwazen of zotten, zonder er een
+uit te zonderen: uw deugniet van Uilenspiegel neemt de wapenen op
+voor de gewetensvrijheid; zijn vader Klaas sterft, laat zich levend
+verbranden voor zijne godsdienstige overtuiging; zijne moeder, Soetkin,
+kwijnt van verdriet en sterft ten gevolge van de foltering, om een
+fortuin voor haren zoon te bewaren; uw Lamme Goedzak stapt recht door
+het leven alsof het al was, goed en eerlijk op deze wereld te zijn;
+uwe kleine Nele, die niet leelijk is, bemint in heel haar leven maar
+een enkelen man.... Waar ziet men nog zulke dingen? Ik zou u beklagen,
+zoo ge mij niet deedt lachen.
+
+Nochtans moet ik bekennen dat naast die bespottelijke personages, er
+wel eenige zijn die ik geerne onder mijne boezemvrienden zoude nemen:
+uwe Spaansche huurlingen, uwe monniken die het gemeen verbranden,
+uwe Gilline, spionneerster der Inquisitie, uw gierige vischverkooper,
+aanklager en weerwolf, uw edelman die 's nachts duivel speelt om eene
+onnoozele te verleiden, en vooral dien omzichtigen Philips II, die,
+geld noodig hebbende, de heilige beelden in de kerken doet breken,
+ten einde een opstand te beteugelen waarvan hij de wijze aanstoker
+was. Minder kan men toch niet, als men geroepen is te erven van
+degenen die men doodt.
+
+Maar ik geloof dat al mijne woorden verloren moeite zijn. Gij weet
+niet wat een uil is. Ik ga het u zeggen.
+
+De uil is hij die in 't geniep, eerroof stookt onder de lieden
+die hem hinderlijk zijn en die, als men hem vraagt of hij de
+verantwoordelijkheid over zijne gezegden wil dragen, voorzichtig
+antwoordt: Ik bevestig niets, Men heeft mij gezegd.... Hij weet wel
+dat Men onvindbaar is.
+
+Uil is hij die een eerlijk gezin binnendringt, zich aanstelt als
+een trouwer, een meisje verleidt, geld ontleent, soms zijne schuld
+betaalt en henengaat als er niets meer te nemen is.
+
+Uil, de politieke man die een masker van vrijheid, van oprechtheid,
+van menschenliefde opzet en die, op een gegeven oogenblik, zonder te
+verwittigen, een man of eene natie zachtjes de keel toeworgt.
+
+Uil, de koopman die zijnen wijn doopt, zijne eetwaren vervalscht,
+een kwade maag brengt daar waar spijsverteering,--woede, daar waar
+vroolijkheid was.
+
+Uil, hij die behendig steelt, zonder dat men hem bij den kraag vatten
+kan, valsch getuigt tegen de waarheid, de weduwe ten onder brengt,
+de weeze stroopt, en zegepraalt in 't vet, lijk anderen zegepralen in
+'t bloed.
+
+Uilin, zij die hare schoonheid verkoopt, de beste harten van
+jongelieden vermorst, dat heeten: de jeugd vormen, en ze zonder eenen
+cent, achterlaat in het slijk waarin zij hen sleepte.
+
+Als ze ooit treurig gestemd is, zich ooit herinnert dat ze vrouw is,
+moeder zoude kunnen zijn, dan verloochen ik heur. Als ze, dat bestaan
+moede, in 't water springt, dan is zij eene zinnelooze, die niet
+verdiende te leven.
+
+Zie rondom u, domme schrijver, en tel, als gij kunt, de uilen van deze
+wereld; bedenk of het voorzichtig is gelijk gij het doet, van Macht
+en List, die koninginnen der uilen, aan te vallen. Kom tot inkeer,
+zeg mea culpa en vraag op uwe knieën om vergiffenis.
+
+Nochtans hebt gij mijne belangstelling gewonnen door uwe onbesuisdheid,
+vol zelfvertrouwen; tegen mijne gekende gewoonten in, verwittig ik u
+dan ook dat ik, op staanden voet, de grofheid en roekeloosheid van
+uwen stijl ga aanklagen bij mijne neven in letterkunde, die eene
+sterke pen, eene stoute tong en voortreffelijke brillen hebben, en
+zeer voorzichtige en pedante lieden zijn, die uwen trant niet gewoon
+zijn en hunne taal zoozeer kuischen, dat er ten lange laatste niets
+zal van overblijven. [3]
+
+
+Bubulus Bubb.
+
+
+
+
+
+
+
+EERSTE BOEK.
+
+
+I.
+
+In meimaand, als de hagedoorn in bloei stond, werd te Damme, in
+Vlaanderenland, Uilenspiegel, de zoon van Klaas geboren.
+
+Terwijl Katelijne, de vroedvrouw, hem in warme doeken bakerde, bezag
+ze zijn hoofd en riep ze blijde uit:
+
+--Hij is met den helm geboren!
+
+Maar weldra jammerend, met den vinger een zwart stipje op den schouder
+van den boorling toonend:
+
+--Laas! schreide zij, dat is het zwarte merk van den vinger des
+duivels!
+
+--Heer Satan is vandaag vroeg opgestaan, antwoordde Klaas, dat hij
+alreeds den tijd vond om mijn zoon te teekenen?
+
+--Satan sliep nog niet, zei Katelijne, want luister, nu eerst kraait
+Kanteklaar de hennen wakker.
+
+En zij gaf het kind over aan Klaas en ging naar buiten.
+
+De dageraad verdreef nu het nachtelijk duister, de zwaluwen vlogen
+kwetterend rakelings over de weide, en de zon kleurde vuurrood
+de kimme.
+
+Klaas deed het venster open en sprak tot Uilenspiegel:
+
+--Kind met den helm, zie, daar is moeder de Zon, die Vlaanderenland
+komt groeten. Bezie haar als uwe kijkers zullen open zijn; verkeert
+gij later ooit in twijfel, weet gij niet wat te doen om goed te doen,
+ga dan om raad bij de Zonne; zij is warm en helder: wees zoo goed
+als zij warm, zoo eerlijk als zij helder is.
+
+--Klaas, mijn man, zei Soetkin, ge spreekt tot een doove; kom en drink,
+mijn jongen.
+
+En de moeder stak den boorling hare schoone, blanke borsten toe.
+
+
+
+
+II.
+
+Terwijl Uilenspiegel zich laafde aan de levensbron, ontwaakten al de
+vogelkens in 't veld.
+
+Klaas, die mutsaards bond, bezag zijne vrouw, die Uilenspiegel de
+borst gaf.
+
+--Zeg eens, vrouw, sprak hij, hebt ge nog veel van die lekkere melk?
+
+--De kruiken zijn vol, man, antwoordde zij, maar dat is niet voldoende
+om mijn hert te verblijden.
+
+--Gij spreekt zoo treurig en het is zoo vroeg nog in den morgen.
+
+--Ik denk er aan, dat er geen oortje meer steekt in de tassche,
+die daar aan den muur hangt.
+
+Klaas nam de tassche van den wand; maar hij had goed schudden, er
+rinkelde geen geld in. Hij was er onthutst over; doch hij wilde zijne
+vrouw moed inspreken, en zei:
+
+--Waarover bekommert gij U? Hebben wij in de schapraai den koek
+niet liggen, dien Katelijne ons gisteren gaf? Zie ik daar geen groot
+stuk vleesch, dat ten minste voor drie dagen goede melk aan 't kind
+zal geven? Die zak boonen daar in den hoek, is die een voorteeken
+van hongersnood? En dat kuipje boter bestaat toch niet in mijne
+verbeelding? In mijne verbeelding ook niet, die appelen, welke,
+met elven in 't gelid, op onzen zolder liggen? En de dikke tonne
+schuimende Brugsche kuite, noodt zij ons niet, met haren vollen buik,
+tot een gulle drinkpartij?
+
+--Als 't kind gedoopt wordt, zei Soetkin, moeten er twee oortjes zijn
+voor den pastoor en één gulden voor 't festijn.
+
+Daarop kwam Katelijne het huis binnen met een grooten bundel kruiden
+en zij sprak:
+
+--Aan het kind bied ik de angelica, die den man voor ontucht behoedt
+en de venkel, die Satan van hem verwijderd houdt....
+
+--Hebt gij het kruideken niet, vroeg Klaas, dat guldens aantrekt?
+
+--Neen, zegde zij.
+
+--Dan ga ik zien of er iets in de vaart is te vinden.
+
+Hij ging heen, met zijn hengel en zijn net, zeker dat hij niemand
+ontmoeten zou, want het was nog een heel uur vóór oosterzon, wat in
+Vlaanderen vijf uren zeggen wil.
+
+
+
+
+III.
+
+Klaas kwam aan de Brugsche vaart, niet verre van de zee. Hij schoof
+het aas aan den haak, wierp de lijn uit en liet ook zijn net in 't
+water zinken. Op den overkant der vaart lag een goedgekleede knaap
+vast in slaap, op een bed van mosselen.
+
+Op het gerucht, dat Klaas maakte, werd de jongen wakker; hij wilde
+vluchten, meenende dat het een serjant der naburige gemeente was, die
+kwam om hem te pakken en naar het Steen te brengen voor landlooperij.
+
+Doch de schrik was verdwenen toen hij Klaas herkende, die hem toeriep:
+
+--Wilt gij zes duiten verdienen? Ja?... Jaag dan de visch langs hier!
+
+Op die woorden ging het knaapje, een kleine dikzak, het water in;
+het trok er eenige lischbladeren, vatte ze tot een bundel samen en
+joeg er mee de visch naar Klaas.
+
+Toen de vangst gedaan was, trok Klaas net en lijn uit het water en
+ging hij de sluis over naar het knaapje.
+
+--Gij zijt het, zegde hij, die Lamme heet van uw doopnaam, en
+Goedzak om den wille van uw zachtaardig karakter, en achter Onze
+Lieve Vrouwekerk in de Reigerstraat woont? Hoe komt het dat gij,
+zoo jong en zoo netgekleed, onder den blooten hemel slaapt?
+
+--Laas! baas kooldrager, antwoordde het jongetje, ik heb thuis eene
+zuster, die een jaar jonger is dan ik en mij troef geeft bij den
+minsten twist. Maar op haren rug durf ik mijne weerwraak niet nemen,
+want ik zou haar zeer doen, baas. Gisterenavond, onder het eten,
+wischte ik met mijne vingers een teil uit, waarin ossenvleesch met
+boonen geweest was, en zij wou er heur deel van hebben. Daar was niet
+eens genoeg voor mij, baas. Als ze mij zag likkebaarden om den goeden
+smaak der saus, werd ze razend en sloeg ze met de volle hand mij zóó in
+'t gezicht, dat ik heel bebloed het huis uitgeloopen ben.
+
+Klaas vroeg hem wat zijn vader en zijne moeder zeiden, terwijl hij
+zoo geslagen werd.
+
+Lamme Goedzak antwoordde:
+
+--Vader stompte mij op den eenen schouder en moeder klopte mij op den
+anderen, roepende: "Verweer u, laffe Lamme". Maar ik wil geen meisje
+slaan en daarom ben ik weggeloopen.
+
+Eensklaps verbleekte Lamme en beefde hij als een riet.
+
+En Klaas zag een lange vrouw afkomen, met een mager meisje naast zich,
+dat er barsch uitzag.
+
+--Ah! zuchtte Lamme, terwijl hij Klaas bij zijne hooze vastgreep, daar
+komen moeder en zuster mij halen. Bescherm mij toch, baas kooldrager!
+
+--Dáár, sprak Klaas, neem eerst die zes duiten voor uwe moeite en
+heb geen vrees.
+
+Toen de twee vrouwen Lamme zagen, liepen zij naar hem toe, en beiden
+wilden hem slaan, de moeder omdat hij haar onrust aangedaan had en
+de zuster uit gewoonte.
+
+Lamme verschool zich achter Klaas en riep:
+
+--Ik heb zes duiten verdiend, ik heb zes duiten verdiend, slaat
+me niet!
+
+Doch de moeder kuste haren jongen reeds, terwijl het meisje Lamme's
+handen wilde openwringen, om hem zijn geld af te nemen. Maar Lamme
+schreeuwde:
+
+--'t Is 't mijne, ge zult het niet hebben.... 't Is 't mijne!
+
+En hij balde de vuisten.
+
+Toen trok Klaas de kleine meid geducht bij de ooren en sprak:
+
+--Als het u nog voorvalt leed te doen aan uw broer, die goed en zacht
+is als een lammeken, steek ik u in een donker kolenhok, en daar zal
+ik u niet meer bij de ooren trekken, maar de roode duivel uit de hel;
+hij zal u aan stukken scheuren met zijn groote klauwen en zijne tanden,
+die op vorken gelijken.
+
+Op die woorden dorst de meid Klaas niet meer te bezien, noch
+heuren broeder te naderen; zij verborg zich achter de rokken heurer
+moeder. Doch in de stad schreeuwde zij het overal uit:
+
+--De kooldrager heeft mij geslagen; hij heeft een duivel in zijn
+kelder.
+
+Nochtans dorst zij Lamme niet meer slaan; maar als zij groot was,
+deed ze hem haar werk doen. En de goede sul gehoorzaamde gewillig.
+
+Onderweg had Klaas zijne vangst verkocht aan een pachter, een
+lekkerbek, en thuis komende, zegde hij tot Soetkin:
+
+--Zie, dat heb ik gevonden in den buik van vier snoeken, negen karpers
+en in een volle ben paling.
+
+En hij smeet twee gulden en een oortje op tafel.
+
+--Man, waarom gaat gij niet alle dagen visschen? vroeg Soetkin.
+
+Klaas antwoordde:
+
+--Wel, omdat ik zelf niet geerne zou spartelen in de netten van de
+stadsserjanten.
+
+
+
+
+IV.
+
+Te Damme werd Uilenspiegel's vader "Klaas de kooldrager"
+geheeten. Klaas had zwart haar, schitterende oogen; zijn vel was van
+de kleur zijner koopwaar, uitgenomen op Zon- en feestdagen, als er
+veel zeep in de stulp was. Hij was klein, hoekig, sterk en blijgezind.
+
+Als zijn werk gedaan was en hij met den valavond naar eene taveerne
+van den Brugschen steenweg ging, om met kuite zijn keelgat te spoelen,
+dat zwart was van koolstof, riepen al de vrouwen, die, op den dorpel
+van heur deur den koelen avond genoten, hem vriendelijk toe:
+
+--Goên avond en klaar bier, kooldrager!
+
+--Goên avond en 'nen man die niet slaapt, antwoordde Klaas.
+
+De meisjes die in troepjes van het veld kwamen, stelden zich vóór hem,
+lieten hem niet door en vroegen hem:
+
+--Wat geeft ge om er door te mogen: een scharlaken lint, een vergulden
+gesp, fluweelen schoentjes of een gulden in ons beursje?
+
+Maar Klaas nam er eene om haar middel en kuste heur wangen of heur
+hals, al naarvolgens zijn mond het dichtst bij de donzige huid was,
+en dan zegde hij:
+
+--Vraagt, mijne hertjes, vraagt de rest aan uwe minnaars.
+
+En schaterlachend gingen de joelende meisjes voort.
+
+De kinderen herkenden Klaas aan zijn grove stem en aan zijn zwaren
+stap. Zij liepen naar hem toe en zeiden:
+
+--'n Avond, kooldrager!
+
+--Van 's gelijken, mijne engelkens, zei Klaas; maar komt niet te dicht,
+of 'k maak U zwart als moorkens.
+
+De stoute kaboutermannekens kwamen toch nader; dan nam Klaas er een
+bij zijn wambuis, streek zijn zwarte hand over 't gladde gezichtje
+en liet hem zoo loopen, tot groote vreugd van de schaterende bende.
+
+Soetkin, Klaas' wijf, was een brave, wakkere vrouw, die opstond met
+de zon, en vlug en vlijtig was als een bij.
+
+Zij en Klaas bebouwden getweeën hunnen akker en spanden zich als ossen
+vóór den ploeg. Zwaar was het om hem voort te trekken, doch zwaarder
+nog trok de egge, die met hare houten tanden den harden grond moest
+scheuren. Toch deden zij het blij te moede, met een liedeken op
+de lippen.
+
+En de grond mocht nog zoo hard zijn en de zon hare heetste stralen
+op hen neerschieten: zij konden water en bloed zweeten als zij de
+egge trokken dat hunne knieën knikten--al hun lijden vergaten zij,
+als zij even stil stonden en Soetkin heur zacht gelaat naar Klaas
+keerde, want dan kuste Klaas den spiegel van die teedere ziele.
+
+
+
+
+V.
+
+Den vooravond had men van de pui van 't gemeentehuis uitgeroepen dat
+Mevrouw, echtgenoote van keizer Karel, zwanger was en dat er gebeden
+voor hare aanstaande verlossing moesten worden opgezegd.
+
+Gansch huiverend kwam Katelijne bij Klaas binnen.
+
+--Wat scheelt er? vroeg de kooldrager.
+
+--Laas! sprak zij met hijgenden boezem. Dezen nacht zag ik spoken,
+die menschen maaiden gelijk de hooiers het gras.--'k Zag meisjes
+levend begraven! En de beul danste op de lijken!--De bloedsteen,
+die sedert negen maanden zweette, is dezen nacht gebarsten.
+
+--Erbarming, zuchtte Soetkin, erbarming, Heere God: wat duister
+voorteeken voor Vlaanderenland!
+
+--Ziet gij dat met uwe oogen of in droom? vroeg Klaas.
+
+--Met mijne eigen oogen, sprak Katelijne.
+
+Doodsbleek en schreiend sprak Katelijne toen:
+
+--Twee kinderkens zijn geboren; het een, in Spanje, is de kleine
+Philippus, het ander, in Vlaanderenland, is de zoon van Klaas,
+die later Uilenspiegel zal heeten. Philippus wordt een beul, want
+hij werd verwekt door Karel den Vijfde, den moordenaar van ons
+land. Uilenspiegel wordt een meester in kwinkslagen en guitenstreken,
+maar goedhertig zal hij zijn, want zijn vader is Klaas, de wakkere
+arbeider, die in braafheid, eer en deugd zijn brood verdient. Keizer
+Karel en koning Philippus zullen hun leven lang kwaad doen, door
+oorlog en knevelarij en andere misdaden. Klaas, die heel de week werkt,
+zal leven volgens recht en wet, bij zijn zuren arbeid zal hij lachen
+in stee van weenen: hij zal het zinnebeeld van de goede Vlaamsche
+werkers zijn. Uilenspiegel, immer jong en onsterfelijk, gaat de wereld
+door, maar nergens zal hij een vaste woonplaats hebben. En hij zal
+boer, edelman, schilder, beeldhouwer worden, alles zal hij te gelijk
+zijn. Zoo zal hij dolen langs velden en wegen, het goede en het schoone
+prijzen en lachen en spotten met alles wat dwaas en verkeerd is. Klaas
+is uw moed, edel volk van Vlaanderen, en Soetkin uwe dappere moeder;
+Uilenspiegel is uw geest; een lief en bevallig meisje, Uilenspiegel's
+gezellin en onsterfelijk als hij, zal uw hert zijn, en Lamme Goedzak,
+een dikke pens, uwe maag. En omhoog zullen de opeters van 't volk gaan,
+en omlaag hunne slachtoffers; omhoog de roovende wespen, omlaag de
+noeste bijen, en in den hemel zullen de wonden van Christus bloeden.
+
+Toen Katelijne, de goede tooveres, dit gezegd had, viel zij in slaap.
+
+
+
+
+VI.
+
+Uilenspiegel werd ten doop gebracht, toen plotseling een hevige
+regenbui viel, die hem gansch nat maakte. Zoo werd hij voor de eerste
+maal gedoopt.
+
+Als hij nu de kerk binnengebracht werd, kwam de kosterschoolmeester
+aan peter en meter, vader en moeder zeggen, dat zij zich rond de
+doopvont moesten scharen, hetgeen zij deden.
+
+Maar boven de vont, was er in 't gewelf een gat, dat een metser gekapt
+had om er eene lamp aan een vergulde sterre te hangen. De metser, die,
+van boven, peter en meter stokstijf rond de toegedekte vont zag staan,
+goot verraderlijk door het gat een emmer water, dat, tusschen hen, met
+groot geplas op het deksel van de vont kletste. Doch Uilenspiegel kreeg
+er het grootste deel van. En zoo werd hij voor de tweede maal gedoopt.
+
+De deken kwam; zij deden hem hun beklag, maar hij zei hun van zich te
+haasten, dat het een ongeluk was. Uilenspiegel ging te werk als een
+bezetene, om den wille van het water, dat op hem gespat was. De deken
+gaf hem het zout en het water en heette hem Thijlbert, wat zeggen wil:
+"altijd ongedurig". En zoo werd hij voor de derde maal gedoopt.
+
+Uit Onze Lieve Vrouwekerk ging men daar rechtover, in de Langestraat,
+eene taveerne binnen, die voor uithangbord een rozenkrans had, met
+eene pint in het midden. Zij dronken er zeventien pinten dobbele kuite
+en nog meer. Want in Vlaanderen, als men nat is, droogt men zich met
+een vuur van bier in den buik. Zoo werd Uilenspiegel voor de vierde
+maal gedoopt.
+
+Met het hoofd zwaarder dan 't lichaam, strompelden ze huiswaarts;
+zoo kwamen ze aan een brugje over eenen poel; Katelijne, die
+meter was, droeg het kind; zij struikelde en viel in de modder met
+Uilenspiegel. Zoo werd hij voor de vijfde maal gedoopt.
+
+Men trok hem uit den poel. In 't huis van Klaas werd hij met lauw
+water gewasschen. Dit was zijn zesde doopsel.
+
+
+
+
+VII.
+
+Dien dag besloot Zijne Heilige Majesteit keizer Karel, groote feesten
+te houden, om de geboorte van zijn zoon te vieren. Evenals Klaas,
+besloot hij uit visschen te gaan, niet in de vaart, doch in de beurzen
+en tasschen zijner onderdanen. Daaruit is het dat vorstelijke lijnen
+gouden karolussen, gouden lammeren, rozenobels, dubloenen, zilveren
+daelders en al die wonderbare visschen trekken, die, naar willekeur
+van den visscher, veranderen in fluweelen kleederen en schitterende
+edelgesteenten, in lekkeren wijn en smakelijke gerechten. Want de
+rivieren, die 't rijkst zijn aan visch, zijn niet die, waarin het
+meeste water is.
+
+Nadat Zijne Heilige Majesteit zijn raad bijeengeroepen had, besloot
+hij, dat de vangst volgenderwijze geschieden zou:
+
+De genadige infant zou rond negen of tien uren ten doop gebracht
+worden; ten blijke van groote vreugde, zouden de inwoners van
+Valladolid heel den nacht, op eigen kosten, feesten en kermissen,
+en ten bate der armen, hun geld op de Groote Markt strooien.
+
+Op vijf punten zou eene fontein, tot aan den dageraad toe, goeden
+wijn spuiten, die door de stad moest betaald worden. Op vijf andere
+plaatsen zouden, op houten kramen, allerhande worsten, ossetongen en
+pasteien uitgestald worden, mede ten laste van de stad.
+
+Op eigen kosten zouden de lieden van Valladolid, op den doortocht van
+den stoet, in grooten getale zegebogen oprichten, den Vrede, het Geluk,
+den Overvloed, de Fortuin voorstellend, en allerhande zinnebeeldige
+toespelingen op de gaven des hemels, waarmede zij onder de regeering
+van Zijne Heilige Majesteit begunstigd waren.
+
+Ten slotte en behalve deze bogen van pais, zouden er andere opgericht
+worden, waarop, in helle kleuren, minder goedertieren kenteekenen
+zouden prijken, zooals arenden, leeuwen, lansen, hellebaarden,
+vlammende spiesen, kanonnen, falkonetten, slangen met wijden mond,
+mitsgaders al ander oorlogstuig, om op zinnebeeldige wijze de macht
+en de kracht van Zijne Heilige Majesteit voor te stellen.
+
+En, voor het verlichten der kerk zou, als een blijk van de genade
+Zijner Majesteit, aan het gilde der keersgieters toegestaan worden,
+voor niet, over de twintig duizend waskeersen te leveren, waarvan de
+onopgebrande einden naar 't kapittel zouden gaan.
+
+Al de andere kosten zou de keizer zelf betalen, om aldus te toonen,
+dat het Zijner Goedertierenheid behaagde, zijne volkeren niet te zeer
+te belasten.
+
+Als de gemeente die bevelen uitvoerde, kwamen jammerlijke tijdingen uit
+Rome. Oranje, Alençon en Frundsberg, bevelhebbers van den keizer,
+waren binnen de heilige stede gedrongen en hadden er kerken,
+kapellen en huizen verwoest en geplunderd, niemand, priesters,
+nonnen, moeders noch kinderen, sparend. Den Heiligen Vader hadden zij
+gevangengenomen. De plundering duurde reeds een volle week; ridders en
+landsknechten doolden door Rome, zwelgend en brassend, met de wapens
+zwaaiend, op zoek naar de kardinalen, roepende en tierende, dat zij
+hen allen derwijze verminken zouden, dat geen hunner ooit paus zou
+worden. Enkelen hadden die bedreiging reeds ten uitvoer gebracht en
+dweilden langs de straten met halssnoeren van acht-en-twintig of meer
+bloedige bollen, groot als okkernoten. De wegen leken roode beken,
+waarin de verminkte lijken der vermoorden lagen.
+
+Onder het volk werd gezegd, dat de keizer, die geld noodig had, er
+wilde visschen in het bloed van de priesters, en dat hij bekend met
+het tractaat, den gevangen paus door zijne bevelhebbers opgelegd, hem
+dwong afstand te doen van al de versterkte plaatsen zijner Staten,
+400.000 dukaten te betalen en gevangen te blijven totdat aan die
+voorwaarden voldaan was.
+
+Nochtans was de droefheid van Zijne Majesteit zoo groot, dat hij al
+de toebereidselen van vreugde, feesten en vermakelijkheden afzegde
+en den heeren en edelvrouwen van zijn huis beval den rouw aan te nemen.
+
+En de infant werd gedoopt in zijn witte doeken, ten teeken van
+koninklijken rouw.
+
+Dat alles aanschouwden de heeren en edelvrouwen als voorteekenen
+van rampspoed.
+
+Desniettemin toonde de voedster den infant aan de edelen en edelvrouwen
+van het koninklijk huis, opdat zij hem, naar aloud gebruik, hunne
+wenschen en giften zouden bieden.
+
+Mevrouw de la Coena hing om zijn hals een zwarten steen tegen het
+vergif, zoo rond en zoo groot als eene hazelnoot, in een gouden
+ring gevat; Mevrouw de Chaussade bond aan een zijden draadje eene
+schelp, wolfsmuil geheeten, hangende op zijne maag, voor de goede
+spijsvertering; messire Van der Steen, uit Vlaanderen, bood hem een
+Gentsche worst, vijf ellebogen lang en een halven dik, en wenschte
+daarbij hoogstnederig aan Zijne Hoogheid, dat hij, alleen op den
+reuk van de worst, dorst mocht krijgen naar Gentschen klauwaard,
+daarbij voegende dat, al wie het bier eener stad lust, de brouwers
+niet kan haten; messire jonker Jacob Christoffel van Castilië bad
+Zijne Hoogheid den Infant een groenen jaspis aan zijn doorluchtige
+voetjes te willen dragen, opdat hij goed zou kunnen loopen. Jan de
+Paepe, de nar, die daar ook was, sprak toen:
+
+--Messire, geef hem liever den horen van Jozua, op wiens geschal al de
+steden, met alles wat er in was aan mannen, vrouwlieden en kinderen,
+zich in beweging zetten en liepen. Want Zijne Hoogheid moet niet
+leeren zelf te loopen, maar wel de anderen te doen loopen.
+
+De bedrukte weduwe van Floris van Borsele, in leven heer van Veere
+in Zeeland, schonk aan Zijne Hoogheid Philippus eenen steen die,
+naar zij zegde, de eigenschap had de mannen verliefd en de vrouwen
+ontroostbaar te maken.
+
+Maar de infant schreide zonder ophouden.
+
+Uilenspiegel schreide ook, maar Klaas stak hem een wisschen klater
+met belletjes in de hand, deed hem op zijne hand dansen en sprak:
+Klingelingeling, hadt gij maar altijd belletjes aan uw kaproen,
+mijn zoon, want de gekken zijn meester van de wereld.
+
+En Uilenspiegel lachte zijn vader toe.
+
+
+
+
+VIII.
+
+Klaas had een grooten zalm gevangen, die op een Zondag gegeten werd
+door hem en ook door Soetkin, Katelijne en den kleinen Uilenspiegel;
+doch Katelijne at niet meer dan een vogelken.
+
+--Maar, zei Klaas tot haar, is Vlaanderens lucht tegenwoordig zoo
+voedzaam, dat gij maar moet ademhalen om gespijsd te wezen als met
+een teil vleesch? Wanneer zal men kunnen leven zonder eten? De regen
+moest goede soep zijn, de hagelsteenen erwten en de sneeuw stoverije;
+dat zou den armen pelgrims versterking geven.
+
+Katelijne schudde zwijgend het hoofd.
+
+--Maar, moet gij daar zoo jammerend zitten? zei Klaas. Wat scheelt
+er aan?
+
+Toen sprak Katelijne met eene stem, zacht als een ademtocht:
+
+--De booze geest, de zwarte nacht valt neer.--Daar meldt hij zijne
+komst, met het geschreeuw van den nachtuil.--Rillend aanroep ik--te
+vergeefs--de Heilige Maagd.--Voor hem, muren noch hagen, deuren noch
+vensters.--Licht als een geest, dringt hij overal binnen.--Krakende
+ladder.--Hij is bij mij, op den zolder waar mijne legerstee staat.--Hij
+grijpt mij in zijn koude armen, als marmer zoo hard.--IJskoud is zijn
+gelaat, en zijn kussen vochtig als de sneeuw.--De stroohut schudt en
+slingert als een schuitje op de woelige zee....
+
+--Elken morgen, zei Klaas, moet gij ter misse gaan, opdat de Heer
+Jezus U de kracht geve dat helsche spook te verjagen.
+
+--Hij is zoo schoon! sprak zij.
+
+
+
+
+IX.
+
+Als Uilenspiegel gespeend was, groeide hij op lijk een boom.
+
+Dan kuste zijn vader hem zoo dikwerf niet meer, maar voedde hem streng
+op, opdat hij geen weekeling worden zou.
+
+Als Uilenspiegel thuis kwam en kloeg, dat hij, bij een of anderen
+twist, klop gekregen had, kreeg hij er nog klop bij van Klaas,
+omdat hij de anderen niet geklopt had: en, aldus opgebracht, kreeg
+Uilenspiegel den moed van een jongen leeuw.
+
+Als Klaas er niet was, vroeg Uilenspiegel aan Soetkin een duit om te
+spelen. Dan was Soetkin boos en sprak:
+
+--Waarom moet ge gaan spelen? Blijf liever thuis, om mutsaards
+te binden.
+
+En als zij niets gaf, begon Uilenspiegel te blaten als een lam. Maar
+Soetkin maakte dan veel leven met potten en pannen, om te gebaren
+dat ze hem niet hoorde. Dan weende Uilenspiegel, en de zoete moeder
+liet hare geveinsde hardheid af, kwam tot hem, streelde hem en vroeg:
+"Hebt gij genoeg met een denier?" Nu, gij moet weten, dat een denier
+zes duiten gold.
+
+Zoo beminde zij hem te veel en, als Klaas er niet was, was Uilenspiegel
+baas in huis.
+
+
+
+
+X.
+
+Op een morgen zag Soetkin haren man met gebogen hoofd in de keuken
+staan, in gedachten verdiept.
+
+--Wat scheelt er toch, man? vroeg zij. Ge ziet bleek, gij zijt kwaad
+en verstrooid.
+
+Met eene stem, als een hond die bromt, antwoordde Klaas:
+
+--De wreede plakkaten des keizers gaan ze weer uithalen. Opnieuw gaat
+de dood over Vlaanderenland heerschen. De aanbrengers krijgen de helft
+van de have der slachtoffers, als de have de honderd karolusgulden
+niet te boven gaat.
+
+--Wij zijn arm, sprak zij.
+
+--Arm, zeide hij,... niet arm genoeg. Er zijn lage zielen, gieren
+en raven, die ons zouden aanklagen, zoowel om een zak kolen als om
+een zak karolussen met Zijne Majesteit te deelen. Wat bezat het arme
+Tanneken, de weduw van Sies den kleermaker, die ze te Heist levend
+begroeven? Een Latijnschen bijbel, drie gouden florijnen en wat potten
+van Engelsch tin, waarop eene buurvrouw loerde. Wantje Martens werd
+eerst in 't water geworpen; haar lijf dreef boven, en daarin zag
+men hekserij, weshalve zij als tooveres verbrand werd. Zij had wat
+gebroken meubelen, zeven gouden karolussen in een lederen tassche,
+en de aanklager vroeg er de helft van. Eilaas! nog tot morgen zou ik
+aldus kunnen spreken: maar wat baat het, vrouw: in Vlaanderen is het
+leven onhoudbaar om den wille van de plakkaten. Welhaast zal telken
+nacht de kar van den Dood dof door de straten rijden en wij zullen
+zijne beenderen hooren rammelen.
+
+Soetkin sprak:
+
+--Jaag me geen schrik aan, Klaas. De keizer is de vader van Vlaanderen
+en Brabant; als dusdanig is hij braaf en grootmoedig, geduldig
+en genadig.
+
+--Daarbij zou hij te veel verliezen, antwoordde Klaas, want de
+verbeurdverklaarde goederen komen hem bij erfenis toe.
+
+Plotseling hoorde men de trompet en de cimbels van den
+stadsuitroeper. Op dat geluid kwamen Klaas en Soetkin, die beurt om
+beurt Uilenspiegel op den arm droegen, met de volksmenigte toegeloopen.
+
+Zoo kwamen zij aan het schepenhuis. Voor de pui waren de herauten te
+peerd, op bazuinen blazend en op cimbels slaande, de provoost met de
+roede der justitie in de hand en de stadsprocureur, ook te peerd,
+die eene ordonnantie des keizers in de hand hield en zich gereed
+maakte ze aan vergaderde volksmenigte voor te lezen.
+
+Klaas vernam, dat het andermaal aan allen in 't algemeen en aan elk in
+'t bijzonder verboden was, te drukken, te lezen, in bezit te hebben of
+voor te staan, de boeken, schriften of leerstellingen van Martinus
+Luther, van Joannes Wycliff, Joannes Huss, Marcilius van Padua,
+Æcolampadius, Ulricus Zwinglius, Philippus Melanchton, Franciscus
+Lambertus, Joannes Pomeranus, Otto Brunselsius, Justus Jonas, Joannes
+Pupperis en Gorcianus, de Nieuwe Testamenten gedrukt door Adriaan
+van Bergen, Christoffel van Roemonde en Joannes Zell, vol Luthersche
+en andere heresiën, verworpen en veroordeeld door de Faculteit der
+godgeleerdheid van de Universiteit van Leuven. Mitsgaders te maken of
+te doen maken smadelijke konterfeitsels of afbeeldsels van God, van de
+heilige Maagd Maria of van de santen; te breken, te scheuren of uit te
+wisschen de beelden of konterfeitsels, vervaardigd tot verheerlijking
+van en tot aandenken aan God en de Maagd Maria of de heiligen der kerk.
+
+Verder zei het plakkaat, dat het aan niemand toegelaten was, tot welken
+staat hij ook mocht behooren, zich te vermeten de Heilige Schrifture te
+bespreken of over haar te twisten, zelfs niet op twijfelachtige punten,
+tenzij door een godgeleerde van naam, erkend door eene Universiteit,
+daartoe gemachtigd.
+
+Onder andere straffen besliste Zijne Heilige Majesteit, dat
+de verdachten nooit of nimmer een eerbaar ambt zouden kunnen
+bekleeden. En zij, welke in hunne dolingen hervielen of bleven
+volharden, zouden veroordeeld worden met een zacht of hard vuur,
+in een strooien huis of gebonden aan een paal te worden verbrand,
+al naar de sententie van den rechter. De anderen zouden omgebracht
+worden door het zweerd als zij edelen of goede burgers waren, de
+gemeene manslieden aan de galg geknoopt en de vrouwlieden levend
+begraven. Om tot voorbeeld te strekken, zou hun hoofd op een paal
+worden gestoken. Ten profijte van den keizer was er verbeurte hunner
+goederen, overal waar verbeurdverklaring geschieden kon.
+
+Zijne Heilige Majesteit schonk den aanbrengers de helft van al
+hetgene de aflijvigen in eigendom bezeten hadden, zoo die have de
+somme van honderd pond grooten, Vlaamsche munte, alles in 't alles,
+niet te boven ging. En wat aanging het deel van den keizer, dit
+zou hij aanwenden voor werken van godsvrucht en van bermhertigheid,
+gelijk bij de plundering van Rome was geschied.
+
+En treurig keerde Klaas naar huis, met Soetkin en Uilenspiegel.
+
+
+
+
+XI.
+
+Daar het een jaar van voorspoed geweest was, kocht Klaas voor zeven
+florijnen een ezel en negen halsters boonen, en op een morgen besteeg
+hij zijn beest. Uilenspiegel zat van achteren. Aldus gingen zij hun
+oom en oudsten broeder, Judocus Klaas, bezoeken, die woonde omtrent
+Meiborg, in de Duitsche landen.
+
+Judocus, die in zijne jeugd eenvoudig en zacht van aard was geweest,
+had door vele geleden onrechtveerdigheden haat tegen de menschen
+opgevat en leefde in eenzaamheid.
+
+Zijn vermaak was, twee zoogezeid trouwe vrienden met elkander te doen
+vechten, en hij gaf drie oortjes aan hem, die zijn vriend het ergst
+toegetakeld had.
+
+Ook bracht hij geerne, in een warme kamer, in grooten getale,
+twistzieke oude wijven bijeen en gaf haar geroosterd brood en
+kruidenwijn.
+
+Aan de vrouwen, die meer dan zestig jaar oud waren, stelde hij saaie
+ter hand, die zij in een hoek moesten opbreien; daarbij beval hij haar
+altijd aan, de nagels lang te laten groeien. En 't was wonderlijk
+ze te hooren kuchen, babbelen, snappen en, met hare priemen onder
+de oksels, te zamen den naam en de eer van den evennaaste te hooren
+schenden en rooven.
+
+Wanneer Judocus zag, dat zij goed in gang waren, smeet hij eenen
+borstel in 't vuur, die door het schroeien der haren de lucht met
+een geweldigen stank vervulde.
+
+Dan begonnen de wijven al te gelijk te kijven en elkaar te beschuldigen
+de oorzaak te zijn van den stank: en allen streden het af en vlogen
+weldra elkander in 't haar; en dan wierp Judocus opnieuw borstels in
+het vuur en paardenhaar op den vloer. Als het gevecht zoo verwoed en
+de rook zoo dik werd, en het stof zoo hoog steeg, dat hij niets meer
+zien kon, ging hij zijne twee in stadsserjanten verkleede knechts
+halen, die de ouden als woedende ganzen met groote stokslagen uit de
+kamer verdreven.
+
+En toen Judocus het slagveld overzag, vond hij er lappen van rokken,
+van kousen, van hemden en ook oude tanden.
+
+En droefgeestig zei hij tot zich zelven:
+
+--Mijn dag is verloren, niet eene van haar heeft hare tong
+achtergelaten.
+
+
+
+
+XII.
+
+In het baljuwschap Meiborg ging Klaas door een smal boschje: de
+ezel hapte hier en daar naar een distel; Uilenspiegel smeet zijne
+kaproen naar de vlinders en ving ze weer op, zonder van den ezel te
+komen. Klaas at eene snede brood en nam zich voor, die in de naaste
+taveerne te begieten. Van verre hoorde hij een klokje kleppen en een
+gedruisch als van vele menschen die altegader spreken.
+
+--'t Is eene bedevaart, en de heeren pelgrims zijn zeker in grooten
+getale. Houd u goed vast, mijn zoon, dat zij u niet van het grauwtje
+stooten. Wij zullen zien. Komaan, ezeltje, wat gauwer, toe!
+
+En de ezel draafde.
+
+Zij verlieten den zoom van het bosch en daalden naar een groote vlakte,
+ten Westen door eene rivier bespoeld. Aan den Oosterkant stond een
+kleine kapel, den gevel versierd met een beeld der Lieve-Vrouwe, met
+twee stieren aan heure voeten. Op de trappen van de kapel stonden een
+heremiet--die giegelend, aan 't kleppen was--vijftig staffieren met
+brandende keersen in de hand, spelers, klokluiders en trommelslagers,
+klaroenblazers, pijpers, schalmei- en doedelzakspelers, alsmede een
+hoop lustige gezellen, die bakken vol oudroest in de handen hielden,
+doch voor het oogenblik allen stille zwegen.
+
+Meer dan vijf duizend pelgrims, in gesloten gelederen, elk van zeven
+man, met helmen op en stokken van groen hout in de hand, gingen hen
+voorbij. Dan schaarden zij zich, telkens zeven, vóór de kapel. Zij
+lieten hunne stokken zegenen en kregen elk eene keers uit de handen
+der staffieren, in ruil waarvan zij den heremiet een halven florijn
+betaalden.
+
+En hunne processie was zoo lang, dat de keersen van de eersten
+opgebrand waren, toen die van de laatsten nog hare volle lengte hadden.
+
+Klaas, Uilenspiegel en de ezel verlustigden zich met aldus een groote
+verscheidenheid breede, hooge, lange, puntige, fiere, ronde of slappe
+buiken te zien voorbijgaan.
+
+Al de pelgrims hadden helmen op. Er waren er die van Troje kwamen,
+andere, die phrygische mutsen leken. Sommige pelgrims hoewel met bolle
+wangen en dikke buiken, droegen helmen met uitgespreide vleugelen,
+doch hadden geenerlei zin tot vliegen. Anderen waren gekapt met
+zoogenaamde "salades", door de slakken onwaardig gekeurd omdat ze
+niet groen genoeg waren.
+
+Maar het meerendeel had helmen, zoo oud en verroest, dat ze uit den
+tijd schenen te zijn van Gambrinus, koning van Vlaanderen en koning
+van het bier, dewelke regeerde negenhonderd jaar vóór Christus en eene
+pint op zijn hoofd droeg, uit vrees niet op tijd te kunnen drinken,
+bij gebrek aan een beker.
+
+Eensklaps begonnen klokken, pijpen, schalmeien, trommelen en het
+oudroest te kleppen, te fluiten, te schallen, te slaan en te kletteren.
+
+Het was het sein voor de pelgrims zich omme te keeren en bij groepen
+van zeven zich nu tegenover elkaar te plaatsen. Als uitdaging stak elk
+de brandende keers in het gelaat van zijn overman. Daardoor ontstond
+groot genies en daarna regende het stokslagen.
+
+Ze vochten en sloegen met handen en voeten, met hoofden, met alles. Er
+waren er, die, gelijk de rammen, op hunne tegenstrevers vielen, met
+den helm vooruit, die bij den eersten schok over hunne ooren schoot,
+en als blinden terechtkwamen op zeven andere woedende pelgrims,
+die hen verwelkomden, maar niet met zachtheid.
+
+Anderen, schreeuwers en bloodaards, jammerden om de ontvangen slagen,
+maar bij het prevelen hunner gebeden werden ze bliksemsnel door nieuwe
+zeventallen overvallen en zonder genade omvergeloopen of omvergetrapt.
+
+En de heremiet lachte.
+
+Verderop zag men zeventallen, die als klissen aan elkaar hingen en
+van boven naar beneden in het water rolden; maar zij bleven elkaar
+toetakelen en ranselen, zonder dat het water hunne woede bekoelde.
+
+En de heremiet lachte.
+
+Zij, die boven gebleven waren, sloegen elkander de oogen blauw en de
+tanden vaneen, rukten elkanders haren uit, en scheurden wambuizen en
+hoozen aan stukken.
+
+En de heremiet lachte en sprak:
+
+--Dapper aan, vrienden: wie 't hardst slaat, bemint het meest. Aan de
+kloekste vechters, de schoonste liefjes! Hier ziet Onze Lieve Vrouw
+van Rindbisbels, wie man is!
+
+En de pelgrims sloegen als op kaf.
+
+Middelerwijl was Klaas den heremiet genaderd, terwijl Uilenspiegel
+lachend en gierend op de slagen bleef toekijken.
+
+--Eerwaarde vader, vroeg hij, welke misdaad hebben die arme sukkelaars
+bedreven, om elkander zoo wreedelijk te mishandelen?
+
+Doch zonder hem te aanhooren, riep de heremiet:
+
+--Luieriken! gij verliest den moed. Als de vuisten moede zijn, zijn
+de voeten het immers nog niet! Zijn er onder U, die beenen hebben om
+te vluchten als hazen? Wat doet het vuur uit de steenen springen? Het
+ijzer, dat er op slaat!
+
+Op die woorden gingen die onnoozele pelgrims voort te vechten met
+helmen, met handen en met voeten. 't Was een verwoede strijd, waarvan
+Argus met zijn honderd oogen niets hadde gezien dan stofwolken en
+hier en daar de punt van een helm.
+
+Doch eensklaps begon de heremiet te kleppen. Pijpen, trommelen,
+trompetten en schalmeien en het oudroest staakten hun gedruisch,
+tot teeken van vrede.
+
+De pelgrims brachten nu hunne gekwetsten bijeen. Er waren er, wier
+tong, gezwollen van gramschap, uit den mond hing. Maar die ging van
+zelve in hare verblijfplaats terug. Moeilijker was het om de helmen
+af te trekken, die tot ver over de ooren zaten. Zij schudden den kop
+en bleven hem schudden: de helmen waren vast gelijk groene pruimen
+aan den boom.
+
+Doch toen sprak de heremiet:
+
+--Leest elkeen een ave en keert terug naar uw wijf. En binnen negen
+maanden zullen evenveel kinderen meer in het baljuwschap zijn, als
+heden 't gevecht dappere strijders telde.
+
+En de heremiet zong het ave voor, en allen zongen het mee. En de
+klok klepte.
+
+De heremiet zegende hen in name van Onze Lieve Vrouwe van Rindbisbels
+en sprak tot de pelgrims:
+
+--Gaat in vrede!
+
+En roepend en stompend en zingend, trokken zij naar Meiborg terug. Al
+de vrouwen, oude en jonge, wachtten hen op den dorpel van de huizen,
+waar zij binnenvlogen als soldeniers in een stormenderhand veroverde
+stad.
+
+De klokken van Meiborg luidden al te gader: de jongens floten, riepen,
+speelden op den rommelpot.
+
+Pinten en stoopen, bekers en glazen gingen lustig aan 't klinken en
+rinkelen. En de wijn vloeide in de kelen als een stroom in de zee.
+
+Terwijl de klokken luidden en de wind, bij vlagen, aan Klaas 't gezang
+van mannen, vrouwlieden en kinderen bracht, vroeg hij opnieuw aan den
+heremiet, welke hemelsche gratie die sukkelaars hoopten te verkrijgen,
+na die hardhandige oefeningen.
+
+Lachend antwoordde hem de heremiet:
+
+--Op die kapel daar, ziet ge twee gekapte beelden, die twee stieren
+voorstellen. Zij staan daar ter herinnering aan het mirakel van den
+heiligen Martinus, die twee ossen in stieren veranderen deed, door
+hen met de horens te doen vechten. Daarna streek hij meer dan een
+uur keersvet over hunnen snuit, en sloeg er met den stok op.
+
+Welnu, ik kende het mirakel. Ik vroeg Zijne Heiligheid om eene
+vergunning, die ik duur betaalde en kwam mij vestigen in dit oord.
+
+Toen preekte ik over het wonder en weldra kregen al de mannen, zoo
+ouden als jongen, de zekerheid dat Onze Lieve Vrouwe hun genadig was
+als ze goed gevochten hadden met de keers die de zalf, en den stok die
+de kracht is. Hierheen is het, dat de vrouwen heuren man sturen. De
+kinderen, die uit kracht van de bedevaart verwekt zijn, worden vlug
+en wreedaardig, geweldig en roekeloos en, later, vrome soldaten.
+
+Eenklaps vroeg de heremiet aan Klaas:
+
+--Herkent gij mij?
+
+--Ja, sprak Klaas, gij zijt mijn broeder Judocus.
+
+--Gij zijt er, antwoordde de heremiet, maar wie is die bengel daar,
+die leelijke gezichten naar mij trekt?
+
+--'t Is uw neef, was 't antwoord van Klaas.
+
+--Welk verschil maakt gij tusschen keizer Karel en mij?
+
+--'t Is groot, sprak Klaas.
+
+--'t Is klein, wedervoer Judocus: de keizer doodt de menschen en bij
+mij krijgen ze klop, tot ons beider profijt en vermaak.
+
+Dan bracht hij Klaas en Uilenspiegel naar zijne kluis, waar zij elf
+dagen achtereen kermis vierden.
+
+
+
+
+XIII.
+
+Als Klaas afscheid nam van zijn broer, steeg hij op zijn ezel, met
+Uilenspiegel achter zich. Op de Markt van Meiborg stonden velerhande
+pelgrims en als zij hen zagen, ontstaken ze in woede en hieven de
+stokken dreigend omhoog. En allen riepen "Schelm! Nietdeug!" om
+den wille van Uilenspiegel, die zijne hooze losgemaakt en zijn hemd
+opgetrokken had, en zijne achterkaken liet zien.
+
+Klaas, ziende dat ze zijn zoon bedreigden, vroeg hem:
+
+--Wat hebt gij gedaan, dat zij zoo kwaad op u zijn?
+
+--Vadertjelief, antwoordde Uilenspiegel, ik zit op den ezel en zeg
+tot niemand een woord, en toch schelden ze mij uit voor een nietdeug.
+
+Toen deed Klaas hem langs voren zitten.
+
+In die postuur stak Uilenspiegel de tong uit naar de pelgrims, en
+roepend en tierend balden ze hunne vuisten en dreigden met hunne
+stokken Klaas en den ezel.
+
+Maar Klaas sloeg op zijn ezel om hunne woede te ontvlieden. Toen de
+pelgrims hen met rust lieten, sprak Klaas tot zijn zoon:
+
+--Gij zijt onder een zeer slecht gesternte geboren, want gij zit vóór
+mij, doet niemand kwaad en toch willen ze u dooden!
+
+Uilenspiegel hield zijn buik vast van 't lachen.
+
+Terwijl Klaas door 't Land van Luik reed, hoorde hij zeggen, dat
+die van Rivage hongersnood leden en dat ze gesteld waren onder
+de jurisdictie van den officiaal, eene vierschaar van geestelijke
+rechters. Zij maakten opstand om brood en om wereldlijke rechters
+te bekomen. Eenigen werden onthoofd of gehangen, anderen uit het
+land gebannen; dàt was de goedertierenheid van den zachtzinnigen
+aartsbisschop, den hoogweerdigen Van de Marck.
+
+Klaas zag onderwege de gebannenen, die de zoete vallei van Luik
+ontvloden, en, aan de boomen, omtrent de stad, zag hij de lijken van
+hen die gehangen waren, omdat zij de misdaad begaan hadden, honger
+te hebben. En Klaas schreide over hunnen rampspoed.
+
+
+
+
+XIV.
+
+Toen Klaas op zijn ezel weer thuis kwam met een zak vol oortjes,
+dien hij van zijn broeder gekregen had en ook met een schoonen beker
+van Engelsch tin, was 't Zondag en weekdag kermis in de arme stulp;
+alle dagen at men boonen met vleesch.
+
+Menigmaal vulde Klaas den schoonen beker met schuimende dobbele kuite.
+
+Uilenspiegel at voor drie; hij ging en kwam naar de borden en teilen
+als eene musch op een graanzolder.
+
+Eet gij het zoutvat niet mee? vroeg Klaas.
+
+Uilenspiegel antwoordde:
+
+--Wanneer, gelijk hier, het zoutvat gemaakt is van een uitgeholde
+korst brood, moet men het soms opeten, anders komen er wormen in.
+
+--Waarom, zegde Soetkin, veegt gij uwe vettige handen af aan uwe hooze?
+
+--Aan mijne hooze? wel, om nooit met natte billen te loopen.
+
+Daarop dronk Klaas een groote teug bier uit zijn tinnen beker.
+
+Uilenspiegel vroeg hem:
+
+--Waarom hebt gij zoo'n grooten beker en ik maar een klein kroezeken?
+
+Klaas antwoordde:
+
+--Omdat ik uw vader en de baas van het huis ben.
+
+Doch Uilenspiegel hernam:
+
+--Gij drinkt al veertig en ik nog maar negen jaar; gij hebt al genoeg
+gedronken en mijne beurt is gekomen. Geef mij den beker en neem gij
+het kroezeken.
+
+--Zoon, sprak Klaas, men giet geen vat bier in een vaatje over
+zonder morsen.
+
+--Nu ga dan te werk met verstand en giet uwe kan in mijn tonne,
+want mijn buik is grooter dan uw beker, antwoordde Uilenspiegel.
+
+En lachend liet Klaas hem zijn beker ledigen. En zoo leerde
+Uilenspiegel listig worden om bier te krijgen.
+
+
+
+
+XV.
+
+Onder haren gordel droeg Soetkin het kenmerk van een nieuwe
+bevruchting; ook Katelijne was zwanger, maar zij dorst heur huis
+niet verlaten.
+
+Soetkin ging haar bezoeken.
+
+--Ach! sprak zij jammerend, wat ga ik aanvangen met de ongelukkige
+vrucht van mijn lichaam? Moet ik het wichtje versmachten? Ik zou
+het besterven! Maar zoo ik een kind heb zonder getrouwd te zijn,
+zullen de serjanten mij pakken. Ik zal, als een ontuchtige deerne,
+twintig gulden moeten betalen, en op de groote markt gegeeseld worden.
+
+Om haar te troosten, sprak Soetkin heur eenige zoete woorden
+toe. Bezorgd en nadenkend keerde zij huiswaarts. Op een morgen sprak
+zij tot Klaas:
+
+--Zoudt ge mij slaan, Klaas, als ik u twee kindjes schonk in stee
+van maar één?
+
+--Dat weet ik niet, antwoordde Klaas.
+
+--Maar, sprak Soetkin, als het tweede kindje niet uit mijn lichaam
+kwam en, gelijk dat van Katelijne, verwekt was door een onbekende,
+door den duivel misschien?
+
+--De duivel, antwoordde Klaas, verwekt wel vuur en dood en rook,
+maar geen kinderen. Het kind van Katelijne zal ik als het onze aanzien.
+
+--Zoudt gij dat? vroeg zij.
+
+--Gelijk ik u zeg, hernam Klaas.
+
+Soetkin ging die goede mare aan Katelijne kondschappen en uiterst
+gelukkig en opgetogen riep deze uit:
+
+--De goede man heeft gesproken voor 't heil van mijn lichaam. God zal
+hem zegenen, en ook de duivel, sprak zij huiverd, als 't een duivel
+is, die U verwekte, arm schaapje, dat in mijn boezem leeft.
+
+Soetkin bracht een zoon en Katelijne eene dochter ter wereld. Beiden
+werden ten doop gebracht als zoon en dochter van Klaas. De knaap werd
+Hans genoemd, maar bleef niet in leven; het meisje werd Nele geheeten
+en groeide flink op.
+
+Aan vier bekers dronk zij levenssap: aan de borsten van Soetkin en
+aan die van Katelijne. En een zoete strijd ontstond tusschen de twee
+vrouwen, om de kleine de borst te mogen geven. Maar tot haar groot
+leed, moest Katelijne heure melk laten verdrogen, want men hadde heur
+gevraagd van waar die kwam, zonder dat zij moeder was.
+
+Als Nele gespeend was, nam Katelijne heure dochter bij zich en liet
+haar niet eerder naar Soetkin gaan, dan nadat zij heur "moeder"
+genoemd had.
+
+En de buren zeiden, dat het schoon was van Katelijne, die have en
+goed bezat, het kind op te voeden, want Soetkin en Klaas leefden
+veelal in kommer en armoe.
+
+
+
+
+XVI.
+
+Op zekeren morgen was Uilenspiegel alleen thuis. Hij verdroot zich
+geweldig, en nam een schoen van zijn vader, om er een schuitje van
+te maken. De groote mast stond reeds vast in de zool en Uilenspiegel
+ging een gat snijden in 't overleer, om den boegspriet te plaatsen,
+toen hij over 't halfdeurken het hoofd van een ruiter en den kop van
+een peerd zag.
+
+--Is hier niemand? vroeg de ruiter.
+
+--Ja, antwoordde Uilenspiegel, een mensch, een halve mensch en een
+paardekop.
+
+--Hoezoo? vroeg de ruiter.
+
+Uilenspiegel sprak:
+
+--Wel, ik zie hier een heelen mensch en die ben ik; verder zie ik
+een halven mensch, te weten, uw hoofd en borst, en daarbij nog den
+kop van uw peerd.
+
+--Waar zijn uw vader en moeder? vroeg de man.
+
+--Vader gaat van kwaad tot erger en moeder is bezig met ons in scha
+of schande te brengen.
+
+--Dat begrijp ik niet, sprak de ruiter.
+
+Uilenspiegel hernam:
+
+--Vader graaft de voren van zijn land dieper, om de jagers, die zijn
+koren plat trappen, van kwaad in erger te doen vallen. Moeder is geld
+gaan leenen: geeft zij te veel weer, dan is het ons scha en geeft ze
+te weinig, dan is het ons schande.
+
+Toen vroeg de man hem den weg.
+
+--Daar, waar de eenden gaan, antwoordde Uilenspiegel.
+
+De ruiter ging heen, doch als Uilenspiegel bezig was met van Klaas'
+tweeden schoen eene galei te maken, kwam hij terug.
+
+--Gij hebt mij bedrogen, sprak hij; daar waar de eenden zijn, is het
+modder en veengrond, waarin zij ploeteren.
+
+Uilenspiegel antwoordde:
+
+--Ik zei u niet van te rijden waar zij ploeteren, doch daar waar
+zij gaan.
+
+--Wijs mij ten minste den weg, die naar Heist gaat, sprak toen de man.
+
+--In Vlaanderen, zei Uilenspiegel, zijn 't de menschen die gaan,
+en de wegen blijven liggen.
+
+
+
+
+XVII.
+
+Op zekeren dag sprak Soetkin tot Klaas:
+
+--Man, ik heb den dood op het lijf. 't Is nu al drie dagen, dat Thijl
+uit den huize is. Waar mag hij wel zijn?
+
+Treurig antwoordde Klaas:
+
+--Hij is waar de straathonden zijn, op den grooten weg, met nietdeugen
+van zijne soort. God was vol wreedheid, toen hij ons zulk een zoon
+gaf. Toen Thijl ter wereld kwam, zag ik in hem de vreugd van onzen
+ouden dag, een werktuig te meer in ons huis; ik meende hem een
+handwerk te leeren, maar 't boosaardige noodlot maakt hem tot een
+schelm, een dagdief.
+
+--Wees niet te gestreng, man, sprak Soetkin. Onze zoon is maar negen
+jaar, hij is nog in den roes van de eerste jeugd. Moet hij, als de
+boomen, niet eerst zijne hulsels afwerpen, alvorens zich te kunnen
+tooien met zijne bladeren, die, voor den boom des volks, de eer en de
+deugd zijn? 't Is een kleine guit, ik weet het, maar zijne slimheid zal
+hem later te goede keeren, als hij ze tot een of ander goed ambacht
+aanwendt, in stee van ze tot kwade parten te gebruiken. Hij steekt
+geerne den draak met een ieder; maar later zal hij zijn plaats vinden
+in een lustige broederschap. Hij lacht gedurig; maar de gezichten,
+die zuur zien vóór hunne rijpheid, zijn een slecht voorteeken voor
+later. Zoo hij loopt, is 't dat hij zulks noodig heeft om te groeien;
+zoo hij niet werkt, is het dat hij nog niet begrijpt, dat werken een
+plicht is en als hij somwijlen dag en nacht, een halve week uitblijft,
+is het dat hij niet beseft hoeveel verdriet hij ons aandoet, want
+hij heeft een goed hart en ziet ons geerne.
+
+Klaas schudde het hoofd en antwoordde niet, en toen hij sliep,
+lag Soetkin te weenen. En 's morgens, als zij dacht dat haar zoon
+wellicht ergens aan den weg ziek lag, ging zij op den dorpel der
+deure zien of hij niet afkwam; maar zij zag hem niet en zij zette
+zich aan 't venster, om van daar naar de straat te kijken. En meer
+dan eens bonsde heur het hert in de borst, als zij den lichten stap
+van een kind hoorde; maar als de kleine voorbijging en zij zag dat
+het Uilenspiegel niet was, weende zij weer, de arme moeder.
+
+Doch Uilenspiegel was, met zijn deugnieten van kameraden, te Brugge
+op de Zaterdagsmarkt.
+
+Daar zag men leerzenmakers en schoenlappers in hunne kramen,
+kleermakers met hoozen, wambuizen, bovenkerels; Antwerpsche
+meezenvangers, die 's nachts met een uil ter vogelvangst gaan; daar
+waren kooplui in wild, hondenvangers, verkoopers van kattevellen voor
+handschoenen, borstlappen en kragen, en koopers uit alle standen,
+poorters en poorteressen, knechten en dienstmaagden, broodmeesters,
+botteliers, eierboeren en -boerinnen en men hoorde ze, ieder op zijn
+wijs, vragen en bieden, de waren prijzen en afkeuren.
+
+In een hoek van de markt was een schoone lijnwaden tente opgericht op
+vier palen. Aan den ingang van die tente stond een boer uit het Land
+van Aalst--met twee monniken naast zich om het geld te ontvangen--die
+voor een oortje aan de nieuwsgierigen een stukje van het schouderblad
+van de heilige Maria van Egypte liet zien. Met schorre, heesche stemme,
+roemde hij de verdiensten der gelukzalige; in zijnen lofzang vergat
+hij zelfs niet te zeggen hoe ze eens, bij gebreke aan geld, een jongen
+veerman, die haar overgezet had, betaalde met schoone munt der nature,
+om Gods gebod, omtrent het loon der werklieden, niet te overtreden.
+
+En de twee monniken knikten om te bevestigen, dat de boer waarheid
+sprak. Naast hen stond een groot, dik wijf, met een rood gezicht,
+als Astarte zoo wulpsch, een oorverdoovend lawaai te maken op een
+gebarsten doedelzak, terwijl een lieftallig meisje naast haar zong
+als een nachtegaaltje, doch op haar lette niemand. Aan den ingang
+van de tent wiegelde eene kuip, met de beide ooren aan twee staken
+vastgemaakt. Als het wijf in hoogdravende woorden vertelde, dat het
+eene kuip wijwater was, die van Rome kwam en de monniken weer knikten
+om hare woorden te staven, verviel Uilenspiegel in diepe overpeinzing.
+
+Aan een van de palen der tente stond een ezel gebonden, die meer hooi
+dan haver kreeg: met hangenden kop zag hij naar de aarde, maar zonder
+hoop er distels te zien opschieten.
+
+--Jongens, riep Uilenspiegel, naar het wijf, de twee paters en 't
+weemoedige grauwtje wijzend, vermits de meesters zoo goed zingen,
+moet de ezel dansen. En hij liep naar een winkel, en kwam met zes
+duiten peper. Toen hief hij den steert van den ezel op en wreef er
+de peper onder.
+
+Als het beest de peper gevoelde, keek het omme, om te zien van waar
+die ongewone warmte kwam. Het meende, dat het den vuurduivel achter
+de hielen had en wilde loopen om hem te ontvlieden; dan begon het
+dier te balken en te stampen en uit al zijne kracht aan den paal te
+trekken. Bij den eersten schok ging de kuip los, die tusschen de
+twee haken hing, en al het wijwater kletste op de tent en op hen,
+die er in waren. Weldra stortte de tent in en de aanwezigen, die naar
+de geschiedenis van Maria van Egypte luisterden, lagen als onder een
+natten mantel begraven. En Uilenspiegel en zijne vrienden hoorden van
+onder het doek groote beroering en geweeklaag, want de geloovigen,
+die binnen waren, beschuldigden malkander de kuip omvergetrokken
+te hebben, en wit van woede brachten ze elkander vele vuistslagen
+toe. Men zag het doek van de tente op en neer gaan, en telkens als
+Uilenspiegel op het doek een ronden vorm zag uitkomen, stak hij er in
+met eene speld. Dan hoorde hij grootere kreten en grootere uitdeeling
+van vuistslagen onder de tente.
+
+En hij had dolle pret en het meest toen hij den ezel zag wegloopen met
+doek, met kuip en met palen achter zich aan, terwijl de baas van de
+tent, zijn wijf en zijn kind zich vastklampten aan den sleep van den
+ezel. Eindelijk kon het dier niet meer voort, het begon erbarmelijk
+te balken en te stampen, en hield maar op om onder zijn steert te
+zien of het vuur, dat er brandde, niet haast gebluscht was.
+
+Maar de kwezelaars vochten voort en zonder aan hen te denken,
+scharrelden de monniken het geld bijeen, dat uit de schaal gevallen
+was.
+
+Uilenspiegel hielp devotelijk mee, doch niet zonder profijt.
+
+
+
+
+XVIII.
+
+Terwijl de zoon van den kooldrager als een schalk opwies, bracht de
+ziekelijke zoon van den grooten keizer zijne dagen in droefgeestigheid
+door. Edelvrouwen en heeren zagen hem, door kamers en gangen van 't
+paleis van Vallodolid, zijn armzalig lichaam op waggelende beentjes
+voortsleepen, alsof hij moeite had de zwaarte te dragen van zijn
+groot hoofd, met stekelig blond haar bedekt.
+
+Steeds zocht hij de donkere gangen op en bleef er uren lang zitten, met
+de beenen uitgestrekt. En als een dienstknecht er uit onachtzaamheid
+op trapte, liet hij hem geeselen, en als hij hem hoorde huilen van
+pijn, deed het hem goed, maar hij lachte niet.
+
+'s Anderen daags haalde hij elders in de gangen van het paleis
+dezelfde streken uit. Edelvrouwen, heeren en schildknapen, die hem
+voorbijgingen, deed hij struikelen, en als zij vielen en zich bezeerden
+deed hem dat genoegen, maar hij lachte niet.
+
+En zoo iemand hem aanraakte en niet viel, huilde hij alsof hij geslagen
+was: en de ontsteltenis ziende, was hij blij, maar hij lachte niet.
+
+Zijne Majesteit hierover verwittigd, beval, dat men geen acht op den
+infant moest geven, zeggende, zoo hij niet wilde dat men hem trapte,
+hij zijne voeten niet moest zetten waar eens anders beenen gingen.
+
+Zulks mishaagde Philippus, doch hij zei niets; men zag hem niet meer,
+tenzij in den tuin, wanneer hij, bij helderen zomer dag, zijn schraal
+lichaampje in de zonne ging warmen.
+
+En als keizer Karel, van den oorlog teruggekeerd, zijn zoon vol
+somberheid zag zitten, sprak hij:
+
+--Mijn zoon, hoe zeer verschilt gij van mij! Op uwen leeftijd klom ik
+op de boomen achter de eekhoorntjes; met een koord liet ik mij langs
+steile rotsen glijden om arendsnesten te ledigen. Ik kon er het leven
+bij inschieten, maar mijn lichaam werd er des te sterker om. Op de
+jacht vluchtten de wilde dieren, als ze mij zagen met mijn vuurroer.
+
+--Ach! zuchtte de infant, 'k heb buikpijn, heer vader.
+
+--Paxarete-wijn is een uitstekend geneesmiddel tegen de buikpijn,
+sprak Karel.
+
+--Dien wijn lust ik niet; 'k heb hoofdpijn, heer vader.
+
+--Mijn zoon, zei Karel, gij moet loopen, springen, stoeien, zooals
+de andere kinderen van uwen leeftijd doen.
+
+--Mijne beenen zijn stijf, heer vader.
+
+--Kan het anders? sprak Karel, gij maakt er houten beenen van. Wacht,
+ik ga u vastbinden op een vurig peerd.
+
+De infant weende.
+
+--Bind mij niet vast, sprak hij, ik heb pijn aan de lenden, heer vader.
+
+--Maar, vroeg Karel, hebt gij dan overal pijn?
+
+--Het zou niets zijn, zoo men mij gerust liet, zegde de infant.
+
+--Denkt gij soms, hernam de keizer ongeduldig, uw koninklijk leven als
+de poëten in mijmering door te brengen? Laat hen hunne perkamenten
+met inkt bemorsen, in stilte, eenzaamheid en bespiegeling; aan u
+zoon van het zweerd, behoort het warme bloed, het oog van den arend,
+de list van den vos, de kracht van een Hercules. Waarom maakt gij het
+teeken des kruises? Een leeuwenwelp mag geen paternosterknauwer zijn!
+
+--Het Angelus, heer vader, antwoordde de infant.
+
+
+
+
+XIX.
+
+Bloei- en Zomermaand waren dat jaar oprecht de maanden der
+bloemen. Nooit zag men, in Vlaanderen, zulke welriekende hagedoornen,
+in de hovingen zooveel rozen, jasmijn en kamperfoelie. Als de
+Westenwind de geuren van dat bloemenland naar 't Oosten dreef, stak
+iedereen, en meest nog in Antwerpen, verrukt den neus omhoog, zeggende:
+
+--Riekt gij dien goeden wind, die uit Vlaanderen waait?
+
+Onverpoosd waren de vlijtige bijen bezig met honig uit de bloemen te
+zuigen, was te maken, het broedsel te verzorgen in de korven, te weinig
+in aantal om al de zwermen te bergen. Heerlijke muziek van den arbeid
+onder den blauwen hemel, die schitterend den rijken bodem overdekte!
+
+Men maakte rieten, strooien, wisschen bijenkorven. Mandenmakers,
+kuipers, stroovlechters arbeidden van den vroegen morgen. En de
+kastenmakers konden bijlange het bestelde werk niet afdoen.
+
+De zwermen bestonden uit dertig duizend werkbijen en twee duizend
+zevenhonderd hommels. De honigraten waren zoo lekker en van zulke
+zeldzame hoedanigheid, dat de deken van Damme er elf zond aan keizer
+Karel, als dankzegging omdat hij, door zijne ordonnantiën de Heilige
+Inquisitie weder ingevoerd had. Philippus at de honigraten op, maar
+hij had er geen genot van.
+
+Schooiers, bedelaars, rabauwen en heel die bende luiaards, die vadsig
+langs de wegen slenteren en zich liever laten opknoopen dan zich aan
+eenigerhande bezigheid over te leveren, kwamen van heinde en verre
+aanloopen, verlekkerd door den honiggeur. En 's nachts zwierven zij
+in groote menigte door velden en hoven.
+
+Klaas had korven gemaakt om er bijenzwermen heen te lokken; eenige
+waren gevuld, andere nog ledig. Klaas bleef heel den nacht waken om
+op zijn goed te letten. Als hij moede was, zegde hij tot Uilenspiegel
+zijne plaats in te nemen. Deze deed het gewillig.
+
+Nu, op een nacht dat het koel was, kroop Uilenspiegel in een ledigen
+korf, en gansch ineengedrongen, keek hij door de gaten die er van
+boven in waren.
+
+Op 't punt van insluimeren, hoorde hij de haag kraken en de stemmen
+van twee manslieden, die hij voor dieven aanzag. Hij keek door een
+der gaten van den bijenkorf en zag, dat de beide mannen lang haar
+en een langen baard hadden, hoewel een lange baard te dien tijde een
+teeken van adel was.
+
+Zij gingen van korf tot korf, en zoo kwamen zij aan den zijnen en
+hem optillende, spraken zij:
+
+--Deze is de zwaarste; vervolgens staken zij er hunne stokken onder
+en droegen hem mee.
+
+Uilenspiegel vond het geenszins aangenaam, aldus in een bijenkorf
+vervoerd te worden. De nacht was donker en de dieven spraken geen
+woord. Alle vijftig stappen bleven zij staan om adem te scheppen en
+zich vervolgens weder op weg te begeven. Die vóór ging gromde van
+kwaadheid omdat de last zoo zwaar woog, en die van achteren, kermde
+weemoedig. Want in de wereld zijn twee soorten luiaards: zij, die
+kwaad zijn op den arbeid, en zij, die jammeren als er te werken valt.
+
+Uilenspiegel, die niets te doen had, trok den dief, die vóór ging,
+bij zijn haar, en den anderen bij zijnen baard, zoodat de grommer
+den janker toeschreeuwde:
+
+--Als gij niet ophoudt, aan mijn haar te trekken, geef ik u eene smete
+op den kop, dat hij in uwe borstkas valt en gij door uwe ribben kunt
+zien, als een dief door de traliën van het Steen.
+
+--Ik deed het niet, vriend, jammerde de janker, gij zijt het die aan
+mijnen baard trekt.
+
+De grommer antwoordde:
+
+--Ik zoek geen ongedierte in een schurftigen baard!
+
+--Maat, sprak de janker, doe de korf niet zoo schommelen, mijne armen
+houden het niet langer uit.
+
+--Hewel, ik zal ze u van het lijf rukken. En hij trok zijnen riem over
+zijn hoofd, zette den korf op den grond en sprong op zijn makker. En
+zij vochten, de eene vloekend, de andere om genade smeekende.
+
+Toen Uilenspiegel de slagen hoorde vallen, kroop hij uit den korf,
+sleepte dien in een boschje, waar hij hem terugvinden kon, en keerde
+toen huiswaarts.
+
+En zoo is het, dat de slimmen voordeel halen uit twist en krakeel.
+
+
+
+
+XX.
+
+Als Uilenspiegel vijftien jaar oud was, bouwde hij te Damme, met
+vier palen, eene kleine tent op, en riep dat een iegelijk er zijn
+tegenwoordig en toekomstig gelaat kon afgebeeld zien, in een schoone
+lijst van hooi.
+
+Wanneer een opgeblazen rechtsgeleerde binnen kwam, zot van eigenwaan,
+stak Uilenspiegel zijn hoofd door de lijst en bootste het gezicht
+van een ouden aap na; dan sprak hij:
+
+--Een ouden snuit kan rotten, maar geenszins bloeien; ben ik uw
+spiegel niet, heer dokter in de rechten?
+
+Als Uilenspiegel tot klant een oudgediende kreeg, liet hij, in stee
+van zijn gezicht, in 't midden van de lijst een schotel vleesch en
+brood zien, en sprak hij:
+
+--De oorlog zal u tot gehakt maken; wat geeft gij mij om de
+voorzegging, o snorrebaard, verzot op sakkers met wijden mond?
+
+En als een oud heertje aan Uilenspiegel zijn poezelig wijfje liet
+zien, verborg de snaak zijn gelaat nogmaals en toonde in de lijste een
+boompje, aan welks takken messen, koffertjes, kammen en schrijfgerei
+hingen, alles van hoorn vervaardigd, en zeide:
+
+--Vanwaar komen die schoone snuisterijen, messire? is het niet van den
+horenboom, die groeit in den boomgaard der oude manslieden? Wie zal
+nog zeggen, dat horendragers van geenerlei nut zijn in de samenleving?
+
+En Uilenspiegel toonde in de lijste, nevens den boom, zijn jeugdig
+gezicht.
+
+Als de ouderling hem hoorde, ontstak hij in hevige woede, doch zijn
+vrouwtje paaide hem, en glimlachend vroeg zij aan Uilenspiegel:
+
+--En mijn spiegel, wilt ge hem mij toonen?
+
+--Kom nader, was 't antwoord.
+
+Zij deed het. Toen kuste hij haar waar hij maar kon.
+
+--Uw spiegel, sprak hij, is bloeiende jeugd in trotschheid gehuld.
+
+En de schoone ging heen, en vergat niet hem een paar gulden te geven.
+
+Aan een dikken monnik, die hem vroeg om zijn tegenwoordig en toekomstig
+gezicht te zien, antwoordde Uilenspiegel:
+
+--Gij zijt eene hespenkast, en een bierkelder zult gij ook zijn,
+want zout noodt tot drinken, niet waar, dikzak? Geef mij een oortje,
+omdat ik de waarheid zei.
+
+--Mijn zoon, sprak de monnik, nooit dragen wij geld op ons.
+
+--Dan is het, antwoordde Uilenspiegel, dat het geld u op zich draagt,
+want mij is 't bekend, dat gij het steekt tusschen twee zolen, onder
+den voet! Geef mij uw riemschoen.
+
+Maar de monnik hernam:
+
+--Mijn zoon, 't is het goed van het klooster. Maar als 't moet,
+zal ik u toch twee oortjes geven voor uwe moeite.
+
+De monnik gaf ze en Uilenspiegel nam ze minzaam aan.
+
+Daarna toonde hij ook aan de lieden van Damme, van Brugge, van
+Blankenberge, tot zelfs van Oostende, hunnen spiegel.
+
+En in stee van te zeggen in Vlaamsche sprake: "Ik ben Ulieden spiegel",
+zei hij kortweg: "Ik ben Ulen spiegel", gelijk thans nog gezegd wordt
+in Oost- en West-Vlaanderen.
+
+En zóó kwam hij aan zijn bijnaam Uilenspiegel.
+
+
+
+
+XXI.
+
+Grooter geworden slenterde hij geerne langs kermissen en
+jaarmarkten. Zag hij ergens een hobo-, vedel- of doedelzakspeler,
+dan liet hij zich voor een oortje leeren, hoe men uit die speeltuigen
+welluidende tonen kan halen.
+
+Zeer behendig werd hij in 't bespelen van den rommelpot, een speeltuig
+gemaakt met een pot, eene blaas en een rietje, en wel als volgt:
+over den pot spant men een natte blaas; een eind van het rietje
+wordt met een touwtje gebonden in het middenste van de blaas en het
+ander raakt den bodem van van den pot; vervolgens wordt de blaas tot
+barstens toe om den pot gespannen. 's Anderen morgens, als de blaas
+droog geworden is, kan men er op slaan als op een tamboerijn en zoo
+men met het rietje wrijft, bromt het schooner dan de viool.
+
+En Uilenspiegel ging met zijn rommelpot, die het geblaf van wachthonden
+nabootste, aan de deur van de huizen kerstliederen zingen, in
+gezelschap van kinderen, waarvan een, op Driekoningen, een blinkende
+papieren ster droeg.
+
+Als een meester-schilder te Damme kwam om de broeders van een of ander
+gilde geknield op het doek te malen, bekroop Uilenspiegel de lust te
+zien hoe hij werkte; daarom vroeg hij om zijne verf te mogen wrijven,
+en als loon wilde hij slechts eene snee brood, drie duiten en eene
+pint kuite aanveerden.
+
+Terwijl hij de verf fijn wreef, ging hij de doenwijze zijns meesters
+na. Als deze weg was, beproefde hij te schilderen, maar overal streek
+hij scharlakenrood. Hij probeerde ook 't portret te maken van Klaas,
+Soetkin, Katelijne en Nele, alsmede van pinten en stoopen. En Klaas
+hem aan 't werk ziende, voorzeide, dat hij, zoo hij neerstig wou
+zijn, florijnen bij tientallen zou kunnen verdienen met opschriften
+te schilderen op de speelwagens in Vlaanderen en Zeeland.
+
+Ook het houtsnijden en steenkappen leerde hij van een meester-metser,
+terwijl deze, in het koor van Onze Lieve Vrouwekerk, eenen zetel
+kwam maken, derwijze geschikt, dat de oude deken zitten kon zonder
+dat iemand het merkte.
+
+Uilenspiegel was het, die het eerst een messenhecht sneed, zooals de
+Zeeuwen gebruiken. Hij maakte er een kunstig bewerkt snijwerk van,
+met van binnen een doodshoofd en van boven een wakende hond. Hetgeen
+zeggen wilde: het hecht getrouw tot aan den dood.
+
+En alzoo begon zich de voorzegging van Katelijne te verwezenlijken,
+want Uilenspiegel was nu tegelijk schilder, beeldhouwer, boer en ook
+edelman: immers de Klaassen voeren, van vader tot zoon, drie zilveren
+pinten in een veld van bruinbier.
+
+Maar Uilenspiegel bleef in alles ongedurig en Klaas zei dat, als dat
+spelletje zoo voortging, hij hem de stulp uit zou jagen.
+
+
+
+
+XXII.
+
+De keizer, van den oorlog teruggekeerd, vroeg waarom zijn zoon
+Philippus hem niet was komen begroeten.
+
+De aartsbisschop-leermeester van den infant antwoordde, dat hij niet
+gewild had, dat hij slechts van boeken en eenzaamheid hield.
+
+De keizer vroeg, wáár hij zich ophield.
+
+De leermeester antwoordde, dat men hem overal zoeken moest, waar het
+duister was. Zoo deden zij.
+
+Als zij door menige zalen gegaan waren, kwamen zij eindelijk in een
+somber verblijf, door een smal venster verlicht. En op den grond
+stond een staak, waaraan een jong en lief aapje vastgemaakt lag,
+een diertje dat Zijne Hoogheid uit Indië gekregen had om er mede te
+spelen. Smeulende takkebossen lagen rondom en in het vertrek hing
+een walm van verkoold haar.
+
+Het diertje, levend verbrand, had zoo verschrikkelijk geleden, dat
+zijn lichaampje niet geleek op dat van een wezen dat geleefd had,
+maar op een stuk gewrongen en gerimpelden wortel. En op zijn mondje,
+dat open was, als om genade te vragen, stond een bloedig schuim,
+en zijn arm gezichtje was nat van zijne tranen.
+
+--Wie heeft dat gedaan? vroeg de keizer.
+
+De leermeester dorst niet antwoorden en beiden bleven sprakeloos,
+droef en grammoedig staan.
+
+Maar onverwacht werd de stilte door een lichten kuch gestoord, die uit
+den donkersten hoek kwam. Zijne Majesteit keerde zich om en zag den
+infant Philippus, in 't zwart gekleed bezig een citroen uit te zuigen.
+
+--Don Philippus, sprak hij, kom hier om mij te groeten.
+
+Zonder zich te verroeren, bekeek de infant hem met zijne vreesachtige
+oogen, waar geenerlei liefde in blonk.
+
+--Zijt gij het, vroeg de keizer, die dat diertje verbrand hebt?
+
+De infant boog het hoofd.
+
+--Waart gij wreedaardig genoeg om het te bedrijven, wees dan vrank
+genoeg om het te bekennen.
+
+De infant zweeg.
+
+Zijne Majesteit ontnam hem den citroen, wierp dien op den grond
+en wilde zijn zoon slaan, maar de aartsbisschop hield hem terug,
+en fluisterde hem toe:
+
+--Zijne Hoogheid zal later een groote ketterbrander zijn!
+
+De keizer glimlachte en beiden gingen, den infant met zijn aapje
+alleen latend.
+
+Maar ook anderen, die geen aapjes waren, kwamen in vlammen om.
+
+
+
+
+XXIII.
+
+De Slachtmaand was gekomen, de kille hoestmaand der borstlijders.
+
+'t Is ook de maand, waarin de knapen bij benden over de rapenvelden
+heenstormen, om te rooven wat zij kunnen, tot groote schade der boeren,
+die ze tevergeefs achternazitten met stokken en vorken.
+
+Op een avond nu dat Uilenspiegel van een strooptocht terugkwam,
+hoorde hij in een hoek van den haag, dicht bij hem, een gekerm. Hij
+bukte en zag, op eenen steen, een hondeken liggen.
+
+--Wel, mijn beestje, sprak hij, wat doet ge hier zoo spa in den avond?
+
+Hij wilde den hond streelen en hij voelde dat zijn rug nat was. Hij
+dacht, dat men hem had willen verdrinken en nam hem in de armen,
+om hem te drogen en te koesteren.
+
+Thuis gekomen, sprak hij:
+
+--Hier is een gekwetste, wat moet ik er mee doen?
+
+--Hem verbinden, antwoordde Klaas.
+
+Uilenspiegel zette den hond op de tafel. Klaas, Soetkin en hij zagen
+toen, bij het licht van de lamp, dat het diertje eene wond op de
+rug had. Soetkin wiesch ze, lei er balsem op en bond er een doek
+om. Uilenspiegel nam den hond in zijn bed, hoewel Soetkin hem in
+'t hare wou hebben, bevreesd dat Uilenspiegel, die woelde als een
+duivel in een wijwatervat, in zijn slaap het diertje zou bezeeren.
+
+Maar Uilenspiegel deed zijne goesting; hij verzorgde zijn hond zóó
+goed, dat de gekwetste na zes dagen liep zooals de meesten zijner
+verwaande natuurgenooten, met den steert omhoog.
+
+En de schoolmeester hiet hem Titus Bibulus Snuffius: Titus in memorie
+van zekeren goeden Romeinschen keizer, dewelke dwalende honden placht
+op te nemen; Bibulus, omdat de hond eene dronkemansliefde voor kuite
+en bruinbier had, en Snuffius omdat hij steeds met den snoet in
+rattenholen en mollenritten aan 't snuffelen was.
+
+
+
+
+XXIV.
+
+Aan het einde van de Onze-Lieve-Vrouwestraat stonden twee wilgeboomen
+aan den boord van een diepe gracht.
+
+Tusschen de twee wilgen spande Uilenspiegel eene koorde, waarop hij
+op een Zondag na de vespers danste, zoo vlug, dat heel de menigte
+van straatloopers in de handen kletste. Toen kwam hij beneden en ging
+rond met zijn schaaltje, dat met geld gevuld werd, maar hij ledigde
+het in de schorte van Soetkin, en hield elf duiten voor zich.
+
+Den volgenden Zondag wilde hij weer op de koorde dansen, maar eenige
+bengels, uit nijd over zijne behendigheid, hadden eene snee in de
+koorde gegeven, zoodat zij na eenige sprongen brak en Uilenspiegel in
+'t water tuimelde.
+
+Terwijl hij naar den oever zwom, riepen de kleine koordesnijders
+hem toe:
+
+--Hoe gaat het, Uilenspiegel-vlug? Gaat gij nu in den vijver den
+karpers leeren dansen?
+
+Uilenspiegel kwam uit het water en schudde zich af. En daar zij uit
+angst voor een pak slaag wegliepen, riep hij hun toe:
+
+--Vreest niets; komt Zondag terug, 'k zal U andere kunsten toonen en
+gij zult uw deel in de winst hebben!
+
+'s Zondags nadien sneden de bengels de koorde niet door, doch hielden
+er de wacht bij, opdat niemand ze aanraakte, want er waren toeschouwers
+in groote menigte.
+
+Uilenspiegel zei hun:
+
+--Dat ieder mij een zijner schoenen geve, en 'k wed dat ik er mee dans,
+zoowel met den grootsten als met den kleinsten.
+
+--En wat betaalt gij, als gij verliest? vroegen zij hem.
+
+--Veertien pinten bruinbier, antwoordde Uilenspiegel, maar gij betaalt
+mij drie oortjes als ik win.
+
+--Goed! riepen zij.
+
+En zij gaven hem elk een hunner schoenen. Uilenspiegel legde ze alle
+in het voorschoot dat hij aan had en, met dien last, danste hij op
+de koorde, doch niet zonder moeite.
+
+Van beneden riepen de koordesnijders:
+
+--Gij hebt gezegd met elk onzer schoenen te zullen dansen; trek ze
+aan en houd uwe wedding.
+
+Uilenspiegel danste voort en antwoordde:
+
+--Ik heb niet gezegd uwe schoenen aan te trekken, doch er mee te
+dansen. Nu, ik dans, en alles danst mee in mijn voorschoot. Ziet gij
+het niet met uwe paddenoogen? Betaalt mij mijn drie oortjes.
+
+Doch zij jouwden hem uit en schreeuwden, dat zij hunne schoenen
+moesten terughebben.
+
+Uilenspiegel smeet ze alle te gelijk in een worp naar beneden. Een
+woedend gevecht volgde, daar niemand zijn schoen dadelijk terugvinden
+kon.
+
+Uilenspiegel kwam naar beneden en begoot de vechters, maar niet met
+klaar water.
+
+
+
+
+XXV.
+
+De infant, nu vijftien jaar oud, dwaalde als naar gewoonte door gangen
+en trappen en zalen van 't slot. Doch meestal slenterde hij rond de
+vertrekken der edelvrouwen, om de edelknapen te verschalken, die,
+gelijk hij, als katten in de gangen op loer lagen. Andere jonkers
+waren in den tuin, keken verzuchtend omhoog, en zongen eene ballade
+van minne.
+
+Als de infant het hoorde, vertoonde hij zich eensklaps aan een der
+vensteren, en de arme edelknapen waren ontsteld als zij zijn bleeke
+tronie zagen, in stee van de zoete oogen hunner schoonen.
+
+Onder de edelvrouwen van het hof was een lieftallige dame, een
+Vlaamsche van Dudzele, omtrent Damme, van ongemeene schoonheid en in
+de volheid harer jaren, met oogen, groenig-bruin, en rossig, krullend
+haar, dat schitterde als goud. Vroolijk van zin en vurig van aard,
+verheelde zij niemand hare neiging tot den gelukkige, wien zij, op
+heur aanbiddelijk erf, het hemelsch privilege van liefde schonk. De
+uitverkorene heurs herten was een schoon en fier ridder. Elken dag
+op vast uur, ging zij tot hem, hetgeen Philippus wist.
+
+Hij zette zich op eene bank tegenover een venster en wachtte. En
+als zij hem voorbijging met flikkerend oog en met rozeroode lippen,
+en glanzend van jeugd en van liefde in haar kleed van goudbrocaat,
+zag zij den infant, die, zonder zich van zijne plaats te verheffen,
+tot haar zegde:
+
+--Mevrouwe, hebt gij een oogenblik voor mij?
+
+Driftig als de merrie, die in haren loop gestuit wordt op 't oogenblik
+dat zij rent naar den schoonen hengst, die in den beemd hinnikt,
+antwoordde zij:
+
+--Hoogheid, een ieder moet gehoorzamen aan Uwen vorstelijken wil.
+
+--Zet U naast mij, sprak de infant.
+
+Onbeschaamd, listiglijk en onbermhertig zag hij haar aan:
+
+--Zeg mij het Onze-vader in Vlaamsche tale; men heeft het mij geleerd,
+laas! ik heb het vergeten.
+
+De arme vrouw zegde een Vader-ons, doch tamelijk vlug, maar hij dwong
+haar telkens tot langzamer spreken.
+
+En aldus noodzaakte hij heur het tot tienmaal toe te zeggen, aan haar,
+die op dit uur aan andere gebeden dacht.
+
+Daarna sprak hij vleiend van heure schoone gouden lokken, van heure
+heldere tint, heur klare oogen, maar niets dorst hij zeggen van
+heur gevleesde schouderen, noch van haren fraai gevormden boezem,
+noch van iets anders.
+
+Zij meende te mogen heengaan en blikte reeds naar den tuin waar zij
+haren minnaar wachtte, toen hij vroeg of ze wist welke de deugden
+der vrouw zijn?
+
+Daar zij niet antwoordde uit vreeze van verkeerd te spreken, deed
+hij het in heure plaats, en zegde hij op den toon van een zedenpreeker:
+
+--Deugden der vrouwe zijn kuischheid, eerzaamheid en ingetogenheid.
+
+Hij ried haar aan zich zedig te kleeden en alles wat heur was,
+zorgvuldiglijk te verbergen.
+
+Zij knikte ten teeken van goedkeuring en zeide, dat zij zich voor
+Zijne Noordpoolachtige Hoogheid liever met tien berenhuiden dan met
+eene el neteldoek bedekken zou.
+
+En terwijl hij onthutst was over dit antwoord, nam zij lachende
+de vlucht.
+
+Nochmaals was het vuur der jeugd in de borst van den infant ontbrand:
+maar het was dit gloeiende vuur niet, dat de sterke zielen tot groote
+daden drijft, noch het zoete vuur, dat de teedere herten doet weenen:
+'t was een somber vuur uit de helle, door Satan ontstoken. En het
+glom in zijne grijze oogen, gelijk de maan boven een kerkhof, in
+winternacht. En het brandde hem wreedelijk.
+
+Daar de arme gluiperd geene liefde voor anderen voelde, dorst hij de
+edelvrouwen niet aanspreken; toen ging hij naar een afgelegen hoekje,
+in een kamertje, met witte muren, slecht verlicht, waar hij gemeenlijk
+zijne lekkernijen at en waar een groote menigte vliegen waren, om den
+wille van de brokkelingen. Daar streelde hij zichzelven, terwijl hij de
+vliegen met den kop tegen de ruiten plette en er met honderden doodde,
+totdat zijne vingeren te danig beefden om hunne bloedige bezigheid
+voort te zetten. En in die wreede uitspanning vond hij een genot,
+mits geilheid en wreedheid twee eerlooze zusteren zijn. Als hij
+uit dat hok kwam, was hij nog somberder dan te voren en een ieder
+ontvluchtte het bleeke gelaat van dien terugstootenden prins.
+
+En de treurige Hoogheid leed, want slecht herte is smerte.
+
+
+
+
+XXVI.
+
+De schoone vrouwe verliet Valladolid om naar heur slot van Dudzele,
+in Vlaanderen, te gaan.
+
+Toen zij, met heuren dikken bottelier, door Damme trok, zag zij een
+veertienjarigen knaap, met den rug tegen eene hut geleund, op eenen
+doedelzak spelen. Rechtover hem zat een rosse hond, die jammerlijk
+huilde, daar die muziek hem niet aanstond. De zonne stond schitterend
+aan den hemel. Nevens den knaap zat een aanminnig meisje, dat, bij
+elk erbarmelijk gehuil van den hond, in een gulhertigen lach schoot.
+
+Toen de schoone vrouwe en de dikke bottelier voorbij de stulp kwamen,
+bezagen zij Uilenspiegel, die blies, Nele, die lachte en Titus Bibulus
+Snuffius, die jankte.
+
+--Stoute jongen, sprak zij tot Uilenspiegel, wilt ge wel ophouden
+dien armen hond zoo te doen huilen!
+
+Maar Uilenspiegel bezag haar en blies nog harder op zijnen
+doedelzak. En Bibulus Snuffius jankte nog jammerlijker, en Nele
+schaterlachte nog luider.
+
+De bottelier ontstak in woede, wees naar Uilenspiegel en sprak tot
+de edelvrouwe:
+
+--Als ik dat schavuitengebroed eens afroste met de schee van mijn
+degen, zou de onbeschaamderik wel ophouden!
+
+Uilenspiegel bezag den bottelier, hiet hem Jan Papzak, om den wille
+van zijn dikken buik en ging voort met blazen op zijn doedelzak. De
+bottelier liep op hem toe en dreigde hem met de vuist; maar Bibulus
+Snuffius vloog op hem af en beet Papzak in het been; van schrik viel
+de bottelier op den grond en schreeuwde om hulp.
+
+De dame lachte Uilenspiegel toe en sprak:
+
+--Kunt ge mij zeggen, doedelzakspeler, of de weg, die van Damme naar
+Dudzele leidt, niet veranderd is?
+
+Uilenspiegel bleef voortblazen, schudde den kop en bezag de edelvrouwe.
+
+--Maar waarom ziet ge mij zoo strak aan? vroeg zij.
+
+Doch hij speelde voort en sperde de oogen open, alsof hij voor heur
+in bewondering stond.
+
+--Zijt gij niet beschaamd, voor een jongen snaak als gij, de vrouwen
+aldus te bezien?
+
+Uilenspiegel bloosde een weinig, speelde voort en bekeek heur nog meer.
+
+--Ik heb U gevraagd, hernam zij, of de weg niet veranderd is, die
+van Damme naar Dudzele leidt?
+
+--Weleer was hij groen, thans is hij droef en schraal, sedert hij
+het geluk mist U te mogen dragen, antwoordde Uilenspiegel.
+
+--Wilt ge mij leiden?
+
+Maar Uilenspiegel bleef zitten, haar steeds aanziende. En als ze hem
+zoo snaaksch zag en zoo jong en zoo levendig, vergaf zij hem geerne
+zijne woorden. Hij stond op om binnen te gaan.
+
+--Waar gaat gij?
+
+--Mijn beste kleeren aantrekken, antwoordde hij.
+
+--Spoed U dan, sprak de edelvrouwe.
+
+Toen zette zij zich neer op de bank naast de deur; de bottelier deed
+zooals zij. Zij wilde tot Nele spreken, maar Nele antwoordde heur niet,
+want zij was jaloersch.
+
+Uilenspiegel kwam terug; hij was schoon gewasschen en had een
+bombazijnen wambuis aan. Hij zag er flink uit in zijn zondagspak.
+
+--Gaat gij toch mee? vroeg Nele hem.
+
+--Ik ben dadelijk terug.
+
+--Wil ik in uwe plaats gaan? sprak Nele.
+
+--Neen, zegde hij, de wegen zijn vol modder.
+
+--Waarom, vroeg de dame gestoord en insgelijks jaloersch, waarom,
+kleine meid, wilt gij hem beletten van mede te gaan?
+
+Nele antwoordde heur niet, maar twee dikke tranen welden in heure
+oogen, en treuriglijk en gramstorig bekeek zij de schoone edel vrouwe.
+
+Gevieren begaven zij zich op weg, de dame op hare witte hakkenei
+met zwart fluweel getuigd; de bottelier met zijn waggelenden buik;
+Uilenspiegel, die de hakkenij bij den breidel hield, en Bibulus
+Snuffius, die, met den steert in de lucht, fier naast zijn meester
+stapte.
+
+Geruimen tijd reden en gingen zij aldus voort, maar Uilenspiegel was
+niet op zijn gemak; stom als een visch snoof hij den fijnen benjoëreuk
+op, die opsteeg uit de kleeren van de dame, en hij bekeek, ter sluip,
+heur schoon paardentuig, heure zeldzame kleinooden en juweelen, en ook
+heur zachtaardig uitzicht, heure schitterende oogen, heuren schoonen
+boezem en heur haar, dat als een gouden helmet in de zonne schitterde.
+
+--Waarom zegt gij zoo weinig, vriendje? vroeg zij.
+
+Hij antwoordde niet.
+
+--'t Ware jammer als gij uwe tong verloren hadt, want 'k had U geerne
+met een boodschap belast.
+
+--Welke? vroeg Uilenspiegel.
+
+--Gij moet, sprak de dame, mij hier verlaten en naar Koolkerke gaan,
+aan den anderen kant van den wind, en aldaar zeggen aan een edelman,
+half in 't zwart, half in 't rood gekleed, dat hij mij vandaag niet
+mag verwachten, maar Zondag komen moet, te tien uren van den nacht,
+in mijn slot, langs de sluippoort.
+
+--Ik ga niet! sprak Uilenspiegel.
+
+--Waarom niet? vroeg de dame.
+
+--Neen, ik ga niet! volhardde Uilenspiegel.
+
+De dame sprak toen:
+
+--Maar waarom toch maakt gij u driftig als een haantje, en wilt
+niet gaan?
+
+--Ik ga niet! sprak Uilenspiegel.
+
+--Maar als ik U een gulden gaf?
+
+--Neen! sprak hij.
+
+--Een dukaat?
+
+--Neen.
+
+--Een karolus?
+
+--Neen, sprak Uilenspiegel nog. En toch, voegde hij er bij met
+een zucht, zou ik dien liever dan eene mosselschelp in moeder heur
+tassche zien.
+
+De dame glimlachte, en eensklaps riep zij uit:
+
+--Ik ben mijne beugeltassche kwijt, een schoone zeldzame tassche van
+zijdelaken, met fijne perelen geborduurd. Te Damme had ik ze nog aan
+mijne ceintuur bevestigd.
+
+Uilenspiegel verroerde zich niet, maar de bottelier ging naar de
+edelvrouwe:
+
+--Mevrouwe, sprak hij, als die jonge schavuit ze gaat zoeken, ziet
+gij hem nimmer terug.
+
+--En wie zal dan gaan? vroeg de edelvrouwe.
+
+--Ik, sprak hij, hoewel ik oud van jaren ben.
+
+En terstond ging hij op zoek.
+
+Middag sloeg de klok; 't was drukkend warm en stille en eenzaam in
+het ronde. Uilenspiegel sprak geen woord, doch deed zijn nieuw wambuis
+uit, om de dame onder de schaduwe van een lindeboom te laten rusten,
+zonder dat de koelte van het gras heur kwellen kon. En hij bleef
+rechtstaan in verzuchting, naast heur.
+
+Zij zag hem aan en voelde medelijden voor dien blooden jongen,
+en vroeg hem of hij niet moede was, zoo lang op zijne jonge beenen
+te staan. Hij antwoordde niet, doch liet zich naast heur vallen, en
+zij trok hem tot zich, en zijn hoofd rustte op heuren blooten boezem,
+en daar lag hij zoo goed, dat zij het als eene zonde beschouwd hadde,
+hem te zeggen, dat hij elders een hoofdkussen zoeken moest,
+
+De bottelier kwam intusschen terug, zeggende dat hij de beugeltassche
+niet gevonden had.
+
+--Ik heb ze wedergevonden, ik, antwoordde de dame, toen ik van mijn
+peerd steeg; in 't vallen was zij aan den stijgbeugel vastgeraakt. En
+nu, sprak zij tot Uilenspiegel, leid ons nu recht naar Dudzele en
+zeg mij uw naam.
+
+--Mijn patroon, antwoordde hij, is de heer Sint Thijlbert, naam,
+die bediedt vlug te been, om te gaan waar het goed is; mijn naam is
+Klaas en mijn toenaam Uilenspiegel. Als ge U zelf in mijn spiegel wilt
+aanschouwen, zult gij overtuigd zijn, dat er, gansch Vlaanderenland
+door, geen schitterender bloem van schoonheid bestaat dan Uwe geurige
+bekoorlijkheid.
+
+De dame bloosde van welbehagen en was geenszins verbolgen.
+
+En gedurende die lange afwezigheid weenden Soetkin en Nele bitterlijk.
+
+
+
+
+XXVII.
+
+Toen Uilenspiegel van Dudzele terugkwam, zag hij Nele, aan den
+inkoom van de stad, met den rug tegen een hek geleund, en een tros
+blauwe druiven in de hand. Een voor een at zij de vruchten, die
+haar verfrischten, maar blijken liet zij dit niet. Integendeel, zij
+scheen verstoord, want driftig beet zij de druiven van de rist. Zij
+was weemoedig, en had zulk een droevig en spijtig gezicht, dat
+Uilenspiegel, vol liefde, medelijden kreeg en, stille achter haar,
+heur eenen kus in den hals gaf.
+
+Maar zij gaf hem een klinkenden kaakslag in de plaats.
+
+--Die was raak, zei Uilenspiegel.
+
+Zij weende dat de tranen over heure wangen rolden.
+
+--Nele, sprak hij, gaat gij nu de fonteinen aan den ingang van de
+stad stellen?
+
+--Loop heen! zegde zij.
+
+--Maar ik kan niet heengaan, als gij zoo weent, liefste?
+
+--Ik ben geene liefste, sprak Nele, en weenen doe ik niet.
+
+--Neen, gij weent niet, maar er komt water uit uwe oogen.
+
+--Wilt gij gaan, sprak zij.
+
+--Neen! zegde hij.
+
+Maar met heure bevende handjes, hield zij heur schort voor 't gezicht;
+zij beet er de stof van aan stukken, en heure tranen maakten het nat.
+
+--Nele, vroeg Uilenspiegel, zeg eens, zal het straks schoon weder zijn?
+
+En glimlachend zag hij heur liefderijk aan.
+
+--Waarom vraagt ge mij dat? sprak zij.
+
+--Omdat het spreekwoord zegt: na regen komt zonneschijn, antwoordde
+Uilenspiegel.
+
+--Ga, sprak zij, ga bij uw schoone dame met haar zijden kleed, die
+hebt gij genoeg doen lachen.
+
+Toen zong Uilenspiegel:
+
+
+    Hoor ik mijn lieveken krijschen
+    't Doet mijn herteken groot verdriet.
+    Honig zoo gij haar lachen hoort,
+    Peerlen zoo gij heur traantjes ziet....
+    Ei, mijn lieveken laat ik niet!...
+    En ik geef een bottel ten beste
+    Lekkeren Leuvenschen wijn.
+    En ik geef een bottel ten beste
+    Als Nele vroo wil zijn....
+
+
+--Gemeene man, sprak zij, gij lacht mij dan noch uit!
+
+--Nele, sprak Uilenspiegel, ik ben een man, dat is waar, maar gemeen
+ben ik niet, want onze adellijke familie, eene schepenfamilie, voert
+drie zilveren pinten in een veld van bruinbier. Nele, is 't waar,
+dat men, in Vlaanderenland, kaaksmeten maait als men kussen zaait?
+
+--Ik spreek u niet aan, zegde zij.
+
+--Waarom doet ge dan uw mondje open om het mij te zeggen?
+
+--Ik ben kwaad, sprak zij.
+
+Uilenspiegel klopte heel zachtjes op heuren rug en sprak:
+
+--Kus een vrouwtje en ze zal u kloppen; klop een vrouwtje en ze zal
+u kussen. Kus mij dan, liefste, vermits ik u klopte.
+
+Nele keerde zich om. Hij opende zijne armen en, nog weenend, wierp
+zij er zich in en vroeg:
+
+--Zult ge ginder niet meer gaan, Thijl?
+
+Maar hij antwoordde niet, want hij had het te druk met heure bevende
+vingeren in de zijne te drukken en, met de lippen, de heete tranen
+te wisschen, die uit Nele's oogen vielen als de dikke droppelen van
+een stormregen.
+
+
+
+
+XXVIII.
+
+In dien tijd weigerde Gent, de edele stad, haar aandeel te betalen
+in de bede, die haar zoon, keizer Karel, heur vroeg. Zij kon niet
+betalen, want zij had geen geld meer, en dit was de schuld van Karel
+zelf. Toch was dat een groote misdaad, en hij besloot haar in persoon
+te gaan kastijden.
+
+Want de slagen, die eene moeder het zeerst doen, zijn die van heuren
+zoon.
+
+Frans met den Langen Neus, zijn vijand, deed hem het aanbod om
+door Frankrijk te gaan. Karel nam het aan, en in stee van te
+worden gevangengezet, werd hij op vorstelijke wijze onthaald en
+gevierd. Altijd zijn de vorsten bereid elkander te helpen, om 't volk
+te onderdrukken.
+
+Karel verbleef langen tijd te Valencijn, zonder eenig teeken van
+toorn te geven. De stad Gent, zijne moeder, leefde zonder vrees in
+het geloof, dat de Keizer, haar zoon, vergeten zou, wijl zij gehandeld
+had volgens recht.
+
+Karel kwam onder de muren van de stad met vier duizend peerden. Alva
+was bij hem, alsmede de prins van Oranje. Het gemeen en de kleine
+ambachten hadden geerne die kinderlijke intrede belet en de tachtig
+duizend man van de stad en den bijvang op de been gebracht; maar de
+hoogpoorters verzetten zich daartegen, want zij vreesden, dat het volk
+de overhand zou krijgen. Nochtans had de stad Gent haren zoon met zijne
+vier duizend peerden in de pan kunnen hakken. Maar zij beminde hem nog,
+en de kleine ambachten zelven hadden weder vertrouwen gekregen.
+
+Karel ook had haar lief, maar 't was om het geld, dat hij van haar
+in zijne kisten had en nog van haar trekken wilde.
+
+Toen hij zich meester gemaakt had van de stad, stelde hij overal
+krijgswachten en liet hij dag- en nachtronden doen. Daarna sprak hij,
+in groote statie, de sententie over de stede uit.
+
+De voornaamste poorters moesten vóór zijnen troon vergiffenis komen
+vragen, met een strop om den hals; Gent werd schuldig verklaard aan
+de ergste misdaden, dewelke zijn: ontrouw, inbreuk op de tractaten,
+ongehoorzaamheid, muiterij, opstand en majesteitsschennis. De keizer
+verklaarde alle geschonken privileges, rechten, vrijheden, costumen
+en gebruiken verbeurd en, de toekomst verbindende alsof hij God zelf
+was, bepaalde hij verder, dat zijne opvolgers, bij hunne komst als
+landheer, zweren moesten niets te zullen naleven dan de vernederende
+Karolijnsche Concessie, door hem aan de stad verleend.
+
+De abdij van Sint-Baafs deed hij afbreken, om ter plaatse eene vesting
+te bouwen, van waar hij, gemakkelijk, de borst zijner moeder met
+kogels kon doorboren.
+
+Als een slechte zoon, die met ongeduld naar den dood zijner ouderen
+wacht, verbeurde hij alle goederen en eigendommen van Gent, inkomsten
+en panden, geschut en oorlogstuig.
+
+En hij vond, dat de stad te goed verdedigd was: daarom deed hij den
+Rooden Toren, den Paddenhoektoren, de Braampoort, de Steenpoort,
+de Walpoort, de Ketelpoort en vele andere poorten afbreken, dewelke
+als meesterstukken van bouwkunst en beeldhouwkunst doorgingen.
+
+En als later vreemdelingen naar Gent kwamen, spraken zij verbaasd
+tot elkaar:
+
+--Is dàt Gent, die platte en treurige stad? Men vertelde er ons
+wonderen van: men heeft ons bedrogen.
+
+En die van Gent antwoordden:
+
+--Keizer Karel heeft de stad heure krone ontnomen.
+
+En dit zeggende, waren zij grammoedig en beschaamd. En uit het puin
+van de poorten haalde de keizer steenen voor zijne vesting.
+
+Hij wilde, dat Gent arm werd, daar aldus de stad noch door arbeid,
+noch door handel of geld, zich tegen zijne stoutmoedige inzichten
+verzetten kon; daarom veroordeelde hij haar tot het betalen van het
+geweigerde aandeel in de schatting van vierhonderd duizend gouden
+karolusgulden en, daarboven, honderd vijftig duizend karolussen in
+eens, en elk jaar nog zes duizend als eeuwigdurende rente. Hij had
+geld van de stad in leening gekregen en moest haar voor hetzelve
+eene rente betalen van honderd vijftig pond grooten. Met geweld deed
+hij zich de schuldbrieven overhandigen en verscheurde ze. En op die
+manier betaalde hij zijne schuld.
+
+In menige aangelegenheid had Gent hem lief gehad en geholpen. Maar
+hij stak haar eenen dolk in de borst, om bloed te hebben, daar hij
+geene melk meer vond.
+
+Toen bezag hij Roeland, de schoone klokke, en aan haren klepel liet hij
+den poorter opknoopen, die storm geluid had, om de stad ten strijde
+te roepen, ten einde heur recht te verdedigen. Geene genade had hij
+voor Roeland, de fiere klokke, de tong zijner moeder, waarmee zij
+tot Vlaanderen sprak:
+
+
+    Als men my slaat dan is 't brandt,
+    Als men my luydt dan is 't storm in Vlaenderland.
+
+
+Mits zijne moeder te luide sprak, nam hij de klokke weg. En die van
+'t platteland zeiden, dat Gent dood was, dat heur zoon, met eene tang,
+heure tong uit heuren mond had gerukt.
+
+
+
+
+XXIX.
+
+Op een van die dagen,--heldere en frissche lentedagen, als heel de
+aarde liefde ademt,--zat Soetkin bij het open venster te naaien,
+neurde Klaas een deuntje, terwijl Uilenspiegel bezig was met Titus
+Bibulus Snuffius eene rechterskap op te zetten. De hond ging met
+zijne pooten te werk, alsof hij eene sententie moest uitspreken, maar
+'t was alleen om den hoed af te krijgen.
+
+Doch eensklaps sprong Uilenspiegel naar het venster en deed het
+dicht. Klaas en Soetkin keken op en zagen hun zoon rond de kamer
+loopen, op tafels en stoelen springen om een vogeltje te vangen,
+dat, met trillende vleugelen en piepend van angst, in den hoek van
+een balk aan de zoldering eene schuilpaats ging zoeken.
+
+Uilenspiegel wilde het diertje grijpen, toen Klaas hem met ruwe
+stemme vroeg:
+
+--Waarom springt gij aldus?
+
+--Om het te vangen, antwoordde Uilenspiegel, het in eene kevie te
+zetten, zaad te geven en voor mij te doen zingen.
+
+Maar de vogel piepte van angst, vloog weer rond de kamer en bezeerde
+zijn kopje tegen de ruiten.
+
+Daar Uilenspiegel niet ophield met grijpen en springen, pakte Klaas
+hem ruw bij den schouder.
+
+--Vang het beestje, sprak hij, doe het voor u zingen, maar ik zal
+u ook in eene kooi steken, met kloeke ijzeren staven gesloten en ik
+zal ook u doen zingen. Gij, die zoo geerne loopt, wordt opgesloten;
+in de schaduw gestoken als gij koude hebt, in den zonneschijn als
+gij het warm hebt. En op een Zondag zullen wij uitgaan en vergeten u
+eten te geven, en als wij 's Donderdags terugkomen, zullen wij Thijl,
+gestorven van honger, met de beenen uitgestrekt vinden.
+
+Soetkin weende, Uilenspiegel vloog naar het venster.
+
+--Wat doet gij? vroeg Klaas.
+
+--Het venster open doen om den vogel buiten te laten, antwoordde hij.
+
+Inderdaad, de vogel, een distelvink, vloog het venster uit, tjilpte
+blijde in de vrije lucht, en steeg als een pijl naar omhoog. Dan
+ging hij op een perelaar zitten, waar hij zijne vleugelen streek en
+zijne pluimen schudde en grammoedig, in zijne vogeltaal, Uilenspiegel
+allerlei verwenschingen naar het hoofd stuurde.
+
+Toen sprak Klaas:
+
+--Mijn zoon, nooit moogt ge aan mensch of dier de vrijheid ontnemen,
+want die is het hoogste goed. Laat een iegelijk de zonne zoeken als hij
+koude heeft, en de schaduw als hij het warm heeft. En God oordeele
+Zijne Heilige Majesteit, die het vrije geloof in Vlaanderenland
+aan ketenen legt en Gent, de edele stad, in een ijzeren kooi van
+slavernije sluit!
+
+
+
+
+XXX.
+
+Philippus was getrouwd met Maria van Portugal, wier bezittingen hij
+bij de Spaansche krone gevoegd had; van haar had hij don Carlos,
+den wreedaardigen zot. Maar liefde gevoelde hij voor zijne vrouw niet.
+
+De koningin leed aan de gevolgen van heure kraam. Zij bleef te bed en
+bij haar waren heure eeredames, onder dewelke de hertoginne van Alva.
+
+Philippus liet heur dikwijls alleen, om ketters om hals te zien
+brengen. De edelvrouwen en kamerheeren deden als hij. En zoo ook de
+hertoginne van Alva, de adellijke baker van Maria.
+
+In dien tijd vatte de officiaal een Vlaamschen beeldhouwer,
+Roomsch-katholiek van geloove, omdat een monnik hem den overeengekomen
+prijs voor een houten Lieve-Vrouwenbeeld geweigerd had, en nu het
+aangezicht van het beeld met zijnen beitel had geschonden, zeggende:
+dat hij liever zijn werk vernielde, dan het te laten onder den prijs.
+
+Door den monnik als beeldschenner aangeklaagd, werd hij zonder genade
+op de pijnbank gelegd, en veroordeeld om levend te worden verbrand.
+
+Op de pijnbank had men hem de voetzolen geroosterd en onderwege,
+van het gevang naar den brandstapel, met den san benito op het hoofd,
+riep hij gedurig:
+
+--Snijdt mijne voeten af! Snijdt mijne voeten af!
+
+En van verre hoorde Philippus die bange kreten, en hij trilde van
+genot, maar hij lachte niet.
+
+De eeredames verlieten koningin Maria om de voltrekking van het vonnis
+bij te wonen: na haar volgde de hertoginne van Alva, die bij het hooren
+van de kreten van den Vlaamschen kunstenaar, ook het schouwspel wilde
+zien en de Koningin alleen liet.
+
+Toen Philippus, zijne hooge dienaren, prinsen, graven, schildknapen en
+hofdames dáár waren, werd de beeldhouwer met een lange keten aan een
+paal geklonken, te midden van een vuur, gemaakt van rijshout en stroo,
+dat hem langzaam moest braden, terwijl hij zich zoo verre mogelijk
+van het laaie vuur wilde houden.
+
+Hij was zoo goed als naakt, en nieuwsgieriglijk keek men hoe hij
+beproefde zijne zielskracht te stellen tegen de hitte des vuurs.
+
+En middelerwijl had Maria dorst. Zij zag een halven meloen op eene
+schaal liggen, sleepte zich uit heur bedde, greep de vrucht en verslond
+die gulzig.
+
+De verkoelende vrucht deed de kraamvrouw huiveren. Zij bleef op de
+vloer liggen, ze kon zich niet bewegen.
+
+--Ik zou mij verwarmen, was hier iemand om mij te bedde te leggen?
+
+Toen hoorde zij den armen beeldhouwer schreeuwen:
+
+--Snijdt mijne voeten af!
+
+--Ach! riep de arme vorstinne, is dat een hond, die huilt om mijnen
+dood te voorspellen?
+
+Op dat oogenblik zag de beeldhouwer rondom zich; doch hij bespeurde
+niets dan vijandige Spaansche gezichten, en hij dacht aan Vlaanderen,
+het land van de dapperen; en, zijne lange keten achter zich sleepend,
+stapte hij naar den vuurgloed van stroo en van rijshout. Zich in zijn
+gansche lengte verheffend en de armen kruisend sprak hij:
+
+--Ziet hoe de Vlamingen sterven onder het oog van de Spaansche
+beulen! Snijdt niet mijne, maar hunne voeten af, opdat ze naar
+geen nieuwe euveldaden loopen! Leve Vlaanderen! Vlaanderen in der
+eeuwigheid!
+
+En de edelvrouwen juichten hem toe, vroegen genade voor hem, als ze
+zijne fiere houding zagen.
+
+En de kunstenaar stierf.
+
+Koningin Maria rilde over gansch heur lichaam, heure tanden klapperden
+van koude en, armen en beenen uitrekkend, kreunde zij:
+
+--Legt mij te bedde, dat ik mij verwarme. En zij stierf.
+
+En alzoo, volgens de voorzegging van Katelijne, de goede tooveres,
+zaaide Philippus overal dood, bloed en tranen.
+
+
+
+
+XXXI.
+
+Maar Uilenspiegel en Nele hadden elkander innig lief.
+
+Het was op 't einde van de Grasmaand; al de boomen stonden in bloei,
+de planten waren in lichtgroen gedost, de nachtegalen kwinkeleerden
+in het loover: de heele natuur had zich gereedgemaakt om de Meimaand
+waardig te ontvangen.
+
+Dikwerf dwaalden Uilenspiegel en Nele getweeën langs de wegen. Nele
+ging aan Uilenspiegel's arm en hield hem met hare twee handjes
+vast. Uilenspiegel had dit geerne en sloeg soms zijn arm om Nele's
+middel, om heur beter vast te houden, zegde hij. En dit deed heur
+genoegen, doch zij uitte geen woord.
+
+De wind voerde den balsemgeur der beemden over de wegen; in de verte
+loeide traagzaam de zee. Uilenspiegel stapte fier vooruit; als een
+jonge duivel, en Nele volgde schuchter als eene heilige uit den hemel,
+beschaamd over 't genot dat zij smaakte.
+
+Zij leunde heur hoofdje op den schouder van Uilenspiegel: hij nam
+heure handjes in de zijne en kuste heur, al gaande, op het voorhoofd,
+op de koonen en op heuren liefelijken mond. Doch zij uitte geen woord.
+
+Het werd warm en zij kregen dorst; zij gingen melk drinken bij eenen
+boer, maar zij waren niet verkoeld.
+
+En zij zetten zich neer in het gras, aan den boord eener gracht. Nele's
+gelaat was bleek en zij scheen bekommerd; angstig keek Uilenspiegel
+heur aan.
+
+--Zijt ge droef? sprak zij.
+
+--Ja, antwoordde hij.
+
+--Waarom? vroeg zij.
+
+--Ik weet het niet, sprak hij, maar die bloesem van appelaars en
+kriekelaars, die zoele lucht als bezwangerd met het vuur van den
+bliksem, die blozende madeliefjes in de beemden, die witte hagedoorn,
+hier dicht bij ons....
+
+... Wie zal mij zeggen waarom ik heel ontroerd ben, waarom ik mij
+steeds bereid voel tot sterven of slapen? En mijn hert klopt hevig als
+ik de vogelen hoor zingen, als ik zie dat de zwaluwen terugkeeren; ik
+zou willen vliegen, verder dan zon en mane. En nu eens heb ik koud,
+dan weer heb ik warm. Ha, Nele! Ik zou niet meer van deze wereld
+willen zijn, of duizend levens geven voor haar, die mij heure minne
+schenken zou....
+
+Maar zij uitte geen woord en, glimlachend van geluk, keek zij naar
+Uilenspiegel.
+
+
+
+
+XXXII.
+
+Op Allerzielen kwam Uilenspiegel uit Onze Lieve Vrouwekerk met eenige
+deugnieten van zijn leeftijd. Lamme Goedzak was onder hen verdwaald,
+als een lam te midden van de wolven.
+
+Lamme, die op alle Zon- en feestdagen van zijne moeder drie oortjes
+kreeg, trakteerde de jonge snaken.
+
+Hij trok dus met hen in het Roode Schild, bij Jan van Liebeke, die
+Kortrijkschen dobbelen knollaard opbracht.
+
+De drank verhitte hunne hersenen en, wijl zij over kerken en gebeden
+spraken, uitte Uilenspiegel de meening, dat zielmissen enkel voordeel
+brengen aan de priesters.
+
+Maar er was een judas onder 't gezelschap: hij ging Uilenspiegel als
+ketter verklikken. En ondanks de tranen van Soetkin en het smeeken van
+Klaas, werd Uilenspiegel gepakt en gevangengezet. Eene maand en drie
+dagen bleef hij in den kerker opgesloten, zonder iemand te zien. De
+cipier at de drie kwart van zijn eten op. Intusschentijd deed men
+onderzoek over het gedrag van den beklaagde. Er werd alleen bevonden,
+dat hij een meedoogenlooze spotter was, die met iedereen gekscheerde,
+maar dat hij nooit het minste kwaad gesproken had noch van den Heere
+God, noch van de Maagd Maria, noch van de santen. Weshalve de sententie
+dan ook zacht was; want men hadde hem kunnen brandmerken of geeselen
+met schorpioenen.
+
+Om den wille van zijn jeugdigen leeftijd, veroordeelden de rechters
+hem enkel om, in zijn hemde, barrevoets en blootshoofds en met eene
+waskeers in de hand, achter de priesters te stappen, in 't midden
+van de eerste processie, die zou uitgaan.
+
+Het was Ons-Heeren-Hemelvaart.
+
+Als de processie binnentrok, moest hij in 't portaal van
+Onze-Lieve-Vrouwekerk blijven staan en uitroepen:
+
+--Dank zij Jezus-Christus! Dank zij de eerweerde geestelijken! Hunne
+gebeden zijn zoet en verkwikkend voor de zielen in 't vagevuur; want
+elk ave is een emmer water, die haar op den rug valt, en elk pater
+eene kuip.
+
+En het volk aanhoorde hem devotelijk, doch niet zonder lachen.
+
+Op den Eersten-Sinksendag, moest hij nogmaals de processie volgen; hij
+was barrevoets en blootshoofds, in zijn hemde, met eene waskeers in de
+hand. Bij het binnengaan in 't portaal, met zijne keers eerbiediglijk
+in de hand, hoewel hij moeite deed om niet in lachen uit te bersten,
+sprak hij met een luide en heldere stem:
+
+--Zoo de gebeden der christenen veel verlichting brengen
+aan de zielen van 't vagevuur, zoo geven die van den deken van
+Onze-Lieve-Vrouwekerk--een heilig man die alle deugden beoefent--zulk
+eene verkwikking aan de smerten des vuurs, dat dit laatste seffens in
+ijs verandert. Maar de duivelen, die het vuur moeten poken, krijgen
+er geen zier van.
+
+En weer luisterde het volk devotelijk, doch niet zonder lachen,
+en de deken glimlachte inwendiglijk.
+
+Verder werd Uilenspiegel voor drie jaren uit Vlaanderenland gebannen;
+hem werd tevens opgelegd eene bedevaart naar Rome te doen en terug
+te komen met de Pauselijke absolutie.
+
+Klaas moest drie gulden voor deze sententie betalen, maar hij gaf er
+nog eenen aan zijn zoon en daarboven eene pelgrimspij.
+
+Op den dag van 't vertrek was Uilenspiegel 't hert in, toen hij
+Klaas en Soetkin kuste, want ze schreide bitter, de arme moeder. Zij
+deden hem uitgeleide tot verre op den weg, in gezelschap van meerdere
+poorters en poorteressen.
+
+Toen Klaas terug in de hut trad, sprak hij tot Soetkin:
+
+--Vrouwe, 't is toch wreed een zoo jongen knaap tot zulke strenge
+straf te veroordeelen, en dit voor eenige lichtzinnige woorden.
+
+--Gij weent, man, sprak Soetkin; gij bemint hem meer dan ge wilt laten
+blijken, want daar berst gij uit in mannelijke snikken, die de tranen
+van den leeuw zijn.
+
+Maar hij antwoordde niet.
+
+Nele was zich in de schuur gaan verbergen, opdat niemand zien zou,
+dat ook zij weende om Uilenspiegel. Van verre volgde zij Soetkin en
+Klaas, de poorters en poorteressen; en toen zij heuren vriend alleen
+zag voortgaan, liep ze naar hem en sprong hem om den hals:
+
+--Ginder zult gij schoone vrouwen vinden, sprak zij.
+
+--Schoon, misschien, antwoordde Uilenspiegel, maar toch zoo frisch
+niet als gij, want zij zijn allen verbrand van de zonne.
+
+Lang nog stapten zij samen voort: Uilenspiegel was nadenkend en
+prevelde van tijd tot tijd:
+
+--Die zielmissen zullen ze mij betalen.
+
+--Welke missen en wie zal betalen? vroeg Nele.
+
+Uilenspiegel antwoordde:
+
+--Alle dekenen, parochiepapen, geestelijken, kosters en andere
+hooge en lage zotskappen, die ons allerhande domheden willen doen
+slikken. Was ik een noeste arbeider geweest, dan was ik voor drie jaar
+mijn dagloon bestolen, met hunne bedevaart. Maar 't is de arme Klaas,
+die betaalt. Mijne drie jaar zal ik hun honderdvoudig betaald zetten;
+ik zal hun eene zielmis zingen, die hun aan de ribben zal hangen.
+
+--Laas! Thijl, wees toch voorzichtig, zij zouden u levend verbranden,
+antwoordde Nele.
+
+Ik ben vuurvast, antwoordde Uilenspiegel.
+
+En zij namen afscheid van elkander: zij badend in tranen, hij
+droefgeestig en gram.
+
+
+
+
+XXXIII.
+
+Toen Uilenspiegel door Brugge, over de Woensdagmarkt kwam, zag hij
+daar eene vrouw, die rondgeleid werd door den beul en zijne knechten,
+en een groote menigte andere vrouwen, die rondom haar tierden en heur
+allerhande vuile beleedigingen toewierpen.
+
+Daar zij boven aan heur kleed roode lapjes en den steen der justitie
+met zijne ijzeren ketenen om den hals droeg, begreep Uilenspiegel,
+dat het eene vrouw was, die het jeugdig en maagdelijk lichaam van hare
+dochteren verkocht had. Men zei hem, dat zij Barbara hiet en getrouwd
+was met Jason Darue; dat ze in dit gewaad van de eene plaats naar
+de andere gesleurd werd, totdat zij terugkwam op de Groote Markt,
+waar het schavot voor haar gereed stond. Uilenspiegel volgde haar
+met de menigte, die achter heur huilde en tierde. Op de Groote Markt
+teruggekomen, werd zij op het schavot gebracht, aan eenen paal
+gebonden, en de beul legde voor hare voeten een hoop gras en een
+klomp aarde: de bediedenis van het graf.
+
+Ook zei men aan Uilenspiegel, dat ze vooraf in 't gevang gegeeseld was.
+
+Voortgaande, ontmoette hij Hendrik Marischal, schooier, die in de
+kasselrij West-Ieperen gehangen was geweest; rond den hals toonde
+hij nog het merk van de koorden. Hij hing al in de lucht, zegde hij,
+en was verlost geworden alleenlijk door een goed gebed te doen tot
+Onze-Lieve-Vrouwe van Halle, zoodanig, dat, toen de baljuws en de
+rechters vertrokken waren, door een echt mirakel de koorden braken
+en hij ongedeerd ten gronde viel.
+
+Maar later hoorde Uilenspiegel zeggen, dat die van de koorden verloste
+bedelaar een valsche Hendrik Marischal was, en dat men hem zijne
+leugen liet rondventen, omdat hij een perkament had, afgegeven door
+den deken van Onze-Lieve-Vrouwe van Halle, die, door het vertelsel
+van dien Hendrik Marischal, de galgenazen in grooten getale met rijke
+offeranden naar zijne kerk lokte. En Onze-Lieve-Vrouwe van Halle werd,
+zeer lang nog, Onze-Lieve-Vrouwe der Gehangenen genoemd.
+
+
+
+
+XXXIV.
+
+In dien tijd moesten kettermeesters en godgeleerden keizer Karel
+voor de tweede reis vermanen: dat de Kerke ten onder ging; dat haar
+gezag miskend werd; dat zoo hij menigvuldige zegepralen behaald had,
+hij dit verschuldigd was aan de gebeden der Katholieke Kerk, die de
+keizerlijke macht op haren troon in stand hield.
+
+Een aartsbisschop van Spanje vroeg hem om zes duizend hoofden te
+laten afkappen en evenveel lichamen te laten verbranden, ten einde
+de kwaadaardige Luthersche ketterije in de Nederlanden uit te
+roeien. Zijne Heilige Majesteit oordeelde, dat dit niet voldoende was.
+
+Overal waar de ontzette Uilenspiegel dan ook voorbij kwam, zag hij
+niets dan hoofden op palen, meisjes in zakken genaaid en levend in 't
+water gesmeten, mannen naakt op het rad gebonden en met ijzeren staven
+geslagen, vrouwen levend in eenen kuil gelegd, met aarde boven haar
+en den beul op haren boezem dansen om dien te verpletteren. Maar de
+biechtvaders van hen die zich vooraf bekeerd hadden, kregen telkenmale
+twaalf stuivers voor hunne moeite.
+
+Te Leuven zag hij de beulen dertig Lutheranen tegelijk verbranden
+en den brandstapel met schietpoeder aansteken. Te Limburg zag hij
+een gansche familie, mannen en vrouwen, dochteren en zonen, ter
+strafplaatse leiden. Allen zongen psalmen. Alleen de oude vader
+schreeuwde, terwijl hij verbrandde.
+
+En Uilenspiegel ging zijns weegs, met beklemd en toegenepen herte.
+
+
+
+
+XXXV.
+
+In het open veld gekomen schudde hij zich als een vogeltje, als een
+hond die den band ontloopen is, en zijn herte was verkwikt bij het
+aanschouwen van de boomen, van de beemden, van de heldere zonne.
+
+Als hij drie dagen lang gegaan had, kwam hij omtrent Brussel, in de
+machtige gemeente Ukkel. Vóór het gasthof de Trompet, werd zijn neus
+gestreeld door een hemelschen geur van stoverije. Aan een kleinen
+schooier, die den reuk van de saus opsnoof, vroeg hij ter eere van
+welken heilige die wierook omhoog steeg? De kleine antwoordde, dat
+de broeders van de Goede Tronie na de vespers moesten bijeenkomen
+om de herinnering te vieren van de verlossing der gemeente door hare
+vrouwen en meisjes.
+
+Uilenspiegel zag van verre eenen staak met een gaai erop, rond
+denwelken vrouwen met bogen liepen; hij vroeg of de vrouwlieden nu
+boogschieters waren geworden?
+
+De jongen snoof nog eens den reuk van de keuken op en antwoordde, dat,
+in den tijd van den goeden hertog, die zelfde bogen, in de handen der
+Ukkelsche vrouwen, meer dan honderd baanstroopers van het leven naar
+den dood hadden gestuurd.
+
+Uilenspiegel wilde meer weten, doch de kleine schooier zei dat hij
+geen woord meer zeggen zou, zoolang hij honger en dorst had, ten ware
+hij een oortje kreeg om zich te verzadigen. Uilenspiegel gaf het hem
+uit medelijden.
+
+Zoodra de jongen het oortje had, trok hij, als een vos in een
+hoenderhok, het gasthof binnen, om weldra, met een halve worst en
+eene dikke snee brood triomfantelijk te voorschijn te komen.
+
+Plotseling hoorde Uilenspiegel een zoete muziek van tamboerijnen en
+violen en zag hij vele dansende vrouwen, en onder haar een schoon
+wijf met een gouden ketting om den hals.
+
+De schooier, in zijn schik, omdat hij zoo lekker gegeten had, zegde
+tot Uilenspiegel dat die jonge, schoone vrouw de koningin van de
+gaaischieting was, dat zij Mietje heette en de vrouw was van messire
+Renonckel, schepene van de gemeente. Dan vroeg hij aan Uilenspiegel
+nog zes duiten om te drinken: Uilenspiegel gaf ze hem. Toen hij
+gegeten en gedronken had, zette hij zich in de zonne op de hurken,
+en kuischte met zijne nagelen zijne tanden.
+
+Als de boogschietsters Uilenspiegel in zijne pelgrimspij zagen,
+begonnen zij rond hem te dansen, zeggende:
+
+--Dag, schoone pelgrim; komt gij van verre, jonge pelgrim?
+
+Uilenspiegel antwoordde:
+
+--Ik kom uit Vlaanderen, het schoone land der verliefde meidekens.
+
+En droefgeestig dacht hij aan Nele.
+
+--Wat was uwe misdaad? vroegen zij, terwijl zij haren dans staakten.
+
+--Ik durf het niet zeggen, daar ze zoo groot is, sprak hij. Bij mij,
+mijne hertjes, is niemendal klein.
+
+Zij lachten en vroegen waarom hij aldus moest reizen met den
+pelgrimsstaf, den bedelzak en de oesterschelpen?
+
+--'t Is, antwoordde hij, omdat ik gezegd heb, dat de zielmissen
+voordeelig zijn voor de priesters.
+
+--Zij brengen hun klinkende munt op, antwoordden de vrouwen, maar
+toch zijn zij ook voordeelig voor de zielen in 't vagevuur.
+
+--Daar was ik niet bij, antwoordde Uilenspiegel.
+
+--Komt gij met ons eten? vroeg de schoonste.
+
+--Ik wil, sprak hij, met u eten, en u eten, u en uwe vriendinnen,
+de eene na de andere, want gij zijt fijne brokjes, lekkerder dan
+ortolanen, lijsters of sneppen.
+
+--De Hemel vergeve u, dat wild is buiten prijs, zeiden zij.
+
+--Zooals gij allen, mijne hertjes, antwoordde hij.
+
+--'t Is te zien, spraken zij, maar wij zijn niet te koop.
+
+--Noch te geven? vroeg hij.
+
+--Ja, zegden zij, wij geven slagen aan degenen die te stout zijn. Hebt
+gij er van doen, wij zullen op u slaan lijk op kaf.
+
+--Ik doe niet mee, sprak hij.
+
+--Kom dan mee-eten, zegden zij.
+
+Blijde als hij was rond zich vroolijke, lachende gezichten te zien,
+volgde hij heur naar de binnenplaats van het gasthof. Plotseling
+zag hij de broeders van de Goede Tronie, in groote staatsie, met
+vaandel, fluit, bazuin en tamboerijn, in het binnenhof komen; zij
+droegen waardiglijk den naam van hunne broederschap. Daar zij hem
+nieuwsgieriglijk bekeken, zeiden de vrouwen dat het een pelgrim was,
+dien ze op den weg ontmoet en meegebracht hadden naar 't festijn,
+omdat zijne tronie haar aanstond.
+
+De mannen stemden hiermee in, en een hunner sprak:
+
+--Reizende pelgrim, wilt gij eene bedevaart doen in sausen en
+stoverije?
+
+--Daarvoor wil ik de leerzen van Duimken aantrekken, antwoordde
+Uilenspiegel.
+
+Als hij met hen de zaal van 't festijn binnenging, zag hij op den
+Parijschen steenweg een twaalftal blinden. En toen zij voorbij hem
+kwamen, kloegen zij van honger en dorst. Uilenspiegel zei tot zich
+zelven, dat zij dien dag zouden avondmalen als prinsen, en wel ten
+koste van den deken van Ukkel, op afkorting van de zielmissen.
+
+Hij ging tot hen en sprak:
+
+--Hier zijn negen gulden, gij kunt komen eten. Riekt gij den geur
+niet van de stoverije?
+
+--Laas! spraken zij, reeds een half uur lang, doch zonder hope.
+
+--Gij zult eten, zegde Uilenspiegel, vermits gij nu negen gulden
+hebt. Maar hij gaf ze hun niet.
+
+--Wees gezegend! spraken zij.
+
+En, door Uilenspiegel geleid, zetten zij zich rond een kleine tafel,
+terwijl de broeders van de Goede Tronie met hunne wijven en dochteren
+aan de groote tafel gingen zitten.
+
+Met een zelfvertrouwen van negen gulden, riepen de blinden luide
+en stout:
+
+--Baas, geef ons te eten en te drinken, alles van 't beste!
+
+De weerd, die van negen gulden had hooren spreken, dacht, dat die in
+hunne tasschen staken en vroeg wat de gasten wenschten.
+
+Toen riepen allen tegelijk:
+
+--Boonen met spek, hutspot met rundvleesch, kiekens, kalfsvleesch en
+hamelbout. Zijn de worsten voor de honden gemaakt?
+
+--'k Heb witte en zwarte pensen geroken; 'k zou ze zien als ik nog
+mijne lanteernen had.--Waar zijn de koekebakken met Anderlechtsche
+boter? Zij zingen in de pan, sappig, knappend en hijgend naar het bier,
+waarmede wij ze zullen begieten.--Wie geeft de hesp met eieren die
+onzen mond placht te streelen?--Waar zijt gij, hemelsche soezels, die
+zwemmen midden in de nieren, hanekammen, kalfszwezeriken, ossesteerten,
+schapepooten, met veel ajuin, peper, kruidnagelen, muskaat, goed
+ondereengestoofd met drie pinten witten wijn als saus?--Wie brengt
+u tot mij, goddelijke kalfsworsten, die zoo goed zijt dat ge niets
+zegt als men u opeet? Kwaamt gij recht uit Luilekkerland, waar niet
+te werken valt, en eten en drinken een ambacht is? Gij zijt verdwenen
+lijk de droge bladeren van den jongsten herfst.--Ik wil een hamelbout
+met erwtjes.--Ik, verkensooren.--Ik, een rozenkrans van ortolanen,
+met sneppen als paters en een vetten kapoen als credo.
+
+De weerd antwoordde bedaard:
+
+--Gij krijgt een pannekoek van zestig eieren en, als wegwijzers om
+uwe vorken te bestieren, vijftig zwarte pensen, rookend op dien berg
+van eieren gestoken, en als drank dobbelen peeterman: dat zal de
+riviere wezen.
+
+Het water kwam in den mond van de arme blinden.
+
+Breng ons den berg, de wegwijzers en de rivier!
+
+En de broeders van de Goede Tronie en hunne vrouwen, die reeds
+met Uilenspiegel aan tafel zaten, zeiden, dat deze voor de blinden
+onzichtbare smulpartij hun slechts de helft van het genot deed smaken.
+
+Toen de weerd en vier koks den pannekoek opdienden, opgesmukt met
+peterselie en keur van kruiden, wilden de blinden er zich op werpen,
+maar de weerd gaf, niet zonder moeite, eerlijk aan elk zijn deel.
+
+De boogschietsters waren verrukt als zij hen zagen slempen en zuchten
+van genoegen, want zij hadden grooten honger en sloegen de pensen
+binnen lijk oesters. De dobbele peeterman liep in hunne magen gelijk
+een waterval van het hooggebergte.
+
+Toen de blinden hunne teilen uitgewischt hadden, vroegen zij opnieuw
+koekebakken, ortolanen en weer stoverije. De weerd bracht hun slechts
+een grooten schotel ossen-, kalfs- en schapenbeenderen, die in goede
+saus zwommen. Maar hij deelde niet rond.
+
+Als zij hun brood en hunne handen, tot over de polsen, in de saus
+gedoopt hadden, en niets vonden dan hamel-, kalfs- en andere beenderen,
+meende een iegelijk dat zijn buurman al het vleesch had, en verwoed
+sloegen zij met de beenderen op elkanders gezicht.
+
+Bij dat schouwspel lachten de broeders van de Goede Tronie naar
+hertelust en legden goedhertig een deel van 't festijn op de teil van
+de arme blinden, en een iegelijk die een been zocht om er mee te slaan,
+legde de hand op eene lijster, een kieken, een koppel leeuwerikken,
+terwijl de vrouwen hun het hoofd achterover hielden en hun Brusselschen
+wijn lieten drinken, zooveel zij konden. En als de arme lieden op den
+tast zochten van waar die stroom godendrank kwam, grepen zij een rok,
+die gezwind uit hunne handen glipte.
+
+Zij lachten, aten, dronken en zongen zoo heerlijk! Eenigen vermoedden
+dat er poezele wijfjes moesten zijn en liepen, dol van liefde,
+de eetzale rond, maar de plaagzieke vrouwen draaiden zich om en
+verborgen zich achter een broeder van de Goede Tronie, roepende:
+"Kus mij, toe!" En als de blinden het deden, kusten zij in stee van
+de donzige huid eener vrouw, het harig gezicht van een man--maar niet
+zonder kletsen te krijgen.
+
+De broeders van de Goede Tronie zongen, en zij zongen insgelijks. En
+de vrouwen glimlachten teeder, met stil genoegen, als zij hen zoo
+vol vroolijkheid zagen.
+
+Toen die heerlijke uren voorbij waren, sprak de baas:
+
+--Gij hebt goed gegeten en gedronken, geef mij nu zeven gulden.
+
+Elk hunner zwoer dat hij de beurze niet had en beschuldigde zijn
+buurman. Een nieuw gevecht ontstond, in hetwelk zij elkaar trachtten
+te schoppen, te slaan en te stompen, maar de broeders van de Goede
+Tronie hielden de vechtenden van elkaar. En 't regende slagen in de
+lucht, behalve een die bij ongeluk terecht kwam op 't aangezicht van
+den baas, die, verwoed, nu allen aftastte en niets anders vond dan een
+versleten schapulier, zeven duiten, drie knoopen en hunne paternosters.
+
+Hij wilde hen in het verkenskot steken en hen daar op water en brood
+zetten, totdat liefdadige zielen voor hen betaald hadden.
+
+--Wilt gij, vroeg Uilenspiegel, dat ik borg voor hen blijve?
+
+--Ja, antwoordde de baas, als iemand ook voor u borg is.
+
+De Goede Tronies wilden borg zijn, maar Uilenspiegel voorkwam hen
+en zei:
+
+--De deken zal borg zijn, ik ga het hem vragen.
+
+Gedachtig aan de zielmissen, trok hij naar den deken en vertelde hem
+dat de baas uit de Trompet van den duivel bezeten was, en dat hij
+van anders niets sprak dan van verkens en blinden; dat de verkens de
+blinden opaten en de blinden de verkens. Middelerwijl, zoo vertelde
+hij, brak de baas thuis alles aan stukken, en hij bad hem den armen
+man van dien boozen duivel te komen verlossen.
+
+De deken beloofde het, maar zei, dat hij niet dadelijk kon komen,
+mits hij bezig was met de rekening van 't kapittel te maken en dat
+dit zeer lastig was, zoo hij zijn garande wilde hebben.
+
+Toen Uilenspiegel zag dat hij ongeduldig werd, zegde hij dat hij
+zou terugkomen met het wijf van den baas en dat de deken haar zelve
+kon spreken.
+
+--'t Is goed, antwoordde de deken.
+
+Uilenspiegel keerde terug bij den baas en zegde:
+
+--Ik heb den deken gesproken, hij blijft borg voor de blinden. Terwijl
+gij op hen let, kan de bazinne meekomen, en hij zal heur herhalen
+wat ik u zegde.
+
+--Ga mee, vrouw, sprak de baas.
+
+De bazinne ging met Uilenspiegel bij den deken, die maar altijd aan
+'t cijferen was, om zijn aandeel te vinden. Toen zij binnenkwam met
+Uilenspiegel, maakte hij met de hand een driftig gebaar, zeggende:
+
+--Ga heen en wees gerust: morgen of overmorgen kom ik bij uwen man.
+
+En toen Uilenspiegel naar de Trompet terugkeerde, sprak hij onderweg
+in zich zelven: "Hij zal honderd gulden betalen en dat zal mijn eerste
+zielmisse zijn."
+
+En hij ging zijns weegs, en de blinden insgelijks.
+
+
+
+
+XXXVI.
+
+'s Anderen daags kwam Uilenspiegel op eene baan vol volk. Hij volgde
+de menigte en vernam, dat het dien dag beeweg naar Alsemberg was.
+
+Hij zag er arme oude vrouwen, die, voor een gulden en om de zonden van
+voorname dames te boeten, barrevoets achterweerts gingen. Terzijde
+van den weg deed meer dan één pelgrim zich te goed aan wafelen en
+bruinbier, bij geschal van lieren, violen en doedelzakken. En de reuk
+van allerhande spijzen steeg ten hemel als een zoete wierook.
+
+Maar daar waren ook pelgrims, die er gemeen en ellendig uitzagen;
+die hadden zes stuivers van de Kerk gekregen, om achterweerts den
+beeweg te doen.
+
+Een kaalhoofdig manneken, met opengesperde oogen, volgde hen insgelijks
+achterweerts springend en vaderonzen zeggend.
+
+Uilenspiegel, die wilde weten waarom hij aldus de kreeften naäapte,
+ging voor hem staan en sprong glimlachend lijk hij. Lieren, pijpen,
+violen en doedelzakken, waren met het geschreeuw van de pelgrims,
+de muziek van dien dans.
+
+--Zeg eens, Jan van den Duivel, sprak Uilenspiegel, is het om zeker
+te zijn van vallen, dat gij averechts gaat?
+
+De man antwoordde niet en bad voort.
+
+--Of is het om de boomen te tellen, vervolgde Uilenspiegel, en
+misschien ook de bladeren er bij?
+
+De man, die een credo zei, deed Uilenspiegel teeken dat hij zwijgen
+moest.
+
+--Of, sprak deze, altijd vóór hem springend en zijne gebaren
+nabootsend, zijt gij misschien eensklaps zot geworden, dat gij
+loopt lijk de kreeften? Maar wie van een zot een verstandig antwoord
+verwacht, is zelf niet wijs. Niet waar, mijnheer de kaalkop?
+
+Daar de man nog niet antwoordde, danste en sprong Uilenspiegel voort,
+doch hij maakte daarbij zooveel lawijd met zijne zolen, dat de weg
+klonk als een houten kist.
+
+--Of zijt gij stom, mijnheer? vroeg Uilenspiegel ten slotte.
+
+--Ave Maria, sprak de man, gratia plena et benedictus fructus ventris
+tui, Jesu.
+
+--Of misschien doof? zei Uilenspiegel. Dat gaan wij dadelijk zien:
+men zegt, dat dooven vleierij noch beleediging hooren. Laat zien of
+de trommel van uw ooren van vel of van ijzer is: Meent gij, lanteerne
+zonder keers, mislukte voetganger, dat gij een mensch gelijkt? Ge
+kunt wachten totdat wij van vodden gemaakt zijn. Zag men ooit zulke
+gele tronie, zulk een kletshoofd, elders dan op een galgeveld? Zijt
+ge in uw leven nooit gehangen geweest?
+
+En Uilenspiegel danste steeds voort, en de man, die kwaad werd,
+stapte boosaardig achterwaarts en bad zijn vaderonzen met heimelijke
+verbolgenheid.
+
+--Of misschien, sprak Uilenspiegel, verstaat gij geen Hoogvlaamsch;
+daarom ga ik u in 't Platvlaamsch aanspreken: Zijt gij geen gulzigaard,
+dan zijt gij een dronkaard; zijt gij geen dronkaard, dan zijt gij
+verstopt; zijt gij niet verstopt, dan hebt gij den afgang; als er
+matigheid is, dan is zij het niet, die de tonnen van uw buik vult;
+zijt gij geen losbol, dan zijt gij een kapuin en als er op de duizend
+millioen mannen der aarde maar één horendrager was, dan zoudt gij
+het zijn....
+
+Op die rede, viel Uilenspiegel op zijn achterste, met de beenen omhoog,
+want de man had hem zulk een vuistslag op den neus toegediend, dat
+het vuur hem uit zijne oogen sprong. Dan liet de man zich, ondanks
+zijn dikken buik, verraderlijk op hem vallen en sloeg hem overal,
+dat de slagen als hagelsteenen op het magere lichaam van Uilenspiegel
+vielen. En Uilenspiegels stok rolde mede ten gronde.
+
+--Dat zal u leeren, sprak de man, eerlijke menschen kwellen die
+op bedevaart gaan. Want--gij moogt het wel weten--ik ook ga naar
+Alsemberg, volgens aloud gebruik, om Onze-Lieve-Vrouwe te bidden,
+een kind te willen doen afkomen, dat mijne vrouw ontving terwijl
+ik op reis was. Om zulk een groote genade te verkrijgen, moet men,
+zonder spreken, achterweerts loopen en dansen van den twintigsten
+stap voorbij zijn huis tot aan de trappen der kerk. Laas! nu moet ik
+geheel opnieuw beginnen.
+
+Uilenspiegel, die zijn stok opgeraapt had, sprak:
+
+--Ik zal u helpen, deugniet, die Onze-Lieve-Vrouwe wilt smeeken om
+de kinderen vóór hun geboorte te vermoorden.
+
+En meteen sloeg hij den leelijken horendrager zoo deerlijk, dat hij
+hem voor dood op den weg liet.
+
+En nog altijd steeg het gehuil der pelgrims en het geluid van  pijpen,
+lieren, violen en doedelzakken omhoog, met den geurigen wierook van
+gekook en gebraad.
+
+
+
+
+XXXVII.
+
+Klaas, Soetkin en Nele zaten samen rond den heerd en praatten over
+den reizenden pelgrim.
+
+--Meisje, sprak Soetkin, kondet gij hem voor altijd bij ons houden
+door uwe jeugd en uwe schoonheid!
+
+--Laas! sprak Nele, ik kan niet.
+
+--Omdat hij, antwoordde Klaas, meer behagen vindt in loopen, zonder
+ooit te rusten, tenzij om te eten.
+
+--De leelijke stouterik! zuchtte Nele.
+
+--Ik geef toe dat hij stout is, sprak Soetkin, maar leelijk is
+hij niet. Als Uilenspiegel Grieksch noch Romeinsch van gezicht is,
+is hij des te schooner; want Vlaamsch zijn zijne vlugge voeten, van
+'t Brugsche Vrije zijn levendige bruine oogen; en zijn neus en mond
+zijn gemaakt door twee vossen, ervaren in de kunsten van slimheid
+en verstand.
+
+--Wie dan, vroeg Klaas, maakte hem zijne armen van luierik en zijne
+beenen, die al te vlug loopen naar vermaak en pleizier?
+
+--Zijn al te jeugdig herte, was 't antwoord van Soetkin.
+
+
+
+
+XXXVIII.
+
+In dien tijd genas Katelijne, met kruiden, een os, drie schapen en een
+verken toebehoorende aan Speelman, doch de koe van Jan Beloen kon ze
+niet genezen. Jan beschuldigde haar van hekserij en verklaarde, dat
+zij het dier betooverd had, daar zij, terwijl zij het de geneeskruiden
+gaf, het gestreeld en aangesproken had, zeker in een duivelsche tale,
+want een eerlijk christenmensch mag het woord tot geen dier richten.
+
+Gemelde Jan Beloen voegde er bij, dat hij gebuur was van Speelman,
+wiens os, schapen en verken zij genezen had en, zoo zij zijne
+koe gedood had, het zeker was op het opstoken van Speelman, die
+jaloersch was, omdat zijne akkers slechter bebouwd waren en minder
+opbrachten dan de zijne--van Beloen namelijk. Op getuigenis van Pieter
+Meulemeester, een man van goed gedrag en zeden, en ook van Jan Beloen,
+die bevestigden dat Katelijne te Damme bekend stond als tooveres,
+en naar allen schijn de koe gedood had, werd Katelijne aangehouden
+en veroordeeld om op de pijnbank te worden gelegd totdat zij hare
+misdaden bekende.
+
+Zij werd ondervraagd door een schout, die altijd narrig was, want
+heel den dag door dronk hij brandewijn. Vóór hem en vóór die van de
+Vierschaar, deed hij Katelijne op de eerste pijnbank zetten.
+
+De beul ontkleedde haar en keek of zij geenerlei hekserij verborgen
+hield.
+
+Hij vond niets, en bond heur met koorden op de pijnbank. Toen
+zegde zij:
+
+--Heilige Moeder Gods, laat mij sterven, dat ik mijne schamelheid
+aan die mannen niet hoeve te toonen!
+
+Toen legde de beul natte doeken op heure borst, heuren buik en heure
+armen; vervolgens hief hij de bank op en goot hij heet water in
+heure keel, bij zulke groote hoeveelheid, dat zij gansch opgeblazen
+scheen. Vervolgens liet hij de bank nedervallen.
+
+De schout vroeg aan Katelijne of zij hare misdaad wilde bekennen. Zij
+schudde het hoofd. Toen goot de beul nog heet water in haren mond,
+maar Katelijne gaf het allemaal over.
+
+Op het oordeel van den heelmeester, werd zij toen losgemaakt. Zij
+sprak niet, doch klopte op hare borst om te zeggen, dat het heet
+water haar verbrand had. Toen de schout zag dat zij van haar eerste
+foltering bekomen was, sprak hij:
+
+--Beken, dat gij tooveres zijt en dat gij de koe betooverd hebt.
+
+--Ik zal niet bekennen, sprak zij. Zooveel het in de macht van mijn
+zwak herte ligt, zie ik alle beesten geerne, en ik deed nog liever leed
+aan mij zelve dan aan hen, daar zij zich niet verdedigen kunnen. Om
+de koe te helpen, heb ik de geneeskruiden gebruikt, die ik moest.
+
+Maar de schout sprak:
+
+--Gij hebt vergif gebruikt, want de koe is gestorven.
+
+--Heere schout, antwoordde Katelijne, ik ben hier voor u en in uwe
+macht; en toch durf ik zeggen, dat een dier, evenals een mensch,
+van ziekte kan sterven, niettegenstaande de hulp van artsen en
+heelmeesteren. En bij Jezus-Christus, die voor onze zonden op het
+kruis is gestorven, zweer ik dat ik die koe geenerlei kwaad gewild heb,
+doch getracht heb ze te genezen met de gebruikelijke kruiden.
+
+Woedend sprak toen de schout:
+
+--Die tooverkol zal niet blijven afstrijden; men brenge heur op een
+andere pijnbank!
+
+En daarna dronk hij een groot glas brandewijn.
+
+De beul deed Katelijne zitten op het deksel eener eiken doodkist,
+die op pikkels stond. Dat deksel, in den vorm van een dak, was scherp
+als een mes. Een groot vuur brandde in den schoorsteen, want men was
+toen in de slachtmaand.
+
+Katelijne werd op de doodkist en op een scherpe houten pinne gezet,
+en men deed haar nieuwlederen schoenen aan die te smal waren. Zóó
+schoof men heur tegen het vuur. Als zij de snede van de doodkist
+en de scherpe pinne in heur vleesch voelde dringen, en de hitte van
+'t vuur het leder van de schoenen deed krimpen, riep zij uit:
+
+--Ik lijd ongemeene smerten! Wie geeft mij zwart vergif?
+
+--Breng haar dichter bij 't vuur, sprak de schout.
+
+Toen ondervroeg hij Katelijne.
+
+--Hoe dikwijls, sprak hij, reedt gij op een bezemsteel naar den
+heksensabbat? Hoe dikwijls deedt gij het koren in de aar, de vrucht
+op den boom, het kind in den schoot vergaan? Hoe dikwijls zaaidet
+gij haat en nijd in de herten van broeders en zusters?
+
+Katelijne wilde spreken, maar zij kon niet, en zij zwaaide met hare
+handen als om "neen" te bedieden. Toen zegde de schout:
+
+--Zij zal niet spreken vooraleer zij al heur heksenvet zal voelen
+smelten. Breng haar nog dichter bij het vuur.
+
+Katelijne schreeuwde. De schout zegde heur:
+
+--Bid Satan dat hij u verfrissching bezorge.
+
+Met het gezicht vol smerte, wees zij naar heure schoenen, die rookten
+ten gevolge van de hitte des vuurs.
+
+--Bid Satan, dat hij ze uitdoe, sprak de schout.
+
+Tien uren sloeg de klok, dit was het etensuur van den wreedaard;
+hij vertrok met zijn schrijver, den beul en zijn knechten, en liet
+Katelijne alleen bij 't vuur, in de folterkamer.
+
+Te elf uren kwamen zij terug, en zij vonden Katelijne stijf en
+onbeweeglijk zitten. De schrijver sprak:
+
+--Ik geloof, dat zij dood is.
+
+De schout beval Katelijne van de doodkist te nemen en heure schoenen
+uit te doen. De beul moest ze vaneen snijden en Katelijne's voeten
+waren rood en bloedden.
+
+En de schout, die aan zijn maaltijd dacht, bezag ze, doch uitte geen
+woord; doch weldra kwam ze tot heur zelve terug; zij viel ten gronde
+zonder zich te kunnen oprichten ondanks al heure krachtsinspanning,
+en sprak tot den schout:
+
+--Vroeger wildet gij mij voor echtgenoote, maar nu zult gij mij niet
+meer hebben. Viermaal drie is een heilig getal, en de dertiende is
+de echtgenoot.
+
+Vervolgens, daar de schout wilde spreken, zegde zij tot hem:
+
+--Zwijg stille: hij hoort beter dan de aartsengel, die in den hemel
+de hertkloppingen der rechtvaardigen telt. Waarom komt gij zoo
+spa? Viermaal drie is een heilig getal; het doodt de ellendelingen,
+die mij willen vervolgen.
+
+De schout sprak:
+
+--Zij ontvangt den duivel in heur bedde.
+
+--Zij is uitzinnig, ten gevolge van de smerten der foltering, sprak
+de schrijver.
+
+Katelijne werd terug naar 't gevang gebracht. Drie dagen nadien kwamen
+de schepenen in de Vierschaar bijeen en, na rijpe beraadslaging,
+werd Katelijne veroordeeld tot de straffe des vuurs.
+
+De beul en zijne knechten brachten heur naar de Groote Markt van
+Damme, alwaar een schavot opgericht was, hetwelk zij beklom. Op de
+Markt stonden de provoost, de heraut en de rechters.
+
+Driemaal klonken de bazuinen van den stadsheraut en deze sprak tot
+het volk:
+
+--De magistraat van Damme, medelijden gekregen hebbende met vrouwe
+Katelijne, heeft haar niet willen straffen volgens al de strengheid
+van de wet van de stede, maar tot teeken dat zij tooveres is, zal heur
+haar verbrand worden; verder zal zij twintig gouden karolussen boete
+betalen en voor drie jaar gebannen worden uit de stede van Damme,
+op verbeurte van een lid.
+
+En het volk juichte die barbaarsche goedertierenheid toe.
+
+De beul bond Katelijne toen aan eenen paal, legde op heur geschoren
+hoofd eene pruik van werk en stak die in brand. En het werk brandde
+lang, en Katelijne schreeuwde en huilde van pijn.
+
+Eindelijk werd zij losgemaakt; zij werd op eene kar buiten het
+grondgebied van Damme gebracht, want heure voeten waren verbrand.
+
+
+
+
+XXXIX.
+
+Terwijl Uilenspiegel te 's-Hertogenbosch in Brabant was, wilden de
+heeren van de stad hem tot hunnen nar benoemen, maar die weerdigheid
+weigerde hij, zeggende: "Reizende pelgrims mogen zich nergens vestigen;
+hun verblijf is de groote baan."
+
+Rond dien tijd kwam Philippus, die koning van Engeland was, zijne
+toekomstige erfstaten Vlaanderen, Brabant, Henegouwen, Holland en
+Zeeland bezoeken. Hij was in zijn negen en twintigste jaar; in zijne
+grijze oogen las men bittere droefgeestigheid, woeste geveinsdheid
+en wreedaardige vastberadenheid. Koud was zijn aangezicht, stijf
+zijn hoofd met vaalrood haar, alsmede zijn mager lichaam en zijne
+schrale beenen. Langzaam en slijmerig sprak hij, alsof hij wolle in
+den mond had.
+
+Te midden van tornooien, steekspelen en feesten, bezocht hij
+achtereenvolgens het vroolijke hertogdom Brabant, het rijke graafschap
+Vlaanderen en zijne andere heerlijkheden. Overal beloofde hij onder
+eede de privileges te zullen eerbiedigen; maar toen hij te Brussel
+op 't Evangelie zwoer de Brabantsche gouden bul te zullen in stand
+houden, trok zijne hand zoodanig te zamen, dat men hem het heilige
+boek moest afnemen.
+
+Hij ging naar Antwerpen, waar men drie en twintig zegebogen
+oprichtte om hem te ontvangen. De stad gaf tweehonderd zeven en
+tachtig duizend gulden uit om die bogen te betalen, alsmede voor
+de kleedij van achttien honderd negen en zeventig kooplieden, allen
+in karmozijnpanne, en voor de rijke livrei van vierhonderd zestien
+lakeien en den schitterenden zijden dos van vier duizend poorters,
+allen eender gekleed. Menigvuldige feesten werden gegeven door de
+rederijkerskamers van bijna al de steden der Nederlanden.
+
+Daar werden gezien met hunne narren: de Prins van Liefde, van Doornijk,
+rijdende op eene zeuge, die Astarte hiet; de Koning der Zotten, van
+Rijsel, die een peerd bestierde bij den steert en achter hetzelve
+ging; de Prins van Genuchte, van Valencijn, die zich vermaakte met
+de veesten van zijnen ezel te tellen; de Abt van Vroolijkheid, van
+Atrecht, die zijn Brusselschen wijn dronk uit eene flesch, in de
+gedaante van een getijdenboek, en het boek lustig om lezen vond; de
+Abt der Gevulde Buiken van Ath, die gescheurde kleederen en versleten
+schoenen aanhad, maar eene worst droeg, met dewelke hij zijn buiksken
+vulde; de Proost van Onbezonnenheid, jonge knaap, die op een schuwe
+geit zat en aldus door het volk reed, ten gevolge waarvan hij slagen
+en stompen in groote menigte ontving; de Abt van den Zilveren Schotel,
+van de stad Le Quesnoy die, te peerd, gebaarde zich neder te zetten
+in eenen schotel, zeggende: hoe groot een beest ook weze, het toch
+kan gebraden worden.
+
+En zij vertoonden allerhande onschuldige gekheden, maar de vorst
+bleef somber en stuursch.
+
+'s Avonds nog kwamen de markgraaf van Antwerpen, de burgemeesteren,
+hoofdmannen en dekenen bijeen om toch iets te vinden, dat Philippus
+zou doen lachen.
+
+De markgraaf sprak:
+
+--Hebt gij nooit hooren spreken van zeker Pierken Jacobsen, den nar
+van 's-Hertogenbosch, die bekend is voor zijn aardige streken?
+
+--Ja, spraken zij.
+
+--Hewel, zei de markgraaf, laat ons hem ter stede ontbieden, en dat hij
+iets aardigs vertoone, vermits onze nar lood in zijn schoenen heeft.
+
+--Laat ons hem ontbieden! spraken zij.
+
+Toen de bode van Antwerpen naar 's-Hertogenbosch kwam, zegde men hem,
+dat de nar Pierken gebersten was van 't lachen; maar dat er voor
+eenigen tijd een andere nar in de stad was, met name Uilenspiegel.
+
+De bode ging hem zoeken in eene taveerne, waar hij gestoofde mosselen
+aan 't eten was.
+
+Uilenspiegel was verrukt toen hij vernam, dat het voor hem was,
+dat de schepenbode van Antwerpen kwam, op een schoon peerd van het
+Veurne-Ambacht en een ander peerd bij den toom houdend.
+
+Zonder af te stijgen, vroeg de bode hem of hij geen nieuwe poetsen
+kende om koning Philippus te doen lachen.
+
+--Onder mijn haar liggen poetsen met de macht, antwoordde Uilenspiegel.
+
+En zij reden weg. De twee peerden liepen spoorslags tot Antwerpen,
+met den bode en met Uilenspiegel.
+
+Uilenspiegel verscheen vóór den markgraaf, de beide burgemeesters en
+de poorters van Antwerpen.
+
+--Wat schikt gij te doen? vroeg de markgraaf hem.
+
+--In de lucht vliegen, antwoordde Uilenspiegel.
+
+--Hoe gaat gij dat aanleggen? vroeg de markgraaf.
+
+--Weet gij wat nog minder weerd is dan eene blaas die berst?
+
+--Neen, sprak de markgraaf.
+
+--'t Is een geheim dat men uitbrengt, was 't antwoord van Uilenspiegel.
+
+De feestherauten reden op hunne schoone peerden met karmozijnpanne
+getoomd, door de straten, markten en pleinen van de stad met slaande
+trom en schallenden hoorn. Op die wijze maakten zij bekend aan de
+signoorkens en signorinnekens, dat Uilenspiegel, de nar van Damme,
+op de kaai in de lucht zou vliegen, in de aanwezigheid van koning
+Philippus en zijn eerweerdig, doorluchtig en adelijk gezelschap.
+
+Rechtover de estrade des konings stond een huis op Italiaansche wijze
+gebouwd, onder welks dak eene regengoot liep. En op die goot kwam
+een zoldervenster uit.
+
+Dien dag reed Uilenspiegel door de stad op een ezel. Een voetknecht
+ging nevens hem. Uilenspiegel had het schoon karmozijnzijden kleed
+aangetrokken, hetwelk de heeren van de stad hem gegeven hadden. Tot
+hoofddeksel droeg hij eene kap, mede van karmozijnzijde, waaraan twee
+ezelsooren met een belleken aan. Hij droeg een halssnoer van koperen
+penningen, waarop het schild van Antwerpen prijkte. Aan de mouwen
+van zijn kleed zag men aan een puntigen elleboog een paar vergulde
+bellekens. Ook droeg hij puntleersjes, met een belleken aan elken top.
+
+Zijn ezel, getoomd met karmozijnzijde, droeg op elke bil het schild
+van Antwerpen, met fijn goud geborduurd.
+
+De knecht hield met de eene hand den ezel bij den kop en met de andere
+eenen tak, aan denwelken een koebelletje klingelde.
+
+Uilenspiegel liet zijn knecht en zijn ezel op straat en klom in
+de dakgoot.
+
+Daar deed hij de bellekens klinken en strekte de armen wijd open, alsof
+hij vliegen ging. Dan bukte hij zich naar koning Philippus, zeggende:
+
+--Ik dacht, dat niemand dan ik in Antwerpen zot was, maar ik zie,
+dat de stad vol gekken is. Hadt gij mij gezegd dat gij vliegen zoudt,
+dan had ik u niet geloofd; maar een zot komt u zeggen dat hij het zal
+doen, en gij gelooft hem! Hoe wilt gij dat ik vliege, daar ik geene
+vleugelen heb?
+
+De eenen lachten, de anderen vloekten, maar allen zegden:
+
+--'t Is toch de waarheid.
+
+Maar koning Philippus bleef stijf als een koning van steen.
+
+En die van de gemeente fluisterden tot elkaar:
+
+--'t Was de moeite niet, al die vermakelijkheden in te richten voor
+zulk een zuur gezicht.
+
+En zij gaven drie gulden aan Uilenspiegel die heenging, nadat hij
+hun het karmozijnzijden kleed had teruggegeven.
+
+--Wat zijn drie gulden in de tassche van een jonkman anders dan
+een sneeuwbal vóór 't vuur, dan een volle flesch vóór uw aanschijn,
+drinkebroers? Drie gulden! De bladeren vallen van de boomen, doch er
+schieten nieuwe op hunne plaats; maar de guldens gaan uit de zakken
+en keeren er nimmermeer in; de vlinders verdwijnen met den zomer,
+en de guldens ook, hoewel zij meer dan twee esterlings wegen.
+
+Dus sprekende, staarde Uilenspiegel naar zijne drie gulden.
+
+--Welk fier gezicht, murmelde hij, heeft, op de zijde van den
+beeldenaar, die gehelmde, geharnaste keizer Karel, met een zweerd
+in eene hand en den aardbol in de andere! Door de genade Gods is
+hij Roomsch keizer, koning van Spanje enz., en hij is wel genadig
+voor ons, de geharnaste keizer! En hier op de keerzijde, hebt ge een
+schild, op hetwelk de wapenen van zijne verschillende graafschappen,
+hertogdommen en heerlijkheden prijken, met die schoone spreuke:
+Da mihi virtutem contra hostes tuos: "Geef mij dapperheid tegen uwe
+vijanden". Hij was dapper, inderdaad, tegen de protestanten, die have
+en goed hadden, om van dezelven te erven. Ha! was ik keizer Karel,
+ik liet guldens voor een iegelijk slaan; zoo iedereen rijk was,
+zou niemand meer hoeven te werken.
+
+Maar Uilenspiegel had niet lang genoegen in 't bezien van zijn geld:
+weldra verzwond het in 't gerinkel van bottels en pinten.
+
+
+
+
+XL.
+
+Terwijl Uilenspiegel zich in karmozijnzijde op de dakgoot vertoonde,
+had hij Nele niet gezien, die hem, onder de menigte, glimlachend
+toekeek. Zij woonde te Borgerhout, omtrent Antwerpen, en zij had
+gedacht, dat, als een nar voor koning Philippus moest vliegen, het
+niemand anders kon zijn dan haar Uilenspiegel.
+
+Terwijl hij droomend heenging, hoorde hij niet 't gerucht van haastige
+stappen achter zich, doch hij voelde de twee handjes wel, die langs
+achteren vóór zijne oogen werden gebracht. Aan Nele denkend, vroeg hij:
+
+--Zijt gij het?
+
+--Ja, sprak zij, ik loop achter u sedert dat gij uit de stad zijt. Kom
+mede met mij.
+
+--Maar, antwoordde hij, waar is Katelijne?
+
+--Gij weet niet, sprak zij, dat zij onrechtveerdig als tooveres
+gefolterd werd, vervolgens voor drie jaar uit Damme gebannen,
+en men haar pijnigde en brandde. Ik zeg u dit, opdat gij niet
+zoudt verschieten, want zij is uitzinnig ten gevolge van de hevige
+smerten. Gansche nachten soms beziet ze heure voeten, zeggende:
+Hansken, mijn zoete duivel, zie eens wat zij gedaan hebben met uwe
+vriendinne. En heur arme voeten gelijken twee bloedige wonden. Dan
+weent zij, zeggende: Andere vrouwen hebben een man of een minnaar,
+ik, ik leef op deze wereld als een weduwe. Maar dan zeg ik tot haar,
+dat haar Hansken boos zal wezen, als zij van hem tot anderen durft
+spreken. En zij luistert naar mij gedwee als een kind, behalve wanneer
+zij een os of eene koe, oorzake harer foltering, ziet; dan neemt zij
+ijlings de vlucht, zonder dat iets, barreelen of beken of grachten,
+haren loop kunne stuiten, totdat zij eindelijk nederzijgt aan den
+zoom van een weg of tegen den muur van eene hoeve, waar ik haar ga
+oprapen om heure bloedende voeten te verbinden. En ik geloof, dat
+zij met het brandende werk, ook heure hersenen verbrand hebben.
+
+En beiden waren zeer bedroefd, terwijl zij dachten aan Katelijne.
+
+Zij kwamen bij haar en zagen heur op eene bank in de zonne zitten,
+tegen den muur van heur huis. Uilenspiegel vroeg:
+
+--Herkent gij mij?
+
+Viermaal drie, sprak zij, is een heilig getal, en de dertiende is
+Thereb. Wie zijt gij, kind dezer booze wereld?
+
+--Ik ben Uilenspiegel, antwoordde hij, de zoon van Klaas en van
+Soetkin.
+
+Zij knikte tot teeken dat zij hem herkende; vervolgens wenkte zij
+hem om nader te komen en fluisterde hem in 't oor:
+
+--Als gij hem ziet, wiens kussen koud als de sneeuw zijn, zeg hem
+dan te komen, Uilenspiegel.
+
+Vervolgens heur verbrand haar toonende, sprak zij:
+
+--Ik heb zeer; zij hebben mij mijnen geest afgenomen, maar als hij
+komt zal hij mijn hoofd vullen, dat nu hol is van binnen. Hoort
+gij? het klinkt als een klokke; 't is mijne ziel, die aan de deur
+klopt om henen te gaan, daar het brandt in de helle. Als Hansken komt
+en hij mijn hoofd niet wil vullen, zal ik hem zeggen er een gat in
+te snijden: de ziel, die daar binnen is en klopt om buiten te komen,
+bedrukt mij zoo deerlijk, dat ik het besterven zal. En nimmer slaap
+ik meer, steeds wacht ik op hem, dat hij mij mijn geest teruggeve.
+
+En nederzijgend, zuchtte zij diep.
+
+En de boeren, die van het veld kwamen op etenstijd, als de klokken
+luiden, gingen voorbij Katelijne en spraken:
+
+--Daar is de zottinne.
+
+En zij maakten het teeken des kruises.
+
+En Nele en Uilenspiegel weenden, en Uilenspiegel moest zijne bedevaart
+voortzetten.
+
+
+
+
+XLI.
+
+Zijn beeweg vervolgend, trad hij in dienst bij zekeren Judocus, de
+kwabakker geheeten, om den wille van zijne zure en norsche tronie. De
+kwabakker gaf hem voor eten drie oudbakken brooden per week en deed
+hem slapen in een kot onder het dak, waar het regende en waaide dat
+het een pleizier was.
+
+Als Uilenspiegel zag, dat hij zoo slecht behandeld werd, bakte hij
+zijnen baas verscheidene poetsen en onder andere deze: als men 's
+morgens heel vroeg bakt, moet men 's nachts het meel builen. Nu op
+een nacht dat de mane scheen, vroeg Uilenspiegel een keers om te zien,
+en hij kreeg van zijn meester het volgende antwoord:
+
+--Buil het meel in den maneschijn.
+
+Uilenspiegel gehoorzaamde, en builde het meel op den grond, daar waar
+de maan scheen.
+
+Als de kwabakker 's morgens kwam zien naar Uilenspiegel's werk,
+vond hij hem nog aan 't builen.
+
+--Kost het meel dan geen geld meer, sprak hij, dat gij het nu op den
+grond built?
+
+--Ik heb het meel in den maneschijn gebuild, gelijk gij mij geheeten
+hebt, antwoordde Uilenspiegel.
+
+De bakker antwoordde:
+
+--Ezel, die ge zijt: 't was door eene zeef dat gij het moest doen.
+
+--Ik meende, dat de maan eene zeef van uwe vinding was, antwoordde
+Uilenspiegel. Maar er zal niet veel verloren gaan, ik zal het meel
+opscheppen.
+
+--'t Is nu te laat, antwoordde de bakker, om deeg te maken en te
+bakken.
+
+Uilenspiegel sprak:
+
+--Baas, het deeg van onzen buurman is gereed in den trog, wil ik het
+gaan nemen?
+
+--Loop naar de galg, antwoordde de kwabakker, neem wat er te vinden is.
+
+--Ik ga, baas, antwoordde Uilenspiegel.
+
+Hij liep naar het galgeveld en vond er de verdroogde hand van een
+dief. Hij bracht ze aan den kwabakker en sprak:
+
+Dit is eene gelukshand, die onzichtbaar maakt, wie ze draagt. Wilt
+gij uwe slechte inborst verbergen?
+
+--Ik zal u zwart maken bij het gerecht, antwoordde de kwabakker,
+en gij zult zien dat gij het heerenrecht hebt overtreden.
+
+Toen zij getweeën vóór den burgemeester stonden, wilde de kwabakker al
+de misdaden van Uilenspiegel opsommen, maar deze zette groote oogen
+op en maakte den kwabakker zoo grammoedig, dat hij zijne aanklacht
+onderbrak om te vragen:
+
+--Wel, wat is er?
+
+Uilenspiegel antwoordde:
+
+--Gij hebt mij gezegd, dat gij mij zoodanig zwart gingt maken, dat
+ik zou zien. Wel, ik zie niemendal....
+
+--Uit mijne oogen! riep de bakker.
+
+--Was ik in uw oogen, antwoordde Uilenspiegel, dan zou ik, als gij
+ze toedeedt, er langs de neusgaten moeten uitkruipen.
+
+De burgemeester dacht dat men hem voor den aap hield en wilde hen
+niet langer aanhooren.
+
+Uilenspiegel en de kwabakker kwamen samen buiten, de bakker hief zijn
+stok op, doch Uilenspiegel sprong ter zijde en sprak:
+
+--Baas, daar het met slagen is dat men mijn meel built, neem gij
+de zemelen: dat is uwe norschheid; ik houd de bloem: dat is mijne
+vroolijkheid.
+
+En zich omkeerende, zei hij: Als ge bakken wilt--hier is de oven.
+
+
+
+
+XLII.
+
+De reizende Uilenspiegel ware geerne struikroover geworden, maar hij
+zei tot zich zelven, dat hij met struiken niets verrichten kon.
+
+Hij stapte op goed valle 't uit naar Oudenaarde, waar toen een
+garnizoen Vlaamsche ruiters lag, om de stad te verdedigen tegen de
+Fransche benden, die het land verwoestten lijk sprinkhanen.
+
+De hoofdman van de ruiters was een Fries, een zekere Kornjuin. Zij
+ook liepen het platteland af en knevelden het volk, dat aldus, als
+naar gewoonte, langs twee kanten tegelijk opgegeten werd.
+
+Alles was hun deeg: kiekens en kapoenen, eenden en duiven, kalveren
+en verkens. Op een avond dat Kornjuin en zijne mannen met buit beladen
+terugkwamen, zagen zij aan den voet van een boom Uilenspiegel liggen,
+die sliep en zeker van stoverije droomde.
+
+--Wat doet gij om te leven? vroeg Kornjuin.
+
+--Sterven van honger, antwoordde Uilenspiegel.
+
+--Wat is uw ambacht?
+
+--Reizen voor mijne zonden, de anderen zien wroeten, op de koorde
+dansen, lieve gezichtjes schilderen, messenhechten snijden, op den
+rommelpot spelen en op de trompet blazen.
+
+Als Uilenspiegel zoo stout zei, dat hij op de trompet kon blazen,
+was het omdat hij had hooren zeggen, dat, in het slot van Oudenaarde,
+de plaats open was van torenwachter, ten gevolge van den dood van
+den ouden man welke die bediening vervulde.
+
+Kornjuin zei hem:
+
+--Gij zult bazuinblazer van de stede wezen.
+
+Uilenspiegel volgde hem en hij werd gebracht op een van de hoogste
+torens der vestingen, in een goed verlucht hokje, dat open was voor
+alle winden, behalve voor dien uit 't Zuiden.
+
+Men zei hem, dat hij blazen moest als hij den vijand zag aankomen
+en, daarom steeds het hoofd vrij en de oogen helder moest houden,
+weshalve men hem niet te veel eten of drinken bracht.
+
+De hoofdman en zijne huurlingen bleven in de toren en kermisten
+heel den dag ten koste van het platteland. Daar werd meer dan
+een kapoen, wiens eenige misdaad was vet te zijn, gedood en
+opgesmuld. Uilenspiegel, die altijd vergeten werd en zich tevreden
+moest houden met zijn mageren disch, vond in 't heel geen behagen
+in den reuk van de saus. De Franschen kwamen, namen het vee mee,
+doch Uilenspiegel blies het alarm niet.
+
+Kornjuin kwam boven en vroeg:
+
+--Waarom hebt gij niet geblazen?
+
+Uilenspiegel sprak:
+
+--Gij hadt kunnen denken, dat het als dank was voor mijn eten.
+
+'s Anderen daags bestelde de hoofdman een groot festijn voor zich en
+zijne huurlingen, maar Uilenspiegel werd nogmaals vergeten. Zij gingen
+zich deugd doen aan 't lekkere maal, toen Uilenspiegel alarm blies.
+
+Kornjuin en zijne soldaten, meenende dat de Franschen daar waren,
+verlieten de tafel en sprongen te peerd. Zij reden in allerijl de
+stad uit, maar buiten vonden ze niets dan een os, die in de zonne
+herkauwde, en dien zij meenamen.
+
+Middelerwijl had Uilenspiegel zich volgestopt met vleesch en met
+wijn. Toen de hoofdman terugkwam, zag hij hem lachend en met waggelende
+beenen staan aan de deur van de zaal van 't festijn. Hij sprak:
+
+--'t Is verraderswerk van alarm te blazen als gij den vijand niet ziet,
+en van niet te blazen als ge hem wèl ziet.
+
+--Mijnheer de hoofdman, antwoordde Uilenspiegel, ik heb geblazen om
+mij te verlichten, want in mijn toren was ik zoodanig opgeblazen van
+wind, dat ik vreesde te zullen wegvliegen. Laat mij maar ophangen,
+nu of een andere maal, zoo gij ezelsvel noodig hebt voor uwe trommelen.
+
+De hoofdman ging henen en zei geen woord.
+
+Maar Oudenaarde kreeg tijding, dat de genadige keizer Karel de stede
+zou komen bezoeken met een doorluchtig gezelschap. Bij die gelegenheid
+gaven de schepenen aan Uilenspiegel eenen bril, om Zijne Majesteit
+beter te zien aankomen. Uilenspiegel moest driemaal blazen, zoodra
+hij den keizer van Leupegem zag aankomen op een kwartier gaans van
+de Borgpoort.
+
+Die van de stad zouden aldus den tijd hebben de klokken te luiden,
+het vuurwerk in gereedheid te brengen, het vleesch in den oven te
+zetten, de vaten aan te steken.
+
+Zekeren dag, dat de wind uit Brabant woei en de hemel helder was,
+zag Uilenspiegel, rond den middag, een grooten troep ruiters op
+fiere peerden, op den weg die naar Leupegem leidt. Sommigen droegen
+banieren. Degene, die statig voorop reed, had een goudlakensche
+muts op met groote pluimen. Hij droeg een kleed van bruine panne,
+met bloemen geborduurd.
+
+Uilenspiegel zette zijn bril op en zag dat het keizer Karel was,
+die hoogstgenadiglijk aan die van Oudenaarde kwam toestaan hem hunne
+beste wijnen en fijnste vleezen op te dienen.
+
+Heel die troep kwam stapvoets af en snoof de frissche lucht op, die
+eetlust doet krijgen; maar Uilenspiegel zei tot zich zelven, dat die
+lieden de vette brokken gewoon waren en zij niet zouden sterven zoo
+zij eens over den pot sprongen, daar vasten gezond is. Hij zag ze
+dus komen, maar blies niet op de trompet.
+
+Lachend en pratend kwamen zij nader, terwijl Zijne Heilige Majesteit
+het hoofd voorover boog, als om te zien of er in zijnen buik plaats
+genoeg was voor het festijn van die zijner goede stad Oudenaarde. Doch
+hij was verwonderd en ontevreden dat geenerlei klokke luidde, om
+zijne komst te kondschappen.
+
+Ondertusschen kwam een boer de stad binnenloopen om te zeggen, dat hij
+in de omstreken een Franschen aanhang gezien had, die op Oudenaarde
+aanrukte, om alles te stelen en te rooven.
+
+Op die rede sloot de poortwachter zijne poort en liet de andere
+poortwachters door een knaap der gemeente verwittigen. Maar de wacht
+kermiste zonder van iets te weten.
+
+Zijne Majesteit kwam nader, zeer ontstemd, geen klokkengelui of
+kanongebulder te vernemen. Te vergeefs de ooren spitsend, hoorde
+hij niets dan de beiaard, die het half uur speelde. Hij kwam vóór de
+poort, vond die gesloten en sloeg er op met de vuisten om opengedaan
+te worden.
+
+En de heeren van zijn gevolg, verstoord als Zijne Majesteit, gromden
+bittere woorden. De poortwachter, die omhoog op de vestingen stond,
+riep hun toe dat zij moesten stille zijn, of dat hij hun wat kogels
+zou zenden, hetwelk hun ongeduld eenigszins zou koelen.
+
+Doch Zijne Majesteit, in woede ontstoken, riep:
+
+--Blind verken, herkent gij uwen keizer niet?
+
+De poortwachter antwoordde, dat de meest vergulde verkens niet altijd
+de kleinsten waren, dat hij overigens goed wist, dat de Franschen
+spotters van nature waren, en keizer Karel voor 't oogenblik oorloogde
+in Italië, en dus niet voor de poorten van Oudenaarde wezen kon.
+
+Daarop schreeuwden de keizer en de heeren nog luider, zeggende:
+
+--Als gij niet opendoet, laten wij U braden op eene lans. En eerst
+zult gij uwe sleutels inslikken.
+
+Op het gerucht dat zij maakten, kwam een oudgediende uit de plaats waar
+'t geschut stond. Hij keek over den muur en sprak tot den poortwachter:
+
+--Gij zijt mis, dat is onze keizer; ik herken hem goed, hoewel hij
+verouderd is sedert hij Maria Vander Gheynst van hier naar 't kasteel
+van Lalaing voerde.
+
+De poortwachter viel stokkedood van schrik, de soldaat nam de sleutels
+en deed de poort open.
+
+De keizer vroeg waarom men hem zoolang had laten wachten; als de
+soldaat hem het geval uitgelegd had, beval Zijne Majesteit de poort
+weder te sluiten en de ruiters van Kornjuin te doen komen. Hij deed
+ze vóór hem gaan, slaande op de tamboerijnen en spelend op de pijpen.
+
+Weldra ontwaakten de klokken de eene na de andere en begonnen zij te
+bimbommelen. Aldus voorafgegaan, kwam Zijne Majesteit met keizerlijk
+lawaai op de Groote Markt. Burgemeesteren en schepenen waren op het
+stadhuis vergaderd; schepen Jan Guigelaer kwam met veel gedruisch de
+zaal binnen en riep:
+
+--Keizer Karel is alhier! Keizer Karel is alhier!
+
+Ten uiterst verschrikt bij het hooren van die tijding, liepen
+burgemeesteren, schepenen en raadsheeren buiten om, in korps, keizer
+Karel te begroeten, terwijl hunne knapen de stede rondliepen om het
+vuurwerk in gereedheid te brengen, de kapoenen op 't vuur te zetten
+en de tonnen aan te steken.
+
+Mannen, vrouwlieden en kinderen riepen tot elkander:
+
+--Keizer Karel is op de Groote Markt!
+
+Weldra was het volk in groote menigte naar de Markt gestroomd.
+
+Grammoedig vroeg de keizer aan de twee burgemeesteren, of zij niet
+verdienden gehangen te worden, om aldus te kort te komen aan den
+eerbied, den vorst verschuldigd.
+
+De burgemeesteren antwoordden, dat zij zulks inderdaad verdienden,
+maar dat Uilenspiegel, de torenwachter, het meer verdiende, vermits
+hij, op de mare van 't bezoek van Zijne Majesteit, op den toren gezet
+werd met een goeden bril, met uitdrukkelijk bevel driemaal te blazen,
+zoodra hij den keizerlijken stoet in het gezicht kreeg. Maar hij had
+het niet gedaan.
+
+De keizer, nog immer gram, deed Uilenspiegel komen.
+
+--Waarom, sprak hij, hebt gij bij mijne komst niet geblazen, terwijl
+gij een goeden bril hadt?
+
+Dit zeggende, streek hij de hand over de oogen, om den wille van de
+zonne, en zoo bekeek hij Uilenspiegel.
+
+Deze streek ook de hand over de oogen en antwoordde dat hij, sedert
+hij Zijne Heilige Majesteit door zijne vingeren zag kijken, geen bril
+meer wilde bezigen.
+
+De keizer zei hem, dat hij ging gehangen worden; de poortwachter zei
+dat het wel besteed was, en de burgemeesteren zeiden geen woord om
+die sententie goed te keuren of tegen te spreken, want zij waren met
+schrik vervuld.
+
+De beul en zijne knechten werden geroepen. Zij kwamen met eene ladder
+en een nieuwe koorde, grepen Uilenspiegel bij den kraag en deden hem
+vóór de honderd ruiters van Kornjuin gaan. In stee van hem gerust
+te laten om zijne gebeden te zeggen, begonnen deze hem te sarren en
+te plagen.
+
+Het gemeen, dat volgde, zegde:
+
+--'t Is een ongemeene wreedheid, dien armen jongen voor zulk een
+gering vergrijp ter dood te veroordeelen.
+
+En de wevers, die daar in groote menigte onder de wapens stonden,
+zegden:
+
+--Wij zullen Uilenspiegel niet laten hangen; dat is in strijd met de
+costume van Oudenaarde.
+
+Doch men kwam aan het galgeveld. Uilenspiegel werd op de ladder
+getrokken, en de beul deed de koorde rond zijnen hals. De wevers
+drongen rond de galge. De provoost was daar, met de roede der justitie
+bij zich, met dewelke hij op bevel van den keizer het teeken tot de
+uitvoering moest geven.
+
+Heel het vergaderde volk riep:
+
+--Genade! genade voor Uilenspiegel!
+
+Uilenspiegel, van op zijne ladder, sprak:
+
+--Medelijden! genadige keizer!
+
+De keizer hief de hand op en sprak:
+
+--Als die deugniet mij iets vraagt, dat ik niet doen kan, schenk ik
+hem het leven!
+
+--Spreek, Uilenspiegel! riep het volk.
+
+De vrouwen weenden en zeiden:
+
+--Hij moet sterven, de jongen, want de keizer kan alles.
+
+En allen riepen:
+
+--Spreek, Uilenspiegel!
+
+--Heilige Majesteit, ik zal U noch geld, noch erfgoederen, noch het
+leven vragen, doch enkel iets voor hetwelk gij beloven moet, als
+ik zoo spreken durf, mij niet te zullen doen geeselen of radbraken,
+vóór dat ik naar de andere wereld vertrek.
+
+--Dat beloof ik, sprak de keizer.
+
+--Majesteit, zei Uilenspiegel, ik vraag dat, vóór ik gehangen worde,
+gij mijnen mond komt kussen met denwelken ik geen Vlaamsch spreke....
+
+De keizer, die lachte evenals heel de menigte, antwoordde:
+
+--Ik kan niet doen wat gij mij vraagt, en gij zult niet gehangen
+worden, Uilenspiegel.
+
+Maar de burgemeesteren en schepenen veroordeelde hij om, zes maanden
+lang, eenen bril van achteren op het hoofd te dragen, opdat, zegde
+hij, als die van Oudenaarde van voren niet zien, zij tenminste van
+achteren zouden zien.
+
+En, bij keizerlijk decreet, staat die bril nog heden op het wapen
+van de stad.
+
+En Uilenspiegel ging zediglijk henen, met een kleine tassche vol geld,
+dat de vrouwen hem hadden gegeven.
+
+
+
+
+XLIII.
+
+Uilenspiegel, die te Luik op de vischmarkt liep, zag een dikken
+jongeling, die een net met allerhande gevogelte onder den arm droeg
+en nog een ander vulde met schelvisch, forellen, paling en karpers.
+
+Uilenspiegel herkende Lamme Goedzak.
+
+--Wat doet gij hier, Lamme? vroeg hij.
+
+--Gij weet, sprak hij, dat die van Vlaanderen welkom zijn in het
+zoete land van Luik; ik ben hier heengetrokken door de liefde. En gij?
+
+--Ik zoek een meester om brood te verdienen, antwoordde Uilenspiegel.
+
+--'t Is droge kost, zei Lamme. Een rozenkrans van ortolanen met eene
+lijster, als credo, staat verre daarboven.
+
+--Zijt gij rijk? vroeg Uilenspiegel hem.
+
+Lamme Goedzak antwoordde:
+
+--'k Verloor mijn vader, mijn moeder en mijn jongere zuster, die mij
+altijd sloeg. Ik erfde hun vermogen en ik woon met eene dienstmaagd,
+die maar één oog heeft, zeer ervaren in de kunste van braden en koken.
+
+--Wil ik uwe visch en uw gevogelte dragen, vroeg Uilenspiegel.
+
+--Ja, sprak Lamme.
+
+En beiden slenterden voort langs de markt.
+
+Eensklaps vroeg Lamme:
+
+--Weet gij waarom gij niet wijs zijt?
+
+--Neen, antwoordde Uilenspiegel.
+
+Omdat gij dit eten in de hand draagt, in stee van in uwe maag.
+
+--Inderdaad, Lamme, antwoordde Uilenspiegel; maar sinds ik geen brood
+meer heb, willen de ortolanen mij niet meer bezien.
+
+--Gij zult er hebben, Uilenspiegel, sprak Lamme, en gij zult mij
+dienen als gij mijne dienstmaagd vermoogt te bevallen.
+
+Terwijl zij voortgingen, toonde Lamme aan Uilenspiegel, een schoone,
+lieve, poezele meid, in zijde gekleed, die langs de markt liep en
+Lamme toelonkte.
+
+Een oud man, heur vader, ging achter heur met twee netten, één met
+visch, het ander met wild.
+
+--Die, sprak Lamme, die wordt mijne gade.
+
+--Ja, sprak Uilenspiegel, ik ken heur, 't is een Vlaamsche van
+Zottegem; zij woont in de rue Vinave-d'Isle, en de buren zeggen,
+dat hare moeder in heure plaats de straat vóór de deur keert en dat
+heur vader heure hemdenen strijkt.
+
+Doch Lamme antwoordde niet en sprak blijde:
+
+--Zij heeft mij bezien.
+
+Getweeën kwamen zij aan het huis van Lamme, omtrent eene brug over
+de Maas, en Lamme klopte aan de deur. Een eenoogige dienstmaagd kwam
+opendoen. Uilenspiegel zag dat zij oud, lang, mager en norsch was.
+
+--Sanginne, sprak Lamme tot haar, wilt gij dezen jongen man om u te
+helpen in uw werk?
+
+--Ik zal hem probeeren, sprak zij.
+
+--Neem hem, sprak hij, en laat hem de lekkernijen van uwe keuken
+proeven.
+
+Sanginne bracht toen drie zwarte pensen, eene pint kuite en eene
+homp brood.
+
+Terwijl Uilenspiegel aan 't eten was, smulde Lamme ook aan eene pens.
+
+--Weet gij, vroeg hij hem, waar onze ziel woont?
+
+--Neen, Lamme, sprak Uilenspiegel.
+
+--In onze maag, antwoordde Lamme, daar wordt ze steeds doorploegd
+om ons voortdurend nieuwe geesteskracht te schenken. En welke zijn
+onze beste gezellen? Het zijn de fijne brokken, begoten met wijn van
+de Maas.
+
+--Ja, sprak Uilenspiegel, pensen zijn aangenaam gezelschap voor een
+eenzame ziele.
+
+--Hij vraagt nog, Sanginne, sprak Lamme.
+
+Deze reis gaf Sanginne hem witte pensen.
+
+Terwijl Uilenspiegel zich volstopte, zei Lamme, in gedachten
+verslonden:
+
+--Als ik zal sterven, zal mijn maag met mij sterven, en hier beneden,
+in het vagevuur, zal men mij laten vasten, en laten ronddwalen met
+een slappen en ledigen buik.
+
+--De zwarte waren beter, zei Uilenspiegel.
+
+--Gij hebt er zes gegeten, sprak Sanginne, gij krijgt geene meer.
+
+--Uilenspiegel, sprak Lamme, gij zult hier goed behandeld worden,
+en eten lijk ik.
+
+--Dat woord zal ik onthouden, zei Uilenspiegel.
+
+Uilenspiegel, ziende dat hij at lijk Lamme, was gelukkig. De pensen
+die hij gegeten had, gaven hem zulken moed, dat hij dien dag ketels,
+potten en pateelen deed blinken lijk zonnen.
+
+Daar hij goed leven had in dit huis, verbleef hij geerne in kelder en
+keuken, en liet hij den zolder aan de katten. Eens had Sanginne twee
+kiekens te braden, en beval tot Uilenspiegel aan het spit te draaien,
+terwijl zij naar de markt om de toespijzen ging.
+
+Als de twee kiekens gebraden waren, at Uilenspiegel er een op.
+
+Sanginne kwam terug en ze sprak:
+
+--Er waren twee kiekens, en ik zie er maar een meer.
+
+--Doe uw ander oog open en gij zult ze alle twee zien, antwoordde
+Uilenspiegel.
+
+Woedend ging zij dat vertellen aan Lamme Goedzak, die naar de keuken
+kwam en aldus sprak tot Uilenspiegel:
+
+--Waarom spot gij met de meid? Er waren twee kiekens.
+
+--Inderdaad, Lamme, sprak Uilenspiegel, maar als ik hier binnenkwam,
+hebt gij gezegd dat ik zou eten en drinken als gij. Er waren twee
+kiekens: een heb ik gegeten, het ander is voor u; mijne vreugd is
+voorbij, de uwe nog niet; zijt gij niet gelukkiger dan ik?
+
+--Ja, sprak Lamme glimlachend, maar doe immer alles wat Sanginne u
+zal zeggen, en gij zult maar half werk hebben.
+
+--Ik zal mijn best doen, Lamme, antwoordde Uilenspiegel.
+
+Telkens dat Sanginne hem dan ook iets gebood, deed hij het maar half,
+als zij hem zei van twee akers water te putten, bracht hij er maar
+een; als zij hem vroeg aan de tonne den pot met kuite te vullen,
+goot hij onderweg de helft in zijn keelgaat, en zoo verder.
+
+Ten slotte werd Sanginne het moede en ze zei tot Lamme dat, als die
+deugniet langer in huis bleef, zij dadelijk heenging.
+
+Lamme ging tot Uilenspiegel en zei:
+
+--Gij moet heengaan, mijn jongen, niettegenstaande dat gij hier goed
+waart in huis. Hoor dien haan kraaien, 't is twee uren na middag,
+dat is een teeken van regen. Liever zette ik u niet buiten, als er
+slecht weder op handen is; maar bedenk, mijn jongen, Sanginne houdt met
+heur gekook en gebraad mijn levenslicht brandend; als zij mij verlaat,
+moet ik sterven. Ga heen dus, mijn vriend, op Gods genade, en neem deze
+drie gulden en dezen krans worsten, om u tot vertroosting te dienen.
+
+En Uilenspiegel trok beschaamd en beteuterd henen, want hij betreurde
+Lamme en zijne keuken.
+
+
+
+
+XLIV.
+
+De slachtmaand kwam te Damme en elders, maar 't was een late
+winter. Noch sneeuw, noch koude, noch regen; de zonne scheen van 's
+morgens tot 's avonds, de kinderen stoeiden in het stof van straten en
+wegen; en kooplieden, kramers, goudsmeden, wagenmakers en werklieden
+kwamen 's avonds na het eten, op de zulle hunner deur, kijken naar den
+immerblauwen hemel, naar de boomen, die nog hunne bladeren hadden,
+naar de ooievaars, die op de daken zaten en de zwaluwen, die nog
+niet vertrokken waren. De rozen hadden driemaal gebloeid en botten
+voor de vierde reize; de nachten waren zoel, de vogeltjes kweelden
+in de bosschen.
+
+Die van Damme zegden:
+
+--De winter is dood, laat ons hem verbranden.
+
+En zij maakten een grooten man met een berensnoet, een langen vlassen
+baard en haar van schavelingen. Zij deden hem witte kleederen aan en
+verbrandden hem in groote plechtigheid.
+
+Klaas was weemoedig; hij zegende geenszins den immerblauwen hemel,
+noch de zwaluwen die niet wilden vertrekken. Want te Damme brandde
+niemand meer kolen, tenzij voor de keuken, en daar iedereen er
+daarvoor genoeg had, ging niemand er koopen bij Klaas, die al zijne
+spaarpenningen uitgegeven had om zijn voorraad in te doen.
+
+De kooldrager stond op de zulle zijner deur, toen hij zijn neus door
+een koel windeken voelde streelen,
+
+--Ha! sprak hij, daar komt mijn brood aanwaaien.
+
+Maar het koel windeken bleef niet waaien, en de hemel bleef immer
+blauw, en de bladeren wilden niet vallen. En Klaas weigerde zijn
+wintervoorraad voor halfprijs te verkoopen aan den gierigaard
+Grijpstuiver, den deken der vischverkoopers. En weldra was er gebrek
+in de arme stulp.
+
+
+
+
+XLV.
+
+Doch koning Philippus had geen honger; hij at gebakjes bij zijne
+gemalin, Maria de leelijke, van het koninklijk huis der Tudor's. Hij
+beminde heur niet, doch hoopte die tengere vrouw te bevruchten om
+aan de Engelsche natie een Spaanschen koning te geven.
+
+Maar de verbintenis van een steen met een brandende kool mislukte haar
+doel. Toch waren Philippus en Maria genoeg verbonden om protestanten
+met honderden te doen sterven door het vuur en het water.
+
+Als Philippus niet uit Londen was, of als hij niet, onder eenige
+vermomming, in het een of ander slecht kot zijn vermaak zocht, bracht
+de nacht de beide echtgenooten bij elkander.
+
+Dan leunde koningin Maria, in schoone Iersche kant en fijn Doornijksch
+lijnwaad gehuld, tegen het echtelijk bed, terwijl Philippus keek of
+hij bij zijne vrouw geenerlei teeken van zwangerschap zag; doch niets
+ziende, werd hij kwaad en bekeek de toppen zijner vingeren zonder
+een woord te uiten. Teederlijk zag de vorstinne hem aan; smeekte
+den ijskouden Philippus om liefde. Niets ontzag zij, tranen, kreten,
+noch smeekingen om een kus te ontvangen van hem, die heur zijn minne
+niet schonk.
+
+Als een uitzinnige vrouw lachte en weende zij tegelijk om hem te
+verteederen; doch lachen noch tranen vermochten dit steenen herte
+te smelten.
+
+Als een verliefde slang, kronkelde zij zich, sloeg zij te vergeefs
+hare armen rond hem en trok zij tegen heur hert de smalle borstkas,
+waar de wanstaltige ziel van den bloedigen koning in huisde; maar
+hij verroerde zich niet.
+
+De arme vrouw deed heur best lieftallig te zijn; zij gaf hem al de
+zoete namen, die de minnezieken geven aan de verkorene heurs herten:
+Philippus bekeek de toppen zijner vingeren.
+
+Soms antwoordde hij:
+
+--Zult gij nooit kinderen hebben?
+
+Op die rede boog Maria het hoofd.
+
+--Is het mijne schuld, sprak zij, zoo ik onvruchtbaar ben? Heb
+medelijden met mij: ik leef als eene weduwe.
+
+--Waarom hebt gij geene kinderen? sprak Philippus.
+
+Toen viel de vorstinne op het tapijt, als door den dood getroffen. En
+hare oogen baadden in tranen, en zij hadde bloed geweend, hadde
+zij gekunnen.
+
+En aldus wreekte God de slachtofferen, waarmede de beulen Engelands
+bodem hadden bedekt.
+
+
+
+
+XLVI.
+
+Het gerucht liep, dat keizer Karel van zins was het recht van
+erflating te ontnemen aan al degenen, die in de kloosters stierven,
+hetgeen den Paus grootelijks mishaagde.
+
+Uilenspiegel, die toen in de vallei der Maas was, dacht dat de keizer
+aldus te allen kant voordeel halen zou, want hij erfde als de familie
+niet erfde. Hij zette zich neder aan den oever van den stroom en
+wierp zijne lijn met het aas uit. Vervolgens knaagde hij aan een oude
+broodkorst; het speet hem wel, dat hij er geen kroes wijn bij had, maar
+hij zegde tot zich zelven: men kan 't niet altijd naar wensch hebben.
+
+Toen wierp hij een stuk van zijn brood in 't water, want wie zijn
+maaltijd niet deelt met zijn evennaaste, is niet weerd dat hij leeft.
+
+Een grondeling kwam het brood rieken en opende onnoozel den bek, in
+den waan, dat het brood er van zelf ging in vallen. Terwijl hij aldus
+in de lucht keek, werd hij eensklaps ingeslikt door een verradelijken
+snoek, die als een pijl op hem was toegeschoten.
+
+Een karper, die argeloos in de lucht naar de vliegen hapte, onderging
+hetzelfde lot. Als de snoek verzadigd was, bleef hij onbeweeglijk stil,
+de kleine vischjes versmadend, die pijlsnel van hem wegzwommen. Terwijl
+hij aldus in trotschheid zijn gemak nam, schoot een hongerige,
+vraatzuchtige snoek met open muil op hem toe. Een woedend gevecht
+ontstond en weldra zag het water rondom hen rood van bloed. De
+verzadigde snoek verdedigde zich slecht tegen den hongerige, die wat
+achteruit zwom, zijn aandrift nam en op zijn tegenstrever toeschoot,
+welke hem met open muil afwachtte en de helft van zijn kop inslikte;
+hij wilde hem weder uit den muil stooten, doch hij slaagde er niet in,
+om den wille van zijne haaktanden. En beide spartelden wanhopiglijk.
+
+Aldus aaneengehecht, zagen zij den sterken angel niet, die, aan een
+zijden snoer gebonden, langzaam omhoog kwam en in de vinne drong van
+den verzadigden snoek, beide optrok en ze met krachtigen zwenk op
+het gras smeet.
+
+Uilenspiegel sneed hun de keel af en sprak:
+
+--Snoeken, mijne vrienden, mocht gij de paus en de keizer zijn, die
+elkander verslinden, en ik het wakkere volk dat u beiden opscheert,
+op het uur dat God zal believen!
+
+
+
+
+XLVII.
+
+En Katelijne, die Borgerhout niet verlaten had, dwaalde steeds door
+de velden en herhaalde gedurig: "Hansken, mijn man, zij hebben
+vuur op mijn hoofd gelegd; maak er een gat in, dat mijne ziel er
+uit kome. Helaas! zij klopt altijd en elke klop doet zeer als een
+hamerslag."
+
+En Nele verzorgde de arme uitzinnige, en treurig dacht zij aan heuren
+vriend Uilenspiegel.
+
+En te Damme bond Klaas zijne mutsaards en verkocht zijne kolen;
+en menigwerf werd hij droefgeestig als hij dacht aan Uilenspiegel,
+den banneling, die nog in langen tijd niet zou mogen terugkeeren naar
+de ouderlijke stulp.
+
+Soetkin zat heele dagen aan het venster te kijken of zij heuren zoon
+niet zag aankomen.
+
+Deze was nu bij Keulen en kreeg lust in 't hovenieren.
+
+Hij ging zich als knecht verhuren bij Jan van Zuursmoel, die, ten
+tijde dat hij kapitein der landsknechten was, wegens wanbetaling van
+soldij bijna gehangen geweest was, weshalve hij een grooten afkeer
+had van hennep, door de boeren kennep genoemd.
+
+Op zekeren dag nam Jan van Zuursmoel Uilenspiegel mede naar zijn akker,
+waarnaast een dagwand, geheel met kennep beplant.
+
+Jan van Zuursmoel sprak tot Uilenspiegel:
+
+--Telkenmale dat gij die leelijke plant ziet, moet gij ze met zooveel
+verachting bejegenen als gij maar kunt, want zij dient tot rad en
+tot galg.
+
+--Ik zal het onthouden, antwoordde Uilenspiegel.
+
+Eens nu dat Jan van Zuursmoel met eenige vrienden aan tafel zat,
+zei de keukenmeid tot Uilenspiegel:
+
+--Ga naar den kelder en haal er den zennep, wat toen mosterd bediedde.
+
+Uilenspiegel opzettelijk kennep in plaats van zennep verstaande,
+bejegende den mosterdpot met de meest mogelijke verachting en kwam
+hem vervolgens op de tafel stellen, heimelijk lachend.
+
+--Waarom lacht gij? vroeg Jan van Zuursmoel. Meent gij dat onze
+neuzen van koper zijn? Eet zelf dien zennep, mits gij hem zelven
+gereedgemaakt hebt.
+
+--Ik eet liever kaneelkoekjes, antwoordde Uilenspiegel.
+
+Jan van Zuursmoel stond recht om hem te slaan.
+
+--Wat hebt gij in dien mosterdpot gedaan? sprak hij.
+
+--Wel baas, antwoordde Uilenspiegel, herinnert gij u niet den dag, toen
+ik u moest volgen naar den akker en gij mij, den zennep aanwijzende,
+zegdet: "Overal waar gij die leelijke plant ziet, moet gij ze met
+zooveel verachting bejegenen als gij maar kunt, want zij dient tot
+rad en tot galg." En ik heb het gedaan, baas, ik heb ze al mijne
+verachting uitgedrukt; gaat ge mij nu slaan omdat ik gehoorzaam was?
+
+--Ik heb kennep gezeid en niet zennep, riep Jan van Zuursmoel.
+
+--Baas, ge hebt zennep gezeid en niet kennep, antwoordde Uilenspiegel.
+
+Nog langen tijd twistten zij aldus voort, Uilenspiegel op nederigen
+toon, Jan van Zuursmoel met een woedend geschreeuw, waarin hij de
+woorden hennep, zennep, kemp-zemp, zemp-kemp ondereen mengde als een
+verwarde streng zijde.
+
+En de gasten lachten als duivels, die zich goed doen aan
+preekheerenribben en kettermeestersnieren.
+
+Maar Uilenspiegel moest de deur uit.
+
+
+
+
+XLVIII.
+
+Nele was nog zeer bedroefd voor heur zelve en voor heure uitzinnige
+moeder.
+
+Als Uilenspiegel zich bij een kleermaker verhuurde, zei deze tot hem:
+
+--Als gij naait, naai dicht aaneen, dat ik de steken niet
+zie. Uilenspiegel ging zich onder eene tonne zetten en begon daar
+te naaien.
+
+--Wat is dàt nu? riep de kleermaker.
+
+--Ik ben in de ton gekropen om te naaien, dan kunt gij immers de
+steken niet zien? antwoordde Uilenspiegel.
+
+--Kom, sprak de kleermaker, zet u hier neer op de tafel, en stik uwe
+steken dicht bij elkander, en maak het kleed als deze wolf.--Wolf
+was de naam van een boerenwambuis.
+
+Uilenspiegel nam het wambuis, sneed het aan stukken, naaide het aaneen,
+zooveel als hij kon in de gedaante van een wolf.
+
+Toen de kleermaker dat zag, riep hij uit:
+
+--Wat duivel? maakt gij daar?
+
+--Een wolf, antwoordde Uilenspiegel.
+
+--Leelijke spotter, sprak de kleermaker, ik had u gezegd van een
+wolf te maken, 't is waar, maar gij weet toch wel, dat een wolf een
+boerenwambuis is.
+
+Eenigen tijd naderhand zegde hij hem:
+
+--Jongen, gooi nog eens gauw de mouwen aan dien bovenkerel daar,
+eer gij slapen gaat.
+
+Uilenspiegel hing den bovenkerel aan eenen nagel en bracht heel den
+nacht door met de mouwen naar het kleedingstuk te werpen.
+
+Op het leven dat hij maakte, kwam de kleermaker kijken.
+
+--Deugniet, sprak hij, welke kwade poets zijt gij mij nu aan 't bakken?
+
+--Gij heet dat een kwade poets? antwoordde Uilenspiegel. Bezie die
+mouwen, heel den nacht gooi ik ze naar den bovenkerel, en ze blijven
+er nog niet op.
+
+--Dat spreekt van zelf, zei de kleermaker, daarom gooi ik u op straat,
+misschien blijft gij er op.
+
+
+
+
+XLIX.
+
+Als Katelijne bij een of anderen braven gebuur was, die op heur wilde
+letten, ging Nele verre, verre alleen, zelfs tot Antwerpen, langsheen
+de Schelde of elders, turend naar de wiegelende schuitjes en naar de
+stoffige wegen, of ze soms heuren vriend Uilenspiegel niet ontwaarde.
+
+Eens dat Uilenspiegel te Hamburg op de jaarmarkt was, zag hij
+overal kooplieden, en onder hen, eenige oude joden, woekeraars en
+schacheraars.
+
+Uilenspiegel, die ook wilde koopmanschap drijven, raapte eenige
+peerdevijgen op en droeg ze mee naar huis, 't is te zeggen naar een
+hoek van den vestingmuur. Daar liet hij ze drogen. Vervolgens kocht
+hij roode en groene zijde, van dewelke hij zakjes maakte; daarin
+stak hij de peerdevijgen, en hij bond de zakjes toe met een lint,
+alsof er muskus in stak.
+
+Vervolgens maakte hij een houten bakje, hetwelk hij met een oude koord
+om zijn hals hing, en hij kwam op de markt met het bakje vol roode
+en groene zakjes, 's Avonds stelde hij een keersken midden tusschen
+de zakjes, om ze te verlichten.
+
+Als men hem kwam vragen wat hij verkocht, antwoordde hij op
+geheimzinnigen toon:
+
+--Ik zal het u zeggen, maar spreek niet te luide.
+
+--Wat is het dan? vroegen de klanten.
+
+--Het zijn, antwoordde Uilenspiegel, profetische zaadkorrels, die
+recht van Arabië naar Vlaanderen kwamen; zij zijn met groote kunste
+gereedgemaakt door meester Abdul-Medil, afstammeling van den grooten
+Mahomed.
+
+De klanten zeiden tot elkander:
+
+'t Is een Turk.
+
+Anderen spraken:
+
+--Maar neen, 't is een pelgrim, die uit Vlaanderen komt; hoort gij
+'t niet aan zijne tale?
+
+En armoedige, in lompen gehulde liefhebbers spraken:
+
+--Geef ons eenige profetische zaadkorrels.
+
+--Als gij guldens zult hebben om te betalen, antwoordde Uilenspiegel.
+
+En de armoedige, in lompen gehulde liefhebbers gingen beteuterd henen,
+zeggende:
+
+--Alles is toch voor de rijken hier op de wereld!
+
+Maar weldra werd op de markt het gerucht verspreid, dat daar een
+Vlaming was met profetische zaadkorrels.
+
+--Ja, zeiden de poorters tot elkander, ze zijn te Jeruzalem op het graf
+van Jezus Christus gewijd, maar men zegt dat hij ze niet wil verkoopen.
+
+En de poorters kwamen bij Uilenspiegel en vroegen hem van zijne
+zaadkorrels.
+
+Maar Uilenspiegel, die groote winsten wilde opstrijken, antwoordde dat
+zij niet rijp genoeg waren, en hij hield het oog op twee rijke joden,
+die langs de markt slenterden.
+
+--Ik zou wel eens willen weten, sprak een der poorters, wat er geworden
+zal van mijn schip, dat op zee is.
+
+--Het zal ten hemel varen, als de baren hoog genoeg rijzen, antwoordde
+Uilenspiegel.
+
+Een ander liet hem zijn dochter zien, een blozende, poezele meid,
+en vroeg hem of het goed met haar zou loopen.
+
+--Alles loopt zooals de natuur het wil, antwoordde Uilenspiegel,
+want hij had het meisje een sleutel zien geven aan een jongen man,
+die, glanzend van geluk, aan Uilenspiegel vroeg:
+
+--Koopman, geef mij een van uwe profetische zakjes, opdat ik wete of
+ik dezen nacht alleene zal slapen.
+
+--Er staat geschreven, sprak Uilenspiegel, wie verleiding zaait,
+zal horens maaien.
+
+De jonge snaak was grammoedig en vroeg:
+
+--Wat wilt gij zeggen?
+
+--De zaadkorrels zeggen, antwoordde Uilenspiegel, dat zij u wenschen
+een gelukkig huwelijk en een vrouw, die u geen Vulcanus-hoed
+opzet. Kent gij dat hoofddeksel?
+
+Vervolgens sprak hij op den toon van een zedenpreeker:
+
+--Want de vrouw die een godspenning geeft op den huwelijkskoop,
+geeft naderhand heel de waar aan anderen weg.
+
+Stoutweg vroeg de meid aan Uilenspiegel:
+
+--Ziet men dat allemaal in uwe profetische zakjes?
+
+--Men ziet er mede eenen sleutel in, fluisterde Uilenspiegel heur
+stil in het oor.
+
+Maar de jongeling was weg met den sleutel.
+
+Eensklaps zag Uilenspiegel een dief van den stal van een spekslachter
+eene worst nemen van eene elle lang en die onder zijn mantel
+verbergen. Maar de koopman zag het niet. Blijgezind kwam de dief bij
+Uilenspiegel, en hij vroeg hem:
+
+--Wat verkoopt gij daar, ongeluksprofeet?
+
+--Zakjes, waarin gij zult zien dat uwe liefde voor de worsten u naar
+de galg zal brengen.
+
+Op die rede nam de dief ijlings de vlucht, terwijl de bestolen
+koopman riep:
+
+--Houdt den dief! houdt den dief!
+
+Maar deze was de gaten uit.
+
+Terwijl Uilenspiegel sprak, kwamen de twee rijke Joden, die met
+aandacht geluisterd hadden, naar hem toe en vroegen:
+
+--Wat verkoopt gij daar, Vlaming?
+
+--Zakjes, antwoordde Uilenspiegel.
+
+--En wat ziet men met uwe profetische zaadkorrels? vroegen zij weder.
+
+--Men ziet de toekomst, als men op de zaadkorrels zuigt, antwoordde
+Uilenspiegel.
+
+De twee joden spraken stille tot elkander, en de oudste zei tot
+den anderen:
+
+--Zoo zouden wij weten wanneer onze Messias komt; dat ware voor ons
+een groote vertroosting. Laat ons een van die zakjes koopen.
+
+--Hoeveel, uwe zakjes? vroegen zij.
+
+--Vijftig gulden, antwoordde Uilenspiegel. Is het te veel, trekt dan
+maar op. Wie den akker niet koopt, heeft ook den vetten mest niet
+van noode.
+
+Ziende dat Uilenspiegel zoo vastberaden was, telden zij hem de
+somme en namen zij een van de zakjes. Zij trokken er mee naar
+hunne vergaderplaats, alwaar weldra al de joden in groote menigte
+heenstroomden, toen zij gehoord hadden, dat de twee ouden een geheim
+hadden gekocht, met hetwelk zij de komst van den Messias konden
+voorzeggen.
+
+Zoodra dit gekend was, wilden allen, zonder betalen, aan het zakje
+zuigen; maar de oudste, die het zakje gekocht en betaald had en Jehu
+hiet, wilde alleen de eer en 't genot hebben.
+
+--Zonen van Israël, sprak hij, het zakje in de hand houdend, de
+Christenen bespotten ons; zij maken jacht op ons, en roepen achter
+ons alsof wij cahorsijnen of woekeraars waren. De Philistijnen willen
+ons nog dieper dan den grond doen buigen; zij spuwen ons in 't gelaat,
+want God heeft onze bogen ontspannen en de teugels losgelaten. Heere,
+God van Abraham, van Isaäc en van Jacob, hoelang nog moet het kwaad
+ons geworden, terwijl wij het goede verbeiden; hoelang moeten de
+duisternissen heerschen, terwijl wij het licht verwachten? Goddelijke
+Messias, zult gij weldra op de aarde nederdalen? Wanneer zullen de
+Christenen zich verschuilen in holen en spelonken, bevend voor de
+kastijding, die zij bij uwe verschijning zullen ontvangen?
+
+En de joden riepen:
+
+--Kom Messias! Zuig, Jehu!
+
+Jehu zoog aan het zakje en, met walg spuwend, riep hij jammerend uit:
+
+--Ik zeg U, in der waarheid, dat het drek is; de Vlaamsche pelgrim
+is een dief.
+
+Toen sprongen al de joden bij, en zij openden het zakje. Als zij zagen
+wat er in stak, liepen zij in woede naar de jaarmarkt om Uilenspiegel
+te vinden, maar deze had niet op hen gewacht.
+
+
+
+
+L.
+
+Een man van Damme, die aan Klaas zijne kolen niet kon betalen, had
+hem het schoonste van zijn kateil gegeven, zijnde een handboog met
+twaalf goed aangezette pijlen.
+
+En als er niet te werken was, ging Klaas op jacht: meer dan één
+beestje, te groot liefhebber van kool, werd door hem gedood en
+veranderd in hazepeper.
+
+Klaas zette zich toen gretig te eten, en Soetkin zag naar den eenzamen
+weg en zeide:
+
+--Thijl, mijn zoon, riekt gij den lekkeren geur van de saus
+niet?... Ongetwijfeld heeft hij nu honger.
+
+En droomerig, had zij hem zijn deel van 't festijn willen wegzetten.
+
+--Als hij honger heeft, sprak Klaas, is het zijne schuld; dat hij
+terugkome en hij zal eten als wij.
+
+Klaas hield duiven; ook hoorde hij geerne, rondom zich, distelvinken,
+leeuwerikken, musschen en andere vogelen zingen en piepen, en
+schoot hij geerne muizenvalken en speurgalen, die de kleine vogelen
+verslinden.
+
+Nu, eens dat hij in zijne lochting kolen mat, toonde Soetkin hem een
+grooten vogel, die in de lucht boven het duivenhok zweefde.
+
+Klaas nam zijn handboog en sprak:
+
+--De duivel redde Zijne Sperwerachtigheid!
+
+Toen hij den pijl in den boog had gestoken, hield hij zich in de
+lochting, alwaar hij al de bewegingen van den vogel met de oogen
+volgde om hem niet te missen. Het was valavond. Klaas kon enkel een
+zwarte stip onderscheiden. Hij schoot den pijl af en zag een ooievaar
+in de lochting vallen.
+
+Klaas was er droef om, maar Soetkin nog meer, en zij riep:
+
+--Nu hebt gij den vogel Gods gedood!
+
+Zij nam toen den ooievaar en zag dat hij maar aan den vleugel gewond
+was; zij ging ongel halen en sprak, terwijl ze zijne wonde vermaakte:
+
+--Ooievaar lief, 't is niet behendig voor u, die geerne gezien wordt,
+van in de lucht te zweven als een steekvogel, die gehaat wordt. Aldus
+treffen de pijlen des volks soms den verkeerden man. Hebt gij zeer aan
+uwen vleugel, arme ooievaar, dat gij mij zoo gewillig laat begaan? Hoe
+weet gij dat onze handen handen van vrienden zijn?
+
+Als de ooievaar genezen was, kreeg hij alles te eten wat hem lustte;
+doch liefst at hij de visch, die Klaas voor hem in de vaart ging
+vangen. En telkens dat de vogel Gods hem zag komen, opende hij gretig
+den bek.
+
+Hij volgde Klaas als een hondje, maar liefst bleef hij in de keuken,
+alwaar hij zijne maag warmde en met den snavel op Soetkin sloeg,
+terwijl zij het noenmaal bereidde, als om heur te vragen:
+
+--Is er niets bij voor mij?
+
+En 't was aardig dien ernstigen geluksbode op zijne lange pooten de
+hut te zien rondloopen.
+
+
+
+
+LI.
+
+Maar de slechte dagen waren teruggekomen: droevig wrocht Klaas alleen
+op zijn akker, want er was geen werk voor hen beiden. Soetkin bleef in
+de stulp en bereidde op allerhande manieren de boonen, hun dagelijksch
+maal, om Klaas' eetlust te streelen. En zij zong en zij lachte, opdat
+hij heure droefheid niet merken zou. De ooievaar stond bij heur,
+op één poot en met den bek in de pluimen.
+
+Een man te peerd hield voor hunne woning stil; hij was heel in 't
+zwart gekleed en had een mager en droevig gezicht.
+
+--Is hier iemand thuis? vroeg hij.
+
+--God zegene Uwe Droefgeestigheid, antwoordde Soetkin; ben ik dan
+een schimme, dat gij mij vraagt of iemand thuis is?
+
+--Waar is uw vader? vroeg de ruiter.
+
+--Als mijn vader den naam draagt van Klaas, is hij ginder, antwoordde
+Soetkin, en bezig met koren te zaaien.
+
+De ruiter ging weg, en Soetkin toog ook henen vol droefheid, want
+voor de zesde reize moest ze, zonder geld, brood bij den bakker gaan
+halen. En toen ze met ledige handen terugkwam, was zij versteld Klaas
+triomfantelijk te zien terugkomen op het peerd van den zwarten man, die
+te voet naast hem ging en het dier bij den toom hield. Klaas hield vol
+trotschheid in de hand een lederen tassche, dewelke goed gevuld scheen.
+
+Toen hij van 't peerd steeg, omhelsde hij den man en klopte hem
+vervolgens vriendelijk op den schouder.
+
+--Leve mijn broeder Judocus, de goede heremijt! riep hij uit, terwijl
+hij de tassche deed rinkelen. God beware hem in vreugd, in vet en in
+gezondheid. 't Is Judocus vol zegen, Judocus vol overvloed, Judocus
+met zijne vette soep! De ooievaar heeft geenszins gelogen!
+
+En hij legde de tassche op de tafel. Jammerend sprak Soetkin toen:
+
+--Man, wij hebben geen eten vandaag: de bakker heeft mij brood
+geweigerd.
+
+Brood? sprak Klaas, de tassche openend en goudstukken op de tafel
+gietend, brood? Daar is brood, boter, vleesch, wijn, bier! Daar zijn
+hespen, mergpijpen, reigerpastijen, ortolanen, ganzen, krakelingen,
+daar is ambrozijn, lijk bij de groote heeren! daar is bier met tonnen
+en wijn met vaten! Gestraft wordt de bakker, want wij zullen bij hem
+niets meer koopen.
+
+--Maar man, sprak Soetkin verbaasd.
+
+--Nu luister, sprak Klaas, en wees verblijd. Katelijne, in stee
+van in 't markgraafschap Antwerpen hare ballingschap uit te doen,
+is vergezelschapt door Nele, te voet naar Meiborg gegaan. Daar heeft
+Nele tot mijn broeder Judocus gezegd, dat wij ondanks onzen harden
+arbeid, veelal in armoe verkeeren. En naarvolgens die goede bode mij
+zooeven gezegd heeft--en Klaas wees naar den zwarten ruiter--heeft
+Judocus den heiligen Roomschen godsdienst verlaten, om de Luthersche
+ketterije aan te hangen.
+
+De zwarte man sprak:
+
+--Ketters zijn zij, die de Groote Hoer volgen. Want de Paus vergeet
+zijne plichten en drijft handel in de heilige zaken.
+
+--Stil! zei Soetkin, spreek niet zoo luide, gij zoudt ons gedrieën
+op den brandstapel brengen!
+
+--Dus, vervolgde Klaas, Judocus heeft aan dezen braven bode gezegd,
+aangezien hij strijden ging onder de troepen van Frederik van Saksen,
+wien hij vijftig goed gewapende mannen bezorgde, hij zooveel geld
+niet van noode had, want dat het, bij rampspoed, toch zou worden
+gestolen door een of anderen landsknecht. Breng dus, zoo sprak hij,
+met mijnen zegen, die zevenhonderd karolusgulden aan Klaas, mijnen
+broeder en zeg hem dat hij goed leve en het heil zijner ziel gedenke.
+
+--Ja, sprak de ruiter, want 't is tijd: God geeft een ieder naar zijne
+werken en handelt met een iegelijk volgens de verdiensten zijns levens.
+
+--Heer, sprak Klaas, 't zal mij ondertusschen toch niet verboden
+zijn mij in de goede tijding te verblijden? Verweerdig u hier te
+blijven. Om uwe boodschap te vieren, zullen wij eten heerlijke pensen,
+menigvuldige karbonaden, een hammetje dat daar even zoo rond en zoo
+lekker bij den spekslager lag, dat mijne tanden wel een voet lang
+uit mijnen mond kwamen.
+
+--Laas! sprak de man, alleen de goddeloozen denken aan genuchten,
+terwijl de blikken des Heeren op hen zijn gevestigd.
+
+--Nu, bode, sprak Klaas, wilt gij met ons eten en drinken of niet?
+
+De man antwoordde:
+
+--De geloovigen zullen hunne zielen aan de aardsche genoegens mogen
+wijden, als de Babylonische Hoer ten gronde zal liggen!
+
+Daar Klaas en Soetkin een kruis sloegen, wilde hij heengaan.
+
+Klaas sprak tot hem:
+
+--Zoo het U behaagt aldus met een slecht onthaal te vertrekken,
+geef dan den vredekus aan mijn broeder Judocus en waak over hem in
+'t gevecht.
+
+--Ik zal het doen, sprak de man.
+
+En hij toog henen, terwijl Soetkin eten ging halen om dit uit de
+lucht gevallen fortuin te vieren. Dien avond kreeg de ooievaar twee
+grondelingen en een kabeljauwskop.
+
+De mare verspreidde zich weldra te Damme, dat de arme Klaas, door
+het toedoen van zijn broeder Judocus, de rijke Klaas was geworden. En
+de deken zei, dat Katelijne zeker Judocus betooverd had, daar Klaas
+van hem een groote somme gelds had gekregen en dat hij niet eens een
+kleedje aan Onze-Lieve-Vrouw had geofferd.
+
+Klaas en Soetkin waren gelukkig; Klaas wrocht op het veld of verkocht
+zijne kolen, en Soetkin bleef de wakkere huisvrouw.
+
+Maar Soetkin, altoos droefgeestig, zocht steeds, met de oogen, heuren
+zoon Uilenspiegel op de wegen.
+
+En alle drie smaakten het geluk, dat God hun zond, in afwachting van
+hetgeen de menschen hun zouden jonnen.
+
+
+
+
+LII.
+
+Keizer Karel ontving dien dag uit Engeland een brief, in denwelken
+zijn zoon hem schreef:
+
+
+
+"Heer en Vader,
+
+"Het mishaagt mij grootelijks te moeten leven in een land, waar
+de gevloekte ketteren vermenigvuldigen als vlooien, rupsen en
+sprinkhanen. Het vuur en het zweerd zouden niet te veel zijn om ze
+te rukken van den stam des levendmakenden booms die onze Moeder de
+Heilige Kerk is. Alsof mijn leed nog niet voldoende ware, beschouwen
+mijne onderdanen mij niet als een koning, maar als den echtgenoot
+van hunne koningin, die zonder haar geenerlei gezag zou hebben. Zij
+spotten met mij, zeggende in kwaadwillige boekskens, waarvan niemand
+den schrijver of drukker kan vinden, dat de Paus mij betaalt om
+stoornis en verderf te brengen in het koninkrijk, door ketteren te
+hangen en te branden en, zoo ik een dringende schatting opleggen
+wil--want meermaals laten zij mij met opzet zonder geld--antwoorden
+zij in boosaardige paskwils, dat ik er maar te vragen heb aan Satan,
+voor denwelken ik werk. Die van 't Parlement bieden mij, uit vreeze,
+hoogst nederig hunne verontschuldiging aan, maar zij geven toch niets.
+
+"Doch de muren van Londen zijn bedekt met opschriften, waarin ik
+voorgesteld word als een vadermoorder, gereed om Uwe Majesteit te
+treffen, om van hem te erven.
+
+"Maar gij weet, Heer en Vader dat onaangezien rechtmatigen trots,
+ik aan Uwe Majesteit nog lange en glorierijke dagen wensch.
+
+"Ook verspreiden zij in de stad eene prent, geëtst op koper,
+waarop ik afgebeeld word staande bij eene klavecimbel, in dewelke
+katten opgesloten zijn, die met hare pooten op de snaren slaan
+en wier steerten steken uit ronde gaten, waaraan zij met ijzeren
+roeden vastgemaakt zijn. Een man, die ben ik, verbrandt de steerten
+met een gloeiend ijzer, om de dieren met de pooten op de toetsen
+te doen slaan en erbarmlijk te doen kermen. Ik ben afgebeeld zoo
+wanstaltig en met zulken grijnslach, dat ik mij niet wil bezien. En
+gij weet, Heer en Vader, of ik mij ooit aan zulk onheilig vermaak
+overleverde. Ongetwijfeld deed ik wel eens, voor mijn pleizier,
+katten mauwen, doch ik lachte niet. Als echte muitmakers, rekenen
+zij mij dit alles als eene misdaad aan, hoewel de dieren geene ziel
+hebben, en een iegelijk, en inzonderheid vorstelijke personen, zich
+van hen mag bedienen tot nut en verzet. Maar in Engeland is men zoo
+verzot op dieren, dat men ze beter behandelt dan de dienstknechten;
+stallen en hondehokken zijn hier paleizen en hier zijn heeren, die
+in den stal bij hun peerd slapen.
+
+"Daarenboven is mijne gade en koningin onvruchtbaar. Om mij te
+beleedigen zeggen ze, dat ik, niet zij--die jaloersch, onhandelbaar,
+en bovenmate minneziek blijft--daarvan de schuld is. Mijnheer en Vader,
+alle dagen bid ik deemoedig Onzen Heere, dat Hij mij Zijne genade
+schenke, in de hoop dat Hij mij een anderen troon geve, al was het
+bij de Turken, in afwachting van dien tot denwelken eenmaal geroepen
+zal worden de zoon Uwer Allerglorierijkste en Allerzegevierendste
+Majesteit.
+
+"Ondertekend: Philippus."
+
+
+De keizer antwoordde als volgt:
+
+
+
+"Mijnheer en Zoon,
+
+"Uwe vijanden zijn groot, ik betwist het geenszins, doch tracht
+zonder grammoedigheid een schitterender kroon te verbeiden. Reeds
+meermalen heb ik het voornemen uitgedrukt, mij terug te trekken uit
+de Nederlanden en uit mijne andere bezittingen, want ik voel dat ik,
+oud en jichtig als ik word, niet meer zal kunnen wederstaan aan Hendrik
+van Frankrijk, den tweeden van dien naam, want de Fortuin lacht steeds
+den jongeren toe. Verlies ook niet uit het oog, dat gij, meester van
+Engeland, door uwe macht, Frankrijk, onzen vijand, kwetst en vernedert.
+
+"Ik werd deerlijk verslagen vóór Metz, alwaar ik veertig duizend man
+verloor; ik moest vluchten voor den koning van Saksen. Als God mij
+door Zijne Goedertierenheid in mijn vroegere kracht en macht niet
+wil herstellen, ben ik van zins, Mijnheer en Zoon, U mijne rijken af
+te staan.
+
+"Heb dus geduld en doe ondertusschen uwen plicht tegen de ketterijen,
+van dewelke gij niemand moet sparen, noch mannen, noch vrouwlieden,
+noch kinderen, want mij is niet zonder leed ter kennis gekomen,
+dat Mevrouw de koninginne hun dikwijls genade wil schenken.
+
+"Uw verkleefde vader,
+
+Onderteekend: Karel."
+
+
+
+
+LIII.
+
+Daar Uilenspiegel lang, zeer lang gegaan had, waren zijne voeten tot
+bloedens toe gekwetst. Doch in het bisdom Mentz ontmoette hij eenen
+wagen met pelgrims, die hem naar Rome bracht.
+
+Toen hij in die stad kwam en uit den wagen stapte, zag hij aan de
+poort eener afspanning een poezele vrouwe staan, die hem toelachte.
+
+Heur minnelijk gezichtje beviel hem ten volle.
+
+--Weerdin, sprak hij, wilt gij een reizenden pelgrim herbergen, die,
+met zonden overladen, den Heiligen Vader om genade komt smeeken?
+
+--Wij herbergen al degenen, die betalen.
+
+--Ik heb honderd dukaten in mijne tassche, antwoordde Uilenspiegel,
+die er maar éénen had, en met u wil ik den eersten verteren; laat
+ons een bottel ouden Roomschen wijn drinken.
+
+--De wijn is niet duur in deze heilige stede, sprak zij; kom binnen
+en drink voor een soldo.
+
+Zij dronken samen lang en ledigden, onder vriendelijk gekeuvel,
+zulke menigte flesschen, dat de weerdin aan heure meid zeggen moest
+de klanten in heure plaats te gerieven, terwijl zij en Uilenspiegel
+in een marmeren achterkamer zaten, waar het koel was als in den winter.
+
+Heur hoofd op zijn schouder leunend, vroeg zij hem wie hij was.
+
+--Ik ben messire van Geenland, grave van Nergensthuis heere van
+Vastendonk, en 'k heb te Damme, dat mijne geboorteplaats is, vijf en
+twintig bunders maneschijn.
+
+--Waar ligt dat land? vroeg de weerdin, uit Uilenspiegel's beker
+drinkend.
+
+--'t Is een land, sprak hij, waar men stoute verbeelding, onzinnige
+verwachtingen en ijdele beloften zaait; een land, waar gij niet
+vandaan zijt, met uwe lichtbruine huid, met uwe oogen die flonkeren
+als perelen; ze zijn van de kleur van de zonne, die goudbruine
+lokken; 't is het erfdeel van Venus, die gevleesde schouderen, die
+goddelijke borsten, die ronde armen, die fijne handjes. Willen wij
+samen avondmalen?
+
+--Schoone pelgrim uit Vlaanderen, sprak zij, wat komt gij hier doen?
+
+--Den paus spreken, antwoordde Uilenspiegel.
+
+--Laas! sprak zij, den paus spreken! Ik, die hier vandaan ben, heb
+het nog nooit gekunnen.
+
+--Ik zal het kunnen, sprak Uilenspiegel.
+
+--Maar, sprak zij, weet gij waar hij gaat, hoe hij is, en kent gij
+zijne levenswijze?
+
+--Onderweg zegde men mij, antwoordde Uilenspiegel, dat hij Julius de
+derde heet, dat hij ontuchtig, lichtzinnig is, dat hij goed klapt en
+snedig antwoordt. Men zei ook mij, dat hij een ongemeene vriendschap
+opgevat heeft voor een zwarten, vuilen bedelaar, die met een aapje
+de aalmoes vroeg, dat hij hem tot kardinaal gemaakt heeft en dat hij
+ziek is als hij hem een dag niet ziet.
+
+--Drink, sprak zij, en spreek niet zoo luide.
+
+--Men zei ook, vervolgde Uilenspiegel, dat hij eens vloekte als een
+soldenier, toen hij een kouden pauw niet terugvond, dien hij had doen
+wegzetten voor zijn avondmaal, en dat hij sprak: Ik, de stadhouder
+Gods, mag wel vloeken om een pauw, wanneer mijn meester grammoedig
+om eenen appel was! Gij ziet liefste, dat ik den paus ken en weet
+wie hij is.
+
+--Laas! zegde zij, spreek daarvan aan anderen niet. Maar gij zult
+hem niet zien.
+
+--Ik zal hem spreken, zei Uilenspiegel.
+
+--Als gij dát kunt, betaal ik U honderd florijnen.
+
+--Ik heb ze gewonnen! sprak Uilenspiegel.
+
+Hoewel zijne beenen vermoeid waren, doorliep hij 's anderen daags
+de stad en vernam hij, dat de paus dien dag de misse zou lezen in de
+kerk van San Giovanni in Laterano. Uilenspiegel toog er henen, ging
+zoo dicht bij den paus staan als hij kon, en telkens dat de paus den
+kelk of de hostie ophief, keerde Uilenspiegel den rug naar het autaar.
+
+De paus was bijgestaan door een schelmschen, zwaarlijvigen kardinaal,
+die, met een aapje op den schouder, het volk het sacrament gaf,
+met menigvuldige ontuchtige gebaren daarbij. Hij deed den paus de
+handelwijze van Uilenspiegel kennen, en als de misse gedaan was,
+kwamen vier groote pijkeniers zich meester maken van den pelgrim.
+
+--Van welk geloove zijt gij? vroeg hem de paus.
+
+--Van hetzelfde als mijne hospita, Zeer Heilige Vader, antwoordde
+Uilenspiegel.
+
+De paus ontbood de vrouwe.
+
+--Wat gelooft gij? vroeg hij haar.
+
+--Alles wat Uwe Heiligheid gelooft, antwoordde zij.
+
+--En ik van 's gelijken, sprak Uilenspiegel.
+
+De paus vroeg hem, waarom hij den rug naar het autaar gekeerd had.
+
+--Ik voelde mij onweerdig het te aanschouwen, antwoordde Uilenspiegel
+deemoedig.
+
+--Zijt gij pelgrim? vroeg hem de paus.
+
+--Ja, sprak hij, en 'k kom uit Vlaanderen om vergiffenis voor mijne
+zonden te vragen.
+
+De paus zegende hem en Uilenspiegel ging henen met de weerdin, die
+hem honderd florijnen telde. Met de tassche gevuld, verliet hij Rome
+om naar Vlaanderenland terug te keeren.
+
+Maar zeven dukaten moest hij betalen voor het perkament, op hetwelk
+zijne vergiffenis geschreven stond.
+
+
+
+
+LIV.
+
+Te dien tijde kwamen twee premonstratenzer broeders te Damme aflaten
+verkoopen. Boven hunne monnikspij, droegen zij een schoon fijn hemde,
+met kant bezet.
+
+Aan de deur der kerke, bij helder weder, en onder 't portaal als het
+regenachtig was, hingen zij hun tarief uit; daarin gaven zij voor zes
+duiten, voor een oortje, voor een half pond parisis, voor zeven, voor
+twaalf karolusgulden, honderd, tweehonderd, driehonderd, vierhonderd
+jaar aflaat, en, al naarvolgens de prijzen, halven aflaat en vollen
+aflaat en de vergiffenis voor de afschuwelijkste schelmstukken, ja
+zelfs voor het koesteren van begeerten ten opzichte van de Heilige
+Maagd. Maar dát kostte zeventien gulden.
+
+Aan de klanten die betaalden, stelden zij kleine stukjes perkament
+ter hand, op dewelke het cijfer van de jaren aflaat geschreven was. En
+daaronder stond het opschrift:
+
+
+      Is er iemand die niet en wil zijn
+        Gebraeden ofte geroosterd fijn,
+      Bij duizend jaer in 't vaegevuer,
+    Of in de Helle voor allen duer,
+      Hij coope de aflaten maer
+      De gratiën en de kwijtscheldingen te gaer
+        Voor ietswat geld ende goed:
+      God hem dan het loonen moet.
+
+
+En er kwamen koopers van tien uren in 't ronde.
+
+Een van de goede broeders preekte dikwijls voor het volk; hij had
+roode kaken en een driedubbele kin.
+
+--Ongelukkige! sprak hij, een of anderen zijner toehoorders beziende;
+ongelukkige! daar zijt gij in de helle! Het vuur verbrandt u
+wreedelijk: men legt u te koken in een ketel vol vet, in denwelken
+men oliekoekjes voor Astarte bakt; gij zijt niets meer dan eene worst
+in Lucifer's panne, een hamelbout in die van Gielgirot, den grooten
+duivel, want men snijdt u eerst aan stukken! Zie nu dien grooten
+zondaar, die de aflaten versmaadde; zie dien schotel stoverije: hij
+is 't, hij is 't, zijn goddeloos lichaam, zijn vermaledijd lichaam
+is vaneengekookt tot eene brij. En met welke saus! sulfer, pek en
+teer! En al die arme zondaren worden alzoo opgegeten om opnieuw tot
+hunne smerte in 't leven te komen. En 't is een gedurig geween en
+tandengeknars. Ontferm U onzer, genadige God! Ja, daar ligt gij in de
+helle, arme verdoemde, al die smerten te lijden. Zoo men voor u maar
+éénen denier gaf, dan zoudt gij bereids verlichting aan de rechterhand
+gevoelen; met nog een halven denier bij, waren uwe twee handen uit
+het vuur. Maar de rest van uw lichaam? Voor één gulden slechts, zou
+de dauw des aflaats op u nedervallen. O, verkwikkende koelte! En in
+tien dagen, in honderd dagen, in duizend jaar, al naar gelang dat men
+betaalt, geen gebraad, geen oliekoekje, geen stoverije meer! En als
+'t voor u niet is, zondaar, liggen er soms geen vrienden of magen
+van u, geene gade of geen liefje in de gruwelijke diepte des vuurs?
+
+En dit zeggende, stiet de monnik met den elleboog tegen den broeder,
+die met een zilveren schotel naast hem stond. En op dat teeken sloeg
+de broeder de oogen neer en schudde devotelijk den schotel om het
+geld bij te roepen.
+
+... Hebt gij, vervolgde de monnik, hebt gij in het helsche vuur
+soms geen zoon, geene dochter, geen kindje, dat gij lief hadt? Zij
+schreeuwen, zij weenen, zij roepen U. Zoudt gij doof blijven voor hun
+bange klachte? Dat kunt gij niet; uw hert van ijs gaat smelten, maar
+dat zal u een karolus kosten. En kijk, bij den klank van dien karolus
+op dit verachtelijk metaal ... (de andere monnik schudde nogmaals
+zijn schotel) maakt zich eene ruimte in het vuur, en stijgt de arme
+ziele tot aan den mond van eenen vuurberg. Daar is zij in de versche,
+in de vrije lucht! Waar zijn de smerten des vuurs? De zee is nabij,
+de arme ziele werpt er zich in, zij zwemt op den rug, op den buik, op
+de golven. Hoor, hoe zij schreeuwt van vreugde, zie, hoe zij duikelt
+in 't water! De engelen bezien haar en zijn gelukkig. Zij wachten
+heur, maar zij kan uit het water niet weg, zoo goed, zoo koel is het
+daar. Zij weet niet, de arme ziele, dat daarboven heerlijke geurige
+baden heur wachten, in dewelke groote stukken kandijsuiker drijven,
+en die koel zijn als ijs. Daar komt een haai: zij vreest hem niet. Zij
+klimt op zijnen rug, maar hij voelt heur niet; zij wil met hem in
+'t diepste der zee dringen. Zij gaat er de zeenimfen groeten, die
+waterzooi eten in koralen ketels en versche oesters in perelmoeren
+tellooren. En zij wordt goed ontvangen, onthaald en gevierd; de engelen
+roepen heur altijd omhoog. Gansch verkwikt, gelukkig, begint zij te
+zingen als een leeuwerik en vliegt zij naar 't hoogste der hemelen,
+alwaar God glorierijk op Zijnen troon is gezeten. Zij vindt daar al
+heure vrienden en magen terug, behalve diegenen, die de aflaten en
+Onze Moeder de Heilige Kerke versmaadden en branden in het diepste
+der helle. En dat voor altijd, altijd, altijd, in de eeuwigheid der
+eeuwigheden. Maar de andere ziele, zij is bij den Heere; zij verkwikt
+zich in welriekende baden en knabbelt kandijsuiker. Koopt aflaten,
+mijne broeders: men heeft er tegen alle prijzen, tegen dukaten,
+tegen gouden florijnen, Engelsche sovereings! Kopergeld wordt niet
+versmaad. Koopt! koopt! alhier is de heilige winkel; armen en rijken
+worden gediend, maar krediet geeft men niet, mijne broeders, want
+koopen zonder klinkende munt is eene misdaad in de oogen van den Heer."
+
+De broeder, die niet preekte, rammelde met den schotel. Guldens,
+dukaten, lammeren, oortjes, stuivers en deniers vielen er in als
+hagelsteenen.
+
+Klaas, die nu geld had, betaalde een gulden voor tienduizend jaar
+aflaat. De monniken gaven hem daarvoor een stuksken perkament.
+
+Eindelijk ziende, dat er in Damme niemand overbleef dan de
+hertevreters, die geen aflaten zouden koopen, trokken de beide broeders
+naar Heist.
+
+
+
+
+LV.
+
+Gekleed met zijne pelgrimspij en met eene absolutie in regel op zak,
+verliet Uilenspiegel de heilige stede. Hij ging recht voor zich en
+kwam te Bamberg, waar de smakelijkste groenten der wereld zijn.
+
+Hij kwam in eene afspanning, waar een vroolijke weerdinne hem vroeg:
+
+--Jonge meester, wilt gij eten voor uw geld?
+
+--Ja, sprak Uilenspiegel. Maar voor hoeveel eet men hier?
+
+De hospita sprak:
+
+--Aan de tafel der heeren eet men voor zes gulden; aan de tafel der
+poorters voor vier, en aan de huistafel voor twee.
+
+--Hoe meer, hoe liever! antwoordde Uilenspiegel.
+
+Hij ging dus aan de tafel der heeren zitten. Als hij wel zijne bekomst
+en zijn maal met Rijnwijn begoten had, sprak hij tot de weerdin:
+
+--Bazin, ik heb goed gegeten voor mijn geld: geef mij mijne zes gulden.
+
+De weerdinne sprak:
+
+--'t Is om te lachen, zeker! Betaal mij maar gauw!
+
+--Liefste bazinne, antwoordde Uilenspiegel, gij ziet er geen slechte
+betaalster uit; integendeel, gij ziet er zoo eerlijk, zoo rechtschapen
+uit, dat gij mij nog liever achttien gulden zoudt geven, dan mij de
+zes te weigeren die gij mij schuldig zijt. Wat schoone oogen! 't is
+de zonne, die mij bestraalt, die mijne liefde hooger doet schieten dan
+'t hondsgras in een verlaten kluis.
+
+De weerdinne sprak:
+
+--Ik heb geen zaken noch met uwe liefde noch met uw hondsgras, betaal
+mij en trek op!
+
+--Optrekken, sprak Uilenspiegel, en u niet meer zien. 'k Zei nog
+liever vaarwel aan 't leven. Bazinne, zoete bazinne, ik, arme pelgrim,
+pleeg niet voor zes gulden te eten; ik heb mij vol gepropt en straks
+laat ik de tong hangen als een hond in de zonne: wil mij betalen, ik
+verdiende eerlijk de zes gulden door het lastige werk mijner tanden;
+geef ze mij, en 'k zal u streelen, u zoenen, u kussen, met meer vuur
+dan wel zeven en twintig minnaars te zamen.
+
+--Zoo spreekt gij voor 't geld, antwoordde zij.
+
+--Moet ik u voor niets opeten? vroeg hij.
+
+--Neen, sprak zij, hem afwerend.
+
+--Ah! zuchtte hij, steeds naderend, uwe huid is als room zoo zacht,
+uw haar als gebraden fazant, en uwe lippen als rijpe kersen! Maar
+zijn er lekkerder kersen dan gij?
+
+--Ik vind het goed, leelijke stouterik, sprak zij glimlachend, mij op
+den koop toe nog zes gulden te vragen! Wees tevreden dat ik u eten gaf,
+zonder betaling te eischen.
+
+--Wist gij, sprak Uilenspiegel, hoeveel plaats er nog is!
+
+--Vertrek, sprak de hospita, eer mijn man komt!
+
+--Zie, sprak Uilenspiegel, ik zal een redelijke schuldeischer zijn,
+geef mij slechts één gulden voor den dorst, die zal komen.
+
+--Daar, stouterik, sprak zij.
+
+En zij gaf hem een gulden.
+
+--Mag ik nog terugkomen? vroeg Uilenspiegel.
+
+--Wilt gij wel heengaan! sprak zij.
+
+--Wél heengaan, zei Uilenspiegel, dat ware naar u toe gaan, maar 't
+is een slecht heengaan, die schoone oogen te moeten verlaten. Als ge
+mij wilt houden, zal ik alle dagen maar voor één gulden eten....
+
+--Moet ik een stok nemen?
+
+--Wilt gij den mijnen? antwoordde Uilenspiegel.
+
+Zij lachte, maar hij moest henengaan.
+
+
+
+
+LVI.
+
+Rond dien tijd kwam Lamme Goedzak weder te Damme wonen, mits het land
+van Luik niet meer rustig was, ter oorzake van de ketterij. Zijne
+vrouw kwam volgeerne mede, omdat de Luikenaars, spotters van nature,
+lachten met Lamme's lamlendigheid.
+
+Lamme ging dikwijls bij Klaas, die sedert hij geërfd had, veel in de
+taveerne den Blauwen Toren verbleef, alwaar hij eene tafel gekozen had
+voor zich zelven en zijne gezellen. Aan de naburige tafel zat een man
+profijtelijk zijn kapperken te drinken; 't was Judocus Grijpstuiver,
+de gierige deken der vischverkoopers, die niets dan haring at en
+meer van zijn geld hield dan van zijner ziele zaligheid. Klaas droeg
+in zijn tassche het stuk perkament, op hetwelk zijn aflaat van tien
+duizend jaar geschreven stond.
+
+Op een avond dat hij met Lamme Goedzak, Jan van Roosebeke en Mathijs
+van Assche in den Blauwen Toren zat, en Judocus Grijpstuiver er ook
+was, ging Klaas lustig aan 't drinken; Jan van Roosebeke zegde tot hem:
+
+--'t Is zonde Gods van zoo te drinken!
+
+Klaas antwoordde:
+
+--Voor elk pintje te veel brandt men maar een halven dag. En 'k heb
+tienduizend jaar aflaat in mijn tassche. Wie wil er honderd jaar,
+om zonder vrees voor de pijnen der hel, den god Bacchus te dienen?
+
+Allen riepen:
+
+--Hoeveel vraagt gij er voor?
+
+--Eene pinte, antwoordde Klaas, maar honderd vijftig jaar geef ik
+voor eene portie konijn.
+
+En een ieder kwam bij en betaalde aan Klaas pinten, kuite en
+muskens, hesp en konijn, en voor een ieder sneed hij een stuksken
+perkament. Doch 't was niet Klaas die alles at en dronk, maar wel
+Lamme Goedzak, dewelke at dat hij oogenschijnlijk opzwol, terwijl
+Klaas met zijne waar de taveerne rondging.
+
+Grijpstuiver keerde zijn schrokkig gezicht naar hem.
+
+--Kunt gij tien dagen missen? vroeg hij.
+
+--Neen, antwoordde Klaas, dat is moeilijk om passen.
+
+Iedereen lachte, en Grijpstuiver kropte zijne woede op.
+
+Toen trok Klaas naar zijne hut, gevolgd door Lamme, die stapte alsof
+hij wollen beenen aan zijn lijf had.
+
+
+
+
+LVII.
+
+Rond het einde van heur derde jaar ballingschap, keerde Katelijne te
+Damme terug naar heur huis. En gedurig sprak zij uitzinnig: "Vuur op
+het hoofd, de ziele klopt, maakt een gat, zij wil er uit". En altijd
+vluchtte zij weg, bij het zien van ossen en schapen. En zij zette
+zich neer op de bank onder de linden achter heure hut, en schudde
+het hoofd, terwijl zij, zonder ze te herkennen, die van Damme bekeek,
+dewelke tot elkander lispten: "Daar is de zottinne".
+
+Doch reizend over velden en wegen, zag Uilenspiegel een ezel, getuigd
+met leder en koperen nagelen, en den kop versierd met roodwollen
+kwasten en kwispels.
+
+Eenige oude wijven stonden rond den ezel en zeiden, allen te gelijk
+sprekend: "Niemand mag hem vastnemen; 't is het afgrijselijke rijbeest
+van den grooten toovenaar, den baron von Raiz, die levend verbrand
+werd, om acht kinderen aan den duivel geofferd te hebben.--Zoo rap is
+hij gevlucht, dat niemand hem krijgen kon; Satan houdt de hand boven
+zijnen kop.--Want terwijl hij, vermoeid op den weg, een oogenblik
+stilstond om adem te halen, zijn de stadsserjanten gekomen om hem te
+pakken, maar hij balkte en sloeg zoo geweldig met zijne achterpooten,
+dat zij niet naderen dorsten.--En 't is niet 't gebalk van een ezel,
+maar 't gebalk van een duivel.--Men heeft hem dus distelen laten
+eten zonder hem voor de vierschaar te dagen of als toovenaar levend
+te branden?--Die mannen, die mannen, zij hebben geen greintje moed
+in hun lijf".
+
+Niettegenstaande al deze schoone reden, namen allen schreeuwend de
+vlucht, zoodra de ezel de ooren spitste of met den steert zijne zijden
+sloeg; en tienmaal kwamen zij aldus nader al kakelend en snaterend,
+om tienmaal weder de vlucht te nemen.
+
+Maar Uilenspiegel zag haar van verre en sprak lachend tot zich zelven:
+
+--Zie ze parlesanten! Hoe ouder ze zijn, hoe meer ze babbelen: de
+jongeren zitten meer met minnarijen in 't hoofd.
+
+Den ezel beziende, ging hij voort:
+
+--Dat betooverde grauwtje staat goed op zijne pooten, dunkt mij;
+ik ga het ergens berijden of verkoopen.
+
+Zonder een woord te spreken, kocht hij een maatje haver, hetwelk
+hij den ezel vóór zette. Hij sprong vervolgens gezwind op den rug
+van het dier, nam den teugel vast, keerde zich naar het Noorden,
+het Oosten en het Westen en zegende de oude wijven. Dezen, van schrik
+bevangen, vielen op de knieën, en 's avonds vertelden zij aan den hoek
+van den heerd, dat een engel verschenen was met een vilten hoed met
+fazanteveeren en heur allen gezegend had en dat hij, door bijzondere
+gunste van God, weggereden was op den ezel des toovenaars.
+
+En Uilenspiegel ging met zijn ezel te midden van malsche beemden, waar
+peerden huppelden, en koeien en veerzen loom in de zonne herkauwden.
+
+En hij heette hem Jef.
+
+De ezel was blijven staan en deed zich deugd aan de distelen. Somwijlen
+nochtans, huiverde hij over gansch zijne huid en sloeg hij met den
+steert op zijne zijden om de vraatzuchtige horzels te verdrijven die,
+evenals hij, wilden eten, doch van zijn vleesch en zijn bloed.
+
+Uilenspiegel, wiens maag naar eten riep, was weemoedig en sprak:
+
+--Gij zoudt wel gelukkig zijn, mijnheer de ezel, zoo gij kondt blijven
+smullen zonder dat iemand u stoort en u herinneren komt dat gij
+sterfelijk zijt, dat wil zeggen geboren om te lijden en te verduren.
+
+... Evenals gij, vervolgde hij, heeft de man met de Heilige Muil zijne
+horzel en dat is mijnheer Luther; en Zijne Genadige Majesteit Karel
+heeft ook de zijne, dat is messire Frans de eerste, de koning met
+zijn langen neus en zijn nog langeren degen. Ik, arme zwerveling,
+mag dus ook mijne horzel wel hebben, mijnheer de ezel. Laas! in
+al mijne zakken zijn gaten, en langs de gaten schaveelen dukaten,
+guldens en daalders, gelijk een legioen muizen die vluchten voor den
+klauw eener kat. Ik weet niet waarom het geld van mij niet houdt,
+ik houde nochtans zooveel van het geld. 't Is eene leugen, dat de
+Fortuin eene vrouw is, want zij bemint maar de oude gierigaards, die
+haar vrekkig sluiten in kisten, in koffers, in zakken, en haar nooit
+met het tipje van heur gouden neusje aan 't venster laten komen. Dat
+is de horzel die mij bijt en mij knaagt, die mij kittelt zonder mij
+te doen lachen. Maar gij luistert niet, mijnheer de ezel, gij denkt
+maar aan eten. Ha! buikvuller, uwe lange ooren blijven doof voor den
+kreet mijner ledige maag. Aanhoor mij, ik wil het!
+
+En hij zweepte hem. De ezel begon te balken.
+
+--Laat ons gaan, nu gij gezongen hebt, sprak Uilenspiegel.
+
+Maar de ezel verroerde zich niet meer dan een paal en scheen van zins
+al die distelen van den weg tot de laatste naar binnen te jagen. En
+hij sloeg er geen enkele over.
+
+Dat ziende, steeg Uilenspiegel af; hij sneed een bussel distelen,
+stak die onder den bek van den ezel en mende dezen bij den neus tot
+op het grondgebied van den landgraaf van Hessen.
+
+--Mijnheer de ezel, sprak Uilenspiegel onderweg, gij loopt achter
+mijn bos distelen en versmaadt de lekkere planten waarmede de lange
+weg volstaat. Gij zijt lijk de mannen die loopen achter eenen bos
+roem, eenen bos gewin, eenen bos liefde, dien de Geluksgodin onder
+hunnen neus steekt. Op het einde van den weg zien zij, gelijk gij,
+dat de nagejaagde buit weinig weerde heeft, terwijl zij onderweg èn
+rust èn werk èn gezondheid lieten.
+
+Aldus met zijn ezel klappend, bereikte Uilenspiegel het kasteel van
+den landgraaf.
+
+Twee kapiteins der boogschutters speelden op de trap met dobbelsteenen.
+
+Een hunner, ros van haar en groot van gestalte, bezag Uilenspiegel,
+die zediglijk op Jef zat en hen aankeek.
+
+--Wat wilt gij, met uwe hongerige en reizende tronie? sprak hij.
+
+--'k Heb inderdaad honger, antwoordde Uilenspiegel, en reize geenszins
+voor mijn vermaak.
+
+--Zoo gij honger hebt, sprak de kapitein, kunt gij met den hals de
+koorde opeten, die zwiert aan de eerste galge die gij ontmoet.
+
+--Heer kapitein, antwoordde Uilenspiegel, als gij mij de schoone gouden
+koorde geeft die rond uwen hoed ligt, zal ik mij met de tanden gaan
+ophangen aan die vette hesp, die ginder bij dien spekslachter zwiert.
+
+--Van waar komt gij? vroeg de kapitein.
+
+--Uit Vlaanderen, was 't antwoord van Uilenspiegel.
+
+--Wat wilt gij?
+
+--Aan Zijne Landgrafelijke Hoogheid eene schilderij van mijne hand
+toonen.
+
+--Kom binnen, als gij een schilder en van Vlaanderen zijt, sprak de
+kapitein, ik zal u bij mijnen meester brengen.
+
+Toen Uilenspiegel bij den landgraaf was, groette hij hem drie reizen
+en nog meer.
+
+--Uwe Hoogheid, sprak hij, verweerdige mij aan zijne edele voeten eene
+schilderij neder te leggen, die ik voor hem maakte, en op dewelke
+ik het konterfeitsel verbeeldde van de Allerheiligste Maagd Maria,
+in haren vorstelijken dos.
+
+... Die schilderij zal misschien de eer hebben Uwe Hoogheid te
+bevallen, vervolgde hij, in welk geval ik mij vermete te hopen het
+ambt te verkrijgen van schilder Uwer Grootmoedigheid.
+
+De landgraaf bezag het doek, dat goed gemaald was, en sprak:
+
+--Gij zult onze schilder zijn; neem plaats in dien zetel.
+
+En Uilenspiegel kuste hem op beide wangen en nam plaats in den zetel.
+
+--Gij ziet er niet rijk uit, sprak de landgraaf.
+
+Uilenspiegel antwoordde:
+
+--Inderdaad sire; Jef, mijn ezel kon distelen eten, doch drie dagen
+reeds leef ik van ellende en eet ik rook van hope.
+
+--Straks krijgt gij beters, sprak de landgraaf lachend, maar waar is
+uw ezel?
+
+Uilenspiegel antwoordde:
+
+--Ik liet hem op de Groote Markt, rechtover 't kasteel Uwer Genade;
+ik ware gelukkig zoo Jef dezen nacht op stal was.
+
+De edele landgraaf gebood dadelijk aan een zijner schildknapen den
+ezel van Uilenspiegel als zijn eigen beest te behandelen.
+
+Weldra kwam het uur des avondmaals, dat een recht festijn was. En de
+spijzen rookten op tafel, en de wijn liep als een stroom door de kelen.
+
+Uilenspiegel en de landgraaf werden zoo rood als hanen. Uilenspiegel
+was vol vreugd, maar de landgraaf bleef nadenkend.
+
+--Schilder, sprak hij eensklaps, gij zult mijn portret moeten maken,
+want 't is een groote voldoening voor een sterfelijken vorst, aan
+zijne nazaten de geheugenis zijner trekken te laten.
+
+--Sire, antwoordde Uilenspiegel, uw wensch is mijn wil, maar 't
+schijnt mij, nietsweerdige, dat uwe Edelheid in de toekomende eeuwen
+niet veel genoegen zal smaken, zoo alleene op het doek te staan. Hij
+moet vergezelschapt wezen door zijne adellijke gemalinne, mevrouw de
+Landgravin, door zijne edelvrouwen en heeren, door zijne dapperste
+kapiteins, te midden waarvan zijne Hoogheid en Mevrouwe schitteren
+zullen als twee zonnen te midden van lanteernen.
+
+--Inderdaad, antwoordde de landgraaf, en wat moet ik u betalen voor
+dat groot kunstwerk?
+
+--Honderd gulden op voorhand of anderszins, antwoordde Uilenspiegel.
+
+--Hier zijn ze vooraf, sprak de edele landgraaf.
+
+--Allergenadigste heer, hernam Uilenspiegel, gij giet olie in mijne
+lamp, ze zal branden te uwer eere.
+
+'s Anderen daags vroeg hij aan den landgraaf de hovelingen vóór
+hem te doen komen, welke de eer hadden hem op het doek te mogen
+vergezelschappen.
+
+Toen kwam de hertog van Luneburg, hoofdman der landsknechten in dienst
+van den landgraaf. 't Was een dikke vent, die verging in zijn vet. Hij
+naderde Uilenspiegel en fluisterde hem deze woorden in 't oor:
+
+--Als gij mij op de schilderij de helft van mijnen buik niet afneemt,
+laat ik u opknoopen door mijne soldaten.
+
+En de hertog ging voort.
+
+Toen kwam een lange dame, die een bochel op den rug had, terwijl haar
+borst plat was als het zwaard der wrekende gerechtigheid.
+
+--Heer schilder, sprak zij, als gij mij langs voren geen twee bochels
+geeft, in stee van éénen langs achteren, doe ik u als giftmenger
+vierendeelen.
+
+En de hofdame ging voort.
+
+Vervolgens kwam een jonge eerejuffer die blond, frisch en lieftallig
+was, doch drie tanden miste in de bovenste rij.
+
+--Heer schilder, sprak zij, als ge mij lachen doet en niet al mijne
+tanden laat zien, doe ik u in stukskens kappen door mijn minnaar,
+die daar staat.
+
+En zij wees naar den kapitein van de boogschutters die den dag te
+voren op de trappen van het paleis met de dobbelsteenen speelde;
+daarop ging zij voort.
+
+En allen gingen aldus hem voorbij; ten slotte bleef Uilenspiegel
+alleen met den edelen landgraaf.
+
+--Als gij het ongeluk hebt, sprak de edele landgraaf, alle die lieden
+niet trouwelijk uit te schilderen, laat ik u het hoofd afkappen.
+
+--Zonder hoofd, dacht Uilenspiegel, gevierendeeld, in stukskens
+gekapt of voor het minste gehangen, zal het veel voorzichtiger zijn,
+niemand te schilderen. Ik zal er over nadenken.
+
+--Waar is de zaal op welker muren ik al die doorluchtige lieden moet
+malen? vroeg Uilenspiegel aan den landgraaf.
+
+--Volg mij, sprak de landgraaf.
+
+En hij bracht hem naar een ruime kamer met groote witte muren.
+
+--Hier is zij, sprak hij.
+
+--Het ware goed, zei Uilenspiegel, dat men vóór die muren groote
+gordijnen hing, om mijn schilderwerk te behoeden voor stof en voor
+de beleediging der vliegen.
+
+--Dat zal geschieden, sprak de edele landgraaf.
+
+Toen de gordijnen hingen, vroeg Uilenspiegel drie leerjongens, om
+zijne verven te malen, naar hij zeide.
+
+Dertig dagen lang gastreerden Uilenspiegel en de leerjongens en lieten
+zij zich de fijne vleezen en de oude wijnen goed smaken. De landgraaf
+zorgde voor alles.
+
+Doch den een en dertigsten dag stak hij zijn neus in de kamer, alwaar
+Uilenspiegel gezegd had, dat niemand mocht binnenkomen.
+
+--Hewel, Thijl, sprak hij, waar zijn de portretten?
+
+--Ze zijn verre, antwoordde Uilenspiegel.
+
+--Mag ik ze zien?
+
+--Nog niet.
+
+Den zes en dertigsten kwam hij weer met zijn neus voor de deur.
+
+--Hewel, Thijl? vroeg hij.
+
+--Edele landgraaf, zij gaan op hun laatste.
+
+Den zestigsten dag maakte de landgraaf zich kwaad en, de kamer
+binnentredend, sprak hij:
+
+--Op staanden voet gaat gij mij het schilderwerk toonen.
+
+--Ja, geduchte heer, sprak Uilenspiegel, maar gelief het gordijn niet
+te openen, alvorens de kapiteins en de edelvrouwen van uw hof hier
+binnen te roepen.
+
+--Dat zij komen, sprak de edele landgraaf.
+
+Op dit bevel traden allen binnen.
+
+Uilenspiegel stond voor het dichtgesloten gordijn.
+
+--Doorluchtige Landgraaf, sprak hij, en gij, mevrouwe de Landgravinne,
+en gij, hertog van Luneburg, en gij allen, schoone damen en
+dappere kapiteins, achter dit gordijn heb ik, op mijn beste, uw
+lieve of krijgshaftige gezichten geschilderd. Een iegelijk zal zich
+dadelijk herkennen. Gij zijt nieuwsgierig uw konterfeitsel te zien;
+'t is redelijk, doch verweerdigt u geduld te nemen en laat mij nog
+een woord of vijf zeggen. Gij, schoone damen en dappere kapiteins,
+die allen van edelen bloede zijt, kunt mijn schilderwerk zien en
+bewonderen, maar mocht onder u zich iemand bevinden van onadellijk
+bloed, niets zou hij zien dan een witten muur. En nu, verweerdigt U
+uwe doorluchtige oogen te openen.
+
+Uilenspiegel schoof het gordijn weg.
+
+--Alleen de edelen kunnen iets zien; lieden van gemeene afkomst
+blijven blind voor dit kunststuk.
+
+Al de hovelingen sperden de oogen open, gebaarden in bewondering
+te staan, zich zelven en anderen wederzijds te herkennen, doch in
+werkelijkheid zagen zij niets dan een naakten muur, hetwelk hen
+gansch onthutste.
+
+Doch de nar die aanwezig was, sprong drie voet hoog, en, zijn
+narrenstok zwaaiend, sprak hij:
+
+--Men mag mij uitmaken voor boer, en daarenboven voor schurk, voor
+deugniet, maar 'k zal het roepen en schreeuwen van de daken, dat ik
+daar een witte muur, een naakten muur, een blooten muur voor mijnen
+neus heb! Zoo helpe mij God en alle zijne santen.
+
+Uilenspiegel sprak:
+
+--Als de zotten spreken, is 't tijd dat de wijzen optrekken.
+
+Hij wilde het paleis verlaten, als de landgraaf hem tegenhield.
+
+--Snaak, sprak hij, die overal gaat en komt om het schoone en goede
+te prijzen en luidkeels te spotten met de dwaasheid; gij, die in
+tegenwoordigheid van zooveel grooten der aarde, als man uit het volk,
+zoo onbermhertig dorst spotten met hunne blazoenen en voorrechten,
+gij zult eens gehangen worden om uw stoute tong.
+
+--Als de koord van goud is, antwoordde Uilenspiegel, zal zij breken
+van schrik als ze mij ziet komen.
+
+--Daar, sprak de landgraaf, hem vijftien gulden in de hand stoppend,
+zie hier een stukje van de koorde!
+
+--Hertelijk dank, genadige heer, antwoordde Uilenspiegel, elke
+afspanning van den weg krijgt er een vezel van, een gouden vezel,
+die al die dieven van weerden tot rijkaards maakt.
+
+En hij sprong op den ezel en reed weg, met zijn hoedeken fier naar
+omhoog.
+
+
+
+
+LVIII.
+
+De bladeren verdorden op de boomen en de Octoberwind begon te
+waaien. Soms was Katelijne gedurende eenige uren bij heur verstand. En
+Klaas zei dan dat de geest Gods heur in zijne zoete ontferming kwam
+bezoeken. In die oogenblikken had zij de macht, door woorden en
+gebaren, Nele te betooveren en dan zag het meisje, meer dan honderd
+uren verder, alles wat omging op pleinen, in straten of in huizen.
+
+Op een dag dat Katelijne bij heure zinnen was en oliekoeken at, wel
+begoten met dobbele kuite, in gezelschap van Klaas, van Soetkin en
+Nele, sprak Klaas:
+
+--'t Is heden de troonafstand van Zijne Heilige Majesteit keizer
+Karel. Zeg, Nele, liefste, zoudt gij tot Brussel, in Brabant,
+kunnen zien?
+
+--Ja, zoo Katelijne wil, antwoordde Nele.
+
+Katelijne deed het meisje op eene bank zitten en betooverde heur door
+woorden en teekenen, en Nele viel zachtjes in slaap.
+
+Katelijne zegde heur:
+
+--Ga in het kleine huis omtrent de Warande, het geliefkoosd verblijf
+van keizer Karel.
+
+--Ik ben, sprak Nele stille, in een kleine kamer, groen
+geschilderd. Daar zit een man van vier en vijftig jaar, grijs en kaal,
+met blonden baard op een vooruitstekende kin, met onheilspellenden
+blik in zijne sluwe, wreede en listige oogen. Dien man heet men
+Heilige Majesteit. Hij is aamborstig en hoest. Naast hem zit nog
+een man, jonger, met een afschuwelijk gelaat gelijk een aap met een
+waterhoofd. Ik zag hem te Antwerpen, 't is koning Philippus. Zijne
+Heilige Majesteit verwijt hem, dat hij zeker weer bij eene of andere
+slet in eene kroeg van de benedenstad uitgeslapen heeft. Hij zegt hem
+dat zijn haar naar de taveerne riekt, en dit geen vermaak is voor een
+koning die te kiezen heeft tusschen de aanbiddelijkste vrouwen met
+satijnen huid, die uit geurige baden komen, wat beter is, zegt hij,
+dan een vuile smots die met moeite uit de armen komt van een dronken
+soldaat. Geene vrouw, onder de schoonsten en edelsten, 't zij maagd,
+gehuwd of weduw, zegt hij hem, zou hem willen wederstaan; trotsch
+zouden zij heure minnarijen verlichten met den gloed van wierookvaten,
+in stee van het walmende licht eener stinkende vetkeers.
+
+De koning antwoordt Zijne Heilige Majesteit, dat hij hem in alles
+gehoorzaam zal wezen. Ik zie dat Zijne Heilige Majesteit een hoestbui
+krijgt en eenige slokken kruidenwijn drinkt.
+
+Hij zegt tot Philippus: Aanstonds zullen voor Ons verschijnen de
+Staten-Generaal, prelaten, edelen en poorters: Oranje de Zwijger,
+Egmond de IJdele, Hoorn de Onbeminde, Brederode de Leeuw en
+allen die van het Gulden Vlies, van hetwelk ik u grootmeester zal
+maken. Honderden liefhebbers voor dat speelgoed zult gij zien die
+zich den neus zouden laten afsnijden, zoo zij het op den borst aan
+een gouden ketting mochten dragen, tot teeken van hoogen adel.
+
+Op jammerenden toon vervolgt Zijne Heilige Majesteit tot koning
+Philippus: Gij weet mijn zoon, dat ik te uwen voordeele afstand doe,
+aan de wereld een grootsch schouwspel ga geven, en voor eene groote
+menigte spreken zal, hikkend en hoestend,--want wederom heb ik te
+veel gegeten, mijn zoon,--en gij zoudt een steenen hert moeten hebben,
+zoo gij, na mij aanhoord te hebben, niet eenige tranen wildet storten.
+
+--Ik zal weenen, vader, antwoord koning Philippus.
+
+Vervolgens spreekt Zijne Heilige Majesteit tot zijn dienstknecht
+Dubois.
+
+--Dubois, zegt hij, geef mij een stukje suiker met Madeira: ik heb den
+hik. Als mij dat maar niet overkomt terwijl ik het woord voer. Zal
+die gans van gisteren dan nooit zakken? Als ik een beker wijn van
+Orléans dronk? Neen, die is te hard. Als ik eenige ansjovisjes at? Ze
+zijn zoo vettig. Dubois, geef mij een glas Romagne-wijn.
+
+Dubois geeft aan Zijne Heilige Majesteit wat hij vraagt; vervolgens
+doet men hem een karmozijnpannen kleed en een gouden mantel aan;
+men gordt een zweerd om zijne lenden; in zijne handen steekt men den
+schepter en den wereldbol, op zijn hoofd zet men de krone.
+
+Zijne Heilige Majesteit treedt uit het huis der Waranda, gezeten op een
+muilezel en gevolgd door koning Philippus en hooge personages. Zij gaan
+naar een groot gebouw, dat zij het Paleis heeten, en vinden daar in een
+kamer een rijkgekleeden, grooten mageren man, dien zij Oranje noemen.
+
+Zijne heilige Majesteit spreekt dien man aan en zegt:
+
+--Zie ik er goed uit, neef Willem?
+
+--Maar de man geeft geen antwoord.
+
+Daarop zegt Zijne Heilige Majesteit--half lachend, half grammoedig:
+
+--Neef, zult gij dan altijd zwijgen, zelfs om aan een oude pruik de
+waarheid te zeggen? Moet ik nog regeeren of moet ik afstand doen,
+Zwijger?
+
+--Heilige Majesteit, antwoordt de magere man, als de winter daar is,
+laten de sterkste eiken hunne bladeren vallen.
+
+Drie uren slaat de klok.
+
+--Zwijger, zegt hij, leen mij uwen schouder, dat ik er op leune.
+
+En Zijne Majesteit gaat met hem en zijn gevolg een groote zaal binnen,
+zet zich neder onder een verhemelte, behangen met karmozijnzijde. Daar
+zijn drie stoelen. Zijne Heilige Majesteit neemt den middelste,
+die schooner en hooger is dan de andere en waarop een keizerlijke
+kroon prijkt; koning Philippus neemt den tweede, en de derde is voor
+eene vrouwe, ongetwijfeld eene koningin. Rechts en links zitten,
+op gestoffeerde banken, mannen in 't rood gekleed, die om den hals
+een gulden schaap dragen. Achter hen staan meerdere personages, die
+zeker heeren en prinsen zijn. Rechtover Zijne Heilige Majesteit,
+een paar treden lager, zitten in laken gekleede mannen op houten
+banken. Ik hoor hen zeggen dat zij zoo zediglijk gekleed en gezeten
+zijn, omdat zij alleen alle lasten betalen. Iedereen is rechtgestaan
+als Zijne Heilige Majesteit binnenkwam, doch weldra zette hij zich
+neer en deed hij iedereen teeken hetzelfde te doen.
+
+Langen tijd spreekt hij over het jicht, daarna overhandigt de vrouw,
+die eene koningin schijnt te wezen, Zijne Heilige Majesteit eene rol
+perkament, waarop dingen geschreven staan die Zijne Heilige Majesteit
+hoestend en met zwakke stemme afleest:
+
+--Ik heb menigvuldige reizen gedaan in Spanje, in Italië, in de
+Nederlanden, in Engeland en in Afrika, dit alles voor de glorie Gods,
+den roem mijner wapenen en het welzijn mijner volkeren.
+
+Ten slotte zegt hij dat hij zwak en vermoeid is, en dat hij de kroon
+van Spanje, de graafschappen, hertogdommen, heerlijkheden van deze
+landen wil leggen in de handen van zijnen zoon Philippus.
+
+Hij weent en allen weenen mede.
+
+Nu staat koning Philippus recht en, op de knieën vallend, roept
+hij uit:
+
+--Heilige Majesteit, is het mij toegelaten die krone uit uwe handen
+te ontvangen, terwijl gij nog zoo bekwaam zijt die met eere te dragen?
+
+Zijne Heilige Majesteit fluistert hem toe een welwillende aanspraak
+te houden tot de mannen, die op de gestoffeerde banken zitten.
+
+Koning Philippus keert zich naar hen en zegt op gemelijken toon,
+zonder recht te staan:
+
+--Ik ken tamelijk goed Fransch, doch niet genoeg om het woord tot
+ulieden te richten. Gij zult hooren wat de bisschop van Atrecht,
+mijnheer Granvelle, u mijnentwege zal zeggen.
+
+--Slecht geproken, mijn zoon, lispt Zijne Heilige Majesteit.
+
+En inderdaad, de vergadering mompelt, als zij den jongen koning zoo
+fier en zoo trotsch ziet. De vrouwe, die de koningin is, spreekt mede
+zijnen lof; nu komt de beurt aan een ouden doctor en als deze gesproken
+heeft, geeft Zijne Heilige Majesteit een teeken van dankzegging. Als
+die aanspraken en plechtigheden gedaan zijn, verklaart Zijne Heilige
+Majesteit zijne onderzaten ontslagen van hunnen eed van getrouwheid;
+hij teekent de akten, stapt van zijnen troon en doet er Philippus op
+plaats nemen. En iedereen weent. Vervolgens trekken zij terug naar
+het huis der Warande.
+
+Daar zijn zij weder getweeën in de groene kamer; zijne Heilige
+Majesteit schaterlacht en zegt tot koning Philippus, die niet lacht:
+
+--Hebt gij gezien hoe gauw men met spreken, hikken en lachen die
+menschen verteedert? Wat tranenvloed! En die dikke Maes die, op 't
+einde zijner aanspraak, begon te weenen gelijk een kind. Gij zelf
+scheent ontroerd, doch niet genoegzaam. Dat zijn de vertooningen die
+'t volk moet hebben. Wij mannen, hebben die minnaressen 't liefst,
+die ons 't duurst kosten. En zoo ook is het volk. Hoe meer wij
+ze doen betalen, hoe liever ze ons zien. In Duitschland duldde ik
+den hervormden eeredienst, dien ik in de Nederlanden strengelijk
+strafte. Als de prinsen van Duitschland katholiek geweest waren, dan
+ware ik Lutheraan geworden om hunne goederen verbeurd te verklaren. Zij
+denken dat mijn ijver voor 't Roomsch geloove oprecht is, en 't spijt
+hun dat ik hen verlaat. Door mijn toedoen zijn, in de Nederlanden,
+uit hoofde van ketterije, vijftig duizend hunner dapperste mannen en
+bevalligste meidekens om hals gebracht. Zonder de verbeurdverklaringen
+te rekenen, deed ik hun meer schattingen en beden betalen dan Indië
+en Peru samen: zij zijn droef mij te verliezen. Ik heb den vrede van
+Cadzand gescheurd, Gent, de fiere stad, getemd, uit den weg geruimd wat
+mij hinderen kon; vrijheden, keuren en privileges, alles is onderworpen
+aan 't gezag van de keizerlijke ambtenaren. Die goede menschen wanen
+zich vrij, omdat ik hun toelaat boogschietingen te houden en hunne
+gildevaandels plechtiglijk door de straten te dragen. Zij voelen mijn
+meesterschap; in eene kevie gestoken, bevinden zij er zich goed: zij
+zingen en betreuren mij. Mijn zoon, wees met hen, lijk ik het was:
+zoet van woorden, ruw van daden; geef likjes zoolang gij niet bijten
+moet. Zweer, zweer altijd op hunne vrijheden, keuren en privileges,
+doch vernietig ze, zoodra ze u een gevaar kunnen worden. IJzer zijn
+zij, als men ze met schuchtere handen aanraakt, glas als men ze met
+een sterken arm breekt. Bestrijd de ketterije, niet om haar verschil
+met den Roomschen godsdienst, maar omdat zij, in de Nederlanden,
+eindigen zou met ons gezag te vernielen; zij die den Paus met zijne
+drie kronen aanvallen, zouden gauw gedaan krijgen met vorsten die er
+maar ééne dragen. Maak als ik van de vrijheid van geweten eene daad
+van majesteitsschennis, met verbeurte van goederen, en gij zult erven,
+gelijk ik heel mijn leven geërfd heb; en als gij hen zult verlaten
+om afstand te doen of te sterven, zullen zij zeggen: Heil! de goede
+vorst! En zij zullen weenen!
+
+--En ik hoore niets meer, vervolgde Nele; Zijne Heilige Majesteit is
+op een praalbed gaan liggen en slaapt, en koning Philippus, trotsch
+en vermetel, staart hem koel en liefdeloos aan.
+
+Op die woorden werd Nele gewekt door Katelijne.
+
+En Klaas bleef, in gedachten verslonden, kijken naar de vlam die in
+den heerd flikkerde.
+
+
+
+
+LIX.
+
+Uilenspiegel verliet den landgraaf van Hessen en besteeg zijn
+ezel. Toen hij over de Groote Markt reed, zag hij verbolgen gezichten
+van eenige heeren en damen, maar dat deerde hem niet.
+
+Weldra kwam hij op het grondgebied van den hertog van Luneburg en
+ontmoette daar een troep Smadelijke Broeders, lustige Vlamingen van
+Sluis, die alle Zaterdagen geld uitlegden om eens per jaar eene reize
+in Duitschland te doen.
+
+Zij zaten in een open wagen, bespannen met een kloek peerd uit het
+Veurne--Ambacht, en zoo reden zij zingend en juichend door de wegen
+en sompen van het hertogdom Luneburg. Er waren er die op de pijp,
+de schalmeie, den vedel, den doedelzak speelden, en dat alles maakte
+groot lawaai. Naast den wagen liep veeltijds een dikzak die op een
+rommelpot speelde, in de hope wat te vermageren.
+
+Zij waren aan hun laatsten gulden; als zij Uilenspiegel
+zagen komen, riepen zij hem eene afspanning binnen om hem te
+trakteeren. Uilenspiegel nam gereedelijk aan. Daar hij zag dat de
+Smadelijke Broeders tot elkaar knipoogden en heimelijk lachten,
+terwijl zij hem inschonken, begreep hij dat men hem eene poets wilde
+bakken. Hij ging buiten, doch bleef aan de deur luisteren. Hij hoorde
+den dikzak zeggen:
+
+--'t Is de schilder van den landgraaf, die hem meer dan duizend gulden
+gaf om zijn portret te maken. Onthalen wij hem op bier en op wijn,
+en hij zal dobbel en dik tegenbetalen.
+
+--Amen, zegden de anderen.
+
+Uilenspiegel zadelde zijn ezel, bracht hem duizend passen verder,
+bij een pachter en gaf twee oortjes aan de meid om op het dier te
+letten. Vervolgens keerde hij terug naar de taveerne en zette zich neer
+bij de Smadelijke Broeders, zonder van iets te gebaren. Ze schonken
+hem in en betaalden 't gelag. Uilenspiegel liet de guldens van den
+landgraaf in zijne tassche rinkelen en zei, dat hij zoo even aan
+eenen boer zijnen ezel verkocht had voor zeventien zilveren daalders.
+
+De dikzak die op den rommelpot speelde, ging bij den baas en sprak,
+naar Uilenspiegel wijzend:
+
+--'t Is de schilder van den landgraaf, hij zal alles betalen.
+
+Als de baas guldens en daalders in Uilenspiegel's tassche hoorde
+rammelen, bracht hij eten en drinken op tafel. Uilenspiegel
+liet het zich goed smaken. En altijd rinkelde het geld in zijne
+beurze. Menigwerf had hij ook op zijnen hoed geslagen en gezegd dat
+daar zijn grootste schat stak. Als de smulpartij twee dagen en eenen
+nacht geduurd had, zeiden de Smadelijke Broeders tot Uilenspiegel:
+
+--Laat ons opkramen en 't gelag betalen.
+
+Uilenspiegel antwoordde:
+
+--Als een rat in een kaas zit, vraagt zij om ergens elders te gaan?
+
+--Neen, spraken zij.
+
+--En als een mensch goed eten en drinken heeft, vraagt hij naar het
+stof van de wegen of naar 't water van de grachten die vol echelen
+steken?
+
+--Neen, spraken zij.
+
+--Laat ons dus hier blijven, vervolgde Uilenspiegel, zoolang mijne
+guldens en daalders ons dienen tot trechters om de goddelijke dranken
+van den baas in onze kelen te gieten.
+
+En hij zei tot den baas van nog wijn en nog worsten te brengen.
+
+Terwijl zij aten en dronken, sprak Uilenspiegel:
+
+--Ik betaal alles, nu ben ik eens de landgraaf. Als mijne beurze
+ledig was, wat zoudt gij doen, kameraden? Als dat ongeluk overkomt,
+neemt dan mijn vilten hoedeken: het steekt vol gouden karolussen.
+
+--Laat ons eens tasten, spraken allen te gader.
+
+En zuchtend, voelden zij tusschen hunne vingeren groote geldstukken
+die gouden karolussen moesten zijn. Doch een hunner bleef den hoed
+met zooveel vriendschap vasthouden, dat Uilenspiegel hem den hoed
+moest afnemen, zeggende:
+
+--Ongeduldige koeier, wacht ten minste tot het uur van melken daar is.
+
+--Geef mij de helft van uw hoedeken, sprak de Smadelijke Broeder.
+
+--Neen, sprak Uilenspiegel, want schadelijk ware het voor uwe hersenen
+half in de zonne en half in de schaduw te loopen.
+
+En, zijn hoofddeksel aan de baas gevend, sprak hij:
+
+--Houd hem goed vast, het is wat te warm. Ik ga mij wat lichter maken.
+
+Hij ging buiten en de baas hield het hoedeken vast.
+
+Maar Uilenspiegel liep naar den boer, steeg op zijn ezel en sloeg
+den weg in naar Emden.
+
+Als de Smadelijke Broeders, hem niet zagen terugkomen, zeiden zij
+tot elkander:
+
+--Zou hij weg zijn? Wie zal dan 't gelag betalen?
+
+De baas kreeg argwaan en sneed Uilenspiegels hoed middendoor.
+
+Maar in stee van karolussen, vond hij tusschen het vilt en de voering
+niets dan kwade koperen penningen.
+
+Toen voer hij heftig uit tegen de Smadelijke Broeders.
+
+--Diefelijke broeders, gij gaat niet uit mijn huis, vóór dat gij mij
+al uwe kleederen gelaten hebt, behalve uwe hemde, sprak hij.
+
+En zij moesten zich uitkleeden om hun gelag te betalen. In hun hemde
+reden zij aldus over velden en wegen, want zij hadden hun peerd noch
+hun wagen willen verkoopen.
+
+En een iegelijk onderweg had medelijden met hen en gaf hun geerne wat
+brood, wat bier en soms ook een stuk vleesch; want overal zegden zij
+dat zij door dieven uitgeschud waren.
+
+En zij hadden in 't gelijk maar ééne hooze.
+
+Zoo kwamen zij naar Sluis terug, in hun hemde op de wagen dansend en
+op den rommelpot spelend.
+
+
+
+
+LX.
+
+Intusschen reed Uilenspiegel op zijn ezel door de landen en sompen
+van den hertog van Lunenburg, het Watersignoorken, zooals de Vlamingen
+hem heetten.
+
+Jef gehoorzaamde Uilenspiegel als een hondje, dronk bruinbier, danste
+beter dan een Hongaarsche dansmeester en legde zich, bij het minste
+teeken, op den rug met de vier pooten omhoog.
+
+Uilenspiegel wist dat de hertog van Lunenburg--verbolgen omdat hij,
+te Darmstadt, in tegenwoordigheid van den landgraaf van Hessen, met
+hem den spot had gedreven--hem op straffe van den strop den toegang
+tot zijn grondgebied ontzegd had.
+
+Plotseling zag Uilenspiegel Zijne Hertogelijke Hoogheid in persoon
+aankomen en mits hij zijn geweldig karakter kende, werd hij bang. Hij
+sprak tot zijn ezel:
+
+--Jef, jongen, daar komt de hertog van Lunenburg. Aan den hals voel
+ik een groote krieuweling; nu, Jef, ik zou niet geerne gehangen
+worden. Gedenk dat wij broeders in ellende en in lange ooren zijn;
+gedenk ook welk een goeden vriend gij aan mij zoudt verliezen.
+
+En Uilenspiegel wischte zich de oogen en Jef begon te balken.
+
+--Wij leven samen gelukkig, vervolgde Uilenspiegel, of rampspoedig,
+naarvolgens de omstandigheden; gedenk dat, Jef!--De ezel balkte
+voort, want hij had honger.--En nooit zult ge mij vergeten, sprak
+zijn meester, want welke liefde is sterker dan die, welke dezelfde
+vreugde beleeft en denzelfden rampspoed beweent? Jef, jongen, gij
+moet u op den rug leggen.
+
+De zachtaardige ezel deed wat zijn meester begeerde en de hertog zag
+hem met de vier pikkels omhoog liggen. Uilenspiegel zette zich neer
+op den buik van den ezel.
+
+--Wat doet gij daar? sprak de hertog. Weet gij dan niet dat ik, bij
+mijn laatste plakkaat, u verboden heb uwe stoffige voeten in mijne
+gewesten te zetten?
+
+Uilenspiegel antwoordde:
+
+--Genadige heer, heb erbarming met mij.
+
+En naar zijn ezel wijzend:
+
+--Gij weet wel, heer, dat hij, die tusschen zijne vier palen woont,
+bij wet en recht immmer vrij is.
+
+De hertog antwoordde:
+
+--Verlaat mijne gewesten of gij zult sterven!
+
+--Genadige heer, antwoordde Uilenspiegel, met een paar gulden zou ik
+er rapper buitenrollen.
+
+--Nietdeug, sprak de hertog, het is u niet genoeg ongehoorzaam te zijn,
+ge vraagt er mij nog geld bij!
+
+--Ik moet het wel vragen, heer, mits ik het niet nemen kan.
+
+De hertog gaf hem een gulden.
+
+Toen sprak Uilenspiegel tot zijn ezel:
+
+--Jef, sta op en groet Zijne Hoogheid.
+
+De ezel stond op en begon te balken. Toen gingen beiden hun weg.
+
+
+
+
+LXI.
+
+Soetkin en Nele zaten aan een der vensteren van de hut en keken naar
+de straat. En Soetkin sprak tot Nele:
+
+--Liefste, ziet gij mijn zoon Uilenspiegel niet komen?
+
+--Neen, sprak Nele, dien leelijken landlooper zien wij nooit meer
+terug.
+
+Nele, antwoordde Soetkin, gij moogt niet kwaad zijn, maar gij moet
+hem beklagen, omdat hij niet bij ons is, de arme jongen!
+
+--Ik weet het, sprak Nele, maar hij heeft elders een huis, verre van
+hier, een huis, rijker dan 't zijne, waar hij zeker door een schoone
+dame getroeteld wordt.
+
+--'t Ware gelukkig voor hem, zei Soetkin; daar eet hij misschien
+ortolanen.
+
+--Dat men hem keien te eten gaf, zuchtte Nele, gauw zou hij hier zijn
+de slokker.
+
+Soetkin lachte en zei:
+
+--Van waar, liefste, die boosheid?
+
+Maar Klaas, die stil in zijn hoekje mutsaards bond, antwoordde:
+
+--Ziet gij dan niet dat Nele verliefd is?
+
+--Wel, sprak Soetkin, wat doortrapte meid, die mij daar nooit een
+woord over sprak. Is 't waar, liefste, hebt gij er zin in?
+
+--Geloof er niets van, sprak Nele.
+
+--Gij zult, zei Klaas, een goeden man aan hem hebben, met een grooten
+mond, een hollen buik en een lange tonge, die van de guldens duiten
+zal maken en nooit een oortje van zijnen arbeid, een straatlooper en
+een nietdeug.
+
+Doch, blozend en kwaad, antwoordde Nele:
+
+--Waarom hebt gij hem niet anders gemaakt?
+
+--Daar weent ze nu, sprak Soetkin, zwijg toch, man.
+
+
+
+
+LXII.
+
+Als Uilenspiegel te Neurenberg kwam, gaf hij zich uit voor grootmeester
+in de medicijnen, overwinnaar van alle kwalen, wereldberoemd
+lichaamzuiveraar, die pest, koorts en alle ziekten verdreef.
+
+In het gasthuis van die stad lagen zooveel zieken dat men ten einde
+raad was. De overste had de komst van Uilenspiegel vernomen; hij ging
+hem bezoeken en vroeg of hij werkelijk allerlei ziekten genezen kon?
+
+--Uitgenomen de laatste, antwoordde Uilenspiegel; maar beloof mij
+tweehonderd gulden voor genezing der overigen; doch ik wil geen duit,
+als al uwe zieken niet zeggen, dat zij genezen zijn en het gasthuis
+kunnen verlaten.
+
+'s Anderen daags trad hij, met doctorale waardigheid de ziekenzaal
+binnen. Hij ging overal rond, bezocht elken zieke afzonderlijk en zei:
+
+--Zweer mij dat gij aan niemand zult zeggen wat ik u in het oor ga
+vertellen. Welke ziekte hebt gij?
+
+De kranke zei het hem, en zwoer bij hoog en leeg te zullen zwijgen.
+
+--Weet, sprak Uilenspiegel, dat ik morgen een uwer tot asch moet
+verbranden, om daarmede een wonderbaar geneesmiddel te bereiden, dat
+alle zieken zullen te drinken krijgen. Hij, die niet gaan kan, wordt
+tot pulver verbrand. Morgen kom ik terug met de overste, en ik zal
+roepen: "Dat al degenen die niet ziek zijn, hun pak maken en heengaan."
+
+Den volgenden morgen kwam Uilenspiegel en riep gelijk hij gezegd
+had. Al de zieken, kreupelen, jichtlijders, koortslijders, wilden om
+'t zeerste buiten. En zelfs zij die in geen tien jaar uit hun bedde
+waren gekomen, liepen de straat op.
+
+De overste vroeg of zij genezen waren en of zij gaan konden.
+
+--Ja, antwoordden zij, in 't gedacht dat er één op de binnenplaats
+tot assche verbrand werd.
+
+Toen sprak Uilenspiegel tot den overste:
+
+--Betaal mij; gij ziet, allen zijn buiten en verklaren dat zij
+genezen zijn.
+
+De overste betaalde hem tweehonderd gulden, en Uilenspiegel spoedde
+zich buiten de stad.
+
+Maar twee dagen nadien zag de overste alle zijne zieken zieker
+terugkomen, behalve één dien de frissche lucht genezen had, en die nu
+dronken door de straten liep, al zingende: "Hoezee voor den grooten
+dokter Uilenspiegel!"
+
+
+
+
+LXIII.
+
+Als de tweehonderd gulden verteerd waren, kwam Uilenspiegel te Weenen,
+alwaar hij zich verhuurde bij eenen wagenmaker, die zijne gasten
+gedurig beknorde, omdat zij den blaasbalg van de smidse niet vlug
+genoeg trokken.
+
+--Op maat schreeuwde hij, en volgt met den blaasbalg.
+
+Eens dat de baas naar zijnen hof ging, maakte Uilenspiegel den
+blaasbalg los, schouderde hem en volgde aldus zijnen meester. Als
+deze verwonderd opkeek, sprak Uilenspiegel.
+
+--Baas, gij hebt mij geheeten met den blaasbalg te volgen, waar moet
+ik hem leggen, terwijl ik de anderen haal?
+
+--Jongen, antwoordde de baas, dat heb ik u niet gezegd, breng den
+blaasbalg op zijne plaats terug.
+
+Maar de baas wilde hem die poets betaald zetten. Hij stond, van
+dien dag af, te middernacht op, maakte zijne gasten wakker en deed
+hen werken.
+
+De werklieden spraken:
+
+--Baas, waarom wekt gij ons te midden van den nacht?
+
+--Ik heb de gewoonte, antwoordde de baas, mijne gasten de eerste
+zeven dagen maar een halven nacht te laten slapen.
+
+Den volgende nacht, wekte hij weer zijne gasten te
+middernacht. Uilenspiegel, die op den zolder sliep, bond zijn bed op
+zijnen rug en kwam aldus de smidse binnen.
+
+De baas sprak tot hem:
+
+--Zijt gij zot? Waarom laat gij uw bed niet op zijne plaats?
+
+--Ik heb de gewoonte, antwoordde Uilenspiegel, de eerste zeven dagen
+van de week de helft van den nacht op mijn bed en de andere helft
+onder mijn bed te slapen.
+
+--Zoo, antwoordde de meester, maar ik heb nog een tweede gewoonte, dat
+is van mijne onbeschaamde gasten op straat te smijten, met toelating
+de eerste week boven den grond, en de tweede onder den grond door
+te brengen.
+
+--In uwen kelder, baas, bij de tonnen bruinbier?
+
+
+
+
+LXIV.
+
+Als Uilenspiegel den wagenmaker verlaten had, verhuurde hij zich,
+op de terugreis naar Vlaanderen, als leerknaap bij eenen schoenmaker,
+die liever aan zijne deur stond, dan met zijne else op den stoel zat.
+
+Uilenspiegel, die hem voor de honderdste maal zag opstaan, vroeg hoe
+hij de overleeren moest snijden.
+
+--Snijdt er, sprak de baas, voor groote en middelmatig voeten, opdat
+zij passen aan al wie groot of klein vee drijft.
+
+--Zoo zal geschieden, baas, antwoordde Uilenspiegel.
+
+Als de schoenmaker weg was, sneed Uilenspiegel overleeren die alleen
+goed waren voor merriën, ezelinnen, veerzen, zeugen en ooien.
+
+Als de baas terug in zijn werkhuis kwam en zijn leder versneden zag,
+riep hij uit:
+
+--Wat steekt gij daar uit?
+
+--Wat gij mij gezegd hebt, was 't antwoord van Uilenspiegel.
+
+--Ik heb u gezegd, hernam de baas, schoenen te snijden die passen
+aan allen die ossen, varkens en schapen drijven, en nu snijdt gij
+schoenen voor die beesten.
+
+Uilenspiegel antwoordde:
+
+--Baas, in dit seizoen waarin alle beesten minneziek zijn, wie anders
+dan de zeug, de ezelin, de veers en de ooie mennen den beer, den ezel,
+den stier en den ram?
+
+Hij maakte zich buiten, doch hij mocht niet meer binnen.
+
+
+
+
+LXV.
+
+Het was in de Grasmaand, de lucht was zoet, doch nadien begon het te
+vriezen en de hemel zag grijs als op Allerzielen. Uilenspiegel's derde
+jaar ballingschap was sedert lang verstreken, en Nele verwachtte alle
+dagen heuren hertsvriend terug.
+
+--Laas! sprak zij, 't gaat sneeuwen op de kersebloesems, op de
+bloeiende seringa's, op al de arme planten die bij de zoele warmte
+eener vroege lente vol hope ontloken waren. Lichte sneeuwvlokjes
+vallen reeds op de wegen. En 't sneeuwt ook op mijn arm herte.
+
+Waar zijn zij, de heldere zonnestralen, die de gezichten verblijden,
+de daken rooder maken, den hemel blauw en de ruiten vlammend? Waar
+zijn zij die warmte schenken aan aarde, lucht, aan vogelen en
+insecten? Laas! nu heb ik dag en nacht koude van droefheid en bangen
+twijfel. Waar zijt gij mijn lief, mijn Uilenspiegel?
+
+
+
+
+LXVI.
+
+Uilenspiegel naderde Ronse, en hij had honger en dorst, doch wilde
+niet klagen; hij beproefde de menschen te doen lachen om aan brood
+te geraken. Maar het ging hem niet af, de menschen kwamen en gingen
+en gaven hem niets.
+
+Het was koud, beurtelings sneeuwde, regende en hagelde het op den
+rug van den zwerver. Als hij een hond een been zag afknagen, kwam
+het water hem in den mond. Hij had wel een gulden willen verdienen,
+doch wist niet hoe hij een gulden in zijne tassche zou krijgen.
+
+Omhoog zoekend, zag hij duiven die van hunne piere witte plakjes
+op den weg lieten vallen, maar guldens waren het niet. Hij zocht
+langs de groote wegen, maar ook tusschen de kasseien schoten geene
+guldens omhoog.
+
+Rechts zoekend, zag hij wel een grimmige wolk in de lucht drijven,
+maar hij wist wel dat, zoo er uit dien gieter iets moest vallen,
+het geene guldenbui zou wezen. Links vorschend, zag hij een grooten,
+luien kastanjelaar, die leefde en waste zonder iets te verrichten.
+
+--Ha! sprak hij, waarom zijn er ook geen guldenaars? Daar zouden
+schoone vruchten aan groeien.
+
+Eensklaps barstte de zwarte wolk, en de hagelsteenen vielen en sloegen
+geducht op Uilenspiegel's rug.
+
+--Laas, sprak hij, ik voel het wel, 't is alleen naar dwalende honden
+dat men steenen smijt.--Toen zette hij het op een loopen.--'t Is
+mijne schuld niet, vervolgde hij, als ik geen paleis of zelfs geen
+tent heb om mijn schraal lichaam te beschutten. Ho! die leelijke
+hagelsteenen, zij zijn hard als kogels. Neen, 't is mijne schuld
+niet, als ik in lompen gehuld de wereld rondzwerf, 't is enkellijk
+omdat het mij behaagt. Waarom ben ik geen keizer? Die hagelsteenen
+willen, lijk slechte woorden, halsstarrig in mijne ooren dringen.--En
+hij liep.--Arme neus, voegde hij erbij, weldra zijt gij doorboord,
+en kunt gij dienen tot pepervat op de festijnen van de grooten der
+aarde, op wie het nooit te hagelen pleegt. En zijne kaken afwisschend,
+sprak hij:--Deze kunnen weldra dienen tot schuimspanen voor de koks,
+die het te warm bij hunne ovens hebben. Ha! verre herinnering aan
+heerlijke pastijen van weleer! Ik heb honger. Ledige buik, beklaag
+u niet, jammerende ingewanden, houdt u stil. Fortuin, waar zit gij
+nu? breng mij ergens waar ik te eten vind.
+
+Terwijl hij aldus tot zich zelven sprak, werd de hemel helder; het
+hagelde niet meer, de zonne vertoonde zich en Uilenspiegel sprak:--Daar
+is de zonne, mijne eenige vriendin, die mij komt drogen! Maar eensklaps
+zag hij van verre op den weg een gespikkelden hond op zich afkomen,
+met hangende tong en puilende oogen.
+
+--Dat beest is razend, riep Uilenspiegel. Hij raapte een grooten steen
+op en klom gezwind in een boom; nauwelijks had hij den eersten tak
+bereikt, of de hond was dáár, en Uilenspiegel smeet hem den steen op
+den kop. De hond bleef staan, trachtte nog Uilenspiegel te bijten,
+maar hij kon niet en viel dood ten gronde.
+
+Dat deed Uilenspiegel geen genoegen en te minder daar hij, beneden
+gekomen, zag dat de hond geen drogen muil had, gelijk gewoonlijk bij
+dolle honden 't geval is. Vervolgens het vel beziende, zei hij tot
+zich zelven dat het schoon genoeg was om te verkoopen; hij stroopte
+het, waschte het, hing het aan een paal, liet het in de zonne wat
+drogen en stak het in zijne tassche.
+
+Daar honger en dorst hem kwelden, ging hij eenige hoeven binnen,
+doch dorst het vel niet te koop bieden, uit vreeze dat de hond aan
+den boer toebehoord had. Hij vroeg een stuk brood, maar men weigerde
+het hem. De nacht kwam. Zijne beenen waren vermoeid en hij ging een
+kleine afspanning binnen. Daar zag hij een oude bazin, die een ouden
+hond streelde, wiens vel op dat van den doode geleek.
+
+--Van waar komt gij, reiziger? vroeg de oude bazinne.
+
+Uilenspiegel antwoordde:
+
+--Ik kom van Rome, alwaar ik den hond van den Paus van eene verkoudheid
+genas, die hem grootelijks hinderde.
+
+--Hebt gij den Paus gezien? vroeg zij, een glas bier tappend.
+
+--Laas! zei Uilenspiegel, het glas ledigend, het is mij alleen
+toegestaan geweest zijn heilige voeten en zijn doorluchtige muilen
+te kussen.
+
+De oude hond van de bazinne kuchte, doch spuwde niet.
+
+--Wanneer deedt gij dat? vroeg de oude.
+
+--Nu twee maanden geleden, antwoordde Uilenspiegel. Men verwachtte
+mij, ik kwam en klopte:--Wie is daar? vroeg de aartsdoorluchtige,
+aartsgeheime en aartsbuitengewone kardinaal-kamerheer van Zijne
+Zeer Heilige Heiligheid.--Ik, heer kardinaal, antwoordde ik, ik
+kom opzettelijk uit Vlaanderen om de voeten van den Paus te kussen
+en zijnen hond van het slijm te verlossen.--Ha! zijt gij het,
+Uilenspiegel? sprak de Paus langs den anderen kant, achter een
+deurken. Het zou mij veel genoegen doen u te zien, maar nu is dat
+onmogelijk. De heilige Decretalen verbieden mij mijn gezicht aan de
+vreemdelingen te toonen, als men er met het heilige scheermes over
+gaat--Laas! zei ik, het slaat mij erg tegen, ik was uit verre landen
+gekomen om de voeten Uwer Heiligheid te kussen en zijn hond van het
+slijm te genezen. Moet ik onverrichter zake terugkeeren?--Neen, sprak
+de Heilige Vader; vervolgens hoorde ik hem roepen:--Aartskamerheer,
+schuif mijn stoel tot bij de deur en open het schuifken. Zoo
+werd gedaan.--En door het schuifje zag ik twee voeten steken met
+gouden muilen aan, en 'k hoorde eene stem die als de donder rolde,
+zeggen:--Dit zijn de doorluchtige voeten van den Prins der Prinsen,
+den Koning der Koningen, den Keizer der Keizers. Kus, geloovige,
+kus de heilige muilen. En ik kuste de heilige muilen en mijn neus was
+gansch vervuld met den hemelschen geur die uit die voeten opsteeg. Toen
+ging het schuifken weder toe en dezelfde geduchte stemme gebood mij te
+wachten. De deur ging toen open en daar kwam een hond te voorschijn,
+om de waarheid te zeggen, een ruige, kuchende hond met loopende oogen
+en zoo opgeblazen, dat hij schier niet gaan kon.
+
+De Heilige Vader verweerdigde zich nog mij te zeggen:--Uilenspiegel,
+gij ziet mijnen hond; hij heeft slijm en andere ziekten gekregen met
+te knagen aan het gebeente van geradbraakte ketteren. Genees hem,
+mijn zoon, gij zult er u wel mee bevinden.
+
+--Drink, sprak de oude.
+
+--Schenk, antwoordde Uilenspiegel. Zijne rede vervolgend, sprak hij:
+Ik deed den hond purgeeren door middel van een wonderbaar drankje,
+dat ik zelf gereedgemaakt heb. Hij piste drie dagen en drie nachten
+aan één stuk, en was toen genezen.
+
+--Jezus, Maria! sprak de oude, laat mij u kussen, doorluchtige pelgrim,
+die den Paus gezien hebt en ook mijn hond kunt genezen.
+
+Doch Uilenspiegel, die niet erg ingenomen was met de kussen der oude,
+sprak:--Zij, wier lippen de heilige muilen aangeraakt hebben, mogen,
+twee jaar lang, geene kussen van eenige vrouwe ontvangen. Geef mij
+wat goede karbonaden, een koppel bloedworsten en bier in overvloed,
+en ik zal uwen hond zulke heldere stem geven, dat hij gemakkelijk
+zal kunnen meezingen op de okzaal in de groote kerk.
+
+--Mocht het waar zijn, sprak de oude, ik gaf u een gulden voor
+uwe moeite.
+
+--Ik zal het doen, sprak Uilenspiegel, maar slechts na het eten.
+
+Zij diende hem alles wat hij gevraagd had. Hij at en dronk zijn
+bekomst en had wel, uit erkentelijkheid, de oude gekust, hadde hij
+niet gezegd dat dit niet mogelijk was.
+
+Terwijl hij sprak, kwam de oude hond met zijne pooten op zijne
+knieën om een stuksken te vragen. Uilenspiegel gaf er hem meerdere;
+vervolgens sprak hij tot de hospita:
+
+--Wat zoudt gij doen, als iemand bij u at en niet wilde betalen?
+
+--Ik zou den dief zijn opperste kleed afnemen, sprak de oude.
+
+--Goed, sprak Uilenspiegel; daarna nam hij den hond in den arm en
+ging er mee naar den stal, alwaar hij hem opsloot met een been. Hij
+nam het vel van den dooden hond en, bij de oude terugkomend, vroeg
+hij haar of zij bij heur woord bleef, dat zij het opperste kleed zou
+uitdoen van dengene die at zonder betalen.
+
+--Zeker, antwoordde zij.
+
+--Wel, uw hond heeft met mij medegegeten zonder betalen; en ik heb
+hem volgens uw voorschrift zijn opperste en eenig kleed uitgedaan.
+
+En hij toonde heur de huid van den dooden hond.
+
+--Ha! snikte de oude, dat is wreed van u, mijnheer de dokter. Arm
+hondje! het was mij als een kind. Waarom ontnaamt gij mij den eenigen
+vriend, dien ik op aarde bezat? Nu mag ik sterven!
+
+--Ik zal hem weder in 't leven roepen, sprak Uilenspiegel.
+
+--Weder in 't leven! sprak zij. En hij zal mij nog streelen, nog
+aankijken, nog likjes geven? Doe het, mijnheer de dokter; niet
+alleenlijk zult gij voor niet een lekker maal hebben genoten, maar
+'k geef u nog een gulden op den koop toe.
+
+--Ik zal hem weder in 't leven roepen, sprak Uilenspiegel, maar ik
+moet warm water hebben, siroop om de voegen van het nieuw vel toe
+te plakken, eene naald en garen, en saus van karbonaden, en men moet
+mij alleen laten.
+
+De oude gaf hem alles wat hij vroeg; en hij trok met het vel van den
+dooden hond naar den stal.
+
+Daar streek hij saus aan den snoet van den ouden hond, die hem liet
+begaan; van onderen op zijnen buik en aan zijne pooten maakte hij
+groote streepen met siroop.
+
+Hij stiet driemaal een grooten schreeuw en sprak: Sta op! sta op! ik
+beveel het, vuile hond!
+
+Vervolgens stak hij gezwind het vel van den dooden hond in zijne
+tassche, gaf den levenden hond een schop en joeg hem alzoo de
+gelagkamer binnen.
+
+Als de oude heuren hond levend en likkebaardend terugzag, wilde zij
+hem kussen van geluk. Maar Uilenspiegel liet het haar niet toe.
+
+--Gij moogt uwen hond maar streelen, sprak hij, als hij al de siroop
+afgelikt heeft die aan zijn vel plakt; dan eerst zullen de naden goed
+dicht zijn. Tel mij nu mijne tien gulden.
+
+--Eén had ik gezeid, sprak de oude.
+
+--Eén voor het nieuw vel en negen om den hond in 't leven te roepen.
+
+En zij telde ze hem. Uilenspiegel toog henen en smeet het vel van den
+dooden hond in de gelagkamer, zeggende:--Daar, vrouwe, bewaar het oude
+vel, het kan dienen om het nieuwe te vermaken, als de mot er in komt.
+
+
+
+
+LXVII.
+
+Dien Zondag ging te Brugge de Heilig-Bloedprocessie uit. Klaas zei
+tot zijne vrouw en tot Nele van er heen te gaan, daar zij misschien
+Uilenspiegel in de stad zouden ontmoeten. Hij zelf zou thuis blijven
+om den pelgrim te ontvangen, mocht hij terugkomen.
+
+De vrouwen vertrokken getweeën. Klaas bleef aan zijne deur zitten
+en vond Damme doodsch en verlaten. Hij hoorde niets dan het kleppen
+van eene of andere dorpsklok in 't ronde, terwijl de wind, bijwijlen
+uit Brugge, het getintel van den beiaard en een groot geraas van
+falkonetten en van vuurpijlen bracht, die ter eere van het Heilig
+Bloed afgeschoten werden.
+
+Klaas zocht droomerig Uilenspiegel op de wegen, doch hij zag niets
+dan een blauwen, onbewolkten hemel, eenige honden die met hangende
+tong in de zonne lagen, wat musschen die tjilpend zich wentelden in
+'t stof, eene kat die ze beloerde, en het zonnelicht dat vriendelijk
+in al de huizen drong en er de koperen ketels en tinnen pateelen op
+den schoorsteen glinsteren deed.
+
+Doch Klaas was treurig te midden van al die vreugd en, zijn zoon
+zoekend, tuurde hij in den dikken damp, die over de weiden hing en
+spitste het oor om te luisteren of hij hem niet hoorde tusschen het
+blijde geritsel der bladeren en het vroolijk gekweel der vogelen in
+de boomen. Eensklaps zag hij op den weg van Maldegem een man van
+lange gestalte afkomen, maar seffens zag hij dat het Uilenspiegel
+niet was. Hij zag hem stilstaan bij een rapenveld en gulzig eenige
+dier knollen opeten.
+
+--Die moet grooten honger hebben, sprak Klaas.
+
+Nadat hij hem een oogenblik uit het zicht verloren had, zag hij
+hem weder te voorschijn komen aan den hoek van de Reigerstraat,
+en hij herkende den bode van Judocus, die hem zevenhonderd gouden
+karolusguldens gebracht had. Hij ging hem tegemoet en sprak:
+
+--Kom binnen!
+
+De man antwoordde:
+
+--Gezegend zijn zij, die goed zijn jegens den dolenden reiziger.
+
+Buiten op de vensterbank lagen broodkruimelen, die Soetkin voor de
+vogelen had gestrooid. Zij kwamen daar 's winters hun eten zoeken. De
+man nam de brokkelingen en at ze gulzig op.
+
+--Gij hebt honger en dorst, sprak Klaas.
+
+--Voor acht dagen werd ik uitgestroopt door de roovers, sprak de man,
+en sedert dien voed ik mij met rapen en wortelen langs de wegen.
+
+--'t Is dus tijd eenige versterking te nemen. Hier is, sprak Klaas,
+de schapraai openend, hier is eene teil vol boonen, hier zijn eieren,
+pensen, hesp, Gentsche worst, en nog hier is waterzooi. Beneden in
+den kelder ligt Leuvensche wijn te rusten, die bereid is naar de wijze
+van Bourgondië, als robijn zoo rood en zoo klaar. Hij vraagt maar om
+gedronken te worden. Nu, wij gaan wat hout op het vuur doen. Hoort
+gij de pensen zingen op den rooster? Dat is een liedje van wellust.
+
+Klaas keerde de pensen op den rooster en sprak:
+
+--Hebt gij mijn zoon, mijn Uilenspiegel, niet gezien?
+
+--Neen, antwoordde hij.
+
+--Brengt gij nieuws van Judocus, mijn broeder? vroeg Klaas, terwijl hij
+alles opdiende: gerooste pensen, een eierpannekoek, kaas, twee groote
+bekers en Leuvenschen wijn, die helder en rood in de bottels flikkerde.
+
+De man antwoordde:
+
+--Uw broeder is te Sippenaken gestorven op het rad. En dit om, als
+ketter, de wapenen tegen den keizer te hebben gevoerd.
+
+Klaas was als waanzinnig en beefde, over gansch zijn lijf, zoo groot
+was zijn gramschap.
+
+--De beulen, de moordenaars! Judocus! mijn arme broeder!
+
+--Onze vreugde en onze smerten zijn niet van deze wereld, zegde de man.
+
+En hij begon te eten. Vervolgens sprak hij:
+
+--Ik heb uw broeder bijgestaan in het gevang, ik deed mij doorgaan
+voor een zijner neven. Ik kom alhier, omdat hij mij zeide: Ga bij mijn
+broeder Klaas, als gij voor 't geloove niet sterft als ik; zeg hem van
+in den vrede des Heeren te leven, door werken van bermhertigheid te
+plegen en zijn zoon heimelijk in de wet van Christus op te brengen. Het
+geld dat ik hem gaf, werd genomen van het arme, onwetende volk; dat hij
+het gebruike om Thijl op te voeden in de leering van God en zijn woord.
+
+Op die rede, gaf de bode aan Klaas den vredekus.
+
+En Klaas jammerde:
+
+--Op het rad gestorven! mijn arme broeder!
+
+En zoo groot was zijn smert, dat hij niet tot bezinning kon
+komen. Doch, daar hij zag dat de man dorst had en zijn glas uitstak,
+schonk hij hem wijn in, maar hij at en dronk zonder vreugde.
+
+Soetkin en Nele bleven zeven dagen weg; gedurende dien tijd bleef de
+bode de gast van den koolbrander.
+
+Al die nachten hoorden zij Katelijne huilen:
+
+--Het vuur! het vuur! Maak open, maak open; de ziel wil er uit!
+
+En als Klaas naar heure hut ging, stilde hij heur met zoete woorden.
+
+Na zeven dagen toog de vreemde henen, zonder iets van Klaas te willen
+aanveerden dan twee karolussen, om onderwege te eten en te slapen.
+
+
+
+
+LXVIII.
+
+Nele en Soetkin waren van Brugge teruggekomen. Klaas zat in de keuken
+als een kleermaker, knoopen aan een oude hooze te naaien. Nele stond
+naast hem en hitste tegen den ooievaar Titus Bibulus Snuffius op, die
+beurtelings vooruit en achteruit sprong en kefte. De ooievaar stond,
+op één poot, hem ernstig te bezien, met zijn langen hals in de pluimen
+zijner borst. Als Titus Bibulus Snuffius hem zoo vreedzaam zag, kefte
+hij nog meer. Maar de vogel, wien die muziek op den duur verveelde,
+gaf eensklaps eenen slag met zijn bek in den rug van den hond, die
+jankend en jammerend wegvluchtte.
+
+Klaas lachte, Nele insgelijks en Soetkin keek gedurig naar de straat
+of Uilenspiegel niet afkwam.
+
+Eensklaps sprak zij:
+
+--Daar is de provoost met vier sergeanten. 't Is toch zeker niet voor
+ons. Twee van de mannen loopen de hut om.
+
+Klaas hief zijn hoofd op.
+
+--En de twee anderen blijven staan voor de deur, vervolgde Soetkin.
+
+Klaas stond recht.
+
+--Wien gaat men hier vangen? sprak zij. Jezus God! man, zij komen
+hier binnen.
+
+Klaas sprong van de keuken in den hof, gevolgd door Nele en zei:
+
+--Red de karolussen, ze steken achter den brandmuur van den
+schoorsteen.
+
+Nele begreep hem: toen zag ze dat hij over de haag sprong, dat de
+serjanten hem bij den kraag vatten, dat hij worstelde om los te
+geraken en zij weende en riep:
+
+--Hij is onschuldig! hij is onschuldig! doet geen kwaad aan Klaas, aan
+mijn vader! Uilenspiegel, waar zijt gij? Gij zoudt ze den kop inslaan!
+
+En zij sprong naar een der serjanten en reet zijn gezicht met
+heure nagelen vaneen. En zij riep: Zij gaan hem dooden! en zij viel
+machteloos op het gras van den hof.
+
+Op het gerucht kwam Katelijne toegeloopen, en stijf en onbeweeglijk
+aanzag zij het schouwspel.
+
+--Het vuur! het vuur! Maakt open: de ziel wil er uit!
+
+Soetkin onkundig van hetgeen er gebeurde, sprak op vroolijken toon
+tot de serjanten, die binnengekomen waren:
+
+--Mijne heeren, wien zoekt gij hier in deze arme woning? Als 't mijn
+zoon is, die is verre. Hebt gij lange beenen?
+
+Doch op dit oogenblik schreeuwde Nele om hulp; Soetkin liep in den
+hof. Daar zag zij heuren man tegenspartelend medegesleept door de
+beide serjanten.
+
+--Sla ze dood! riep zij. Uilenspiegel waar zijt gij?
+
+En zij wilde heuren man ter hulp komen, maar een der serjanten greep
+heur vast, niet zonder moeite.
+
+Klaas verweerde zich zoo geducht, dat hij ware ontsnapt, hadden de
+twee andere serjanten hunne gezellen de hand niet geleend.
+
+En, met de handen gebonden, brachten ze hem terug naar de keuken,
+waar Soetkin en Nele heete tranen weenden en snikten.
+
+--Heer provoost, sprak Soetkin, wat heeft mijn arme man gedaan,
+dat gij hem bindt als een dief?
+
+--Ketter, sprak een der serjanten.
+
+--Ketter? hernam Soetkin, zijt gij een ketter, gij? Die duivels liegen!
+
+--Ik stel mijn vertrouwen op God, antwoordde Klaas.
+
+Hij werd buitengeleid; Nele en Soetkin volgden hem weenend, in den
+waan dat zij ook voor den rechter moesten verschijnen. Mannen en
+vrouwlieden kwamen bij heur; maar als zij hoorden dat Klaas opgeleid
+werd onder verdenking van ketterije, kregen zij zulken schrik dat zij
+haastelijk weer in huis liepen en de deuren toededen. Alleen eenige
+meisjes dorsten bij Klaas komen en hem vragen:
+
+--Waar gaat gij alzoo gekoord en gebonden, kooldrager?
+
+--Op Gods genade, meidekens, antwoordde hij.
+
+--Men bracht hem naar het Steen; Soetkin en Nele zetten zich neer
+aan de poort. Als het avond werd, zei Soetkin tot Nele te gaan zien
+of Uilenspiegel niet teruggekomen was.
+
+
+
+
+LXIX.
+
+Weldra liep de mare in de omliggende dorpen, dat een man gevangengezet
+was uit hoofde van ketterije en dat de kettermeester Titelman, deken
+van Ronse, bijgenaamd de Inquisiteur Zonder Genade, het onderzoek
+zou bestieren.
+
+Uilenspiegel verbleef toen te Koolkerke, in de beste vriendschap met
+een schoone pachterse, een jonge weduwe die hem niets weigeren kon
+van hetgeen heur eigendom was. Hij werd daar gevierd en geliefkoosd,
+tot op den dag dat een verraderlijke medeminnaar, een schepene der
+gemeente, hem in den morgen afwachtte als hij uit de taveerne kwam
+en hem afrossen wilde. Maar Uilenspiegel, om zijne woede te stillen,
+smeet hem in een vijver, waaruit de schepene met de grootste moeite
+klaveren kon, groen als een kikvorsch en nat als een spons.
+
+Uilenspiegel duchtte de weerwraak van den schepene en maakte dat hij
+zoo gauw mogelijk uit Koolkerke kwam.
+
+En hij liep regelrecht naar Damme.
+
+De avond viel: hij hadde thuis willen zijn; in zijnen geest zag
+hij Nele zitten naaien, Soetkin het avondmaal bereiden, Klaas zijne
+mutsaards binden en Titus Bibulus Snuffius knagen aan een been.
+
+Een rondleurder vroeg hem in 't voorbijgaan:
+
+--Waar loopt gij zoo haastig?
+
+--Naar Damme, naar mijn huis, was 't antwoord van Uilenspiegel.
+
+De rondleurder sprak:
+
+--De stad is niet meer veilig, ter oorzake van de ketteren die men
+er pakt.
+
+En hij ging voort.
+
+Aan de afspanning het Roode Schild gekomen, ging Uilenspiegel er
+binnen, om een glas dobbele kuite te drinken.
+
+De baas zei hem:
+
+--Zijt gij de zoon van Klaas niet?
+
+--Die ben ik, antwoordde Uilenspiegel.
+
+--Haast u, sprak de baas, want het uur van rampspoed is voor uwen
+vader geslagen.
+
+Uilenspiegel vroeg wat hij zeggen wilde.
+
+De baas antwoordde, dat hij het ongelukkiglijk maar al te gauw
+zou weten.
+
+En Uilenspiegel liep voort.
+
+Toen hij Damme binnen kwam, liepen de honden die op de zullen der
+deuren zaten, hem keffend en blaffend achterna. Op dat gerucht kwamen
+de vrouwen buiten en allen vroegen hem te gelijk:
+
+--Van waar komt gij? Hebt gij nieuws van uwen ongelukkigen vader? Waar
+is uwe arme moeder? Zit zij ook in het Steen? Laas! als zij hem maar
+niet levend verbranden!
+
+Uilenspiegel liep nog harder.
+
+Hij kwam Nele tegen, die hem zegde:
+
+--Thijl, ga niet naar huis: die van de stad hebben er een bewaker
+gesteld van wege den keizer.
+
+Uilenspiegel bleef staan.
+
+--Nele, sprak hij, is 't waar dat zij Klaas, mijn vader in 't gevang
+hebben gestoken?
+
+--Ja, sprak Nele, en Soetkin weent aan de poort van het Steen.
+
+Het hert van den verloren zoon bonsde van smerte en hij zei tot Nele:
+
+--Ik wil ze zien.
+
+--Neen, dat moet gij niet doen, sprak Nele, maar wel volbrengen hetgeen
+Klaas gezegd heeft, vóóraleer hij gepakt werd: Red de karolussen,
+zij steken achter den brandmuur van den schoorsteen. Die moet gij
+eerst redden, want zij zijn 't erfdeel van Soetkin, van de arme vrouwe.
+
+Uilenspiegel luisterde niet, maar liep tot aan de poort van het
+Steen. Daar vond hij Soetkin zitten; hij kuste heur snikkend en zij
+weenden beiden. Door hun jammeren was het volk in menigte naar 't
+gevang toegeloopen. Maar de serjanten kwamen, en verjoegen de arme
+Soetkin en Uilenspiegel.
+
+Moeder en zoon gingen toen naar het huis van Nele, naast hunne
+woonstee, vóór dewelke zij een der landsknechten zagen, die men uit
+Brugge ontboden had, uit vreeze voor de onlusten, die tijdens de
+uitspraak en gedurende de lijfstraf konden uitbreken. Want Klaas werd
+geerne gezien door de burgers van Damme.
+
+De soldenier zat vóór de deur, en zoog de laatste droppelen uit eene
+bottel brandewijn. Toen zij ledig was, smeet hij ze waar ze vliegen
+wilde. Vervolgens trok hij zijn jachtmes en stak hij kasseien uit.
+
+Snikkend kwam Soetkin bij Katelijne binnen.
+
+En schuddebollend sprak Katelijne: "Het vuur! Maakt open, mijne ziel
+wil er uit!"
+
+
+
+
+LXX.
+
+De burgstorm had geluid om de rechters ter vierschare te roepen;
+omtrent vier uren zaten zij rond den boom der justitie.
+
+Klaas werd vóór hen geleid en hij zag onder het verhemelte den Baljuw
+van Damme zitten; aan zijne zijden waren de drossaard, de schepenen
+en de griffier.
+
+Op het geluid van de klokke kwam het gemeen in groote menigte
+toegeloopen, en het sprak:
+
+--Vele onder de rechters zitten daar niet om naar recht te vonnissen,
+maar als slaven in dienst van den Keizer.
+
+De griffier verklaarde dat de rechtbank zich voorafgaandelijk
+ter vierschare rond den lindeboom vergaderd hebbende, beslist had
+dat, gehoord de aantijgingen en getuigenissen, de genaamde Klaas,
+koolbrander, geboortig van Damme, echtgenoot van Soetkin, dochter van
+Joostens, bij den lijve moest gevat worden. En nu, voegde hij er bij,
+gaan wij tot het verhoor der getuigen over.
+
+Hans Barbier, buurman van Klaas, werd eerst onderhoord. Nadat hij den
+eed afgelegd had, sprak hij: "Op mijner ziele zaligheid bevestig en
+verzeker ik dat Klaas, alhier tegenwoordig, door mij gekend is meer
+dan vijftien jaar; dat hij altijd eerlijk geleefd heeft volgens de
+wetten Onzer Moeder de Heilige Kerk; dat hij nooit smadelijk over
+haar gesproken of bij mijn wete nooit eenigen ketter geherbergd heeft,
+noch het boek van Luther verborgen, noch over gemeld boek gesproken,
+noch iets gedaan dat hem in verdenking kan brengen, de wetten en
+ordonnantiën van het keizerrijk overtreden te hebben. Zoo helpen mij
+God en al zijne santen."
+
+Jan Van Roosebeke werd vervolgens onderhoord en zei "dat, gedurende de
+afwezigheid van Soetkin, vrouw van Klaas, hij verscheidene reizen in
+het huis van den beschuldigde twee mannenstemmen had meenen te hooren
+en dat hij dikwijls, na de avondklokken, in een kleine zolderkamer,
+een licht en twee klappende mannen gezien had, waaronder Klaas. Wat
+betreft te zeggen of de andere man al of niet een ketter was, dat kon
+hij niet, daar hij hem van verre gezien had. Maar wat Klaas betreft,
+vervolgde hij, in volle waarheid moet ik zeggen dat hij, sedert ik hem
+ken, geregeld zijn Paschen houdt, op de groote heiligdagen Onzen Heere
+ontvangt, en alle Zondagen naar de misse gaat, uitgenomen nochtans
+dien van het Heilig Bloed en de volgende. Meerder weet ik niet. Zoo
+helpen mij God en al zijne santen."
+
+Ondervraagd of hij Klaas, in de taveerne den Blauwen Toren, geene
+aflaten had zien verkoopen en met het vagevuur niet had hooren spotten,
+antwoordde Jan Van Roosebeke dat Klaas inderdaad aflaten verkocht had,
+maar zonder eenigerlei verachting of spotternije, en dat hij, Jan Van
+Roosebeke, er van hem gekocht had gelijk ook Judocus Grijpstuiver,
+de deken der vischverkoopers, had willen doen.
+
+De baljuw maakte nu de feiten en punten bekend, uit hoofde waarvan
+Klaas voor de vierschare gedaagd was en sprak:
+
+--De aanbrenger, toevallig eens te Damme gebleven, ten einde zijn
+geld te Brugge niet in slemperijen en braspartijen te verteren,
+gelijk dit meer gebeurt bij deze heilige gelegenheid, stond in
+pais een luchtje te scheppen aan zijne zulle, toen hij een man de
+Reigerstraat zag ingaan. Klaas, den man ziende, ging hem tegen en
+groette hem. De man was in 't zwart gekleed. Hij ging bij Klaas
+binnen en de deur bleef half open. Nieuwgierig om te weten wie
+die man was, ging de aanbrenger in de gang en hoorde Klaas met den
+vreemdeling spreken over zekeren Judocus, zijn broeder, die, onder
+de protestantsche troepen gevangengenomen, omtrent Aken geradbraakt
+werd. De vreemdeling zei tot Klaas: aangezien het geld hetwelk
+zijn broeder hem gegeven had, genomen was van het arme, onwetende
+volk, hij het moest gebruiken om zijn zoon op te brengen in den
+hervormden eeredienst. Ook zette hij Klaas aan om den schoot Onzer
+Moeder de Heilige Kerk te verlaten, en nadat hij allerlei goddelooze
+woorden uitgesproken had, antwoordde Klaas alleenlijk: De beulen! De
+moordenaars! Mijn arme broeder! En dusdoende lasterde de beschuldigde
+Onzen Heiligen Vader den Paus en Zijne Koninklijke Majesteit, omdat zij
+de ketterije terecht willen straffen als eene misdaad van goddelijke
+en menschelijke majesteitsschennis. Als de man gedaan had met eten,
+hoorde de aanbrenger Klaas uitroepen: "Arme Judocus, dat God zich
+uwer ontferme; zij waren wreed jegens u." Daardoor beschuldigde hij
+God zelf van goddeloosheid, door te willen veronderstellen dat Hij
+ketteren in zijnen hemel zou ontvangen. En Klaas hield niet op te
+zeggen: "Mijn arme broeder!" Gelijk een kettersch predikant, riep
+de vreemdeling toen in woede uit: "Zij zal vallen, de Babylonische
+Hoer, en het verblijf worden van duivelen en roofdieren." Klaas
+riep daarop: "De beulen, de moordenaars! Mijn arme broeder!" De
+vreemdeling, zijne rede vervolgende, sprak: "Want de engel zal eenen
+steen oprapen, zoo groot als een molensteen. En hij zal hem in de
+zee smijten en zeggen: Zoo wordt het groot Babylon weggeworpen en
+nimmermeer teruggevonden."--"Heer, sprak Klaas, uw mond is vol
+grammoedigheid; maar zeg mij wanneer de heerschappij zal komen
+in dewelke de zachtmoedigen in pais op de wereld zullen kunnen
+leven?"--"Nooit! antwoordde de vreemdeling, zoolang de antichrist
+regeert, dat is de paus, die een vijand van licht en waarheid
+is."--"Ha! sprak Klaas, gij spreekt zonder eerbied van Onzen Heiligen
+Vader. Hij is onwetend van de wreede folteringen waarmede de arme
+protestanten gestraft worden." De vreemdeling antwoordde: "Zeker
+weet hij het, want het is op zijne bevelen dat zij worden om hals
+gebracht door den keizer, nu door den koning, die profijt trekt uit
+de verbeurdverklaringen, die van de gestorvenen erft en juist liefst
+de rijken uit hoofde van ketterije voor de Vierscharen daagt." Klaas
+antwoordde: "Overal spreekt men ervan in Vlaanderenland, ik moet het
+gelooven. Het vleesch des menschen is zwak, al is het ook koninklijk
+vleesch. Mijn arme Judocus!" En Klaas gaf alzoo te verstaan dat het
+uit een verachtelijk winstbejag is dat Zijne Majesteit de ketteren
+doet straffen. Mits de vreemdeling wilde voortgaan, antwoordde Klaas:
+"Gelief, Heere, met deze reden niet voort te gaan, want werden zij
+gehoord, ik zou het duur moeten bekoopen."
+
+... Klaas stond op om naar den kelder te gaan, waaruit hij met een
+kan bier terugkwam: "Ik ga de deur toedoen", sprak hij vervolgens,
+en de aanbrenger hoorde niets meer, want hij moest haastelijk het huis
+verlaten. Maar met valavond werd de deur weer geopend. De vreemdeling
+ging heen, maar weldra kwam hij weder kloppen, zeggende: "Klaas,
+'t is koud; ik weet niet waar slapen; verleen mij eene schuilplaats;
+niemand heeft mij zien binnenkomen; alles is stil." Klaas liet hem
+binnen, stak eene lanteerne aan en men zag hem,--den ketter den weg
+wijzend,--de trap opgaan en den vreemdeling brengen in een kleine
+dakkamer waarvan het venster uitzicht geeft in den hof.
+
+--Wie anders, riep Klaas uit, kan dat alles overgedragen hebben dan
+gij, deugniet van een vischverkooper? Stondt gij dien Zondag niet stijf
+als een paal aan uwe zulle, schijnheilig naar de zwaluwen te kijken?
+
+En hij wees naar Judocus Grijpstuiver, deken der vischverkoopers,
+die met zijn leelijke tronie tusschen het volk te zien was.
+
+De vischverkooper grijnslachte, toen hij hoorde dat Klaas aldus zich
+zelven verried. Allen die van 't gemeen, mannen, vrouwen en meidekens,
+zeiden tot elkaar:
+
+--Arme man, die woorden kosten hem het leven!
+
+Doch de griffier ging voort:
+
+--De ketter en Klaas spraken dien nacht en ook de zes volgende
+nachten langdurig met elkander; men kon den vreemdeling vele gebaren
+van dreigement of van zegening zien maken, de handen ten hemel zien
+heffen, als zijne gelijken in ketterije plegen te doen. Klaas scheen
+zijne reden goed te keuren. Voorzeker spraken zij die dagen, avonden
+en nachten smadelijk over de misse, de biecht, de aflaten en Zijne
+Koninklijke Majesteit....
+
+--Niemand heeft dat gehoord, sprak Klaas, en zonder bewijzen mag men
+mij daarvan niet beschuldigen!
+
+De griffier hernam:--Men heeft andere dingen gehoord. Als de
+vreemdeling den zevenden dag omtrent den valavond vertrok, hebt
+gij hem uitgeleide gedaan tot aan den paalsteen van Katelijne's
+akker. Daar vroeg de vreemdeling u wat gij gedaan hadt met de leelijke
+afgodenbeelden--en de baljuw sloeg een kruis--van de Allerheiligste
+Maagd, van Sint-Nikolaas en van Sint-Maarten? Gij antwoordet dat
+gij ze gebroken en in den put gesmeten hadt. Zij werden inderdaad,
+verleden nacht, in uwen put gevonden, en de stukken ervan liggen in
+de folterkamer.
+
+Op die rede scheen Klaas verstomd. De baljuw vroeg hem of hij niets
+te antwoorden had; Klaas zegde van neen.
+
+De baljuw vroeg hem of hij de vermaledijde gedachte niet herroepen
+wilde, die hem de beelden had doen breken, alsmede de goddelooze doling
+dewelke hem smadelijke woorden ten opzichte van Zijne Goddelijke
+Majesteit en ten opzichte van Zijne Koninklijke Majesteit had doen
+uitspreken.
+
+Klaas antwoordde dat zijn lijf aan Zijne Koninklijke Majesteit,
+maar dat zijn geweten aan Christus behoorde, wiens wet hij wilde
+opvolgen. De baljuw vroeg hem of die wet diegene van de Heilige
+Kerk was.
+
+--Zij staat geschreven in de Heilige Schrift, antwoordde Klaas.
+
+Aangemaand te antwoorden op de vraag of de Paus de Stadhouder van
+Christus op dees aarde is, sprak hij:
+
+--Neen!
+
+--Ondervraagd of hij geloofde dat het verboden was de beelden van
+de Heilige Maagd en van de Heiligen te aanbidden, antwoordde hij,
+dat het afgoderij was. Ondervraagd over het stuk of de oorbiecht goed
+is en heilzaam, antwoordde hij:
+
+--Christus heeft gezegd: Belijdt uwe zonden aan malkander.
+
+Hij was kloekmoedig in zijne antwoorden, hoewel hij in den grond
+treurig en angstig scheen.
+
+Acht uren had de klok geslagen en de avond viel: de heeren der
+rechtbank stelden de uitspraak uit tot den volgenden dag.
+
+
+
+
+LXXI.
+
+In Katelijne's hut weende Soetkin, waanzinnig van smerte. En gedurig
+sprak zij:
+
+--Mijn man! mijn arme man!
+
+Uilenspiegel en Nele omhelsden heur met oneindige teederheid. Zij
+drukte hen toen in heure armen en weende in stilte. Dan deed zij hun
+teeken heur alleen te laten. Nele sprak tot Uilenspiegel:
+
+--Laat heur, zij wil het; wij zullen de karolussen redden.
+
+En zij togen henen; Katelijne liep rond Soetkin en sprak:
+
+Maak open: mijne ziel wil er uit!
+
+En Soetkin, met strakke oogen, keek heur aan zonder heur te zien.
+
+De hutten van Klaas en van Katelijne paalden aaneen, die van Klaas
+stond wat achteruit en had een hofje van voren. Bij het huisje van
+Katelijne hoorde een boonenveld, dat op de straat uitgaf. Dat veld
+was afgesloten met een groene haag, waarin Uilenspiegel en Nele,
+toen ze jong waren, een gat gemaakt hadden, om bij malkander te komen.
+
+Uilenspiegel en Nele gingen in het boonenveld en van daar zagen zij
+den landsknecht welke, met waggelenden kop in de lucht spuwde, maar
+het speeksel viel terug op zijn wambuis. Een flesch lag nevens hem.
+
+--Nele, sprak Uilenspiegel stille, die dronken soldaat heeft niet
+genoeg gedronken, hij moet nog meer drinken. Eerst dan zullen wij
+hem meester zijn. Laat ons de flesch nemen.
+
+Bij den klank hunner stemmen, keerde de soldenier zijn zwaren kop
+naar hen toe; hij zocht zijne flesch en, die niet vindende, spuwde hij
+voort in de lucht om in den maneschijn zijn speeksel te zien vallen.
+
+--De brandewijn zit tot aan zijne tanden, sprak Uilenspiegel, ziet gij,
+Nele, hoe moeilijk hij spuwt?
+
+Als de soldenier opnieuw gespuwd en in de lucht gekeken had, stak hij
+de hand uit naar de flesch. Hij vond ze, zette ze aan zijn mond, stak
+zijn hoofd achteruit, klopte zachtjes op de flesch om er de laatste
+droppelen uit te halen en lokte er aan als een kind aan de borst
+zijner moeder. Er niets meer in vindende, smeet hij de flesch weg,
+vloekte toen in het Hoogduitsch, spuwde weer, liet den kop rechts en
+links vallen, knauwde een onverstaanbaar vaderons en sliep in.
+
+Uilenspiegel, die begreep dat die slaap niet van langen duur wezen
+zou, zegde dat zij hem nog zwaarder moesten doen ronken; hij kroop
+door de haag, nam de flesch van den dronkenlap, gaf ze aan Nele,
+die ze met brandewijn vulde.
+
+De soldaat snorkte door; Uilenspiegel kroop weder door het gat van
+de haag, stak de volle flesch tusschen de beenen van den dronkaard
+en keerde terug in het boonenveld, waar hij met Nele bleef wachten.
+
+De koelte van de versch gevulde flesch deed den soldaat de oogen
+openen, en onwillekeurig tastte hij naar het voorwerp, dat hem koude
+veroorzaakte.
+
+Zijn dronkaards-instinct zei hem, dat het wel eene volle flesch kon
+wezen, en hij greep ze vast. Uilenspiegel zag hem, in den maneschijn,
+de flesch schudden om te hooren of er iets in was, er van proeven,
+lachen en verwonderd zijn dat zij zoo vol was, dan een slok drinken,
+de flesch neerzetten, weernemen en nog drinken.
+
+Toen zong hij:
+
+
+    Komt in 't blauw heer Maneschijn
+    's Avonds bij vrouw Zee....
+
+
+Bij de Hoogduitschers is vrouwe Zee de gemalinne van heer Maan,
+die de meester der vrouwen is. Hij zong dus:
+
+
+    Komt in 't blauw heer Maneschijn
+    's Avonds bij vrouw Zee,
+    Vrouwe Zee dan biedt hem aan
+    Heet haar grooten roemer wijn,
+    Komt in 't blauw heer Maneschijn.
+
+    Met hem zal ze aan tafel gaan,
+    Om zijn hals haar armen slaan,
+    En is 't rijke maal gedaan,
+    In haar bed hem liggen gaan,
+    Komt in 't blauw de heere Maan.
+
+    Dien' me zoo mijn lievekijn,
+    Lekker eten, heeten wijn,
+    Dien' me zoo mijn lievekijn,
+    Komt in 't blauw heer Maneschijn.
+
+
+Na elk referein nam hij een slok en na het laatste ledigde hij de
+flesch. En toen viel hij in slaap. En hij hoorde niet dat Nele zegde:
+"Ze steken in eenen pot achter den brandmuur van den schoorsteen",
+noch dat Uilenspiegel langs het stalleken in de keuken van Klaas
+drong. Uilenspiegel hief de plaat van den brandmuur op, nam den pot en
+de karolussen en ging toen de karolussen begraven naast den steenput
+van Katelijne, daar hij wel wist dat men ze misschien in den put,
+doch geenszins er nevens zou zoeken.
+
+Vervolgens keerden zij terug bij Soetkin, die weende en zuchtte:
+
+--Mijn man! mijne arme man!
+
+Nele en Uilenspiegel bleven heel den nacht bij heur waken.
+
+
+
+
+LXXII.
+
+Den volgenden dag riep de burgstorm de rechters ter vierschare.
+
+Als zij op de vier banken rond den boom der justitie zaten,
+onderhoorden zij nogmaals Klaas en vroegen hem of hij zijne dolingen
+wilde herroepen.
+
+Klaas hief de handen ten hemel en sprak:
+
+--Christus, mijn Heer, ziet mij van omhoog. Ik bekeek de zonne toen
+mijn Thijl ter wereld kwam. Waar is hij nu, de zwerver? Soetkin,
+mijn goede, mijn zoete vrouwe, zult gij kloekmoedig zijn in 't ongeluk?
+
+Toen bezag hij den lindeboom en vloekte hij hem:
+
+--Storm en droogte! dat de boomen van den grond onzer vaderen liever
+verschroeien dan te gedogen, dat men in hunne schaduw het vrije
+geweten ten dood verwijst! Waar zijt gij, mijn jongen? Ik was hard
+jegens u Mijne Heeren, ontfermt U mijner, en oordeelt mij gelijk Onze
+Goedertieren Heere zou doen.
+
+En allen die hem aanhoorden, moesten weenen, behalve de rechters en
+Judocus Grijpstuiver.
+
+Toen vroeg hij of er voor hem geenerlei vergiffenis was, zeggende:
+
+--Ik heb altijd veel gewrocht en weinig gewonnen; ik was goed jegens
+den arme en gedienstig voor elkeen. Ik heb de Roomsche Kerke verlaten
+om te gehoorzamen aan den geest Gods, die tot mij sprak. Ik smeek om
+geen andere gratie dan de verandering van de straffe des vuurs in die
+van eeuwigdurende verbanning uit Vlaanderenland, op verbeurte mijns
+levens, straffe die voorwaar streng genoeg is.
+
+Allen riepen:
+
+--Genade, heeren! erbarming!
+
+Maar Judocus Grijpstuiver riep niet mede.
+
+De baljuw gaf de toehoorders teeken te zwijgen en zegde dat het door
+de plakkaten strengelijk verboden was, genade voor ketteren te vragen,
+maar dat, zoo Klaas zijne doling wilde afzweren, hij zou gehangen
+worden in stee van verbrand.
+
+En het volk sprak:
+
+--Gehangen of verbrand, 't is toch de dood!
+
+En de vrouwen weenden en de mannen morden.
+
+--Ik zweer niets af, sprak Klaas. Doet met mijn lijf wat uwer genade
+zal believen.
+
+Titelman, de deken van Ronse, riep toen uit:
+
+--Het is ondraaglijk zulk een kettergespuis tot zijne rechters het
+hoofd te zien verheffen; het lichaam tot assche verbranden is een
+kortstondige pijne; men moet de ziele redden en de ketteren, door
+middel van de torture, dwingen hunne dolingen af te gaan, opdat zij
+aan 't volk het gevaarlijk schouwspel niet geven van ketteren, die
+in onboetveerdigheid sterven.
+
+Op die rede weenden de vrouwen nog meer en zeiden de mannen:
+
+--Hij heeft het stuk bekend: 't is dus de straffe, maar niet de
+torture.
+
+De rechtbank besliste dat, mits de tortuur niet voorgeschreven was
+door de ordonnantiën, Klaas die niet moest verduren. Nogmaals tot
+afzweren vermaand, antwoordde hij:
+
+--Ik kan niet.
+
+Krachtens de plakkaten, werd hij plichtig verklaard aan simonie,
+wegens het verkoopen van aflaten, aan ketterije en aan het herbergen
+van ketters en als dusdanig werd hij veroordeeld om "geëxecuteerd
+te worden met den viere, zoo dat er de dood naar volge", vóór de pui
+van het schepenhuis.
+
+Zijn lichaam zou twee dagen aan den staak blijven hangen om tot
+voorbeeld te dienen en daarna gevoerd worden ter plaatse patibulaire,
+zooals zij het galgeveld heetten.
+
+De rechtbank kende den aanbrenger Judocus Grijpstuiver--wiens' naam
+niet genoemd werd--vijftig gulden op de eerste honderd karolusgulden
+der erfenis en den tienden penning op het overige toe.
+
+Als Klaas dat vonnis hoorde, sprak hij tot den deken der
+vischverkoopers:
+
+--Gij zult een kwaden dood sterven, slecht mensch, die voor een kleine
+som gelds eene weduw en eenen wees, twee ongelukkigen maakt.
+
+De rechters hadden Klaas laten uitspreken, want zij ook--behalve
+Titelman--voelden groote verachting voor den deken der vischverkoopers
+en zijne eerlooze aanklacht.
+
+Grijpstuiver was bleek van woede en van schaamte.
+
+En Klaas werd terug naar het Steen gebracht.
+
+
+
+
+LXXIII.
+
+Den volgenden dag, werd het vonnis aan Nele, Uilenspiegel en Soetkin
+bekend gemaakt.
+
+Zij vroegen den rechters om in het gevang te mogen gaan, hetwelk hun
+toegestaan werd, behalve aan Nele.
+
+Als zij binnenkwamen, zagen zij Klaas met een keten aan den muur
+geklonken. Een klein houtvuur smeulde in den heerd, ter oorzake van de
+wakheid. Want bij wet en recht is het in Vlaanderen voorgeschreven,
+goed te zijn voor hen die moeten sterven, en hun brood, vleesch of
+kaas, alsmede wijn te geven. Maar de schrokkige cipiers overtreden
+dikwijls de wet, en talrijk zijn zij, die het grootste en beste deel
+van het eten der arme gevangenen achterhouden.
+
+Weenend vloog Klaas om den hals van Uilenspiegel en Soetkin, maar
+hij was de eerste die ophield met weenen, want hij wilde sterk zijn,
+als man en als hoofd van het huis.
+
+Soetkin snikte en Uilenspiegel sprak:
+
+--Kon ik die ijzers breken.
+
+Soetkin snikte en sprak:
+
+--Ik zal bij koning Philippus gaan, hij zal genade verleenen.
+
+Klaas antwoordde:
+
+--De koning erft van de martelaren.
+
+Dan voegde hij er bij:
+
+--Lieve vrouw en kind! treurig en smertvol ga ik deze wereld
+verlaten. Zoo ik eenigen schrik koester voor het lijden mijns
+lichaams, ben ik mede bedroefd als ik er aan denk dat, als ik dood
+ben, gij beiden arm en ellendig zult zijn, want de koning zal u uwe
+have ontnemen.
+
+Uilenspiegel antwoordde met stille stemme:
+
+--Gisteren heb ik met Nele alles gered.
+
+--Dat doet mij genoegen, antwoordde Klaas; de aanbrenger zal niet
+lachen op mijn lijk.
+
+--Hij sterve, de judas, sprak Soetkin met haatvollen blik.
+
+Maar Klaas dacht aan de karolussen en sprak:
+
+--Dat was slim van u, Thijlken, mijn lieveling; Soetkin, mijn arme
+Soetkin, zal dus in haren ouden dag geen honger hoeven te lijden.
+
+En Klaas omhelsde heur, drukte heur tegen zijne borst, en zij snikte
+nog harder, bij de gedachte dat zij weldra heuren braven beschermer
+zou kwijt zijn.
+
+Klaas bezag Uilenspiegel en sprak:
+
+--Mijn zoon, dikwijls deedt gij kwaad, door langs de wegen te
+slenteren als de rabauwen; dat moogt gij nimmermeer doen, mijn kind,
+noch uw moeder alleen laten, want gij, als man, moet heur beschermer
+en verdediger zijn.
+
+--Dat zal ik, vader, sprak Uilenspiegel.
+
+--O mijn arme man! zei Soetkin hem kussend. Welke misdaad bedreven wij
+dan? Wij leefden getweeën gelukkig in eere en in deugd; wij beminden
+elkander, dat weet gij, Heere God, die ons ziet! Wij stonden vroeg
+op om te werken en 's avonds aten wij, U dankend, het zuur gewonnen
+brood van den dag. Ik ga naar den koning; ik zal hem verscheuren met
+mijne nagelen. Heere God, wij hebben niets misdaan!
+
+Maar de cipier kwam binnen en zei dat ze moesten vertrekken.
+
+Soetkin vroeg om te blijven. Klaas voelde heur arm gezicht branden
+tegen het zijne, en de tranen van Soetkin maakten zijne wangen nat,
+en heel heur lichaam trilde en huiverde in zijne armen. Hij vroeg om
+heur bij hem te laten.
+
+De cipier zei nog dat ze moesten henengaan en trok Soetkin uit de
+armen van Klaas.
+
+Klaas sprak tot Uilenspiegel:
+
+--Waak over haar.
+
+Uilenspiegel beloofde het hem. En de zoon de moeder ondersteunend,
+togen Uilenspiegel en Soetkin henen.
+
+
+
+
+LXXIV.
+
+Den volgenden dag, die de dag van de lijfstraffe was, namen de buren
+uit medelijden, Uilenspiegel, Soetkin en Nele mede naar Katelijne's
+huis en sloten hen op.
+
+Maar zij hadden er niet aan gedacht, dat zij van verre de kreten
+van den martelaar hooren en, door het venster, de vlammen van den
+brandstapel zien konden.
+
+Schuddebollend dwaalde Katelijne door de stad, roepende:
+
+--Maakt open: de ziel wil er uit!
+
+Te negen uren werd Klaas in zijn hemde, met de handen op den rug
+gebonden, uit de gevangenis gehaald. Volgens de sententie, was de
+brandstapel opgericht in de Onze-Lieve-Vrouwestraat, rondom een staak,
+die vóór de pui van 't schepenhuis geplaatst was. De beul en zijne
+knechten waren nog bezig met het hout opeen te stapelen.
+
+Klaas, omringd door zijne serjanten, wachtte geduldig, terwijl de
+provoost te peerd, de staffieren van 't baljuwschap en de negen uit
+Brugge ontboden landsknechten groote moeite hadden om het morrende
+volk tegen te houden.
+
+Allen zeiden dat het wreedheid was een man, die steeds goed, gedienstig
+en neerstig was, in zijn ouden dag aldus te martelen.
+
+Doch eensklaps knielden zij neder om te bidden. De doodklok begon
+te kleppen.
+
+De uitzinnige Katelijne stond vooraan in het volk.
+
+Naar Klaas en den brandstapel kijkend, sprak zij:
+
+--Het vuur! Het vuur! Maakt een gat: de ziel wil er uit.
+
+Als Soetkin en Nele de klokke hoorden, sloegen beiden een kruis. Maar
+Uilenspiegel deed het niet, zeggende dat hij God niet aanbad op de
+manier van de beulen. De hut rondloopend, beproefde hij deuren en
+vensteren open te breken, maar de buren, die buiten stonden, beletten
+het hem.
+
+Doch Soetkin sloeg eensklaps heur voorschoot vóór heur gezicht
+en gilde:
+
+--De rook!
+
+De drie bedroefden zagen een groote zwarte rookwolk dwarrelend omhoog
+stijgen. 't Was de rook van den brandstapel, waarop Klaas aan eenen
+staak was gebonden en dien de scherprechter aan drie kanten aangestoken
+had, in naam des Vaders, des Zoons en des Heiligen Geestes.
+
+Klaas keek rond zich, en als hij Soetkin en Uilenspiegel in de menigte
+niet zag, was hij tevreden dat zij hem niet zouden zien lijden.
+
+Klaas bad, het hout knetterde, de mannen morden, de vrouwen weenden,
+Katelijne sprak:--Doet het vuur uit, maakt een gat, de ziel wil er
+uit,--en de doodklok klepte, en ander gerucht hoorde men niet.
+
+Soetkin werd eensklaps bleek als de dood, zij huiverde over gansch
+heur lichaam en wees naar den hemel. Een lange, smalle vlam was uit
+den brandstapel opgestegen en verhief zich bijwijlen boven de daken
+van de lage huizen. De vlam was bitter smertelijk voor Klaas, want al
+naar gelang van de grillen des winds, knaagde zij aan zijne beenen,
+verschroeidde en verbrandde zij zijn haar en zijnen baard.
+
+Uilenspiegel drukte Soetkin in zijne armen en wilde heur van voor
+het venster trekken. Zij hoorden een bangen kreet: 't was Klaas,
+wiens lichaam aan eenen kant brandde. Maar hij zweeg en weende. En
+zijne borst was nat van zijne tranen.
+
+Toen hoorden Soetkin en Uilenspiegel een groot rumoer. 't Waren de
+poorters, vrouwen en kinderen die riepen:
+
+--Klaas werd niet veroordeeld om te sterven met zacht vuur, maar met
+groote vlammen. Beul, pook het vuur aan!
+
+De beul deed het, doch het vuur wilde niet laaien.
+
+--Verworg hem, riepen zij.
+
+En zij smeten steenen naar den provoost.
+
+--De vlam! de groote vlam! huilde Soetkin.
+
+Te midden van den rook, zag zij nu een roode vlam ten hemel stijgen.
+
+--Hij gaat sterven, sprak de weduw. God, ontferm U der ziele van
+den onschuldigen martelaar. Waar is de koning, dat ik hem met mijne
+nagelen het hert uitrukke?
+
+En de doodklok klepte.
+
+Soetkin hoorde Klaas nog een grooten kreet slaken, maar zij zag noch
+zijn lichaam dat zich wrong en kronkelde door de smerte des vuurs,
+noch zijn gezicht dat ineentrok, zijn hoofd dat hij langs alle kanten
+keerde en draaide en tegen den staak sloeg. Het volk ging voort met
+roepen en fluiten, de vrouwen en kinderen smeten nog steenen, toen
+plotseling heel de brandstapel ontgloeide, en allen, te midden van
+rook en van vlammen, Klaas hoorden zuchten:
+
+--Soetkin! Thijl!
+
+En zijn hoofd viel op zijne borst alsof het van lood was.
+
+En uit Katelijne's woning kwam een schellen, hertverscheurenden
+kreet. En toen hoorde men niets meer dan de uitzinnige, die
+schuddebollend sprak: "De ziel wil er uit".
+
+Klaas was dood. De brandstapel viel ineen aan den voet van den staak,
+aan denwelken het arme, verkoolde lichaam bij den hals bleef hangen.
+
+En de doodklep klepte.
+
+
+
+
+LXXV.
+
+Met gebogen hoofd en gevouwen handen stond Soetkin zwijgend tegen
+den muur van den keuken. En Uilenspiegel had zijne armen om heuren
+hals geslagen, zonder spreken of weenen.
+
+Hij was verschrikt van het koortsvuur dat in zijn moeders lichaam
+brandde.
+
+De buren, die terugkwamen, zeiden dat Klaas gedaan had met lijden.
+
+--Hij is in den hemel, sprak de weduw.
+
+--Bid voor hem, sprak Nele tot Uilenspiegel, en zij gaf hem heuren
+rozenkrans; maar hij stiet dien van zich af, omdat, zoo hij zeide,
+de bollekens door den paus gewijd waren.
+
+De nacht was gevallen en Uilenspiegel zei:
+
+--Moeder, ga slapen, ik zal bij u waken.
+
+--Gij moet niet waken, sprak Soetkin, want de slaap doet goed aan
+jonge menschen.
+
+Nele maakte hun elk eene legerstee in de keuken en ging toen henen.
+
+En zij bleven er getweeën, terwijl het vuur van de wortels in den
+heerd uitbrandde.
+
+Soetkin ging slapen, Uilenspiegel deed als zij en hoorde ze weenen
+in heur bedde.
+
+Buiten, in de nachtelijke stilte, deed de wind de boomen huilen lijk
+de zee en joeg, als voorboden van den herfst, dwarrelende stofwolken
+tegen de ruiten.
+
+Het scheen Uilenspiegel dat hij een man zag over en weer gaan, dat
+hij stappen hoorde in de keuken. Toen hij opkeek, zag hij den man
+niet meer; maar hij luisterde en hoorde alleen den wind, die in den
+schoorsteen huilde en Soetkin, die in heur bedde weende.
+
+Dan opnieuw hoorde hij stappen, en, achter zich, tegen zijn hoofd,
+een bangen zucht.--Wie is daar? sprak hij.
+
+Niemand antwoordde, maar hij hoorde drie kloppen op de
+tafel. Uilenspiegel, verschrikt en huiverend, vroeg nogmaals:--Wie is
+daar? Hij kreeg geen antwoord, maar hoorde drie kloppen op de tafel
+en voelde twee armen die hem vastgrepen, en over zijn gelaat zich
+een ruig lichaam buigen, dat een groot gat in de borst had en naar
+verbrand rook.
+
+--Vader, sprak Uilenspiegel, is het uw arm lichaam, dat aldus op
+mij drukt?
+
+Hij kreeg geen antwoord, en, hoewel de schimme omtrent hem was,
+hoorde hij buiten roepen: "Thijl! Thijl!" Soetkin stond schielijk op
+en kwam aan Uilenspiegel's bed. "Hoort gij niets?" vroeg zij hem.
+
+--'t Doet, vader die mij roept.
+
+Ik, sprak Soetkin, ik heb een koud lichaam in mijn bedde gevoeld;
+en de stroozakken schudden en de gordijnen gingen open en toe en
+'k hoorde eene stemme die sprak: "Soetkin"; eene stemme die zwak
+als een ademtocht was, en stappen zoo licht als het dansen der
+muggen. Vervolgens tot den Geest van Klaas sprekend, zegde zij:
+"Man, zoo gij iets begeert in den hemel alwaar God U opgenomen heeft,
+moet gij het zeggen, opdat wij uwen wil kunnen volbrengen."
+
+Eensklaps sloeg de wind met geweld de deur open en de kamer werd
+met stof vervuld, en Uilenspiegel en Soetkin hoorden in de verte een
+akelig ravengekras.
+
+Zij kwamen samen buiten en gingen naar den brandstapel.
+
+Het was stikdonker, behalve wanneer de gure Noordenwind de wolken in
+den hemel als herten voortjoeg en de bleeke maan heur zilveren licht
+ter aarde zond.
+
+Een stadsserjant stond op wacht bij den brandstapel. Soetkin en
+Uilenspiegel hoorden den klank zijner stappen op den harden grond en
+het gekras eener raaf, die zekere raven bijriep, want het werd in de
+verte beantwoord door andere raven.
+
+Als Uilenspiegel en Soetkin bij den brandstapel waren, viel de raaf
+op Klaas' schouderen neer, en zij hoorden heur pikken in het lijk,
+en andere raven vlogen weldra bij.
+
+Uilenspiegel wilde op den brandstapel springen om de raven te verjagen;
+de serjant sprak tot hem:
+
+--Tooveraar, 't is nuttelooze moeite die gij doen gaat, weet dat de
+handen van verbranden het vermogen niet hebben onzichtbaar te maken
+als die van gehangenen.
+
+--Heer serjant, antwoordde Uilenspiegel, ik ben geen tooveraar, maar
+de wees van hem die daar hangt, en deze vrouw is zijne weduwe. Wij
+willen hem nogmaals kussen en een weinig van zijne assche meenemen,
+tot gedenkenis. Laat het ons toe, heer, gij die geen vreemd soldenier,
+maar een zoon van Vlaanderen zijt.
+
+--Doet als gij vraagt, antwoordde de serjant.
+
+De wees en de weduw klommen op het verkoold hout en kwamen bij het
+lijk; weenend kusten zij Klaas zijn gezicht.
+
+Ter plaats van het hert, waar de vlam een groot gat had geknaagd, nam
+Uilenspiegel een weinig asch van den doode. Vervolgens nederknielend,
+begonnen zij te bidden. En toen de ochtendschemering de kimmen lichtte,
+zaten beiden daar nog; doch de sergeant deed hen heengaan, uit vreeze
+voor straf.
+
+Thuis, nam Soetkin een stukje roode en een stukje zwarte zijde; zij
+maakte een zakje van, in hetwelk zij de assche stak; en zij naaide
+twee linten aan het zakje, opdat Uilenspiegel het om den hals kon
+dragen. Zij langde hem het zakje en sprak:
+
+--Dat deze assche, die het hert van mijn man is, dit rood, dat zijn
+bloed is, dit zwart, dat onze rouw is, steeds op uwe borst blijve,
+als een vuur van wrake voor zijne beulen!
+
+--Dat zal, zwoer Uilenspiegel.
+
+En de weduw kuste den wees, en de zonne stond op.
+
+
+
+
+LXXVI.
+
+'s Anderen daags kwamen de serjanten en omroepers der gemeente in de
+hut van Klaas, om al het huisraad op straat te brengen en publiek te
+verkoopen. Van uit Katelijne's huis zag Soetkin de wieg van ijzer en
+kooper beneden komen die, van vader tot zoon, altijd in Klaas' huis
+was geweest, waarin de arme doode geboren was en ook Uilenspiegel ter
+wereld kwam. Vervolgens bracht men ook het bedde beneden, in hetwelk
+Soetkin heuren zoon had ontvangen. En vervolgens de schapraai, en
+de ketels, pateelen en potten, die niet meer blonken lijk weleer,
+maar nu vuil van het stof waren.
+
+En ook eene tonne enkele en een klein vaatje dobbele kuite en, in
+een groote mande, ten minste dertig flesschen wijn; en alles werd op
+straat gezet, tot den laatsten stoel uit het huis.
+
+Met bloedend herte, doch zonder klagen, zag zij zich heur nederigen
+rijkdom, alle die herinneringen van vroeger, alle die vrienden
+ontnemen. De omroeper stak de keers aan en het huisraad werd stuk
+voor stuk verkocht. De keers was bijkans op, als de deken der
+vischverkoopers alles tegen een spotprijs gekocht had om het voort
+te verkoopen. Hij scheen vergenoegd als een wezel, die de hersenen
+eener henne uitzuigt.
+
+Uilenspiegel zei in zich zelven: "Gij zult niet blijven lachen,
+moordenaar."
+
+De verkoop was gedaan en nochtans bleven de serjanten overal zoeken,
+zonder de karolussen te vinden. De vischverkooper riep:
+
+--Gij zoekt slecht: ik weet dat Klaas voor zes maanden zevenhonderd
+karolussen bezat.
+
+Uilenspiegel zei in zich zelven: "Gij zult niet erven, moordenaar."
+
+Eensklaps keerde Soetkin zich naar hem en sprak, met den vinger naar
+den vischverkooper wijzend:
+
+--Dáár is de aanbrenger!
+
+--Ik weet het, zei Uilenspiegel.
+
+--Duldt gij, sprak zij, dat hij uws vaders bloed erve?
+
+--Nog liever zat ik een heelen dag op de pijnbank, antwoordde
+Uilenspiegel.
+
+--Ik ook, sprak Soetkin, maar spreek niet uit medelijden, hoe groot
+ook de smerte weze die ik lijde.
+
+--Eilaas! gij zijt eene vrouwe, zei Uilenspiegel.
+
+--Arme jongen, sprak Soetkin, ik bracht u ter wereld en kan tegen
+'t lijden. Maar gij, als ik u zag.... Vervolgens verbleekend: Ik zal
+de Heilige Maagd bidden, die heuren zoon aan het kruis zag....
+
+En zij weende, en kuste Uilenspiegel.
+
+En aldus sloten zij een verdrag, dat hun haat en hunne kracht
+versterkte.
+
+
+
+
+LXXVII.
+
+De vischverkooper moest maar de helft van de koopsom betalen, mits de
+andere helft hem als aanbrenger toekwam, tot dat men de zevenhonderd
+gouden karolussen vond, die hem tot zijn eerlooze daad aangezet hadden.
+
+Soetkin weende 's nachts en werkte 's daags in het huishouden. Dikwijls
+hoorde Uilenspiegel haar in zich zelve zeggen:
+
+--Als hij erft, laat ik mij dooden.
+
+Nele en hij, wisten dat zij doen zou wat zij zeide; zij deden hun
+best om Soetkin te bewegen naar Walcheren te trekken, alwaar zij magen
+had. Soetkin wilde niet, zeggende dat zij zich niet verwijderen wilde
+van den bodem, die weldra heur gebeente zou ontvangen.
+
+Ondertusschen ging de vischverkooper opnieuw tot den baljuw en zegde,
+dat de aflijvige voor eenige maanden zevenhonderd karolussen geërfd
+had, dat Klaas een spaarzam man was en dat hij dus die groote som
+niet verteerd had, maar dat ze ergens verborgen moest zijn.
+
+De baljuw vroeg hem wat kwaad Uilenspiegel en Soetkin hem hadden gedaan
+om, na den eenen zijn vader en de andere heuren man te hebben ontnomen,
+hen nu nog zoo wreedelijk te vervolgen.
+
+De vischverkooper antwoordde dat hij, als hoogpoorter van Damme,
+de wetten van den lande wilde doen eerbiedigen om 's keizers
+goedertierenheid te verwerven.
+
+Daarop liet hij in handen van den baljuw een geschrevene aanklacht en
+hij bracht getuigen, die, in volle waarheid sprekende, huns ondanks
+moesten bevestigen, dat de vischverkooper niet loog.
+
+Op die getuigenissen verklaarden de heeren van de Schepenkamer,
+dat de vermoedens van plichtigheid voldoende waren om de torture toe
+te passen. Dienvolgens lieten zij het huis opnieuw afzoeken door de
+serjanten, die last hadden moeder en zoon naar het Steen te brengen,
+alwaar zij zouden opgesloten blijven, tot dat de scherprechter van
+Brugge kwam, die men op staanden voet had ontboden.
+
+Toen Soetkin en Uilenspiegel gekoord en gebonden door de straat kwamen,
+stond de vischverkooper aan zijne deur naar hen te kijken.
+
+En de poorters en poorteressen van Damme stonden ook aan hunne
+deur. Mathijssen, de naaste gebuur van den vischverkooper, hoorde
+Uilenspiegel tot den lafaard zeggen:
+
+--Gij, die eene weduwe martelt, wordt gedoemd door den Heere!
+
+En ook Soetkin, die zei:
+
+--Gij, die eenen wees vervolgt, zult een kwaden dood sterven!
+
+Toen die van Damme aldus vernomen hadden dat het op een tweede
+aanklacht van Grijpstuiver was, dat men moeder en zoon naar 't gevang
+bracht, jouwden zij den vischverkooper uit en smeten 's avonds steenen
+in zijne ruiten. En zijne deur werd vol vuiligheid bestreken.
+
+En hij dorst niet meer buitenkomen.
+
+
+
+
+LXXVIII.
+
+Omtrent tien uur des voormiddags werden Soetkin en Uilenspiegel in
+de folterkamer gebracht.
+
+Daar waren de baljuw, de griffier en de schepenen, de beul van Brugge,
+zijn knecht en een chirurgijn-baardemaker.
+
+De baljuw vroeg aan Soetkin of zij niets achterhield dat den keizer
+toekwam. Zij antwoordde dat zij, mits zij niets bezat, niets kon
+achterhouden.
+
+--En gij? vroeg hij aan Uilenspiegel.
+
+--Voor zeven maanden, antwoordde hij, erfden wij zevenhonderd
+karolussen; eenigen daarvan zijn verteerd. En ik weet niet waar de
+andere zijn, maar ik denk dat de reiziger, die tot onzen rampspoed
+ten onzent verbleef, die heeft medegenomen, want nooit heb ik thuis
+karolussen gezien.
+
+De baljuw vroeg toen nog eens of beiden in hun gezegde bleven
+volherden.
+
+Zij antwoordden, dat zij geenerlei goed achterhielden dat den keizer
+toekwam.
+
+Ernstig doch vol medelijden, sprak de baljuw:
+
+Mits de lasten tegen u beiden zwaar zijn, zult gij, zoo gij geen
+bekentenis doet, de pijnbank moeten verduren.
+
+--Spaar de weduw, sprak Uilenspiegel. De vischverkooper heeft alles
+gekocht wat er was.
+
+--Arme jongen, sprak Soetkin, de mannen kunnen geen smerten als de
+vrouwen verdragen.
+
+Als zij zag dat Uilenspiegel om harentwille wit als een doode was,
+zeide zij nog:
+
+--Ik haat en 'k ben sterk.
+
+--Spaar de weduw, sprak Uilenspiegel.
+
+--Neem mij in zijne plaats, zei Soetkin.
+
+De baljuw vroeg aan den beul of alles gereed was om de waarheid
+te ontrukken.
+
+De beul antwoordde:
+
+Alles is gereed.
+
+De rechters, na beraadslaagd te hebben, besloten dat men moest beginnen
+met de vrouw, om 't stuk te doen bekennen.
+
+--Want, sprak een der schepenen, geen zoon is zoo wreedaardig dat hij
+zijne moeder kan zien lijden, zonder te bekennen om heur te verlossen.
+
+De baljuw sprak tot den scherprechter:
+
+--Zet de vrouw op den stoel en doe de stokskens aan heure handen
+en voeten.
+
+De beul gehoorzaamde.
+
+--Ho! doet dat niet, mijne heeren, riep Uilenspiegel. Bindt mij vast
+in heure plaats, breekt mijne vingeren en teenen, maar spaart heur!
+
+--De vischverkooper! riep Soetkin. Ik haat en 'k ben sterk.
+
+Uilenspiegel werd nog bleeker, beefde en zweeg.
+
+De stokskens, die van palmhout waren, werden tusschen de vingeren
+gestoken. Door middel van koordjes waren zij tot een zoo vernuftigen
+toestel gemaakt, dat de beul naar den wil van den rechter, al
+de vingeren kon pletteren, of den lijder maar een geringe pijn
+veroorzaken.
+
+Hij stak de stokskens tusschen de vingeren en teenen van Soetkin.
+
+--Trek aan, zei de baljuw.
+
+De hangman deed het wreedelijk.
+
+Toen sprak de baljuw tot Soetkin:
+
+--Zeg mij waar de karolussen liggen.
+
+--Ik weet het niet, antwoordde zij zuchtend.
+
+--Nijp harder, sprak hij.
+
+Uilenspiegel wilde zijne armen losrukken, die op zijnen rug waren
+gebonden, om Soetkin te hulpe te komen.
+
+--Doet niet prangen, heeren rechters, het zijn teere en broze
+vrouwenvingeren. Een vogeltje zou ze aan stukken pikken. Prangt niet;
+heer scherprechter, ik spreek geenszins tot u, want gij moet doen
+wat die heeren u heeten. Spant niet, hebt medelijden.
+
+--De vischverkooper! riep Soetkin.
+
+En Uilenspiegel zweeg.
+
+Doch, als hij zag dat de beul de stokskens harder deed spannen,
+riep hij opnieuw:
+
+--Erbarming, heeren! Daar breekt gij heure vingeren die zij noodig
+heeft om te werken. Laas! heure voeten, nu zal zij niet meer kunnen
+gaan! Erbarming, heeren!
+
+--Vischverkooper, gij zult een bangen dood sterven! riep Soetkin.
+
+En heure beenderen kraakten en 't bloed van heure voeten gutste
+ten gronde.
+
+Uilenspiegel zag het en sprak, bevend van smert en van gramschap:
+
+--Vrouwenbeenderen, breekt ze toch niet, heeren rechters.
+
+--De vischverkooper! zuchtte Soetkin.
+
+En heure stem was zacht als de stem van eene schim.
+
+--Heeren rechters, de handen en voeten zijn rood van 't bloed. Men
+heeft heure beenderen gekraakt.
+
+De chirurgijn-baardemaker raakte ze aan, en Soetkin stiet een kreet
+van smerte.
+
+--Beken in heure plaats, zei de baljuw tot Uilenspiegel.
+
+Maar Soetkin bezag hem met opengesperde oogen, als die van een
+doode. En hij begreep dat hij niet spreken mocht, en weende zonder
+een woord te uiten.
+
+--Daar die vrouwe de kloekmoedigheid des mans heeft, sprak toen de
+baljuw, moet men ze beproeven door heuren zoon onder heure oogen uit
+te rekken.
+
+Soetkin hoorde niet, want zij lag in bezwijming, door de pijnen die
+zij uitstond.
+
+Men deed ze met azijn tot heur zelve komen.
+
+Vervolgens werd Uilenspiegel ontkleed en bloot voor de oogen zijner
+moeder gesteld. De beul scheerde hem zijn haar af, om te zien of
+hij geenerlei tooverteeken verbolgen hield. Toen zag hij op zijn
+rug een zwarte geboortevlek. Verscheidene reizen stak hij er in met
+een lange naalde; er kwam bloed uit, en hij was van oordeel dat het
+litteeken geen tooverije verborg. Op 't bevel van den baljuw, werden
+Uilenspiegel's handen gebonden met twee koorden, die rond een wielken
+aan een zolderbalk hingen, zoodat de beul, op bevel van de rechters,
+hem met geweldige schokken kon optrekken en weer laten vallen; dit
+deed hij wel negen reizen, na vooraf aan elk been een gewicht van
+vijf en twintig pond te hebben gebonden.
+
+Bij den negenden schok, scheurde de huid en werden polsen en enkels
+ontwricht.
+
+--Belijd, sprak de baljuw.
+
+--Neen, antwoordde Uilenspiegel.
+
+Soetkin bezag heuren zoon, doch zij had de kracht niet om te roepen
+of te spreken; zij stak alleenlijk heure bloedige handen uit, ten
+teeken dat men die folteringen zou staken.
+
+Maar de beul trok Uilenspiegel nogmaals op, om hem te laten vallen. En
+het vel der polsen en enkels scheurde erger en zijn voeten werden
+nog erger ontwricht; doch hij schreeuwde niet.
+
+Soetkin weende en zwaaide met heure bloedige handen.
+
+--Belijd, sprak de baljuw, en gij krijgt vergiffenis.
+
+--De vischverkooper heeft vergiffenis noodig, antwoordde Uilenspiegel.
+
+--Is 't om met de rechters te spotten? vroeg een der schepenen.
+
+--Spotten? Laas, antwoordde Uilenspiegel, ik heb er geen lust toe,
+ge moogt mij gelooven.
+
+Soetkin zag toen den beul, op bevel van den baljuw, een fornuis
+aanstoken, terwijl een beulsknecht twee keersen deed branden.
+
+Zij wilde rechtstaan op heure vermorzelde voeten, doch zij viel terug,
+uitroepende:
+
+--Weg met dat vuur! Ach! heeren rechters, spaart zijne jeugd. Weg
+met dat vuur!
+
+--De vischverkooper! riep Uilenspiegel, heur ziende wankelen.
+
+--Trek Uilenspiegel een voet boven den grond, sprak de baljuw; stel
+het fornuis onder zijne voeten en eene keers onder elken oksel.
+
+De beul gehoorzaamde. Het haar onder de okselen knetterde en schroeide
+onder de vlamme.
+
+Uilenspiegel schreeuwde, en Soetkin sprak weenend:
+
+--Doe dat vuur weg.
+
+--Belijd, sprak de baljuw, en gij zult verlost zijn. Belijd voor
+hem, vrouwe.
+
+En Uilenspiegel sprak:
+
+--De vischverkooper verdient het eeuwige vuur!
+
+Soetkin schudde het hoofd tot teeken dat zij niets te zeggen
+had. Uilenspiegel knarste op zijne tanden, en weenend keek Soetkin
+met verwilderde oogen naar heuren zoon.
+
+Nochtans toen de beul de keersen uitgeblazen had en het gloeiend
+fornuis onder Uilenspiegels voeten plaatste riep zij uit:
+
+--Heeren rechters, hebt medelijden met hem, hij weet niet wat hij zegt.
+
+--En waarom niet? vroeg de baljuw listiglijk.
+
+--Ondervraagt heur niet, heeren rechters, sprak Uilenspiegel, gij
+ziet wel dat de smert heur waanzinnig maakt. De vischverkooper heeft
+gelogen.
+
+--Spreekt gij als hij, vrouw? vroeg de baljuw.
+
+Soetkin knikte van ja.
+
+--Verbrandt den vischverkooper! riep Uilenspiegel.
+
+Soetkin zweeg, hief den arm tot vermaledijding omhoog.
+
+Doch als zij het fornuis zag gloeien onder de voeten haars zoons,
+riep zij uit:
+
+--Heere God! Heilige Maria, die in de hemelen zijt, stelt toch een
+einde aan die marteling! Ontferming! Doe het vuur weg!
+
+--De vischverkooper! zuchtte Uilenspiegel nog.
+
+Hij spuwde bloed door den mond en de neusgaten, en hij bleef met
+gebogen hoofde, boven de gloeiende kolen hangen.
+
+Toen riep Soetkin:
+
+--Hij is dood! Zij hebben hem vermoord! Ha! hem ook! Rechters, doet
+het vuur weg! Laat mij hem in mijne armen nemen, om getweeën te
+sterven. Gij weet dat ik niet kan wegloopen, met mijn gebroken voeten.
+
+--Geef de weduw haren zoon, sprak de baljuw.
+
+Vervolgens gingen de rechters tot beraadslaging over.
+
+De hangman maakte Uilenspiegel los en legde hem naakt en met bloed
+overdekt op den schoot zijner moeder, terwijl de chirurgijn-baardemaker
+de beenderen weer in de gewrichten bracht.
+
+En Soetkin kuste Uilenspiegel, en weende en sprak:
+
+Mijn zoon, arme martelaar! Ik zal u genezen, zoo de heeren rechters het
+gedoogen; maar wordt toch wakker, Thijl, mijn zoon! Heeren rechters,
+als gij hem gedood hebt, zal ik tot Zijne Majesteit gaan; want gij
+hebt gehandeld tegen wet en recht, en gij zult zien wat een arme
+vrouwe tegen de boozen vermag. Maar, heeren rechters, laat ons in
+vrijheid. De hand Gods valt zwaar op ons neder, en wij zijn slechts
+getweeën op de wereld.
+
+Na beraadslaging, brachten de rechters de volgende sententie uit:
+
+"Omme dieswille dat gij, Soetkin, weduwvrouwe van Klaas, en gij, Thijl,
+zoon van Klaas, in de wandelinge Uilenspiegel, beschuldigd het goed
+geroofd te hebben dat door verbeurdverklaring, niettegenstaande alle
+privileges, aan Zijne Koninklijke Majesteit toebehoorde, in weerwil
+van de pijnbank en voldoende beproevingen, niets beleden hebt;
+
+"Overwegende het gebrek aan bewijzen, en gezien den erbarmlijken
+staat uwer ledematen, vrouwe, en de tortuur die gij onderstaan
+hebt, man, verklaart de vierschaar u beiden vrij en staat u toe,
+niettegenstaande uwe armoede, te wonen bij hem of heur van de stede,
+waar het u believen zal.
+
+"Aldus gewijsd ende geprononcieerd te Damme, den drij en twintigsten
+van Wijnmaand van 't jaar onzes Heeren 1558."
+
+--Weest gezegend, heeren rechters, sprak Soetkin.
+
+--De vischverkooper! zuchtte Uilenspiegel.
+
+En moeder en zoon werden op eene kar naar 't huis van Katelijne
+gevoerd.
+
+
+
+
+LXXIX.
+
+In dat jaar, het acht en vijftigste der eeuw, kwam Katelijne bij
+Soetkin binnen en sprak:
+
+"Dezen nacht heb ik mij laten vervoeren, door middel van eenen stok
+met zalve bestreken, naar den Onze-Lieve-Vrouwetoren. Daar zag ik de
+sylphen de gebeden der menschen overgeven aan de engelen, dewelke naar
+het hoogste der hemelen vlogen om ze naar den troon Gods te dragen. En
+heel het hemelrijk was met fonkelende sterren bezaaid. Eensklaps
+verhief zich van op een brandstapel een zwarte gedaante, die omtrent
+mij op den toren kwam zitten. Ik herkende Klaas gelijk hij was in
+zijn leven, met zijne kooldragerskleeren.--Wat doet gij hier op
+Onze-Lieve-Vrouwetoren? vroeg hij mij,--Maar gij zelf, antwoordde
+ik, waar gaat gij henen, vliegend door de lucht als eene zwaluw?--Ik
+ga, sprak hij, naar het oordeel; hoort gij de trompet van den engel
+niet? Ik stond dicht tegen hem, en voelde dat zijn lichaam niet vast
+was gelijk dat der levenden, maar zoo licht dat ik er doorging als
+door een warmen damp. Aan mijne voeten, heel Vlaanderenland door,
+flikkerden eenige lichtjes, en ik sprak in mij zelve: Zij die vroeg
+opstaan en spade werken, zijn gezegend door God.
+
+En heel den nacht hoorde ik de trompet van den engel schallen. En ik
+zag een andere gedaante omhoog stijgen; ze kwam uit Spanje; deze was
+oud en afgeleefd; siroop van kweeperen hing nog aan hare lippen. Om de
+schouders droeg zij een karmozijnpannen mantel, gevoerd met hermelijn,
+op het hoofd eene keizerskroon, in de eene hand eene ansjovis, in de
+andere een beker bier.
+
+Zij kwam, zeker uit vermoeienis, op Onze-Lieve-Vrouwetoren
+zitten. Nederknielend vroeg ik haar: Gekroonde Majesteit, vol eerbied
+lig ik voor U neder, doch ik ken U niet. Van waar komt gij, wat doet
+gij op de wereld?--Ik kom, sprak zij, van Sint-Just in Estramadura,
+en was keizer Karel de vijfde.--Maar, vroeg ik, waar vaart gij henen,
+in dien kouden nacht, door dien hemel vol hagelwolken?--Ik ga, was
+het antwoord, naar het oordeel.
+
+Als de keizer zijne ansjovis wilde eten en zijn bier wilde drinken,
+schalde de trompet van den engel. En de keizer verhief zich in de
+lucht, grommend omdat hij niet voorteten kon. Ik volgde Zijne Heilige
+Majesteit. Hij vloog door het luchtruim, hijgend van vermoeienis,
+blazend van aamborstigheid, en soms brakend, want hij was van overdaad
+gestorven. Wij klommen hooger en hooger, gelijk de pijlen uit eenen
+boog van kornoelje-hout. De sterren vlogen ons voorbij en lieten
+vurige strepen na. De trompet des engels weerschalde, met een machtig,
+klaterend geweld. Bij elk geschal dat door de ruimte klonk, sloeg
+de lucht uiteen, alsof een orkaan had geblazen. En aldus werd de weg
+gebaand. Duizend uren hoog en nog meer, zagen we Christus, in al zijn
+heerlijkheid op een sterrentroon gezeten. Aan zijne rechterzijde, zat
+de engel die de daden der menschen opteekent in een bronzen boek, en
+aan zijne linkerzijde, Maria, zijne moeder, die de zondaren voorsprak.
+
+Klaas en keizer Karel knielden neder voor den troon.
+
+De engel sloeg den keizer de krone van 't hoofd:--Christus alleen is
+keizer, sprak hij.
+
+Zijne Heilige Majesteit scheen verstoord, doch nederig vroeg hij:
+Zou ik dit ansjovisje en dit bier niet mogen behouden, want 'k heb
+honger van die lange luchtvaart?--Gelijk heel uw leven, antwoordde
+de engel; nu, eet en drink maar.
+
+Als hij gedaan had, vroeg Christus:
+
+--Komt gij met zuivere ziele naar 't oordeel?
+
+--Ik hoop het, zoete heer Jezus, want ik heb gebiecht, antwoordde
+keizer Karel.
+
+--En gij, Klaas? vroeg Christus; gij beeft niet lijk die keizer.
+
+--Heer Jezus, antwoordde Klaas, geenerlei ziele is teenemaal zuiver,
+doch ik heb geen angst voor U, die het opperste goed en de opperste
+rechtveerdigheid zijt; maar ik vrees voor mijne zonden, die groot in
+getal waren.
+
+--Spreek, aardworm, sprak de engel tot den keizer.
+
+--Heer, antwoordde Karel met verlegene stem, gezalfd door de hand uwer
+priesteren, werd ik koning van Castilië, keizer van Duitschland en
+Roomsch koning gewijd. Steeds nam ik de instandhouding van de macht,
+die van U komt, ter herte, en ik ging de ketterije te keer te vuur
+en te zweerd, met put en galg.
+
+--Leugenaar, sprak de engel, gij wilt ons bedriegen. In Duitschland
+duldet gij de ketteren, want gij vreesdet hen, maar gij deedt ze
+onthalzen, branden, hangen en levend begraven in de Nederlanden,
+dáár waar gij vreesdet niet genoeg te erven van die noeste bijen, zoo
+rijk aan honig. Honderd duizend menschen werden ter dood gebracht,
+niet omdat gij Christus, mijnen Heere, bemindet, maar omdat gij
+een dwingeland, een landverwoester waart, die niemand bemindet, dan
+zichzelven, en daarna het vleesch, de visch, het bier en den wijn,
+want gij waart gulzig als een hond en dronkt als eene spons.
+
+--En gij, Klaas, spreek, zegde Christus.
+
+Doch de engel stond recht en sprak:
+
+--Deze heeft niets te zeggen. Hij was goedhertig, neerstig, gelijk
+heel het Vlaamsche volk, dat geerne werkt en geerne lacht, dat den
+eed gestand bleef, denwelken het aan zijne vorsten gezworen had, in
+den waan dat zijne vorsten ook den hunne zouden houden. Hij had geld,
+hij werd in beschuldiging gesteld, en omdat hij een ketter gehuisd had,
+werd hij levend verbrand.
+
+Maria sprak toen:--Arme martelaar! doch in het hemelrijk zijn frissche
+bronnen, fonteinen die melk en wijn spuiten; kom mee, kooldrager,
+ik zal u leiden.
+
+Nogmaals schalde de trompet van den engel en, van uit het diepste des
+afgronds, zag ik een schoonen, naakten man verrijzen, met een ijzeren
+krone op 't hoofd. En op den band van de krone stond geschreven:
+Droef tot op den dag der gerechtigheid.
+
+Hij naderde den troon en zeide tot Christus:
+
+--Ik ben uw slaaf tot dat ik uw meester worde.
+
+--Satan, sprak Maria, eens komt een dag waarop er geen meesters noch
+slaven meer zijn, waarop Christus dewelke liefde is, en Satan, die
+de hoogmoed is, beteekenen zullen: Macht en kennis.
+
+--Vrouwe, gij zijt goed en schoon, zegde Satan.
+
+En naar den keizer wijzend, vroeg hij aan Christus:
+
+--Wat moet ik hiermee doen?
+
+Christus antwoordde:
+
+--Dien gekroonden worm zult gij brengen in eene zaal, waar al de
+foltertuigen verzameld zijn, die onder zijne regeering gebruikt
+werden. Telkens dat een arme onschuldige de pijne des waters
+verduren zal, die de menschen opzwelt lijk blazen; of de pijne der
+keersen, die hunne voetzolen en okselen verbranden; of de pijne
+der radbraking, die de ledematen plettert; of de pijne der olie;
+telkens dat een vrije ziel op den brandstapel den laatsten snik
+zal geven, moet hij op zijne beurt dien dood, die smerten verduren,
+opdat hij leere hoeveel kwaad een onrechtveerdig man doen kan, die
+over millioenen gebiedt; hij verga in de gevangenissen, hij sterve
+op de brandstapels, zuchte in ballingschap, ver van het Vaderland;
+hij worde geschavotteerd, ontpoorterd, gegeeseld, gebrandmerkt; hij
+weze rijk, opdat de bedezetters hem alles ontnemen; de afgunstige
+klage hem aan en de verbeurdverklaring brenge hem ten onder. Gij zult
+van hem maken een ezel, opdat hij zachtzinnig, mishandeld en slecht
+gevoed weze; een arme, opdat hij bedele en beleedigingen erlange; een
+arbeider, opdat hij zich afbeule en niet genoegzaam te eten krijge;
+vervolgens, als hij als mensch naar ziel en lichaam alles geleden
+heeft, maakt gij van hem een hond, opdat hij braaf weze en slagen
+krijge; een slaaf, omdat hij aan den meestbiedende verkocht worde;
+een soldenier, opdat hij vechte voor anderen en zich late dooden
+zonder te weten waarom. En als hij na afloop van driehonderd jaar
+aldus alle smerten, alle ellenden geproefd heeft, zult gij er een
+vrijen man van maken. Is hij in dien staat goed, gelijk Klaas was,
+geef dan in een lachend, lommerig oord, onder een schoonen boom, de
+eeuwige ruste aan zijn gebeente, en zijne vrienden zullen aan zijn
+graf komen weenen en bloemen strooien ter zijner gedachtenis.
+
+--Genade, mijn zoon, zeide Maria, hij wist niet wat hij deed, want
+macht doet het herte versteenen.
+
+--Geene genade, sprak Christus.
+
+--Ach, zeide Zijne Majesteit, had ik slechts een glas wijn van
+Andalusië.
+
+--Kom, sprak Satan, 't is uit met wijn, met gebraad en gevogelte.
+
+En naar het diepste der helle bracht hij de ziele van den armen keizer,
+die nog van zijn stukje ansjovis at.
+
+Uit medelijden liet Satan hem begaan. Dan zag ik die Heilige Maagd,
+die Klaas naar het hoogste des hemelrijks leidde, daar waar de sterren
+met trossen aan 't gewelf hangen. En daar waschten de engelen hem,
+tot dat hij schoon en jong was. En zij gaven hem rijstpap met zilveren
+lepels. En de hemel sloot zich."
+
+--Hij is in den hemel, sprak de weduwe.
+
+--De assche klopt op mijn hert, zei Uilenspiegel.
+
+
+
+
+LXXX.
+
+Gedurende de volgende drie en twintig dagen, werd Katelijne bleek en
+mager, en dorde zij, alsof zij verteerd werd door een inwendig vuur.
+
+Zij riep niet meer: Het vuur! Maakt open! mijn ziel wil er uit! doch
+in vervoering sprak zij gedurig tot Nele: Bruid ben ik; bruid moet
+gij wezen. Schoon is hij; lang haar; vurige liefde; koude knieën en
+koude armen!
+
+En Soetkin bezag haar treuriglijk, en dacht dat het een nieuwe uiting
+van waanzin was.
+
+Heure rede vervolgend, sprak Katelijne:
+
+--Driemaal drie is negen, een heilig getal. Hij alleen die 's nachts
+fonkelende oogen als katoogen heeft, ziet de geheimenis.
+
+Toen Soetkin heur op een avond zoo bezig hoorde, schudde zij
+vertwijfeld het hoofd. Doch Katelijne sprak:
+
+--Vier en drie, ongeluk onder Saturnus; onder Venus, een
+bruiloftgetal. Koude armen! Koude knieën! Een herte van vuur!
+
+Soetkin antwoordde:
+
+--Gij moogt van die leelijke heidensche afgoden niet spreken.
+
+Katelijne hoorde dit; zij sloeg een kruis en sprak:
+
+--Gezegend zij de grijze ruiter. Nele moet een man hebben, een schoonen
+man met een zweerd, een zwarten man met blinkend gelaat.
+
+--Ja, sprak Uilenspiegel, eene mannenstoverij, voor dewelke ik met
+mijn mes de saus zal maken.
+
+Nele bezag teederlijk heuren vriend, want zij was gelukkig omdat hij
+jaloersch was.
+
+--Ik wil dien niet, sprak zij.
+
+Katelijne antwoordde:
+
+--Wanneer komt hij, die in 't grijs gekleed, en altijd anders geleersd
+en gespoord is?
+
+Soetkin sprak:
+
+--Bidt God voor de uitzinnige.
+
+--Uilenspiegel, zei Katelijne, haal ons twee stoopen dobbele kuite,
+terwijl ik de heetekoeken bak.
+
+Soetkin vroeg waarom zij den Zaterdag vierde, naar de wijs van
+de Joden.
+
+Katelijne antwoordde:
+
+--Omdat het deeg gerezen is.
+
+Uilenspiegel stond met den grooten kroes van Engelsch tin in de hand,
+waarin juist twee stoopen gingen.
+
+--Moeder, vroeg hij, wat moet ik doen?
+
+--Ga, sprak Katelijne.
+
+Daar zij geene meesteresse in huis was, wilde Soetkin niet
+tegenspreken. Zij zegde tot Uilenspiegel:--Ga, mijn zoon.
+
+Uilenspiegel liep naar den Staak en kwam terug met twee stoopen
+dobbele kuite.
+
+Weldra verspreidde de geur der heetekoeken zich in de keuken, en
+allen hadden honger, tot zelfs Soetkin.
+
+Uilenspiegel liet het zich goed smaken. Katelijne had hem een grooten
+beker gegeven, zeggende dat, aangezien hij de eenige man, hoofd van
+het huis, was, hij meer moest drinken dan de anderen en vervolgens
+moest zingen.
+
+En zij lachte heimelijk, maar Uilenspiegel dronk, doch zong niet. Nele
+weende als zij Soetkin bleek en gansch ineengevallen zag zitten;
+alleen Katelijne was vroolijk.
+
+Na het avondmaal gingen Soetkin en Uilenspiegel naar boven op den
+zolder slapen; Katelijne en Nele bleven in de keuken, alwaar heure
+bedden nu stonden.
+
+Rond twee uren des morgens als Uilenspiegel, door het zware bier,
+al lang sliep, lag Soetkin gelijk alle nachten wakker, Maria biddende
+dat zij heur slaap zou zenden, doch Maria aanhoorde heur niet.
+
+Eensklaps hoorde zij den schreeuw van een nachtuil en, uit de keuken,
+antwoordde een dergelijke kreet; vervolgens, in de verte, in den
+kouter, weerklonken andere kreten en altijd scheen het heur dat men
+die in de keuken beantwoordde.
+
+Denkend dat het nachtvogelen waren, sloeg zij er niet verder
+acht op. Zij hoorde peerdengehennik en hoevengetrappel op den
+steenweg. Zij opende het venster en zag inderdaad twee gezadelde
+peerden, die stampend het gras van den berm schoren. Toen hoorde zij
+een schreeuwende vrouwenstem, een dreigende mannenstem, herhaalde
+slagen, nieuwe kreten, eene deur met gedruis toeslaan en angstige
+stappen de trap opklimmen.
+
+Uilenspiegel snorkte en hoorde er niets van; de deur van den
+zolder vloog open en, schier naakt, sprong Nele hijgend en snikkend
+binnen. En in haast schoof zij eene tafel, stoelen, een oud komfoor en
+al het huisraad dat zij vinden kon, tegen de deur. De laatste sterren
+verbleekten aan het uitspansel; de hanen kraaiden; zij kondigden den
+dageraad aan.
+
+Op het gerucht dat Nele maakte, keerde Uilenspiegel zich om in zijn
+bed, zonder wakker te worden.
+
+Nele viel om Soetkin's hals en sprak:--Soetkin, ik ben bang, steek
+eene keers aan.
+
+Soetkin deed het en Nele zuchtte voortdurend.
+
+Als de keers aangestoken was, bezag Soetkin het meisje, en ze zag dat
+heur hemd op den schouder gescheurd was. Op heur voorhoofd, heure
+kaken, in heuren hals zag zij bloedende schrammen, gelijk krabben
+van nagels.
+
+--Nele, vroeg Soetkin heur kussend, van waar komen die, schrammen?
+
+Steeds bevend en zuchtend, sprak het meisje:
+
+--Doe ons niet verbranden, Soetkin.
+
+Doch Uilenspiegel werd wakker en wreef zich de oogen, verblind als hij
+was door de klaarte der keers. Soetkin vroeg:--Wie is beneden? Nele
+antwoordde:--Zwijg, 't is de man dien Katelijne mij geven wil.
+
+Soetkin en Nele hoorden Katelijne plotseling schreeuwen, en heure
+beenen knikten van schrik.--Hij slaat heur om mij, sprak Nele.
+
+--Wie is er in huis? riep Uilenspiegel, uit zijn bed
+springend. Vervolgens liep hij door de kamer tot dat hij een zwaar
+stookijzer gevonden had, dat in eenen hoek lag.
+
+--Niemand, sprak Nele, ga niet beneden, Uilenspiegel!
+
+Maar hij luisterde niet, liep naar de deur, trok stoelen, tafels en
+komfoor uit den weg. Katelijne schreeuwde nog altijd beneden. Nele
+en Soetkin hielden Uilenspiegel vast, om zijn lijf, bij zijne beenen,
+en spraken:--Ga niet beneden, Uilenspiegel, 't zijn duivelen.
+
+--Ja, sprak hij, duivelsche man van Nele, ik breng u het stookijzer
+tot gade. Een huwelijk van ijzer en vleesch. Laat mij, beneden!
+
+Doch zij lieten hem niet los, want zij waren sterk, en klampten zich
+vast aan de leun van de trap. Maar zij vermochten niet hem te houden,
+en, naar beneden vliegend als een lawine, stormde hij de keuken
+binnen. Daar zag hij Katelijne bleek en ontdaan, en hoorde haar
+zeggen:--Hansken, waarom verlaat gij mij? 't Is mijne schuld niet;
+Nele is stout.
+
+Zonder te luisteren, opende Uilenspiegel de deur van het
+stalleken. Hij vond er niemand; hij liep naar den kouter en van
+daar op den steenweg: van verre zag hij twee dravende peerden in
+den morgennevel verdwijnen. Hij wilde ze achterhalen, maar ze renden
+gelijk de stormwind, die de droge bladeren opjaagt.
+
+Vol gramschap en vertwijfeling kwam hij binnen, fluisterend:--Zij
+hebben heur gehoond! En met een onheilspellend vuur in de oogen, bezag
+hij Nele; deze, die huiverend voor Soetkin en Katelijne stond, sprak:
+
+--Neen, Thijl, mijn geliefde, neen.
+
+Dit zeggende, keek zij hem zoo droef en oprecht in de oogen, dat
+Uilenspiegel zag dat zij de waarheid sprak. Toen ondervroeg hij heur:
+
+--Van waar kwamen die kreten? Waar gingen die mannen? Waarom is
+uw hemde gescheurd? Van waar komen die krabben op uwe kaken en uw
+voorhoofd?
+
+--Luister, Uilenspiegel, doe ons niet verbranden. Katelijne--God
+beware heur voor de helle--heeft sedert drie-en-twintig dagen een in
+'t zwart gekleeden, geleersden en gespoorden duivel tot vriend. Zijn
+gelaat blinkt lijk het vuur dat 's zomers, als 't warm is, schittert
+op de baren der zee.
+
+--Waarom zijt gij vertrokken, Hansken, mijn lieveling? sprak Katelijne,
+Nele is stout.
+
+Maar Nele, vervolgende, sprak:--Hij schreeuwt als een nachtuil om zijne
+komst te melden. Moeder ziet hem alle Zaterdagen in de keuken. Zij
+zegt, dat zijne kussen als ijs zijn en zijn lichaam als sneeuw. Hij
+slaat heur als zij niet doet wat hij heet. Eens bracht hij heur enkele
+guldens mee, doch hij nam heur al de andere af.
+
+Bij dit verhaal vouwde Soetkin de handen, om voor Katelijne te
+bidden. Katelijne sprak blijde:
+
+--Mijn lijf en mijn geest, alles zij hem. Hansken, mijn liefste,
+leid mij nog naar den Sabbat. 't Is Nele, die nooit komen wil! Nele
+is stout.
+
+--Bij de ochtendschemering toog hij henen, vervolgde het meisje,
+'s anderen daags vertelde moeder mij dan allerhande zonderlinge
+dingen.... Maar bezie mij toch zoo kwaad niet, Uilenspiegel. Gisteren
+zeide zij mij dat een schoon heer, in 't grijs gekleed en Hilbert
+genaamd, mij ten huwelijk wilde en thuis zou komen, om zich te
+toonen. Ik antwoordde dat ik geen man wilde, hij mocht schoon zijn of
+leelijk. Zij deed mij opblijven om hen te verbeiden; want zij is dan
+geenszins van heure zinnen, als 't minnarijen geldt. Wij waren half
+ontkleed, gereed om te gaan slapen; ik sliep op genen stoel. Toen
+zij binnenkwamen, werd ik niet wakker. Plotseling voelde ik iemand
+die mij omhelsde, mij in mijnen hals kuste. En in den maneschijn zag
+ik een helder gezicht, gelijk het schuim der branding in Hooimaand,
+bij broeiend weer, en hoorde ik stille fluisteren:--Ik ben Hilbert,
+uw verloofde; wees aan mij; 'k zal u rijk maken. Zijn gezicht stonk
+naar visch. Ik stiet hem weg; hij wilde mij nemen met geweld, maar
+'k was sterker dan tien mannen als hij. Doch hij scheurde mijn hemde,
+kwetste mij aan mijn aangezicht en herhaalde: Wees aan mij, 'k zal
+u rijk maken.--Ja, zei ik, lijk mijne moeder, wier laatsten duit gij
+nemen zult.--Toen verdubbelde hij zijne pogingen, maar hij vermocht
+niets tegen mij. Hij was nog leelijker dan een doode, en ik krabde
+hem zoo geweldig met mijne nagelen in zijne oogen, dat hij kermde. Zoo
+geraakte ik los, en kwam ik bij Soetkin vluchten.
+
+Katelijne herhaalde gedurig:
+
+--Nele is stout. Waarom zijt gij zoo gauw vertrokken, Hansken,
+mijn liefste?
+
+--Waar waart gij, slechte moeder, sprak Soetkin, terwijl men de eer
+van uw kind wilde rooven?
+
+--Nele is stout, zegde Katelijne. Ik zat bij mijn zwarten heer,
+toen de grijze duivel met bloedend gelaat bij ons kwam en sprak: Kom
+mede, kameraad, het deugt hier niet; de mannen willen ons doodslaan
+en de vrouwen hebben messen aan heure vingeren. Daarop sprongen zij
+te peerd en verdwenen zij in den nevel. Nele is stout!
+
+
+
+
+LXXXI.
+
+'s Anderen daags, onder 't ontbijt, sprak Soetkin tot Katelijne:
+
+--Gij ziet dat wee en smerte mij overal volgen, wilt gij mij uw huis
+doen ontvluchten, met uwe verdoemde hekserijen?
+
+Maar Katelijne sprak:
+
+Nele is stout. Kom weder, mijn Hansken.
+
+Den volgenden Woensdag kwamen de beide duivelen terug. Sedert den
+Zaterdag sliep Nele bij de weduwe Vanden Houte, zeggende dat zij
+niet langer bij Katelijne mocht vernachten, om Uilenspiegel, mits
+dit opspraak zou verwekken.
+
+Katelijne ontving heuren zwarten heer en zijnen vriend in de keete,
+die tot waschhuis diende en waar de broodoven stond. En zij onthaalde
+ze op ouden wijn en gerookte ossetong. De zwarte sprak tot Katelijne:
+
+--Om een groot werk te verrichten, hebben wij veel geld van noode;
+geef ons wat gij kunt.
+
+Toen Katelijne hun maar één gulden geven wilde, dreigden ze heur met
+den dood. Maar zij lieten heur los voor twee gouden karolussen en
+zeven deniers.
+
+--Komt 's Zaterdags niet meer, zeide zei. Uilenspiegel kent dien dag
+en gewapend zal hij u wachten om u beiden te dooden, en na u zou ik
+ook sterven.
+
+--Wij zullen den naasten Dinsdag komen, zegden zij.
+
+Dien dag sliepen Uilenspiegel en Soetkin zonder vreeze voor de
+duivelen, want zij meenden dat ze 's Zaterdags kwamen.
+
+Katelijne stond op en ging zien in de keete of heure vrienden daar
+waren.
+
+Zij was zeer ongeduldig, want sedert dat zij Hansken weergezien had,
+was heure uitzinnigheid grootelijks verminderd, daar het minnegekheid
+was, naar men zeide.
+
+Als zij hen niet zag, was zij droef en troosteloos; maar in het veld,
+uit de richting van Sluis, hoorde zij 't geschreeuw van den nachtuil
+en zij ging er op af. En langs eenen dijk van rijshout en graszoden
+stappend, hoorde zij aan den anderen kant van dien dijk de beide
+duivelen samen in gesprek. De eene zei:
+
+--Ik moet de helft hebben.
+
+De andere antwoordde:
+
+--Gij krijgt niets; wat Katelijne behoort, behoort mij.
+
+Zij vloekten en twisten wie de have en de minne van Katelijne en Nele
+al te gader hebben zou. Doch van schrik, bleef Katelijne roerloos
+luisteren. Weldra hoorde zij ze vechten en een hunner zeggen: "Dat
+ijzer is koud", dan een gereutel en den val van een zwaar lichaam.
+
+Verschrikt, keerde zij naar heure woning terug. Rond twee uren van
+den nacht hoorde zij opnieuw het gekras van den nachtuil, doch deze
+reis was 't in hare lochting. Zij deed open en zag heuren vriend voor
+de deur staan. Zij vroeg hem:
+
+--Wat hebt gij met den andere gedaan?
+
+--Hij zal niet meer komen.
+
+Hij omhelsde en kuste haar. En zij vond hem nog kouder dan gewoonte. En
+Katelijne was goed bij heur verstand. Toen hij heenging, eischte hij
+twintig gulden, alles wat zij bezat: zij gaf er hem zeventien.
+
+Door nieuwsgierigheid gedreven, keerde zij 's anderen daags terug
+naar den dijk, maar zij vond niets dan op het gras eenen bloedplas zoo
+groot als eene doodkist, 's Avonds wischte de regen de bloedvlek uit.
+
+En den volgenden Woensdag hoorde zij opnieuw het gekras van den
+nachtuil.
+
+
+
+
+LXXXII.
+
+Telkens dat Uilenspiegel geld noodig had om Katelijne 't
+gemeenschappelijk verteer te betalen, ging hij 's nachts den steen
+opheffen van het gat nabij den waterput, en nam hij eenen karolus.
+
+Op een avond zaten de drie vrouwen te spinnen; Uilenspiegel maakte
+eene doos, die de baljuw hem besteld had. Met veel vaardigheid sneed
+hij er een schoone jachtpartij op, met eenen koppel Henegouwsche
+honden, groote, bloeddorstige honden van Candia, Brabantsche honden
+die getweeën loopen en ooreneters genoemd worden, verders allerhande
+dikke en magere honden, alsmede mopsen en hazewinden.
+
+Terwijl Katelijne daar was, vroeg Nele aan Soetkin of ze heuren
+schat niet elders verbergen zou. De weduwe antwoordde argeloos,
+dat hij niet beter kon zijn dan nevens den muur van den steenput.
+
+Rond het midden van den Donderdagnacht, werd Soetkin gewekt door
+Bibulus Snuffius, die zeer vinnig blafte, doch niet langdurig. Ze
+dacht dat het niets was, en sliep weder in.
+
+Toen Soetkin en Uilenspiegel Vrijdagsmorgens met den dageraad,
+opstonden, zagen zij, dat Katelijne tegen heure gewoonte, in de keuken
+niet was; en het vuur was niet aangestoken en de melk kookte niet. Zij
+waren verwonderd en keken of ze bij toeval in de lochting niet was. In
+weerwil van den motregen, zagen zij heur staan met loshangend haar,
+in heur hemd, nat en bibberend, zonder te durven binnenkomen.
+
+--Wat doet gij daar, schier naakt, in den regen?
+
+--Ha! zegde ze, ja, ja, groot wonder!
+
+En ze wees naar den hond die, verworgd, levenloos uitgestrekt lag.
+
+Uilenspiegel dacht terstond aan den schat. Hij liep er henen. Het
+hol was ledig en de aarde in 't ronde gestrooid.
+
+Hij vloog naar Katelijne, en driftig heur slaande vroeg hij:
+
+--Waar zijn de karolussen?
+
+--Ja, ja, groot wonder! antwoordde Katelijne.
+
+Nele, die toeliep, verdedigde heure moeder en smeekte:
+
+--Sla niet, Uilenspiegel!
+
+Hij hield op met slaan. Soetkin kwam toen bij en vroeg wat er scheelde.
+
+Uilenspiegel wees naar den verworgden hond en het ledige gat.
+
+Soetkin werd doodsbleek en sprak:
+
+--Gij beproeft mij wel hard, heer God. Mijn arme voeten!
+
+En zij zegde dat, om de smert die zij uitstond en om de pijniging
+die zij nutteloos ondergaan had voor de gouden karolussen. Nele, als
+ze Soetkin zoo verduldig zag, begon vertwijfeld te weenen. Katelijne
+zwaaide met een stuk perkament en vervolgde:
+
+--Ja, groot wonder is er geschied. Dezen nacht is hij gekomen, braaf
+en schoon. Op zijn gelaat had hij dien witten schijn niet meer, die mij
+steeds zoo verschrikte. Hij sprak mij liefdevol aan. Ik was verrukt en
+mijn hert hoorde hem toe. Hij zegde mij: Nu ben ik rijk en weldra breng
+ik duizend gouden florijnen.--Ja, zeide ik, dat doet mij meer genoegen
+voor u dan voor mij, Hansken, mijn liefste.--Maar is hier niemand,
+in huis, dien gij liefhebt en voor wien ik iets doen kan?--Neen,
+antwoordde ik, zij die hier zijn, hebben niemand van noode.--Zijn
+Soetkin en Uilenspiegel dan rijk? vroeg hij.--Zij leven zonder
+iemands hulpe, antwoordde ik.--Niettegenstaande de verbeurte?--Daarop
+antwoordde ik dat gij liever de pijnbank onderstaan hadt, dan uwe have
+te laten ontnemen.--Dat wist ik, sprak hij. En stille en zachtjes
+giegelend, begon hij te spotten met den baljuw en de schepenen,
+omdat zij u geenerlei belijdenis konden ontrukken. En toen lachte ik
+insgelijks. 't Ware ook dom geweest, sprak hij, van hunnen schat in
+het huis te verbergen.... Ik lachte. "Of in den kelder?" Ik knikte
+van neen. "Of in de lochting?" Ik antwoordde niet.--Ha! sprak hij,
+dit ware zeer onvoorzichtig.--Integendeel, sprak ik, want water noch
+muur zullen iets uitbrengen. En hij lachte voort.
+
+--Dien nacht vertrok hij vroeger dan gewoonte, na mij een poeierken
+gegeven te hebben met hetwelk ik, naar hij zeide, naar den schoonsten
+sabbat zou gaan. Ik deed hem uitgeleide tot aan de deur van de
+lochting, en ik was slaapdronken. Ik ging, zooals hij gezeid had,
+naar den sabbat en kwam eerst met de ochtendschemering weder, hier
+ter plaatse, waar ik den hond verworgd en het gat open vond. Dat is
+een wreede slag voor mij, want ik beminde hem teederlijk en schonk
+hem mijne ziel. Maar ik zal u alles geven wat ik bezit, en dag en
+nacht werken om u te onderhouden.
+
+--Ik ben als ijzer op het aambeeld; God en een dief treffen mij
+tegelijk, zegde Soetkin.
+
+--Zóó moogt gij niet spreken, antwoordde Katelijne; hij is geen dief,
+maar een duivel. Ten blijke zal ik u het perkament toonen, dat hij
+in de lochting achterliet. Daarop staat geschreven: "Vergeet nimmer
+mij te dienen. Binnen driemaal twee weken en vijf dagen, krijgt gij
+dobbel terug. Koester geen twijfel, of het kost u het leven."--En
+hij zal woord houden.
+
+--Arme zinnelooze! sprak Soetkin.
+
+Het was heur laatste verwijt.
+
+
+
+
+LXXXIII.
+
+De twee weken waren driemaal voorbij en de vijf dagen insgelijks,
+maar de duivel kwam niet terug. Doch Katelijne wanhoopte niet.
+
+Soetkin werkte niet meer; zij stond gedurig bij het vuur, gebogen
+en kuchende. Nele gaf heur de beste en geurigste kruiden; maar dat
+alles kon niet baten. Uilenspiegel ging de hut niet meer buiten,
+uit vreeze dat Soetkin onderwijl stierf.
+
+Vervolgens kon zij niet meer eten of drinken zonder over te geven. De
+chirurgijn-baardemaker kwam en deed heur eene lating; en toen was zij
+zoo zwak, dat zij van heure bank niet meer kon opstaan. Eindelijk,
+uitgeteerd van verdriet en van smert, sprak zij op een avond:
+
+--Klaas, mijn man! Thijl, mijn zoon! Dank, de Heere neemt mij tot zich!
+
+En zij blies den laatsten ademtocht uit.
+
+Katelijne dorst bij heur niet waken, daarom deden Uilenspiegel en
+Nele het getweeën, en heel den nacht baden zij voor de arme ziele.
+
+Bij de ochtendschemering vloog een zwaluw het open venster binnen.
+
+--De vogel der zielen, sprak Nele, dat is een goed teeken: Soetkin
+is in den hemel.
+
+De zwaluw vloog driemaal rond de kamer en verdween met een schellen
+kreet.
+
+Vervolgens kwam een andere zwaluw binnen, grooter en zwarter dan de
+eerste. Zij vloog rondom Uilenspiegel en deze sprak:
+
+--Vader en moeder, de assche klopt op mijne borst, ik zal doen wat
+gij vraagt.
+
+En de tweede zwaluw vloog kwetterend heen als de eerste. De oosterkim
+verbleekte. Uilenspiegel zag duizenden zwaluwen rakelings over de
+weide vliegen, en de zonne rees op.
+
+En Soetkin werd op het armenveld begraven.
+
+
+
+
+LXXXIV.
+
+Sedert Soetkin's dood, liep Uilenspiegel droomend, treurig of
+grammoedig de keuken op en neer; hij luisterde niet meer, at en dronk
+wat men hem voorzette, zonder zelf iets te nemen. En dikwijls stond
+hij 's nachts op.
+
+Te vergeefs sprak de zoete stem van Nele hem moed in, te vergeefs zeide
+Katelijne hem, dat zij wist dat Soetkin bij Klaas in den hemel was;
+steeds antwoordde Uilenspiegel:
+
+De assche klopt.
+
+En hij geleek een waanzinnige en Nele weende als zij hem zoo
+naargeestig zag.
+
+En de vischverkooper bleef alleen in zijn huis als een vadermoorder,
+en dorst slechts 's avonds buitenkomen; want de mannen en vrouwlieden
+die hem zagen, jouwden hem uit en heetten hem moordenaar, en de
+kleine kinderen vluchtten voor hem, daar men hun gezegd had, dat hij
+de hangman was. En geschuwd door een iegelijk, dwaalde hij eenzaam in
+'t ronde, zonder eene taveerne te durven binnengaan; want men wees
+er hem met den vinger, en, al bleef hij er slechts een korte wijl,
+de andere klanten ledigden hun glas en gingen heen.
+
+Daarom zagen de weerden hem noode komen, en zij sloten liever de deur
+vóór zijn neus. Toen deed de vischverkooper hun nederig zijn beklag,
+maar zij antwoordden hem, dat zij wel mochten tappen, maar dat zij
+daartoe geenszins waren gedwongen.
+
+Eindelijk ging de vischverkooper drinken in den Rooden Valk, eene
+kleine herberg buiten de stad, aan de vaart naar Sluis. Daar wilde
+men hem bedienen, want 't waren arme lieden, wien alle geldstukken
+welkom waren. Maar de weerd of de weerdin uit den Rooden Valk spraken
+nooit een woord tot hem. Daar waren twee kinderen en een hond: als
+de vischverkooper de kleinen wilde streelen, liepen zij weg; en als
+hij den hond riep, toonde deze brommend zijn tanden.
+
+Op een avond stond Uilenspiegel aan de zulle; als Mathijssen, de
+kuiper, hem zoo droomerig zag, zeide hij hem:
+
+--Gij moet werken met uwe handen, om de smert te vergeten.
+
+--De assche van Klaas klopt op mijne borst, antwoordde Uilenspiegel.
+
+--Ha! zei Mathijssen, de ellendige vischverkooper leidt een nog
+treuriger leven dan gij. Niemand spreekt tot hem en elkeen schuwt hem,
+zoodat hij genoodzaakt is bij de arme lieden uit den Rooden Valk te
+gaan, om zijn kapperken bruinbier in eenzaamheid te drinken. 't Is
+een groote straffe.
+
+--De assche klopt! sprak nogmaals Uilenspiegel.
+
+Dien zelfden avond, terwijl het negen uren sloeg op
+Onze-Lieve-Vrouwetoren, ging Uilenspiegel naar den Rooden Valk en,
+ziende dat de vischverkooper er niet was, ging hij traagzaam slenteren
+onder de boomen langs de vaart. 't Was een heldere maneschijn.
+
+Hij zag den moordenaar komen.
+
+Juist als hij voorbij hem kwam, kon hij hem van dichtbij zien, en,
+luide sprekend lijk de menschen die in alleenigheid leven, hooren
+zeggen:--Waar mogen die karolussen steken?
+
+--Waar de duivel ze gevonden heeft, antwoordde Uilenspiegel, en meteen
+gaf hij hem een vuistslag in 't gezicht.
+
+--Laas! sprak de vischverkooper, ik herken u, gij zijt de zoon, heb
+medelijden, ik ben oud en krachteloos! Wat ik deed was geenszins uit
+haat, maar om Zijne Majesteit te dienen. Schenk mij vergiffenis. Ik
+zal u het huisraad afstaan dat ik gekocht heb, en gij moet er mij
+geen oortje voor geven. Is 't niet genoeg? Ik kocht het voor zeven
+gouden florijnen. Ik geef u alles en nog een halven gulden daarbij,
+want ik ben niet rijk, dat moet gij niet denken.
+
+En knielend vroeg hij vergiffenis.
+
+Als Uilenspiegel hem zoo verachtelijk, zoo bang en zoo lafhertig zag,
+smeet hij hem in de vaart.
+
+En hij toog henen.
+
+
+
+
+LXXXV.
+
+De lichamen der slachtoffers walmden op de brandstapels. Aan Klaas
+en Soetkin denkend, weende Uilenspiegel eenzaam in stilte.
+
+Op een avond ging hij bij Katelijne, om heur hulp en raad te vragen.
+
+Zij was alleen met Nele, die naaide bij het licht. Op 't gerucht
+dat hij bij zijn binnenkomen maakte, hief Katelijne het hoofd op,
+als iemand die uit een zwaren slaap schiet.
+
+Hij sprak:
+
+--De assche van Klaas klopt op mijne borst, ik wil Vlaanderenland
+verlossen. Ik vroeg het aan den grooten God van hemel en aarde,
+doch hij antwoordt mij niet.
+
+Katelijne sprak:
+
+--De groote God kon u niet hooren; gij moet eerst tot de sylphen
+spreken, die tusschen hemel en aarde zweven en de klachten der menschen
+ontvangen en overdragen aan de engelen, om ze naar den troon des
+hemelrijks te brengen.
+
+--Help mij daartoe, sprak hij, en 'k zal u met mijn bloed betalen,
+als 't noodig is.
+
+Katelijne sprak:
+
+--Ik zal u helpen, zoo een meisje dat u bemint, u wil medenemen naar
+den Sabbat der Lentegeesten, het Pascha van 't Levenssap.
+
+--Ik zal hem meenemen, zegde Nele.
+
+In een kristallen beker goot Katelijne een grijsachtig vocht, dat zij
+streek aan hunne slapen, neusgaten, palmen der handen en polsen; zij
+deed hun elk een snuifken witte poeier eten, en zei dat ze elkander
+in de oogen moesten zien, opdat hunne zielen één zouden worden.
+
+Uilenspiegel keek Nele aan, en de zoete oogen van 't meisje ontstaken
+in hem een blakerend vuur; toen begon het vocht te werken en hij
+voelde als duizenden spelden in zijn lijf steken.
+
+Vervolgens ontkleedden zij zich, en zij waren schoon in hunne
+schamelheid, verlicht door de lamp: hij in al zijn fiere kracht, zij
+in heure liefelijke bevalligheid. Maar reeds half ingeslapen, zagen
+zij elkander niet. Toen legde Katelijne het hoofd van het meisje in
+Uilenspiegels arm en zijne hand op heur hert.
+
+En zoo bleven zij naast malkander liggen.
+
+Het scheen hun beiden, dat hunne elkander rakende lichamen de zachte
+warmte hadden van de zonne, in de maand van de rozen.
+
+Zij stonden op, gelijk zij later zeiden, klommen op de vensterbank,
+vlogen van daar in de ruimte en voelden, dat de lucht hen droeg als
+het water de schepen draagt.
+
+Toen zagen zij niets meer, noch de aarde waar de arme menschenkinderen
+sliepen, noch den hemel waarin zoo even de wolken voor hunne voeten
+holden. En zij zetten den voet op Sirius, de koude sterre. Van daar
+werden zij op de pool geworpen.
+
+Daar zagen zij, niet zonder schrik, een naakten reus, den reus
+Winter, met ruig haar, op schotsen, met den rug tegen eenen ijsmuur
+gezeten. Een huilende troep ijsberen en zeehonden zwommen in de
+plassen rond hem. Met heesche stemme riep hij op: hagel, sneeuw, koude
+regenbuien, donderwolken, rosse, stinkende nevelen, dwarrelwinden en de
+snerpende noordenwinden. En allen woedden te gelijk in dit akelig oord.
+
+De reus lachte al dien rampspoed toe en vlijde zich neer op de bloemen
+die zijne hand verwelkt, op de bladeren die zijn adem verdroogd
+had. Dan zich vooroverbuigend en den grond met zijne nagelen krabbend,
+er met de tanden in bijtend, groef hij een hol, ten einde het hert
+der aarde te bereiken, om het te verslinden, en de lommerige bosschen
+tot zwarte kolenbedden, de gouden korenaren tot verbrand stroo, de
+vruchtbare landouwen tot dorre vlakten te verkeeren. Doch het herte
+der aarde was van vuur, en hij dorst het niet naderen, maar trok zich,
+bevreesd, terug.
+
+Daar troonde hij als koning, en ledigde hij zijnen beker traan, te
+midden van de beren en zeehonden en van de geraamten dergenen die hij
+doodde op zee, op het land en in de hutten der armen. Blijde hoorde
+hij de beren brommen, de zeehonden huilen, de beenderen kletteren van
+de geraamten van menschen en beesten, onder de klauwen van gieren
+en raven, die er een laatsten hap vleesch aan zochten, alsook het
+gekrakkrak van de ijsschotsen, die in het doode water tegen elkander
+stootten.
+
+En de stem van den reus was gelijk het geloei van den orkaan, het
+geschuifel van den storm en 't gehuil van den wind in de schoorsteenen.
+
+--Ik heb koude en ben bang, zei Uilenspiegel.
+
+--Hij vermag niets tegen de geesten, antwoordde Nele.
+
+Plotseling ontstond een groote beweging onder de zeehonden, die ijlings
+in 't water trokken, onder de ijsberen, die, met neerhangende ooren,
+jammerlijk bromden en onder de raven, die, krassend van angst in de
+wolken verdwenen.
+
+En nu hoorden Nele en Uilenspiegel de doffe slagen van den stormram
+tegen de muren van ijs, waarop de reus Winter gezeten was. En de muur
+kloofde en waggelde op zijne grondvesten.
+
+Doch de reus Winter hoorde niets, en hij huilde en tierde blijmoedig,
+vulde en ledigde zijnen beker en zocht naar het hert van de aarde om
+het te verstijven, maar hij dorst het niet aanraken.
+
+De slagen weerklonken harder en harder, de muur spleet meer en meer,
+en een regen van ijsscherven viel rondom hem.
+
+En de beren gromden jammerlijk en de zeehonden huilden in de doode
+wateren.
+
+De muur stortte in, de zonne werd zichtbaar; een schoone, jonge man
+met een gouden akst in de hand, daalde neder. Die man was Lucifer,
+koning Lente.
+
+Als de reus hem bemerkte, wierp hij zijn beker traan weg en smeekte
+hem niet te dooden.
+
+En bij den zoelen adem van koning Lente, verloor de reus Winter al
+zijne kracht. Toen nam de koning een diamanten keten, en hij bond er
+den reus mee vast aan de pool.
+
+Dan riep hij, doch teeder en liefdevol. En uit den hemel daalde een
+schoone, blonde vrouw. Zij zette zich nevens den koning en zeide
+tot hem:
+
+--Sterke man, gij zijt mijn overwinnaar.
+
+Hij antwoordde:
+
+--Hebt gij honger, eet; hebt gij dorst, drink; zijt gij bang, kom
+bij mij: ik ben uw man.
+
+--Ik heb honger en dorst alleen naar u, zegde zij.
+
+De koning riep nog zeven reizen met verschrikkelijke stemme. En er was
+een groot gedruisch van donders en bliksemen, en achter hen verrees een
+gehemelte van zonnen en sterren. En beiden zetten zich op den troon.
+
+Toen weerklonk een geroep des konings en der vrouwe; hun edel gelaat
+verroerde niet, en hun gebaar was niet strijdig met hunne kracht
+en waardigheid.
+
+Op die kreten ontstond een golvende beweging in den grond, in den
+harden steen, in de ijsschotsen. En Nele en Uilenspiegel hoorden een
+gerucht lijk dat, welk reusachtige vogelen zouden maken, die de schaal
+van ontzaglijke eieren wilden doorpikken.
+
+En, in die rijzing en daling van den grond, gelijk de baren der zee,
+waren vormen als van een ei.
+
+Eensklaps rezen allerwegen boomen op, wier dorre takken zich
+strengelden, wier stammen wankelden lijk dronken mannen. Dan scheidden
+zij, een groote ruimte tusschen zich latend. Aardgeesten stegen uit den
+geschokten grond; uit het diepst van het woud kwamen de boschgeesten,
+uit de naburige zee de watergeesten.
+
+Uilenspiegel en Nele zagen daar de ruige, gebochelde, grijnzende en
+mismaakte dwergen, die de schatten bewaren; de vorsten der gesteenten;
+de boschmannen, die leven als boomen en, in stee van mond en maag,
+onderaan 't gezicht vezelige wortels dragen, om aldus hun voedsel uit
+de aarde te zuigen; de bergvorsten, die niet kunnen spreken, hert noch
+ingewand hebben, zich bewegen als ledepoppen in schittergewaad. Daar
+waren dwergen van vleesch en beenderen, met hagedissteerten en
+kikvorschkoppen, met eene lanteern op het hoofd, die 's nachts op
+de schouders van de dronken voetgangers of vreesachtige reizigers
+springen, en, hunne lanteern zwierend, hen leiden en brengen naar
+sompen of spelonken, terwijl de arme verdwaalden meenen dat die
+lanteern de keerse is, die flikkert in hunne woning.
+
+Daar waren ook de bloemenmaagden, dochteren vol vrouwelijke kracht
+en gezondheid, fier over heure schoonheid, en die heur krachtig haar
+als een zijden mantel openspreidden.
+
+Hare vochtige oogen schitterden als perelmoer in het water, het vleesch
+van heur lichaam was vast, blank, zacht gebronsd door het licht;
+uit heuren rooden mond kwam een adem, geuriger dan seringabloesem.
+
+Zij zijn het, die, minneziek, 's avonds in waranden en hovingen
+zwerven, ofwel in het diepst der bosschen, langs de lommerige paden,
+op zoek naar de ziele eens mans, om de genieting der minne te
+smaken. Zoodra een jongeling en zijne geliefde voorbij haar komen,
+beproeven zij het meisje te dooden, of blazen het weerstand biedende
+meideken liefdelust in, opdat zij heuren minnaar gehoor geve; want
+dan krijgt de bloemenmaagd de helft van de kussen.
+
+Nele en Uilenspiegel zagen ook uit het diepste der hemelen de
+beschermgeesten der sterren nederdalen, alsmede de geniën van wind,
+van dauw en van regen, gevleugelde jongelingen die de aarde bevruchten.
+
+Dan verschenen aan alle punten des hemelrijks de vogelen der
+zielen, de lieve zwaluwen. Met hunne komst scheen het licht
+heller. Bloemenmaagden, vorsten der steenen en der bergen,
+boschmannen, water-, vuur- en aardgeesten riepen allen te gader:
+Licht! levenssap! glorie aan den koning Lente!
+
+Hoewel het geschal van dien roep machtiger was dan 't geloei van de
+woedende zee, en van 't losgeketend orkaan, klonk het als een zoete
+muziek in de ooren van Nele en Uilenspiegel, die, stom en onbeweeglijk,
+achter den knoestigen stam van een eikeboom neergehurkt zaten.
+
+Maar heviger werd hunne vrees, toen de geesten, bij duizenden
+zich zetten op zetels van reusachtige spinnekoppen, kikvorschen met
+olifantssnuiten, ineengekronkelde slangen, krokodillen die recht op den
+steert stonden en eene menigte geesten in den muil hielden, slangen die
+meer dan dertig dwergen van beider kunne schrijlings op haar golvend
+lijf droegen, en wel honderdduizend insecten, grooter dan reuzen,
+gewapend met zweerden, spiesen, zeisen, vorken met zeven tanden,
+en allerhande moordtuigen. Zij vochten met een ijselijk gedruisch,
+en de sterken verslonden de zwakken, tot bewijs dat de Dood uit het
+Leven en het Leven uit den Dood komt.
+
+En uit heel de wemelende, dichte, verwarde menigte van geesten steeg
+een gedruisch op, dat leek op het dof gerol van een verren donder en
+het gerucht van honderden wevers, vollers, slotenmakers, die samen
+aan den arbeid zijn.
+
+Plotseling verschenen de geesten van het levenssap; zij waren kort,
+dik, met lendenen zoo breed als het Heidelbergsche vat, dijen zoo dik
+als wijnmudden, en spieren zoo forsig en sterk, dat men zou gezegd
+hebben dat hun lichaam gemaakt was van groote en kleine eieren, het
+een op het andere, met een rood vel overdekt, vettig en blinkend als
+hun dunne baard en rossig haar; en in de handen hielden zij groote
+bekers met een vreemdsoortig vocht.
+
+Als de geesten ze zagen komen, ontstond er onder hen een groote
+trilling van vreugde; boomen en planten bewogen zich en de aarde
+scheurde open om te drinken.
+
+En de geesten van het levenssap schonken wijn: terstond begon alles
+te botten, te groeien, te bloeien; het gras was vol gonzende diertjes,
+en de lucht vol vogels en pepels; de geesten schonken voort, en die van
+beneden ontvingen den wijn zooals zij konden: de bloemenmaagden openden
+den mond, of sprongen op heur rosse schenkers en kusten ze, om meer te
+krijgen; de eenen vouwden de handen smeekend te zamen; anderen zaten
+stille en lieten zich met wijn beregenen; doch allen, zoo dorstigen
+als gelaafden, zochten den wijn en bij elk dropje dat zij kregen,
+werden zij levendiger. En daar waren geene grijsaards, doch allen,
+schoonen of leelijken, waren vol vinnige kracht en levende jeugd.
+
+En zij lachten, riepen, zongen, terwijl zij elkander achtervolgden in
+de boomen als eekhorentjes, in de lucht als vogelen; en elke man zocht
+zijn wijfje en verrichtte onder Gods hemel het heilige werk der natuur.
+
+En de geesten van het levenssap brachten aan den koning en aan de
+koningin een grooten beker wijn. En de koning en de koningin dronken,
+en kusten elkander.
+
+Vervolgens omhelsde de koning de koningin, en hij stortte den beker
+uit op boomen, bloemen en geesten, en riep:
+
+--Glorie aan het Leven! glorie aan de vrije Lucht! glorie aan de
+Kracht!
+
+En allen riepen:
+
+--Glorie aan de Natuur! glorie aan de Kracht!
+
+En Uilenspiegel nam Nele in zijne armen. Aldus ineengestrengeld,
+begon een dans, als een warreldans van droge bladeren in de macht
+eener windhoos, in denwelke alles in beweging was, boomen, planten,
+insecten, vlinders, hemel en aarde, koning en koningin, bloemenmaagden,
+bergvorsten, watergeesten, gebochelde dwergen, vorsten der steenen,
+boschmannen, lanteerndragers, beschermgeesten der sterren en de honderd
+duizenden gruwelijke insecten, die hunne spiesen, zeisen en vorken met
+zeven tanden ondereenmengden. En aan dien duiveldans, hollend door
+de ruimte, namen de zon, de maan, de planeten, de sterren, de wind,
+de wolken insgelijks deel.
+
+De eik, waaraan Nele en Uilenspiegel zich vastklemden, draaide in de
+dwarreling mee, en Uilenspiegel zeide tot Nele:
+
+--Liefste, nu gaan wij sterven.
+
+Een geest hoorde hen, en zag dat zij stervelingen waren.
+
+--Aardelingen, sprak hij, aardelingen in dit oord!
+
+En hij trok hen van den boom en smeet hen in 't gedrang. En
+Uilenspiegel en Nele vielen zachtjes op den rug van de geesten,
+die ze kaatsend naar malkander smeten en spraken:
+
+--Gegroet, menschenkinderen! Welkom, aardwormen! Wie wil het knaapje
+en het meideken? Zij komen ons bezoeken, de weekelingen.
+
+--Genade! riepen Nele en Uilenspiegel, die van den een naar den
+anderen vlogen.
+
+Maar de geesten luisterden niet, en beiden vlogen in't ronde, met het
+hoofd omlaag en de beenen omhoog, lijk pluimpjes in den winterwind,
+terwijl de geesten spraken:
+
+--Glorie aan de mannekens en aan de vrouwkens! Dat zij dansen als wij!
+
+De bloemenmaagden wilden Uilenspiegel en Nele van malkander scheiden;
+zij sloegen heur en hadden ze gedood, als de koning geen einde aan
+den dans gesteld had, met deze woorden:
+
+--Men brenge die beide aardwormen vóór mij!
+
+Zij werden gescheiden; en elke bloemenmaagd trachtte Uilenspiegel
+aan de andere te ontrukken, zeggende:
+
+--Thijl, wilt gij sterven voor mij?
+
+--Fluks, antwoordde Uilenspiegel.
+
+En de boschgeesten, die Nele droegen, zeiden:
+
+--Waarom zijt gij geene ziel lijk wij, wij zouden u nemen!
+
+--Hebt geduld, antwoordde Nele.
+
+En zoo kwamen zij vóór den troon van den koning; en zij beefden,
+als zij zijn gouden akst en zijn ijzeren kroon in het gezicht kregen.
+
+Hij vroeg hun:
+
+Wat komt gij hier doen, nietelingen?
+
+Zij antwoordden niet?
+
+--Ik ken u, tooveresseknop, voegde de koning er bij, en ook u,
+kooldragerswelp; maar zoo gij door allerlei toovermiddelen in deze
+werkplaats der Natuur zijt gedrongen, waarom houdt gij nu den bek
+als volgepropte kapoenen?
+
+Nele beefde als zij den verschrikkelijken duivel bezag, doch
+Uilenspiegel hernam zijne mannelijke stoutmoedigheid en antwoordde:
+
+--De assche van Klaas klopt op mijn hert. Doorluchtige vorst, in
+naam des Pausen maait de Dood de krachtigste mannen, de bevalligste
+vrouwlieden van Vlaanderenland; zijne privileges zijn verbroken, zijne
+keuren vernietigd, de hongersnood ondermijnt het, zijne wollenwevers
+verlaten het, om in den vreemde vrijen arbeid te zoeken. Het zal
+sterven, als men het niet ter hulpe komt. Ik ben maar een arme
+nieteling, die op de wereld kwam als een iegelijk, leefde als hij
+kon, onvolmaakt, bekrompen, onwetend, geenszins deugdzaam, en de
+menschelijke of goddelijke gratie teenemaal onweerdig. Doch Soetkin
+stierf ten gevolge van de pijnen der tortuur en van droefheid, en
+Klaas werd in een schrikkelijk vuur verbrand. Ik wilde hen wreken,
+en ik deed het eenmaal; ik wilde dien bodem, bezaaid met de beenderen
+zijner telgen, gelukkig zien, en vroeg aan God den dood zijner beulen,
+maar hij aanhoorde mij niet. Moede van klagen, aanriep ik u door de
+tooverkracht van Katelijne, en wij vallen u te voet, mijn bevende
+gezellinne en ik, om u te bidden dit rampzalige land te verlossen.
+
+De vorst en zijne vrouwe antwoordden samen:
+
+
+    Door den krijg en door het vuur,
+    Door den dood en door het zweerd,
+      Zoek de Zeven.
+
+    In den dood en in het bloed,
+    In de puinen en de tranen,
+      Vind de Zeven.
+
+    Leelijk, wreede, boos, wanstaltig.
+    Echte geesels der arme aarde,
+      Brand de Zeven.
+
+    Wacht, luister en zie,
+    Zeg ons, kleine, zijt ge in uw schik niet?
+      Vind de Zeven.
+
+
+En al de geesten zongen samen:
+
+
+    In den dood en in het bloed,
+    In de puinen en de tranen,
+      Zoek de Zeven.
+
+    Wacht, luister en zie,
+    Zeg ons, kleine, zijt ge in uw schik niet?
+      Vind de Zeven.
+
+
+--Maar, sprak Uilenspiegel, Hoogheid en gij, heeren geesten, ik
+begrijp niets van uwe tale. Zeker spot gij met mij.
+
+Doch zonder hem te aanhooren, gingen zij voort:
+
+
+    Raakt het Noorden
+    Kussend het Westen
+    Rampspoed is uit.
+    Vind de Zeven
+    En den Gordel.
+
+
+En dat met zooveel overeenstemming en machtigen maatklank, dat de aarde
+beefde en de hemelen sidderden. En de vogelen floten, de raven krasten,
+de musschen tjilpten, de nachtuilen kloegen en vlogen uitzinnig in
+het ronde. En de dieren der aarde, leeuwen, slangen, beren, herten,
+gemsen, wolven, honden en katten brulden, sisten, bromden, schreeuwden,
+huilden, jankten, mauwden verschrikkelijk.
+
+En de geesten zongen:
+
+
+    Wacht, luister en zie,
+    Heb de Zeven lief
+      En den Gordel.
+
+
+En de hanen kraaiden, en al de geesten verzwonden, buiten een booze
+bergvorst, die Uilenspiegel en Nele elk bij een arm nam en ze vrij
+onzacht naar beneden smeet.
+
+Zij lagen naast elkander als om te slapen, als de frissche morgenwind
+hen wakker maakte.
+
+En Uilenspiegel zag Nele's lief gezicht, in gouden glans door de
+rijzende zonne bestraald.
+
+
+
+
+
+
+
+TWEEDE BOEK.
+
+
+I.
+
+Dien morgen, 't was in Herfstmaand, nam Uilenspiegel zijnen stok,
+drie gulden die Katelijne hem gaf, eene snede brood met een stuk
+verkenslever, en hij vertrok naar Antwerpen, op zoek naar de
+Zeven. Nele sliep.
+
+Onderwege werd hij gevolgd door een hond, die op den reuk van de
+lever afkwam. Uilenspiegel wilde den hond wegjagen, maar deze bleef
+halstarrig meeloopen, waarop Uilenspiegel hem de volgende rede hield:
+
+--Hondje, mijn beestje, gij handelt verkeerd met uw huis te verlaten,
+alwaar goede porties, lekkere kliekjes, mergbeenderen u wachten, om op
+goed valle 't uit een zwerver te volgen, wien het zelfs aan wortelen
+zal ontbreken om u toe te werpen. Geloof mij, onbezonnen hondje,
+keer terug naar uwen baas. Vermijd regen, sneeuw, hagel, mist, ijzel
+en andere liefelijkheden, die het lot van de zwervers zijn. Blijf u
+warmen in den hoek van den heerd bij het lustige vuur, en laat mij
+voortgaan in modder, in stof, in koude en hitte, heden gestoofd en
+morgen bevroren, des Vrijdags verzadigd en 's Zondags verhongerd. Keer
+terug van waar gij komt, hondje van weinig ondervinding, en gij zult
+verstandig handelen.
+
+Het beest scheen Uilenspiegel maar niet te begrijpen. Het
+kwispelsteertte en sprong zoo hoog als het kon. Uilenspiegel meende
+dat het uit vriendschap was, maar vergat de lever, die in zijne
+tassche stak.
+
+Hij ging voort, de hond volgde. Als zij alzoo bijna een uur gegaan
+hadden, zagen zij op de baan eene kar, bespannen met een ezeltje,
+dat den kop liet hangen. Op den berm van den weg, tusschen twee
+distelstruiken, zat een man met in eene hand eenen hamelbout en in
+de andere eene bottel, waaraan hij zich goed deed. Als hij niet at
+of dronk, zuchtte en weeklaagde hij.
+
+Uilenspiegel stond stil, de hond insgelijks. Bout en lever riekend,
+beklom hij den berm. Daar ging hij nabij den man op zijn achterste
+zitten, krabde aan zijn wambuis, om beetjes te vragen, doch de man
+stiet hem terug met den elleboog, en zuchtte erbarmelijk met den bout
+omhoog. De hond jankte uit begeerlijkheid; en de ezel, grammoedig
+omdat hij, ingespannen, de distelen niet kon bereiken, begon te balken.
+
+--Wat is er, Jan? vroeg de man tot den ezel.
+
+--Niets, antwoordde Uilenspiegel, maar hij zou zich willen vergasten
+aan de distelen, die naast u groeien; en deze hond zou evenmin boos
+zijn, nadere kennis te maken met het been, dat gij in de hand hebt. In
+afwachting daarvan, kan hij beginnen met de lever, die ik hier heb.
+
+Toen de hond de lever binnen had, keek de man naar zijnen bout. Hij
+beet er het laatste vleesch af, gaf toen het been aan den hond,
+die er zijn pooten op stelde en het trachtte te kraken.
+
+Toen keek de man naar Uilenspiegel.
+
+Deze herkende Lamme Goedzak, van Damme.
+
+--Lamme, vroeg hij, waarom zit gij hier te eten, te drinken en te
+jammeren? Heeft een soldaat u misschien eene schudding gegeven?
+
+--Laas! mijne vrouw! sprak Lamme.
+
+Hij wilde zijne bottel wijn ledigen, maar Uilenspiegel hield hem tegen.
+
+--Drink zoo niet, sprak hij, al te haastig doet geen deugd aan de
+nieren. Beter zou het komen aan hem, die geene bottel op zak heeft.
+
+--Ge spreekt goed, antwoordde Lamme, maar zoudt gij beter drinken?
+
+En hij langde hem de bottel.
+
+Uilenspiegel nam ze, dronk en gaf ze hem terug.
+
+--Ge moogt mij Maraan heeten, sprak hij, als er genoeg overbleef voor
+eene musch.
+
+Lamme bezag de bottel, zuchtte en nam uit zijne tassche een andere
+flesch en een stuk worst, dat hij in schijfjes sneed en weemoedig opat.
+
+Eet gij standvastig, Lamme? vroeg Uilenspiegel.
+
+--Veelal, mijn jongen, antwoordde Lamme, maar 't is om mijne droeve
+gedachten te verjagen. Waar zijt gij, vrouwtje? weeklaagde hij,
+terwijl hij een traan uit het het oog wischte.
+
+En hij sneed tien schijfjes van de worst.
+
+--Lamme, sprak Uilenspiegel, eet niet zoo gulzig en zonder medelijden
+voor den armen pelgrim.
+
+Lamme reikte hem weenend vier schijfjes en Uilenspiegel zuchtte om
+den fijnen smaak.
+
+Maar steeds weenend en etend, sprak Lamme:
+
+Mijne vrouw, mijne goede vrouw, ze was zoo zoet en zoo goed gevormd van
+lichaam, licht als de vlinder, vlug als de bliksem, en zij zong als een
+leeuwerik! Maar toch hield zij te veel van schoone kleeren. Laas! zij
+hingen heur zoo goed! Immers, hebben de bloemen ook geen schitterenden
+dos? Zie, hadt gij heure handjes gezien, die tot streelen gemaaakt
+schenen, nooit hadt gij heur potten of pateelen laten aanraken. Het
+vuur van de keuken hadde heure hagelblanke tint verzengd. En die
+oogen! Ik moest ze maar bezien, en ik verging van liefde.--Drink
+een slok wijn, Thijl, 'k zal na u drinken.--Ha! waarom is zij niet
+dood! Ik deed alles in huis, om heur den minsten arbeid te sparen:
+ik veegde den vloer, maakte het huwelijksbed, in hetwelk zij zich
+'s avonds behaaglijk uitstrekte, ik waschte de schotels, alsmede het
+linnen, hetwelk ik zelven ook streek.--Eet, Thijl, 't is Gentsche
+worst.--Soms, als zij gaan wandelen was, kwam zij te laat naar huis
+voor het noenmaal, maar heur zien was zulk een groote vreugde voor mij,
+dat ik niet kijven dorst, hoogst gelukkig nog, als ze mij 's nachts
+den rug niet toekeerde. Ik heb alles verloren.--Drink dien wijn, Thijl,
+'t is Brusselsche wijn, bereid naar de wijze van Bourgondië.
+
+--En waarom liet zij u zitten? vroeg Uilenspiegel.
+
+--Weet ik het? hernam Lamme Goedzak. Waar is de tijd, als ik ten
+narent kwam om heure hand te vragen, en zij vluchtte,--uit vreeze en
+uit liefde? Als heure armen bloot waren, schoone, ronde, en blanke
+armen, sloeg zij plotseling heure mouwen neer als zij zag, dat ik
+er naar keek. Andere malen mocht ik heur zoenen, en 'k kuste heure
+schoone oogen, die zij dicht hield van zalig genot; dan trilde zij
+en slaakte kleine kreten, of boog heur hoofd achterover en gaf er
+mij een stoot op den neus mee. En zij lachte als ik riep: Ai! en ik
+gaf haar dan kleine duwtjes, want tusschen ons was niets anders dan
+gestoei en gejoel.--Thijl, is er nog wijn in die bottel?
+
+--Ja, sprak Uilenspiegel.
+
+Lamme dronk en ging voort:
+
+--Andere reizen viel ze vol minne rond mijnen hals en zei: gij zijt
+schoon! En honderd maal kuste ze mij op de kaken of op 't voorhoofd,
+maar nooit op den mond. En als ik vroeg waarom, antwoordde zij
+blozend, dat moeder heur vroeger dikwijls gewaarschuwd had dat dit voor
+meidekens gevaarlijk is. Ha! zoete oogenblikken, zalige tijd!--Thijl,
+zie eens of gij soms een hammetje vindt in de weitasch?
+
+--Een half, antwoordde Uilenspiegel.
+
+Uilenspiegel gaf het hem en Lamme at het heel op.
+
+--Dat hammetje deed mij deugd, sprak Uilenspiegel, als Lamme gedaan
+had.
+
+--Mij ook, sprak deze. Maar nooit zal ik mijn liefste terugzien,
+zij is weggeloopen uit Damme. Rijdt gij mede om ze te zoeken?
+
+--Ik wil wel, antwoordde Uilenspiegel.
+
+--Maar, sprak Lamme, is er niets meer in de bottel?
+
+--Geen droppel, antwoordde Uilenspiegel.
+
+En zij stegen in de kar, getrokken door grauwtje, dat weemoedig balkte
+om het vertrek aan te kondigen.
+
+Maar de hond was--als hij goed zijne bekomst had--er stillekens van
+door gegaan.
+
+
+
+
+II.
+
+De kar reed op den dijk, tusschen eenen vijver en eene vaart,
+en droomerig drukte Uilenspiegel de assche van Klaas tegen zijne
+borst. Hij vroeg zich af of het visioen leugen of waarheid was,
+of die geesten met hem den spot gedreven hadden, of wel hem op
+raadselachtige wijze gezegd hadden wat hij doen moest om 't land
+zijner vaderen gelukkig te maken.
+
+En te vergeefs trachtte hij te vatten, wat de Zeven en de Gordel
+bediedden.
+
+Aan den dooden keizer, den levenden koning, de landvoogden, den paus
+van Rome, den groot-inquisiteur, den generaal der jezuïeten denkend,
+vond hij in hen zes groote beulen, die hij onverwijld levend had
+willen verbranden. Maar hij dacht, dat er van hen geen sprake was,
+dat zij zelven te geerne anderen brandden, dat hij elders moest zoeken.
+
+En gedurig herhaalde hij in zich zelven:
+
+
+    Raakt het Noorden
+    Kussend het Westen
+    Rampspoed is uit.
+    Vind de Zeven
+    En den Gordel.
+
+
+--Laas, sprak hij, in dood, bloed en puinen, Zeven vinden, Zeven
+branden, Zeven minnen! Mijn arme geest wordt gefolterd, want wie dan
+verbrandt zijne minne?
+
+De kar had reeds een eind wegs afgelegd; zij hoorden een gekraak van
+stappen in het zand en eene stemme, die zong:
+
+
+    Gij, die voorbij trekt, zaagt ge wel
+    Mijn vriend, mijn vrijer, snaaksch en snel?
+    Hij zwerft nu hierent en darent.
+    Zaagt ge hem wel?
+
+    Gelijk op een lam een arent,
+    Viel hij op een hartken fel.
+    Baardloos, een man als niemendel.
+    Zaagt ge hem wel?
+
+    Ontmoet gij hem, zeg dat Nele
+    Vermoeid is van te gaan zoo snel.
+    Waar toeft ge lieve Thijl, vertel:
+    Zaagt ge hem wel?
+
+    Een tortel in den abeele
+    Treurt om haar verloren gezel.
+    Alzoo menig trouwe gespele.
+    Zaagt ge hem wel?
+
+
+Uilenspiegel klopte op Lamme's buik en zei:
+
+--Houd uwen adem in, dikzak.
+
+--Laas, antwoordde Lamme, 't is lastig voor iemand, die zoo dik is.
+
+Doch Uilenspiegel liet hem praten; hij verborg zich achter de huif van
+de kar, en de stemme nabootsend van een die bedronken is, neurde hij:
+
+
+    Uw vriend en vrijer zag ik wel
+    Op een kar van 't oud model,
+    Met een papzak voor gezel,
+    Zag ik hem wel!
+
+
+--Thijl, zei Lamme, ge zingt leelijk dezen morgen.
+
+Zonder naar hem te luisteren, stak Uilenspiegel het hoofd door een
+gat van de huif.
+
+--Nele, herkent gij mij? riep hij.
+
+Verschrikt, weenend en lachend te gelijk, want heure kaken waren nat,
+sprak zij:
+
+--Ik zie u, leelijke deugniet!
+
+--Nele, sprak Uilenspiegel, als ge mij wilt slaan, heb ik thuis
+eenen stok. Hij slaat goed, en laat merkteekenen na, want hij is
+zwaar en knoestig.
+
+--Thijl, vroeg Nele, gaat gij naar de Zeven?
+
+Ja, antwoordde Uilenspiegel.
+
+Nele droeg eene weitasch, die proppensvol stak. Zij langde die aan
+Uilenspiegel en sprak:
+
+--Thijl, ik heb gedacht dat het voor een man ongezond is van op reis
+te gaan, zonder een goede vette gans, een hesp en wat Gentsche worsten
+bij zich. En dit moet gij eten te mijner gedenkenis.
+
+Daar Uilenspiegel Nele bezag en er geenszins aan dacht de weitasch
+te nemen, stak Lamme het hoofd door een ander gat van de huif en sprak:
+
+--Meideken vol voorzienigheid, als hij niet aanpakt, is 't uit
+verlegenheid. Maar geef mij die hesp, die gans en die worsten: ik
+zal ze bewaren voor hem en ze beschermen.
+
+--Welk een tronie is mij dat? vroeg Nele.
+
+'t Is, sprak Uilenspiegel, een slachtoffer van het huwelijk, die met
+het herte vol wee, zou uitdrogen lijk een stoksken, zoo hij zich niet
+stevig hield door dag en nacht te eten en te drinken.
+
+--Zoo is het, mijn zoon, zuchtte Lamme.
+
+De heldere zon drukte loodzwaar op Nele's hoofd. Zij dekte zich met
+haar voorschoot. Daar Uilenspiegel met heur alleen wilde zijn, zei
+hij tot Lamme:
+
+--Ziet gij ginder die vrouw in de meersch?
+
+--Ja, zei Lamme.
+
+--Herkent gij ze niet?
+
+--Daar? vroeg Lamme, zou het de mijne zijn? Zij is niet gekleed als
+een poorteresse.
+
+--Twijfelt gij nog, blinde mol? sprak Uilenspiegel.
+
+--En als zij het niet was?
+
+--Daar zoudt gij niets bij verliezen, want op de linkerhand, naar
+het Noorden, is een kaberdoesken waar men lekker bruinbier tapt. Daar
+zullen wij u vinden. En hier is hesp, om u te vergezelschappen.
+
+Lamme kwam uit de kar en liep met groote schreden naar de vrouw in
+de meersch.
+
+Uilenspiegel vroeg tot Nele:
+
+--Waarom komt ge niet bij mij?
+
+Toen hielp hij heur in den wagen en deed hij ze naast hem zitten;
+hij nam heure huik van den schouderen, en heur honderd kussen gevend,
+sprak hij:
+
+--Waar gingt ge heen, liefste?
+
+Zij antwoordde niet, doch scheen heel vervoerd en begeesterd. En
+Uilenspiegel, vervoerd als zij, zegde tot haar:
+
+--Ik heb u zoo geerne naast mij. De wilde roze heeft niet de zachte
+tint uwer donzige huid. Ge zijt wel geen koninginne, doch laat mij
+maar eene krone van kussen maken voor u. Lieve, zoete armen, die God
+maakte tot koozerij! Ha! liefste, ik vrees, dat mijn ruwe handen die
+schouders verwelken! De lichte vlinder rust op de purperen anjelier,
+maar hoe zal ik op uwe blankheid rusten, opdat ze niet verwelkt? God
+is in den hemel, de koning zit op zijnen troon en de zonne glinstert
+ginder aan 't uitspansel; maar ik ben God en koning en het licht, daar
+ik zoo dicht bij u wezen mag! O, dat haar is zachter dan zijde! Nele,
+ik ben ruw en wild, doch wees zonder vreeze! Die lieve voetjes! Hoe
+komt het, dat zij zoo wit zijn? Pleegt gij ze te wasschen met melk?
+
+Zij wilde opstaan.
+
+Wat vreest gij? vroeg Uilenspiegel, toch niet de zonne, die op ons
+schijnt en u teenenmale in 't goud zet? Sla uwe oogen niet neder. Zie
+in de mijne, welk heerlijk vuur er brandt. Luister, liefste mijne;
+'t is het stille middaguur, de landman keert huiswaarts; hij leeft
+van brood; maar wij, laat ons van liefde leven! Duizend jaren lang
+zou ik aan uwe voeten willen doorbrengen.
+
+--Mooispreker! zegde zij.
+
+De zonne straalde, een leeuwerik tierelierde boven de klaveren,
+en Nele legde heur hoofdje op den schouder van Uilenspiegel.
+
+
+
+
+III.
+
+Maar Lamme kwam zweetend en blazend terug.
+
+Laas! sprak hij, ik ben onder een slecht gesternte geboren. Nadat
+ik mij het hert afgeloopen had achter die vrouw, zag ik, dat het de
+mijne niet was en reeds bedaagd; ze moest diep in de veertig zijn,
+en aan heure kap zag ik, dat ze nooit getrouwd geweest was. Ze vroeg
+mij bits wat ik met mijn dikken buik in heure klaveren kwam doen?
+
+Ik zoek mijne vrouw, die mij liet zitten, antwoordde ik zachtjes,
+en daar ik u nam voor haar, liep ik naar u toe.
+
+Op die rede zegde de oude jongedochter, dat ik kon terugkeeren waar ik
+van daan kwam; dat, als mijne vrouw mij liet zitten, het wel besteed
+was, want dat al de mannen truwanten, dieven en ketteren zijn, die
+alle meisjes willen verleiden en dat, als ik niet dadelijk opkraamde,
+ze mij door heuren hond zou doen opvreten.
+
+En niet zonder schroom pakte ik mijne biezen, want een groote hond
+lag aan heure voeten te brommen. Als ik van heur land was, zette
+ik mij neer op den wegel en at ik uw stuk hesp, om op mijn effen
+te komen. Plotseling hoorde ik een geritsel achter mij en, als ik
+mij omkeerde, zag ik den grooten hond van de oude jongedochter;
+doch nu bromde hij niet meer, integendeel, hij kwispelsteertte en
+zag mij begeerig aan, om de hesp. Ik smeet hem eenige stukskens toe,
+maar zijne meesteresse kwam bij en riep:
+
+--Pak hem! pak hem! manneken!
+
+En ik op den loop, en de groote hond achter mij; hij beet mij in mijn
+been. Maar terwijl ik schreeuwde van pijn, gaf ik hem met mijnen stok
+eenen slag op zijne voorpooten, dat er ten minste één van gebroken
+is. Hij viel en jammerde in zijne hondentaal: "Genade", die ik hem
+verleende. Ondertusschen smeet zijne meesteresse kluiten aarde naar
+mij, bij gebreke aan steenen, en ik weer op den loop!
+
+Laas! is het niet wreed en onrechtveerdig voor eene vrouw, zich op
+een onschuldigen jongen als ik te wreken, omdat zij niet schoon genoeg
+is om aan eenen man te geraken?
+
+En treurig stapte ik naar het kaberdoesken, dat gij mij gewezen
+hadt, om met bruinbier mijnen schrik af te drinken. Maar ik was
+nogmaals bedrogen, want als ik binnenkwam, zag ik man en vrouw
+bezig met vechten. Ik vroeg, dat zij zouden uitscheiden om mij eenen
+pot bruinbier te tappen, al was 't maar eene pinte of zeven; maar
+de vrouw, een echte stokvisch, antwoordde mij woedend, dat als ik
+niet dadelijk wegkwam, zij mij in kennis zou brengen met den blok,
+waarmede zij op den kop van heuren man trommelde. En nu ben ik hier,
+vriend, zweetend en af van vermoeidheid; hebt gij niets te eten?
+
+--'t Doet, zei Uilenspiegel.
+
+En Lamme slaakte eenen zucht van verlichting.
+
+
+
+
+IV.
+
+En ze reden samen voort. De ezel, met hangende ooren, trok traagzaam
+de kar.
+
+--Lamme, sprak Uilenspiegel, wij zijn gevieren: de ezel, die op goed
+geluk naar distelen zoekt; gij, dikzak, die uwe wederhelft achternazit;
+zij, de teedere en zoete geliefde, die iemand vindt, harer onweerdig,
+'t is te zeggen mij, den vierde.
+
+Nu, kinderen, moed! de bladeren worden geel, en de hemel zal helderder
+worden; weldra zal, in de najaarsnevelen, de zonne ondergaan, en de
+winter zal verschijnen, als het beeld van den dood, om allen, die
+onder onze voeten liggen, met een sneeuwen lijkwade te dekken. En
+ik zal optrekken voor de redding van Vlaanderenland. Arme dooden:
+Soetkin stierf van smerte; Klaas door den viere: eik van goedheid en
+eiloof van liefde; ik, uw zoon, ik lijd grootelijks en zal u wreken,
+assche, die ik zoo liefheb, die klopt op mijne borst.
+
+Lamme sprak:
+
+--Gij moogt ze niet beweenen, die voor de gerechtigheid stierven.
+
+Maar Uilenspiegel bleef nadenken; eensklaps zegde hij:
+
+--Nele, het uur van scheiden is gekomen en 't zal voor lang zijn;
+wie weet, of ik uw lief gelaat ooit wederzie.
+
+Nele bezag hem met heure oogen, die glinsterden als sterren, en sprak:
+
+--Stap van den wagen en kom met mij in het bosch, alwaar gij lekker
+eten zult vinden; want ik ken de kruiden en kan de vogelkens bijroepen.
+
+--Meisje, sprak Lamme, 't is slecht van uwentwege, Uilenspiegel te
+willen ophouden, die naar de Zeven moet zoeken en mijne vrouw helpen
+terugvinden.
+
+--Nog niet! sprak Nele, en zij weende: doch lachte, te midden heurer
+tranen, Uilenspiegel liefderijk toe.
+
+Dit ziende antwoordde deze:
+
+--Uw vrouw zult gij wel intijds terugvinden, als gij lust naar nieuwe
+smert zult gevoelen.
+
+--Thijl, sprak Lamme, gaat ge mij, voor dat meisje, in mijne kar alleen
+laten? Gij antwoordt niet en denkt aan het woud, waar de Zeven niet
+zijn, en mijne vrouw evenmin. Help ze liever zoeken op dezen steenweg,
+waar de kar zoo gemakkelijk rijdt.
+
+--Lamme, sprak Uilenspiegel, er ligt een volle weitasch in de kar,
+gij zult dus niet sterven van honger, als gij van hier naar Koolkerke
+gaat, alwaar ik bij U kom. Gij moet er alleen zijn, want daar zult
+gij vernemen naar welke windstreek gij u richten moet, om uwe vrouw te
+vinden. Luister. Gij rijdt stapvoets naar Koolkerke, op drie uren van
+hier. Op den toren draait een windhaan met alle winden mee op zijn
+roestige hengsels. Dat geknars wijst aan de arme mannen, die hunne
+liefste verloren, den weg, langs welken zij haar zullen terugvinden.
+
+Maar vooreerst moet men met een hazelaarstaksken, zeven reizen, op elk
+muurvlak slaan. Als de hengsels knarsen, terwijl de wind uit 't noorden
+blaast, is 't die kant dien gij nemen moet, doch met omzichtigheid,
+want Noordenwind is oorlogswind; blaast hij uit 't Zuiden, ga dan
+maar blijgemoed: 't is minnewind; uit het Oosten, loop dan gezwind:
+'t is licht en en vroolijkheid; uit het Westen, ga traagzaam, want
+die wind brengt regen en tranen. Ga, Lamme, en wacht mij te Koolkerke.
+
+--Ik zal, zei Lamme.
+
+En hij reed voort met de kar.
+
+Terwijl Lamme naar Koolkerke reed, joeg de sterke, zoele wind de grijze
+wolkjes als een kudde schapen door het luchtruim. Uilenspiegel en Nele
+waren alleen in het woud. Uilenspiegel had honger en Nele zocht naar
+heerlijke vruchten, doch vond niets anders dan eikels, en de kussen,
+die heur vriend heur in overvloed gaf.
+
+Uilenspiegel had strikken gespannen en floot om de vogels bij
+te roepen, ten einde diegenen te braden, die zich zouden laten
+vangen. Een nachtegaal kwam omtrent Nele op de bladeren zitten; zij
+ving hem niet, om hem te laten voortzingen; toen kwam een grasmusch,
+en zij had er medelijden mee, omdat zij zoo lief en zoo hupsch was;
+vervolgens kwam een leeuwerik, maar Nele zei hem, dat hij beter zou
+doen hoog in de lucht te vliegen en de Natuur te bezingen, dan dom
+weg te komen dartelen boven de doodelijke punt van een braadspit.
+
+En 't was de waarheid, want inmiddels had Uilenspiegel een vuur
+aangestoken en een braadspit gesneden, dat op niets anders wachtte
+dan op lichtzinnige slachtofferen.
+
+Maar de vogelen kwamen niet meer bij, tenzij eenige kwaadaardige raven,
+die hoog boven hunne hoofden krasten.
+
+En zoo kwam het, dat Uilenspiegel niemendal te eten had.
+
+Doch Nele moest vertrekken en bij Katelijne terugkeeren. En weenend
+ging zij haren weg op, en Uilenspiegel keek heur droef achterna.
+
+Maar ze kwam terug en viel hem om den hals.
+
+--Ik ga henen, sprak zij.
+
+Zij ging, doch opnieuw keerde ze terug, zeggende:
+
+--Ik ga henen.
+
+En zoo wel twintig reizen en nog meer.
+
+Eindelijk vertrok zij, en Uilenspiegel bleef alleen. Toen ging hij
+ook henen om Lamme weder te vinden.
+
+Als hij bij hem was, zat Lamme aan den voet van den toren, met
+een grooten pot bruinbier tusschen zijne beenen, weemoedg op een
+hazelaarstakje te bijten.
+
+--Uilenspiegel, sprak hij, ik geloof, dat ge mij maar weggezonden
+hebt, om met 't meideken alleen te blijven; ik heb met den hazelaar
+zeven reizen op elk vlak van den toren geslagen, en hoewel de wind
+blaast als een duivel, toch hebben de hengsels niet geknarst.
+
+--Men zal ze zeker gesmeerd hebben, antwoordde Uilenspiegel. Vervolgens
+togen ze henen naar het hertogdom Brabant.
+
+
+
+
+V.
+
+Dagen en nachten bracht Philippus tusschen zijne papieren en
+perkamenten door. Aan hen vertrouwde hij de gedachten van zijn
+ongevoelig herte. Daar hij nooit bemind had, maar ook wist dat niemand
+hem liefhad, wilde hij zelf zijn onmetelijk rijk bestieren, en de
+droefgeestige Atlas bukte onder den last. Weemoed en bovenmatige
+arbeid ondermijnden zijn zwak lichaam. Hij had een afschuw van een
+blij gezicht en daarom een haat tegen onze lachende landen; tegen onze
+kooplieden, om hunne weelde en hunnen rijkdom; tegen onzen adel, om
+zijne vrijmoedigheid en het vuur zijner kloeke blijgeestigheid. Hij
+wist--men had het hem gezegd--dat lang reeds vóór dat kardinaal
+de Couza, omtrent het jaar 1380, op de misbruiken der Kerk en op
+de noodzakelijkheid der hervormingen gewezen had, de opstand tegen
+Paus en de Roomsche Kerk, die zich in onze landen onder verschillende
+sektevormen geuit had, in de gemoederen borrelde als kokend water in
+een ketel.
+
+Hij geloofde, de koppige, dat zijn wil op de gansche wereld
+drukken moest als de wil van God; hij wilde, dat onze landen die
+de gehoorzaamheid ontwend waren, bogen onder het oude juk, zonder
+eenige hervorming te erlangen. Hij wilde, dat Zijne Heilige Moeder:
+de Katholieke, Apostolische en Roomsche kerk één, geheel en algemeen,
+ongewijzigd en onveranderd zou zijn, alléén omdat hij het wilde,
+en alzoo handelde hij als een onredelijke vrouw. En 's nachts woelde
+hij in zijn bed als op een leger van doornen, werd hij onophoudelijk
+gefolterd door zijne gedachten.
+
+--Ja, Heilige Philippus, Heere God, al moest ik van de Nederlanden
+één kerkhof maken, tot U zullen zij komen, mijn beschermer, tot U,
+Heiligen des hemelrijks.
+
+En hij beproefde te doen wat hij zeide, zich aldus Roomscher toonend
+dan de Paus en katholieker dan de kerkvergaderingen.
+
+En Uilenspiegel en Lamme, en het volk van Vlaanderen en van de
+Nederlanden, zagen, met angstvolle herten, van verre, in de sombere
+halle van 't Escuriaal, die gekroonde spinnekop, met heure lange,
+ruige pooten, heure geopende grijpers, het net spannen, dat hen vangen
+moest om het beste van hun bloed te zuigen.
+
+Hoewel, onder de regeering van keizer Karel, de pauselijke inquisitie
+honderd duizend Christenen gedood had: hoewel de goederen dier
+martelaren in de kisten van keizer en koning gevloeid waren als
+regen in eene goot, oordeelde Philippus dat dit niet voldoende was,
+en hij legde den lande de nieuwe bisdommen op en wilde er de Spaansche
+inquisitie invoeren.
+
+En overal lazen de stadsherauten, bij geschal van bazuinen, en geroffel
+van trommen, de plakkaten af waarbij kond werd gegeven, dat al de
+ketteren, met den viere zouden sterven als zij hunne dolingen niet
+afzwoeren, en met de koorde als zij die wel zouden afgaan. Vrouwen
+en meidekens zouden levend begraven worden, en de beul zou op heure
+lichamen dansen.
+
+En als een vuur zette de wederstand zich door heel het land voort.
+
+
+
+
+VI.
+
+Den vijfden van de grasmaand, vóór Paschen, gingen de heeren Lodewijk
+van Nassau, Kuilenburg en Brederode, met driehonderd edellieden het
+hof van Brussel binnen, bij Mevrouwe de landvoogdes, hertoginne van
+Parma. In rangen van vieren beklommen zij de groote trap van 't paleis.
+
+Binnengeleid in de zaal waar Mevrouwe zich bevond, boden zij heur
+een klaagschrift aan, bij hetwelk zij heure tusschenkomst vroegen om
+den koning te bewegen, de plakkaten op 't stuk der religie, alsmede
+de Spaansche inquisitie op te heffen, verklarende, dat er in onze
+misnoegde landen anders niets uit kon voortvloeien dan muiterij,
+puinhoopen en algemeene ellende.
+
+En dat verzoekschrift werd Het Eedverbond geheeten.
+
+Berlaymont, die later zoo valsch en wreed was voor den grond zijner
+vaderen, stond naast Hare Hoogheid en sprak, om te spotten met de
+armoede dier edele eedgenooten:
+
+--Mevrouwe vrees niets, het zijn maar geuzen!
+
+Daarmede wilde hij zeggen, dat die edelen en smalle jonkers ondergegaan
+waren in dienst des konings of door in weelde te wedijveren met de
+Spaansche edellieden.
+
+Om de woorden van Berlaymont met verachting te bejegenen, verklaarden
+zij er eere in te stellen "geuzen" geheeten en genaamd te worden,
+voor den dienst des konings en het welzijn dezer landen.
+
+Zij besloten een gouden penning te dragen, met de beeltenis des
+konings op de eene zijde, en op de andere twee ineengelegde handen,
+saamgesnoerd door de riemen van eenen bedelzak, en deze woorden: "Den
+koning getrouw tot den bedelzak". En op hunne hoeden en mutsen droegen
+zij ook gouden juweelen in den vorm van nappen en van bedelaarsmutsen.
+
+Intusschentijd liep Lamme met zijn dikken buik door de stad, op zoek
+naar zijne vrouw, maar hij vond ze niet.
+
+
+
+
+VII.
+
+Op een morgen zei Uilenspiegel tot Lamme:
+
+--Kom mede: wij gaan een grooten, edelen, machtigen, geduchten heere
+groeten.
+
+--Zal hij mij zeggen waar mijne vrouw is? vroeg Lamme?
+
+--Als hij het weet, antwoordde Uilenspiegel.
+
+En zij gingen bij Brederode, den machtigen drinker.
+
+Hij was in het binnenhof van zijn paleis.
+
+--Wat wilt gij? vroeg hij tot Uilenspiegel.
+
+--U spreken heer! antwoordde Uilenspiegel.
+
+--Spreek, zegde Brederode.
+
+--Gij zijt, sprak Uilenspiegel, een schoon, dapper en krachtig
+man. Eens hebt gij een Franschman in zijn harnas versmacht, als eene
+mossel in hare schelp; doch zijt gij sterk en dapper, gij zijt mede
+verstandig. Waarom dan draagt gij dien penning, waarop te lezen staat:
+"Den koning getrouw tot den bedelzak"?
+
+--Ja, heer, waarom? vroeg Lamme.
+
+Doch Brederode antwoordde niet en keek Uilenspiegel scherp in de
+oogen. Deze ging voort:
+
+--Waarom wilt gij, edele heeren, den koning getrouw tot den bedelzak
+blijven? Is 't voor het goede, dat hij u gunt, of de vriendschap,
+die hij u toedraagt? Waarom, in stee van hem getrouw te zijn tot
+den bedelzak, verlost gij niet liever onze landen van dien beul,
+die met volle gerechtigheid zelf den bedelzak diende te dragen?
+
+En Lamme knikte, tot teeken dat hij daarmede instemde.
+
+Brederode bezag Uilenspiegel met zijn levendigen blik, lachte en sprak:
+
+--Als gij geen spion van koning Philippus zijt, zijt gij een goed
+Vlaming, en ik ga u loonen voor de beide gevallen.
+
+Hij bracht hem naar de keuken en Lamme volgde hem. Daar trok hij hem
+tot bloedens bij de ooren.
+
+--Dit is voor den spion, sprak Brederode.
+
+Uilenspiegel schreeuwde niet.
+
+--Breng, zegde hij tot zijn bottelier, breng hier dien moor met
+kaneel-wijn.
+
+De bottelier bracht den moor en een grooten beker warmen, geurigen
+wijn.
+
+--Drink, sprak Brederode tot Uilenspiegel, dit is voor den goeden
+Vlaming.
+
+--Ha! sprak Uilenspiegel, wat schoone tale spreekt die wijn met kaneel;
+zoo spreken de santen zeker in het hemelrijk niet!
+
+Als hij de helft van den wijn uitgedronken had, gaf hij de rest
+aan Lamme.
+
+--Wie is die papzak daar, vroeg Brederode, die beloond wordt om niets
+te doen?
+
+--'t Is mijn vriend Lamme, antwoordde Uilenspiegel, telkens dat hij
+warmen wijn drinkt, verbeeldt hij zich, dat hij zijne vrouw gaat
+terugvinden.
+
+--Ja! sprak Lamme, den beker devotelijk ledigend.
+
+--Waar gaat gij nu? vroeg Brederode.
+
+--Wij gaan, antwoordde Uilenspiegel, op zoek naar de Zeven, die
+Vlaanderenland moeten verlossen.
+
+--Welke Zeven? vroeg Brederode.
+
+Als ik ze gevonden heb, zal ik u zeggen wie ze zijn, antwoordde
+Uilenspiegel.
+
+Maar Lamme, dien de wijn vroolijk gemaakt had, vroeg:
+
+--Thijl, als wij eens in de maan naar mijne vrouw gingen zoeken?
+
+--Waar is de ladder? vroeg Uilenspiegel.
+
+In Mei, de groote Bloeimaand, sprak Uilenspiegel tot Lamme:
+
+--Daar is de schoone Bloeimaand, de heldere, blauwe hemel! De
+takken der boomen zien rood van levenssap, de grond baart welige
+groeikracht. Dat is het oogenblik om te hangen en te branden voor het
+geloof. Daar zijn zij, de goede ketterjagers. Wat edele gezichten! Zij
+hebben het vermogen een iegelijk te straffen, te tuchtigen, af te
+zetten, aan de wereldlijke rechters over te leveren, en ook hun eigen
+gevangenis te hebben.--Ha! wat een schoone Bloeimaand!--in hechtenis
+nemen, in rechte vervolgen zonder vorm van proces, branden, hangen,
+onthalzen en vrouwen en meidekens voorbarig begraven. De vinken slaan
+in de boomen. De goede kettermeesters houden de rijken in 't oog. En
+de koning zal erven. Gaat, meidekens, gaat dansen in de beemden,
+bij geschal van pijpen en schalmeien. Ho! de schoone Bloeimaand.
+
+De assche van Klaas klopte op Uilenspiegel's borst.
+
+--Laat ons gaan, sprak hij tot Lamme. Gelukkig zij, die het hert hoog
+en het zweerd gereed houden in de sombere dagen, die op handen zijn.
+
+
+
+
+VIII.
+
+Uilenspiegel kwam eens, in de Oogstmaand, op den Vlaamschen steenweg,
+te Brussel, voorbij de woning van Jan Sapermillemente, aldus genoemd
+omdat zijn grootvader, als hij kwaad was, met dien uitroep placht te
+vloeken, om den zeer heiligen naam Gods niet te lasteren noch ijdelijk
+te gebruiken. Gemelde Sapermillemente was meester-borduurder; doch
+daar hij zich blind en doof gedronken had, borduurde zijne vrouw--een
+oud wijf met een bitsige tronie--de kleederen, wambuizen, mantels en
+schoenen der heeren. Hare bevallige dochter was haar behulpzaam in
+dien goedbetaalden arbeid.
+
+Toen Uilenspiegel bij het vallen van den avond voorbij hunne woning
+ging, zag hij het meideken aan 't venster en hoorde hij heur neuren:
+
+
+        Oogst, oogst,
+    Zeg mij, zoete maand,
+    Wie neemt er mij als vrouw;
+    Zeg mij, zoete maand?
+
+
+--Ik, zei Uilenspiegel, als gij wilt.
+
+--Wie, ik? vroeg zij. Kom nader, dat ik u zie.
+
+Doch Uilenspiegel vroeg:
+
+--Hoe komt het, dat gij in Oogstmaand roept hetgeen de Brabantsche
+meidekens plegen te roepen in den vooravond van Lentemaand?
+
+--Omdat zij maar ééne maand hebben die een man geeft, en ik er
+twaalf heb. Op den vooravond van elke maand, niet te middernacht,
+doch zes uren lang tot middernacht, spring ik uit mijn bed, ga ik
+drie stappen achterweerts naar het venster en zing ik het liedeken;
+vervolgens keer ik terug naar mijn bed, met drie stappen achterweerts,
+en te middernacht ga ik slapen om te droomen van den mij bestemden
+echtgenoot. Maar de maanden zijn spotters van nature, en 't is niet
+van één man dat ik droom, maar van twaalf te gelijk; gij zijt de
+dertiende, zoo gij lust hebt.
+
+--De andere zouden jaloersch zijn, antwoordde Uilenspiegel. Gij ook
+roept: "Verlossing!"
+
+Het meideken bloosde en sprak:
+
+--Ik roep om verlossing en weet wat ik vraag.
+
+--Ik weet het insgelijks en breng het u mede, antwoordde Uilenspiegel.
+
+--Gij moet wachten, zeide zij glimlachend en daarbij liet zij heure
+schoone tanden zien.
+
+Wachten, sprak Uilenspiegel, neen. Een huis kan op mijn hoofd vallen,
+de wind mij in eene beek smijten, een dolle hond in mijn been bijten;
+neen, wachten doe ik niet.
+
+--Ik ben nog te jong, sprak ze, en roep maar naar het aloud gebruik.
+
+Uilenspiegel werd achterdochtig, als hij er aan dacht, dat het op
+Maartavond en geenszins in de Oogstmaand was, dat de Brabantsche
+meidekens naar een man riepen.
+
+Glimlachend herhaalde zij:
+
+--Ik ben nog te jong en roep maar naar het aloud gebruik.
+
+--Gaat gij wachten totdat gij te oud zijt? 't Ware jammer! Nog nooit
+zag ik zoo'n ronden hals, zoo'n blanken boezem, een Vlaamschen boezem
+vol goede melk, die kloeke mannen maakt.
+
+--Vol? sprak zij, nog niet; gij zijt er rap bij, gij!
+
+--Wachten? herhaalde Uilenspiegel; totdat ik geene tanden meer heb
+om u levend op te eten, liefste? Gij antwoordt niet en glimlacht met
+uw lichtbruine oogen en uwe lippen als kersen zoo rood!
+
+Het meisje bezag hem met een onderzoekenden blik en antwoordde:
+
+--Van waar komt al die liefde in eens? Wat doet gij? Zijt gij een
+bedelaar, of zijt gij rijk?
+
+--Bedelaar ben ik, sprak hij, en rijk al te gader, als gij mij
+toehoort, liefste.
+
+Zij antwoordde:
+
+--Dat is 't niet wat ik wil weten. Gaat gij naar de misse? Zijt
+gij goed Christene? Zoudt gij durven zeggen, dat gij een bedelaar,
+een echte bedelaar, een geus zijt, die opstaat tegen de plakkaten en
+tegen de inquisitie?
+
+De assche van Klaas klopte op Uilenspiegel's borst.
+
+--Ik ben geus, sprak hij, dood en opgevreten door de wormen wil ik
+de verdrukkers onzer Nederlanden zien! Gij beziet mij, liefste. Dat
+liefdevuur, dat voor u brandt, is het vuur van de jeugd. God stak
+het aan, het brandt lijk de zonne gloort, totdat het uitdoove. Doch
+God stak ook het vuur aan der wrake, dat smeult in mijn hert. Het
+zal wezen het zweerd, het vuur, de koorde, de brand, de verwoesting,
+de oorlog en de val van de beulen!
+
+--Gij zijt schoon, zegde zij treurig, hem op beide wangen kussend;
+maar zwijg toch.
+
+--Waarom weent gij? vroeg hij.
+
+--Gij moet altijd zien waar gij zijt, sprak zij, hier en ook elders.
+
+--Hebben de muren dan ooren? vroeg Uilenspiegel.
+
+--Zij hebben alleen de mijne, sprak zij.
+
+--Met een kus zal ik ze geerne sluiten.
+
+--Gekke vriend, luister toch als ik spreek.
+
+--Waarom? wat hebt gij te zeggen?
+
+--Luister, sprak zij met ongeduld. Daar is mijne moeder.... Zwijg,
+zwijg vooral in heur bijzijn....
+
+De oude Sapermillemente kwam binnen. Uilenspiegel bezag heur en sprak
+in zich zelven:
+
+--Gezicht als eene schuimspaan, oogen met harden en valschen blik, mond
+die wil lachen en slechts grijnzen kan, gij maakt mij nieuwsgierig.
+
+--God zij met u, heer, standvastig met u, sprak de oude. Ik heb geld
+ontvangen, meisje, schoon geld van den grave van Egmond, als ik hem
+zijn opperste kleed bracht, op hetwelk ik den narrenstok geborduurd
+heb. Ja, heer, een narrenstok, tegen den Rooden Hond.
+
+--Kardinaal Granvelle? vroeg Uilenspiegel.
+
+--Ja, sprak zij, tegen den Rooden Hond. Men zegt, dat hij den koning
+hunne praktijken overbrieft; zij willen hem van kant maken. Zij hebben
+gelijk, niet waar, heer?
+
+Uilenspiegel antwoordde niet.
+
+--Hebt gij ze niet gezien in de straten, gekleed met hun wambuis en
+hun grijs opperste kleed, gelijk het gemeen draagt, met hunne lange,
+hangende mouwen, met kalbasfleschjes en nopjes om den hals? Op al
+de opperste kleederen staat de narrenstok geborduurd. Ik heb er wel
+zeven en twintig gemaakt en mijne dochter voor 't minst vijftien. Als
+de Roode Hond die narrenstokken ziet, is hij grammoedig.
+
+Vervolgens zeide zij stille tot Uilenspiegel:
+
+--Ik weet, dat de heeren besloten hebben den narrenstok te vervangen
+door eene korenschoof, tot teeken van eendracht. Ja, ja, zij gaan
+strijden tegen den koning en tegen de inquisitie. Zij hebben gelijk,
+niet waar, heer?
+
+Uilenspiegel antwoordde niet.
+
+--De vreemde heer is droefgeestig, zei de oude; hij houdt den bek toe.
+
+Uilenspiegel zeide geen woord en ging buiten.
+
+Hij trok een taveerne binnen om het drinken niet te verleeren. De
+taveerne was vol drinkers, die zich onvoorzichtig uitlieten over den
+koning, de gehate plakkaten, de inquisitie en den Rooden Hond, dien
+men het land moest uitjagen. Daar zag hij de oude, in lompen gehuld,
+die gebaarde te slapen naast een kapperken brandewijn. Aldus bleef
+ze langen tijd zitten; eindelijk trok zij een schaaltje uit den zak;
+hij zag heur bedelen in de groepen, en vooral vragen aan degenen,
+die zich 't onvoorzichtigst hadden uitgelaten.
+
+En een iegenlijk gaf heur gereedelijk een gulden, een denier of
+een oortje.
+
+In de hoop van het meisje te weten wat de oude Sapermillemente hem
+verborg, ging Uilenspiegel opnieuw voorbij de woning; het meideken
+riep nu niet meer, doch lachte hem, knipoogend, liefelijk toe.
+
+Doch de oude kwam plotseling achter hem binnen.
+
+Grammoedig heur te zien, liep Uilenspiegel als een hert de straat op,
+al roepend "'t brandt! 't brandt!" totdat hij kwam vóór het huis van
+Jacob Pietersen, den bakker. De ondergaande zonne weerkaatste gloeiend
+rood in de vensteren van zijnen winkel, en een dikke rook van brandende
+takkebossen steeg op uit den schoorsteen. Uilenspiegel liep voort,
+al roepend: "'t brandt! 't brandt!" En met den vinger wees hij naar
+'t huis van Pietersen. De menigte schoolde samen, zag den rooden
+gloed en den dikken rook, en riep lijk Uilenspiegel: 't brandt! 't
+brandt! De waker der Katelijnekerk blies op zijne trompet, terwijl
+de koster uit al zijne macht de wacharmklok luidde. En de knapen en
+meidekens kwamen, zingend en fluitend, met hoopen toegesneld.
+
+Daar de klok altoos luidde en de trompet altoos schalde, toog de oude
+Sapermillemente er eindelijk ook henen.
+
+Uilenspiegel hield ze van verre in 't oog. Toen zij weg was, ging
+hij binnen.
+
+--Gij, hier! sprak het meideken, brandt het dan niet?
+
+--Neen, neen, antwoordde Uilenspiegel.
+
+--Maar die klok, die zoo jammerlijk klept?
+
+--Zij weet niet wat zij doet, antwoordde Uilenspiegel.
+
+--En de trompet, en dat volk dat zoo loopt?
+
+--Ons Heer moet zijn getal hebben.
+
+--Waar brandt het dan toch? vroeg zij.
+
+--In mijn hert, antwoordde Uilenspiegel.
+
+En hij vloog naar heuren mond.
+
+--Gij bijt mij, sprak zij.
+
+--Ik eet geerne kersen, zegde hij.
+
+Droef glimlachend keek zij hem aan. En schreiend sprak zij tot hem:
+
+--Zet geen voet meer hier in huis. Gij zijt een geus, een vijand des
+Pausen, zet hier geen voet meer.
+
+--Uwe moeder? sprak hij.
+
+--Ja, zegde zij blozend. Weet gij waar ze nu is? Daar waar het brandt,
+om te luisteren wat er gezegd wordt. En fluks gaat zij bij den Rooden
+Hond, hem alles overdragen en het beulswerk voorbereiden. Vlucht,
+Uilenspiegel, ik red u, vlucht. Nog een kus, doch kom nooit meer terug;
+nog één, gij zijt schoon, maar vertrek!
+
+--Braaf meideken, sprak Uilenspiegel, heur in de armen drukkend.
+
+--Dat was ik niet altijd, zegde zij. Ik deed lijk zij.
+
+Hoe sprak hij, dat liedeken, die zoete oproep tot de verliefde mannen?
+
+--Ja, zegde zij. Moeder wilde het, u red ik, omdat ik u uit
+liefde beminne. De anderen zal ik redden te uwer gedenkenis, mijn
+geliefde. Zal uw hert nog denken aan het boetveerdige meideken,
+als gij verre van hier zijt? Geef mij een kus. Voor geld zal zij
+geene slachtofferen naar de galge meer sturen. Ga heen; neen, blijf
+nog. Hoe zacht is uwe hand! Zie, ik kus uwe hand, tot teeken van
+onderdanigheid; gij zijt mijn heer, mijn meester. Luister, dichtbij,
+en zwijg. Dezen nacht zijn rabauwen en diepers en ander slecht volk,
+waaronder een Italiaan, de een na den ander hier geweest in ons
+huis. Moeder deed ze in deze kamer komen, stak mij buiten, en sloot de
+deur achter mij. Ik hoorde echter deze woorden: "Steenen kruisbeeld,
+Borgerhoutsche poort, ommegang, Antwerpen, Lieve-Vrouwekerk", een
+onderdrukt gelach en guldens, die op tafel geteld werden.... Vlucht,
+daar komt ze; vlucht, mijn welbeminde. Denk soms aan mij; vlucht....
+
+Uilenspiegel liep zooals zij zeide tot in den Ouden Haan, en daar
+vond hij Lamme weemoedig zitten met eene worst in de hand en zijn
+zevende pint Peeterman vóór zich op de tafel.
+
+En, in weerwil van zijn dikken buik, deed hij hem loopen als hij.
+
+
+
+
+IX.
+
+Terwijl hij aldus, gevolgd door Lamme, het op een drafje zette, vond
+hij in de Eikstraat een kwaadwillig paskwil tegen Brederode. Hij ging
+het hem onmiddellijk overhandigen.
+
+--Ik ben, Heere, sprak hij, die goede Vlaming en die spion van den
+koning, dien gij zoo goed bij de ooren trokt en zulken goeden wijn te
+drinken gaaft. Ik breng u een lieftallig schriftje, in hetwelk men u
+onder anderen beschuldigt, den titel van grave van Holland te nemen,
+die den koning behoort. Het is versch geprent door Jan Lastermans,
+wonende op de Schavuitenkaai, omtrent de Eerrooversgang.
+
+Glimlachend antwoordde Brederode:
+
+--Ik laat u twee uren lang geeselen, als ge mij den echten naam van
+den schrijver niet zegt.
+
+--Heer, antwoordde Uilenspiegel, gij moogt mij twee jaar lang doen
+geeselen als gij wilt, maar wat mijn mond niet weet, zult gij mijnen
+rug niet doen zeggen.
+
+En hij ging henen met een gulden voor zijne moeite.
+
+
+
+
+X.
+
+Sedert de Zomermaand, de maand van rozen, was men in Vlaanderen aan
+'t preeken.
+
+En de apostelen der eerste kerstene Kerk preekten overal, op alle
+plaatsen, in 't groen en in de hovingen, op de heuvelen waar men
+bij overstrooming de beesten in veiligheid bracht, op de rivieren,
+in booten.
+
+Te land verschansten zij zich als in een kamp, door middel van
+karren. Op de rivieren en in de reeden hielden schuiten vol gewapende
+mannen de wacht rondom hen.
+
+En rond de verschansingen stonden boogschutters en pijkeniers, om
+hen te behoeden voor eene verrassing des vijands.
+
+En aldus weerklonk allerwegen het woord der vrijheid op den bodem
+der vaderen.
+
+
+
+
+XI.
+
+Uilenspiegel en Lamme waren te Brugge, en ze lieten hunne kar in een
+beluik, om Sint-Salvatorskerk binnen te gaan; zij waren liever naar
+de taveerne gegaan, doch hunne tassche liet geen blijd gerinkel van
+geld meer hooren.
+
+Pater Cornelis Adriaensen, minderbroeder, een vuile, woedende,
+blaffende en schaamtelooze prediker, speelde dien dag zijne perten
+in den kansel der waarheid.
+
+Jong en poezele kwezelkens verdrongen zich rond hem.
+
+Pater Cornelis sprak over de Passie. Gekomen ter plaatse van de Heilige
+Schrift, waar de Joden, naar Jezus wijzend, tot Pilatus schreeuwden:
+"Aan het kruis, aan het kruis met hem, want wij hebben eene wet en,
+volgens die wet, moet hij sterven!" riep broeder Cornelis uit:
+
+"Gij hoort het, goede lieden, als Ons-Heer Jezus Christus een
+gruwelijken en schandelijken dood is gestorven, is het omdat er tegen
+de ketters altijd wetten bestonden. Hij werd te recht veroordeeld,
+omdat hij de wet had geschonden. En nu willen ze de edicten en
+plakkaten als nietig aanzien. Ha! Jezus, welke vermaledijding wilt gij
+over deze landen doen vallen! Allerheiligste Moeder Gods, was keizer
+Karel nog in leven en kon hij het schandaal zien van die verbonden
+edelen, die zoo stoutmoedig waren de landvoogdes een vertoogschrift
+aan te bieden tegen de inquisitie en tegen de plakkaten, die met het
+beste inzicht gemaakt, na zoo langdurige en voorzichtige overwegingen
+opgesteld en uitgevaardigd zijn tot uitroeiing van alle sekten en
+ketterijen! En nu ze dat meer van noode zijn dan brood en dan kaas,
+willen zij ze vernielen! In welken smerigen, stinkenden, afgrond
+wil men ons lokken? Luther, die razende os, zegepraalt in Saksen, in
+Brunswijk, in Luneburg, in Mecklenburg; Brentius, de vuile Brentius,
+die in Duitschland van eikelen leefde die de verkens versmaadden,
+Brentius zegepraalt in Wurtenberg; Servet, de waanzinnige Servet, die
+een kwartier van de maan in zijn hoofd heeft, zegepraalt in Pommeren,
+in Denemarken en in Zweden, en daar vermeet hij zich de heilige,
+glorierijke en almachtige Drievuldigheid te lasteren. Ja. Maar
+men heeft mij gezegd, dat hij levend verbrand werd door Calvijn,
+die eindelijk dan toch iets gedaan heeft dat deugt; ja, door den
+stinkenden Calvijn, die zuur riekt; ja, met zijnen snuit zoo lang als
+die van eenen otter; met zijnen kaaskop, met zijn groote tanden, die
+op de tanden eener egge gelijken. Ja, die wolven verslinden elkander;
+ja, die os van een Luther, de razende os, wapende de prinsen van
+Duitschland tegen den wederdooper Munzer, die een snul was, naar men
+zegt, en leefde volgens de Heilige Schrift. En heel Duitschland door,
+hoorde men 't geloei van dien os, ja, heel Duitschland door!
+
+"Ja, en wat ziet men in Vlaanderen, in Gelderland, in Friesland, in
+Holland, in Zeeland? Adamieten, die naakt door de straten loopen, ja,
+goede lieden, naakt door de straten, en schaamteloos hun mager lichaam
+aan de menschen toonen. Er was er maar één, zult ge zeggen;--ja,
+'t kan zijn--maar één is honderd, en honderd zijn één. En werd hij
+verbrand, vraagt ge? hij werd levend verbrand op het aanzoek van
+Calvinisten en Lutheranen. Die wolven verslinden elkander, zeg ik u!
+
+"Ja, wat ziet men in Vlaanderen, in Gelderland, in Friesland, in
+Holland, in Zeeland? Wederdoopers, vrijheidsapostelen, die leeren dat
+alle dienstbaarheid strijdig is met het woord Gods. Zij liegen, die
+stinkende ketteren; wij moeten ons onderwerpen aan onze Heilige Moeder,
+de Roomsche Kerke. En daar, in die verdoemde stad Antwerpen, waar
+al het kettergespuis van de wereld bijeenkomt, dorsten zij preeken,
+dat wij onze hostiën met hondenvet bakken! Een ander durft zeggen:
+'t is die geus, die op dien waterpot zit, op den hoek van de straat:
+"Er is geen God, geen eeuwig leven, geene verrijzenis des vleesches,
+geen eeuwige verdoemenis". "Men mag, zegt die andere ginder,
+men mag doopen zonder zout, zonder vet, zonder speeksel, zonder
+duivelbezwering en zonder keerse". "Er is geen vagevier", zegt een
+ander. Geen vagevier, goede lieden! Zaliger voor u goede lieden,
+ware het van te zondigen met uwe moeder, uwe zuster, uwe dochter,
+dan een oogenblik te twijfelen aan 't bestaan van het vagevier!
+
+"Ja, en zij lachten met den inquisiteur, den heiligen man, ja. Ze
+zijn hieromtrent, te Bellem, geweest met vier duizend Calvinisten,
+gewapende mannen, met trommels en vaandels. Ja. En van hier riekt gij
+den stank hunner keuken. Zij hebben Sinte-Katelijnekerk genomen om
+ze te onteeren, te ontwijden, te ontheiligen met hunne vermaledijde
+predikatiën.
+
+"Is die verdraagzaamheid niet goddeloos en niet schandalig? Bij
+de duizenden duivelen uit de helle, waarom steekt gij ook de
+handen niet uit naar de wapenen, weekhertige katholieken? Als dat
+calvinistengebroed, hebt gij ook harnassen, lansen, hellebaarden,
+zweerden, kruismessen, alsmede de falkonetten, bussen, slangen en
+serpenten van de gemeente.
+
+"Zij zijn vreedzaam, zult gij zeggen; zij willen, in volle rust en
+vrede, Gods woord aanhooren. 't Is eender. Trekt de stad uit! verjaagt
+mij, doodt mij, smijt mij al die Calvinisten uit den Tempel! Zijt
+gij nog niet weg! Foei, gij zijt precies lijk verschrikte hennen,
+die op eenen mesthoop staan te beven! Ik zie het oogenblik aankomen,
+op hetwelk die verdoemde Calvinisten op den buik uwer vrouwen en
+dochteren zullen trommelen en gij zult ze laten begaan, weekelingen
+van mannen die gij zijt. Gaat niet naar Bellem, blijft hier, gij zoudt
+uwe kousen verslijten. Foei, Bruggelingen! foei, katholieken! Schande
+over u, eenden, ganzen en kalkoenen die gij zijt!
+
+"Dat moeten schoone predikantjes zijn, daar gij met hoopen luisteren
+gaat naar de leugenen, die zij uitbraken en daar de meidekens des
+nachts naar hunne sermoenen trekken, zoodat de stad binnen negen
+maanden vol kleine geuskens en geuzinnekens zal steken? Zij waren
+daar gevieren, vier truwanten, die preekten op 't kerkhof. De eerste
+bleek en mager, die leelijke broeksch..., had een vuilen hoed op zijn
+hoofd, met denwelken hij zijne ooren verborg. Heeft iemand van u ooit
+de ooren van eenen predikant gezien? Hij had geen hemd aan, want zijne
+armen staken bloot uit zijn wambuis. Gij kondt door zijn broek kijken,
+als door den St.-Jacobstoren van Antwerpen. De andere schelm had
+geen schoenen aan zijne voeten. Niemand heeft zijne ooren gezien. En
+hij bleef steken in zijne predikanterij, en de knapen en meidekens
+jouwden hem uiten riepen: "Ahoe! ahoe! hij kent zijne les niet." De
+derde had een vuilen, leelijken hoed op, met een pluimken op zij. Ook
+zijne ooren kon men niet zien. De vierde, een beetje beter gekleed
+dan de anderen, moet door den beul tweemaal gebrandmerkt zijn, ja!
+
+"Onder hunnen hoed dragen zij allen vettige, zijden hoofddeksels,
+die hunne ooren verbergen. Hebt gij ooit de ooren van een predikant
+gezien? Ooren! ha! ja, hunne ooren toonen; de beul is er mee weg:
+zij zijn allen gekortoord!
+
+"En nochtans is 't rond die schelmen, rond die diepers, rond
+die schoenlappers die hunnen spanriem ontliepen, rond die luizige
+predikanten, dat die van 't gemeen riepen: "Leve de geus!" alsof zij
+allen razend, zat of zot waren.
+
+"Ha! ons, arme Roomsch-Katholieken, blijft anders niets over dan de
+Nederlanden te verlaten, vermits men er den kreet: "Leve de geus! Leve
+de geus!" laat uitbraken! Welke steen van vermaledijding is dan toch op
+dat stompzinnig, betooverd volk gevallen? Ha! Jezus! overal zijn rijken
+en armen, edelen en onedelen, ouden en jongen, mannen en vrouwen aan
+'t roepen: "Leve de geus!"
+
+"En wat zijn al die heeren, al die kaalkoppen, die ons uit Duitschland
+overgewaaid zijn? Heel hunne have hebben zij in ontucht opgegeten
+met de wijven, met den drank, met het spel. Zij hebben zelfs geen
+verroesten nagel meer om te krabben daar waar het jeukt. En nu eischen
+zij het goed van kerken en kloosters!
+
+"En daar, in hun gastmaal, bij dien truwant van Kuilenburg, met
+dien anderen drinkebroer Brederode, hebben zij uit houten napjes
+gedronken, uit minachting voor den heere van Berlaymont en mevrouwe de
+landvoogdes. Ja, en zij hebben geroepen: "Leve de geus!" Ha! ware ik
+in de plaats van den goeden God geweest, ik hadde hun drinken, bier
+of wijn, veranderd in vuil, walgelijk schotelwater, ja, in vuile,
+stinkende loog, waarin zij hunne vuile hemden en drekkige lakens
+hadden kunnen wasschen.
+
+"Ja, tiert, ezels die gij zijt, brult: "Leve de geus!" Ja, tiert maar
+op, doch ik ben profeet. En al de verwenschingen, rampen, koortsen,
+pesten, branden, verwoestingen, kankers, Engelsche zweetkoortsen en
+zwarte pesten zullen over de Nederlanden vallen. Ja, en aldus zal God
+gewroken worden over uw vuil getier van "Leve de geus!" En er blijft
+geen steen uwer huizen over of geen splinter van uw verdoemde beenen,
+die zoo haastig naar die vervloekte Calvinisterij en predikanterij
+liepen. Het zij zoo! Amen!
+
+--Laat ons gaan, sprak Uilenspiegel tot Lamme.
+
+--Dadelijk, sprak Lamme.
+
+En hij zocht onder de jonge en schoone kwezelkens, die naar het
+sermoen geluisterd hadden; maar zijne vrouw vond hij niet.
+
+
+
+
+XII.
+
+Uilenspiegel en Lamme kwamen aan het Minnewater, hetwelk de groote
+doctoren en wijsneuzige wijsgeeren halsstarrig doen afstammen van
+Minrewater of Minderbroederswater.
+
+Zij bleven op den oever staan en zij zagen vrouwen, meidekens en
+knapen, arm in arm, met bloemen getooid, die malkander teederlijk in
+de oogen bezagen en dicht tegen elkander gedrongen gingen.
+
+Als Uilenspiegel hen zag, dacht hij aan Nele. En bij die weemoedige
+herinnering, sprak hij treurig tot Lamme:
+
+--Lamme, laat ons iets drinken.
+
+Maar Lamme hoorde niet wat Uilenspiegel zegde; droefgeestig bezag
+hij de verliefde paartjes.
+
+--Weleer gingen wij ook aldus, arm in arm, mijne vrouw en ik, tot
+groote afgunst van hen, die in alleenigheid, zonder geliefde levend,
+nijdig ons nakeken.
+
+--Kom, sprak Uilenspiegel, de Zeven vinden wij misschien op den bodem
+eener pinte.
+
+--Dat is drinkebroerspraat, antwoordde Lamme; de Zeven, dat weet gij
+wel, zijn reuzen, die onder 't groot gewelf van Sint-Salvatorskerk
+niet kunnen recht staan.
+
+Uilenspiegel dacht treurig aan Nele. Ook dacht hij, dat hij misschien
+in eene of andere afspanning een goed maal, een goed onderkomen en
+een lieftallige bazinne zou vinden; hij sprak nogmaals:
+
+--Laat ons iets drinken!
+
+Maar Lamme luisterde niet en sprak, naar Onze-Lieve-Vrouwetoren
+kijkend:
+
+--Heilige Maria, patronesse der geoorloofde minne, verleen mij de
+gunst, heur blanken boesem weder te zien,
+
+--Kom mede, sprak Uilenspiegel, heur blanke boezem troont in de eene
+of andere taveerne.
+
+--Hoe durft gij dat zeggen? sprak Lamme.
+
+--Wel zeker, sprak Uilenspiegel, ze moet ergens weerdinne zijn.
+
+--Dronkemansuitvluchten, sprak Lamme.
+
+Uilenspiegel vervolgde:
+
+--Wellicht bewaart zij voor de arme zwervers een schotel gestoofd
+ossevleesch, niet te vet, niet te droog, malsch lijk rozeblaadjes,
+zwemmend tusschen menigvuldige kruidnagelen, notemuskaat,
+hanekammetjes, kalfszwezerikken en andere hemelsche lekkernijen.
+
+--Deugniet! sprak Lamme, gij wilt mij zeker doen sterven. Weet gij dan
+niet, dat wij sedert twee dagen van droog brood en klein bier leven?
+
+--Dat is praat van een gulzigaard, antwoordde Uilenspiegel. Gij
+schreeuwt van honger; kom eten en drinken. Ik heb een halven gulden
+en zal de kosten van 't gelag betalen.
+
+Lamme lachte. Zij gingen hunne kar halen en, aldus door de stad
+rijdend, zochten zij naar de beste afspanning. Doch zij trokken er
+vele voorbij, als zij de zure gezichten van den baas of de bazinne
+zagen, weinig aantrekkelijk uithangsbord voor een gezellige keuken.
+
+Zij kwamen op de Zaterdagsmarkt en gingen het gasthof, de Blauwe
+Lanteern binnen. Daar zag de weerd er vriendelijker uit.
+
+Zij deden uitspannen en den ezel op stal zetten, in gezelschap van
+een maatje haver. Zij lieten zich een keurig avondmaal opdienen,
+aten hunne bekomst, sliepen als dassen en stonden 's morgens op,
+om nog te eten. Lamme schitterde van genoegen en sprak:
+
+--In mijne maag hoor ik een hemelsche muziek.
+
+Als 't oogenblik van betalen gekomen was, ging de weerd bij Lamme en
+sprak hij:
+
+--'t Is tien oortjes.
+
+--Hij heeft ze, zei Lamme, naar Uilenspiegel wijzend, die antwoordde:
+
+--Ik heb ze niet.
+
+--En de halve gulden?
+
+--Ik heb er geen, sprak Uilenspiegel.
+
+--'t Is gemakkelijk gezegd, sprak de baas; dan zal ik u uw wambuis
+en hemd uittrekken.
+
+Lamme, dien de drank moedig maakte, stond recht en riep uit:
+
+--En als ik wil eten en drinken, ja, eten en drinken voor zeven en
+twintig gulden en nog meer, zal ik het doen! Of meent gij, dat er
+geen rooden duit in dezen buik steekt? Bij God! tot hiertoe werd hij
+uitsluitend met ortolanen gevoed. Dergelijken buik zult gij nooit onder
+uw vettigen gordelriem dragen. Bij mij ligt het vet drie duim dik op
+den buik, terwijl gij het op den kraag van uw wambuis moet zoeken.
+
+De weerd was buiten zich zelven van woede. Hakkelaar van nature,
+wilde hij rap spreken; doch hoe meer hij zich haastte, hoe meer hij
+moest niezen als een hond, die uit 't water komt. Middelerwijl wipte
+Uilenspiegel bollekens brood naar zijn aangezicht. En Lamme, meer en
+meer opgewonden, vervolgde:
+
+--Ja, ik bezit genoeg voor uw drie magere hennen, uw vier schurftige
+kiekens en dien grooten dwazerik van een pauw, die met zijn morsigen
+steert het neerhof ginds ronddwijlt. En als uwe huid niet verrimpeld
+was als die van een ouden haan, als uw beenderen niet vaneen vielen in
+uwe borstkas, dan had ik nog genoeg om u ook op te eten, u, en uwen
+snotterigen knecht, en uw halfblinde meid, en uwen kok, die gelukkig
+mag zijn als hij 't schurft niet heeft, daar zijne armen te kort zijn
+om zich ordentelijk te krabben.
+
+--Bezie mij, vervolgde hij, bezie mij dien vogel eens, die, voor een
+halven gulden, ons wambuis en ons hemde wil uitdoen! Daarom moet men
+schaamtevrij zijn; heel zijne plunje is geen drie duiten weerd.
+
+Maar de baas blies door zijnen neus van woede.
+
+En Uilenspiegel wipte maar altoos bollekens brood naar zijn aangezicht.
+
+Lamme, dapper als een leeuw, vervolgde:
+
+--Hoeveel, magere tronie, hoeveel meent gij wel wat een ezel weerd
+is, een ezel met een fijnen mond, met lange ooren, een breede borst,
+met spieren als ijzer zoo sterk? Achttien gulden voor 't minst, is
+'t niet, armoedige baas? Hoeveel verroeste nagelen hebt gij wel,
+om zulk schoon beest te betalen?
+
+De baas blies nog meer door zijnen neus, doch dorst zich niet roeren.
+
+Lamme sprak:
+
+--Hoeveel meent gij, dat een schoone esschen kar geldt, die heel in
+'t blauw is geverfd en tegen zon en regen bespannen met eene huif
+van Kortrijksch lijnwaad? Vier en twintig gulden voor 't minst,
+niet waar? Vier en twintig gulden en achttien gulden, hoeveel maakt
+dat? Antwoord, armzalige rekenmeester. En, daar het marktdag is en er
+boeren in uwe ellendige afspanning zijn, ga ik ze dadelijk verkoopen.
+
+Hetgene geschiedde, want allen kende Lamme. En inderdaad, voor ezel
+en kar kreeg hij vier en veertig gulden en tien oortjes. Toen deed
+hij het goud rinkelen onder den neus van den weerd, en sprak hij:
+
+--Hewel, baas is hier geld genoeg om nog iets te peuzelen?
+
+--Ja, sprak de baas.
+
+En stille zegde hij:
+
+--Als gij ooit uw vel verkoopt, geef ik er een oortje voor: 't zal
+een amulet tegen overdadigheid wezen.
+
+Doch een hupsch en lieftallig wijfje, dat in het donker binnenhof
+stond, was verscheidene reizen voor 't venster naar Lamme komen zien,
+en telkens dat hij heur schoon gezichtje kon bemerken, trok ze zich
+schielijk achteruit.
+
+'s Avonds, als hij, zonder licht, waggelend de trap opklom, voelde
+hij eene vrouw, die hem omarmde, hem kuste op zijne kaken, zijnen
+mond, tot zelfs op zijn neus; zijn gezicht was nat van hare tranen,
+na hetwelk zij hem liet voortgaan.
+
+Lamme ging naar zijn bedde en sliep als een os, en 's anderen daags
+trok hij met Uilenspiegel naar Gent.
+
+
+
+
+XIII.
+
+Daar zocht hij zijne vrouw in al de kaberdoeskens, danszalen en
+taveernen. 's Avonds vond hij Uilenspiegel terug in den Zingenden
+Zwaan. Uilenspiegel ging overal rond om het volk tot opstand te wekken,
+tegen de beulen van den vaderlandschen bodem.
+
+Op de Vrijdagsmarkt, omtrent de Dulle Griet, ging Uilenspiegel plat
+op zijn buik ten gronde liggen.
+
+Een kooldrager kwam voorbij en sprak:
+
+--Wat doet gij daar?
+
+--Ik maak mijnen neus nat om te zien van waar de wind komt, antwoordde
+Uilenspiegel.
+
+Een timmerman kwam.
+
+--Neemt gij den grond voor een bedde? vroeg hij.
+
+--Er zijn er, die hem weldra voor een deken zullen nemen antwoordde
+Uilenspiegel.
+
+Een monnik bleef staan.
+
+--Wat doet dat kalf daar? vroeg hij.
+
+--Het kalf vraagt plat op zijn buik uwen zegen, mijn vader, antwoordde
+Uilenspiegel.
+
+De monnik gaf hem dien en toog henen.
+
+Toen legde Uilenspiegel zijn oor tegen den grond; een boer kwam
+voorbij.
+
+--Hoort gij daar iets? vroeg hij.
+
+--Ja, sprak Uilenspiegel, ik hoor het hout groeien, hetwelk zal dienen
+om de arme ketteren te verbranden.
+
+--Hoort gij niets anders? vroeg een stadsserjant.
+
+--Ik hoor, sprak Uilenspiegel, de Spaansche soldaten aandraven; als
+gij iets hebt, dat dierbaar is, begraaf het dan, want weldra zijn de
+steden niet meer veilig tegen de roovers.
+
+--Hij is zot, zei de serjant.
+
+--Hij is zot, herhaalden de poorters.
+
+
+
+
+XIV.
+
+Doch Lamme at of dronk niet meer, dacht standvastig aan den zoeten
+droom op de trap in de Blauwe Lanteern. Zijn hert trok hem naar Brugge,
+maar Uilenspiegel nam hem mede naar Antwerpen, alwaar hij jammerend
+voort zocht.
+
+Uilenspiegel ging in de taveernen en, sprekende over de plakkaten,
+zeide hij tot goede Vlamingen, tot hervormden, ja zelfs tot
+vrijheidminnende katholieken:
+
+--Zij brengen ons de inquisitie mede, zoogezegd om ons lijf van
+de ketterije te zuiveren, maar 't is ook voor onze beurze, dat die
+rabarber zal dienen. Wij, die niets innemen tegen onze goesting, wij
+zullen ons verzetten, muitmaken en de hand aan de wapenen slaan. Dat
+weet de koning. Als hij ziet, dat wij zijne rabarber niet willen, zal
+hij afkomen met lavementpijpen: dat zijn groote en kleine kanonnen,
+falkonetten, slangen met wijden mond. Een koninklijk lavement,
+kortom. En in het derwijze gepurgeerde Vlaanderenland zal geen begoede
+burger meer overblijven. Gelukkige landen, die zulk een koninklijken
+geneesheer hebben!
+
+Maar de poorters lachten.
+
+Uilenspiegel sprak: Lacht maar; doch vlucht of wapent u op den dag,
+als er in Onze-Lieve-Vrouwekerk beelden worden gebroken.
+
+
+
+
+XV.
+
+Op 15 der Oogstmaand, den grooten dag van Maria en van de wijding
+van kruiden en wortelen, wanneer de hennen, volgepropt met graan,
+doof blijven voor 't geroep van den haan, werd aan eene der poorten
+van Antwerpen, een groot steenen kruisbeeld aan stukken geslagen
+door een Italiaan, in dienst van Granvelle. 's Zondags nadien ging
+de ommegang van Onze-Lieve Vrouwekerk uit, voorafgegaan door groene,
+gele en roode narren.
+
+Maar het Mariabeeld werd onderwege gehoond door rapaille, dat riep:
+"Maaiken, de uitdraagster, dit is uw laatste feestdag, want men zal
+haast met u mosselen zieden"; het beeld werd ijlings in 't koor van
+de kerk teruggebracht.
+
+Uilenspiegel en Lamme gingen Onze-Lieve-Vrouwekerk binnen. Havelooze,
+in lompen gehulde jongelieden en ook eenige volwassenen, elkeen
+onbekend, stonden vóór het koor tot malkander zekere teekenen
+en gebaren te maken. Zij maakten veel gerucht met voeten en
+tongen. Niemand had ze ooit in Antwerpen gezien, of zag ze later
+ooit weer. Een hunner, met een bruin gezicht als een verbrande ajuin,
+vroeg of Maaiken--dat was Maria--bang was, daar ze zoo ijlings terug
+in de kerk kwam.
+
+--'t Is toch niet voor u dat ze bang is, leelijke moor, antwoordde
+Uilenspiegel.
+
+De jonge schoelje, tot wien hij sprak, kwam op hem af om hem te slaan,
+maar Uilenspiegel nam hem bij den kraag en sprak:
+
+--Als gij durft slaan, doe ik u uwe tong uitspuwen.
+
+Zich vervolgens tot eenige Antwerpsche vrienden wendend, die daar
+waren, zeide hij:
+
+--Signoorkens en pagadders (naar de havelooze kerels wijzend),
+betrouwt ze niet, 't zijn valsche Vlamingen, lafaards en verraders,
+die betaald zijn om ons in kwaad, in ellende en in rampspoed te lokken.
+
+Vervolgens tot het geboefte sprekend, zeide hij:
+
+--Hewel, ezelskoppen, die uittdroogt van armoe, vanwaar haalt gij het
+geld, dat thans in uwe beurze rinkelt? Hebt gij soms nu reeds uw vel
+verkocht om er trommelen van te maken?
+
+--Beziet eens dien preeker! riepen ze.
+
+Toen begonnen zij allen samen te schelden, sprekende van
+Onze-Lieve-Vrouwe:
+
+--Maaiken heeft een schoon kleed! Maaiken heeft een schoone kroon! Ik
+zal ze geven aan eene loddege van mijne kennis.
+
+Zij gingen buiten, terwijl een onverlaat den predikstoel beklom om
+er zotte reden te houden, en zij kwamen terug, roepende:
+
+--Kom beneden, Maaiken, of wij komen u halen. Doe een mirakel, toon
+nu eens dat gij kunt loopen, in stee van u laten dragen!
+
+Maar Uilenspiegel riep te vergeefs: Rampzaligen, houdt op met uw
+geschimp; alle plundering is misdaad! Zij gingen voort met hunne
+heiligschendende taal en spraken zelfs van het koor binnen te breken
+en Maaiken beneden te halen.
+
+Daarop smeet een oude vrouw, die keersen verkocht in de kerk, hun de
+assche van haren vuurpot in het gezicht; maar zij werd geslagen en
+ten gronde gestampt, en daarna herbegon het geweld.
+
+De markgraaf kwam in de kerk met zijne hellebaardiers. Toen hij het
+volk samengeschoold zag, spoorde hij het aan de kerk te verlaten,
+maar zoo weinig krachtdadig, dat slechts enkelen henen gingen; de
+anderen spraken:
+
+--Eerst moeten de kanunniken de vespers zingen, ter eere van Maaiken.
+
+De markgraaf sprak:
+
+--Er wordt niet gezongen.
+
+--Dan zullen we zelven zingen was het antwoord.
+
+Zoo deden zij in de zijbeuken en omtrent het portaal van de
+kerk. Eenigen speelden met den bal en hinkelden met steentjes over
+den vloer en zeiden: "Maaiken, nimmer speelt gij in het hemelrijk,
+en gij verveelt u: kom spelen met ons".
+
+En onophoudelijk hoonden zij het beeld, riepen, huilden en floten.
+
+De markgraaf gebaarde bang te zijn en ging henen. Hij deed de deuren
+sluiten behalve ééne.
+
+En hoewel het gemeen er zich niet mee bemoeide, werden de galgenazen
+stoutmoediger en riepen zij nog luider. Het gewelf weergalmde als onder
+'t gebulder van kanonnen.
+
+Op den predikstoel klom er toen een. Hij scheen gezag te hebben;
+met een gebaar deed hij allen zwijgen, en hij begon te preeken:
+
+"In den naam des Vaders, des Zoons en des Heiligen Geestes,
+drie zijn één en één is drie; God beware ons in 't hemelrijk van
+dergelijke cijferkunde; op heden, vijftienden van de Oogstmaand, is
+Maaiken met heur schoonste kleeren in triomf uitgegaan om haar houten
+gezicht te toonen aan alle signoorkens en pagadders van de goede stad
+Antwerpen. Maar onderwege in den ommegang, is Maaiken den duivel Satan
+tegengekomen en Satan sprak lachend tot haar: "Zijt gij nu te fier
+om den armen pagadder Satan goeden dag te zeggen, omdat gij gekleed
+zijt als eene koningin, en gij gedragen wordt door vier signoren?" En
+Maaiken antwoordde: "Gaat van hier, Satan, of ik verbrijzel u nogmaals
+den kop!" "Maaiken, dat doet gij nu reeds vijftienhonderd jaar, maar
+de Geest van den Heer uwen meester heeft mij verlost. Ik ben sterker
+dan gij; gij zult mij op den kop niet meer trappen, en nu ga ik u een
+dansken leeren. Satan nam een duchtige lederen zweep en begon er mee
+te kletsen op Maaiken, die niet dorst schreeuwen om niet te laten
+zien dat ze bang was; en toen is ze op den loop gegaan en deed zij
+de signoorkens die haar droegen insgelijks loopen, opdat ze met heur
+gouden kroon en rijke juweelen niet onder 't arme gemeene volk zou
+vallen. En nu zit Maaiken koes en bevend in heur kot, te kijken naar
+Satan, die daar omhoog op gindsche zuil zit, met de zweep in de hand,
+en grijnslachend zegt: "Ik zal u het bloed en de tranen betaald zetten,
+die vloeiden in uwen naam! Maaiken, hoe is 't met uwe onbevlektheid? Ge
+moet rijden! We gaan u aan stukken slaan, leelijk houten beeld dat
+ge zijt, voor al de beelden van vleesch en beenderen, die in uwen
+naam genadeloos verbrand, gehangen en levend begraven werden." Aldus
+sprak Satan, en hij had gelijk. En gij moet beneden, wreedaardig,
+bloeddorstig Maaiken, want gij geleekt geenszins op uwen zoon Christus.
+
+En heel de menigte handlangers riep en tierde en huilde:
+"Maaiken! Maaiken, gij moet rijden! Maakt gij nu uw hemd nat van
+schrik? Weg met de houten heiligen! Laat heur een bad in de Schelde
+nemen! Hout drijft toch boven!"
+
+Het volk aanhoorde hen zonder iets te zeggen.
+
+Doch Uilenspiegel klom op den predikstoel, stampte met geweld den
+spreker van de trappen en zei tot het volk:
+
+--Dwazen, onnoozele dwazen, ziet gij dan niet verder dan uw neus lang
+is? Begrijpt gij dan niet, dat dit alles verraderswerk is? Zij willen
+u tot heiligschenners en tot beeldbrekers maken, om u tot muiters te
+kunnen verklaren, uwe kisten te ledigen, u te onthalzen en levend
+te verbranden! En de koning zal erven! Signoorkens en pagadders,
+hecht geen geloof aan de woorden dier bewerkers van rampspoed: laat
+Onze-Lieve-Vrouw in heure nis, leeft kloekmoedig, werkt blijgezind en
+geniet van uwe winsten en profijten. De zwarte duivel des rampspoeds
+heeft u in 't oog, en 't is door plundering en vernieling, dat hij het
+vijandelijke leger zal roepen om u als rebellen te behandelen en Alva
+over u te doen regeeren door dictatuur, inquisitie, verbeurdverklaring
+en dood!
+
+... En hij zal erven!
+
+--Laas, sprak Lamme, plundert niet, signoorkens en pagadders; de
+koning is al kwaad genoeg. De dochter van de borduurster heeft het
+tot mijn vriend Uilenspiegel gezegd. Plundert niet, mijne heeren!
+
+Maar het gemeen kon hen niet hooren.
+
+De handlangers riepen:
+
+--Ze moet beneden! In de Schelde, de houten heiligen. Hout drijft
+toch boven!
+
+Uilenspiegel klampte zich aan den preekstoel vast en riep tevergeefs:
+
+--Signoorkens en pagadders, duldt de plundering niet! Brengt uwe stad
+niet ten onder!
+
+En hij werd weggerukt met gekwetst gelaat, wambuis en hoos gescheurd,
+hoewel hij zich dapper verweerde met vuisten en voeten. En heel
+bebloed, hield hij niet op te roepen:
+
+--Duldt de plundering niet!
+
+Maar het was te vergeefs.
+
+De onbekenden en het grauw van de stad liepen tegen het hek van het
+koor aan, hetwelk zij braken al roepend:
+
+--Vive le geus!
+
+Allen begonnen te breken, te plunderen, te vernielen. Vóór middernacht
+was die groote kerk, in dewelke zeventig autaren, allerhande schoone
+schilderijen en kostbaarheden waren, teenemaal ledig. De autaren
+werden aan stukken geslagen, de beelden werden van hunne pedestalen
+getrokken, uit hunne nissen gerukt, op den vloer geworpen en met
+hamers verbrijzeld en de gewijde olie tot schoensmeer gebezigd. Toen
+er niets meer te breken viel, trok de bende naar de Minderbroeders,
+De Franciscanen, Sint-Pieters, Sint-Andries, Sint-Jacobs, Sint-Joris,
+Sint-Michiels, de Peterpotkerk, den Burcht, het Fawkensklooster,
+de Witte Zusters, de Grijze Zusters, de Predikheeren en al de
+kerken en kapellen van de stad, om er te werk te gaan als in
+Onze-Lieve-Vrouwe. Zij namen waskeersen en flambouwen en liepen er
+mee overal rond.
+
+En onder hen was geen getwist nog krakeel; geen hunner werd gekwetst
+in die groote afbraak van steen, van hout en andere stoffen.
+
+Zij trokken naar den-Haag, om er de beelden en autaren weg te nemen;
+doch daar noch elders verleenden de protestanten hun hulp.
+
+In den-Haag vroeg de magistraat hun, waar hunne lastgeving was.
+
+--Hier, sprak een hunner, en hij sloeg op zijn hert.
+
+--Hoort gij, signoorkens en pagadders? Hunne lastgeving! sprak
+Uilenspiegel, die het feit vernomen had. Er is dus iemand, die hun
+last geeft het werk van heiligschenners te doen! Als een dief mijne
+hut binnendringt, zal ik doen als de magistraat van den-Haag, en
+zal ik, mijn hoedeken afnemend, vragen: Lieve schelm, beminnelijke
+dieper, eerbiedweerdige roover, waar is uwe lastgeving? Hij zal
+wijzen naar zijn hert, dat dorst naar mijne have. En ik zal hem al
+mijne sleutels ter hand stellen! Zoekt, zoekt wien de plundering
+baat. Mistrouwt den Rooden Hond; de misdaad is begaan, de beteugeling
+zal volgen. Mistrouwt den Rooden Hond! Het groote steenen kruisbeeld
+is aan stukken geslagen. Mistrouwt den Rooden Hond!
+
+Toen Uilenspiegel vernam dat de Groote Raad van Mechelen, door den
+mond van zijnen voorzitter Viglius, geboden had den beeldenstorm
+geenerlei verzet te bieden, sprak hij:
+
+--Laas! de oogst is rijp voor de Spaansche maaiers. De hertog! de
+hertog nadert! Vlamingen, de zee, de zee der wrake wast. Arme
+vrouwen en meidekens, vlucht den put. Arme mannen, vlucht de galg,
+het vuur en het zweerd! Philippus wil het bloedig werk van keizer
+Karel voltooien. De vader zaaide dood en ballingschap; de zoon heeft
+gezworen, dat hij liever over een kerkhof dan over een kettervolk
+heerscht. Vlucht, daar zijn de beul en de grafmakers.
+
+Het volk luisterde naar Uilenspiegel, en honderden gezinnen verlieten
+de steden, en de wegen waren vervuld met karren vol huisraad van
+allen die in ballingschap gingen.
+
+En Uilenspiegel ging overal, gevolgd door Lamme, die jammerend zocht
+naar zijne vrouw.
+
+En te Damme weende Nele bij de uitzinnige Katelijne.
+
+
+
+
+XVI.
+
+Toen Uilenspiegel, in de Wijnmaand, te Gent was, kwam hij Egmond
+tegen, die gegastreerd had in het edel gezelschap van den abt
+van Sint-Baafs. Neurend, dede hij droomerig zijn peerd op stap
+gaan. Eensklaps keek hij op, en zag hij eenen man, die met een
+brandende lanteerne naast hem ging.
+
+--Wat wilt ge? vroeg Egmond.
+
+--Uw welzijn, antwoordde Uilenspiegel, zooveel welzijn, als een
+brandende lanteerne kan geven.
+
+--Ga heen en laat mij, sprak de graaf.
+
+--Ik zal niet gaan, antwoordde Uilenspiegel.
+
+--Moet gij dan van de zweep hebben?
+
+--Ik wil er wel tienmaal van hebben, als ik in uw hoofd zulk eene
+lanteerne kan steken, dat gij klaar ziet tot in 't Escuriaal.
+
+--Ik heb zaken met uwe lanteerne noch met 't Escuriaal, antwoordde
+de graaf.
+
+--Wel, antwoordde Uilenspiegel, ik kan mij niet weerhouden u een
+goeden raad te geven.
+
+Hij greep het peerd des graven bij den teugel en, terwijl het sloeg
+en steigerde, sprak hij:
+
+--Heere, gedenk toch, dat gij thans goed op uw peerd danst en dat
+uw hoofd ook goed op uwe schouderen danst; maar de koning wil, naar
+men zegt, dien schoonen dans afbreken, u uw lijf laten, maar uw hoofd
+nemen om het zoo verre van hier te doen dansen, dat gij het nimmermeer
+krijgen kunt. Geef mij een gulden, ik heb hem verdiend.
+
+--Van de zweep, als gij niet wegkomt, ongeluksvogel.
+
+--Heer, ik ben Uilenspiegel, zoon van Klaas, die levend verbrand werd
+voor het geloof, en van Soetkin, die stierf van verdriet. De assche
+die klopt op mijne borst, zegt mij, dat Egmond, de dappere krijgsman,
+met de landwacht, die hij aanvoert, tegen den hertog van Alva zijne
+driemaal zegevierende troepen kan stellen.
+
+--Ga heen, antwoordde Egmond, ik ben geen verrader.
+
+--Red onze landen, gij alleen vermoogt het, sprak Uilenspiegel.
+
+De graaf wilde hem slaan met zijne zweep, doch Uilenspiegel bleef op
+de slagen niet wachten, wegvluchtend riep hij nog:
+
+--Eet lanteernen, eet lanteernen, heer graaf. Red onze landen!
+
+Op een anderen dag hield Egmond stil voor de afspanning het Bont
+Verken, gehouden door een lieftallige bazinne van Kortrijk, het
+Muizeken geheeten.
+
+De graaf stond recht op zijne stijgbeugels en riep:
+
+--Is er iemand?
+
+Uilenspiegel, die bij 't Muizeken diende, kwam vóór met een tinnen
+beker in eene hand en in de andere eene bottel vol rooden wijn.
+
+De graaf herkende hem:
+
+--Ha, gij zijt het, ongeluksvogel, sprak hij.
+
+--Heere, antwoordde Uilenspiegel, kunt gij mij zeggen wat het roodst
+is, óf de wijn die door de keel vloeit, óf het bloed dat uit den hals
+stroomt? Dat was het wat mijne lanteerne vroeg.
+
+De graaf antwoordde niet, dronk, betaalde en vertrok.
+
+
+
+
+XVII.
+
+Uilenspiegel en Lamme, elk gezeten op een ezel, dien zij kregen van
+Simon Simonsen, een der getrouwen van den prins van Oranje, reden
+overal rond om de poorters te verwittigen van de snoode inzichten
+van den bloedigen koning en om tijdingen uit Spanje te vernemen.
+
+Zij verkochten groenten, waren gekleed als boeren en liepen de
+markten af.
+
+Bij het terugkeeren van de markt van Brussel, zagen zij in een steenen
+huis, op de Kareelkaai, in een lage kamer, eene dame gekleed in samijt,
+hoog van kleur, vol van boezem en schalksch van oog.
+
+Zij sprak tot een jonge en poezele keukenmeid:
+
+--Gij zult een goede klont boter in de pan moeten smelten, want ik
+houd niet van saus met ijzersmaak.
+
+Uilenspiegel stak zijn neus voor het venster.
+
+--Ik wel, sprak hij, want een hongerige maag kan veel verdragen.
+
+De dame keerde zich om en sprak:
+
+Wat is dat voor een moeial, die zich met mijne keuken bemoeit?
+
+--Eilaas! schoone dame, sprak Uilenspiegel, liet ge mij er een weinig
+mede bemoeien in uwe gezelschap, ik leerde u gerechten uit vreemde
+streken maken, die onze dames niet kennen.
+
+En smakkende, zei hij:
+
+--Ik heb dorst.
+
+--Naar wat? vroeg zij.
+
+--Naar u, sprak hij.
+
+--Hij is schoon, zei de keukenprinses tot de dame. Willen wij hem
+binnenlaten, hij zal ons zijne avonturen vertellen.
+
+--Maar zij zijn getweeën.
+
+--Ik gelast mij met éénen, hernam de keukenmeid.
+
+--Mevrouwe, sprak Uilenspiegel, 't is waar, we zijn getweeën: ik en
+mijn arme Lamme, die geen honderd pond op den rug kan dragen, doch
+gemakkelijk met vijfhonderd pond eten en drinken op de maag loopt.
+
+--Jongen, zei Lamme, spot niet met mij; 't is al ongelukkig genoeg,
+dat mijn buik mij zoo duur kost.
+
+--Vandaag kost hij u geen duit, sprak de dame. Komt beiden binnen.
+
+--Maar, sprak Lamme, er zijn ook twee ezelen, waarop wij zitten.
+
+--In den stal van den grave van Meghem is geene haver te kort,
+antwoordde de dame.
+
+De keukenmeid liet heure braadpannen staan en bracht Uilenspiegel en
+Lamme op het binnenhof, en de ezels begonnen seffens te balken.
+
+--Ze rieken eten en ze schateren uit van vreugde, de arme dieren,
+sprak Uilenspiegel.
+
+Toen beiden van hunne ezels waren gestegen, sprak Uilenspiegel tot
+de keukenmeid:
+
+--Zoudt gij een ezel lijk ik willen, als gij een ezelinnetje waart?
+
+--Ik zou een jongen met een vroolijk gezicht willen, als ik eene
+vrouw was, antwoordde zij.
+
+--Wat zijt gij dan, als gij vrouw noch ezelin zijt? vroeg Lamme.
+
+--Eene maagd, sprak zij, eene maagd is geene vrouw, en eene ezelin
+evenmin: begrijpt gij, dikzak?
+
+Uilenspiegel sprak tot Lamme:
+
+--Gij moet heur niet gelooven, 't is een deugnietje en een
+duivelinneken. Beëlzebub heeft ze van nu af aan verkoren tot zijne
+gezellin in de helle.
+
+--Leelijke spotter, antwoordde de keukenmeid.
+
+De dame sprak:
+
+--Drinkt eerst eene pint bruinbier, eet een stuk hesp, snijdt van
+dien bout, opent de pastei en proeft de salade.
+
+Uilenspiegel vouwde de handen te zamen.
+
+--Hesp, sprak hij, is heerlijk eten; bruinbier, hemelsche drank,
+hamelbout, goddelijk vleesch; een gevulde pastei doet de tong van
+genoegen trillen; een geurige salade is een vorstelijke spijs. Doch
+zalig is hij, die uwe schoonheid tot nagerecht krijgt.
+
+--Hoor hem eens bezig. Toe, eet, ondeugende jongen!
+
+Uilenspiegel antwoordde:
+
+--Zou ik niet liever beginnen met de dankzegging?
+
+--Neen, sprak zij.
+
+Maar Lamme was jammerlijk aan 't zuchten:
+
+--Ik heb honger.
+
+--Gij zult eten, sprak de schoone dame, vermits gij over niets anders
+bekommert zijt dan over uwen buik.
+
+--Ha! en mijne vrouw, zuchtte Lamme, als om heur gezegde te
+logenstraffen.
+
+Maar die woorden stelden de meid teleur. Lamme en Uilenspiegel aten
+buik-sta-bij en dronken als tempeliers. En de dame gaf dien nacht
+nog te eten aan Uilenspiegel en ook 's anderen daags en volgende dagen.
+
+De ezels kregen een dobbel maatje haver en Lamme dobbel rantsoen. Eene
+week lang bleef hij in de keuken geplakt en sloeg hij menigerhande
+schotels naar binnen, maar hij hield zich niet bezig met de meid,
+want hij dacht te veel aan zijne vrouw.
+
+Dat maakte de dienstmeid spijtig, en ze zei, dat het een schande
+was den menschen al dien last aan te doen, om uitsluitend aan zijn
+vettigen buik te denken.
+
+En intusschen leefden Uilenspiegel en de dame zeer vriendschappelijk
+samen. Eens zegde zij tot hem:
+
+Thijl, zoudt gij de verdediging uwer gemartelde broederen op u nemen?
+
+--De assche van Klaas klopt op mijne borst, antwoordde Uilenspiegel.
+
+--Zóó zijt gij schoon, riep zij uit. Maar wie is die Klaas?
+
+Uilenspiegel antwoordde:
+
+--Mijn vader, die voor het geloove verbrand werd.
+
+--De grave van Meghem lijkt geenszins op u, sprak zij; hij wil eene
+lating toedienen aan de stad, die ik minne, want ik ben van Antwerpen,
+de zeeghaftige stede. Weet dus, dat hij overeengekomen is met Scheyf,
+den raadsheer van Brabant, om zijne tien vendels voetvolk in Antwerpen
+te brengen.
+
+--Dat zal ik den poorters gaan zeggen, sprak Uilenspiegel; en hij ijlde
+weg, rap als de wind. 's Anderen daags waren de poorters te wapen.
+
+Doch Uilenspiegel en Lamme, die hunne ezels op stal gezet hadden
+bij eenen pachter van Simon Simonsen, moesten zich schuil houden,
+uit vreeze voor den grave van Meghem, die hen overal deed zoeken om
+ze te hangen; want hij had vernomen, dat twee heretieken van zijn
+vleesch gegeten en van zijnen wijn gedronken hadden.
+
+De grave was jaloersch, en zeide het tot de schoone edelvrouwe,
+die knarsetande, weende en wel zeventien reizen in onmacht viel. De
+keukenmeid volgde heur voorbeeld, maar zoo dikwijls niet en verzekerde,
+op heur aandeel in 't hemelrijk en heurer ziele zaligheid, dat zij en
+heure Mevrouw niets anders gedaan hadden dan het afval van 't eetmaal
+gegeven aan twee armzalige pelgrims, die op magere ezelen gezeten,
+voor het keukenvenster waren komen staan,--en méér niet.
+
+En dien dag vloeiden er zoovele tranen, dat de grond teenemale nat
+was. Dit ziende, schonk messire van Meghem geloof aan heure woorden.
+
+Lamme dorst niet meer teruggaan naar het huis van den edelen heere,
+want telkens dat de keukenmeid zijn neus zag, begon zij zelve te
+zuchten en te jammeren: Ha! mijne vrouw!
+
+En hij was mistroostig, om den wille van het eten; doch Uilenspiegel
+bracht hem altoos eenige lekkere kliekjes mede, want hij drong in
+het huis langs de Sinte-Katelijnestraat, en hield er zich op den
+zolder verscholen.
+
+'s Anderen daags, na de vespers, beleed de grave van Meghem aan de
+schoone vrouwe, dat hij besloten had vóór den dageraad met zijne
+soldaten 's-Hertogenbosch binnen te dringen. Dan viel hij in slaap.
+
+De gravinne liep naar den zolder om Uilenspiegel te vertellen hetgeen
+zij wist.
+
+
+
+
+XVIII.
+
+Verkleed als pelgrim, zonder geld, zonder mond behoeften, trok
+Uilenspiegel dadelijk naar 's Hertogenbosch, om de poorters te
+waarschuwen.
+
+Hij was van zins een peerd te nemen bij Jeroen Praet, broeder van
+Simon, voor wien hij brieven van den prins had, om van daar spoorslags,
+langs de binnenwegen naar 's Bosch te rijden.
+
+Op den steenweg, hoorde hij eene bende huurlingen achter zich
+aanstappen. Hij verschrikte hevig, om reden van de brieven.
+
+Vast besloten allen tegenspoed het hoofd te bieden, bleef hij staan om
+Onze-Vaders te mompelen: toen zij hem ingehaald hadden, ging hij mede
+met hen, en alzoo vernam hij, dat zij naar 's Hertogenbosch trokken.
+
+Een Waalsch vendel opende den marsch. Aan het hoofd reden kapitein
+Lamotte en zijne wacht van zes hellebaardiers; vervolgens, naar
+rangorde, de vendrig met eene kleinere wacht, de provoost, zijne
+hellebaardiers en zijne twee vangmannen, het hoofd van de wacht,
+de trosbewaarder, de beul en zijne knecht; dan volgden pijpen en
+tamboerijnen met een oorverdoovend lawijd.
+
+Vervolgens kwam een Vlaamsch vendel van tweehonderd soldaten, met
+zijn kapitein, zijn vendrig, en verdeeld in twee afdeelingen van
+honderd man, elk aangevoerd door de bent-serjanten, en onderverdeeld
+in rotten, geleid door tiendeniers of rotmeesters. De provoost en zijne
+stokknechten waren mede voorafgegaan door pijpers en tamboerijnslagers,
+die bliezen en roffelden om 't hardst.
+
+Achter hen reden twee wagens, vol schoone, gichelende meidekens,
+de lieven der soldaten. Joelend, dartelend en schaterend, etend,
+drinkend en dansend, volgden de schoone, dolle meidekens den tros.
+
+Er waren er gekleed als landsknechten, maar in fijn, helderwit
+lijnwaad, uitgesneden aan de borst, uitgebekt aan mouwen en beenen,
+aan het wambuis, zoodat men heure donzige huid kon zien; op het hoofd
+droegen zij fijn lijnwaden kappen, met goud afgelegd, en met schoone
+wapperende struisvogelpluimen. Aan heure goudlinnen gordelbanden,
+gestikt met rood satijn, hingen de goudlakensche scheeden heurer
+dolkmessen. En heure schoenen, kousen en hozen, heure wambuizen en
+rijgsnoeren waren van witte zijde en klatermeerse.
+
+Anderen waren insgelijks als landsknechten gekleed, doch in blauwe,
+groene, scharlaken, paarse, karmozijnen stoffen, uitgebekt, geborduurd
+en met wapenen versierd, naar alle grillen en vindingen. En allen
+droegen op den arm een rood schijfje, tot teeken van heur bedrijf.
+
+De hoerwijfel, haar serjant, wilde haar het zwijgen opleggen; maar zij
+deden hem lachen door heur grappige woorden en bekoorlijke gebaren,
+en naar zijne vermaningen luisterden zij niet.
+
+Uilenspiegel, in zijn pelgrimspij, ging naast de twee vendels,
+gelijk een speeljacht, dat vaart naast een oorlogsschip. En hij
+knauwde steeds voort Onze-Vaders.
+
+Eensklaps sprak Lamotte tot hem:
+
+--Waar gaat gij aldus, reizende pelgrim?
+
+--Heer kapitein, antwoordde Uilenspiegel die honger had, weleer
+bedreef ik een groote zonde, en 't kapittel van Onze-Lieve-Vrouwekerk
+veroordeelde mij, te voet naar Rome vergiffenis te gaan vragen aan
+den Heiligen Vader, die ze mij verleende. Nu kom ik gereinigd in deze
+landen terug, op voorwaarde onderwege de Heilige Mysteriën te prediken
+voor alle soldaten, die ik zou ontmoeten en die mij, in ruil mijner
+sermoenen, brood en vleesch moeten geven. En aldus preekend, voorzie
+ik in mijn armzalig bestaan. Wilt gij mij de toelating schenken,
+bij de eerste pleisterplaats mijn gelofte te houden?
+
+--Ja, sprak messire van Lamotte.
+
+Zich broederlijk mengend onder Walen en Vlamingen, vergat Uilenspiegel
+niet, van tijd tot tijd te tasten naar de brieven onder zijn wambuis.
+
+De lustige deernen riepen hem toe:
+
+--Pelgrim, schoone pelgrim, kom hier en laat ons hooren den gloed
+uwer rede.
+
+Uilenspiegel naderde heur en zeide vol zedigheid:
+
+--Zusteren in Christus, spot niet met een armen pelgrim, die allerwegen
+het heilig geloof voor de soldaten moet preeken.
+
+En met de oogen verslond hij de lieve meidekens.
+
+Maar de lustige wijven staken heure blijde gezichten door de gaten
+van het zeil van den wagen.
+
+--Ge zijt wel jong, spraken zij, om voor de soldaten te preeken. Kom
+in onze wagens, wij zullen een blijdere taal tot u spreken.
+
+Uilenspiegel had geerne gedaan zooals zij zeiden, maar hij dorst niet,
+om reden van de brieven; reeds hadden er twee heure ronde blanke armen
+uit den wagen gestoken, om hem op te trekken, maar de hoerwijfel,
+die jaloersch was, snauwde tot Uilenspiegel:
+
+--Ga weg of ik kap uw hoofd af!
+
+En Uilenspiegel verwijderde zich van den wagen, dorstige blikken
+werpend naar de frissche deernen, die de zonne met licht overstroomde.
+
+Men kwam te Berchem; Philip de Lannoy, heere van Beauvoir, aanvoerder
+der Vlamingen, beval daar halt te houden.
+
+Daar stond een eik van middelbare grootte, met een enkelen tak
+afgebroken in 't midden en waaraan, eene maand geleden, een wederdooper
+had gehangen.
+
+De soldaten bleven staan, en de marketensters kwamen bij hen
+om hun brood, vleesch, wijn, bier en allerhande toespijzen te
+verkoopen. Aan de lustige wijvekens verkochten zij suikergebak,
+krakelingen, amandelen, taartjes. Als Uilenspiegel dat zag, kreeg
+hij nog grooteren honger.
+
+Vlug als een aap, klom Uilenspiegel op den boom en zette zich op
+den dikken tak, zeven voet boven den grond. Daar sloeg hij zich met
+eene geeselkoord, terwijl de soldaten en hunne lieven rond den boom
+kwamen staan.
+
+--In den naam des Vaders, des Zoons en des Heiligen Geestes, sprak
+hij. Amen! Er staat geschreven: Wie aan den arme geeft, leent aan God:
+dappere krijgslieden, en gij ook, schoone damen, leent aan God: 't is
+te zeggen, geeft mij brood, vleesch, wijn, bier, als gij wilt, en de
+taartjes die gij missen kunt, en God, die rijk is, zal U alles dobbel
+teruggeven, met dozijnen ortolanen, beken malvezij, bergen kandijsuiker
+en rijstpap, die gij in 't hemelrijk zult eten met zilveren lepels.
+
+Vervolgens jammerend:
+
+--Ziet gij niet door welke wreede smerten ik beproef, vergiffenis
+mijner zonden te bekomen? Zoudt gij de bijtende pijn dier geeseling
+niet lenigen, die tot bloedens toe mijnen rug kwetst?
+
+--Wat is dat voor een zot? vroegen de soldaten.
+
+--Mijne vrienden, antwoordde Uilenspiegel, zot ben ik niet,
+doch boetveerdig en stervend van honger; want terwijl mijn geest
+zijne zonden beweent, beweent mijn buik het gebrek aan smakelijke
+spijzen. Brave soldaten en gij, schoone meidekens, bij u zie ik vette
+hesp, gebraden ganzen, worsten, wijn, bier en taartjes, in grooten
+getale. Hebt gij niets over voor den armen pelgrim?
+
+--Ja, ja, riepen de Vlaamsche soldaten, zijne tronie bevalt ons.
+
+En allen wierpen stukken eten naar hem. Op zijn tak gezeten, hield
+Uilenspiegel niet op met bidden en spreken.
+
+--De honger, sprak hij, maakt den mensch wederspannig tegen het gebed,
+doch een stuk hesp neemt die kwade stemming dadelijk weg.
+
+--Pas op uw hoofd! riep een serjant, terwijl hij een half volle flesch
+naar hem wierp.
+
+Uilenspiegel greep de flesch en, met kleine slokjes drinkend,
+sprak hij:
+
+--Zoo razende honger schadelijk is voor 't lichaam des menschen, is
+er nog iets, dat even nadeelig is: te weten de angst van den armen
+pelgrim, die van goedhertige soldaten een klein stukje hesp en een
+heele bottel bier kreeg. Want gewoonlijk is de pelgrim sober van aard,
+en zoo hij dronk met te weinig eten in de maag, ware hij dadelijk zat.
+
+Terwijl hij sprak, ving hij eene ganzebil.
+
+--In de lucht weidevisch vangen, sprak hij, is iets wondersbaars. Maar
+de vangst is verdwenen in mijn keelgat. Wat is er gretiger dan droog
+zand? Een onvruchtbare vrouw en een hongerige maag.
+
+Plotseling voelde hij de punt eener hellebaard in zijne bil steken. En
+eenen vendrig hoorde hij zeggen:
+
+--Versmaden de pelgrims nu hamelbout?
+
+Uilenspiegel zag op de punt van de hellebaard een groot stuk hamelbout
+steken.
+
+Hij nam het en sprak:
+
+Bout voor bout, liever heb ik er zoo een tusschen mijn tanden dan
+zoo'n ijzeren tegen mijn maag.
+
+--Uit medelijden trek ik dit stuk hamelbout van uw wapen. Van het
+mergbeen zal ik eene pijp maken om uwen lof te bezingen, goedhertige
+hellebaardier.
+
+... Nochtans, ging hij voort, terwijl hij het been afknaagde, wat
+is een bout, hij moge nog zoo lekker en sappig wezen, zoo den armen
+pelgrim geen vriendelijk taartje komt toelachen?
+
+Terwijl hij dus sprak, sloeg hij de hand vóór het gezicht, want twee
+taartjes, die uit de vrouwengroep kwamen, vlogen het een op zijn
+oog, het andere op zijne kaak. De meidekens schaterden van lachen en
+Uilenspiegel sprak:
+
+--Wel bedankt, lieve meidekens, die mij roomkusjes zendt!
+
+Maar de taartjes waren ten gronde gevallen.
+
+Plotseling roffelden de trommels, bliezen de pijpen en zetten de
+soldaten zich weder op marsch.
+
+Messire van Beauvoir beval Uilenspiegel van den boom te komen en
+nevens de soldaten te stappen. Doch Uilenspiegel had honderd uren
+van dáár willen zijn, want uit de woorden van eenige soldaten maakte
+hij op, dat hij verdacht voorkwam en dat zij hem wel voor een spion
+konden nemen; dan zouden zij hem aftasten, en dit was zeker de galge,
+als ze zijne brieven ontdekten.
+
+Hij liet zich dus in eene greppel vallen en riep:
+
+--Medelijden, heeren soldaten, mijn been is gebroken, ik kan niet
+meer gaan; laat mij meerijden in den wagen der vrouwen.
+
+Maar hij wist, dat de hoerwijfel het niet zou gedoogen.
+
+Van uit haren wagen riepen de vrouwen:
+
+--Ja, kom, schoone pelgrim, kom bij ons. Wij zullen u minnen, u
+streelen, u kussen, en gij zult genezen zijn.
+
+--Ik weet het, sprak hij, vrouwenhanden zijn hemelsche balsem voor
+alle wonden.
+
+Maar de jaloersche hoerwijfel sprak tot messire van Lamotte:
+
+--Messire, ik geloof dat die pelgrim den spot bij ons drijft, en
+dat zijn been maar alleen gebroken is, om bij de vrouwen mede te
+rijden. Beveel, dat men hem op den weg late liggen.
+
+--Zoo zal geschieden, sprak messire van Lamotte.
+
+En men liet Uilenspiegel liggen.
+
+Eenige soldaten, die meenden dat zijn been waarlijk gebroken was,
+hadden spijt dat men een christenmensch zoo maar liet liggen, want ze
+vonden dat hij een lustige kwant was. Zij gaven hem vleesch en wijn
+voor twee dagen. De meidekens hadden hem geerne geholpen, doch wijl zij
+niet mochten, smeten zij hem de krakelingen toe, die zij nog hadden.
+
+Als de troep verre was, koos Uilenspiegel het hazenpad. Hij kocht
+een peerd en rende vlug als de wind, over wegen en paden, naar
+'s-Hertogenbosch.
+
+Bij de tijding van de komst der heeren Beauvoir en Lamotte, grepen
+die van de stad, ten getale van achthonderd, naar de wapenen; zij
+kozen aanvoerders en zonden Uilenspiegel, in kooldrager gekleed,
+naar Antwerpen om hulp te vragen aan den machtigen Brederode.
+
+En de soldaten der heeren Lamotte en Beauvoir konden niet binnen in
+'s-Hertogenbosch, de wakkere stede, die zich dapper verweerde.
+
+
+
+
+XIX.
+
+De volgende maand gaf zekere doctor Agileus twee gulden aan
+Uilenspiegel en brieven voor Simon Praet, die hem zou zeggen wat hij
+te doen had.
+
+Uilenspiegel kreeg bij Praet eten en slapen. Zijn slaap was goed,
+zoo goed als zijn tronie; Praet, daarentegen, was schraal en droevig,
+altoos in naargeestige gedachten verslonden. En Uilenspiegel was
+verwonderd dat hij, als hij 's nachts bij toeval wakker werd, hoorde
+kloppen met een hamer.
+
+En hij mocht nog zoo vroeg opstaan, Simon Praet was altijd vóór hem
+op, en droever was zijn gelaat, en somberder zijne blikken, als iemand
+die bereid is tot sterven of strijden.
+
+Somtijds, bij een zucht, vouwde Praet de handen biddend te zamen en
+scheen hij vol verontweerdiging. Zijne vingeren, alsook zijn hemd en
+zijn armen, waren vettig en zwart.
+
+Uilenspiegel wilde weten van waar de hamerslagen, de zwarte armen en
+Praet's neerslachtigheid kwamen. Op een avond, dat hij in de taveerne
+de Blauwe Gans was gebleven, in gezelschap van Simon, die er zijns
+ondanks gegaan was, gebaarde hij zoo dronken te zijn en zoo'n zeer
+in het hoofd te hebben, dat hij zich onverwijld te bedde moest leggen.
+
+En Praet bracht hem neerslachtig naar huis.
+
+Uilenspiegel sliep op den zolder, bij de katten; het bed van Simon
+was beneden, dicht bij den kelder.
+
+Uilenspiegel die dronkenschap bleef voorwenden, klom waggelend de trap
+op, en gebaarde schier te vallen, als hij naar de koord greep. Simon
+kwam hem ter hulp als een broeder, met teedere zorgen. Hij hielp hem
+in zijn bed; hij had medelijden met hem en bad God, dat Hij hem zijne
+dronkenschap zou vergeven. Dan ging hij naar beneden en weldra hoorde
+Uilenspiegel hetzelfde geklop, dat hem zoo dikwijls gewekt had.
+
+Zonder gerucht stond hij op en daalde op bloote voeten de smalle
+treden af; als hij er twee en zeventig geteld had, stond hij vóór
+een kleine deur die op een kier stond, waardoor een licht flikkerde.
+
+Simon drukte vliegende blaadjes met oude letteren uit den tijd van
+Laurens Coster, den uitvinder van de edele drukkunst.
+
+--Wat doet gij daar? vroeg Uilenspiegel.
+
+Verschrikt gaf Simon hem tot antwoord:
+
+--Klaag mij aan, zoo gij van den duivel zijt: ik zal sterven; maar
+zijt gij van God, dat uw mond het gevang uwer tong zij.
+
+--Ik ben van God, antwoordde Uilenspiegel, en wil u geenerlei
+kwaad. Maar wat doet gij daar?
+
+--Ik prent bijbels, antwoordde Simon. Want als ik, om vrouw en kinderen
+te spijzen, 's daags de booze en wreede edicten Zijner Majesteit
+drukken moet, 's nachts ben ik de zaaier van 't echte woord Gods en
+herstel ik het kwaad, dat ik bedrijf in den dag.
+
+--Gij zijt braaf en moedig, sprak Uilenspiegel.
+
+--Ik heb het geloove, antwoordde Simon.
+
+Inderdaad, uit die heilige drukkerij was het, dat de Vlaamsche bijbels
+kwamen, die verspreid werden in Brabant, in Vlaanderen, in Holland,
+in Zeeland, Utrecht, Noord-Brabant, Overijsel, Gelderland, tot den
+dag, waarop Simon veroordeeld werd tot het schavot en aan Christus
+en de gerechtigheid zijn leven offerde.
+
+
+
+
+XX.
+
+Eens vroeg Simon aan Uilenspiegel:
+
+--Hebt gij moed, broeder?
+
+--Ik heb er genoeg, antwoordde Uilenspiegel, om eenen Spanjaard te
+geeselen totdat de dood er op volge, om eenen moordenaar te dooden,
+eenen beul onschadelijk te maken.
+
+--Zoudt gij, vroeg de drukker, geduld genoeg hebben om in eenen
+schoorsteen te blijven, ten einde te luisteren wat in eene kamer
+gezegd wordt?
+
+Uilenspiegel antwoordde:
+
+--Wijl ik door de gratie Gods stevige lenden en fiksche beenen bezit,
+kan ik, als de katten, blijven staan waar ik ben.
+
+--Hebt gij geduld en een goed geheugen? vroeg Simon.
+
+--De assche van Klaas klopt op mijne borst, antwoordde Uilenspiegel.
+
+--Nu, luister, sprak de drukker, neem deze aldus gevouwen speelkaart
+en ga naar Dendermonde; daar zult gij tweemaal hard en eenmaal
+zachtjes kloppen aan de deur van het huis, waarvan de gevel hierop is
+geteekend. Iemand zal opendoen en u vragen of gij de schouwveger zijt;
+gij zult antwoorden dat gij mager zijt en de kaart niet verloren
+hebt. En gij zult ze hem toonen. Dan, Thijl, moet gij doen wat er
+hoeft. Groote rampen zweven over Vlaanderenland. Men zal u eene schouw
+toonen, gereedgemaakt en geveegd; daar zullen krammen voor uwe voeten
+zijn en, om te zitten, een berd, dat stevig vastgemaakt is. Als hij,
+die u binnen liet, u zegt in de schouw te kruipen, zult gij het
+doen, en gij zult daar stil wachten. Adellijke heeren zullen daar
+bijeenkomen, in de kamer vóór de schouw, waarin gij zijn zult. Het
+zijn Willem de Zwijger, de prins van Oranje, de graven van Egmond,
+van Hoorne, van Hoogstraten en Lodewijk van Nassau, de dappere broeder
+des Zwijgers. Wij, hervormden, willen weten wat die heeren willen en
+kunnen voor de redding onzer landen.
+
+Nu, den eersten April, deed Uilenspiegel zooals hem gezegd was. Hij
+was tevreden, dat er geen vuur in den heerd brandde en zei tot zich
+zelven: hoe minder rook hoe scherper het gehoor.
+
+Weldra werd de deur van de kamer geopend, en een tocht trok door
+de schouw. Geduldig verdroeg hij den wind, zeggende: hij zal mijn
+aandacht aanwakkeren.
+
+Vervolgens hoorde hij de heeren van Oranje, van Egmond en de
+anderen de kamer binnentreden. Zij spraken over hunne vreeze,
+over de gramschap des konings en over het slecht beheer van 's
+lands zaken en penningen. Een hunner sprak op bitsen, hoogmoedigen,
+helderen toon. Het was Egmond. Uilenspiegel herkende hem, lijk hij ook
+Hoogstraten herkende aan zijn heesche stem. Hoorne aan zijn harde stem;
+graaf Lodewijk van Nassau aan zijn mannelijke, krijgshaftige taal, en
+den Zwijger aan de langzame wijze waarop hij zijne woorden uitsprak,
+alsof hij elk hunner vooraf wilde wegen.
+
+Graaf van Egmond vroeg waarom men hen een tweede reize bijeenriep,
+terwijl zij te Hellegat hadden kunnen beslissen wat er te doen stond.
+
+Hoorne antwoordde:
+
+--De uren loopen snel voorbij, de koning is vertoornd; wij mogen
+niet talmen.
+
+Toen sprak de Zwijger:
+
+--De landen verkeeren in gevaar; wij moeten ze verdedigen tegen de
+aanvallen van de uitheemsche soldaten.
+
+Egmond antwoordde driftig, dat hij het zonderling vond, dat de koning
+een leger meende te moeten zenden, daar alles in vrede was door de
+zorgen der heeren en voornamelijk door de zijne.
+
+Maar de Zwijger sprak:
+
+--Philippus heeft in de Nederlanden veertien benden, die zijne bevelen
+moeten uitvoeren, waarvan al de soldaten dengene verkleefd zijn,
+die hen aanvoerde te Gravelingen en te Saint-Quentin.
+
+--Ik begrijp niet, sprak Egmond.
+
+De prins hervatte:
+
+--Ik wil er niets bijvoegen, maar aan u en de andere vergaderde heeren
+zal lezing gegeven worden van zekere brieven, met die van den armen
+gevangene Montigny te beginnen.
+
+In zijne brieven, schreef messire van Montigny:
+
+"De koning is uitermate vergramd over hetgeen in de Nederlanden gebeurd
+is, en op tijd en stond zal hij de daders der woelingen straffen".
+
+Daarop zei Egmond, dat het koud was en dat men diende een houtvuur
+aan te steken. Zoo werd gedaan, terwijl de beide heeren spraken over
+de brieven.
+
+Het vuur trok niet, om reden van den al te grooten takkebos in de
+schouw, en de kamer was vol rook.
+
+Hoestend las toen de graaf van Hoogstraten de onderschepte brieven,
+door den Spaanschen gezant te Parijs, don Francès d'Alava, aan de
+landvoogdes geschreven.
+
+--De gezant, sprak hij, schrijft dat al het kwaad, dat den Nederlanden
+overkomt, te wijten is aan de heeren van Oranje, van Egmond en van
+Hoorne. Gij moet, schreef hij, u van de vriendelijkste zijde aan hen
+toonen en hun zeggen dat de koning erkentelijk is voor hunne trouw. Wat
+betreft Montigny en Bergen: Zij blijven waar zij behooren te zijn.
+
+--Ha! dacht Uilenspiegel, ik zit nog liever in een rookende schouw
+in Vlaanderenland, dan in een goed verlucht gevang in Spanje; want
+daar verrijzen schavotten tusschen de vochtige muren.
+
+De gezant van Spanje voegde er bij dat de koning in Madrid gezegd had:
+
+--Door al hetgeen in de Nederlanden voorgevallen is, is ons koninklijk
+gezag verminderd, de dienst van God verlaagd, en wij zullen liever
+het bezit van al onze andere landen in de weegschaal leggen, dan
+dit oproer ongestraft te laten. Wij zijn besloten in eigen persoon
+naar de Nederlanden te gaan en de hulp des pausen en des keizers te
+vorderen. Het kwaad van heden moet het goede van morgen baren. Wij
+zullen de Nederlanden onder onze algeheele gehoorzaamheid brengen en,
+naar ons believen, staat, godsdienst en regeering wijzigen.
+
+--Ha! koning Philippus, dacht Uilenspiegel, kon ik u naar mijn believen
+wijzigen, zeker zoudt gij, onder mijn Vlaamschen stok, een merkelijke
+wijziging ondergaan aan uwe dijen, armen en beenen; ik zou uwen kop
+met twee nagelen in het midden van uwen rug vastmaken, opdat gij
+aldus de kerkhoven kondt zien, die gij achter u laat, en naar eigen
+believen uw liedeken van gewelddadige wijziging zoudt kunnen zingen.
+
+Er werd wijn opgediend. Hoogstraten stond recht en sprak:--Ik drink
+op onze landen! Allen deden als hij; toen voegde hij er bij, terwijl
+hij zijn ledigen beker nederzette:--De rampspoed is gekomen voor den
+Belgischen adel. Wij moeten middelen beramen tot onze verdediging.
+
+Hij wachtte een antwoord en zag naar Egmond, die zweeg.
+
+Maar de Zwijger zei:
+
+--Wij zullen weerstaan, als Egmond, die Frankrijk tweemaal beven deed
+te Saint-Quentin en te Gravelingen, die alle gezag over de Vlaamsche
+soldaten bezit, ons helpen wil om den Spanjaard te beletten in onze
+landen te komen.
+
+Messire van Egmond antwoordde:
+
+--Ik heb een al te eerbiedigen dunk van den koning om te meenen dat
+wij ons, als rebellen, tegen hem moeten wapenen. Dat zij, die zijnen
+toorn duchten, deze landen verlaten. Ik zal blijven, zonder zijne
+hulp kan ik niet leven.
+
+--Philippus zal zich wreedelijk wreken, sprak de Zwijger.
+
+--Ik heb vertrouwen, antwoordde Egmond.
+
+--Ook voor uw hoofd? vroeg Lodewijk van Nassau.
+
+--Mijn hoofd, mijn lijf, mijne toewijding, sprak Egmond, alles is zijn.
+
+--Ik, een getrouw onderdaan, doe als gij, sprak Hoorne.
+
+De Zwijger sprak:
+
+--Men moet voorzien en niet wachten.
+
+Toen antwoordde messire van Egmond met drift:
+
+--Te Geeraardsbergen deed ik twee en twintig hervormden hangen. Als
+de preeken ophouden, als de beeldenstormers gestraft worden, zal de
+woede des konings zich stillen.
+
+De Zwijger antwoordde:
+
+--IJdele hoop.
+
+--Wapenen wij ons met vertrouwen, sprak Egmond.
+
+--Wapenen wij ons met vertrouwen, sprak Hoorne.
+
+--'t Is met ijzer, en geenszins met vertrouwen, dat wij ons moeten
+wapenen, hervatte Hoogstraten.
+
+Daarop deed de Zwijger teeken, dat hij wilde vertrekken.
+
+--Vaarwel, prins zonder land, zegde Egmond.
+
+--Vaarwel, graaf zonder hoofd, antwoordde de Zwijger.
+
+Toen zegde Lodewijk van Nassau:
+
+--De slachter is voor het schaap, en de roem voor den moedigen
+strijder, die den grond der vaderen redt.
+
+--Ik mag, noch ik wil, sprak Egmond.
+
+--Het bloed van de slachtoffers valle op het hoofd van den hoveling,
+sprak Uilenspiegel.
+
+De heeren verlieten de kamer.
+
+Toen kwam Uilenspiegel uit zijne schuilplaats; hij ging rechtstreeks
+bij Praet en vertelde hem wat hij gehoord had.
+
+--Egmond is verrader; God is met den prins, zegde Praet.
+
+De hertog! de hertog te Brussel! Waar zijn de geldkisten, die
+vleugelen hebben?
+
+
+
+
+
+
+
+DERDE BOEK.
+
+
+I.
+
+De Zwijger gaat henen, God leide hem!
+
+De twee graven zijn reeds gevangen; Alva belooft aan den Zwijger
+goedertierenheid en vergiffenis, zoo hij vóór hem wil verschijnen.
+
+Op die tijding sprak Uilenspiegel tot Lamme:
+
+--Op aanzoek van Dubois, procureur-generaal, heeft de hertog gedagvaard
+binnen driemaal veertien dagen vóór hem te verschijnen: den prins
+van Oranje, Lodewijk zijn broeder, Hoogstraten, van den Berg,
+Kuilenburg, Brederode en andere vrienden des prinsen, onder belofte
+van goede justitie en goedertierenheid. Luister, Lamme: Eens daagde
+een Amsterdamsche jood een zijner vijanden uit, op straat te komen;
+de uitdager stond op den openbaren weg en de andere was boven aan
+een venster.
+
+--Kom beneden, riep de uitdager zijn vijand toe, en ik geef u zulken
+slag op uwen kop, dat hij in uwe borstkas zal zinken en gij door uwe
+ribben zult kijken, lijk een dief door de traliën van zijnen kerker.
+
+De andere antwoordde:--"Al beloofdet gij mij honderdmaal meer, nog
+kwam ik niet beneden". Zoo kunnen Oranje en de anderen antwoorden. En
+zoo deden zij ook, en zij weigerden vóór Alva te verschijnen. Egmond
+en Hoorne deden niet als zij. En zwakheid bij het vervullen van den
+plicht roept het uur van God.
+
+
+
+
+II.
+
+Te dien tijde werden te Brussel, op de Peerdenmarkt de heeren onthalsd,
+die zich door verrassing hadden willen meester maken van Amsterdam.
+
+En toen zij, geachttienen, naar de strafplaats gingen en psalmen
+zongen, roffelden tamboerijnen den heelen weg langs.
+
+En de Spaansche soldaten, die hen begeleidden met brandende toortsen,
+brachten hun overal brandwonden toe. En als zij zich verroerden,
+ter oorzake van de pijne, riepen de soldaten:--Hoe, Lutheranen,
+doet het u dan zeer, zoo vroegtijdig te worden verbrand?
+
+En hij, die hen verraden had, hiet Diederik Slosse. Hij had hen naar
+het nog katholieke Enkhuizen gelokt, om ze den beulsknechten van den
+hertog over te leveren.
+
+En zij stierven als helden.
+
+En de koning erfde.
+
+
+
+
+III.
+
+--Hebt gij hem zien voorbijgaan? vroeg Uilenspiegel, in houtkapper
+gekleed, tot Lamme, die op dezelfde wijze uitgedost was. Hebt gij
+den leelijken hertog gezien, met zijn plat voorhoofd als dat van een
+arend, en zijn langen baard, die gelijkt op een eind galgekoord? God
+verworge er hem mede! Hebt gij die spinnekop met haar lange harige
+pooten gezien, die Satan over onze landen braakte? Kom, Lamme, kom;
+laat ons steenen smijten in haar net.
+
+--Laas! sprak Lamme, om levend verbrand te worden!
+
+--Kom naar Groenendaal, mijn beste vriend, kom naar Groenendaal; daar
+is een schoon klooster, waar de Hertogelijke Spin den God van vrede
+bidt, dat Hij heur werk zou laten volvoeren, dat Hij haar als eene raaf
+in rot vleesch late wroeten. Wij zijn in de vasten, maar de hertog
+wil zich niet onthouden van bloed. Kom, Lamme, er zijn vijfhonderd
+gewapende mannen rond het huis van Ohain; driehonderd man te voet
+zijn bij kleine groepen vertrokken en dringen in het Zoniënbosch.
+
+Straks, als Alva aan 't bidden is, grijpen wij hem vast, wij steken
+hem in een ijzeren kooi en zenden 't ondier aan den prins.
+
+Doch rillend van angst, antwoordde Lamme:
+
+--Groot gevaar, mijn zoon, groot gevaar! Ik zou u helpen in die
+onderneming, als mijne beenen zoo zwak niet waren, en mijn buik niet
+zoo opgezwollen van het zuur bier, dat zij drinken in Brussel.
+
+Dit gesprek werd gehouden in een hol, gegraven in een dicht bewassen
+plaats van het bosch. Door de bladeren turend, zag Uilenspiegel
+eensklaps de gele en roode kleederen van de soldeniers des hertogen,
+wier wapenen flikkerden in de zonne en die te voet door het bosch
+kwamen.
+
+--Wij zijn verraden, sprak Uilenspiegel.
+
+Als de soldaten uit het gezicht waren, liep hij ijlings naar Ohain. De
+soldaten lieten hem ongemerkt door, ter oorzake van zijne kleeding
+van houtkapper en den last hout, dien hij op den rug droeg. Daar
+wachtten de ruiters; hij verspreidde het nieuws; allen gingen uiteen en
+ontsnapten, behalve de heer Bausart d'Armentières, die gevat werd. De
+heer Bausart moest het voor de anderen wreedelijk bekoopen.
+
+En 't was een lafhertige verrader uit het regiment van den heer van
+Likes, die hen allen had aangeklaagd.
+
+Met een hert, dat klopte van angst, ging Uilenspiegel te Brussel naar
+de Peerdenmarkt, den ijselijken folterdood bijwonen.
+
+En de arme Armentières, op het rad gelegd, kreeg zeven en dertig
+slagen met een ijzeren staaf op de beenen, de armen, de handen en
+voeten, die achter elkander aan stukken werden geslagen, want de
+beulen vermaakten zich met hem wreed te doen lijden.
+
+En op de borst kreeg hij den zeven en dertigsten klop, van denwelken
+hij stierf.
+
+
+
+
+IV.
+
+Op een zoelen en helderen dag van de Zomermaand werd te Brussel, op
+de Groote Markt, vóór het Broodhuis, een schavot opgericht, dat met
+zwart laken behangen was en nevens hetwelk twee hooge palen stonden,
+met ijzeren pinnen. Op het schavot waren twee zwarte kussens en een
+kleine tafel, met een zilveren kruisbeeld.
+
+En op dat schavot werden, met het zweerd, de edele heeren van Egmond
+en van Hoorne onthalsd.
+
+En de koning erfde.
+
+En de gezant van koning Frans I, over Egmond sprekend, zeide:
+
+--Ik heb daar het hoofd zien vallen van hem, die Frankrijk tweemaal
+deed beven.
+
+En de hoofden der graven werden op de ijzeren pinnen gestoken.
+
+En Uilenspiegel sprak tot Lamme:
+
+--De lijken en het bloed zijn met zwart laken bedekt. Gezegend zij,
+die in de zwarte dagen, welke op handen zijn, het hert hoog en het
+zweerd recht zullen houden.
+
+
+
+
+V.
+
+In dien tijd bracht de Zwijger een leger bijeen, en deed hij de
+Nederlanden langs drie kanten tegelijk aanvallen.
+
+En Uilenspiegel zeide in eene vergadering van Wilde Geuzen van
+Marenhout:
+
+--Op advies van die der inquisitie heeft koning Philippus een iegelijk
+inwoner der Nederlanden plichtig verklaard aan majesteitsschennis,
+zoowel om de ketterije aangehangen, als om haar niet bestreden te
+hebben. En uit hoofde dier afschuwelijke misdaden veroordeelt hij
+allen, zonder onderscheid van kunne of ouderdom, met uitzondering
+van hen, die met name genoemd zijn, tot de straffen voor dergelijke
+gruweldaden bepaald; en dit zonder de minste hoop op genade. En de
+koning erft. De dood maait in de rijke streek tusschen de Noordzee,
+het graafschap Emden, de rivier Amisia, de landen van Westfalen,
+van Kleef, van Gulik en van Luik, de bisdommen Keulen en Trier,
+het land van Lotharingen en Frankrijk. De dood maait in een land van
+driehonderd veertig uren omtrek, binnen tweehonderd ommuurde steden,
+in honderd vijftig dorpen die stadsrecht bezitten, in vlekken en
+velden. En de koning erft.
+
+Elfduizend beulen zijn niet te veel om dat werk te verrichten,--Alva
+heet hen soldaten. En de bodem der vaderen is eene slachtbank geworden,
+gevlucht door de kunsten, verlaten door de getrouwen, geschuwd door al
+de ambachtslieden, die liever den vreemde gaan verrijken, alwaar men
+hun den God van het vrije geweten laat aanbidden. Dood en ondergang
+maaien. De koning erft.
+
+De landen hadden hunne privileges bekomen met macht van
+geld, gegeven aan behoeftige vorsten; die privileges worden
+verbeurdverklaard. Volgens de verdragen, gesloten tusschen de landen
+en de vorsten, hadden zij gehoopt te genieten van de rijke vrucht
+van hun arbeid. Zij bedriegen zich: de metser bouwt voor den brand;
+de ambachtsman werkt voor den dief. De koning erft.
+
+Bloed en tranen! De dood maait op de brandstapels, op de boomen,
+die langsheen de groote wegen tot galgen dienen, in de gapende
+kuilen, in dewelke de arme meidekens levend worden geworpen, in de
+kerkers der gevangenissen, in de kransen van brandende takkebossen,
+te midden waarvan de slachtofferen met zacht vuur verbranden, in de
+gloeiende stroohutten, waarin de veroordeelden sterven door rook en
+door vuur. De koning erft.
+
+Aldus wilde de Paus van Rome.
+
+De steden zijn vol spionnen, die loeren op hun deel van de erfenis
+der slachtofferen. Hoe rijker, hoe schuldiger. De koning erft.
+
+Maar de wakkere mannen van den lande zullen zich niet laten kelen
+als lammeren. Onder de vluchtelingen, zijn gewapende mannen, die
+zich in de bosschen verschuilen. De monniken hadden ze verklikt,
+opdat men hun lijf en goed zou ontnemen. 's Nachts en ook 's daags
+werpen zij zich dan ook bij benden, als wilde dieren, op de kloosters;
+zij nemen er het geld terug, dat aan het arme volk ontroofd werd
+onder de gedaante van gouden en zilveren kandeleers, fierters of
+reliquieënkastjes, kostbare ciboriën, patenen en heilige vaten. Niet
+waar, goede lieden? Zij drinken den wijn, dien de monniken voor zich
+zelven bewaarden. De gesmolten of verkochte vaten zullen dienen tot
+den heiligen oorlog. Vive le geus!
+
+Zij bestoken, dooden, plunderen de soldaten des Konings en vluchten
+vervolgens naar hunne holen. Dag en nacht ziet men in de bosschen
+vuren aansteken en uitdooven, en gedurig van plaats veranderen. 't
+Is het vuur onzer festijnen. Aan ons de eenden en hazen! Wij
+zijn de heeren! De boeren geven ons brood en spek, zooveel als wij
+willen. Bezie ze, Lamme. Schuw, armoedig, vastberaden en zonder genade,
+zwerven zij door de bosschen met hunne aksten, hellebaarden, zweerden,
+kruismessen, pijken, lansen, kruisbogen, bussen, want alle wapens
+zijn goed, en onder vendrigs willen zij niet staan. Vive le geus!
+
+En Uilenspiegel zong:
+
+
+    Slaat op den trommel van dirre dom deijne,
+    Slaat op den trommel van dirre dom dom.
+    Oorlog om Oorlog! Leve de Geus!
+
+    Rukt den hertog Zijn ingewand uit!
+    Klopt met de zweep in Zijn aanzicht!
+    Slaat op den trommel, de holle trom,
+    Vloek zij den hertog, dood den beul!
+
+    Werpt den honden den bloedhond voor! Leve de Geus!
+    Hangt hem bij de tong op, bij den arm op,
+    Bij de tong, die het vonnis velt,
+    Bij den arm, die 't onderschrijft.
+    Slaat op de krijgstrom. Leve de Geus!
+
+    Levend bij lijken van slachtoffers!
+    Delft den hertog in een kuil,
+    Dat hij, in goren stank,
+    Sterve om de pest der dooden!
+    Slaat op de krijgstrom. Leve de Geus!
+
+    Aanschouw uit den hoogen, Christus, uw scharen,
+    Dapper vóór 't vuur, vóór strik en zweerd,
+      Al om Uw woord.
+    Redden willen wij 't vaderland.
+    Slaat op de krijgstrom. Leve de Geus!
+
+
+En allen dronken en riepen:
+
+--Leve de Geus!
+
+En Uilenspiegel dronk uit den gouden beker eens monniks en keek met
+fierheid naar de krijgshaftige gezichten der Wilde Geuzen.
+
+--Wilde geuzen, sprak hij, gij zijt wolven, leeuwen en
+tijgers. Verslindt de honden van den bloedigen koning.
+
+--Leve de Geus! riepen zij, en zij zongen:
+
+
+    Slaat op den trommel van dirre dom deijne,
+    Slaat op den trommel van dire dom dom.
+    Oorlog om Oorlog! Leve de Geus!
+
+
+
+
+VI.
+
+Terwijl Uilenspiegel te Ieperen was en soldaten voor het leger
+van den Zwijger aanwierf, werd hij gezocht door de serjanten des
+hertogen. Dienvolgens bood hij zich aan als koster bij den proost van
+St.-Maartens-kerk. Voor gezel had hij een klokluider, Pompilius Numan,
+een lafaard die zijn gelijke niet had, en 's nachts zijn schaduw voor
+den duivel en zijn hemd voor een spook nam.
+
+De proost was vet als een sleksken, of liever, als een kalkoen,
+vetgemest en pas voor het braadspit. Weldra werd Uilenspiegel gewaar,
+hoe hij het aan boord legde om zoo vollijvig te wezen. Naarvolgens
+hij hoorde zeggen door den klokluider en met eigen oogen zag, was de
+proost gewoon te negen uren het noenmaal en te vier uren het avondmaal
+te nemen. Hij bleef slapen tot halfnegen; vervolgens, alvorens te eten,
+deed hij een ronde in zijne kerk, om te zien of de offerblokken voor
+den arme goed gevuld waren.
+
+En hij stak de helft der ontvangst in zijn tassche. Te negen uren
+nuttigde hij een kom melk, een halven bout, een reigerspasteitje,
+besproeid met vijf bekers Brusselschen wijn. Te tien uren nam hij
+eenige pruimen met daarbij wat Orlans-wijn, en bad hij God dat Hij
+hem steeds voor gulzigheid zou behoeden. 's Middags knabbelde hij
+als tijdverdrijf eenen vleugel en de stuit van een kieken. Een uur
+daarna dronk hij, in afwachting van 't avondmaal, een grooten beker
+Spaanschen wijn; vervolgens legde hij zich te bed, om zich door een
+middagslaapje te verkwikken.
+
+Wakker geworden, at hij een stuksken zalm en dronk hij een
+grooten beker Antwerpschen dobbelen knol, om zijn eetlust te
+scherpen. Vervolgens ging hij naar de keuken, en daar zette hij zich
+neer voor het schoon houtvuur, dat in den heerd flikkerde. Hij zag
+het groot stuk kalfsvleesch of het speenverkentje voor de monniken
+der abdij braden en bruineeren. Hij had er in gebeten, zoo lekker
+scheen het. Maar de eetlust ontbrak hem een weinig. En hij bewonderde
+het braadspit, dat van zelf ronddraaide. Het was werk van Pieter van
+Steenkiste, den smid, wonende in de kasselrij Kortrijk. De proost
+had elk dier braadspitten met vijftien pond parisis betaald.
+
+Vervolgens keerde hij terug naar zijn bed, alwaar hij insluimerde, uit
+vermoeienis. Daarna werd hij weder wakker om een weinig verkensgelei
+te nemen met een slokje Romagne-wijn van tweehonderd veertig gulden
+het stuk. Te drie uren peuzelde hij een vogelken met Madeirasuiker,
+besproeid met twee glaasjes Malvezij van zeventien gulden het
+pijpje. Te half vier at hij een halven pot confituur, begoten met
+mede. Goed wakker, nam hij toen een zijner voeten in de handen en
+bleef hij in diepe overweging zitten rusten.
+
+Als de tijd van 't avondmaal dáár was, kwam de pastoor van Sint Jans
+hem dikwijls bezoeken op dit genoeglijk uur. Soms wedden zij om 't
+meeste visch, gevogelte, wild of vleesch te eten. En die 't eerste
+vol was, moest karbonaden betalen, die volgens den toen heerschenden
+smaak moesten bereid zijn met drie soorten warmen wijn, vier soorten
+specerijen en zeven soorten groenten.
+
+Terwijl zij dus dronken en aten, spraken zij samen over de ketteren,
+die men, naar hun eenstemmig gevoelen, niet genoeg uitroeien kon. Ook
+was er onder hen nooit eenig krakeel, behalve als zij spraken over
+de negen en dertig verschillende wijzen om goede bierpap te maken.
+
+Vervolgens neigden hunne eerbiedige hoofden over hunne heilige buiken,
+en zij deden een dutje. Soms half wakker schietend, zeide een hunner
+dat het leven toch schoon is en dat de arme sukkelaars, die klagen,
+ongelijk hebben.
+
+Bij dien heiligen man werd Uilenspiegel koster. Hij diende zeer goed
+de misse, en vulde wel driemaal de wijnkannetjes, tweemaal voor zich
+zelven en eenmaal voor den proost. De klokluider Pompilius Numan stak
+hem hierbij een handeken toe.
+
+Als Uilenspiegel den klokluider zoo gezond, zoo dik en zoo vet zag,
+vroeg hij hem of het in den dienst van den proost was, dat hij al
+die gezondheid opgedaan had.
+
+--Ja, mijn zoon, antwoordde Pompilius; maar doe goed de deur toe,
+want men zou kunnen luisteren.
+
+Toen zegde hij hem stille in 't oor:
+
+--Gij weet dat onze meester, de proost, van alle wijnen en bieren,
+alle vleezen en pluimdieren houdt als de kat van de melk. Zijne
+eetwaren sluit hij op in eene schapraai en zijne dranken in eenen
+kelder, waarvan de sleutels gedurig in zijne tassche steken. En hij
+slaapt er mee.... 's Nachts, als hij slaapt, ga ik de sleutels van
+op zijnen buik nemen, en ik leg ze dan weder, doch niet zonder beven;
+want als hij het wist, zou hij mij zeker in de olie doen koken.
+
+--Pompilius, sprak Uilenspiegel, al die moeite en schrik zijn onnoodig:
+neem de sleutels nog eenmaal; ik zal er van maken hetzelfde model en
+de andere zullen wij gerust laten liggen op den buik van den goeden
+proost, onzen heer.
+
+--Dat is een goed gedacht, zeide Pompilius.
+
+Uilenspiegel maakte de sleutels; zoodra hij en Pompilius, rond
+acht uren des avonds, oordeelden dat de goede proost vast in slaap
+was, gingen zij beneden en namen zij hunne gading uit vleezen en
+flesschen. Uilenspiegel droeg de flesschen en Pompilius de spijzen,
+omdat Pompilius altoos beefde als een riet en dat hespen en bouten
+toch niet breken als zij vallen. Verscheidene reizen stalen zij
+gevogelte, als het nog rauw was, welke feiten ten laste gelegd werden
+van meerdere katten uit de gebuurte, dewelke deze dieften met den
+dood moesten bekoopen.
+
+Toen trokken de beide gezellen naar de Ketelstraat, waar de meidekens
+van pleizier wonen. Daar kniesden zij niet, doch gaven hunnen lievekens
+edelmoedig gerookt ossevleesch en hesp, worst en gevogelte; zij lieten
+heur zelfs Orlans- en Romagne-wijn drinken, alsmede Engelsche ale
+en smakelijk Oosterbier, dat zij goten in de frissche keel hunner
+schoenen. En zij werden ruimschoots met kussen betaald.
+
+Doch op een morgen, na het eten, deed de proost zijne beide dienaars
+ontbieden. Hij zag er ontzagwekkend uit en zoog, met een boos gezicht,
+aan een mergbeentje uit zijne soep.
+
+Pompilius stond te beven in zijne schoenen, en zijn buik trilde van
+schrik. Uilenspiegel hield zich stil en tastte, inwendig lachend,
+in zijnen zak naar de sleutels.
+
+De proost sprak tot hem:
+
+--Men eet mijn vleesch op en drinkt mijnen wijn uit: zijt gij het,
+mijn zoon?
+
+--Neen, antwoordde Uilenspiegel.
+
+--En die man, daar, de klokluider, sprak de proost, naar Pompilius
+wijzend, heeft hij dan de hand aan die misdaad geleend, dat hij zoo
+wit als een doek ziet? Zeker heeft de gestolen wijn hem vergiftigd.
+
+--Laas! messire, sprak Uilenspiegel, gij beschuldigt uwen klokluider
+ten onrechte, want zoo hij zoo wit ziet, is het niet omdat hij
+uwen wijn heeft gedronken, doch wèl omdat hij er te weinig drinkt;
+dáárvan is hij zoo slap, dat zijne ziel weldra bij stroomen zijne
+hooze zal uitloopen.
+
+--Er zijn arme lieden op deze wereld, zuchtte de proost, terwijl hij
+een grooten slok wijn uit zijn beker dronk. Maar zeg mij, mijn zoon,
+gij die arendsoogen hebt, hebt gij de dieven niet gezien?
+
+--Ik zal goed opletten, heer proost, sprak Uilenspiegel.
+
+--God bescherme u beiden, mijne kinderen, sprak de proost, en leeft
+op sobere wijze. Want uit de onmatigheid komen hier in dit tranendal
+al onze kwalen voort. Gaat in vrede.
+
+En hij gaf hun zijn zegen.
+
+En hij zoog nogmaals aan zijn mergbeen, en hij dronk nog een grooten
+slok wijn.
+
+Uilenspiegel en Pompilius gingen henen.
+
+--De leelijke vrek, sprak Uilenspiegel, hij had u nog geen slokje
+van zijn wijn laten drinken. Als wij nog stelen, zal 't wèl besteed
+zijn. Maar wat hebt gij toch, dat gij zoo beeft?
+
+--Heel mijne hooze is nat, zei Pompilius.
+
+--Dat is gauw droog, kameraad, sprak Uilenspiegel. Maar wees verheugd:
+dezen avond zal er flesschenmuziek zijn, bij onze lievekens in de
+Ketelstraat. En de drie nachtwachten zullen wij dronken maken, en
+snorkend zullen zij de stede bewaken.
+
+Zoo gezegd, zoo gedaan.
+
+Doch, 't was dicht tegen Sint-Maartensdag: de kerk was versierd voor
+den heiligdag. Uilenspiegel en Pompilius gingen 's nachts de kerk
+binnen en sloten goed de deur. Vervolgens staken zij al de waskeersen
+aan; zij namen eene viool en eene doedelzak, en begonnen daarop om
+het best te spelen. En de keersen vlamden als zonnen. Maar het was
+nog niet alles. Als hun werk verricht was, gingen zij bij den proost,
+dien zij, hoewel het al laat was, nog op vonden. Hij knabbelde een
+lijster en dronk een glas Rijnwijn. De ruiten der kerk verlicht ziende,
+trok hij de oogen wijd open.
+
+--Heer proost, zei Uilenspiegel, wilt gij weten wie uw vleesch opeet
+en uwen wijn uitdrinkt?
+
+--En die verlichting? sprak de proost, naar de vensters der kerk
+wijzend. Ha! Heere God, laat gij den heiligen Martinus nu toe,
+'s nachts zonder betalen, de keersen der arme monniken te branden?
+
+--Hij doet nog andere dingen, heer proost, sprak Uilenspiegel. Kom
+maar zien.
+
+De proost nam zijnen staf en ging mede. Zij traden de kerk binnen.
+
+Daar zag hij, in 't midden van den grooten beuk, al de heiligen uit
+hunne nissen gedaald, in een rondeken staan. De heilige Martinus,
+wel een kop grooter dan de anderen, scheen de meester te zijn. En
+op den wijsvinger der rechterhand, die zegenend uitgestrekt was,
+stak een gebraden kalkoen. De anderen hadden in de hand of in den
+mond stukken kieken of gans, worst, hesp, versche visch en gekookte
+visch en, onder andere, eenen snoek wel veertien pond zwaar. En elke
+sant had eene flesch wijn voor zijne voeten staan.
+
+Als de proost dat zag, kon hij zich van woede niet inhouden; hij zag
+rood als een haan, en zijn gelaat was zóó opgezwollen, dat Pompilius
+en Uilenspiegel meenden dat hij ging bersten; maar, zonder op hen te
+letten, ging hij met gebalde vuist recht op den heiligen Martinus
+af, alsof hij hem aanzag voor den dief. Hij rukte hem den kalkoen
+van zijnen vinger en sloeg op Martinus als de duivel op Geeraard,
+zoodat de arm, de neus, de staf en de mijter aan stukken vlogen.
+
+De anderen kregen mede hun deel en meer dan één liet er bij armen,
+handen, mijter, staf, zeis, bijl, rooster, zaag en andere kenteekenen
+van weerdigheid of martelaarschap. Vervolgens liep de proost, woedend
+en haastig, al de waskeersen uitblazen.
+
+En al wat hij vond aan hesp, worst en gevogelte nam hij mede,
+en gebogen onder den last, ging hij zoo treurig en ellendig zijne
+slaapkamer binnen, dat hij drie bottels wijn dronk.
+
+Toen Uilenspiegel zeker was dat hij sliep, peuzelden de beide vrienden
+de beste brokken op, en legden zij de beentjes vóór de voeten der
+heiligen. Vervolgens gingen zij naar de Ketelstraat met al wat de
+proost meende gered te hebben en ook met hetgeen nog lag in de kerk.
+
+Den volgenden morgen ging Pompilius de metten luiden, terwijl
+Uilenspiegel naar boven trok om zijnen meester te wekken.
+
+Deze vroeg wat hij wilde, en Uilenspiegel verzocht hem, beneden
+te komen.
+
+Als de proost in de kerk was, toonde Uilenspiegel het overschot van
+de heiligen en van het gevogelte.
+
+--Messire proost, sprak hij, zij hebben het toch opgegeten.
+
+--Ja, antwoordde de proost, zij zijn als dieven in mijne slaapkamer
+gedrongen, om te stelen hetgeen ik gered had. Ha! heeren santen,
+ik zal mijn beklag aan den Paus doen.
+
+--Ja, sprak Uilenspiegel met een bedenkelijk gezicht, maar de ommegang
+gaat overmorgen uit: straks komen de werklieden in de kerk. Vreest
+gij niet, verraden te worden als beeldenstormer, als zij al die santen
+in stukken en brokken zien liggen?
+
+--Ha! heilige Sint Maarten, sprak de proost, spaar mij van het vuur,
+ik wist niet wat ik deed.
+
+Zich naar Uilenspiegel wendend, terwijl de bange Pompilius zich aan
+het klokzeel liet hangen, sprak hij:
+
+--Nooit zal men tegen Zondag den heiligen-Martinus kunnen
+herstellen. Wat zullen de menschen zeggen en wat staat mij te doen?
+
+--Heere, antwoordde Uilenspiegel, nood breekt wet: wij moeten tot
+een onschuldig bedrog onze toevlucht nemen. Wij zullen eenen baard
+plakken op 't gezicht van Pompilius, die er eerbiedweerdig uitziet,
+daar hij altijd weemoedig is. Wij zullen hem den mijter opzetten, hem
+het koorhemd, den pelsmantel en het groote opperste kleed des santen
+aandoen; wij zullen hem aanbevelen stil op zijn voetstuk te blijven,
+en de geloovigen zullen hem voor den houten Sint-Maarten nemen.
+
+De proost ging tot Pompilius, die meer dood dan levend aan het
+klokzeel bengelde.
+
+--Houd op met luiden, sprak hij, en luister. Wilt gij vijftien
+dukaten verdienen? Zondag zult gij Sint-Maarten in de processie
+verbeelden. Uilenspiegel zal u kleeden en als gij, door de vier
+mannen gedragen, een gebaar durft maken of uw mond open doen, laat
+ik u levend in de olie koken in den grooten ketel, dien de hangman
+rechtover de Hallen gebouwd heeft.
+
+--Heer, ik zeg u duizendmaal dank, sprak Pompilius, maar gij weet
+dat ik zeer moeielijk mijn water kan ophouden.
+
+--Gij moet gehoorzamen, hernam de proost.
+
+--Ik zal gehoorzamen, eerweerdige heer, sprak Pompilius met den dood
+op het lijf.
+
+
+
+
+VII.
+
+De ommegang ging uit, onder een blijde, heldere zon. Uilenspiegel had
+de twaalf heiligen zoo goed mogelijk opgelapt en zij waggelden op
+hunne voetstukken tusschen de banieren der gilden; daarachter kwam
+het standbeeld van Onze-Lieve-Vrouw, vervolgens de maagdekens, in
+'t wit, die lofzangen zongen, dan de boogschutters, eindelijk het
+dichtst bij den hemel en meer waggelend dan de anderen, Pompilius,
+die gebogen ging onder de zware kleederen van den heiligen Martinus.
+
+Uilenspiegel, die zich voorzien had van krabpoeder, had zelf Pompilius
+zijn bisschoppelijk kleed helpen aantrekken, zijn handschoenen
+aangedaan, zijnen staf in zijne hand gestoken en hem geleerd hoe hij de
+handen moest houden om het volk te zegenen. Ook had hij de priesters
+helpen kleeden. Den eenen had hij de stool aangedaan, den anderen den
+pelsmantel, den diakenen het koorhemd. Hij liep gedurig de kerk rond
+om de plooien van een wambuis of een hooze effen te strijken. Hij
+bewonderde de scherpe wapenen der gilden en de geduchte bogen der
+schutters. En elkeen strooide hij een weinig krabpoeder in den hals,
+in den rug, op den pols. Maar de deken en de vier dragers van den
+heiligen Martinus kregen het meest. De maagdekens spaarde hij omdat
+zij zoo lief waren.
+
+De processie ging uit de kerk, in prachtige orde, met fladderende
+banieren en wapperende wimpels. Mannen en vrouwlieden sloegen een
+kruis als zij voorbijging. En de zonne was heet.
+
+De deken werd 't eerst het poeder gewaar en krabde een weinig achter
+zijn oor. Allen, priesters, boogschutters, dragers, krabden zich aan
+den hals, de beenen, de polsen, zonder het nog openlijk te durven;
+doch de klokluider, die meer uitstond dan de anderen, ter oorzake van
+de brandende zon, dorst zich niet verroeren, uit vreeze van levend in
+de olie te worden gekookt. Hij neep zijn neus toe, trok een leelijk
+gezicht en beefde op zijn waggelende beenen, want telkens dat de
+dragers zich krabden, liep hij gevaar van te vallen.
+
+Maar hij dorst zich niet verroeren, en uit schrik liet hij zijn water
+maar loopen; en de dragers zeiden:
+
+--Groote Sint Maarten, gaat het nu regenen?
+
+De priesters zongen een lofzang aan de Heilige Maagd:
+
+
+    Si de coe ... coe ... lo descenderes
+    O Sanc ... ta ... ta ... Ma ... ma ... ria.
+
+
+Want hunne stemmen beefden wegens de krieuweling die onuitstaanbaar
+werd; maar zij krabden zich bedektelijk. Doch de deken en de vier
+dragers van Sint-Maarten krabden hun vel vaneen. Pompilius hield zich
+stil op zijn arme beenen, die 't meest van al jeukten.
+
+Maar eensklaps bleven al de boogschutters, diakenen, priesters, deken
+en dragers staan om zich te krabben. Het poeder beet de voetzolen
+van Pompilius vaneen, doch hij dorst zich niet verroeren uit vrees
+van te vallen.
+
+En de nieuwsgierigen zeiden, dat de heilige Maarten grammoedig rondkeek
+en een dreigend gezicht naar het arme volk zette.
+
+Toen beval de deken, dat de processie zou voortgaan.
+
+Weldra echter maakte de loodzware zon de jeukte van de plechtige
+ruggen en buiken onuitstaanbaar.
+
+En toen bleven priesters, boogschutters, diakenen en deken, net als
+een bende apen eensklaps staan om zich onbeschaamd overal te krabben
+waar het jeukte.
+
+De maagdekens zongen heuren lofzang als engelen en heur frissche
+stemmetjes stegen liefelijk ten hemel.
+
+Allen trokken er trouwens van door zooals zij konden: krabbend, redde
+de deken 't heilig sacrament; het geloovige volk droeg de fierters
+terug in de kerk; de vier dragers van Sint Maarten smeten Pompilius
+ruwweg ten gronde. En daar nog dorst de arme klokluider zich niet
+krabben noch roeren, doch hij sloot devotelijk de oogen.
+
+Twee jonge knapen wilden hem oprichten, doch daar zij hem te zwaar
+vonden, stelden zij hem recht tegen den muur en daar begon Pompilius
+bitter te schreien.
+
+Het volk kwam rond hem staan; de vrouwen gingen neusdoeken van fijn,
+helder lijnwaad halen, wischten zijn gelaat af om zijne tranen als
+reliquieën te bewaren, en zeiden tot hem: "Mijnheer de Sant, wat hebt
+gij het warm!"
+
+De klokluider keek hen jammerlijk aan en maakte, zijns ondanks,
+wegens de krieuweling, met zijn neus de koddigste gebaren.
+
+Doch daar de tranen over zijne wangen rolden, spraken de vrouwen:
+
+--Groote heilige Maarten, weent gij over de zonden der stede
+Ieperen? Niet waar, uwe edele neus verroert zich? Wij hebben nochtans
+de raadgevingen gevolgd van Lodewijk Vives, en den armen van Ieperen
+zal het aan werk noch aan brood ontbreken. Ho! wat groote tranen! Het
+zijn kostbare perelen. Onze redding is hier!
+
+De mannen spraken:
+
+--Wat moeten wij doen, groote heilige Maarten, om uwe droefheid
+te stillen?
+
+Maar het volk riep:
+
+--Daar is de koster!
+
+Uilenspiegel kwam bij, greep Pompilius vast en droeg hem op den
+schouder weg, gevolgd door eene menigte geloovigen van beide
+geslachten.
+
+--Laas! zei de arme klokluider hem stille in 't oor, ik ga bezwijken
+van de jeukte.
+
+--Houd u stijf, antwoordde Uilenspiegel; vergeet niet dat gij een
+houten heilige zijt.
+
+Hij liep op een draf en legde Pompilius neer voor de voeten van den
+proost, die zich tot bloedens toe aan 't krabben was.
+
+--Klokluider, vroeg de proost, hebt gij u gekrabd lijk wij?
+
+--Neen, eerwaarde, antwoordde Pompilius.
+
+--Hebt gij gesproken of u verroerd?
+
+--Neen, eerwaarde, antwoordde Pompilius.
+
+--Hewel, sprak de proost, hier zijn uwe vijftien dukaten. Ga u nu
+krabben; gij hebt het verdiend.
+
+
+
+
+VIII.
+
+Toen Uilenspiegel de zaak uitgebracht had, zei het gemeen 's anderen
+daags, dat het een ongehoorde spotternij was, hun dien schreeuwer
+van een klokluider voor eenen heilige te doen doorgaan en te doen
+aanbidden.
+
+En velen werden ketters. En, hunne have meenemend, gingen zij het
+leger des prinsen versterken.
+
+Uilenspiegel keerde naar Luik terug.
+
+Onderweg zette hij zich te droomen in een bosch. Den helderen hemel
+beziende, sprak hij tot zich zelven:
+
+--De oorlog, altijd de oorlog, opdat de Spaansche vijand het arme
+volk vermoorde, onze goederen roove, onze vrouwen en dochteren
+verkrachte. Nochtans vlieden ons schoone penningen heen en stroomt
+ons bloed bij beken door de straten, zonder het minste voordeel voor
+iemand, tenzij voor dien koninklijken schoft, die eene perel van gezag
+te meer aan zijne krone wil hechten. Perel, die hij glorierijk waant,
+doch die maar eene perel van bloed en van rookwalm is. Ha! kon ik U
+perelen naar mijnen zin, vliegen alleen zouden uw gezelschap nog wezen.
+
+Terwijl hij daaraan dacht, zag hij eene bende herten voorbijrennen. Er
+waren er groote en oude, die hun gewei met negen takken fier in
+de lucht bewogen. Jonge reebokjes, die hunne schildknapen zijn,
+trappelden met hen en schenen bereid hun met hunne scherpe horens
+ter hulp te komen. Uilenspiegel wist niet waar zij heengingen, maar
+hij dacht dat het naar hun leger was.
+
+--Ha! sprak hij, oude herten en lieve reebokjes, fier en blijde gaat
+gij in het diepst van het bosch uwe legerstee zoeken; langs geurige
+paden vindt gij jeugdige spruitjes te eten; gelukkig zijt gij,
+totdat de jager, uw beul, komt. Aldus is het ook gelegen met ons,
+oude herten en jonge reebokjes!
+
+En de assche van Klaas klopte op Uilenspiegel's borst.
+
+
+
+
+IX.
+
+In de Herfstmaand, als de muggen niet meer bijten, stak de Zwijger
+te Sint-Vijt den Rijn over met zes stukken veldgeschut en vier zware
+kanonnen, en met veertienduizend Vlamingen, Walen en Duitschers.
+
+Onder de geel-en-roode vendels van Alva, den bloedigen hertog, stapten
+zes en twintigduizend vijfhonderd man, vergezeld van zeventien stukken
+veldgeschut en negen zware kanonnen.
+
+Maar de Zwijger kon in dien strijd geenerlei voordeel behalen, want
+Alva weigerde gedurig 't gevecht.
+
+En zijn broeder Lodewijk, die reeds vele steden gewonnen en vele booten
+op den Rijn gekaapt had, verloor bij Jemmingen, in Friesland, tegen
+den zoon des hertogen, zestien kanonnen, vijftien honderd peerden en
+twintig vendels, door de schuld der lafhertige huurknechten, die geld
+vroegen als er te vechten viel.
+
+En te midden van puin en van bloed en van tranen, zocht Uilenspiegel
+te vergeefs de redding van den vaderlandschen bodem.
+
+En, heel de Nederlanden door, werden onschuldige slachtofferen
+gehangen, onthalsd, verbrand door de beulen.
+
+En de koning erfde.
+
+
+
+
+X.
+
+Door het Walenland reizend, zag Uilenspiegel, dat de prins daar weinig
+hulp te verwachten had, en zoo kwam hij omtrent de stad Bouillon.
+
+Weldra zag hij op den weg bultenaars van de beide geslachten, van allen
+leeftijd en allen stand verschijnen. Allen, met groote paternosters
+in de hand, baden devotelijk.
+
+En hunne gebeden geleken op het gerikkik van kikvorschen in eenen
+vijver, 's avonds, na een warmen dag.
+
+Daar waren moeders met bulten, die gebochelde kinderen op den arm
+droegen, terwijl andere kleinen aan heure rokken hingen. Er waren
+bultenaars op de heuvelen en bultenaars in de dalen. En overal zag
+Uilenspiegel op den helderen hemel hun magere schimmen afsteken.
+
+Hij ging tot een hunner en vroeg:
+
+--Waar trekken zij allen henen, die ongelukkige mannen, vrouwen
+en kinderen?
+
+De man antwoordde:
+
+--'t Is de begankenis van St. Remaclus; wij gaan naar het graf van
+den heilige, om van hem te verkrijgen wat onze herten verlangen:
+ons ontlasten van dat vernederend pak op onzen rug.
+
+Uilenspiegel hernam:
+
+--Zou ik van Sint-Remaclus niet kunnen verkrijgen wat mijn herte
+verlangt: onze arme gemeenten ontlasten van den bloedigen hertog,
+die als een looden bochel op de Nederlanden drukt?
+
+--Hij is niet gelast, de bochels der boete af te nemen, antwoordde
+de pelgrim.
+
+--Neemt hij er andere af? vroeg Uilenspiegel.
+
+--Ja, als de bulten jong zijn. Als het mirakel der genezing
+geschiedt, is 't volop kermis in de stad. En elke pelgrim geeft dan
+een zilverstuk, soms wel een gouden florijn, aan den gelukzalige,
+die door zijne genezing heilig geworden is en alzoo met vrucht voor
+de anderen kan bidden.
+
+Uilenspiegel sprak:
+
+--Waarom doet de rijke mijnheer Sint-Remaclus zijne genezingen betalen,
+lijk een pillendraaier?
+
+--Goddelooze reiziger, hij zal u straffen voor uwe lastertaal,
+antwoordde de pelgrim, terwijl hij woedend zijnen bochel schudde.
+
+--Laas! zuchtte Uilenspiegel.
+
+En hij liet zich nedervallen aan den voet van een boom.
+
+De pelgrim staarde hem aan en zeide:
+
+--De heilige Remaclus treft goed als hij slaat!
+
+Uilenspiegel kromde zijnen rug en zuchtte, terwijl hij er aan voelde:
+
+--Genade, doorluchtige heilige. 't Is de kastijding. Tusschen
+mijne schouderen voel ik een geweldige pijn. Laas! ai! Vergiffenis,
+mijnheer Sint-Remaclus, Ga voort, pelgrim, en laat mij hier, als een
+vadermoorder, in alleenigheid weenen met mijn berouwhebbend herte.
+
+Maar de pelgrim was reeds op de vlucht: hij liep tot op de Markt van
+Bouillon, waar al de bultenaars vergaderd waren.
+
+Huiverend van schrik, zeide hij met afgebroken woorden:
+
+--Pelgrim ontmoet ... recht als een keers ... den heilige gelasterd
+... bult op den rug....
+
+Als de andere bultenaars dit hoorden, stieten zij blijde kreten en
+spraken zij:
+
+--Sint-Remaclus, als gij bulten kunt maken, kunt gij er afnemen
+ook. Neem onze bulten weg, mijnheer Sint-Remaclus.
+
+Intusschen was Uilenspiegel opgestaan en voortgegaan. Aan de deur
+eener taveerne van de eenzame voorstad, zag hij aan eenen stok twee
+verkensblazen hangen, een teeken, dat het daar pensenkermis was.
+
+Uilenspiegel nam eene der twee blazen en raapte de ruggegraat eener
+schol op; stak zich, om wat bloed in de verkensblaas te laten loopen,
+blies haar op, bond ze toe, na hetwelk hij ze vastmaakte op den rug
+met de graat daarboven. Aldus toegetakeld, schuddebollend en waggelend
+als een oude bultenaar, ging hij naar de Markt.
+
+De pelgrim, die hem had zien vallen, werd hem dadelijk gewaar en riep:
+
+--Daar is de lasteraar!
+
+En hij wees met den vinger naar hem.
+
+En allen liepen naar hem om den rampzalige te zien.
+
+Uilenspiegel schudde treurig het hoofd.
+
+--Ha! sprak hij, ik verdien genade noch medelijden; doodt mij als
+een razenden hond.
+
+En de bultenaars riepen verheugd:
+
+--Eén te meer in onze broederschap!
+
+Uilenspiegel mompelde onhoorbaar tusschen de tanden:
+
+--Ik zal het U wel betaald zetten, booze lieden!
+
+Doch hij scheen alles geduldig te verdragen en sprak:
+
+--Ik eet of ik drink niet meer, totdat de hoogweerdige heilige Remaclus
+mij geneest zooals hij mij trof.
+
+Bij het nieuws van 't mirakel, kwam de deken uit de kerk. 't Was
+een groote, dikke, plechtstatige kerel. Met den neus in de lucht,
+kliefde hij door de baren der bultenaars, als eene bark door de zee.
+
+Men toonde hem Uilenspiegel; hij zegde tot hem:
+
+--Zijt gij het, manneken, die getroffen werd door de roede van den
+heiligen Remaclus?
+
+--Ja, heer deken, antwoordde Uilenspiegel, ik ben het inderdaad,
+zijn nederige dienaar, die zijn nieuwen bult wil laten genezen,
+als het Zijne Heiligheid belieft.
+
+De deken, die giste dat er look in de meersch was, sprak:
+
+--Laat mij dien bult eens betasten.
+
+--Tast maar, genadige deken, sprak Uilenspiegel.
+
+Toen de deken getast had, sprak hij:
+
+--Hij is nieuw en nog nat. Ook hoop ik, dat de groote heilige U
+genadig zal wezen. Kom mede.
+
+Uilenspiegel volgde den deken en ging mee in de kerk.
+
+De bultenaars liepen achter hem en schreeuwden:
+
+--Daar is hij, de gedoemde, de lasteraar! Hoeveel weegt uw versche
+bult? Ik zou er een zak van maken, om mijne daalders in te steken? Heel
+uw leven hebt gij den spot gedreven met ons, omdat gij recht waart;
+nu is 't onze beurt! Gezegend zij Sint-Remaclus!
+
+Uilenspiegel antwoordde niet, doch volgde met gebogen hoofde den
+deken, die hem leidde in een kleine kapel, waar een marmeren graf was,
+gedekt met eene zerk, mede van marmer.
+
+Tusschen het graf en den muur der kapel was eene opening van ruim eene
+hand breed. Een menigte gebochelde pelgrims, die elkander volgden,
+gingen tusschen den muur en de zerk van het graf, tegen dewelke zij
+stilzwijgend hunne bulten wreven. En aldus hoopten zij er van verlost
+te worden. En zij, die hunne bulten tegen de plaat wreven, wilden de
+plaats niet afstaan aan degenen, die volgden; en er werd gevochten,
+doch zonder gerucht, want zij dorsten niet dan heimelijk stompen,
+uit vreeze van heiligschennis.
+
+De deken zegde tot Uilenspiegel op de zerk te klimmen, opdat alle
+pelgrims hem goed konden zien.
+
+Uilenspiegel antwoordde:
+
+--Dat kan ik alleen niet.
+
+De deken hielp hem, bleef bij hem staan en deed hem
+knielen. Uilenspiegel gehoorzaamde en bleef met gebogen hoofde zitten
+in die deemoedige houding.
+
+Na een kort inwendig gebed, zeide de eerwaarde geestelijke met
+heldere stem:
+
+--Kinderen en broeders in Christus, aan mijne voeten ziet gij den
+grootsten zondaar en lasteraar, dien Sint-Remaclus ooit met zijne
+woede trof.
+
+En, op zijne borst kloppend, sprak Uilenspiegel:--Confiteor.
+
+--Weleer, vervolgde de deken, was hij recht als de stok eener
+hellebaard, en was hij er fier op. Beziet hem nu, hij is gebult en
+gebocheld onder de verwensching des hemels.
+
+--Confiteor, neem mijnen bult weg, sprak Uilenspiegel.
+
+--Ja, vervolgde de deken, ja, groote heilige, ja, Sint-Remaclus, die,
+sedert uw glorierijken dood, negen en dertig mirakels gedaan hebt,
+neem van zijne schouderen het gewicht, dat er op drukt, opdat wij
+uwen lof kunnen zingen in de eeuwigheid der eeuwigheden, in soecula
+soeculorum! En vrede op de aarde aan de bultenaars, die van goeden
+wil zijn.
+
+En de bultenaars herhaalden te gelijk:
+
+--Ja, ja, vrede op aarde aan de bultenaars, die van goeden wil
+zijn; weg met de bulten, weg met haat en met nijd, weg met alle
+vernedering! Neem onze bulten weg, doorluchtige heilige Remaclus!
+
+De deken gebood Uilenspiegel het graf te verlaten en zijnen bochel
+te wrijven tegen den kant van de zerk. Uilenspiegel deed het, steeds
+mompelend: Mea culpa, confiteor, neem mijnen bult weg!
+
+En hij wreef zich zoo goed, dat al de omstanders zulks oogenschijnlijk
+zagen.
+
+En dezen riepen:
+
+--Ziet naar zijn bult, hij plooit! Ziet gij, hij smelt weg, rechts
+neemt hij af,--Neen, hij zal in zijnen buik zakken; bulten vergaan
+niet, zij keeren terug in de darmen, uit dewelke zij komen.--Neen,
+zij keeren naar de maag, waar zij tachtig dagen lang tot voedsel
+verstrekken.--'t Is een geschenk van den heilige aan hen, die door
+zijne genade van hunnen last zijn verlost.--Wat geworden de oude
+bulten?
+
+Plotseling stieten al de bultenaars een grooten schreeuw uit, want
+Uilenspiegel had zijnen bult gebersten, door hard tegen den boord
+der zerk te drukken. Het bloed dat er in was, liep er uit, droop van
+onder zijn wambuis met groote droppelen op de steenen der kerk. En
+rechtspringend en de armen uitstrekkend, riep hij blijde:
+
+--Ik ben er van af!
+
+En al de bultenaars riepen te zamen:
+
+--Gezegende Sint-Remaclus, genadig zijt gij voor hem.--Groote
+heilige, neem den mijnen ook weg!--Ik zal u een kalf offeren.--Ik,
+zeven schapen.--Ik, de jacht van één jaar.--Ik, zes hespen,--Ik, ik
+schenk mijne hut aan de kerk.--Neem onze bulten af, heilige Remaclus!
+
+En zij bekeken Uilenspiegel met eerbied en afgunst. Een der bultenaren
+wilde onder Uilenspiegel's wambuis tasten, doch de deken verbood het
+hem, zeggende:
+
+--Daar is een wonde, die het licht niet mag zien.
+
+--Ik zal voor ulieden bidden, sprak Uilenspiegel.
+
+--Ja, pelgrim, spraken al de bultenaars ondereen, ja, mijnheer de
+rechtgemaakte; wij dreven den spot met u; vergeef het ons, wij wisten
+niet wat wij deden. Christus, de Zaligmaker, vergaf aan het kruis,
+wilt gij ons ook vergiffenis schenken?
+
+--Ik vergeef u, sprak Uilenspiegel op hooghertigen toon.
+
+--Neem toch, zeiden zij, neem dit oortje, aanvaard dezen gulden,
+laat ons u dien gouden angelot schenken, dien daalder aanbieden,
+dien karolus in uwen zak steken.
+
+--Laat angelotten en karolussen het daglicht niet zien, zeide
+Uilenspiegel zeer stille: de linkerhand mag niet weten wat de
+rechterhand geeft.
+
+Dat zeide hij om den wille van den deken, die het geld der bultenaars
+met de oogen verslond, zonder te zien of het goud was of zilver.
+
+--Wij zeggen u duizendmaal dank, gezegende, geheiligde oud-bultenaar,
+zeiden de pelgrims tot Uilenspiegel.
+
+En hij nam hunne giften met hooghertigheid aan, zooals iemand betaamt
+die met de gratie des hemels bedeeld is.
+
+Maar de gierigaards wreven hardnekkig hunne bochels tegen het graf,
+zonder iets te zeggen en vooral zonder iets te geven.
+
+Uilenspiegel trok 's avonds naar eene taveerne, waar hij kermis vierde.
+
+Alvorens slapen te gaan, dacht hij er aan dat de deken, zoo niet
+alles, dan toch zijn deel van den buit zou eischen. Hij telde zijn
+winst en vond meer goud dan zilver, want er waren minstens driehonderd
+karolussen. Hij zag een verdroogden laurier in een bloempot staan, trok
+de plant bij den kop uit den pot en legde zijn goud onder de aarde. En
+al de halve guldens, oortjes, deniers spreidde hij uit op de tafel.
+
+De deken trad de taveerne binnen en kwam boven bij Uilenspiegel.
+
+Toen deze hem zag, vroeg hij:
+
+--Heer deken, wat wilt gij van mij, nieteling?
+
+--Ik wil niets dan uw goed, antwoordde de dienaar des Heeren.
+
+--Laas, zuchtte Uilenspiegel, bediedt gij dát goed, dat daar ligt op
+de tafel?
+
+--Ja, mijn zoon, antwoordde de deken.
+
+Vervolgens de hand uitstekend, ruimde hij al het geld van de tafel,
+en liet hij het vallen in eenen zak, dien hij daarvoor opzettelijk
+meegebracht had.
+
+En hij gaf een gulden aan Uilenspiegel, met een zucht alsof het een
+stuk zijner ziel was.
+
+En hij vroeg hem het gerief van het mirakel.
+
+Uilenspiegel toonde hem de graat en de blaas.
+
+De deken nam ze, terwijl Uilenspiegel weeklaagde en hem wat méér
+vroeg, daar de weg van Bouillon naar Damme zoo lang was voor een
+armen voetganger, dat hij ongetwijfeld van honger zou omkomen.
+
+De deken ging heen en lispte geen woord.
+
+Als Uilenspiegel alleen was, sliep hij in met het oog op de plant,
+'s Anderen daags, met den dageraad, stak hij zijnen buit op zak en
+verliet de stad.
+
+Hij ging recht naar het kamp van den Zwijger, gaf hem het geld en
+vertelde den Prins hoe hij er aan geraakt was: dit was het beste
+middel om schattingen van den vijand te lichten, meende hij.
+
+En de prins gaf hem tien gulden.
+
+De graat werd in een kristallen doos gevat, en gestoken tusschen de
+twee armen van het kruis op het hoogautaar, in de kerk van Bouillon.
+
+En een iegelijk, in die stad, weet dat de bult van den rechtgemaakten
+lasteraar steekt in het kruis.
+
+
+
+
+XI.
+
+De Zwijger, die in de omstreken van Luik was, deed, alvorens de Maas
+over te steken, marschen en tegenmarschen, om de waakzaamheid des
+hertogen te verschalken.
+
+Uilenspiegel nam zijne plichten van soldaat ter herte, hanteerde zeer
+behendig zijne bus, en hield steeds de ooren en oogen goed open.
+
+Om dien tijd kwamen in het kamp meerdere Vlaamsche en Brabantsche
+edelen, die in goede overeenstemming leefden met de heeren, kolonels
+en hopmans van 't gevolg van den Zwijger.
+
+En weldra kwamen in het kamp twee partijen tot stand, die gedurig met
+elkander in twist waren. De eenen spraken: De prins is een verrader. De
+anderen antwoordden, dat de beschuldigers logen en dat zij hun hunne
+leugentaal zouden doen slikken. Het wantrouwen werd langzamerhand
+grooter. Zij werden handgemeen bij troepen van zes, acht, twaalf man,
+vochten in tweegevecht met alle wapenen, ja zelfs met vuurroeren.
+
+Op het gerucht kwam de prins eens toegeloopen; hij drong tusschen de
+beide partijen. Een kogel rukte zijn degen aan zijne zijde weg. Hij
+stelde een einde aan 't gevecht en bezocht heel het kamp om zich te
+toonen, opdat men niet zeggen zou: "De Zwijger is dood, de oorlog
+is gedaan".
+
+'s Anderen daags, omtrent middernacht, bij mistig weder, stond
+Uilenspiegel gereed een huis te verlaten, waar hij een Vlaamsch
+minnelied aan een Waalsch meideken gaan zingen was, toen hij eensklaps
+aan de deur van het naburige huis een driemaal herhaald ravengekras
+hoorde. Een boer kwam op de zulle. Uilenspiegel hoorde stappen op
+den weg.
+
+Twee mannen, die Spaansch spraken, kwamen bij den boer, die hun zeide
+in dezelfde tale:
+
+--Wat hebt gij gedaan?
+
+--Goed werk, zeiden zij, leugens verspreid ten voordeele des
+konings. Dank zij ons, zeggen de wantrouwende hoofdmannen en
+soldaten tot elkander: 't Is uit lage eerzucht, dat de prins den
+koning wederstand biedt; aldus hoopt hij gevreesd te worden en, als
+onderpand van den vrede, vele steden en heerlijkheden te krijgen;
+voor vijfhonderd duizend gulden verlaat hij de dappere heeren, die
+strijden voor onze landen. De hertog heeft hem algeheele kwijtschelding
+doen aanbieden met belofte en eed, al de hooge legerhoofden weer in
+'t bezit hunner goederen te stellen, als zij zich onderwerpen aan
+den koning. Oranje gaat alleen met hem onderhandelen.
+
+--'s Zwijgers getrouwen antwoordden ons:
+
+--De voorstellen des hertogen zijn een verraderlijke strik,
+waarin de prins geenszins zal vallen; hij kent 't lot van Egmond en
+Hoorne. Zij weten wel dat kardinaal Granvelle zegde, toen hij te Rome
+de aanhouding der graven vernam: Men vangt de twee blieken, maar men
+laat den snoek ontsnappen; men heeft niets gevangen, zoolang men den
+Zwijger niet heeft.
+
+--De verdeeldheid is dus groot in het kamp? vroeg de boer.
+
+--De verdeeldheid is groot, zeiden zij, en wordt elken dag
+grooter. Waar zijn de brieven?
+
+Zij gingen de hut binnen, alwaar zij eene lanteerne aanstaken. Door een
+klein venster loerend, zag Uilenspiegel hen twee verzegelde brieven
+openen, die lezen met merkbare vreugde, een glas wijn drinken en
+eindelijk weggaan, in het Spaansch tot den boer zeggende:
+
+--Kamp verdeeld, Oranje genomen. Daar zal een ferme beker afmogen.
+
+--Die, sprak Uilenspiegel in zich zelven, die mogen in't leven niet
+blijven.
+
+In den dikken nevel gingen zij buiten. Uilenspiegel zag den boer hun
+eene lanteerne brengen.
+
+Het licht der lanteerne werd somtijds verduisterd door een zwarte
+gedaante. Uilenspiegel leidde daaruit af, dat zij achter elkander
+gingen.
+
+Hij laadde zijn vuurroer en schoot naar de zwarte gedaante. Toen zag
+hij de lanteerne verscheidene reizen op en neer gaan; hij maakte eruit
+op, dat een van beiden gevallen was en de andere wilde weten waar hij
+gewond was. Hij wapende zijn vuurroer opnieuw. Als hij de lanteerne
+vlug en slingerend in de richting des kamps zag voortgaan, schoot
+hij opnieuw. De lanteerne waggelde, viel ten gronde en doofde uit.
+
+Uilenspiegel liep naar het kamp, maar hij kwam den provoost tegen met
+een menigte soldaten, die de vuurschoten hadden gewekt en hij zei hun:
+
+--Ik ben de jager, het wild ligt ginder, gaat het maar oprapen.
+
+--Lustige Vlaming, sprak de provoost, wat beteekenen uwe woorden?
+
+--Woorden zijn wind, antwoordde Uilenspiegel, doch lood blijft in
+het lijf der verraders. Maar volgt mij.
+
+En, met hunne lanteernen, bracht hij hen ter plaatse waar de twee
+mannen gevallen waren. Werkelijk zagen zij hen ten gronde liggen:
+de eene was dood, de andere reutelde: in zijn hand hield hij eenen
+brief, dien hij in een laatste stuiptrekking verfrommeld had.
+
+Zij droegen de verslagenen mede, die zij aan de kleederen voor edelen
+herkenden, en kwamen aldus met hunne lanteernen bij den prins, die
+beraadslaagde met Frederik van Hollenhausen, met den markgraaf van
+Hessen en met andere heeren.
+
+Gevolgd door landsknechten, ridders met gele en groene wambuizen,
+kwamen zij vóór de tent van den Zwijger, luide roepend of hij hen
+wilde ontvangen.
+
+Hij kwam buiten.
+
+Uilenspiegel liet den provoost niet spreken, die, hoestend, zich
+gereedmaakte om hem te beschuldigen, en zegde:
+
+--Heer, in stee van raven, heb ik twee edele verraders van uw gevolg
+gedood.
+
+Vervolgens vertelde hij wat hij gezien, gehoord en gedaan had.
+
+De Zwijger sprak geen woord. De twee lijken werden afgetast in
+bijzijn van hem, Willem van Oranje, van Frederik van Hollenhausen,
+van den markgraaf van Hessen, van Diederik van Schoonenberg, van
+graaf Albrecht van Nassau, van den graaf van Hoogstraten, van Antonius
+van Lalaing, stadhouder van Mechelen, alsmede van de soldaten en van
+Lamme, die beefde als een riet. Op de edellieden werden verzegelde
+brieven van Granvelle en Noircarmes gevonden, waarbij zij aangezocht
+werden verdeeling te zaaien in 's prinsen gevolg, om zijne krachten te
+verzwakken, hem te dwingen zich te onderwerpen en hem aldus te leveren
+aan den hertog van Alva, ten einde onthoofd te worden, naarvolgens
+verdienste. Gij moet, zeiden de brieven, omzichtig te werk gaan, en met
+bedekte woorden doen gelooven aan die van het leger, dat de Zwijger,
+in zijn eigen voordeel alleen, reeds met den hertog heeft onderhandeld;
+zijn vertoornde hoofdmannen en soldaten zullen hem gevangennemen. Als
+belooning werd aan elk hunner een wissel van vijfhonderd dukaten
+gezonden op het huis Függer van Antwerpen; zij zouden nog duizend
+dukaten krijgen, zoodra in Zeeland de Spaansche schepen aankwamen,
+met de vierhonderd duizend dukaten die men verwachtte.
+
+Het eedgespan ontdekt zijnde, wendde de prins zich naar de edelen,
+heeren en soldaten, onder dewelken een groot getal hem verdachten;
+zonder spreken wees hij naar de twee lijken, om hun hun wantrouwen
+te verwijten.
+
+Allen riepen met groot rumoer:
+
+--Lang leve Oranje! Oranje is den landen getrouw!
+
+Vol verachting wilden zij de lijken aan de honden werpen; maar de
+Zwijger sprak:
+
+--Het zijn die lijken niet, die men aan de honden moet werpen, maar
+de zwakheid des geestes, die aan de zuiverste inzichten twijfelen doet.
+
+En de heeren en soldaten riepen:
+
+--Leve de prins! Leve Oranje, de vriend onzer landen!
+
+En hunne stemmen klonken als de donder, dreigend voor 't onrecht.
+
+Naar de lichamen wijzend, zeide de prins:
+
+--Begraaft ze als kerstenen.
+
+--En wat gaat men met mij doen? vroeg Uilenspiegel. Dat men mij
+kastijde als ik kwaad, en loone als ik goed deed.
+
+Toen sprak de Zwijger:
+
+--Die soldaat zal in mijne tegenwoordigheid vijftig slagen krijgen
+met een stok van groen hout, omdat hij, in weerwil van alle tucht
+en zonder bevel, twee edellieden doodde. Ook zal hij dertig gulden
+ontvangen, omdat hij zoo goed gezien en gehoord heeft.
+
+--Heer, sprak Uilenspiegel, als men mij eerst de dertig gulden gaf,
+zou ik de stokslagen met meer geduld ontvangen.
+
+--Ja, ja, zuchtte Lamme Goedzak, lang hem eerst de dertig gulden;
+de slagen zal hij deemoedig verdragen.
+
+--En overigens, sprak Uilenspiegel, daar mijn geweten zuiver is, heb ik
+niet van doen gewasschen of gespoeld te worden met stokken of zweepen.
+
+--Ja, zuchtte Lamme Goedzak opnieuw, Uilenspiegel heeft niet van noode
+gewasschen of gespoeld te worden. Zijn geweten is zuiver. Wascht hem
+niet, mijne heeren, wascht hem toch niet!
+
+Uilenspiegel had de dertig gulden ontvangen, als de provoost den
+stokmeester gebood, Uilenspiegel onder handen te nemen.
+
+--Ziet toch, mijne heeren, zegde Lamme, wat jammerlijk gezicht hij
+trekt. Hij is in 't geheel geen liefhebber van stokken, mijn vriend
+Uilenspiegel.
+
+--Een schoonen, goed getakten esch, die met zijn frischgroene bladeren
+in de zonne prijkt, zie ik geerne, hernam Uilenspiegel; maar ik koester
+een doodelijken haat tegen die leelijke stokken, die nog nat zijn,
+zonder twijgen of bladeren, die hard en woest zijn van uitzicht,
+
+--Zijt gij gereed? vroeg de provoost.
+
+--Gereed, herhaalde Uilenspiegel, gereed tot wat? Om geslagen te
+worden? Neen, dat ben ik niet en zal het nooit wezen, mijnheer de
+stokmeester. Uw baard is ros en gij ziet er vreeselijk uit; maar
+ik ben zeker, dat gij zachtmoedig van aard zijt en met tegenzin een
+armen man, als ik, zoudt afranselen. Ik moet het u zeggen, maar slaan
+doe of zie ik niet geerne, want de rug van een kerstenmensch is een
+heilige tempel, die, evenals de borst, de longen bevat met dewelke
+wij Gods goede lucht ademen. Heel uw leven door, zou de wroeging u
+knagen als een ruwe stokslag mij aan stukken sloeg.
+
+--Spoed u, sprak de stokmeester.
+
+--Heer, zegde Uilenspiegel tot den prins, er is geene haast bij, ge
+moogt mij gelooven; eerst zoudt gij dien stok moeten laten goed drogen,
+want men zegt, dat het sap van groen hout een doodelijk vergif voor
+het bloed is. Zou uwe Hoogheid mij zulken vreeselijken dood willen
+zien sterven? Heer, ik behoud mijnen rug ten dienste Uwer Hoogheid;
+laat hem slaan met roeden, hem striemen met de zweep; maar, als gij
+mij niet wilt zien sterven, Heer, spaar mij toch het groen hout,
+als het u belieft.
+
+--Prins, schenk hem genade, spraken beiden, de heer van Hoogstraten
+en Diederik van Schoonenberg. De anderen glimlachten goedhertig
+en medelijdend.
+
+Lamme kwam achteraan en zuchtte:
+
+--Heer, genade, heer; groen hout is doodelijk vergif.
+
+Toen sprak de prins:
+
+--Ik schenk hem genade.
+
+Uilenspiegel maakte eene tuimelpert, sloeg op Lamme's buik, dwong
+hem tot dansen en sprak:
+
+--Loof met mij Zijne Hoogheid, die mij van het groen hout heeft gered.
+
+En Lamme beproefde te dansen, maar hij kon niet, ter oorzake van zijn
+dikken buik.
+
+En Uilenspiegel trakteerde hem en liet hem eten en drinken, zooveel
+als hij kon.
+
+
+
+
+XII.
+
+De hertog wilde geen slag leveren, doch bestookte den Zwijger op 't
+platteland tusschen Gulik en de Maas; Oranje deed overal den stroom
+peilen, te Hond, Mechelen, Elsen, Meersen, en overal vonden zij er
+voetangels in, om de mannen en peerden te kwetsen, die zouden pogen
+den stroom over te steken.
+
+Te Stokhem vonden de peilers er geene. De prins beval daar te waden. De
+ruiters togen over den stroom en hielden zich aan den overkant in
+slagorde, om het overzetten der troepen langs den kant van het bisdom
+Luik te dekken; vervolgens kwamen, van den eenen tot den anderen oever,
+tien rotten busschutters en boogschutters staan, die aldus den loop van
+de Maas stremden, en in het midden van welke zich Uilenspiegel bevond.
+
+Hij stond tot aan de dijen in 't water; somwijlen zelfs werden hij
+en zijn peerd opgeheven door een plotselinge, verraderlijke golving.
+
+Hij zag de voetknechten overgaan met een zakje buskruit op het
+hoofd en hunne bussen omhoog; vervolgens kwamen de ammunitiewagens,
+de haakbussen, de geleiders, de stukrijders, de slangen, de dubbele
+slangen, de falkonetten, de dubbele falkonetten, de serpenten, de
+halve serpenten, de dubbele serpenten, de slangen met wijden mond, de
+kanonnen, de halve kanonnen, de dubbele kanonnen, de donderbussen, de
+sakers, de kleine stukken bereden veldgeschut, geladen op voorwagens,
+met twee peerden bespannen, en die in alles geleken op de kanonnen,
+die men de Pistolen des keizers heette; daarna kwamen Vlaamsche
+ruiters en landsknechten, die de achterhoede moesten dekken.
+
+Uilenspiegel zocht iets te drinken, dat hem verwarmen kon. De
+boogschutter Riesencraft, een Hoogduitscher, een mager, reusachtig
+en wreedaardig man, die nevens hem op zijn peerd zat te ronken,
+rook geweldig naar brandewijn. Uilenspiegel zocht naar de flesch
+op het kruis van zijn peerd, en vond ze aan zijnen schouderband
+geknoopt. Hij sneed het koordeken door, nam de flesch en dronk lustig
+van het verkwikkende nat. De gezellen boogschutters zeiden tot hem:
+
+--Geef ons ook een slok.
+
+En hij gaf hun de flesch. Als de brandewijn op was, bond hij 't
+koordeken weer aan de flesch en wilde ze terugbrengen op de borst van
+den soldenier. Toen hij den arm oplichtte om de bottel er onder te
+steken, werd Riesencraft wakker. Naarde bottel grijpend, wilde hij
+zijn gewone koe melken. Daar hij er echter geene melk meer in vond,
+ontstak hij in hevige woede.
+
+--Dief, sprak hij, wat hebt gij gedaan met mijn brandewijn?
+
+Uilenspiegel antwoordde:
+
+--Uitgedronken. Onder doornatte ruiters is de brandewijn van één,
+de brandewijn van allen. Gierig zijn is leelijk.
+
+--Morgen daag ik u uit tot een tweegevecht, antwoordde Riesencraft,
+en ik beloof u fatsoenlijk aan stukken te kappen.
+
+--Wij zullen alles afkappen, sprak Uilenspiegel, hoofden, armen en
+beenen. Maar zijt gij verstopt, dat uwe tronie zoo zuur ziet?
+
+--Dat ben ik, sprak Riesencraft.
+
+--Dan moet gij purgeeren, in stee van te vechten.
+
+Zij kwamen overeen zich 's anderen daags met elkander te meten. Elk
+mocht gekleed en uitgerust zijn lijk hij verkoos, en zij zouden naar
+elkander kerven en kappen met een korten stootdegen.
+
+Uilenspiegel vroeg, om voor zich zelven, den degen te mogen vervangen
+door eenen stok, hetgeen hem toegestaan werd.
+
+Intusschen waren al de soldaten over den stroom getogen en reeds
+stelden zij zich in goede orde, op de bevelen hunner kapiteins en
+kolonels. Nu verlieten ook de tien rotten schutters hunne vochtige
+stelling.
+
+En de Zwijger sprak:
+
+--Wij marcheeren op Luik,
+
+Uilenspiegel was er blijde om en riep met al de Vlamingen:
+
+--Lang leve Oranje! Naar Luik! naar Luik!
+
+Maar de vreemdelingen, en voornamelijk de Hoogduitschers zeiden, dat
+zij te nat waren om te marcheeren. Te vergeefs bevestigde de prins
+hun, dat zij naar een gewisse zegepraal gingen, naar eene stede met
+hert en ziel hun toegedaan: zij wilden niet luisteren, en ontstaken
+groote vuren om zich te warmen, met hunne onttuigde peerden.
+
+De aanval der stad werd uitgesteld tot 's anderen daags; en Alva,
+hoogst verbaasd over den stoutmoedigen overtocht, vernam door zijne
+spionnen, dat de soldaten van den Zwijger nog niet bereid waren tot
+den aanval.
+
+Daarop deed hij Luik en heel de omliggende streek bedreigen alles in
+vuur en vlam te zullen zetten, zoo de vrienden des prinsen er eenige
+beweging maakten. Geeraard van Groesbeek, de bisschoppelijke serjant,
+deed zijne soldaten wapenen tegen den prins, die te laat kwam door
+de schuld der Hoogduitschers, benauwd voor een beetje water in hunne
+schoenen.
+
+
+
+
+XIII.
+
+Uilenspiegel en Riesencraft hadden hunne getuigen gekozen; deze
+beslisten, dat de twee soldaten te voet zouden vechten, totdat de
+dood er op volgde, zoo dit den overwinnaar behaagde, want dit waren
+de voorwaarden die Riesencraft stelde.
+
+Het gevecht greep plaats in een kleine heide.
+
+Reeds van den vroegen morgen had Riesencraft zijne kleedij van
+boogschutter aan: de salade, dat is de helm, met ijzeren halsstuk,
+zonder vizier, alsmede een maliënhemd zonder mouwen. Daar zijn ander
+hemd aan stukken vaneen viel, stak hij het in zijnen helm om er in
+geval van nood, pluksel van te maken. Hij nam eenen voetboog van goed
+hout der Ardennen, eenen koker met dertig pijlen, een lange dagge,
+doch geen tweehandig zweerd, dat een wapen der busschutters was. En hij
+kwam naar het strijdperk op zijn handpeerd, dat met den oorlogszadel,
+het met pluimen versierde hoofdharnas, en met een ijzeren borstharnas
+opgetuigd was.
+
+Uilenspiegel koos de uitrusting van een gewapenden ridder: tot rijdier
+had hij een ezel; tot zadel de rokken eener deerne; het hoofdharnas
+was van wisschen, versierd met wuivende schavelingen. Het borstharnas
+van zijn rijdier was van spek, want zeide hij, het ijzer kost te duur,
+het staal is buiten prijs en, wat het koper betreft, in de laatste
+dagen heeft men er zooveel van noodig gehad om kanonnen te gieten,
+dat er niet genoeg meer overblijft om een konijn uit te rusten; tot
+hoofddeksel had hij een schoonen saladestruik, dien de slekken nog
+niet opgegeten hadden; op de salade stak eene zwanepluim, om hem te
+doen zingen als hij soms stierf.
+
+Zijn stootdegen was een goede, lange, dikke stok van dennenhout, waarop
+een bezem van dennentakken. Aan den linkerkant van zijnen zadel hing
+zijn mes, van hout, aan zijne rechterzijde slingerde zijne strijdknots:
+een vliertak met eene raap opgestoken. Zijn harnas bestond uit niets
+dan gaten, met andere woorden: hij had er geen aan.
+
+Als hij, aldus toegetakeld, plechtstatig het strijdperk binnenreed,
+schoten de getuigen van Riesencraft in een luiden schaterlach, doch
+de Hoogduitscher bleef norsch kijken met zijn bittere tronie.
+
+Toen vroegen de getuigen van Uilenspiegel aan die van Riesencraft, dat
+de Duitscher zijne uitrusting van maliën en ijzer zou uitdoen, vermits
+Uilenspiegel slechts met lompen gepantserd was. Riesencraft stemde
+er in toe. Daarop vroegen de getuigen van Riesencraft aan die van
+Uilenspiegel hoe het kwam, dat de Vlaming met eenen bezem gewapend was.
+
+--Gij liet mij toe den stootdegen door eenen stok te vervangen,
+sprak Uilenspiegel, maar gij hebt mij niet verboden de takken er aan
+te laten.
+
+--Ga maar uw gang, spraken de vier getuigen.
+
+Riesencraft zei geen woord, doch kapte, in zijne opgewondenheid,
+met zijne stootdegen de schrale heideplanten af.
+
+De getuigen zetten hem aan, zijn stootdegen neder te leggen en ook
+eenen bezem te nemen, lijk Uilenspiegel.
+
+Hij antwoordde:
+
+--Als die truwant uit eigen beweging een zoo gemeen wapen koos,
+is het dat hij meent daarmede zijn leven te kunnen verdedigen.
+
+Daar Uilenspiegel opnieuw verklaarde, dat hij zijnen bezem wilde
+gebruiken, drongen de vier getuigen niet verder aan en zeiden zij
+dienvolgens, dat alles in regel was.
+
+Beiden stonden tegenover elkander: Riesencraft op zijn peerd,
+dat met ijzer geharnast, Uilenspiegel op zijnen ezel, die met spek
+gepantserd was.
+
+Uilenspiegel reed tot in het midden van het veld. Zijnen bezem recht
+als eene lans houdend, zeide hij:
+
+--Dat gespuis, dat, in het leger van dappere makkers, anders niets
+doet dan schuimbekkend van woede, met een zure tronie rond te loopen om
+ruzie te zoeken, stinkt erger dan pest, dan melaatschheid en dood. Waar
+zij komen, vlucht de lach, versterft het blijde liedeken. Zij moeten
+altoos brommen of vechten, en zij vervangen het heilig gevecht
+voor het vaderland door het tweegevecht, dat het leger ondermijnt
+tot vreugde van den vijand. Riesencraft, hier tegenwoordig, heeft,
+om onschuldige poetsen, een en twintig zijner gezellen vermoord,
+maar nimmer verrichtte hij zelf, in gevecht of schermutseling,
+een schitterende heldendaad of erlangde hij om betoonden moed de
+minste belooning. Nu, heden behaagt het mij, het ruige vel van dien
+twistzieken hond eens averechts te borstelen.
+
+Riesencraft antwoordde:
+
+--Die dronkelap heeft schoone dingen hooren vertellen over het
+misbruik der tweegevechten; heden behaagt het mij hem het hoofd in
+tweeën te klieven, om aan elkeen te toonen, dat er maar hooi in zijne
+hersenpan steekt.
+
+De getuigen deden hen afstijgen. Uilenspiegel liet van zijn hoofd
+den saladestruik vallen, dien de ezel gretig binnensloeg; doch het
+grauwtje werd in die bezigheid gestoord door eenen schop van een der
+getuigen, om hem buiten de omheining van het strijdperk te drijven. Het
+geharnaste peerd ontving mede zijn deel en de beide dieren gingen
+eendrachtiglijk grazen in 't ronde.
+
+De getuigen van Uilenspiegel, die eenen bezem droegen, en de getuigen
+van Riesencraft, die eenen stootdegen voerden, gaven fluitend het
+teeken van 't gevecht.
+
+En Riesencraft en Uilenspiegel vochten als razenden: Riesencraft sloeg
+met zijn stootdegen, Uilenspiegel weerde de slagen af met zijn bezem;
+Riesencraft zwoer bij alle duivelen, Uilenspiegel ontweek de slagen,
+liep schuins, draaide rechts, keerde links door de heide, stak de tong
+uit en zette allerlei vieze gezichten naar Riesencraft, die, ziedend
+van woede, buiten adem geraakte en blindelings als een dronkeman in
+de lucht kapte. Als Uilenspiegel hem vlak achter zich voelde, keerde
+hij zich plotseling om en gaf hem, met zijnen bezem, een forschen
+slag onder den neus. Riesencraft viel neder met uitgestrekte armen
+en beenen, lijk een kikvorsch op zijn uiterste.
+
+Uilenspiegel wierp zich op hem, streek zonder genade den bezem rechts
+en averechts over zijn aangezicht en sprak:
+
+--Roep om genade, of ik doe u den bezem slikken!
+
+En hij wreef en herwreef, tot groot genoegen van de omstanders,
+en zeide altijd:
+
+--Roep om genade, of ik doe u hem slikken!
+
+Maar Riesencraft kon niet meer roepen, want hij was dood van woede
+en gramschap.
+
+--God hebbe uwe ziel, arme razende! zeide Uilenspiegel.
+
+En treurig gestemd, toog hij henen.
+
+
+
+
+XIV.
+
+Het was het einde van Wijnmaand. Geld ontbrak aan den prins; zijne
+soldaten hadden honger. Zij morden; de prins marcheerde naar Frankrijk
+en bood den hertog 't gevecht aan, maar deze weigerde het.
+
+Uit Quesnoy-le-Comte vertrokken om naar het land van Kamerijk te gaan,
+ontmoette hij tien compagnieën Duitschers, acht vendels Spanjaards
+en drie kornetten ruiterij, aangevoerd door don Ruffele Henricis,
+zoon des hertogen, die te midden van het gevecht in het Spaansch riep:
+
+--Slaat dood! Slaat dood! Geen kwartier! Leve de Paus!
+
+Don Henricis met zijne mannen, tegenover de compagnie busschutters,
+waarbij Uilenspiegel tiendenier was, wierp zich op hen.
+
+Uilenspiegel zeide tot den bentserjant:
+
+--De tong van dien beul ga ik in tweeën snijden!
+
+--Snij maar op, zei de serjant.
+
+En met een goed gerichten kogel, verplette Uilenspiegel tong en kaken
+van don Ruffele Henricis, zoon van den hertog.
+
+Uilenspiegel schoot ook den zoon van den markies Delmares van zijn
+peerd.
+
+De acht vendels en de drie kornetten werden verslagen.
+
+Na die zegepraal zocht Uilenspiegel naar Lamme, in het kamp en in
+'t ronde, maar hij vond hem niet.
+
+--Laas! sprak hij, hij is weg, mijn vriend Lamme, mijn dikke vriend. In
+het vuur van den strijd zal hij het gewicht van zijn buik vergeten
+en de Spaansche vluchtelingen achternagezet hebben. Buiten adem, zal
+hij op den weg gevallen zijn als een zak. En zij zullen hem opgeraapt
+hebben, om er losgeld van te trekken; losgeld voor kerstenspek. Vriend
+Lamme, waar zijt gij toch, waar zijt gij, mijn arme, vette vriend?
+
+Uilenspiegel zocht hem overal, en, hem niet vindend, was hij treurig
+gestemd.
+
+
+
+
+XV.
+
+In de Slachtmaand, de maand der sneeuwstormen, ontbood de Zwijger
+Uilenspiegel vóór zich. De prins beet op de koord van zijn maliënhemd.
+
+--Luister goed, sprak hij.
+
+Uilenspiegel antwoordde:
+
+--Mijne ooren zijn gevangenispoorten; men komt er gemakkelijk binnen,
+maar uitgeraken is een andere zaak.
+
+De Zwijger sprak:
+
+--Ga door Namen, Henegouw, Vlaanderen, Zuid-Brabant, Antwerpen,
+Noord-Brabant, Gelderland, Overijsel, Noord-Holland overal verkondigen,
+dat, zoo het geluk onze heilige en kerstene zaak te lande verlaat,
+de strijd tegen onrecht en geweld ter zee voortgezet wordt. God
+bestiere genadig deze zaak, in voor- als in tegenspoed. Te Amsterdam
+gekomen, zult gij Pauwel Buys, mijn getrouwe, rekenschap geven van
+uwe zending. Hier zijn drie passen, door Alva zelven onderteekend en
+gevonden op verslagenen te Quesnoy-le-Comte. Mijn schrijver heeft ze
+behoorlijk ingevuld. Wellicht vindt gij onderwege een goeden gezel,
+in wien gij vertrouwen moogt stellen. Goeden zijn zij, die op 't
+gezang van den leeuwerik antwoorden met 't krijgshaftig gekraai van
+den haan. Hier zijn vijftig gulden. Wees moedig en trouw.
+
+--De assche klopt op mijn hert, antwoordde Uilenspiegel. En hij
+toog henen.
+
+
+
+
+XVI.
+
+Met oorlof van den koning en van den hertog, mocht hij, naar believen,
+alle wapenen dragen. Hij nam zijn goede radbus, patronen, alsmede
+droog kruit. Vervolgens trok hij een gescheurd wambuis, een gelapt
+opperste kleed en eene hooze met gaten aan; naar Spaansche wijs zette
+hij eene toque met wuivende pluim op en gordde een zweerd om. Aldus
+verliet hij het leger en stapte naar Maastricht.
+
+De winterkoninkjes, voorboden der koude, vlogen rond de huizen, om
+eene schuilplaats te zoeken. Den derden dag viel het aan 't sneeuwen.
+
+Menigwerf moest Uilenspiegel onderwege zijne vrijgeleide vertoonen. Men
+liet hem overal door. Hij zette zijn weg voort naar Luik.
+
+Hij kwam in eene vlakte; een hevige wind joeg de vlokken in zijn
+gezicht. Vóór zich zag hij de oneindige, witte vlakte, gesluierd door
+dwarrelende sneeuwbuien. Drie wolven volgden hem op de hielen; hij
+velde er eenen neder met zijne bus; de anderen wierpen zich op den
+gewonde, trokken hem vaneen en liepen het bosch in, elk met een stuk.
+
+Van dat gezelschap verlost, keek Uilenspiegel of er geen andere bende
+in 't veld was. Ten einde de vlakte zag hij meerdere stipjes als
+grijze standbeelden, die zich bewogen in den sneeuwstorm, en achter
+hen, zwarte gedaanten van soldaten te peerd.
+
+Hij klom op eenen boom. De wind bracht een verre geweeklaag
+tot hem. "Wellicht", zeide hij in zichzelven, "wellicht zijn het
+pelgrims met witte pijen: met moeite zie ik iets van hun lichaam in
+de sneeuw." Vervolgens onderscheidde hij menschen, die naakt liepen,
+en twee ruiters met zwarte harnassen op groote peerden gezeten,
+welke die ellendige kudde met zweepslagen voortdreven. Hij wapende
+zijne bus. Onder die ongelukkigen zag hij jongelieden en grijsaards,
+naakt, bibberend, verkleumd, ineengedrongen, angstig voortloopend om
+de zweep te ontvluchten van de twee soldaten, die, warm gekleed, rood
+van brandewijn en goeden kost, er vermaak in schepten, het lichaam
+dier naakte menschen tot bloedens toe te striemen, om ze nog sneller
+te doen aanstappen.
+
+Uilenspiegel sprak:
+
+--Gij zult gewroken worden, assche van Klaas.
+
+En hij zond een kogel in 't voorhoofd van een der ruiters, die dood
+van zijn peerd viel. De andere, die niet wist van waar die onverwachte
+kogel kwam, werd bang, en dacht dat vijanden in het bosch verborgen
+waren. Hij wilde vluchten met het peerd van zijn makker. Maar terwijl
+hij met den teugel van dat dier in de hand van zijn peerd steeg om
+het geld van den doode te rooven, werd hij in den hals getroffen door
+een anderen kogel en viel hij insgelijks dood ten gronde.
+
+De naakten meenden, dat een engel des hemels, een goed schutter,
+hun ter hulp kwam, en vielen op de knieën. Toen kwam Uilenspiegel van
+zijnen boom en werd erkend door mannen uit den troep, die, als hij,
+in het leger des prinsen gediend hadden. Zij zeiden tot hem:
+
+--Uilenspiegel, in dezen jammerlijken staat werden wij uit Frankrijk
+naar Maastricht gezonden, waar de hertog is, om daar behandeld te
+worden als gevangen muitmakers; daar wij geen rantsoen kunnen betalen,
+zijn wij van te voren veroordeeld om gefolterd en onthalsd te worden
+of, als truwanten en diepers, op de galeien des konings te roeien.
+
+Uilenspiegel gaf zijn opperste kleed aan den oudste der bende en sprak:
+
+Komt, ik zal U naar Mézières leiden, maar eerst moeten wij dezen
+soldaten hunne kleeren uittrekken en hunne peerden meenemen.
+
+De wambuizen, hoozen, leerzen en hoeden der soldeniers werden verdeeld
+onder de zwaksten en de zieksten, en Uilenspiegel sprak:
+
+--Wij gaan in het bosch: daar is het zoo koud niet, de lucht is er
+zoeter. Komt, broeders, komt mede.
+
+Doch een der mannen viel ten gronde en zuchtte:
+
+--Ik sterf van kou en van honger, en vóór God zal ik getuigen, dat
+de paus de antichrist is.
+
+En hij stierf. De anderen wilden hem meenemen, om hem als kerstenmensch
+te begraven.
+
+Terwijl zij op de groote baan gingen, zagen zij eenen boer met eene
+huifkar. Als hij de naakte menschen zag, kreeg hij medelijden en deed
+hij hen in zijne kar komen, waar zij hooi vonden om op te liggen en
+ledige zakken om hun schamelheid te bedekken. Zij dankten God, dat
+zij warm lagen. Uilenspiegel reed naast de kar op een van de peerden
+der soldaten, terwijl hij de andere bij den toom leidde.
+
+Te Mézières stapten zij uit de kar; daar gaf men hun goede soep, bier,
+brood en kaas, en vleesch aan de ouderlingen en aan de vrouwlieden. En
+zij werden geherbergd, gekleed en opnieuw gewapend ten koste van de
+gemeente. En tot zegening kusten allen Uilenspiegel, die hen goedhertig
+liet begaan.
+
+Deze verkocht de peerden der twee ruiters voor acht en veertig gulden,
+waarvan hij er dertig aan de verloste gevangenen gaf.
+
+Eenzaam voortgaande, sprak hij in zich zelven:
+
+--Ik ga langs puinhoopen, dood en bloed, zonder iets te vinden. De
+duivelen hebben zeker gelogen. Waar is Lamme? Waar is Nele? Waar zijn
+de Zeven?
+
+En de assche van Klaas klopte op zijne borst. En hij hoorde eene stem
+als een ademtocht fluisteren: "Zoek in dood, puinen en tranen".
+
+En hij ging voort.
+
+
+
+
+XVII.
+
+In de Lentemaand kwam Uilenspiegel te Namen. Hij vond er Lamme, die
+groot liefhebber geworden was van visch uit de Maas en hoofdzakelijk
+van forellen. Hij had een boot gehuurd en vischte in den stroom met
+toelating van de gemeente. Maar hij had vijftig gulden moeten betalen
+aan de nering der vischverkoopers.
+
+Zijne vangst at hij op of verkocht hij, en aldus herstelde hij de
+rondheid van zijnen buik en vergaarde hij een zakje karolussen.
+
+Toen hij zijn vriend Uilenspiegel op den oever van de Maas naar de
+stadspoort zag stappen, was hij aangenaam verrast; hij stak zijn bootje
+naar wal, klaverde den oever op, niet zonder blazen, en kwam naar hem.
+
+Stamelend van genoegen, sprak hij:
+
+--Zijt gij daar, mijn zoon, want ik mag u zoo noemen: mijn buik is
+tweemaal zoo dik als de uwe. Waar gaat gij? Wat doet gij? Gij zijt
+toch niet dood? Hebt gij mijne vrouw niet gezien? Gij zult visch uit
+de Maas eten, de beste, die in dit tranendal bestaat; hier maken ze
+sausen, dat men er de pan bij zou opeten. Gij zijt schoon en vroom,
+met uwe kaken gebruind door 't gevecht. Daar is hij eindelijk, mijn
+zoon, mijn vriend Uilenspiegel, de lustige zwerver!
+
+En stille vroeg hij hem:
+
+--Hoeveel Spanjolen hebt gij geknipt? Hebt gij mijne vrouw niet
+gezien in hunne karren met loddegen? En gij zult wijn van de Maas
+drinken; hij is heerlijk en bevordert de spijsvertering. Zijt gij
+gekwetst, mijn zoon? Gij blijft dus hier, frisch, gezond en wel te
+pas als een veulen. En de paling moet gij proeven! Niet de minste
+grachtsmaak! Omhels mij, mijn vriend! Bij God, wat ben ik tevreden!
+
+En Lamme danste, sprong, blies en dwong ook Uilenspiegel tot dansen.
+
+Toen stapten zij op naar Namen. Aan de poort van de stad toonde
+Uilenspiegel zijn reispas, onderteekend door den hertog van Alva. En
+Lamme leidde hem mede naar huis.
+
+Terwijl hij den maaltijd bereidde, deed hij hem zijne lotgevallen
+verhalen en vertelde hij ook zijn eigen wedervaren. Hij had, zeide hij,
+het leger verlaten om een meisje te volgen, dat, naar hij meende, zijne
+vrouw was. En zoo was hij tot in Namen gesukkeld. En gedurig vroeg hij:
+
+--Hebt gij ze niet gezien?
+
+--Ik heb er anderen gezien, met schoone gezichtjes, antwoordde
+Uilenspiegel, en dat wèl in deze stede, waar allen verliefd schijnen.
+
+--Om de waarheid te zeggen, sprak Lamme, ik kan er krijgen zooveel
+als ik wil, maar ik blijf trouw aan mijne vrouw, want mijn jammerend
+hert is vervuld van haar aandenken.
+
+--Lijk uw buik van menigvuldige gerechten, antwoordde Uilenspiegel.
+
+Lamme hernam:
+
+--Als ik verdriet heb, moet ik eten.
+
+--Is uw verdriet eeuwigdurend? vroeg Uilenspiegel.
+
+--Laas ja! sprak Lamme.
+
+Meteen trok hij eene forel uit eene kuip.
+
+--Zie eens, sprak hij, hoe schoon en hoe vast. Het vleesch is
+rooskleurig als dat mijner vrouw. Morgen verlaten wij Namen; ik
+heb een vollen zak guldens; wij zullen elk een ezel koopen en naar
+Vlaanderen reizen.
+
+--Gij zult er veel bij verliezen, sprak Uilenspiegel.
+
+--Mijn hert trekt naar Damme, naar de plaats, waar zij mij vurig
+beminde. Misschien wacht zij daar.
+
+--Vermits gij het wilt, sprak Uilenspiegel, zullen wij morgen
+vertrekken.
+
+En inderdaad, 's anderen daags kochten zij ezels en reden zij naast
+elkander de stad uit.
+
+
+
+
+XVIII.
+
+Een gure wind blies over de aarde. De lucht, die 's morgens helder
+als de jeugd was, werd grijs als de oude dag. Het regende en hagelde.
+
+Toen de regen opgehouden had, schudde Uilenspiegel zich, zeggende:
+
+--De hemel drinkt zooveel dampen op, dat hij zich soms moet ontlasten.
+
+Maar het begon weer te regenen en te hagelen, en nog meer dan de
+eerste maal. De twee gezellen waren doornat.
+
+Lamme zuchtte:
+
+--Wij waren goed gewasschen, nu is men ons aan't spoelen! De zonne
+kwam weer te voorschijn en blijgemoed stegen zij weder op hunne ezelen.
+
+Doch nu begon het zoo moorddadig te hagelen, dat de droge takken der
+boomen als met messen afgekapt werden.
+
+Lamme sprak:
+
+--Ho! een dak toch! Mijn arme vrouw! Waar zijt gij, goed vuurtje,
+zoete kussen en lekkere hutsepot?
+
+En hij weende, de dikzak.
+
+Doch Uilenspiegel sprak:
+
+--Wij jammeren en weeklagen; maar is het niet van ons zelven, dat
+al onze kwalen ons komen? Het regent en hagelt op onze schouderen,
+doch die winterregen kweekt malsche meiklaver. En de runderen zullen
+loeien van genoegen. Wij zijn zonder schuilplaats, maar waarom trouwen
+wij niet? Ik toch, ten minste, waarom trouw ik niet met Nele, die zoo
+schoon en zoo braaf is, en die mij nu een goeden schotel boonen met
+gestoofd vleesch zou voorzetten? Wij hebben dorst, niettegenstaande het
+water, dat valt; waarom bleven wij niet bij een zelfde ambacht? Zij,
+die meester aanveerd zijn, hebben heele tonnen bruinbier in hunne
+kelders.
+
+De assche van Klaas klopte op zijn hert, de hemel werd helder, de
+zonne schitterde aan het uitspansel en Uilenspiegel sprak:
+
+--Mevrouw de Zon, ik zeg u duizendmaal dank, ge komt onze lendenen
+verwarmen; assche van Klaas, gij verwarmt ons hert en zegt ons dat
+diegenen gezegend zijn, die zwerven voor de verlossing van den bodem
+der vaderen.
+
+--Ja, maar 'k heb honger, zei Lamme.
+
+
+
+
+XIX.
+
+Zij trokken eene afspanning binnen, en men gaf er hun te eten in de
+kelderkamer. Uilenspiegel opende het venster en zag van daar eene
+lochting, in dewelke een minnelijk, poezel meideken wandelde, met
+ronden boezem en gouden lokken. Zij had anders niet aan dan een rok,
+een wit linnen jakje en een zwart voorschoot met gaatjes.
+
+Hemden en ander vrouwenlinnen hingen te drogen; het meisje was steeds
+naar Uilenspiegel gekeerd, trok de hemden van de koorden, hing ze
+weder op, glimlachte en keek gedurig naar Uilenspiegel.
+
+In de nabijheid hoorde Uilenspiegel eenen haan kraaien en zag hij
+eene voedster met een kind spelen, wiens gezichtje zij naar eenen
+man toekeerde, terwijl zij zeide:
+
+--Boelkin, trek oogskens naar vader, toe!
+
+Het kind schreide.
+
+En het aanvallig meideken bleef in de lochting ronddrentelen en het
+linnen afnemen en weder ophangen.
+
+--'t Is eene, die aan den hertog verkocht is, sprak Lamme. Het meideken
+bracht heure handen voor heure oogen en tusschen de vingeren loerend,
+keek ze lachend naar Uilenspiegel.
+
+Vervolgens ging zij op een der gespannen koorden zitten en schommelde,
+zonder met heure voeten den grond aan te raken. Onder 't schommelen,
+liet zij Uilenspiegel heure blanke, ronde armen zien, bloot tot aan
+heur schouderen en die de bleeke zonne bestraalde. Op en neder wippend,
+bekeek zij hem gestadig. Hij ging buiten om tot heur te gaan. Lamme
+volgde hem. Aan de haag van de lochting zocht Uilenspiegel eene
+opening om door te geraken, doch te vergeefs.
+
+Als het meideken hem zoo bezig zag, gluurde zij nogmaals glimlachend
+tusschen heure vingeren.
+
+Uilenspiegel wilde door de haag geraken, maar Lamme hield hem met
+alle geweld tegen en sprak:
+
+--Ga daar niet binnen, 't is eene verklikster, in dienst van den
+Spanjaard: wij worden levend verbrand.
+
+Toen wandelde het meisje rond in de lochting, met heur voorschoot
+over heur gezicht, doch keek door de gaatjes om te zien of heur nieuwe
+vriend nog niet kwam.
+
+Uilenspiegel wilde met een forsigen wip over de haag springen, doch
+hij werd weerhouden door Lamme, die hem, bij zijn been grijpend,
+deed vallen en zeide:
+
+--Koord, zweerd en galg, 't is eene verklikster, ga niet tot haar,
+zeg ik u.
+
+Uilenspiegel verweerde zich zoo goed hij kon. Het meideken stak het
+hoofd over de haag en riep:
+
+--Vaarwel, heer, dat de liefde Uwe Lankmoedigheid onderhoude.
+
+En hij hoorde een spottenden schaterlach.
+
+--Ha! sprak hij, in mijne ooren steekt dat als duizend speldeprikken!
+
+Eene deur werd luidruchtig gesloten.
+
+En hij was gansch weemoedig.
+
+Lamme, die hem nog altoos vasthield, zeide tot hem:
+
+--Met spijt denkt gij aan den verloren schat. Maar 't is eene
+verklikster, die u in heur spionnennet zou lokken. En gij merkt het
+niet: ik berst van lachen.
+
+Uilenspiegel zei geen woord en de beide gezellen stegen weder op
+hunne ezelen.
+
+
+
+
+XX.
+
+Zij reden sprakeloos voort, schrijlings op hun grauwtje gezeten.
+
+Lamme kauwde zijn laatsten maaltijd, terwijl hij blijgemoed met volle
+teugen de frissche lucht ademde.
+
+Plotseling gaf Uilenspiegel hem eenen zweepslag over zijn achterste,
+dat met een band rond den zadel lag.
+
+--Wat doet gij? riep Lamme jammerend uit.
+
+--Wat? vroeg Uilenspiegel.
+
+--Die zweepslag, zei Lamme.
+
+--Welke zweepslag?
+
+--Dien gij mij daar geeft, hervatte Lamme.
+
+--Links? vroeg Uilenspiegel.
+
+--Ja, links en op mijn achterste. Waarom deedt gij dat, schaamtelooze
+nietdeug?
+
+--Uit onwetendheid, antwoordde Uilenspiegel. Ik weet heel goed wat
+een zweep is, en ook heel goed wat een achterste is, dat op eenen
+zadel gespannen zit. Nu, als ik het uwe, breed, gespannen over den
+zadel zag steken, zei ik in mijn zelven: Daar men met de vingeren
+er niet in kan nijpen, kan het koordeken van de zweep er ook niet op
+bijten. Ik was mis, ik beken het rechtuit.
+
+Lamme glimlachte op die rede, en Uilenspiegel vervolgde:
+
+--Maar ik ben de eenige niet op de wereld, die uit onwetendheid
+zondigt, en meer dan één dwaze meester, die zijn overtollig vet op den
+zadel eens ezels ten toon spreidt, zou mij daar lessen in geven. Als
+mijne zweep zich vergat ten opzichte van uw achterste, vergat gij u
+nog meer ten opzichte van mijne beenen, door hun te beletten achter
+het meisje te loopen, dat in de lochting mij zoo lodderlijk wenkte.
+
+--Aas voor de raven, zei Lamme, 't was dus uit wraaklust?
+
+--Een heel klein beetje, antwoordde Uilenspiegel.
+
+
+
+
+XXI.
+
+Nele leefde bedroefd en eenzaam te Damme bij Katelijne, die om den
+ijskouden duivel riep, maar dewelke niet kwam.
+
+--Ach! zei ze, gij zijt rijk, Hansken, en zoudt mij de zevenhonderd
+karolussen kunnen terugbrengen. Soetkin zou op aarde terugkomen en
+Klaas zou tevreden zijn in het hemelrijk; gij moet ze teruggeven. Doe
+het vuur weg, de ziel wil er uit, maak een gat, mijn ziel wil er uit.
+
+En gedurig wees zij met den vinger naar de plaats, waar het werk heur
+hoofd verbrand had.
+
+Katelijne was nu zeer arm, doch de buren stonden haar bij met boonen,
+met brood en met vleesch, al naarvolgens hunne middelen. Ook de
+disch gaf heur wat geld. En Nele naaide voor de rijke poorteressen,
+ging uit strijken en verdiende aldus een gulden per week.
+
+En Katelijne riep altoos:
+
+--Maak een gat, laat mijne ziel er uit. Zij klopt om buiten te
+zijn. Hij zal de zevenhonderd karolussen teruggeven.
+
+En weenend aanhoorde Nele heur waanzinnige reden.
+
+
+
+
+XXII.
+
+Doch Uilenspiegel en Lamme, met hunne reispassen op zak, trokken een
+kleine taveerne binnen, tegen de rotsen der Samber gebouwd, die op
+sommige plaatsen met boomen bedekt zijn. En boven de deur stond te
+lezen: Bij Marlaire.
+
+Zij dronken menige bottel wijn van de Maas, bereid naar de wijze van
+Bourgondië, en aten veel waterzooi; daarna begonnen zij te praten met
+den baas, een eersten paapschgezinde, maar die gestadig heimelijk
+knipoogde, en babbelde als een ekster, ter oorzake van den wijn,
+dien hij gedronken had.
+
+Uilenspiegel, die in de gaten had dat achter dat knipoogen iets
+schuilde, deed hem nog meer drinken, zoodat de weerd begon te dansen
+en te schaterlachen. Vervolgens kwam hij weer aan de tafel zitten
+en sprak:
+
+--Goede katholieken, ik drink op uwe gezondheid!
+
+--Op de uwe! antwoordden Lamme en Uilenspiegel. Op de uitroeiing van
+ketters en muitmakers!
+
+En Lamme en Uilenspiegel vulden gestadig den beker, dien de weerd
+dadelijk weer leeg dronk.
+
+--Gij zijt brave lieden, en ik drink op uwe gezondheid. Hoe meer ik
+drink, hoe grooter mijn winst is. Waar zijn uwe passen?
+
+--Hier, antwoordde Uilenspiegel.
+
+--Geteekend door den hertog, sprak de weerd. Ik drink op den hertog!
+
+--Wij drinken op de gezondheid van den hertog, antwoordden Lamme
+en Uilenspiegel.
+
+De weerd vervolgde:
+
+--Waarmee vangt men ratten en muizen? Met vallen, niet waar? Wie
+is de muis? 't Is de groote Oranjeketter, die rood ziet als 't
+vuur van de hel. God is met ons. Zij komen weldra. He! He! laat
+ons drinken! Schenkt in; ik kook, ik brand. Laat ons drinken! Heel
+schoone gereformeerde predikantjes.... Ik herhaal predikantjes, dapper
+en sterk lijk eiken, onze kloeke soldaten.... Laat ons drinken! Gaat
+gij met hen mede naar 't kamp van den aartsketter? Reispassen heb ik,
+geteekend door hem.... Gij zult hen aan 't werk zien.
+
+--Wij gaan mee naar het kamp!
+
+Zij zullen er zich deugd doen, en 's nachts, als de gelegenheid
+gunstig is (en fluitend maakte de weerd het gebaar van een man, die
+een anderen keelt), zal Stalen Wind de meerle Nassau het schuifelen
+wel afleeren. Laat ons drinken, laat ons drinken!
+
+--Gij zijt een vroolijke kwant, al zijt gij getrouwd, antwoordde
+Uilenspiegel.
+
+De weerd sprak:
+
+--Dat ben ik of was ik nooit. Ik bewaar de geheimen der vorsten. Laat
+ons drinken!--Had ik eene vrouw, zij zou ze mij ontstelen op 't
+oorkussen, om mij te doen hangen, en weduwe zijn vóór de Natuur het
+beliefde. Bij God! Zij komen.... Waar zijn de nieuwe reispassen? Op
+mijn christelijk hert. Laat ons drinken! Dáár zijn ze, op driehonderd
+stappen van hier, op den weg, nabij Marche-les-Dames. Ziet gij ze? Laat
+ons drinken!
+
+--Drink, zeide Uilenspiegel, drink; ik drink op de gezondheid van
+den koning, van den hertog, van de predikanten, van Stalen Wind; op
+uwe gezondheid, op mijne gezondheid, op de gezondheid van den wijn
+en op de gezondheid van de bottels! Maar gij drinkt niet....
+
+En op elken heildronk vulde Uilenspiegel het glas en ledigde de weerd
+het tot den bodem.
+
+Uilenspiegel sloeg hem eene wijl gade; toen stond hij recht en
+sprak hij:
+
+--Hij slaapt, laat ons gaan, Lamme.
+
+En toen zij buiten waren, hernam hij:
+
+--Hij heeft geene vrouw, die ons zal verraden.... De nacht gaat
+vallen.... Hebt gij gehoord wat de schoft gezegd heeft, en weet gij
+wie de drie predikanten zijn?
+
+--Ja, sprak Lamme.
+
+--Gij weet, dat zij van Marche-les-Dames komen langs den oever der
+Maas, en dat wij wèl zullen doen, hen op den weg af te wachten,
+vóór Stalen Wind blaast.
+
+--Ja, zei Lamme.
+
+--Wij moeten het leven des prinsen redden, sprak Uilenspiegel.
+
+--Wij moeten, zei Lamme.
+
+--Hier is mijn bus, sprak Uilenspiegel, ga er mee in het kreupelhout
+tusschen de rotsen; laad ze met twee kogels en schiet als ge mij lijk
+de raaf hoort krassen.
+
+--Ik zal, zei Lamme.
+
+En hij verdween in het kreupelhout. En Uilenspiegel hoorde weldra
+het gekraak van het rad van de bus.
+
+--Ziet gij ze komen? vroeg hij.
+
+--Ik zie ze, antwoordde Lamme. Zij zijn gedrieën en gaan als soldaten,
+en een hunner is een kop grooter dan de anderen.
+
+Uilenspiegel zette zich neer op den weg, de beenen vooruit,
+paternosters te mompelen, lijk de bedelaars doen. En zijn hoedeken
+lag tusschen zijne knieën.
+
+Als de drie predikanten voorbijkwamen, stak hij hun zijn hoedeken
+toe. Maar zij legden er niemendal in.
+
+Uilenspiegel stond recht en zeide op erbarmelijken toon;
+
+--Goede heeren, weigert geen oortje aan een armen werkman, die
+laatst in eene steengroef gevallen is en zich de ribben brak. Ze
+zijn hardvochtig in deze streek en ze hebben mij niets gegeven,
+om mijn ellende te lenigen. Laas! geeft mij een oortje en ik zal
+voor u bidden. En God zal uwe bermhertigheid hier op de aarde met
+vreugde beloonen.
+
+--Mijn zoon, sprak een der predikanten, een sterke vent, voor ons geene
+vreugde op aarde, zoolang de Paus en de Inquisitie zullen heerschen.
+
+Uilenspiegel zuchtte als hij, en sprak:
+
+--Laas! wat zegt gij, mijne heeren? Spreekt stiller, als het u
+belieft. Maar geeft mij een oortje.
+
+--Mijn zoon, antwoordde een kleine predikant met een strijdlustige
+tronie, wij, arme martelaren, hebben maar juist oortjes genoeg om
+onderwege onze nooddruft te koopen.
+
+Uilenspiegel viel op de knieën.
+
+--Zegent mij dan ten minste, sprak hij.
+
+De drie predikanten strekten de hand uit over Uilenspiegels hoofd,
+maar zonder godsvertrouwen.
+
+Doch daar hij merkte dat zij mager waren, en toch dikke buiken hadden,
+richtte hij zich op en gebaarde te vallen. En met het voorhoofd tegen
+den buik van den grooten predikant botsend, hoorde hij daarin het
+vroolijk gerinkel van geldstukken.
+
+Toen sprong hij recht en, zijn kruismes trekkend, riep hij:
+
+--Goede vaders, het is koel, ik ben dun gekleed, en gij hebt te
+veel. Geeft mij van uwe wol, dat ik er mij een mantel van make. Ik
+ben Geus! Leve de Geus!
+
+De groote predikant antwoordde:
+
+--Geus, gij draagt uwen kam te hoog; wij zullen hem kappen.
+
+--Kappen! sprak Uilenspiegel; ik zeg u, dat Stalen Wind u, vóór den
+prins, zal omverblazen. Geus ben ik, leve de Geus!
+
+De drie onthutste predikanten spraken:
+
+--Hoe weet hij dat? Wij zijn verraden. Ter dood! Leve de misse!
+
+En van onder hunne hooze trokken zij goed aangezette kruismessen uit.
+
+Maar zonder hen af te wachten, week Uilenspiegel achteruit, langs
+het struikgewas, waarin Lamme verscholen zat.
+
+Als hij oordeelde, dat de predikanten binnen het bereik van het schot
+waren, riep hij:
+
+--Raven, zwarte raven, Looden Wind blaast! Ik zing uwen dood.
+
+En hij kraste.
+
+Een busschot kwam uit het struikgewas, smeet den grootsten predikant
+met zijn gezicht ter aarde. Een tweede schot velde den tweeden.
+
+En Uilenspiegel ontwaarde tusschen het struikgewas de goede tronie van
+Lamme, en zijn opgeheven arm, die haastiglijk de bus opnieuw laadde.
+
+Een blauwe rookwolk steeg op uit het donker struikgewas.
+
+De derde predikant viel, als in razernij, op Uilenspiegel aan,
+die zeide:
+
+--Stalen Wind of Looden Wind, ook gij verhuist naar de andere wereld!
+
+En hij greep hem aan en hij stond dapper te weer.
+
+Elkaar scherp in het oog houdend, stonden de beide vijanden pal op den
+weg, steken toebrengend en afwerend. Uilenspiegel was heel met bloed
+bedekt, want zijn tegenstander, behendig soldaat, had hem gekwetst
+aan hoofd en been. Maar hij vocht als een leeuw. Het bloed gutste
+uit zijn hoofd, en verblindde hem: toch weerde hij af, met groote
+achterweertsche passen. Met de linkerhand wischte hij zijn bloed af,
+maar zijne krachten verflauwden. Zeker ware hij gedood, hadde Lamme,
+met een derde schot, den predikant niet geveld.
+
+En een vloek stierf op zijne lippen, terwijl hij bloed en doods-schuim
+braakte.
+
+En opnieuw steeg een blauwe rookwolk uit het struikgewas, waartusschen
+Lamme weer zijne goede tronie zien liet.
+
+--Is 't gedaan? vroeg hij.
+
+--Ja, mijn vriend, antwoordde Uilenspiegel, maar kom....
+
+Als Lamme te voorschijn kwam, zag hij Uilenspiegel gansch met bloed
+bedekt.
+
+Ondanks zijnen buik, liep hij als een hert, en kwam bij Uilenspiegel,
+die nabij de gedoode mannen zat.
+
+--Hij is gekwetst, mijn goede vriend, sprak hij, gekwetst door dien
+vuigen moordenaar!
+
+En, met een schop, sloeg hij de tanden van een der predikanten stuk.
+
+--Gij antwoordt niet, Uilenspiegel, hernam hij; gaat gij sterven? Waar
+is de balsem? Ha, in de weitasch, onder de worsten.
+
+... Uilenspiegel, hoort gij mij niet? Laas, ik heb geen warm
+water om uwe wonden te wasschen, en er is geen middel om er
+te krijgen. Maar ik haal water uit de Samber. Spreek toch, mijn
+vriend. Gij zijt toch zóó erg niet gekwetst? Hier, een weinig koud
+water, niet waar? Ha, hij wordt wakker. Ik ben het, uw vriend; ze
+zijn allemaal dood. Linnen! linnen om zijne wonden te verbinden! Er
+is er geen. Ha! mijn hemd!
+
+Lamme kleedde zich uit en vervolgde:
+
+--Aan stukken, het hemd! Het bloed is gestelpt. Mijn vriend zal niet
+sterven.... 't Is koeltjes, zoo bloot in de vinnige lucht. Ik ga mij
+weer aankleeden. Hij zal niet sterven. Ik ben het, Uilenspiegel, ik, uw
+vriend Lamme. Hij glimlacht. Ik ga de moordenaars aftasten. Zij hebben
+guldens in hunnen buik. Ja, zij hebben gouden darmen: karolussen,
+daalders, lammeren, florijnen, oortjes en brieven! Wij zijn rijk! Meer
+dan driehonderd karolussen voor ons getweeën. Wij zullen de wapenen
+nemen en 't geld. Stalen Wind zal niet blazen voor den edelen prins!
+
+Uilenspiegel klappertandde door de koude, en stond op.
+
+--Daar zijt gij op de beenen! sprak Lamme.
+
+--Door de kracht van den balsem, antwoordde Uilenspiegel.
+
+--Balsem van dapperheid! zeide Lamme.
+
+Vervolgens sleepte hij de lijken van de predikanten een voor een
+voort, en smeet ze in een hol, tusschen de rotsen, met hunne wapenen
+en hunne kleederen, behalve den mantel.
+
+In de lucht fladderden de raven, krassend van ongeduldige vraatzucht.
+
+En de Samber vloeide als een stalen stroom, onder den grauwen hemel.
+
+En de sneeuw viel en wischte de bloedvlekken uit. Maar toch waren
+zij ongerust en bekommerd.
+
+Lamme sprak:
+
+--Ik dood liever een kieken dan een mensch.
+
+En zij stegen weder op hunne ezels.
+
+Aan de poorten van Hoei, bloedden de wonden nog altijd; de vrienden
+gebaarden daar twist te krijgen, stegen van hunne ezels en schermden
+met hunne kruismessen. Na het gevecht, dat zeer wreed in schijn was,
+stegen zij weder op hunne dieren en kwamen binnen de stede, nadat
+zij aan de poorten hunne reispassen hadden getoond.
+
+Toen de vrouwen Uilenspiegel gekwetst en Lamme zegevierend op zijn
+ezel zagen, keken zij met teeder medelijden naar Uilenspiegel en
+dreigden zij Lamme met de vuist, zeggende:
+
+--Dáár is de deugniet, die zijn vriend schier vermoordde.
+
+Lamme, ongerust, keek of hij onder haar zijn vrouwtje niet vond.
+
+Hij zocht te vergeefs, wat hem in een weemoedige stemming bracht.
+
+
+
+
+XXIII.
+
+--Waar gaan wij henen? vroeg Lamme.
+
+--Naar Maastricht, antwoordde Uilenspiegel.
+
+--Maar, mijn zoon, men zegt dat het leger des hertogen rond Maastricht
+samengebracht is en dat Alva zelf in die stede verblijft. Onze
+reispassen zullen niet voldoende zijn. En al hadden de Spaansche
+soldeniers er mede genoegen, wij zouden niettemin in de stad gehouden
+en ondervraagd worden. Ondertusschen zouden zij den moord van de
+predikanten vernemen en zouden wij aan het leven vaarwel mogen zeggen.
+
+Uilenspiegel antwoordde:
+
+--De raven, uilen en gieren zullen al het vleesch aftrekken, zoodat
+hun aangezicht onkennelijk zal geworden zijn. Wat onze passen betreft,
+die zouden wel goed zijn; maar als men den moord vernam, zouden wij
+gewis, zooals gij zegt, aangehouden worden. Daar wij te Maastricht
+wezen moeten, zullen wij over Landen trekken.
+
+--Ze zullen ons ophangen, zei Lamme.
+
+--We zullen er wel door geraken, antwoordde Uilenspiegel.
+
+Aldus koutend kwamen zij in de afspanning de Ekster, waar zij goed
+eten, goede slaping en hooi voor hunne ezelen vonden.
+
+'s Anderen daags begaven zij zich op weg naar Landen.
+
+Toen zij omtrent een groote hoeve, nabij de stad kwamen, floot
+Uilenspiegel als de Leeuwerik, en dadelijk antwoordde daarop, van
+binnen, een helder hanengekraai. Een cijnzenaar met een goedig gezicht
+verscheen op den drempel der hoeve. Hij riep hun toe:
+
+--Vrienden, leve de Geus! komt binnen.
+
+--Wie is dat? vroeg Lamme.
+
+Uilenspiegel antwoordde:
+
+--Thomas Utenhove, de dappere hervormde; de knechts en dienstmaagden
+zijner hoeve ijveren als hij voor het vrije geweten.
+
+Utenhove sprak toen:
+
+--Gij zijt zendelingen des prinsen. Eet en drinkt.
+
+En de hesp siste in de pan en de worsten insgelijks; en de wijn werd
+opgebracht en de glazen gevuld. En Lamme dronk als een tempelier en
+liet zich de spijzen goed smaken.
+
+De knechts en meiden van de hoeve kwamen beurtelings voor de
+halfgeopende deur kijken, om hem met de tanden te zien werken. En de
+mannen zeiden, begeerig, dat zij wel zooveel zouden eten als hij.
+
+Op het einde van den maaltijd, sprak Thomas Utenhove:
+
+--Honderd boeren zullen deze week van hier vertrekken; zij zeggen
+dat zij aan de dijken van Brugge en omstreken gaan werken. Zij reizen
+bij troepen van vijf of zes, en langs verschillende wegen. Te Brugge
+zullen zij schuiten vinden, die hen over zee naar Emden zullen brengen.
+
+--Hebben zij wapenen en geld? vroeg Uilenspiegel.
+
+--Elkeen heeft tien gulden en een hertsvanger, antwoordde Utenhove.
+
+--God en de prins zullen U loonen!
+
+--Ik behoef geene belooning; wat ik doe, doe ik uit overtuiging,
+zeide Utenhove.
+
+--Vriend gastheer, vroeg Lamme, die dikke zwarte pensen aan 't peuzelen
+was, hoe krijgt gij ze zoo geurig, zoo smakelijk en zoo fijn van vet?
+
+--Wij doen er kaneel en kattenkruid in, antwoordde de gastheer.
+
+Vervolgens vroeg hij aan Uilenspiegel:
+
+--Hoort Edzard, grave van Friesland, nog steeds tot den aanhang
+des prinsen?
+
+Uilenspiegel antwoordde:
+
+--Openlijk niet, maar toch verleent hij te Emden schuilplaats aan
+zijne vaartuigen.
+
+En hij voegde er bij:
+
+--Wij moeten naar Maastricht.
+
+--Dat zult gij niet kunnen, sprak de gastheer; het leger des hertogen
+is vóór de stad en in 't ronde.
+
+Vervolgens bracht hij hem naar den zolder; daar toonde hij hem van
+verre de vendels en kornetten ruiterij en voetvolk, die door het veld
+reden en marcheerden.
+
+Uilenspiegel sprak:
+
+--Ik geraak er wel door, zoo gij, die hier machtig zijt, mij de
+toelating geeft tot trouwen. De vrouw moet lieftallig, zachtaardig
+en schoon zijn en moet, zoo niet voor altijd, dan toch voor eene week
+met mij willen trouwen.
+
+Lamme zuchtte en sprak:
+
+--Doe dat niet, mijn vriend, zij zou u alleen laten, zonder kommer
+voor uw liefdevuur. Uw bed, waarop gij thans zoo vredevol slaapt, zal
+eene koets van netelen worden, waaruit de zoete nachtrust vlieden zal.
+
+--Ik trouw, antwoordde Uilenspiegel.
+
+En Lamme was diep bedroefd, omdat hij niets op de tafel meer vond. Maar
+hij ontdekte krakelingen in eene schaal, en hij speelde ze weemoedig
+binnen.
+
+Uilenspiegel zei tot Thomas Utenhove:
+
+--Nu, luister. Bezorg mij eene vrouw, rijk of arm. Ik ga met heur
+naar de kerk en doe het huwelijk inzegenen door den pastoor. Deze
+geeft ons een huwelijksbewijs, hoewel ongeldig, daar het komt van een
+aanhanger der Inquisitie; wij doen er in schrijven, dat wij goede
+kerstenen zijn, die gebiecht hebben en ten avondmaal gegaan zijn,
+dat wij apostolisch leven volgens de regelen Onzer Heilige Moeder de
+Roomsche Kerk,--die heure kinderen verbrandt,--om aldus over ons den
+zegen te roepen van Onzen Heiligen Vader den Paus, van de hemelsche
+en aardsche heirscharen, van de santen, santinnen, dekenen, pastoors,
+monniken, soldeniers, serjanten, hangmannen en andere diepers. Met
+dat kostbare bewijs op zak, maken wij de toebereidselen voor de
+gebruikelijke speelreis.
+
+--Maar de vrouw? vroeg Thomas Utenhove.
+
+Die zult gij mij zoeken, antwoordde Uilenspiegel. Ik neem dus twee
+speelwagens, die ik versier met sparre- en hulstetakken en papieren
+festoen. En ik laat er de mannen in stijgen, die gij den prins
+zenden wilt.
+
+--Maar de vrouw? vroeg Thomas Utenhove.
+
+--Die zal niet ver van hier zijn, antwoordde Uilenspiegel.
+
+En zijne rede vervolgend, sprak hij:
+
+--Voor den eersten wagen span ik twee uwer peerden, voor den tweeden
+onze beide ezelen. Den eersten wagen neem ik in met mijne vrouw,
+mijn vriend Lamme, de getuigen; de tweede wagen is bestemd voor de
+speellieden. Vervolgens trekken wij er op los, met wuivende vendels
+en onder 't geschal van tamboerijnen, pijpen, schalmeien; zingend,
+dansend en drinkend, rijden wij in vollen draf de groote baan op,
+die naar het galgeveld of naar de vrijheid leidt!
+
+--Ik wil u helpen, sprak Thomas Utenhove. Maar de vrouwlieden en
+dochteren zullen heure mannen en minnaren willen volgen.
+
+--Wij gaan mee op Gods genade, sprak een minzaam meideken, dat het
+hoofd binnenstak.
+
+--Als het noodig is, zei Thomas Utenhove, kunnen er vier wagens zijn;
+aldus zouden wij meer dan vijf en twintig man aan den prins kunnen
+sturen.
+
+--De hertog zal het kind van de rekening zijn, sprak Uilenspiegel.
+
+--En de vloot van den prins zal eenige dappere soldaten meer tellen,
+antwoordde Thomas Utenhove.
+
+Vervolgens deed hij het klokje luiden, om al zijne knechts en
+dienstmaagden samen te roepen.
+
+Toen allen vergaderd waren, sprak hij tot hen:
+
+--Gij allen, die Zeeuwen zijt, mannen als vrouwlieden, luistert:
+Uilenspiegel, de Vlaming, hier tegenwoordig, wil U in bruidsgewaad
+door het leger des hertogen brengen.
+
+De mannen en vrouwen van Zeeland riepen te gelijk:
+
+--Doodsgevaar! wij zijn er bij!
+
+En de mannen zeiden tot elkaar:
+
+--Voor ons is het een geluk, een land van dienstbaarheid te verlaten
+om de vrije zee te bevaren. Als God er vóór is, wie zal er tegen zijn?
+
+De vrouwlieden en meidekens spraken:
+
+--Wij volgen onze mannen en vrienden. Wij zijn uit Zeeland en zullen
+er schuilplaatse vinden.
+
+Uilenspiegel wendde zich tot een jong en liefelijk meideken uit den
+troep, en zei schertsend:
+
+--Met u wil ik trouwen.
+
+Doch blozend antwoordde zij:
+
+--Ik wil wel; doch alléén in de kerk.
+
+De vrouwen spraken lachend tot elkaar:
+
+--Heur hert trekt naar Hans, den zoon van den baas. Hij vertrekt
+zeker met heur.
+
+--Ja, antwoordde Hans.
+
+En de vader zei tot hem:
+
+--Gij moogt.
+
+De mannen trokken hunne beste kleederen aan: fluweelen wambuis en
+hooze, met het groot opperste kleed daarboven, en zetten breedgerande
+hoeden op 't hoofd, die hen tegen zon en regen zouden beschutten; ook
+de vrouwen kleedden zich in feestdos: gebekte zwarte onderbroeken,
+geplooide witte halskragen, hemelsblauwe en scharlakenroode
+borststukken met goudborduurselen, zwarte wollen rokken met breede
+fluweelen banden van dezelfde kleur, zwarte saaien kousen en fluweelen
+schoenen met zilveren gespen; op het voorhoofd hadden zij groote
+klatermeersen, die de meidekens links en de getrouwde vrouwlieden
+rechts droegen.
+
+Vervolgens ging Thomas Utenhove naar de kerk, den pastoor verzoeken
+Thijlbert, zoon van Klaas, in de wandeling Uilenspiegel geheeten,
+dadelijk te willen trouwen met Tanneken Pieters. En meteen stak hij
+den pastoor twee rijksdaalders in de hand: de parochiepaap stemde
+gereedelijk toe.
+
+Dienvolgens begaf Uilenspiegel zich naar de kerk met heel de bruiloft,
+en daar trouwde hij, vóór den pastoor, met Tanneken, die zoo schoon
+en zoo lief, zoo knap en zoo poezel was, dat hij zich moest inhouden
+om niet in heure kaken te bijten, die op twee kriekappeltjes geleken.
+
+En hij zeide heur dat hij het maar liet, uit eerbied voor heur lief
+en zacht gezichtje. Maar schalksch zei ze:
+
+--Wees toch stil, zie eens hoe Hans u beziet; hij zou u vermoorden!
+
+En een meideken, dat jaloersch was, zei:
+
+Zoek elders, Uilenspiegel, ziet gij niet dat zij bang is voor heuren
+minnaar?
+
+Lamme wreef in zijne handen en riep:
+
+--Ge zult ze toch allen niet hebben!
+
+En hij was in zijn schik.
+
+Uilenspiegel droeg geduldig zijn lot en keerde met de bruiloft terug
+naar de hoeve. Daar dronk men en zong men en deed hij bescheid met
+het jaloersche meideken. Hans was er gansch in zijn schik om, maar
+Tanneken niet, en de bruidegom van 't meideken evenmin.
+
+Rond den middag, bij helderen zonneschijn en terwijl een frisch
+windeken woei, reden de wagens voort; ze waren gansch versierd met
+bloemen en loover, en met wapperende vendels. En ze vertrokken onder
+'t blijde geschal van pijpen, schalmeien, tamboerijnen en doedelzakken.
+
+In 't kamp van Alva was 't een andere kermis. De posten en
+schildwachten bliezen alarm en kwamen achtereenvolgens terug naar
+het kamp, zeggende:
+
+--De vijand nadert; wij hebben 't gerucht van pijpen en schalmeien
+gehoord, en vendels gezien. 't Is een sterke afdeeling ruiterij die
+ons zeker in een hinderlaag wil lokken. Het legerkorps is ongetwijfeld
+in aantocht.
+
+Dadelijk deed de hertog de kampmeesters, kolonels en hoplieden
+verwittigen, het leger in slagorde stellen en den vijand verkennen.
+
+Plotseling verschenen vier wagens, die op de busschutters toereden. In
+de wagens waren de mannen en vrouwen aan 't dansen, bij 't blijde
+gerinkel van bottels en glazen en 't luidruchtig geschal van pijpen,
+schalmeien, trommelen en doedelzakken.
+
+De bruiloft hield halt, en de hertog van Alva kwam zelf toegeloopen
+op het gerucht en zag de jonge bruid op een van de wagens en, naast
+heur, Uilenspiegel, heuren bruidegom, met zijn hoed vol bloemen; en
+al de boeren en boerinnen waren van de wagens gesprongen en dansten
+rond het jonge paar, en noodden de soldaten tot drinken.
+
+Alva en de zijnen waren grootendeels verwonderd over den eenvoud
+dier buitenlieden, die zongen en dansten, te midden van een leger,
+dat in slagorde stond.
+
+En allen, die in de wagens zaten, schonken wijn aan de Spaansche
+soldaten.
+
+En de Maranen zwaaiden met de hoeden en juichten hen toe.
+
+Als de wijn op was, reden de boeren en boerinnen voort, onder 't
+geschal van tamboerijnen, pijpen en doedelzakken. Niemand deed hun
+de minste moeilijkheid aan.
+
+Integendeel, de soldaten schoten een salvo met hunne bussen.
+
+En zoo kwamen zij in Maastricht, waar Uilenspiegel zich verstond
+met de hervormden om, door middel van schepen, een grooten voorraad
+wapenen en munitie naar de vloot van den Zwijger te zenden.
+
+Ook te Landen deden zij hetzelfde.
+
+En, als daglooners gekleed, geraakten zij overal door.
+
+De list kwam den hertog ter oore; en er werd een liedje op gemaakt,
+dat hem gezonden werd, met dit refrein:
+
+
+    Bloed-hertog, dwaas-hertog,
+    Hebt ge de bruid gezien?
+
+
+En telkens dat hij een verkeerde beweging gemaakt had, zongen de
+soldaten:
+
+
+    De hertog krijgt schele oogen,
+    Hij heeft de bruid gezien.
+
+
+
+
+XXIV.
+
+Afgunst verteerde koning Philippus. In zijn hoogmoed bad hij jammerend
+God, dat hij hem de macht zou geven Engeland te overwinnen, Frankrijk
+te veroveren, Milaan, Genua en Venetië in te nemen en, meester der
+zeeën, heel Europa te gebieden.
+
+Hij dacht aan die zegepraal, maar hij lachte niet.
+
+Gedurig was hij huiverig; de wijn verwarmde hem niet, noch het
+vuur van het welriekend hout, dat altijd brandde in de zaal waar
+hij verbleef. Daar zat hij te midden van zoovele brieven, dat men
+er wel honderd tonnen mede had kunnen vullen; hij dacht aan de
+alleen-heerschappij over gansch de aarde, zooals die uitgeoefend
+werd door de Roomsche keizers, en aan den naijver en den haat die
+hij zijnen zoon don Carlos toedroeg, sedert deze de plaats van den
+hertog van Alva in de Nederlanden had willen innemen. En als hij hem
+zag, mismaakt, zot en boosaardig, kwam er een nog grootere haat over
+hem. Maar niemand sprak hij er over.
+
+Zij, die den koning en zijnen zoon dienden, wisten niet wien zij
+'t meest moesten vreezen, óf den moordzieken kroonprins, die zijn
+dienaren in 't gezicht krabde, òf den gluiperigen koning, die zich
+van anderen bediende als hij iemand wilde treffen, en die als eene
+hyena leefde van lijken.
+
+De dienaren waren verschrikt als ze den een achter den anderen zagen
+sluipen, en zeiden, dat men, in 't Escuriaal, weldra van dooden
+zou hooren.
+
+Weldra vernamen zij, dat don Carlos gevangen gezet was, wegens
+hoogverraad. En zij wisten dat verdriet hem verteerde; dat hij door
+de staven van zijn kerker had willen kruipen om te vluchten, en zich
+aldus het aangezicht had gekwetst.
+
+Ook wist men, dat mevrouwe Isabella van Frankrijk, zijne moeder,
+gedurig weende.
+
+Maar koning Philippus weende niet.
+
+Ze kregen mare, dat men don Carlos versche vijgen gegeven had, en dat
+hij 's anderen daags zoo zacht gestorven was alsof hij ingesluimerd
+was.
+
+De dokters zeiden: Zoodra hij de vijgen gegeten had, hield zijn hert
+op met kloppen en werden de natuurlijke levensverrichtingen afgebroken;
+zijn buik zwol op en zoo gaf hij den geest.
+
+Koning Philippus woonde de uitvaart van don Carlos bij, deed hem
+begraven in de kapel zijner koninklijke verblijfplaats en eenen steen
+op zijn graf leggen, maar hij weende niet.
+
+En spottend met het vorstelijk grafschrift, dat in dien steen was
+gebeiteld, zeiden de dienaren tot elkander:
+
+
+    HIER LIGT BEGRAVEN DEGENE DIE VERSCHE
+    VIJGEN AT EN STIERF ZONDER ZIEK TE ZIJN.
+
+    A qui jace qui en para desit verdad,
+    Morio s'in infirmidad.
+
+
+En koning Philippus bezag met ontuchtige blikken de prinses van
+Eboli, die getrouwd was. Door drift verteerd, smeekte hij heur en
+zij weerstond niet....
+
+Mevrouwe Isabella van Frankrijk, die, naar men zeide, don Carlos'
+inzichten op de Nederlanden begunstigd had, werd droef en mager. Heur
+haar viel uit, met dikke lokken te gelijk. En dikwerf braakte zij,
+en de nagelen heurer teenen en vingeren vielen uit. En zij stierf.
+
+En koning Philippus weende niet.
+
+Het haar van den prins van Eboli viel insgelijks uit. Hij werd droef
+en klaagde gedurig. Dan vielen ook zijne nagelen van teenen en vingeren
+uit. En hij stierf.
+
+En de koning deed hem begraven.
+
+En hij betaalde den rouw der weduwe, en weende niet.
+
+
+
+
+XXV.
+
+In dien tijd kwamen eenige vrouwlieden en meidekens van Damme vragen
+aan Nele of zij meibruid wilde zijn en zich wilde verbergen in het
+struikgewas, met den bruidegom dien men voor haar vinden zou; want,
+zeiden de vrouwen, niet zonder afgunst, geen jongeling van Damme en
+'t ronde zou u versmaden; allen zouden willen trouwen met u, die
+zoo schoon en zoo braaf, zoo jong en zoo frisch blijft: gave van
+toovernij, gewis.
+
+Nele antwoordde:
+
+--Zegt tot de jongelieden, die mij tot huisvrouw zouden begeeren,
+dat Nele's hert niet hier is, maar verre, bij hem die ronddoolt om den
+grond der vaderen te verlossen. En zoo ik frisch blijf, lijk gij zegt,
+is dit geene gave van tooverij, maar van gezondheid.
+
+De vrouwen antwoordden:
+
+--Katelijne nochtans wordt verdacht.
+
+--Hecht geen geloof aan de woorden der boozen, antwoordde
+Nele. Katelijne is geene tooveres. De heeren der vierschaar hebben werk
+op heur hoofd verbrand, en God heeft heur met uitzinnigheid geslagen.
+
+En Katelijne, die in een hoek op de hurken zat, schuddebolde en sprak:
+
+--Doe het vuur uit, hij zal terugkomen, Hansken, mijn liefste.
+
+De vrouwen vroegen wie het Hansken was, waarvan Katelijne sprak.
+
+Nele antwoordde:
+
+--De zoon van Klaas, mijn zoogbroeder, dien zij waant verloren te
+hebben, sedert God heur zoo wreedelijk trof.
+
+En de goede vrouwlieden gaven zilveren oortjes aan Katelijne.
+
+En de nieuwe geldstukken die er bij waren, toonde zij eenen, dien
+niemand zag, zeggende:
+
+--Ik ben rijk, ik heb blinkend geld. Kom, Hansken, mijn liefste;
+ik zal uwe koozerijen betalen.
+
+En als de vrouwen henen waren, weende Nele in de eenzame hut. En ze
+dacht aan Uilenspiegel, die in verre landen doolde en dien ze niet
+volgen mocht, en ook aan Katelijne, die steende:--Doe het vuur uit! en
+de beide handen op heure borst drukte, om te bedieden, dat het vuur
+der uitzinnigheid brandde in heur hoofd en heur lijf.
+
+En intusschen verborgen meibruid en meibruidegom zich in het hooge
+gras.
+
+De jongen, die de meibruid vond, was de koning van 't feest; was het
+integendeel een meisje dat den bruidegom vond, dan was zij de koningin
+van het meifeest.
+
+Nele hoorde van verre de vreugdekreten van knapen en meidekens, toen de
+meibruid aan den boord eener gracht, in het hooge gras, werd gevonden.
+
+En zij weende als zij dacht aan den zoeten tijd, toen men heur en
+heuren vriend Uilenspiegel zocht.
+
+
+
+
+XXVI.
+
+En Uilenspiegel en Lamme, schrijlings op hunne ezels gezeten,
+vervolgden hunnen weg.
+
+--Nu, Lamme, luister goed, sprak Uilenspiegel, de Nederlandsche edelen,
+naijverig op den prins van Oranje, verrieden de zaak der eedgenooten,
+het heilig verbond, het kloekmoedig eedverbond, dat geteekend was
+voor het welzijn van den grond onzer vaderen. Egmond en Hoorne waren
+ontrouw, doch zij vonden er niet het minste voordeel bij, integendeel;
+Brederode is dood; in dezen oorlog blijven ons niets anders over dan
+het arme volk van Brabant en Vlaanderen, dat op eerlijke hoofdmannen
+wacht om op te rukken; en vervolgens, mijn jongen, de eilanden van
+Zeeland en Noord-Holland, waarvan de prins stadhouder is; en verder
+nog, op zee, Edzard, graaf van Emden en van Oost-Friesland.
+
+--Laas! sprak Lamme, ik word het wel gewaar: wij dwalen rond tusschen
+rad, galg en brandstapel, stervend van honger, stikkend van dorst,
+zonder hoop ergens ruste te vinden.
+
+--'t Is maar een begin, antwoordde Uilenspiegel. Ge moet toch bekennen,
+dat ons bestaan heel vroolijk is: wij dooden onze vijanden; wij
+spotten met hen, hebben onze tasschen vol florijnen en daalders; wij
+zijn goed gevoed met vleesch, met brood en met wijn. Wat wilt gij nog
+meer, pluimzak? Willen wij onze ezels verkoopen om peerden te koopen?
+
+--Thijl, zeide Lamme, de draf van een peerd is tamelijk hard voor
+een man, zoo vollijvig als ik.
+
+--Gij kunt u te peerd zetten lijk de boeren, antwoordde Uilenspiegel,
+en niemand zal u uitlachen, mits gij gekleed zijt als een boer en
+geen zweerd draagt lijk ik, doch enkel eenen verkensspriet.
+
+--Maar, vroeg Lamme, zijt gij wel zeker, dat onze passen kunnen dienen
+in de kleine steden?
+
+--Heb ik geen bewijs van den parochiepaap, sprak Uilenspiegel, met
+een groot lakzegel van de kerk, dat er aanhangt met twee perkamenten
+steerten; hebben wij ook onze biechtbriefkens niet? De huurlingen en
+serjanten des hertogen vermogen niets tegen twee mannen, van zulke
+goede papieren voorzien.
+
+Lamme antwoordde niet.
+
+--En de zwarte paternosters die wij verkoopen? vervolgde
+Uilenspiegel. Wij beiden zijn ruiters, gij Vlaming, ik Duitscher,
+wij reizen op uitdrukkelijk bevel van den hertog, om de ketters
+dezer landen tot het heilig katholiek geloove terug te brengen,
+door het verkoopen van gewijde voorwerpen. Aldus zullen wij overal
+binnendringen, bij de groote heeren en in de rijke abdijen. En daar
+zullen wij rijkelijk onthaald worden. En wij zullen hunne geheimen
+ontstelen. Verblijd u van te voren, mijn zachtaardige vriend.
+
+--Jongen, sprak Lamme, wat wij doen is werk van spionnen.
+
+--Krachtens recht en oorlogswet, antwoordde Uilenspiegel.
+
+--Als zij de zaak der drie predikanten vernemen, worden wij
+geradbraakt, zei Lamme.
+
+Uilenspiegel zong:
+
+
+    Leven steekt op mijn Vaandel uit,
+    Leven in 't licht der rede.
+    Lederen is mijn eerste huid,
+    Stalen is mijn tweede.
+
+
+Doch Lamme zuchtte:
+
+--Ik, ik heb maar één vel, en het is zeer zacht; bij den minsten
+daggeslag zou het seffens open liggen. Wij zouden beter doen ons
+aan een of ander nuttig ambacht over te leveren, dan aldus van het
+een oord naar 't ander te dolen, om al die groote prinsen te dienen,
+die, met de voeten in fluweelen muilen, rustig, aan vergulde tafelen,
+ortolanen eten. Voor ons de slagen, de gevaren, het gevecht, de regen,
+de hagel, de sneeuwstormen en de magere soep van de zwervers; voor
+hen, de heerlijke worsten, de vette kapoenen, de geurige lijsters,
+de smakelijke ganzen.
+
+--Het water komt in uwen mond, mijn zachtaardige vriend, sprak
+Uilenspiegel.
+
+--Waar zijt gij, nieuwbakken brood, geurige koekebakken, heerlijke
+rijstpap? En gij, waar zijt gij, mijn vrouwtje?
+
+Uilenspiegel antwoordde:
+
+--De assche van Klaas klopt op mijn hert en drijft mij ten
+strijde. Maar gij, zachtmoedige Lamme, die den dood van uwen vader
+noch uwe moeder moet wreken, noch het verdriet van hen die gij bemint,
+nog uw huidige armoede, laat mij alleen gaan, daar waar de plicht
+mij roept, zoo de vermoeienissen des oorlogs u afschrikken.
+
+--Alleen? sprak Lamme.
+
+En hij hield zijn ezel in, die dezen stilstand ten nutte maakte om
+zich deugd te doen aan de distelen, waarmede de weg vol stond, zoo
+ver het oog reikte. Uilenspiegel's grauwtje bleef insgelijks staan
+en nam deel aan 't ezelsfestijn.
+
+--Alleen? sprak Lamme. Dát zult gij niet doen; mij alleen laten
+ware een groote wreedheid. Alreeds mijne vrouw kwijt, en vervolgens
+mijn vriend, dat ware te veel. Ik zal nooit meer klagen, ik beloof
+het u. En, als het nu toch moet zijn,--en hij hief kloekmoedig het
+hoofd op,--zal ik gaan onder den kogelregen, ja! En in 't midden
+der zweerden, ja! vlak in 't gezicht van die leelijke huurlingen,
+die bloed zuipen lijk wolven. En mocht ik eens doodelijk getroffen
+aan uwe voeten neervallen, begraaf mij dan, mijn vriend Uilenspiegel,
+en ziet gij later mijne vrouw weer, zeg heur dat ik gestorven ben,
+omdat ik niet leven kon zonder door iemand bemind te wezen.... Neen,
+dat zou ik niet kunnen, mijn vriend.
+
+En Lamme weende, en Uilenspiegel voelde een krop in de keel.
+
+
+
+
+XXVII.
+
+In dien tijd verdeelde de hertog zijn leger in twee afdeelingen:
+het eerste korps zond hij naar het hertogdom Luxemburg, het ander
+naar het markgraafschap Namen.
+
+--Dat is eene krijgsbeweging waarvan ik de reden niet gis, sprak
+Uilenspiegel, maar 't is mij eender, laat ons vol vertrouwen naar
+Maastricht gaan.
+
+Toen zij omtrent de stede langsheen de Maas reden, zag Lamme dat
+Uilenspiegel aandachtig al de booten bezag, die op den stroom vaarden,
+en dat hij eindelijk bleef staan voor eene, met een gebeeldhouwde
+meermin op den achtersteven. En die meermin hield een schild vast,
+waarop, met gouden letteren op een zwart veld, het teeken I-H-S stond,
+het teeken dat Onzen Heer Jezus-Christus bediedt.
+
+Uilenspiegel deed teeken tot Lamme om stil te staan, en hij begon
+blijgemoed te fluiten als de leeuwerik.
+
+Op de boot kwam een man voor, die kraaide als een haan, vervolgens,
+toen Uilenspiegel balkte als een ezel en naar het volk wees dat
+op de kaai bijeengehoopt stond, insgelijks verschrikkelijk begon
+te balken. Op dat geluid spitsten de beide ezelen van Lamme en
+Uilenspiegel de ooren en vergezelden zij 't refrein in hunne
+moedertaal.
+
+Vrouwlieden trokken voorbij en ook mannen die met jaagpeerden opgingen,
+en Uilenspiegel zei tot Lamme.
+
+--Die schipper spot met ons en met onze ezelen. Als wij hem eens eene
+rammeling gaven op zijne boot? Wat dunkt u er van?
+
+--Dat hij liever hier kome, zoo hij durft, antwoordde Lamme.
+
+Toen sprak eene vrouw:
+
+--Als gij niet wilt voortgaan met uwe armen af, uwe ribben gebroken,
+uwen snoet aan stukken, laat Sterke Pier dan maar balken zooveel het
+hem lust.
+
+--Hi han! hi han! hi han! balkte de schipper.
+
+--Laat hem maar roepen, zei de vrouw, verleden week zagen wij hem
+eene kar, beladen met zware tonnen bier, op de schouderen nemen,
+en een andere kar inhouden, waarvoor een sterk Vlaamsch peerd was
+gespannen. Dáár, sprak zij, naar eene afspanning wijzend, daar in
+den Blauwen Toren, smeet hij, op twintig stappen afstand, zijn mes
+door een eiken berd van twaalf duim dik.
+
+--Hi han! hi han! ging de schipper voort, terwijl een jongetje
+van twaalf jaar op het dek van het schip klom en insgelijks begon
+te balken.
+
+Uilenspiegel antwoordde:
+
+--Uw Sterke Pier kan ons weinig schelen! Hij mag zoo sterk zijn als
+hij wil, wij zijn sterker dan hij, en mijn vriend Lamme hier, zou er
+twee van zijne dikte binnenspelen, zonder hikken of blazen.
+
+--Wat zegt gij, mijn jongen? vroeg Lamme.
+
+--De waarheid, antwoordde Uilenspiegel, gij moet niet loochenen
+uit zedigheid.
+
+En tot de vergaderde menigte vervolgde hij:
+
+--Ja, goede mannen, vrouwen en arbeiders, straks zult gij hem zien
+te werk gaan met de vuisten en dien fameuzen Sterken Pier met zijnen
+neus in het stof duwen.
+
+--Zwijg toch, zei Lamme.
+
+--Uwe kracht is gekend, antwoordde Uilenspiegel, gij moet niet
+loochenen.
+
+--Hi han! riep de schipper.
+
+--Hi han! kefte het jongetje.
+
+Plotseling floot Uilenspiegel opnieuw, welluidend als een kweelende
+leeuwerik.
+
+En de verrukte mannen, vrouwen en arbeiders vroegen hem waar hij dat
+goddelijk vogelgezang had geleerd.
+
+--In het hemelrijk, van waar ik kom, antwoordde Uilenspiegel.
+
+Vervolgens sprak hij tot den schipper, die niet ophield met balken
+en spottend met de vingeren naar hem te wijzen:
+
+--Waarom blijft gij daar op uwe boot, nietdeug? Durft gij aan wal
+komen om met ons en onze ezels te spotten?
+
+--Ja, durft gij? vroeg Lamme.
+
+--Hi han! hi han! hi han! ging de schipper maar voort. Heeren
+langooren, ik noodig u op mijne boot.
+
+--Doe maar altijd lijk ik, zei Uilenspiegel stille tot Lamme. En den
+schipper riep hij toe:
+
+--Zijt gij Sterke Pier, ik, ik ben Thijl Uilenspiegel. En onze
+ezelen, Jef en Jan, kunnen beter balken dan gij, want balken is hunne
+moedertaal. Maar op uwe slecht gevoegde berden komen, daarvoor zullen
+wij ons wachten. Uwe boot lijkt niet slecht op eene kuip; als een
+golfslag haar voortstoot, wijkt zij weer achteruit, en zij kan maar
+vooruit lijk de krabben, zijwaarts.
+
+--Ja, lijk de krabben! riep Lamme achterna.
+
+Toen sprak de schipper tot Lamme:
+
+--Wat mompelt gij daar onverstaanbaar tusschen uwe tanden, spekblok?
+
+Lamme, die kwaad werd, riep:
+
+--Slechte christen, die mij mijn gebrek verwijt, weet dat mijn vet
+mijn eigendom is en van voedzame spijzen voortkomt, terwijl gij,
+oude, roestige nagel, van niets anders leeft dan van uitgemergelde
+haringen, van keerswieken, van stokvischvellen, te oordeelen naar uw
+magere beenen, die door uw gescheurde hooze steken.
+
+--Die gaan malkander in 't haar vliegen, zeiden de omstanders, vol
+ongeduldig genoegen.
+
+--Hi han! hi han! riep de schipper.
+
+Lamme wilde van zijnen ezel stijgen, om steenen op te rapen en naar
+den schipper te werpen.
+
+--Met geen steenen smijten, zeide Uilenspiegel.
+
+De schipper zeide iets in 't oor van het jongetje, dat naast hem op
+de boot aan 't hihannen was.
+
+Het knaapje maakte een schuitje los, dat aan de boot vastgemeerd
+was en bereikte den oever, door middel van eenen haak, dien hij zeer
+behendig hanteerde.
+
+Toen hij dicht bij den wal was, riep hij, fier met het hoofd omhoog:
+
+--De komplimenten van mijnen baas en hij vraagt of gij op zijne boot
+durft komen om tegen hem te vechten met vuisten en voeten. Die mannen
+en vrouwlieden zullen getuigen zijn.
+
+--Zeker, durven wij, zeide Uilenspiegel op waardige wijze.
+
+--Wij nemen het gevecht aan, zeide op zijne beurt Lamme, op
+hoogmoedigen toon.
+
+Het was om den middag; de handwerkslieden, dijkwerkers, kasseiers,
+scheepmakers, de vrouwen met het middageten van heure mannen, de
+kinderen die op hunne vaders stonden te zien, dewelke boonen aten met
+gekookt vleesch, allen lachten, klapten in de handen bij de gedachte
+aan een nakend gevecht en hoopten, met onverholen blijdschap, dat een
+der strijders zijn kop zou ingeslagen worden, of deerlijk gehavend
+in de vaart zou vliegen, tot groot genoegen van elkeen.
+
+--Mijn jongen, zei Lamme, die minder strijdlustig werd, hij gaat ons in
+'t water smijten.
+
+--Wel, laat er u in smijten, sprak Uilenspiegel.
+
+--De dikzak wordt benauwd, zei de menigte werklieden en vrouwen
+en kinderen.
+
+Lamme, altijd op zijnen ezel gezeten, keerde zich naar hen toe en
+bekeek ze grammoedig, maar zij jouwden hem uit.
+
+--Laat ons op de boot gaan, zei Lamme tot Uilenspiegel, zij zullen
+eens zien of ik benauwd ben!
+
+Op die woorden werd hij opnieuw uitgejouwd en Uilenspiegel sprak:
+
+--Laat ons op de boot gaan.
+
+Toen zij van hunne ezels gestegen waren, wierpen zij de teugels naar
+het jongetje, hetwelk de grauwtjes vriendelijk streelde en naar eene
+plaats leidde, waar distelen groeiden.
+
+Vervolgens nam Uilenspiegel een riem, deed Lamme in het schuitje plaats
+nemen, wrikte naar de boot, en klom er op door middel eener koord.
+
+Lamme, zweetend en blazend, volgde hem en klaverde achter hem op
+de boot.
+
+Toen Uilenspiegel op het dek van de bark stond, boog hij zich voorover,
+alsof hij zijne schoenen wilde toerijgen, en zeide hij eenige woorden
+tot den schipper, die glimlachte en pinkoogde, terwijl hij naar
+Lamme keek.
+
+Vervolgens zond hij hem allerlei scheldwoorden naar het hoofd, hiet
+hem deugniet, galgenaas, gevangenisgebroed, papeter, vetbol, en zei:
+
+--Dikke walvisch, hoeveel tonnen traan levert gij wel, als men u
+eenen steek in den buik geeft?
+
+Lamme antwoordde niet, doch vloog eensklaps naar hem als een razende
+stier, wierp hem ten gronde en sloeg op hem uit al zijne macht, doch
+hij deed hem niet veel zeer, omdat er niet veel kracht in zijne vette
+armen stak.
+
+De schipper gebaarde dat hij zich verweerde, doch liet hem begaan en
+Uilenspiegel zei op snoevenden toon:
+
+--Die nietdeug kan maar zien, dat hij ons te drinken betaalt.
+
+De mannen, vrouwlieden, arbeiders, die van den oever het gevecht
+nagingen, zeiden:
+
+--Wie had gedacht dat die dikzak zooveel kracht had?
+
+En zij klapten in de handen, terwijl Lamme sloeg gelijk de duivel op
+Geeraard. Maar de schipper nam geen andere voorzorg dan zijn aangezicht
+te beschutten.
+
+Eensklaps zag men Lamme, met zijne knie op de borst van Sterken Pier,
+met eene hand hem bij de keel houdend en met de andere omhoog, gereed
+om te slaan.
+
+--Vraag om genade, schreeuwde hij razend, of ik stoot u dwars door
+de berden uwer modderschuit.
+
+De schipper kuchte, om te bedieden, dat hij niet kon spreken, en deed
+teeken met de hand dat hij om genade vroeg.
+
+Lamme hielp grootmoedig zijnen vijand opstaan en, met den rug naar
+de toeschouwers, stak hij zijne tong uit naar Uilenspiegel, die in
+een schaterlach uitberstte, toen hij Lamme, met het hoofd omhoog,
+triomfantelijk met groote stappen op de boot zag over en weer loopen.
+
+En de mannen, vrouwlieden, knapen en meidekens, die op den oever
+stonden, juichten toe om het meest en riepen:
+
+--Leve de overwinnaar van Sterken Pier! 't Is een ijzeren man!
+
+En tot elkander zeiden zij:
+
+--Hebt gij hem zien slaan met de vuist? Ja, en met een stoot met het
+hoofd smeet hij den andere ten gronde. Nu gaan zij drinken om pais
+te maken. Sterke Pier komt boven met wijn en met worsten.
+
+Inderdaad, Sterke Pier was twee kroezen en een groote pint witten
+wijn van de Maas gaan halen. En Lamme en hij gaven elkander de hand
+tot teeken van vrede.
+
+En Lamme, die als in den hemel was, ter wille van zijne zegepraal en
+ook om den wijn en de worsten, vroeg hem, wijzend naar een groote
+schouw waaruit een zwarte, dikke rook opsteeg, wat voor stoverije
+hij maakte in het ruim.
+
+--'t Is oorlogskeuken, antwoordde Sterke Pier met een glimlach.
+
+De menigte werklieden, vrouwen en kinderen was uiteengegaan om
+zich naar den arbeid of naar huis te begeven, en van mond tot mond
+verspreidde zich het gerucht dat een dik man, op eenen ezel gezeten
+en vergezeld van een kleinen pelgrim, sterker dan Samson was en dat
+men zich wachten moest hem scheef te bezien.
+
+Lamme at en dronk, en bezag zegevierend den schipper.
+
+Deze zeide eensklaps:
+
+--Uwe ezelen vervelen zich ginder.
+
+Daarop bracht hij de boot tegen de kaai, ging aan wal, nam een der
+ezelen bij de voorpooten en de achterpooten en, het dier dragende
+gelijk het kindeken Jezus het lammeken droeg, zette hij het neer op
+het dek van de boot.
+
+Vervolgens deed hij, zonder hijgen, hetzelfde met den anderen ezel,
+waarna hij zeide:
+
+--Laat ons drinken!
+
+Het jongetje sprong op het dek.
+
+En zij dronken.
+
+Lamme stond verstomd; hij wist niet goed of hij het wel was, geboortig
+uit Damme, welke dien sterken, gespierden man afgerost had, en dorst
+hem nog slechts ter sluips bezien en zonder den minsten hoogmoed,
+want hij vreesde dat de schipper lust kreeg hem op te pakken gelijk
+hij de ezelen opgenomen had, en hem levend in de Maas te smijten,
+uit weerwraak.
+
+Maar glimlachend noodde de schipper hem nogmaals tot drinken, en Lamme
+herstelde zich van zijne vrees en bezag hem opnieuw met zegevierend
+zelfvertrouwen.
+
+En de schipper en Uilenspiegel bekeken elkander en schoten in een
+luiden schaterlach.
+
+Intusschen hadden de ezelen, verwonderd zich op een plankenvloer
+te gevoelen (iets aan hetwelk zij geenszins gewend waren) den kop
+gebogen en de ooren gestreken; zij dorsten niet drinken van schrik.
+
+De schipper ging een van de maatjes haver halen, welke hij gaf aan
+de peerden die zijne boot voorttrokken, want hij kocht zijne haver
+zelf, om door de voerlieden niet bestolen te worden op den prijs van
+het voeder.
+
+Toen de ezelen het maatje haver zagen, prevelden zij binnensmonds
+paternosters van vraatzucht, terwijl zij weemoedig den vloer van de
+boot bekeken, want uit vreeze van uit te glijden, dorsten zij geen
+stap verzetten.
+
+Daarop zei de schipper tot Uilenspiegel en tot zijnen vriend Lamme
+Goedzak:
+
+--Laat ons naar de keuken gaan.
+
+--'t Is oorlogskeuken, zei Lamme ongerust.
+
+--Ja, 't is oorlogskeuken, maar zonder vrees moogt gij beneden komen,
+mijn overwinnaar.
+
+--Ik ben niet bevreesd, sprak Lamme, en ten blijke daarvan zal ik
+u volgen.
+
+Het jongetje ging naar het roer.
+
+Toen zij beneden kwamen, zagen zij overal zakken graan, boonen,
+erwten, kool, wortelen en andere groenten.
+
+De schipper opende de deur eener smidse en zei:
+
+--Vermits gij mannen zijt met kloekmoedig hert, die het gezang kent
+van den leeuwerik, die het zinnebeeld der vrijheid is, en het dappere
+gekraai van den haan, en 't gebalk van den ezel, dien zachtmoedigen
+werker, wil ik u mijne oorlogskeuken toonen. Deze kleine smidse vindt
+men in de meeste booten, die op de Maas varen. Ze kan niet verdacht
+voorkomen, want zij dient om het ijzerwerk aan boord te herstellen;
+doch alle schepen hebben den schoonen voorraad niet, die steekt in
+deze kasten.
+
+Toen schoof hij eenige steenen weg, die het onderste scheepsruim
+bedekten; hij hief eenige planken op en haalde er een dikken bundel
+geweerloopen uit, stak dien omhoog als een pluimken en legde hem toen
+weder op zijne plaats.
+
+Vervolgens toonde hij hun lanspunten, hellebaardijzers, zweerdklingen,
+zakjes kogels en kruit.
+
+--Leve de geus! sprak hij, hier zijn de boonen en de saus; de kolven
+zijn de bouten, de hellebaardijzers zijn de salade, en die geweerloopen
+de osseschinkels voor de vrijheidssoep!
+
+... Leve de Geus! Waar moet ik al die spijzen brengen? vroeg hij
+aan Uilenspiegel.
+
+Deze antwoordde:
+
+--Naar Nijmegen, waar gij zult binnenvaren met uwe boot nog zwaarder
+beladen met echte groenten, die de boeren u brengen te Elsen,
+te Stevensweert en te Roermond. En die ook zullen zingen lijk de
+leeuwerik, zinnebeeld der vrije mannen, en gij zult ook antwoorden met
+een dapper hanengekraai. Gij zult bij dokter Pontus gaan, die omtrent
+de Nieuwe Waal woont, hem zeggen, dat gij in de stad komt met groenten,
+doch dat gij droogte vreest. Terwijl de boeren met de groenten naar de
+markt gaan en ze zoo duur zullen te koop stellen dat niemand ze koopen
+wil, zal dokter Pontus u zeggen wat gij met uwe lading wapenen doen
+moet. Maar ik denk dat hij u eene zending zal opleggen die niet zonder
+gevaar is, en u bevelen de Waal, de Maas of den Rijn af te varen, uwe
+groenten te ruilen tegen netten en naar de visschersschuiten te gaan
+te Harlingen, alwaar vele matrozen het gezang des leeuweriks kennen,
+vervolgens door de wadden, langsheen de kust, naar de Lauwerzee
+te varen, de netten te ruilen tegen ijzer en lood, aan uwe boeren
+kleederen te geven naar de dracht van de eilanden Marken, Vlieland
+of Ameland, een weinig van de kust af te blijven, te visschen en uwe
+vangst in te zouten, niet om ze te verkoopen, doch om ze te bewaren,
+want zout eten en een goeden pot drinken is geoorloofd in oorlogstijd.
+
+--Als het zoo is, sprak de schipper, laat ons drinken!
+
+En zij gingen terug naar het dek.
+
+Doch Lamme was vol weemoed.
+
+--Mijnheer de schipper, sprak hij, gij hebt daar in uwe smidse een zoo
+blakerend vuurtje, dat men daar voorzeker den smakelijksten hutsepot
+zou koken, dien men droomen kan. Mijn keelgat smeekt luide om soep.
+
+--Ik zal u ververschen, sprak de man.
+
+En weldra bracht hij een vette soep op, waarin een dikke snee gezouten
+hesp was gekookt.
+
+Als Lamme eenige lepelen gegeten had, wendde hij zich naar den schipper
+en sprak:
+
+--Mijne keel is verschroeid, mijne tong brandt af; dat is geen
+hutsepot dàt.
+
+--Zout eten en dapper drinken is geoorloofd in oorlogstijd, zoo staat
+er geschreven, antwoordde Uilenspiegel.
+
+De schipper vulde de bekers en sprak:
+
+--Ik drink op den leeuwerik, het zinnebeeld der vrijheid!
+
+Uilenspiegel sprak:
+
+--Ik drink op den haan, die oorlog kraait!
+
+Lamme sprak:
+
+--Ik drink op de gezondheid mijner vrouw; mocht dorst de welbeminde
+nooit kwellen!
+
+--Gij gaat langs de Noordzee naar Emden, zei Uilenspiegel tot den
+schipper. Emden is eene schuilplaats voor ons.
+
+--De zee is groot, sprak de schipper.
+
+--Groot voor 't gevecht, antwoordde Uilenspiegel.
+
+--God is met ons, zei de schipper.
+
+--Wie dan kan tegen ons zijn? hernam Uilenspiegel.
+
+--Wanneer vertrekt gij? vroeg Sterke Pier.
+
+--Dadelijk, antwoordde Uilenspiegel.
+
+--Goede reis en den wind van achteren. Neem dit kruit en deze kogelen.
+
+De schipper gaf hun den afscheidskus en deed hun uitgeleide, nadat hij
+de beide ezelen als lammekens op zijne schouders aan wal had gebracht.
+
+Lamme en Uilenspiegel stegen op hunne grauwtjes en begaven zich op weg.
+
+Zij reden naar Luik.
+
+--Mijn jongen, vroeg Lamme onderwege aan Uilenspiegel, hoe is het
+mogelijk, dat een zoo sterke gespierde kerel zich zoo wreedelijk liet
+afrossen door iemand lijk ik?
+
+--Dit deed hij, antwoordde Uilenspiegel, opdat de vreeze u zou
+voorafgaan in alle oorden, waarheen wij ons zullen begeven. Dat is
+een veiliger geleide dan twintig landsknechten te zamen. Wie dan zou
+voortaan nog een minachtend woord durven richten tot Lamme den sterke,
+tot den zegevierenden Lamme; tot Lamme den stier, die zijn gelijken
+niet heeft, die, onder eens iegelijks oogen, met eenen stoot met
+den kop, Sterken Pier nedervelde, Sterken Pier, die ezelen op zijne
+schouderen draagt alsof het lammekens waren en geheele bierwagens
+opheft? Iedereen kent u hier reeds. Gij zijt de geduchte Lamme,
+de onoverwinbare Lamme, en in de schaduw uwer bescherming, rijd ik
+onbevreesd door. Op den weg, dien wij zullen volgen, zal iedereen
+u kennen, niemand zal zich durven vermeten u scheef te bezien en,
+gezien de lafheid der mannen, zult gij nergens op uwen weg iets
+anders aantreffen dan nederige buigingen, groeten, loftuitingen en de
+algemeene achting, ter eere van de spierkracht uwer geduchte vuisten.
+
+--Gij spreekt goed, mijn jongen, zeide Lamme, die zich stijf in den
+zadel hield.
+
+--En ik spreek waarheid, ging Uilenspiegel voort. Ziet gij die
+nieuwsgierige gezichten aan de eerste huizen van het dorp? Men toont
+elkander Lamme, den schrikverwekkenden overwinnaar. Ziet gij die
+mannen u bekijken met afgunst, en die lafhertige weekelingen hunne
+muts afnemen voor u? Beantwoord hunne groeten, Lamme; veracht nooit
+het zwak van het volk. Zie, de kinderen kennen uwen naam en herhalen
+hem met schrik en met eerbied.
+
+En Lamme reed fier voorbij, groette rechts, groette links, als een
+koning. En de mare zijner dapperheid ging hem vooraf van dorp tot dorp,
+van stad tot stad, tot Luik, Chokier, la Neuville, Vezin en Namen,
+welke stad zij lieten liggen, ter oorzake van de drie predikanten.
+
+En aldus reden zij langen tijd voort, langs rivieren, stroomen en
+vaarten. En overal werd het gezang van den leeuwerik beantwoord door
+'t gekraai van den haan.
+
+En overal werden, voor 't werk van de vrijheid, wapenen gegoten,
+gesmeed, geslepen, en vervolgens verscheept.
+
+En in tonnen, in kisten, in manden, geraakten zij door, aan de tollen.
+
+En overal werden goede lieden gevonden, die ze wilden aanveerden en
+in verzekerde plaatsen bergen, met het kruit en de kogels, totdat
+Gods ure zou slaan.
+
+En Lamme reed steeds voort met Uilenspiegel, altijd voorafgegaan
+door zijnen roem van onoverwinbaren vuistvechter, tot dusverre dat
+hij zelf aan zijn groote kracht begon te gelooven en, hoogmoedig en
+strijdlustig geworden, zijnen baard liet groeien.
+
+En Uilenspiegel noemde hem: Lamme de Leeuw.
+
+Doch Lamme bleef niet standvastig in zijn voornemen, want den vierden
+dag begon zijn baard hem onuitstaanbaar te steken.
+
+En hij liet het scheermes over zijn zegevierend gezicht strijken, dat
+nu weder te voorschijn kwam als de volle maan, met een rooden blos,
+gestoofd door het lekkere eten.
+
+Aldus kwamen zij te Stokhem.
+
+
+
+
+XXVIII.
+
+Te Stokhem lieten zij hunne ezelen op stal, en begaven zij zich te
+voet naar Antwerpen, welke stede zij bij 't vallen van den avond
+binnentrokken.
+
+En Uilenspiegel zeide tot Lamme:
+
+--Hier is de groote stad, de gansche wereld stapelt hier hare
+rijkdommen: goud, zilver, specerijen, goudleder, kostelijke tapijten,
+lakens, fluweelen, tieretijnen, wollen en zijden stoffen; boonen,
+erwten, granen, vleesch en meel, gezouten huiden; wijn van Leuven, van
+Namen, van Luxemburg, van Luik, landwijn van Brussel en van Aarschot,
+wijn van Buley, uit den wijngaard omtrent de poort van La Plante,
+te Namen, Rijnwijn, heerlijke Spaansche- en Portugeesche wijnen;
+druivenolie van Aarschot, die zij Landolium heeten; Bourgondische,
+Malvezij- en vele andere wijnen. En de kaaien staan vol koopwaren.
+
+... Die rijkdommen der aarde en der menschelijke bedrijvigheid trekken
+naar dit oord de schoonste meidekens van de wereld.
+
+--Ik geloof, dat gij weer aan 't droomen zijt, sprak Lamme.
+
+Uilenspiegel antwoordde:
+
+--Onder haar zal ik de Zeven vinden. Er werd mij gezegd:
+
+
+    In den dood en in het bloed,
+    In de puinen en de tranen,
+        Vind de Zeven.
+
+
+... Wie dan veroorzaakt meer verderf dan de meisjes van plezier? Is
+het niet bij heur dat de arme, waanzinnige mannen hunne schoone,
+klinkende en blinkende karolussen verteren? Laten zij niet bij heur,
+juweelen, ringen en kettingen; keeren zij niet uitgeschud huiswaarts,
+zonder wambuis en soms zonder hemde, terwijl de deernen smeren en teren
+met het geld, dat zij hun ontfutseld hebben? Waar is het roode, heldere
+bloed, dat in hunne aderen vloeide? Het is preisap geworden. En vechten
+de mannen niet tegen elkander met messen, met daggen, met zweerden, tot
+den dood, om heure gunst te verkrijgen? De bleeke en bloedende lijken,
+die men wegbrengt, zijn lijken van arme, waanzinnige verliefden. Als
+de vader knort en gestreng blijft zitten, als zijn witte haren er
+witter en stijver uitzien, als uit zijne droge oogen, die branden van
+verdriet over het verderf van zijn kind, geene tranen meer vloeien;
+als de moeder, stilzwijgend en bleek als de dood, weent alsof voor
+haar de wereld nog slechts wee en ramp moest baren, wie dan is de
+schuld van dat verdriet, van die tranen? De lustige meidekens beminnen
+niemand dan zich zelven en het geld, en heel de denkende, werkende,
+zwoegende wereld houden zij aan heure rokken gebonden. Ja, Lamme,
+dáár zijn de Zeven, en wij zullen bij de meidekens gaan. Wellicht
+vinden wij daar uwe vrouw: zóó vangen wij twee vliegen in één slag.
+
+--Ik wil wel, sprak Lamme.
+
+Toen was men in de hooimaand, in het midden van den zomer, als de zon
+de bladeren der kastanjeboomen roostert, de vogeltjes in het loover
+kweelen en de insecten van genoegen gonzen, omdat het gras zoo warm is.
+
+Lamme doolde met gebogen hoofde naast Uilenspiegel door de straten
+van Antwerpen; hij sleepte zijn lichaam voort, alsof het zwaar als
+een huis was.
+
+--Lamme, sprak Uilenspiegel, gij ziet er wederom zoo weemoedig uit;
+weet gij dan niet dat niets slechter kan zijn voor uw vel? Als gij
+volherdt in uw zwarte gedachten, zult gij het verliezen met stukken
+en brokken. En dan zal het aangenaam zijn te moeten hooren, als men
+van u zal spreken: de schurftige Lamme.
+
+--Ik heb honger, sprak Lamme.
+
+--Kom eten, zei Uilenspiegel.
+
+En samen gingen zij naar de Oude Trappen, waar zij soezels aten en
+dobbele kuite dronken, totdat zij hunne bekomst hadden.
+
+En Lamme weende niet meer.
+
+En Uilenspiegel sprak:
+
+--Gezegend zij het goed bier, dat de ziel verkwikt als een dartele
+zonnestraal. Gij lacht dat uw buik er van schokt. Zoo zie ik u geerne,
+met uwe darmen, die dansen van vreugde.
+
+--Mijn vriend, antwoordde Lamme, zij zouden nog meer dansen, zoo ik
+het geluk had mijne vrouw weder te vinden.
+
+--Wij zullen ze zoeken, zei Uilenspiegel.
+
+En zoo kwamen zij in de wijk van het Scheld.
+
+--Kijk, zeide Uilenspiegel tot Lamme, kijk naar dit huisje, dat
+heel van hout is gemaakt, met schoone, gebeitelde vensteren, waar
+kleine ruitjes in steken; kijk naar die gele gordijntjes en die roode
+lanteerne. Daar, mijn vriend, achter vier tonnen bruinbier, uitzet,
+dobbele kuite en Spaanschen wijn, troont een schoone bazinne van over
+de vijftig. Elk jaar, dat de Heer heur vergunt, krijgt zij een nieuwe
+laag vet. Op eene der tonnen flikkert eene vetkeers en aan de balken
+der zoldering hangt eene lanteerne. Het is daar donker en klaar:
+donker voor de liefde en klaar voor 't gelag.
+
+--Maar, sprak Lamme, 't is een klooster van duivelsche nonnen, en
+uwe bazinne is de abdis.
+
+--Ja, sprak Uilenspiegel, zij is het, die, in naam van den heer
+Beëlzebub, vijftien liederlijke meidekens leidt op den weg van den
+ontucht, en de meidekens vinden eten en schuilplaats bij heur, doch
+mogen er niet vernachten.
+
+--Kent gij dat huis? vroeg Lamme.
+
+--Neen.
+
+--Hoe kunt gij er dan van spreken?
+
+--Ik ga er uwe vrouw zoeken. Kom mede met mij.
+
+--Neen, sprak Lamme, ik heb mij bepeinsd en ga daar niet binnen.
+
+--Zoudt gij uwen vriend alleen blootgesteld laten aan de ondernemingen
+van die dienaressen van Astarte?
+
+--Hij moet er maar niet heen gaan, antwoordde Lamme.
+
+--Als hij er nu moet gaan om de Zeven en meteen uwe vrouw te
+zoeken? hernam Uilenspiegel.
+
+--Ik ging liever slapen, sprak Lamme.
+
+--Kom maar mee, zeide Uilenspiegel.
+
+En hij opende de deur en duwde Lamme vóór zich binnen.
+
+--Zie, sprak hij, daar is de bazinne achter heure tonnen, tusschen twee
+keersen: de zaal is groot, met heure zwart geworden eiken zoldering
+van bewalmde kepers en planken. Rondom, langsheen de muren, staan
+stoelen en hinkende tafelen, dewelke bedekt zijn met glazen, pinten,
+bekers, kroezen, kruiken, flesschen, bottels en ander drinkgerief. In
+'t midden der zaal staan nog tafelen en stoelen, waarop huiken, dat
+zijn vrouwenkappen, gulden gordelriemen, fluweelen steltschoenen,
+doedelzakken, pijpen en schalmeien liggen. In den hoek is eene ladder,
+die naar boven leidt. Een kale bultenaar speelt op eene klavecimbel,
+die op glazen pooten staat, om 't geluid van het speeltuig te
+vermeerderen. Dans, dikzak. Vijftien schoone meiden zitten op tafelen
+of schrijlings op stoelen, in allerlei houding: gebogen, op de zijde
+geleund of achterover, of met het hoofd in de hand, naarvolgens
+heure grillen; ze zijn gekleed in het wit, in het rood, in allerhande
+kleuren, en laten heure bloote armen zien en ook een deel van heuren
+boezem. Er zijn er van alle soorten; ze zijn uitgekozen! Van de eenen,
+laat het weifelend licht der keersen, dat heure blonde lokken komt
+streelen, hare blauwe oogen in het duister, zoodat men er enkel het
+vochtige vuur in ziet flikkeren. Anderen zien naar de zoldering en
+neuren, op de maat van den vedel, een droeve Duitsche ballade. Anderen
+nog, ronde, bruine, dikke, drinken met volle bekers Spaanschen wijn en
+toonen heure ronde, tot de schouderen ontbloote armen, en schaamteloos
+roepen en tieren de eenen na den anderen en allen te zamen. Hoor wat
+ze zeggen: Het is onze mesdag! Heden willen wij niets verdienen! Heden
+willen wij geen geld: wij vragen slechts liefde!
+
+Toen Lamme zoovele blonde en bruine, frissche en verslenste vrouwen
+te gelijk zag, werd hij beschaamd; hij sloeg zijn oogen neder en riep:
+
+--Uilenspiegel, waar zijt gij?
+
+--Hij heeft dit tranendal verlaten, mijn vriend, sprak een dikke
+deerne, die hem bij den arm vatte.
+
+--Dit tranendal verlaten? vroeg Lamme.
+
+--Ja, zeide zij, driehonderd jaar geleden, in gezelschap van Jacobus
+de Coster van Maerlandt.
+
+--Laat mij los, sprak Lamme, en nijp mij niet meer.
+
+En op droeven toon ging hij voort:
+
+--Uilenspiegel, mijn vriend, waar zijt gij? Kom uwen gezel toch
+ter hulp.
+
+Maar de vrouwen sarden hem meer en meer.
+
+--Ik ga dadelijk heen, als gij mij niet gerust laat.
+
+--Gij zult niet vertrekken, zeiden zij.
+
+--Uilenspiegel, ging Lamme jammerend voort, waar zijt gij dan toch?
+
+En zich tot de plaagzieke meiden wendend, ging hij voort:
+
+--Juffer, als 't u belieft, trek mij zoo bij mijn haar niet; het is
+geene pruik, ik mag het u verzekeren. Hulp! Hulp! Vindt gij mijne ooren
+niet rood genoeg, dat gij ze nijpt en er het bloed in doet stijgen? En
+die andere, die mij gedurig knippen voor den neus geeft! Gij doet mij
+zeer. Laas! wat wrijft gij nu in mijn aangezicht? Een spiegel! Ik
+zie zwart als een ovengat. Als gij niet uitscheidt, maak ik mij
+kwaad; gij moest beschaamd zijn een armen, weerloozen man aldus te
+mishandelen! Laat mij los! Als gij mij eene uur bij mijne hooze, bij
+mijn wambuis, rechts, links, langs alle kanten zult gesleurd hebben,
+zult gij er vetter om zijn? Ja, ge moogt er zeker van wezen, ik ga
+mij kwaad maken.
+
+--Hij gaat zich kwaad maken, zeiden zij spottend; hij gaat zich kwaad
+maken, zou men niet zeggen! Lach liever, en zing ons een liedeken
+van zoete minne.
+
+--Ik zal een liedeken zingen van slagen, als gij wilt. Maar nog eens,
+laat mij los.
+
+--Wie van ons ziet gij 't liefst?
+
+--Niemand; noch u, noch eene van de anderen. Ik ga mijne klacht doen
+bij den magistraat, en hij zal u doen geeselen.
+
+--Hallo, spraken zij, doen geeselen? En zoo wij u vóór de geeseling
+eens vastnamen en kusten?
+
+--Mij? sprak Lamme.
+
+--Ja, u! antwoordden allen.
+
+En al de vrouwen, schoone en leelijke, frissche en verslenste, bruine
+en blonde, vlogen naar Lamme.
+
+Zij smeten zijne toque, zijn opperste kleed omhoog, streelden hem,
+kusten hem, zoenden hem uit al heure kracht, daar waar zij konden,
+op zijne kaken, op zijnen neus, op zijne maag, in zijnen hals.
+
+De bazinne schaterlachte tusschen heure vetkeersen.
+
+--Hulp! schreeuwde Lamme, hulp! Uilenspiegel, verlos mij van dat
+ongedierte. Laat me los, ik wil van uwe kussen niet weten; ik ben
+getrouwd, drommels!, en bewaar al mijne kussen voor mijne vrouw.
+
+--Getrouwd, spraken zij, maar daar heeft uwe vrouw veel te veel aan,
+aan een man zoo vollijvig als gij. Geef ons wat van uw vet. Een trouwe
+vrouw, dat is van doen, doch een trouwe man is een kapoen. God hoede u:
+gij moet eene keus doen, of wij geeselen u, op onze beurt.
+
+--Ik zal het niet doen, sprak Lamme.
+
+--Kies eene uit, spraken zij.
+
+--Neen, sprak hij.
+
+--Wilt gij mij? vroeg een schoone blonde; bezie mij, ik ben zachtzinnig
+van aard, en ik min hem, die mij mint.
+
+--Laat mij los, sprak Lamme.
+
+--Wilt gij mij? sprak een bekoorlijke meid, met gitzwarte lokken en
+een bruine tint, en die overigens door de engelen gemaakt scheen.
+
+--Peperkoek lust ik niet, sprak Lamme.
+
+--En mij, zult gij mij niet nemen? vroeg een echte reuzin, met een
+voorhoofd, dat schier teenemaal bedekt was met heur haar, met dikke
+wenkbrauwen, die samen kwamen, met groote, flikkerende oogen, met
+dikke, bloedroode lippen, en ook een rood aangezicht, een rooden hals
+en roode schouderen.
+
+--Van gloeiende steenen heb ik schrik, antwoordde Lamme.
+
+--Neem mij, sprak een zestienjarig meideken, met een gezichtje zoo
+scherp als dat van een eekhorentje.
+
+--Ik houd niet van notenkrakers, antwoordde Lamme.
+
+--We zullen hem moeten geeselen, zeiden zij. Waarmede? Met schoone
+zweepen van droog leder. En dapper geklitskletst! Het hardste vel is
+niet bestand tegen lederen roeden. Neemt tien zweepen van karrelieden
+en ezeldrijvers, die zijn de beste,
+
+--Hulp! hulp! Uilenspiegel! kreet Lamme.
+
+Doch Uilenspiegel antwoordde niet.
+
+--Gij hebt geen hert, zuchtte Lamme, terwijl hij zijnen vriend
+overal zocht.
+
+De zweepen werden aangebracht. Twee van de meidekens begonnen Lamme's
+wambuis uit te trekken.
+
+--Eilaas! mijn arm vet, dat ik met zooveel moeite vergaarde, gaan
+ze mij ongetwijfeld ontnemen met heur striemende zweepen. Maar,
+meedoogenlooze wijvekens, mijn vet kan u tot niets dienen, gij kunt
+er niet eens sausen van maken.
+
+Zij antwoordden:
+
+--Wij zullen er keersen van gieten. 't Is toch al iets, klaar te zien,
+zonder dat het een oortje moet kosten! Zij, die voortaan zal beweren
+dat de keersen uit zweepen voortkomen, zal door een iegelijk aanzien
+worden voor een zottinne. Doch wij zullen voor heur aantrekken tot
+den dood, en wij zullen meer dan ééne weddenschap winnen. Steekt de
+roeden even in den azijn. Doet zijn wambuis uit. Negen uren slaat het
+op Sint-Jacobs. Als gij met den laatsten slag geene keus gedaan hebt,
+gaan wij er op los!
+
+Sidderend jammerde Lamme:
+
+Hebt genade en medelijden met mij; ik heb mijne arme vrouwe trouw
+gezworen en ik zal mijn eed gestand doen, hoewel ze heel slecht deed,
+mij te verlaten. Uilenspiegel, help mij, verlos mij, mijn vriend!
+
+Doch Uilenspiegel was te hooren noch te zien.
+
+Lamme zeide tot de deernen:
+
+--Aanschouwt mij, ik lig aan uwe voeten. Ootmoediger kan mijne
+houding niet wezen. Bediedt dit niet genoeg dat ik, als heiligen,
+uwe bekoorlijkheden vereer? Gelukzalig hij, die niet getrouwd is en
+uwe koozerijen mag genieten! Ik twijfel er niet aan, dat gij hemelsche
+genoegens doet smaken, maar slaat mij niet, als 't u belieft.
+
+Doch de bazinne, tusschen heure twee keersen gezeten, sprak eensklaps
+met donderende en dreigende stemme:
+
+--Vrouwen en meidekens, bij alle duivelen uit de helle zweer ik dat,
+bijaldien gij, door lachen en koozerijen, dien man niet dadelijk
+tot u krijgt, ik de nachtwacht ga halen en u allen in zijne plaats
+doe geeselen. Gij verdient geenszins den naam van dienaressen van de
+godin der liefde, zoo gij met uwen mond, uwe handen, uwe vurige oogen
+niet bij machte zijt de mannen te verleiden. En om uwe onnoozelheid
+wordt gij zonder mededoogen gegeeseld!
+
+Op die rede, begonnen de vrouwen en meidekens te beven en blonk
+Lamme's gezicht van vreugde.
+
+--Nu, vrouwtjes, sprak hij schertsend, welke mare brengt gij mede van
+het land der striemende zweepen? Ik zal der bazinne de moeite sparen
+en zelf om de wacht gaan. Deze zal haren plicht doen en ik wil met
+pleizier een handeken toesteken. Alle baten helpen.
+
+Doch een aanvallig meideken van een vijftiental jaren viel op hare
+knieën vóór Lamme.
+
+--Heer, sprak zij, gij ziet mij hier wel nederig en gelaten vóór uwe
+voeten; doch als gij niemand onzer wilt kiezen, moet ik om uwent wille
+gegeeseld worden; is dat rechtveerdig? En de bazinne daar, zal mij in
+een leelijken, donkeren kelder steken, onder de Schelde, waar het water
+van de muren zijpelt en waar ik slechts roggebrood te eten zal krijgen.
+
+--Zou zij werkelijk om mijnent wille gegeeseld worden, mevrouw de
+bazinne? vroeg Lamme onthutst.
+
+De bazinne bevestigde:
+
+--Tot bloedens toe gegeeseld.
+
+Lamme aanschouwde toen het meideken en sprak:
+
+--Gij zijt lief, gij zeit frisch, uw blanke schouderen komen als
+rozeblaadjes uit op uw kleed; ik wil niet dat die donzige huid,
+onder dewelke zulk jeugdig bloed vloeit, lijde onder de slagen der
+zweep; dat die heldere, flikkerende oogen weenen ter oorzake van de
+smerte der slagen; dat de wakke killigheid des gevangs dat goddelijk
+lichaam doe beven. Dienvolgens heb ik liever u te verkiezen, dan te
+weten dat gij om mijnent wille geslagen wordt.
+
+Het meideken leidde hem mede. En zoo zondigde hij, gelijk hij deed
+heel zijn leven, uit goedhertigheid.
+
+
+
+
+XXIX.
+
+Uilenspiegel en Lamme stapten op naar Gent en kwamen met de
+ochtendschemering omtrent Lokeren.
+
+Frissche, witte dampen zweefden over de weiden.
+
+De beide wandelaars kwamen voorbij eene smidse en Uilenspiegel
+schuifelde lijk de leeuwerik, de vogel der vrijheid.
+
+En dadelijk vertoonde zich een man met witte, lange haren, vóór de
+deur van de smidse, en terstond bootste hij het dapper gekraai van
+den haan na.
+
+Uilenspiegel zeide tot Lamme:
+
+Dat is smid Wasteele, die ploegscharen maakt, het ijzer smeedt als het
+warm is om er schoone hekken voor kerkkoren van te verveerdigen, en
+zeer dikwijls, 's nachts, wapenen smeedt en slijpt voor de soldaten van
+het vrije geweten. Hij is vet noch gezond geworden bij dien dubbelen
+arbeid, want hij is bleek als een spook, treurig als een verdoemde,
+en zoo mager dat zijne beenderen door zijn vel steken. Hij is nog
+niet slapen, zeker heeft hij wederom heel den nacht gewrocht.
+
+--Komt binnen, gij beiden, zeide smid Wasteele, en brengt uwe ezelen
+op de meersch, achter het huis.
+
+Toen Uilenspiegel en Lamme dit gedaan hadden, kwamen zij terug in
+de smidse en zagen, dat smid Wasteele al de zweerden in den kelder
+bracht, die hij binst den nacht geslepen had, en het werk voor zijne
+knechts gereedmaakte.
+
+Uilenspiegel met doffe oogen beziende, vroeg hij hem:
+
+--Welk nieuws brengt gij van den Zwijger?
+
+Uilenspiegel antwoordde:
+
+--De Prins is met zijn leger uit de Nederlanden verjaagd, ter oorzake
+van de lafheid zijner huurlingen, die roepen: Geld! Geld! als er
+te vechten valt. Met zijn trouwe soldaten en zijn broeder, graaf
+Lodewijk, trok hij den koning van Navarra en den hugenoten ter hulp;
+van daar toog hij naar Duitschland, naar Dillenburg, alwaar vele
+vluchtelingen uit de Nederlanden tot hem kwamen. Gij moet wapenen
+zenden en het geld dat gij opgehaald hebt, terwijl wij op zee moeten,
+om het werk van vrije mannen te verrichten.
+
+--Ik zal doen wat mij geheeten wordt, sprak smid Wasteele; ik heb
+wapenen en negenduizend florijnen. Maar zijt gij hier niet gekomen
+op ezelen?
+
+--Ja, zeiden zij.
+
+--En hebt gij, onderwege, gene tijding gehad van drie predikanten,
+die gedood, uitgeplunderd en in een hol gesmeten werden op de rotsen
+van de Maas?
+
+--Ja, antwoordde Uilenspiegel met de grootste vrijmoedigheid, die
+drie predikanten waren spionnen van den hertog, die betaald waren
+om den prins in het verderf te brengen. Wij getweeën, Lamme en ik,
+hebben hun het tijdelijke met het eeuwige doen verwisselen. Hun geld
+is in ons bezit en hunne papieren insgelijks. Wij zullen er van nemen
+wat ons hoeft voor onze reis, de rest zullen wij aan den prins geven.
+
+En Uilenspiegel deed zijn wambuis open, alsmede dat van Lamme en trok
+er papieren en perkamenten uit.
+
+Smid Wasteele las ze en sprak vervolgens:
+
+--Zij behelzen plannen van gevecht en van samenzweering. Ik zal ze den
+prins doen behandigen, en er zal hem gezegd worden, dat Uilenspiegel
+en Lamme Goedzak, zijn trouwe wandelaars, zijn edel leven gered
+hebben. Ik ga uwe ezelen doen verkoopen, opdat men U niet aan uwe
+rijdieren zou herkennen.
+
+Uilenspiegel vroeg aan smid Wasteele of de vierschaar der schepenen
+van Namen reeds heure serjanten achter hunne hielen had gezonden.
+
+--Ik ga u kond geven van hetgene ik weet, antwoordde Wasteele. Een smid
+van Namen, een dappere en overtuigde hervormde, is laatst hier bij
+mij geweest, zoogezeid om mij te vragen hem te helpen in het maken
+van de hekken, windwijzers en het ander ijzerwerk voor een slot,
+dat men omtrent La Plante aan 't bouwen is. De deurwaarder van de
+vierschaar der schepenen heeft hem verteld, dat zijne meesters reeds
+bijeengekomen waren, en dat de baas eener taveerne alreeds geroepen
+was, omdat hij op eenige honderden stappen van de plaats van den
+moord woont. Ondervraagd of hij de moordenaars of hen, die hij van den
+moord kon verdenken, gezien had, heeft hij geantwoord: "Ik heb boeren
+en boerinnen gezien, die op ezelen reden; sommigen bleven op hunne
+dieren zitten en vroegen te drinken aan de deur, anderen stegen van
+hunne ezelen en kwamen in de gelagkamer, de manslieden dronken bier, de
+vrouwen en meidekens mede. Ik zag ook twee dappere mannen, die spraken
+van messire van Oranje een kopken kleiner te maken." Terwijl de baas
+dit zeide, floot hij, om den steek van een mes in het vleesch van den
+hals na te bootsen. "Bij Stalen Wind, zeide hij, zal ik u heimelijk
+op de hoogte houden, daar dit in mijne macht is." Hij sprak en werd
+losgelaten. Sedert dien tijd hebben de justitieraden ongetwijfeld
+brieven gezonden aan de baljuws. De baas zei, dat hij anders niemand
+gezien had dan boeren en boerinnen op ezelen; daaruit is te voorzien,
+dat men jacht zal maken op allen die men schrijlings op ezelen zal
+aantreffen. En de prins heeft u noodig, mijne kinderen.
+
+--Verkoop onze ezelen, zeide Uilenspiegel, en de opbrengst kunt gij
+voegen bij den oorlogsschat van den prins.
+
+De dieren werden verkocht.
+
+--Nu moet gij, sprak Wasteele, elk een vrij ambacht hebben, dat tot
+geene gilden behoort. Kunt gij vogelkooien en rattenvallen maken?
+
+--Ik heb er vroeger veel gemaakt, zeide Uilenspiegel.
+
+--En gij? vroeg Wasteele aan Lamme.
+
+--Ik, sprak Lamme, ik zal wafelen en oliekoeken verkoopen.
+
+Volgt mij; hier zijn heel gereedgemaakte vogelkooien en rattenvallen,
+met gereedschap en koperdraad om ze te herstellen en er anderen te
+maken. Dit alles werd mij gebracht door een mijner spionnen Dat is voor
+u, Uilenspiegel. Gij, Lamme, krijgt een klein komfoor met blaasbalg;
+ik zal u ook deeg, spek en olie geven, om uwe wafelen en oliekoeken
+te bakken.
+
+--Hij is in staat alles zelf op te eten, zei Uilenspiegel.
+
+--Wanneer beginnen wij te bakken? vroeg Lamme.
+
+Wasteele antwoordde:
+
+--Gij zult mij eerst een nacht of twee moeten helpen; alleen kan ik
+mijn werk niet afkrijgen.
+
+--Ik heb honger, sprak Lamme, is hier niets te eten?
+
+--Er is brood en kaas, antwoordde Wasteele.
+
+--Zonder boter? vroeg Lamme.
+
+--Zonder boter, sprak Wasteele.
+
+--Hebt gij bier of wijn? vroeg Uilenspiegel.
+
+--Ik zelf drink er nooit, antwoordde Wasteele; doch als gij er hebben
+wilt, zal ik er halen in den Pelikaan, hier dichtbij.
+
+--Ja, sprak Lamme, en breng meteen wat hesp mee.
+
+--Ik zal doen wat gij vraagt, sprak Wasteele, die Lamme met groote
+verachting bekeek.
+
+Toch bracht hij dobbelen klauwaard en hesp. En, van genoegen, at
+Lamme voor vijven.
+
+En hij sprak:
+
+--Wanneer beginnen wij te werken?
+
+--Dezen nacht, sprak Wasteele, maar blijft in de smidse en wees niet
+bevreesd voor mijne gasten. Het zijn hervormden lijk gij.
+
+--Dat gaat mij, sprak Lamme.
+
+'s Nachts, als de slaapklokken geluid hadden en de poorten gesloten
+waren, deed Wasteele zich helpen door Uilenspiegel en Lamme, om uit
+den kelder zware pakken wapenen naar zijne werkplaats te dragen.
+
+--Hier zijn, sprak hij, twintig bussen, die moeten hersteld, dertig
+lanspunten, die moeten geslepen worden, en lood om vijftienhonderd
+kogels te gieten; gij gaat mij helpen.
+
+--Met mijn beide handen! antwoordde Uilenspiegel. Waarom heb ik er
+geen vier om u behulpzaam te wezen!
+
+--Lamme zal ons helpen, sprak Wasteele.
+
+--Ja, antwoordde Lamme op jammerlijken toon, want hij viel van den
+vaak, ter oorzake van het overvloedig eten en drinken.
+
+--Gij zult het lood gieten, sprak Uilenspiegel.
+
+--Ik zal, sprak Lamme.
+
+Lamme smolt zijn lood en goot zijn kogels, doch grimmig bekeek hij smid
+Wasteele, die hem dwong op te blijven, terwijl hij zoo'n slaap had.
+
+Hij goot de kogels, maar hij had grooten lust het gesmolten lood over
+het hoofd van smid Wasteele te gieten. Doch hij hield zich in. Rond
+middernacht werd hij, oververmoeid, door razernij overvallen en,
+terwijl smid Wasteele en Uilenspiegel geduldig zweerden, bussen en
+lanspunten slepen, hield hij met sissende stem de volgende rede:
+
+--Daar staat gij nu, mager, bleek en schraal, met uw vast vertrouwen
+in de prinsen en in de grooten der aarde; door overdreven ijver,
+veronachtzaamt gij uw lichaam, uw edel lichaam, dat gij laat vergaan
+van ellende en zelfvernedering. Daarom is het niet, dat de goede
+God u schiep. Vergeet niet dat onze ziel, die de adem des levens is,
+boonen, ossevleesch, bier, wijn, hesp, worsten, pensen, alsmede rust
+noodig heeft tot haar bestaan; gij, gij leeft van brood, water en
+slapeloosheid!
+
+--Van waar komt u die ongewone woordenvloed? vroeg Uilenspiegel.
+
+--Hij weet niet wat hij zegt, antwoordde Wasteele schokschouderend.
+
+Maar Lamme vervolgde:
+
+--Ik weet het beter dan gij. Ik zeg dat wij zot zijn, ik, gij en
+Uilenspiegel insgelijks, onze oogen te bederven voor al die prinsen
+en heeren, die zeker zouden lachen met ons, als zij ons, overvallen
+door vermoeienis, den nacht zagen doorbrengen met wapenen te slijpen
+en kogels te gieten, te hunnen dienste. Terwijl zij wijn uit gouden
+bekers drinken en kapoenen in tinnen schotels eten, vragen zij zich
+niet af of hunne vijanden met hunne zeisen onze beenen niet afkappen
+en ons in den doodenkuil niet werpen. Intusschen zullen zij, die in
+den grond noch hervormden, noch calvinisten, noch lutheranen, noch
+katholieken zijn, maar aan God noch duivel gelooven, heerlijkheden
+koopen en bemachtigen, het goed van monniken, abten en konventen
+inslikken. Alles zal voor hen zijn: en vrouwen en maagden en meidekens;
+uit hunne gouden bekers zullen zij drinken op hun eeuwig welzijn,
+op onze altijddurende onnoozelheid en op de zeven hoofdzonden, die
+zij gedurig bedrijven; ja, smid Wasteele, en dàt onder uwen neus,
+die mager is van geestdrift. Aanschouw de velden, de weiden, zie naar
+de oogsten, de boomgaarden, de ossen, het goud dat opstijgt uit de
+aarde; aanschouw de wilde dieren van de bosschen, de vogelen van de
+hemelen, de lekkere ortolanen, de heerlijke lijsters, den kop van
+het everzwijn, den bout van den reebok: jacht, vischvangst, aarde,
+zee, alles, alles is voor hen! En gij, gij leeft van water en brood,
+en wij, wij werken ons dood voor hen, zonder slapen, zonder eten,
+zonder drinken! En als wij er onder zullen bezweken zijn, zullen
+zij onze lijken uit hunnen weg schoppen en tot onze moeders zeggen:
+"Maakt er anderen, deze krengen kunnen ons niet meer dienen."
+
+Uilenspiegel lachte goedmoedig zonder iets te zeggen; Lamme blies
+van verontweerdiging, doch Wasteele zeide op zachtmoedigen toon:
+
+--Gij spreekt lichtzinnig. Ik leef niet voor hesp, voor bier, noch
+voor ortolanen, maar voor de zegepraal van het vrije geweten. Voor de
+vrijheid, doet de prins lijk ik. Hij offert zijn goed, zijne rust,
+zijn geluk op om de beulen en de dwingelandij uit de Nederlanden
+te verdrijven. Doe lijk hij en tracht mager te worden. Het is niet
+met den buik dat men de volkeren redt, maar met fieren moed en met
+geduldige vermoeienis. En nu,... ga maar slapen, zoo gij vaak hebt.
+
+Maar Lamme wilde niet slapen gaan, want de smid had hem beschaamd.
+
+En gedrieën slepen zij wapenen en smolten zij kogelen tot den dageraad.
+
+En dit drie nachten achtereen.
+
+Toen vertrokken zij naar Gent. Onderwege leurden zij met vogelkooien,
+muizenvallen en oliekoeken.
+
+Zoo kwamen zij te Meulestede, welks roode daken men van verre ontwaart,
+en daar kwamen zij overeen dat elk op zijn eigen hand zou rond gaan
+en dat men 's avonds, vóór de slaapklok, malkander zou vinden in de
+afspanning den Zwaan.
+
+Lamme zwierf door de straten van Gent en verkocht gewetensvol zijne
+oliekoeken, want hij kreeg zin in zijn bedrijf, maar toch vergat
+hij zijne vrouw niet, want hij zocht ze gedurig, noch zijnen buik,
+want hij ledigde menigvuldige pinten en at zonder ophouden.
+
+Uilenspiegel had brieven van den prins van Oranje besteld aan Jacob
+Scoelap, licentiaat in de medicijnen, aan Lieven Smet, kleermaker,
+aan Jan de Wulfslaeger, aan Gillis Coorne, roodverver, en aan Jan de
+Roose, ticheldekkker, welke hem het geld ter hand stelden, dat zij
+voor den prins opgehaald hadden, en hem zeiden nog eenige dagen te
+Gent en in 't ronde te blijven, daar zij hem nog meer zouden geven.
+
+Die mannen werden later aan de Nieuwe Galge uit hoofde van ketterije
+gehangen, en hunne lijken werden begraven op het Galgeveld, omtrent
+de Brugsche poort.
+
+
+
+
+XXX.
+
+Doch de provoost, de rosse Spelle, met zijne roode roede gewapend,
+reed op zijn mager peerd van de eene naar de andere stad, en overal
+deed hij schavotten oprichten, brandstapels aansteken, putten delven
+om arme vrouwen en meidekens levend te begraven.
+
+En de koning erfde.
+
+Uilenspiegel zat met Lamme te Meulestede onder eenen boom, en was
+naargeestig. Het was killig, niettegenstaande het in de Zomermaand
+was. Uit den hemel, vol grijze wolken, viel een fijne hagel.
+
+--Mijn vriend, sprak Lamme, 't is nu de vierde nacht dat gij op den
+dril zijt en bij de meidekens loopt. Gij slaapt in den Zoeten Inval;
+gij zult eindigen lijk de man van het uithangbord, en met uw hoofd
+voorop in een bijenkorf vallen. Tevergeefs zit ik op u te wachten in
+den Zwaan, en uw losbandig leven voorspelt niets goeds. Waarom neemt
+gij geene vrouw in alle eer en deugd?
+
+--Lamme, sprak Uilenspiegel, hij voor wien ééne allen is, en voor
+wien allen ééne zijn, in dien liefelijken strijd die minne heet,
+kan zoo lichtzinnig en in der haast geene keus doen.
+
+--En Nele, denkt gij aan heur niet?
+
+--Nele is ver van hier, te Damme, zuchtte Uilenspiegel.
+
+Terwijl hij steeds op de hurken zat en de hagel duchtig nederviel,
+liep een jonge, lieftallige vrouw voorbij, die heuren rok over heur
+hoofd had geslagen om zich voor den hagel te beschutten.
+
+--He, sprak zij, wat zit gij daar onder dien boom te suffen?
+
+--Ik vraag mij af, sprak Uilenspiegel, of ik ooit eene vrouw zal
+vinden, die mij onder het dak van heuren rok zal laten schuilen.
+
+--Gij hebt ze gevonden, sprak de vrouw, sta op.
+
+Uilenspiegel stond recht en ging naar heur toe.
+
+--Gaat gij mij weder alleen laten? vroeg Lamme.
+
+--Ja, antwoordde Uilenspiegel, doch ga naar den Zwaan, en eet daar
+eenen bout, eet hesp en al wat u lust, drink er twaalf pinten bier,
+en trek vervolgens naar uw bed; zoodoende ben ik van u ontslagen.
+
+--In dien raad steekt iets goeds, zei Lamme.
+
+Doch Uilenspiegel hoorde hem niet en was reeds bij de vrouw.
+
+--Licht mijn rok langs de eenen kant op, sprak zij, ik zal hem langs
+den anderen kant optillen.
+
+Toen de rok over hunne hoofden geslagen was, zeide zij:
+
+--Laat ons nu loopen.
+
+--Waarom loopen? vroeg Uilenspiegel.
+
+--Om uit Meulestede te vluchten, sprak zij, de provoost Spelle is
+daar met twee beulsknechten en hij heeft gezworen al de onnutte
+vrouwen--lijk hij ons heet--te doen geeselen, als zij hem geen vijf
+gulden willen betalen. Daarom is 't dat ik loop: kom mede en blijf
+bij mij om mij te verdedigen.
+
+--Lamme, riep Uilenspiegel van verre, Spelle is te Meulestede! Ga in
+aller ijl naar Destelbergen, in de Drie Koningen.
+
+Verschrikt, sprong Lamme schielijk op. Hij hield zijnen buik met de
+beide handen vast en begon te loopen.
+
+--Waar loopt die dikke haas naartoe?
+
+--Naar een hol waar ik hem wel zal terugvinden, antwoordde
+Uilenspiegel.
+
+--Laat ons loopen, zeide zij, terwijl zij als een driftige merrie op
+den grond stampte.
+
+--Ik zou deugdzaam willen zijn zonder te loopen, antwoordde
+Uilenspiegel.
+
+--Wat beteekent dat? vroeg zij.
+
+Uilenspiegel antwoordde:
+
+--Die dikke haas daar wil mij doen verzaken aan den goeden wijn,
+aan het gerstesap en aan de donzige huid van de vrouwen.
+
+Wantrouwig bezag hem de meid.
+
+--Gij hebt korten adem, zeide zij, gij zoudt niet slecht doen te
+rusten.
+
+--Rusten, antwoordde Uilenspiegel, rusten? Maar ik zie geenerlei
+schuilplaats.
+
+--Uwe deugd, antwoordde de deerne, zal u tot dekmantel dienen.
+
+--Ik verkies uwen rok, zeide hij.
+
+--Mijn rok, zeide de deerne, ware onweerdig eenen heilige te dekken,
+lijk gij beweert te zijn. Ga weg, ik zal alleen voortloopen.
+
+--Weet gij dan niet, antwoordde Uilenspiegel, dat een hond op zijn
+vier pooten sneller loopt dan een mensch op twee? Ziedaar waarom wij,
+met vier beenen, sneller zullen loopen.
+
+--Ge spreekt nog al krachtig voor een deugdzaam mensch.
+
+--Ja, zeide hij.
+
+--Maar, sprak zij, ik heb altijd gezien dat de deugd een stille,
+ingesluimerde, dikke en kouwelijke hoedanigheid is, een masker, dat
+knorrende gezichten verbergt, een fluweelen opperste kleed om een man
+van graniet. Ik minne die, in welker borst een mannelijk vuur blakert,
+dat tot lustige en dappere ondernemingen aanzet.
+
+--Aldus, zei Uilenspiegel, sprak de schoone duivelin tot den
+doorluchtigen, heiligen Antonius.
+
+Twintig stappen verder lag eene afspanning langs den weg.
+
+--Gij hebt goed gesproken, vervolgde Uilenspiegel, nu moet gij goed
+drinken.
+
+--Ik heb nog geen dorst, zei de vrouw.
+
+Zij gingen de afspanning binnen.
+
+Op eene schapraai, nevens den schoorsteen, stond eene buikflesch.
+
+Uilenspiegel sprak tot den baas:
+
+--Ziet gij dezen gulden?
+
+--Ik zie hem, zei de baas.
+
+--Hoeveel oortjes zoudt gij er wel van afhouden, om die flesch daar
+met dobbelen klauwaard te vullen?
+
+De baas antwoordde:
+
+--Met negen mannekens zijt gij er van af.
+
+--Dat maakt, zei Uilenspiegel, zes mijten Vlaamsch, dus twee mijten
+te veel. Om het even, tap ze maar vol.
+
+Uilenspiegel schonk de meid eenen beker vol. Daarop stond hij recht;
+met fiere houding zette hij de flesch aan den mond en goot heel
+den inhoud door zijn keelgat. En het klonk als 't gerucht van een
+bruisenden waterval.
+
+De vrouw stond verstomd en vroeg:
+
+--Hoe legt gij het aan boord om zulk een dikke flesch in uw mageren
+buik te gieten?
+
+Uilenspiegel antwoordde niet, doch sprak tot den baas:
+
+--Breng ons een hammeken met brood, en nog een volle flesch klauwaard,
+dat wij eten en drinken.
+
+Zoo deden zij.
+
+Terwijl de vrouw smulde van een stukje zwoord, nam hij heur zoo
+onverwachts, zoo heimelijk om de lenden, dat zij er verrast en verrukt
+over was.
+
+Toen vroeg zij hem:
+
+--Hoe komt het, met al uwe deugd, dat gij dorstig als eene spons,
+vraatzuchtig als een wolf en ondernemend als een minnaar zijt?
+
+Uilenspiegel antwoordde:
+
+--Nadat ik op honderd manieren gezondigd had, zwoer ik, lijk gij weet,
+boetveerdigheid te plegen. Dat heeft wel een groot uur geduurd. Ik
+dacht tijdens dit uur aan mijn toekomstig leven en zag dezen droeven
+toestand in 't verschiet: niets hebben dan droog brood om mijn honger
+te stillen, niets dan water om mijnen dorst te lesschen, de minne
+ontvluchten; niet durven verroeren of niet durven niezen, uit vreeze
+van kwaad te doen; geëerd zijn door allen, gevreesd door een iegelijk;
+alleen en verlaten als een melaatsche; treurig als een hond, die zijn
+meester kwijt is, en, na een dergelijk vijftigjarig martelaarsleven,
+weemoedig op eenen stroozak verrekken. De boete was langdurig genoeg;
+kus mij, liefste, en laat ons getweeën het vagevuur verlaten.
+
+--Ha! zeide zij, bereidwillig gehoorzamend, de deugd is een schoon
+vendel om aan eenen stok te binden.
+
+De tijd verliep met dit dartel minnespel; doch zij moesten opstaan
+om te vertrekken, want te midden van het blijde gejoel vreesde het
+meideken steeds den provoost Spelle te zien verschijnen, met zijne
+beulsknechten.
+
+--Sla uwen rok over ons hoofd, sprak Uilenspiegel.
+
+En als herten liepen zij naar Destelbergen, naar de Drie Koningen,
+alwaar zij Lamme aan 't eten vonden.
+
+
+
+
+XXXI.
+
+Te Gent ging Uilenspiegel dikwijls bij Jacob Scoelap, bij Livinus
+Smet en bij Jan de Wulfslaeger, die hem kond gaven van den voor-
+of tegenspoed van den edelen Zwijger.
+
+En als Uilenspiegel naar Destelbergen terugkwam, vroeg Lamme hem
+telkens:
+
+--Welk nieuws brengt gij mede? Goed of slecht?
+
+--Laas! zeide Uilenspiegel, de Zwijger, zijn broeder Lodewijk, de
+andere hoofdlieden en de Franschen hadden besloten vooruit te rukken
+in Frankrijk, om zich met den prins van Condé aan te sluiten. Op die
+wijze waren zij er wellicht in geslaagd het arm Belgisch vaderland
+en het vrije geweten te redden. God liet dit niet toe, de Duitsche
+ruiters en landsknechten weigerden verder te gaan, en zeiden dat hun
+eed sprak van tegen den hertog van Alva te vechten, doch niet tegen
+Frankrijk. Hij heeft hun gesmeekt hun plicht te doen, doch tevergeefs;
+de Zwijger was gedwongen hen langs Champagne en Lotharingen te brengen
+naar Straatsburg, van waar zij naar Duitschland terugkeerden. Alles
+mislukt door dit plotseling en halsstarrig vertrek: de koning van
+Frankrijk weigert, niettegenstaande zijn verdrag met den prins, het
+geld te storten, dat hij hem beloofd had; de koningin van Engeland
+had er hem willen zenden om de stad en het land van Kales weder in
+bezit te krijgen; heure brieven werden onderschept door den hertog
+van Lotharingen, die er een afwijzend antwoord op zond.
+
+... Aldus zien wij dat schoon leger, al onze hoop op redding,
+verzwinden als spoken bij den zonsopgang; maar God is met ons, en als
+de aarde ons ontsnapt, zullen wij te water voortwerken. Leve de Geus!
+
+
+
+
+XXXII.
+
+Badend in tranen, kwam 't meideken zeggen tot Lamme en tot
+Uilenspiegel:
+
+--Te Meulestede laat Spelle, voor geld, moordenaars en coquinen
+ontsnappen. En onschuldigen doet hij ter dood brengen. Mijn broeder
+Michielken is onder hen. Laas! laat mij het U zeggen: gij zijt
+mannen, gij zult hem wreken. Een eerlooze, ontuchtige vuilbaard,
+Pieter de Roose, bevlekker van kinderen en verleider van meidekens,
+is de oorzaak van al het kwaad. Laas! mijn arme broeder Michielken
+en Pieter de Roose zaten op een avond, doch niet aan dezelfde tafel,
+in de taveerne den Valk, alwaar Pieter de Roose door een iegelijk
+geschuwd werd als de pest.
+
+... Mijn broeder, die met hem in dezelfde zaal niet wilde vertoeven,
+schold hem uit voor vuilbaard en beval hem onmiddellijk zijne biezen
+te pakken.
+
+... Pieter de Roose antwoordde:
+
+--De broeder van een publieke loddege zou minder van zijnen neus
+moeten maken,
+
+... Hij loog, want ik ben geen publieke loddege; ik geef mij alleen
+aan hen, die ik minne.
+
+... Toen smeet Michielken hem zijn pint klauwaard naar den kop, hem
+toeroepende dat hij er om loog, lijk een smerige vuilbaard die hij was;
+daarbij bedreigde hij hem met eene aftelling naar de eerste goesting,
+als hij niet dadelijk opkraamde.
+
+... De andere wilde nog antwoorden, doch Michielken deed als hij
+gezegd had: hij sloeg tweemaal met de vuist op zijn aangezicht en
+trok hem bij den snoet op de straat, alwaar hij hem, zonder deernis,
+gansch bebloed en gekneusd op een mesthoop smeet.
+
+... Als Pieter de Roose, die in alleenigheid niet kon leven, genezen
+was, ging hij in het Vagevier, eene taveerne, die heuren naam niet
+gestolen heeft; zóó treurig en somber is zij, dat zij maar bezocht
+wordt door arme lieden en bedelaars. Daar ook werd hij alleen gelaten,
+geschuwd, zelfs door de armzalige menschen. En niemand richtte het
+woord tot hem, behalve eenige boeren, die hem niet kenden, en eenige
+truwanten en diepers of weggeloopen soldaten. Herhaalde malen zelfs
+werd hij er geslagen, want hij is twistziek van aard.
+
+... Toen provoost Spelle met zijne beide hangmannen te Meulestede
+kwam, volgde Pieter de Roose hem overal op als een hond; op dezes
+kosten propte Spelle zich vol met wijn, met vleesch en smaakte alle
+genoegens, die voor geld te koop zijn. Zoo werd Pieter de Roose hun
+vriend en metgezel en deed hij alles wat zijn slecht karakter hem
+ingaf om degenen te folteren, die hij verfoeide, en dat waren al de
+inwoners van Meulestede, doch mijn armen broeder het meest.
+
+... Eerst en vooral begon hij met Michielken. Valsche getuigen,
+rabauwen, die gretig naar guldens waren, verklaarden dat Michielken een
+heretiek was, dat hij vuile reden gehouden had over Onze-Lieve-Vrouwe,
+en meermalen den naam van God en de santen en santinnen gelasterd
+had in de taveerne den Valk, en dat hij daarenboven voor 't minst
+driehonderd florijnen in eene kist liggen had.
+
+... Alhoewel de getuigen geenszins van goed en zedelijk gedrag
+waren, werd Michielken gevangengenomen. Daar Spelle en zijne knechten
+verklaard hadden, dat de bewijzen voldoende waren om den beschuldigde
+op de pijnbank te leggen, werd Michielken bij de armen gehangen aan
+eene katrol, die in de zoldering vastgemaakt was, nadat men aan elken
+zijner voeten een gewicht van vijftig pond had gebonden.
+
+... Hij loochende het stuk en zei dat, zoo er te Meulestede een
+truwant, een rabauw, een godslasteraar en een vuilbaard liep, het
+wel Pieter de Roose was, maar hij niet.
+
+... Doch Spelle wilde niets hooren, en beval den beulsknechten
+Michielken op te trekken tot aan de zoldering en hem vervolgens in eens
+te laten nedervallen, met de gewichten aan zijne voeten. Dat deden zij,
+en wel zoo wreedelijk, dat de huid en de spieren van den ongelukkige
+vaneenscheurden en dat de voeten nog nauwelijks aan de beenen hingen.
+
+... Michielken volhardde in zijne verklaring, dat hij onschuldig was;
+Spelle deed hem opnieuw folteren en liet hem verstaan dat hij hem
+vrijelijk zou laten henengaan, zoo hij hem honderd gulden wilde ter
+hand stellen.
+
+... Michielken zei, dat hij nog liever alle tormenten verduurde.
+
+... Toen die van Meulestede de gevangenneming vernomen hadden, wilden
+zij bij hoopen voor Michielken komen getuigen.
+
+... Michielken is geen ketter, zeiden eenstemmig al de goede burgers
+van de gemeente, want hij ging alle Zondagen naar de misse en
+naderde alle hoogdagen de heilige tafel; zij getuigden verder, dat
+hij over Onze-Lieve-Vrouwe nooit eenig andere rede gehouden had dan
+heure hulp in te roepen in moeilijke aangelegenheden; dat hij nooit
+kwaad gesproken had van eenige vrouw op aarde, en hij dienvolgens
+het nog minder hadde gedurfd van de hemelsche moeder Gods. Wat de
+godslasteringen betreft, die de valsche getuigen, naar hun zeggen,
+in de taveerne den Valk hadden hooren uitbraken, dat was gelogen van
+'t begin tot het einde, zeiden de getuigen.
+
+... Toen werd Michielken losgelaten, en de valsche getuigen
+gestraft. En Spelle deed Pieter de Roose voor zijne vierschaar
+verschijnen, doch liet hem weder los, zonder een onderzoek te doen
+of hem op de pijnbank te leggen, mits honderd gulden aanstonds betaald.
+
+... Pieter de Roose vluchtte uit Meulestede, uit vreeze dat het
+hem nog blijvende geld opnieuw de aandacht van Spelle zou wekken,
+terwijl Michielken, mijn arme broeder, stierf van den kanker, die
+zich aan zijne voeten gezet had.
+
+... Hij, die mij niet meer bezien wilde, deed mij toch roepen om mij
+te zeggen goed te letten op het vuur, dat brandt in mijn lichaam,
+en dat mij zeker naar de helle zou leiden. En ik kon slechts weenen,
+want het vuur brandt in mijn lichaam, en het is mijne schuld niet.
+
+... En in mijne armen gaf hij den geest.
+
+--Ha! zeide zij, hij, die op Spelle den dood van mijn zoeten en
+beminden broeder zou wreken, zou voor eeuwig mijn meester zijn, en
+'k zou hem gehoorzamen als een gewillige hond.
+
+Terwijl zij sprak, klopte de assche van Klaas op Uilenspiegel's borst.
+
+En hij besloot Spelle, den moordenaar, te doen hangen.
+
+Boelkin, zoo was de naam van het meideken, keerde gerust terug naar
+heur huis te Meulestede, zonder de wraak van Pieter de Roose te
+vreezen, want een koerier, die voor zaken naar Destelbergen gekomen
+was, verwittigde heur dat de parochiepaap en de poorters verklaard
+hadden, dat zij Spelle vóór den hertog zouden doen verschijnen,
+bijaldien hij de hand dorst leggen op de zuster van Michielken.
+
+Uilenspiegel, die het meideken vergezelschapt had naar Meulestede,
+kwam in de benedenkamer van het huis van Michielken, en zag daar het
+konterfeitsel van een meester-pasteibakker.
+
+Hij veronderstelde dat dit het portret van den armen doode was.
+
+En Boelkin zeide:
+
+--Dat is mijn rampzalige broeder.
+
+Uilenspiegel nam het konterfeitsel en sprak:
+
+--Spelle wordt gehangen!
+
+--Hoe zult ge dat doen? vroeg zij.
+
+--Moest gij het weten, antwoordde hij, dan zoudt gij geenerlei genoegen
+meer smaken als gij het ziet.
+
+Boelkin schudde het hoofd en zei met jammerende stemme:
+
+--Gij hebt geen vertrouwen in mij.
+
+--Hoe zoo? sprak Uilenspiegel. Is het integendeel geen groot bewijs
+van vertrouwen als ik u zeg: "Spelle wordt gehangen?" Met dat woord
+alleen kunt gij mij doen hangen vóór hem.
+
+--Inderdaad, antwoordde zij.
+
+--Dus, hernam Uilenspiegel, haal mij wat goede klei, een dobbele
+pint bruinbier, klaar water en eenige sneden ossevleesch. Alles moet
+afzonderlijk zijn.
+
+... Het vleesch is voor mij, het bruinbier voor het vleesch, het
+water voor de klei en de klei voor het konterfeitsel.
+
+Uilenspiegel at en dronk, terwijl hij de klei kneedde; soms at hij
+er wel een brokje van, doch daar sloeg hij geen acht op, want heel
+aandachtig beschouwde hij het konterfeitsel van Boelkin's broeder.
+
+Toen de klei gekneed was, maakte hij daarvan een masker, met een neus,
+eenen mond, oogen en ooren, dat zulke groote gelijkenis had met de
+trekken van den doode, dat Boelkin er oprecht over verwonderd was.
+
+Daarna legde hij het masker in den oven te drogen. Toen het droog
+was, beschilderde hij het met de kleur van de lijken, met verwilderde
+oogen en een pijnlijk en getrokken gelaat, als dat van een zieltogende.
+
+Toen was het meideken niet meer verwonderd, doch ze bekeek het masker,
+zonder er van de oogen te kunnen slaan; ze werd bleek, ontstelde,
+bedekte heur gezicht met de handen, en huiverend sprak zij:
+
+--Hij is het, mijn arm Michielken!
+
+Met klei maakte Uilenspiegel ook twee bloedige voeten.
+
+Boelkin, die van heur eersten schrik bekomen was, zei op plechtigen
+toon:
+
+--Gezegend is hij, die den moordenaar zal vermoorden.
+
+Uilenspiegel nam het masker en de voeten en sprak:
+
+--Nu moet ik iemand hebben, die mij wil helpen.
+
+Boelkin antwoordde:
+
+--Ga naar de Blauwe Gans, bij Joost Lansaem van Ieperen, dewelke deze
+taveerne houdt. Hij was de beste kameraad, de trouwste vriend van
+mijn ongelukkigen broeder. Zeg hem, dat het Boelkin is, die u zendt.
+
+Uilenspiegel deed zooals zij hem heette.
+
+Na zijn dagelijksch werk voor den dood, ging provoost Spelle 's
+avonds in de Valk warmen dobbelen klauwaard drinken, die gekookt was
+met kaneel en met Madeira-suiker. Uit vreeze van gehangen te worden,
+dorst men hem, in de afspanning, niets weigeren.
+
+Pieter de Roose, die weer moed gevat had, was naar Meulestede
+teruggekeerd. Overal volgde hij Spelle en zijne beulsknechten, om
+door hen beschermd te worden.
+
+En Spelle trakteerde hem soms. En samen dronken zij blijde met het
+geld der onschuldige slachtofferen.
+
+Maar de taveerne de Valk werd niet meer bezocht zooals in de schoone
+dagen dat het dorpje in vrede leefde, den Heer rechtzinnig diende en
+nog niet gekweld werd op het stuk van religie. Nu, echter, was het
+als in rouw gehuld; dat zag men aan zijn menigvuldige ledige huizen,
+aan zijn eenzame straten, waar enkel eenige magere honden rondzwierven,
+die in de mesthoopen wroetten, om hun eten te zoeken.
+
+In Meulestede was er geene plaats meer dan voor de twee booswichten. De
+verschrikte inwoners zagen hen heel den dag overmoedig rondloopen,
+de huizen der aanstaande slachtofferen teekenen, de doodenlijsten
+opmaken. En als zij 's avonds, onder 't zingen van vuile
+liedekens, van den Valk terugkeerden, werden ze gevolgd door twee
+beulsknechten, dronken als zij, en van top tot teen gewapend om hen
+te vergezelschappen.
+
+Uilenspiegel ging in de Blauwe Gans, bij Joost Lansaem, die achter
+zijnen toog stond.
+
+Uilenspiegel trok een fleschje brandewijn uit zijnen zak en zei tot
+den baas:
+
+--Boelkin heeft zoo twee tonnen te verkoopen.
+
+--Kom binnen in de keuken, zei de baas.
+
+Hij sloot de keukendeur achter zich en bezag Uilenspiegel vlak in
+de oogen.
+
+--Gij zijt geen koopman in brandewijn, sprak hij, wat beteekent uw
+knipoogen? Wie zijt gij?
+
+Uilenspiegel antwoordde:
+
+--Ik ben de zoon van Klaas, die te Damme verbrand werd; de assche van
+den doode klopt op mijne borst: ik wil Spelle den moordenaar dooden.
+
+--Is 't Boelkin, die u zendt? vroeg de weerd.
+
+--Boelkin zendt mij bij u, antwoordde Uilenspiegel. Ik zal Spelle
+dooden en gij zult mij helpen.
+
+--Ik wil, zegde de baas. Wat moet ik doen?
+
+Uilenspiegel antwoordde:
+
+--Ga bij den parochiepaap, die, als een goede herder, de vijand van
+Spelle is. Verzamel uwe vrienden en kom morgen, na de slaapklok,
+met hen op de Evergemsche baan, voorbij het huis van Spelle, tusschen
+den Valk en het huis van dien snoodaard. Gij moet allen in de schaduw
+blijven en moogt geen witte kleeren aanhebben. Op klokslag tien zult
+gij Spelle uit de herberg zien komen, terwijl van den anderen kant
+een wagen zal komen aanrijden.
+
+... Dezen avond moogt gij uwe vrienden niet verwittigen; zij
+slapen te dicht bij de ooren hunner vrouw. Eerst morgen zult gij ze
+opzoeken. Komt, luistert goed, en weest alles indachtig.
+
+--Wij zullen alles onthouden, sprak Joost.
+
+En, met zijnen beker in de hand, sprak hij:
+
+--Ik drink op de koorde van Spelle!
+
+--Op zijne koorde! sprak Uilenspiegel.
+
+Daarop keerde hij met den baas terug in de gelagkamer, waar eenige
+Gentsche oude-kleerkoopers zaten te drinken. Zij kwamen van de
+Zaterdagsmerkt, te Brugge, alwaar zij, tegen goeden prijs, zilver-
+en goudlakensche wambuizen en opperste kleederen verschacherd hadden,
+dewelke zij voor eenige oortjes gekocht hadden van edelen, die ten
+onder gegaan waren door de weelde der Spanjaards te willen evenaren.
+
+En zij gastreerden luidruchtig op de groote winsten, die zij behaald
+hadden.
+
+Uilenspiegel en Joost Lansaem gingen in eenen hoek zitten en, onder
+'t drinken, kwamen zij overeen, zonder gehoord te worden, dat Joost
+bij den parochiepaap zou gaan, die kwaad was op Spelle, den moordenaar
+van zoovele onschuldige slachtofferen.
+
+Daarna zou hij de vrienden gaan vinden.
+
+'s Anderen daags kwamen de vrienden van Michielken, die verwittigd
+waren, bijeen bij Joost Lansaem in de Blauwe Gans, alwaar zij, als naar
+gewoonte en om hunne inzichten te verbergen, pinten op pinten dronken.
+
+Bij de slaapklok gingen zij henen en begaven zich, langs verschillende
+wegen, naar de Evergemsche baan.
+
+Zij waren zeventien in getal.
+
+Op slag van tien uren kwam Spelle uit den Valk, gevolgd door zijne
+twee beulsknechten en door Pieter de Roose.
+
+Lansaem en zijne gezellen waren verscholen in de schuur van Samson
+Boone, een vriend van Michielken.
+
+Spelle kon hen niet zien.
+
+De vrienden van Michielken hoorden hem zwijmelend voorbijgaan, alsook
+Pieter de Roose en de beide beulsknechten.
+
+Met een zware tong, stamelde Spelle hikkend en snikkend:
+
+--Provoosten! provoosten! die hebben hier op Gods aarde goed leven;
+komaan, truwanten, die van mijn overschot leeft, ondersteunt mij toch
+een beetje!
+
+Maar, op den steenweg, van den kant van den kouter, hoorde men op
+eens het gebalk van een ezel en 't geklap eener zweep.
+
+--Dat moet een weerspannige ezel zijn, zij Spelle, want hij wil niet
+vooruit, niettegenstaande het vriendelijk verzoek van de zweep.
+
+Plotseling hoorde men een groot wielengeknars en eenen wagen, die
+onstuimig over den steenweg stormde.
+
+--Houdt hem tegen! riep Spelle.
+
+Toen de wagen dicht bij hen was, sprongen Spelle en zijne twee
+beulsknechten naar den kop van den ezel.
+
+--In dien wagen steekt niets, hij is teenemaal ledig, sprak een van
+de beulsknechten.
+
+--Lomperik, zei Spelle, sedert wanneer rijden de wagens 's nachts
+heel alleen op de baan? In dien wagen is iemand, die zich verbergt;
+spoedt u, steekt de lanteernen aan en heft ze omhoog, ik zal kijken.
+
+De lanteernen werden aangestoken en Spelle klom op den wagen met
+zijne lanteerne in de hand; maar nauwelijks had hij gekeken, of hij
+slaakte een grooten schreeuw en viel achterover, gillend:
+
+--Michielken! Michielken! Jezus, ontferm u mijner!
+
+In een hoek van den wagen stond een man, die in 't wit gekleed was,
+lijk de pasteibakkers, en die, in de beide handen, bloedige voeten
+vasthield.
+
+Toen Pieter de Roose den man zag, die nu door het licht der lanteernen
+beschenen was, riep hij als waanzinnig:
+
+--Michielken! Michielken!
+
+En de twee beulsknechten klappertandden en fluisterden:
+
+--Michielken! Heer, ontferm u onzer!
+
+Op het gerucht kwamen de zeventien vrienden bij, om het schouwspel
+te zien, en allen verschrikten toen zij, bij het zilveren licht van
+de maan, de treffende gelijkenis zagen van Michielken, den armen doode.
+
+En de gedaante zwaaide steeds met de bloedige voeten.
+
+Het was zijn zelfde vol en rond gezicht, doch verbleekt door den
+dood, en grimmig, sneeuwwit keek het dreigend toe, en aan de kin
+waren reeds de wormen aan 't knagen.
+
+Het spook, dat altijd met de bloedige voeten zwaaide, zei met holle
+stem tot Spelle, die op den rug lag te zuchten:
+
+--Spelle! provoost Spelle, word wakker!
+
+Maar Spelle verroerde zich niet.
+
+--Spelle, sprak het spook opnieuw, provoost Spelle, word wakker,
+of ik sleep u in den gapenden mond van de helle.
+
+Spelle sukkelde recht en riep jammerlijk, met de haren te berge
+van schrik:
+
+--Michielken! Michielken! heb medelijden!
+
+De poorters waren nader gekomen, doch Spelle zag niets anders dan de
+lichtjes hunner lanteernen, die hij voor oogen van duivelen nam. Zoo,
+ten minste, bekende hij later.
+
+--Spelle, vervolgde de schim van Michielken, zijt gij tot sterven
+bereid?
+
+--Tot sterven, neen, antwoordde de provoost, neen, messire Michielken,
+daar ben ik niet toe bereid, want ik wil vóór God niet verschijnen,
+beladen met zoo menigvuldige zonden.
+
+--Herkent gij mij? vroeg het spook.
+
+--God weze mij genadig, zuchtte Spelle; ja, ik herken u; gij zijt
+het spook van Michielken, den pasteibakker, die onschuldig stierf
+in zijn bed, ten gevolge van de pijnen der foltering; en de twee
+bloedige voeten zijn die, aan ieder derwelke ik een gewicht van
+vijftig pond deed hangen. Ha! Michielken, ontferm u mijner, schenk
+mij vergiffenis; die Pieter de Roose heeft mij in bekoring gebracht;
+hij bood mij vijftig gulden, en ik heb ze aanveerd, om uwen naam in
+het doodenboek te schrijven.
+
+--Wilt gij biechten? vroeg het spook.
+
+--Ja, messire, zeker wil ik biechten, alles bekennen en penitentie
+doen. Maar verweerdig u toch die duivelen te doen weggaan, die daar
+staan, bereid om mij te verslinden. Ik zal alles bekennen. Verwijder
+die oogen van vuur! Ik heb hetzelfde gedaan te Doornijk, met vijf
+onschuldige poorters, en ook te Brugge, met vier andere. Ik weet hunne
+namen niet meer, maar ik zal ze opzoeken en ze u zeggen, als gij wilt;
+elders nog heb ik insgelijks gezondigd, heer, en door mijn toedoen
+zijn negen en zestig onschuldige martelaren ten grave gedaald.
+
+... Michielken, de koning moest geld hebben. Men had het mij laten
+weten, doch ik ook moest er hebben; het is te Gent, in den kelder,
+onder de vloersteenen, bij de oude Gravels, mijn echte moeder. Ik
+heb alles, alles gezegd; genade en ontferming! Doe de duivelen
+weggaan. Heere God! Heilige Maagd Maria, wees mijn voorspreekster;
+verwijder de vuren der helle! Ik zal alles verkoopen, alles aan de
+arme geven en mijn leven lang boetveerdigheid plegen.
+
+Uilenspiegel, ziende dat de menigte der toegeloopen poorters bereid
+was om hem ter zijde te staan, sprong van den wagen naar de keel van
+Spelle en wilde hem verworgen.
+
+Maar de pastoor kwam bij.
+
+--Laat hem leven, sprak hij, het is beter dat hij door beulshanden
+sterve dan door die van een spook.
+
+--Wat wilt gij er mee doen? vroeg Uilenspiegel.
+
+--Hem vóór den hertog beschuldigen en naar verdienste doen hangen,
+antwoordde de parochiepaap. Maar wie zijt gij? vroeg hij.
+
+--Ik ben, antwoordde Uilenspiegel, het masker van Michielken en een
+arme Vlaamsche vos, die terug naar zijn hol trekt, uit vreeze voor
+de Spaansche jagers.
+
+Intusschen nam Pieter de Roose in aller ijl de vlucht.
+
+En Spelle werd gevonnist en gehangen, en zijne goederen
+verbeurdverklaard.
+
+En de koning erfde.
+
+
+
+
+XXXIII.
+
+'s Anderen daags trok Uilenspiegel naar Kortrijk, langsheen den boord
+van de Leie, met heur helder gouden water.
+
+Jammerend volgde Lamme zijn vriend.
+
+Uilenspiegel zei tot hem:
+
+--Zucht gij nu weder, lafhertige ziele, voor de vrouw, die u een
+hoornen kroon op het hoofd zette?
+
+--Mijn vriend, antwoordde Lamme weemoedig, zij was mij altijd getrouw,
+en beminde mij genoegzaam, lijk ik ze te zeer beminde, mijn zoete
+Jezus. Eens dat zij naar Brugge gegaan was, kwam zij teenemaal
+veranderd terug. Sedertdien, als ik heur van liefde sprak, gaf zij
+mij tot antwoord:
+
+--Ik moet met u leven als eene vriendinne, doch anders niet.
+
+--Toen sprak ik, met den weemoed in mijn gebroken herte:
+
+--Liefste mijne, wij zijn getrouwd voor den Heer. Deed ik voor u niet
+alles wat gij wildet? Ging ik niet dikwijls gedost in een zwart linnen
+wambuis of een bombazijnen opperste kleed, om u, niettegenstaande
+de koninklijke ordonnantiën tegen de weelde, zijden en goudlakensche
+kleeren te laten dragen? Bemint ge mij dan niet meer, liefste?
+
+--Ik bemin u, sprak zij, volgens God en Zijne wetten, volgens de
+heilige voorschriften en de boetveerdigheid. Nochtans zal ik een
+deugdzame gezellin voor u wezen.
+
+--Met uwe deugdzaamheid heb ik niets te maken, antwoordde ik; u is het,
+die ik hebben wil, u, mijne vrouw!
+
+--Zij schudde het hoofd en vervolgde:
+
+--Ik weet, dat gij goed en braaf zijt; tot heden waart gij de kok in
+ons huis, om mij het koken en het braden te sparen; tot heden streekt
+gij onze lakens, kragen en hemden, omdat de ijzers mij te zwaar vielen;
+gij deedt de wasch, gij kuischtet het huis en de straat vóór de deur,
+om mij de minste vermoeienis te sparen. Thans wil ik werken in uwe
+plaats, doch verder niets, mijn vriend.
+
+--Ik geef daar niet om, antwoordde ik; ik zal als voorheen uwe
+kamenier, uwe strijkster, uwe keukenmeid, uwe waschvrouw, uw
+onderdanige slaaf wezen; maar schei toch geen twee herten en zielen,
+die maar één wezen uitmaken; breek den zoeten liefdeband niet, die
+ons zoo innig verbindt.
+
+--Het moet, antwoordde zij.
+
+--Laas! zeide ik, is het te Brugge, dat gij dit harde besluit hebt
+genomen?
+
+Zij antwoordde:
+
+--Ik heb gezworen voor God en Zijne santen.
+
+--Wie dan, riep ik uit, heeft u gedwongen te zweren uwe echtelijke
+plichten niet meer te volbrengen?
+
+--Hij, die den geest Gods in zich heeft en zich verweerdigt mij onder
+'t getal zijner boetelingen te tellen, sprak zij.
+
+--Van dat oogenblik hield zij op mijne vrouw te wezen, alsof zij de
+trouwe gezellin van een ander was.
+
+--Ik smeekte, plaagde, dreigde haar; ik weende en bad, doch
+tevergeefs. Op een avond, dat ik van Blankenberge terugkwam, alwaar ik
+gegaan was om de halfwinning van een mijner hofsteden te ontvangen,
+vond ik mijne vrouw niet meer in huis. Zij was onze halle ontvlucht;
+ongetwijfeld was zij mijne smeekingen moede, of was zij vergramd of
+droevig om mijn verdriet.
+
+--Waar mag zij nu wezen?
+
+En Lamme zette zich neer aan den boord van de Leie, met het hoofd in
+zijne handen, en keek naar het water.
+
+--Ha! mijne vriendin, sprak hij, wat waart gij teeder, poezel en
+lieftallig! Zal ik ooit een duifje vinden als gij? Stoverije van
+liefde, zal ik u nimmermeer proeven? Waar zijn uwe kussen, geurig
+als ortolanen; waar is uw mond, op denwelken ik uw zoenen plukte,
+als het bijtje den honig op de roze; waar zijn uw witte armen, die
+mij streelend omhelsden? Waar is uw kloppend hert, uw ronde boezem
+en die lieve huivering van uw aanbiddelijk lichaam, verlangend naar
+liefde? Doch waar zijn uwe golven van vroeger, frissche rivier, die
+uw nieuwe golfjes zoo blijde voortstuwt in 't gouden licht van de zon?
+
+
+
+
+XXXIV.
+
+De beide wandelaars kwamen voorbij het Petegemsche bosch; het was
+snikkend heet. Lamme sprak tot Uilenspiegel:
+
+--Ik braad; laat ons de schaduw opzoeken.
+
+--'t Kan mij niet schelen, antwoordde Uilenspiegel.
+
+Zij zetten zich neer in het bosch, op het gras, en zagen eenen troep
+herten voorbijrennen.
+
+--Kijk goed, Lamme, zei Uilenspiegel, die den haan zijner Duitsche
+bus overtrok. Daar zijn groote, oude herten, die hun gewei met negen
+takken fier in de lucht dragen; lieve reebokjes, die hunne schildknapen
+zijn, huppelen aan hunne zijde, bereid om hun van dienst te zijn met
+hun puntige horens. Zij gaan naar hun leger. Trek het rad van uwe
+bus over, lijk ik. Schiet. Het oude hert is gewond. Een reebokje is
+getroffen aan de bil; het vlucht. Laten wij het volgen totdat het
+valt. Doe lijk ik, loop, spring, vlieg....
+
+--Mijn gekke vriend is wederom bezig, sprak Lamme, hij wil de herten
+te voet achternazetten. Beproef niet te vliegen zonder vleugelen,
+'t is verloren moeite. Gij zult ze niet krijgen. Ha! wat wreedaardige
+gezel! Meent gij, dat ik zoo vlug ben als gij? Ik zweet, mijn vriend;
+ik zweet en ik ga vallen van vermoeidheid. Als de houtvester u pakt,
+wordt gij gehangen. Herten zijn koningswild; laat ze loopen, mijn zoon,
+gij kunt ze toch niet krijgen.
+
+--Kom, sprak Uilenspiegel. Hoort gij het gerucht van zijn gewei in
+de bladeren? 't Is als eene hoos, die voorbijvliegt. Zie eens deze
+gebroken takken, de bladeren, waarmede de grond teenemaal bedekt
+is. Nu heeft het een nieuwen kogel in de bil; fluks eten wij het op.
+
+--Het is nog niet gebraden, zeide Lamme. Laat die arme dieren maar
+loopen. He! wat is het warm! Ge moogt mij gelooven: ik ga er bij
+vallen om nimmermeer op te staan.
+
+Doch eensklaps kwamen armzalig gekleede mannen, die wapenen droegen,
+te allen kanten te voorschijn uit het bosch. Blaffende honden renden
+de herten achterna. Vier mannen met woest uitzicht kwamen rond Lamme
+en Uilenspiegel staan en leidden hen naar eene plaats, te midden in
+het dichtst begroeide deel van het woud.
+
+Daar zagen zij vrouwen en kinderen, die daar gelegerd waren, en
+ook een groot getal mannen, allen op verschillende wijze gewapend
+met zweerden, met bussen, met voetbogen, met lansen, met spiesen,
+met ruiterspistolen.
+
+Toen Uilenspiegel hen zag, zei hij tot hen:
+
+--Gij schijnt hier in gemeenschap te leven om de vervolging te
+ontvluchten; zijt gij soms de Broeders van het Woud?
+
+--Wij zijn de Broeders van het Woud, antwoordde een grijsaard, die bij
+het vuur zat en eenige vogelen in eene braadpan liet bakken. Maar gij,
+wie zijt gij?
+
+--Ik ben uit het schoone Vlaanderenland vandaan, antwoordde
+Uilenspiegel, en ben schilder, boer, edelman, beeldhouwer, alles te
+gelijk. En door de wereld ga ik aldus, om het goede en het schoone
+te prijzen, en luidkeels te lachen en te spotten met alles wat dwaas
+en verkeerd is.
+
+--Als gij zoovele landen bereisd hebt, sprak de oude man, moet gij
+Schild en Vriend kunnen uitspreken, naar de wijs van de Gentenaren; zoo
+niet, zijt gij een valsche Vlaming en moet gij u tot sterven bereiden.
+
+Uilenspiegel sprak:
+
+--Schild en Vriend.
+
+--En gij, dikzak? vroeg de oude man tot Lamme, welk bedrijf voert
+gij uit?
+
+Lamme antwoordde:
+
+--Mijne landerijen, pachthoeven, cijnzen en messeniën opeten, mijn
+echtelijke vrouw zoeken, en mijn vriend Uilenspiegel in alle oorden
+en plaatsen opvolgen.
+
+--Als gij ook zooveel gereisd hebt, sprak de oude man, moet gij weten
+hoe die van Weert, in Limburg, worden geheeten?
+
+--Ik weet het niet, was 't antwoord van Lamme, maar kunt gij mij
+den naam niet zeggen van den ellendigen deugniet, die mijne vrouw
+overreede heur huis te verlaten? Zeg mij zijn naam, en dadelijk ga
+ik hem vermoorden.
+
+De oude man antwoordde:
+
+--In deze wereld bestaan twee dingen, die nimmermeer wederkomen, eens
+dat zij weg zijn: te weten het verteerde geld, en de onverschillig
+geworden vrouw, die den huize ontvlucht is.
+
+Toen wendde de oude man zich tot Uilenspiegel en stelde hij hem ook
+deze vraag:
+
+--En gij, weet gij niet hoe die van Weert, in Limburg, worden geheeten?
+
+--De rogstekers, wat in hunne streek onttooveraars van roggen bediedt.
+
+--Kunt gij ook zeggen waarom?
+
+--Een levende rog, gevallen uit de kar van een vischverkooper, lag
+zoodanig te spartelen op den weg, dat eenige oude wijven ze voor den
+duivel namen. "Laat ons den parochiepaap halen om den duivel uit de
+rog te verbannen", zeiden zij. De pastoor bezweerde de rog, en nam ze
+mede naar huis, alwaar hij ze kookte, ter eere van die van Weert. Mocht
+het Gode behagen hetzelfde lot te bescheren aan den bloedigen koning!
+
+Intusschen hoorde men, in het bosch, 't geblaf van de honden
+weerklinken. De gewapende mannen liepen het woud in, en riepen
+luidkeels om het wild schrik aan te jagen.
+
+--Het zijn de dieren, die ik achternagezet heb, zeide Uilenspiegel.
+
+--Wij zullen ze opeten, sprak de oude man. Maar zeg mij nog: hoe
+noemt men die van Eindhoven, in Limburg?
+
+--De pinnemakers, antwoordde Uilenspiegel. Eens was de vijand vóór de
+poort hunner stede, en zij grendelden die vast met eenen wortel. De
+ganzen kwamen en begonnen gulzig in den wortel te pikken, en de
+vijand rukte Eindhoven binnen. Maar ijzeren bekken zullen het wezen,
+die de pinnen zullen vaneen pikken, achter dewelke men het vrije
+geweten wil kerkeren.
+
+--Als God met ons is, wie kan tegen ons zijn? antwoordde de oude man.
+
+Uilenspiegel sprak:
+
+--Hondengeblaf, mannengeschreeuw en gebroken takken: het stormt in
+het woud.
+
+--Is hertenvleesch lekkere spijze? vroeg Lamme, terwijl hij de
+stoverije bekeek.
+
+--Het geroep der drijvers komt nader en nader, zei Uilenspiegel tot
+Lamme; de honden zijn nabij. Wat gedonder! Het hert! het hert! uit
+den weg, mijn vriend! Foei! wat leelijk beest, het heeft mijn dikken
+vriend ten gronde geworpen, te midden van potten, pannen, mooren,
+ketels en stoverije. Waanzinnig van schrik, gaan de vrouwen en
+meidekens op den loop. Maar gij bloedt, mijn vriend?
+
+--Gij lacht, nietdeug, sprak Lamme. Ja, ik bloed, het dier heeft mij
+met de horens eenen stoot op mijn achterste gegeven. Zie, mijne hooze
+is gescheurd, en mijn vel insgelijks, en al die lekkere stoverije
+ten gronde! Zie, ik verlies zooveel bloed, dat mijne kous er gansch
+mee besmeurd is.
+
+--Dat hert is een knap chirurgijn, het heeft U van eene geraaktheid
+gered, antwoordde Uilenspiegel.
+
+--Foei, hertelooze deugniet die ge zijt, sprak Lamme verwijtend. Doch
+ik zal U niet meer volgen. Hier blijf ik, te midden van deze goede
+mannen en vrouwen. Hoe kunt ge toch zoo schaamteloos wezen, ongevoelig
+te zijn voor mijne smerten, alswanneer ik u volg op de hielen, als
+een hondje, door sneeuw, door vorst, door hagel en wind en, als het
+heet is, mijne ziel door mijn vel zweet?
+
+--Wees gerust, 't is niet erg. Leg een oliekoekje op uwe wonde,
+het zal een gebakken pleister zijn, antwoordde Uilenspiegel. Maar
+weet gij hoe die van Leuven worden geheeten? Gij weet het niet,
+mijn arme vriend? Hewel, ik zal het u zeggen, maar gij moogt niet
+meer schreien. Men heet ze de koeienschieters: want eens waren
+ze zoo onnoozel naar weerlooze koeien te schieten, die zij voor
+vijandelijke soldaten aanzagen. Wat ons betreft, wij schieten naar
+de Spaansche bokken, hun vleesch stinkt als de pest, maar hun vel is
+goed om trommelen van te maken. En die van Thienen? Weet gij het? Ook
+al niet? Zij hebben den glorierijken naam van kwekkers. Want bij
+hen vliegt, op Sinksen, in de groote kerk, een eendvogel van het
+oksaal naar het autaar, en dat is de beeltenis van hunnen Heiligen
+Geest. Leg eenen heete koek op uwe wonde. Het zal niet erg zijn,
+want ik zie dat gij, zonder een woord te vertellen, de mooren en
+stoverije opraapt, die het hert omver gesmeten heeft. Uw moed behoort
+vooral thuis in de keuken. Gij steekt het vuur opnieuw aan, brengt den
+soepketel terug op zijne drie palen, en houdt u zorgvuldig bezig met
+de kook. Weet gij waarom er vier wonderen te Leuven zijn? Neen? Ik
+zal het u zeggen. Ten eerste, omdat de levenden er onder de dooden
+gaan, want St.-Michielskerk is gebouwd dicht bij de poort van de
+stad. Haar kerkhof ligt op den berm der wallen; ten tweede, omdat de
+klokken er buiten de torens hangen, gelijk men aan St.-Jacobskerk
+ziet, waar een groote klok en een kleine klok zijn; daar de kleine
+in den toren niet meer kon geplaatst worden, heeft men ze buiten
+gehangen. Ten derde, omdat de autaren buiten de kerk staan, want de
+gevel van St.-Jacobskerk lijkt op een autaar. Ten vierde, ter oorzake
+van den Toren-zonder-Nagels, omdat de torenspits van Ste-Geertrui
+van steen gemaakt is en niet van hout, en dat men in steenen geene
+nagelen slaat, behalve in het hert van den bloedigen koning, dat ik
+boven aan de groote poort van Brussel zou willen spijkeren. Maar, gij
+luistert niet. Hebt gij zout in het eten gedaan? Weet gij waarom die
+van Dendermonde de vuurpannen heeten? Omdat, toen eens een jonge prins
+in de afspanning de Wapens van Vlaanderen moest komen vernachten,
+de baas niet wist hoe hij het bed warm zou krijgen, want hij had
+geene vuurpan. Hij deed het bed verwarmen door zijne dochter, die,
+zoodra zij den prins hoorde bovenkomen, ijlings de vlucht nam, en de
+prins vroeg waarom men de pan uit het bed had genomen. God believe
+dat koning Philippus, in een gloeienden ijzeren trommel gestoken,
+tot vuurpan diene voor het leger van Astarte.
+
+--Laat mij gerust, zeide Lamme; ik lach met u, met uwe vuurpannen,
+met uwen Toren-zonder-Nagels, met uwe Astarte en met al de flauwe kul,
+die gij verkoopt. Trek mij niet af van mijne sausen.
+
+--Pas op, sprak Uilenspiegel. Het geblaf houdt niet op, het komt
+dichter en dichter, de honden huilen, de trompetten weerschallen. Pas
+op voor het hert.
+
+Op die woorden nam Lamme de vlucht, en Uilenspiegel riep hem nog
+achterna:
+
+--Hoort gij de jachthorens?
+
+--'t Is niets, Lamme, kom terug bij uwe stoverije, sprak de oude
+man. 't Zijn de honden, die hun deel van het wild krijgen; het hert
+is dood.
+
+--Dat zal ons een lekkeren maaltijd bezorgen, sprak Lamme. Ik hoop
+wel dat gij mij zult nooden, ter oorzake van de moeite, die ik mij
+geef voor ulieden. De saus van de vogelen zal lekker zijn, maar ze
+kraakt toch een weinig. Dat kan ook niet missen, want de vogelen
+zijn in het zand gevallen, als die groote duivel van een hert op mij
+kwam gestormd, en mijn wambuis en mijn vel al te zamen aan stukken
+trok. Maar zeg eens, vreest gij de houtvesters niet?
+
+--Wij zijn al te talrijk, sprak de oude man; zij zijn bevreesd en
+verontrusten ons niet. Ook de serjanten, beulsknechten en rechters
+laten ons met vrede. De inwoners van de steden zien ons geerne,
+want wij doen hun geen kwaad. Wij zullen hier nog eenigen tijd
+leven in vrede, ten ware het Spaansche leger ons omsingelde. Mocht
+dat gebeuren, zoo zouden wij, grijsaards, jonge mannen, vrouwen,
+dochteren, knapen en meidekens, ons leven duur verkoopen, en liever
+nog doodden wij elkander, dan duizend folteringen te lijden door de
+hand van den bloedigen hertog.
+
+Uilenspiegel sprak:
+
+De tijd is voorbij, dat men den gruwzamen beul te lande bestreed. 't
+Is op zee, dat wij zijne macht moeten fnuiken. Gaat naar den kant van
+de Zeeuwsche eilanden, over Brugge, Heist en Knokke, langs het duin.
+
+--Wij bezitten geen duit, spraken zij.
+
+Uilenspiegel antwoordde:
+
+--Hier zijn duizend karolussen vanwege den prins. Gaat voort langsheen
+de waterloopen, vaarten, stroomen en rivieren; als gij schepen ziet met
+het merk J-H-S, dat een uwer het gezang des leeuweriks nabootse. Een
+hanengekraai zal U antwoorden. En gij zult wezen bij vrienden, bij
+soldaten van 't vrije geweten.
+
+--Wij zullen het doen, zeiden de mannen.
+
+De jagers, gevolgd door de honden, verschenen weldra, en trokken met
+koorden het doode hert achter zich.
+
+Toen zetten allen zich neer rond het vuur.
+
+Zij waren wel zestig in getal, mannen, vrouwen en kinderen.
+
+Het brood werd uit de weitasschen gehaald, de messen uit de scheeden
+getrokken. Het hert werd aan stukken gesneden, gestroopt, geruimd,
+en met het kleinere wild aan het braadspit gestoken.
+
+En, na den maaltijd, zag men Lamme tegen eenen boom zitten snorken,
+met het hoofd op de borst.
+
+Toen de avond gevallen was, trokken de Broeders van het Woud in holen
+onder den grond om te slapen, en Lamme en Uilenspiegel deden hetzelfde.
+
+Gewapende mannen hielden de wacht rond het kamp. En Uilenspiegel
+hoorde de droge bladeren onder hunne voeten kraken.
+
+En 's anderen daags morgens ging hij henen met Lamme, terwijl die
+van het kamp zeiden tot hem:
+
+--God zegene u; wij gaan naar de zee.
+
+
+
+
+XXXV.
+
+Te Harelbeke vernieuwde Lamme zijnen voorraad oliekoeken. Hij vond
+ze zoo lekker, dat hij er zeven en twintig zelf opat en dertig in
+zijnen korf stak.
+
+Uilenspiegel droeg zijne vogelkooien in de hand.
+
+Rond den avond kwamen zij te Kortrijk, alwaar zij afstapten in de
+afspanning de Bie, bij Gillis Vanden Ende, die aan zijne deur kwam,
+zoodra hij het gezang des leeuweriks hoorde.
+
+Daar leefden zij als vischjes in 't water. Toen de weerd de brieven
+des prinsen gezien had, stelde hij Uilenspiegel vijftig karolussen ter
+hand voor den Zwijger; bovendien wilde hij niets voor den kalkoen,
+dien hij opgediend had, noch voor den dubbelen klauwaard, waarmede
+hij hem rijkelijk besproeide. Ook verwittigde hij hem, dat er spionnen
+van den Bloedraad in Kortrijk rondliepen, weshalve hij en zijn gezel
+goed op hunne tong moesten letten.
+
+--Wij zullen ze wel herkennen, zeiden Lamme en Uilenspiegel.
+
+De zonne neigde ten Westen en vergulde de gevelspitsen der huizen;
+de vogelen zongen hun avondgebed; de vrouwen praatten op de zulle
+harer deuren; de kinderen stoeiden in het stof en Uilenspiegel en
+Lamme dwaalden op goed-valle-'t-uit door straten en stegen.
+
+Eensklaps sprak Lamme:
+
+--Ik heb aan Gillis Vanden Ende gevraagd of hij geene vrouw gezien had,
+die op de mijne geleek--ik gaf hem zoo goed als ik kon de beschrijving
+van heur bekoorlijk gezicht--en hij zei mij dat, bij Stevenijne, op
+den Brugschen steenweg, in den Regenboog, buiten de stad, alle avonden
+een groot getal vrouwen bijeenkomen. Ik trek er aanstonds naar toe.
+
+--Ik zal u daar komen vinden, sprak Uilenspiegel. Ik wil de stad
+eens afzien; als ik uwe vrouw tegenkom, zal ik ze dadelijk bij u
+zenden. Vergeet niet, dat de baas u voor raad heeft gegeven op uwe
+tong te passen, zoo gij aan uw leven houdt.
+
+--Wees gerust, sprak Lamme.
+
+Uilenspiegel wandelde op zijn gemak rond de stad; de zonne ging onder
+en de avond viel snel.
+
+Uilenspiegel kwam in een eenzame steeg. Daar hoorde hij kunstig op de
+vedel spelen; toen hij nadergekomen was, zag hij van verre een witte
+gedaante, die hem riep, doch wegvluchtte en steeds op de vedel speelde.
+
+Maar Uilenspiegel liep sneller dan zij; hij haalde heur in, greep ze
+vast en wilde heur aanspreken; maar zij legde heure hand, die naar
+benzoë rook, op zijnen mond.
+
+--Zijt gij gemeene burger of edelman? vroeg zij.
+
+--Ik ben Uilenspiegel.
+
+--Zijt gij rijk?
+
+--Rijk genoeg om een hemelsch genot te betalen, niet genoeg om mijne
+ziel af te koopen.
+
+--Hebt gij geen peerd, dat gij te voet gaat?
+
+--Ik had een ezel, antwoordde Uilenspiegel, maar ik heb hem op stal
+gelaten.
+
+--Hoe komt het dat gij alleen, zonder vrienden of dienaren, rondzwerft
+in een vreemde stede?
+
+--Omdat mijn vriend zijnerzijds ergens ronddwaalt lijk ik mijnerzijds,
+nieuwsgierige schoone.
+
+--Ik ben geenszins nieuwsgierig, antwoordde zij. Is hij rijk,
+uw vriend?
+
+--Ja, hij is rijk, doch in vet, sprak Uilenspiegel. Maar hebt gij
+haast gedaan met mij te ondervragen?
+
+--Ik heb gedaan, zeide zij, laat mij nu.
+
+--U laten? sprak hij, 't was precies alsof men tot Lamme, als hij
+honger heeft, zou zeggen eene pateel ortolanen te laten staan. Van
+u wil ik eten.
+
+--Maar gij hebt mij nog niet gezien, zeide zij.
+
+En zij opende eene lanteerne, die plotseling heur aangezicht
+verlichtte.
+
+--Hoe schoon! sprak Uilenspiegel. Ho! wat schoone lichtbruine huid, wat
+zachte oogen, wat roode mond, wat liefelijk lichaam! Alles zij mijn!
+
+--Alles, sprak zij.
+
+En zij bracht hem bij Stevenijne, op den Brugschen steenweg, in
+den Regenboog.
+
+Uilenspiegel zag daar een groot getal meidekens, die aan den arm
+schijfjes droegen van een andere kleur dan die van heur bombazijnen
+kleed.
+
+De gezellinne van Uilenspiegel had een zilverlakensch schijfje op
+een goudlinnen kleed. En al de meidekens bezagen heur met afgunst.
+
+Bij het binnenkomen had zij de bazinne eenen wenk gegeven, maar
+Uilenspiegel had het niet bemerkt: zij zetten zich getweeën neder
+en dronken.
+
+--Weet gij, sprak zij, dat wie mij eens beminde, voor eeuwig mijn is?
+
+--Schoone, welriekende deerne, sprak Uilenspiegel, het ware mij een
+heerlijk festijn eeuwig uwe genuchten te smaken.
+
+Eensklaps zag hij Lamme in eenen hoek zitten, met een tafeltje voor
+zich, waarop eene keers, eene hesp en een pot bier stonden; hij had
+het zeer druk om zijne hesp en zijn bier te verdedigen tegen twee
+meidekens, die met alle geweld met hem wilden eten en drinken.
+
+Toen Lamme zijn vriend Uilenspiegel gewaar werd, kwam hij voor hem
+staan en sprong wel drie voet hoog van blijdschap.
+
+--God zij geloofd, sprak hij, omdat Hij mij mijnen vriend Uilenspiegel
+teruggeeft! Bazinne, breng ons te drinken!
+
+Uilenspiegel trok zijne tasch uit en sprak:
+
+--Te drinken tot dit op is!
+
+En hij deed zijne karolussen rinkelen.
+
+--Leve God! sprak Lamme, die hem gezwind de tassche uit de hand trok,
+ik ben 't die betaal, maar gij niet! Deze tassche is mijn!
+
+Uilenspiegel wilde met geweld zijne tassche terugnemen, doch Lamme
+hield ze stevig vast. Terwijl zij met elkander vochten, de een om de
+tassche te houden, de andere om ze terug te nemen, sprak Lamme stille
+tot Uilenspiegel:
+
+--Luister: serjanten in huis ... ze zijn gevieren ... in een kleine
+kamer met drie meidekens.... Twee buiten voor u, voor mij.... Heb
+willen weggaan ... ben belet geworden.... De deerne met heur goudlinnen
+kleed is eene verklikster ... Stevenijne, ook verklikster!
+
+Terwijl zij met elkander vochten, luisterde Uilenspiegel goed naar
+Lamme en riep hij:
+
+--Mijne tasch terug, dieper!
+
+--Gij zult ze niet hebben, sprak Lamme.
+
+En zij vatten elkander bij den nek, bij de schouderen en rolden ten
+gronde, terwijl Lamme stille alles zeide tot Uilenspiegel wat deze
+diende te weten.
+
+Maar de baas uit de Bie kwam eensklaps binnen met zeven mannen, die
+hij niet scheen te kennen. Hij kraaide als de haan en Uilenspiegel
+floot als de leeuwerik.
+
+Toen de baas Uilenspiegel en Lamme samen aan 't vechten zag, vroeg
+hij tot Stevenijne:
+
+--Wat zijn dat voor twee rabauwen?
+
+Stevenijne antwoordde:
+
+--Truwanten, die men niet slecht zou doen van elkander te scheiden,
+in stede van hen hier al dat gedruisch te laten maken, vóór zij naar
+'t galgeveld trekken.
+
+--Als hij zich vermeet ons te scheiden, sprak Uilenspiegel, hameren
+wij met zijnen kop op de vloersteenen.
+
+--Ja, op de vloersteenen, bevestigde Lamme.
+
+--De baas komt ons redden, fluisterde Uilenspiegel tot Lamme.
+
+De baas, die eene of andere geheimenis ried, wierp zich tusschen
+de vechters.
+
+Lamme zei hem in der haast deze woorden in 't oor:
+
+--Komt gij ons redden? Hoe dat?
+
+De baas gebaarde dat hij Uilenspiegel duchtig bij de ooren trok,
+en fluisterde hem toe:
+
+--Zeven voor u ... sterke mannen, beenhouwers.... Ik ga weg ... te
+zeer gekend in de stad.... Als ik weg ben, is 't tijd van te beven
+den klinkaard.... Alles aan stukken slaan....
+
+--Goed, zeide Uilenspiegel, die zich oprichtte en den baas eenen
+schop gaf.
+
+Maar de baas gaf hem eenen schop terug en eenen slag daarbij. En
+Uilenspiegel zei hem:
+
+--Gij slaat dapper, kameraad.
+
+--Ja, ze vallen als hagelsteenen, niet waar, antwoordde de baas, die
+meteen vlug de tassche uit Lamme's handen rukte en ze aan Uilenspiegel
+teruggaf.
+
+--Daar, rabauw, sprak hij, trakteer mij, nu gij terug in 't bezit
+van uw goed zijt.
+
+--Zuip maar op, schandalige dieper, antwoordde Uilenspiegel.
+
+--Hoor eens hoe stout hij is, sprak Stevenijne.
+
+--Zoo stout als gij schoon zijt, lievelinge, antwoordde Uilenspiegel
+met een spottenden glimlach.
+
+Nu, Stevenijne was diep in de zestig en had een gezicht als eene
+mispel, doch 't was nu geel van toorn en gramschap. In 't midden
+stond een neus, die geleek op den bek van een uil. Zij had oogen
+lijk die van een vrek, zonder glans van min of van vriendschap. Twee
+lange, puntige tanden staken uit haren mageren mond met zijn dunne,
+kleurlooze lippen. En een groote roode vlek bemorste hare linkerwang.
+
+De meidekens lachten, spotten met haar en zeiden:
+
+--Lievelinge, lievelinge, geef hem te drinken!--Hij zal u kussen en
+streelen.--Hoelang is het geleden, dat gij samen voor de eerste maal
+paardet?--Pas op, Uilenspiegel, zij gaat u verscheuren.--Bezie hare
+oogen, zij flikkeren, maar 't is van haat en niet van liefde.--Zou men
+niet zeggen, dat zij lust heeft tot bijten?--Wees niet bevreesd.--Al
+de vrouwen, die oprecht beminnen, doen zooals zij.--Zij wil slechts
+uw goed.--Zie eens hoe 't lachen haar in goede luim heeft gebracht!
+
+En, inderdaad, Stevenijne lachte, doch knipoogde intusschen tot
+Gilline, de deerne met heur goudlinnen kleed.
+
+De baas dronk, betaalde en vertrok.
+
+De zeven beenhouwers deden teeken van verstandhouding tot de serjanten
+en tot Stevenijne.
+
+Een van de zeven maakte een gebaar om te bedieden, dat hij Uilenspiegel
+voor een onnoozele hield en dat hij hem leelijk ging beethebben.
+
+En in Uilenspiegel's oor zeide hij, terwijl hij spottend de tong
+uitstak naar Stevenijne, die lachte en heure tanden liet zien:
+
+--'t Is van te beven den klinkaard!
+
+Vervolgens, naar de serjanten wijzend, sprak hij luidop:
+
+--Lieve hervormde, wij zijn allen met u, trakteer ons met eten
+en drinken.
+
+En Stevenijne lachte van plezier en stak ook heure tong uit naar
+Uilenspiegel, toen deze met zijnen rug naar heur was gekeerd.
+
+En Gilline, de deerne met heur goudlinnen kleed, stak insgelijks
+heure tong uit naar Uilenspiegel.
+
+En de meidekens zeiden tot elkander:
+
+--Ziet die verklikster, die den Spanjaard aanhangt en die, door
+heure schoonheid, meer dan zeven en twintig hervormden naar de wreede
+pijnbank en naar den nog wreederen marteldood bracht. Zie, Gilline
+is buiten zich zelve van vreugde; zeker denkt ze aan het geld, dat
+zij als aanbrengster krijgt,--de eerste honderd karolusgulden op de
+nalatenschap der slachtofferen. Maar zij lacht niet, want zij denkt
+er aan, dat zij met Stevenijne moet deelen.
+
+En allen, serjanten, beenhouwers en meidekens, staken hunne tong uit
+om te spotten met Uilenspiegel.
+
+En Lamme zweette water en bloed; hij was van gramschap zoo rood als
+de kam van een haan, doch hij wilde niet spreken.
+
+--Komaan, trakteer ons met eten en drinken, zeiden de beenhouwers en
+de serjanten.
+
+--Wel, sprak Uilenspiegel, terwijl hij zijne karolussen opnieuw deed
+rinkelen, geef ons te eten en te drinken, beminnelijke Stevenijne,
+geef ons te drinken in glazen, die klinken.
+
+Op die rede lachten de meidekens opnieuw en stak Stevenijne heure
+scherpe tanden weer uit.
+
+Maar ze ging toch naar de keuken en naar den kelder, en ze kwam
+terug met hesp, met worsten, met pannekoeken van zwarte pensen en
+met klinkaards: dat zijn glazen met een voet, aldus geheeten omdat
+zij klinken lijk de beiaard, als men ze tegeneen stoot.
+
+Uilenspiegel zei toen:
+
+--Dat zij eten, die honger hebben, en drinken, die dorst hebben!
+
+En serjanten, meidekens, beenhouwers, Gilline en Stevenijne klapten
+in de handen en trapten met de voeten. Ieder zette zich neer waar
+hij plaats vond: Uilenspiegel, Lamme en de zeven beenhouwers aan de
+groote eeretafel, de serjanten en de meidekens aan twee kleine tafelen.
+
+En men at en men dronk met een luidruchtig geknauw, tot zelfs de
+twee serjanten, die buiten stonden en die door hunne gezellen werden
+binnengeroepen om deel te nemen aan het festijn.
+
+En uit hunne gordeltasschen zag men koorden en kettingen steken.
+
+Stevenijne liet hare tanden zien, en grinnikend sprak zij:
+
+--Niemand zal hier uitgaan, vóór ik betaald ben.
+
+En al de deuren ging zij vast doen; en de sleutelen stak zij in
+heure tassche.
+
+Gilline stak heur glas omhoog en sprak:
+
+--Laat ons drinken, de vogel is gevangen!
+
+Bij die rede zeiden twee meidekens, Gena en Greta, tot heur:
+
+--Gaat gij dien ook al ter dood brengen, wreedaardige beulin?
+
+--Laat mij gerust, zei Gilline, laat ons drinken!
+
+Maar de twee meidekens wilden niet klinken met heur.
+
+En Gilline nam heure vedel en zong:
+
+
+    Op de vedel zing ik geerne,
+      Op de vedel nacht en dag.
+    Ik ben de dartele deerne
+      Die leef van minnegelag.
+
+    Venus mijn heupen maakte,
+      Vlammend als van een elf;
+    Wit zijn mijn schouders, de naakte,
+      Mijn lijf is de godheid zelf.
+
+    Laat uit den buidel klinkelen
+      Kronen met hellen klank.
+    Laat een goudstroom ruischen en rinkelen
+      Geel om mijn voeten blank.
+
+    Ik ben van Eva's geslachte,
+      Door Satan, den feilen held.
+    Geen vreugdbron lokt uw gedachte
+      Die niet in mijn herte welt.
+
+    'k Ben koud en gloeiend samen,
+      Teeder, wankel, of stil,
+    Flauw, lauw, heet in 't verzamen,
+      Willig, man, naar uw wil.
+
+    Zie mijn schoonheid veil, mijn blikken,
+      Mijn oogen, blauw en rood,
+    Mijn lachjes, tranen en snikken,
+      En zoo ge 't zoekt, den Dood.
+
+    Op de vedel zing ik geerne,
+      Op de vedel nacht en dag.
+    Ik ben de dartele deerne
+      Die leef van minnegelag.
+
+
+En terwijl Gilline zong, was ze zóó bevallig, zóó betooverend schoon,
+dat al de mannen, serjanten, beenhouwers, Lamme en Uilenspiegel,
+verteederd, glimlachend, als overwonnen, sprakeloos bleven zitten.
+
+Eensklaps schoot Gilline in een luiden schaterlach en, Uilenspiegel
+beziende, sprak ze:
+
+--Zóó is 't dat men vogelen vangt!
+
+En heure tooverkracht was verdwenen....
+
+Uilenspiegel, Lamme en de zeven sterke beenhouwers bezagen malkander.
+
+--Nu, gaat ge mij betalen? sprak Stevenijne, gaat ge mij betalen,
+messire Uilenspiegel, die teert en smeert met het geld van de
+predikantjes?
+
+Lamme wilde spreken, doch Uilenspiegel deed hem zwijgen en zei tot
+Stevenijne:
+
+--Ik ben niet gewoon op voorhand te betalen.
+
+--Dan zal ik mij naderhand doen betalen op uwe nalatenschap, zeide
+Stevenijne.
+
+--Hyena's leven van lijken, antwoordde Uilenspiegel.
+
+--Ja, sprak een van de serjanten, die twee diepers hebben 't geld van
+de predikanten genomen: meer dan driehonderd karolusgulden. Daar zal
+een goede stuiver voor Gilline afmogen.
+
+Deze zong:
+
+
+    Zoek elders zoeter blikken,
+      Neem alles, mijn lief genoot,
+    Vreugden, kussen, en snikken,
+      En, zoo ge 't wilt, den Dood.
+
+
+En toen riep ze, grijnslachend:
+
+--Laat ons drinken!
+
+De serjanten antwoordden:
+
+--Laat ons drinken!
+
+--Bij God! zei Stevenijne, laat ons drinken! De deuren zijn vast,
+de vensteren zijn van stevige ijzeren staven voorzien: de vogelen
+zijn gevangen; laat ons drinken!
+
+--Laat ons drinken! zei Uilenspiegel.
+
+--Laat ons drinken! zei Lamme.
+
+--Laat ons drinken! zeiden de zeven beenhouwers.
+
+--Laat ons drinken! zeiden de serjanten.
+
+--Laat ons drinken! zei Gilline, die de snaren heurer vedel
+tokkelde. Ik ben schoon, laat ons drinken! Den aartsengel Gabriël
+zou ik vangen in de netten van mijn lied!
+
+--Laat ons dan maar drinken, riep Uilenspiegel. Breng wijn op, om het
+feest te bekronen, en wèl van den besten! Dat onze dorstige lichamen
+van het hoofd tot de voeten doortrokken wezen van het vurige sap van
+den wijngaard!
+
+--Laat ons drinken! sprak Gilline, een grondeling, als gij, is den
+heekt wel een hap weerd.
+
+Stevenijne bracht bottels wijn op.
+
+De serjanten en de meidekens zaten samen, en dronken en zwolgen. De
+zeven beenhouwers, die aan de tafel van Lamme en Uilenspiegel zaten,
+smeten van hunne tafel naar die van de meidekens hespen, worsten,
+pannekoeken en bottels, die zij vingen in de vlucht, gelijk de karpers
+boven het water naar de vliegen snappen. En Stevenijne liet heure
+scherpe tanden zien en grijnslachte, en wees naar de pakken keersen
+van vijf in het pond, die boven den toog hingen. Het waren de keersen
+van de meidekens.
+
+Vervolgens sprak zij tot Uilenspiegel:
+
+--Men gaat naar den brandstapel met eene vetkeers in de hand; wilt
+gij er reeds eene hebben?
+
+--Laat ons drinken! zei Uilenspiegel.
+
+--Laat ons drinken! zeiden de zeven.
+
+Gilline sprak:
+
+--Evenals die van eenen zwaan, dien de dood nabij is, flikkeren
+Uilenspiegel's oogen lijk perelen.
+
+--Perelen, die wij voor de verkens zullen smijten, sprak Stevenijne
+met wrok in het herte.
+
+--Nu, dit ware zoo ongewoon niet: er zijn meer zeugen, die perelen
+dragen; laat ons drinken! antwoordde Uilenspiegel.
+
+--Wat zoudt gij zeggen, vervolgde Stevenijne, als men u op de pijnbank
+legde en daarna uwe tong met een gloeiend ijzer doorboorde?
+
+--Dat ik dan beter zou kunnen schuifelen: Laat ons drinken! antwoordde
+Uilenspiegel opnieuw.
+
+--Ge zoudt zooveel praat niet maken als gij gehangen werdt, sprak
+Stevenijne, en uwe lievelinge zou komen zien hoe gij het stelt.
+
+--Ja, sprak Uilenspiegel, maar ik weeg nogal zwaar, en licht kon het
+gebeuren, dat ik op uw goddelijk wipneusje bonsde: laat ons drinken!
+
+--Wat zoudt gij zeggen zoo gij gekortoord werd, en op het voorhoofd
+en op den schouder met eenen sleutel gebrandmerkt?
+
+--Ik zou zeggen, dat men een verkeerd beest heeft genomen, antwoordde
+Uilenspiegel, en dat men, in stee van met de zeug Stevenijne, met
+den beer Uilenspiegel bezig is: laat ons drinken!
+
+--Mits gij van al die lieve dingen niet houdt, sprak Stevenijne, zult
+gij gebracht worden op de galeien des konings, en daar gevierendeeld
+worden.
+
+--Wel, sprak Uilenspiegel, dan zullen mijne vier deelen in de zee
+gesmeten worden om den haaien te dienen tot voedsel, en wat zij
+overlaten is voor u, mijn hertje: laat ons drinken!
+
+--Eet liever, sprak zij, eet liever deze keersen, zij zullen u dienstig
+zijn in de helle, om uw eeuwige verdoemenis te verlichten.
+
+--Ik zie klaar genoeg om uw lichtenden snoet te onderscheiden,
+o slecht gebrande zeug, hernam Uilenspiegel.
+
+Eensklaps sloeg hij met den voet van zijn glas op de tafel, daarbij
+bootste hij, met de handen, 't gerucht na, dat de tapijtsiers maken
+als zij wolle op eene horde uitkloppen, doch hij deed het stilletjes
+en zei op de maat:
+
+--'t Is van te beven den klinkaard!
+
+In Vlaanderen was dit het teeken, dat de drinkers kwaad werden. Op
+dit teeken werd gemeenlijk alles kort en klein geslagen in de huizen
+met roode lanteerne.
+
+Uilenspiegel dronk, tikte met zijn glas op de tafel en sprak:
+
+--'t Is van te beven den klinkaard!
+
+En de zeven deden als hij.
+
+Allen hielden zich stille: Gilline verbleekte, Stevenijne scheen
+verrast en onthutst.
+
+De serjanten vroegen tot elkaar:
+
+--Zouden die zeven met hen zijn?
+
+Maar de beenhouwers knipoogden om hen gerust te stellen, terwijl zij
+gedurig luider en luider zeiden met Uilenspiegel:
+
+'t Is van te beven den klinkaard! 't Is van te beven den klinkaard!
+
+Stevenijne dronk mee, om zich een hert onder den riem te steken.
+
+Toen sloeg Uilenspiegel met de vuist op de tafel, op de maat van
+de tapijtsiers, die wolle kloppen; de zeven deden als hij: glazen,
+kruiken, schalen, pinten en bekers begonnen te dansen, stieten tegen
+elkander, braken, sprongen van den eenen kant weder recht om van den
+anderen weer neder te vallen.
+
+En altijd weerklonk meer en meer dreigend en vervaarlijk, het
+krijgszuchtig en eentonig referein:
+
+--'t Is van te beven den klinkaard!
+
+--Laas! zuchtte Stevenijne, zij gaan hier alles aan stukken slaan!
+
+En de schrik deed heure scherpe tanden nog langer uitsteken dan
+gewoonte.
+
+En, van woede en grammoedigheid begon het bloed van de zeven en van
+Lamme en Uilenspiegel meer en meer te koken.
+
+En, zonder hun eentonig en dreigend gezang te staken, namen al die
+van Uilenspiegel's tafel hunne glazen en bekers en braken zij dezelve
+op de tafel, op de maat der tapijtsiers. Vervolgens zetten zij zich
+te peerd op hunne stoelen en trokken zij hunne kruismessen uit.
+
+En zij maakten zulk een gedruisch met hun lied, dat al de ruiten van
+het huis aan 't rinkelen gingen.
+
+Vervolgens stormden zij, als uitzinnige duivelen, op hunne stoelen,
+rond de kamer en om de tafelen, terwijl zij aanhoudend riepen:
+
+--'t Is van te beven den klinkaard!
+
+En bevend van schrik stonden de serjanten toen recht en haalden
+zij hunne koorden en kettingen uit. Maar de beenhouwers en Lamme en
+Uilenspiegel staken hunne kruismessen in de scheeden, grepen hunne
+stoelen in de hand, zwaaiden ermede als knuppels, liepen aldus de kamer
+rond en sloegen, in't wilde, alles aan stukken en brokken. Alleen de
+meidekens werden ontzien, doch huisraad, schapraaien, ruiten en pinten,
+glazen en schalen, bottels en flesschen werden aan stukken geslagen,
+ook de serjanten kregen ruimschoots hun deel, altijd op de maat van
+de tapijtsiers, die wolle kloppen:
+
+--'t Is van te beven den klinkaard! 't Is van te beven den klinkaard!
+
+Intusschen had Uilenspiegel eenen vuistslag gegeven op Stevenijne's
+neus en hare sleutels uit heure tassche genomen, en nu wilde hij met
+alle geweld haar heure keersen doen eten.
+
+De schoone Gilline krabde, als eene verschrikte kattin, met heure
+nagelen aan deuren, ramen, ruiten en vensteren, om ergens een uitweg
+te vinden. Vervolgens ging zij, bleek als de dood, in eenen hoek op
+heure hurken zitten, met heure vedel vóór zich, alsof deze heur had
+moeten beschermen.
+
+De zeven en Lamme zeiden tot de verschrikte meidekens:
+
+--U zullen wij geenerlei leed doen.
+
+En, geholpen door heur, bonden zij, met koorden en kettingen,
+de serjanten, die beefden als riet en niet dorsten wederstaan,
+daar zij wel voelden, dat de beenhouwers--die de weerd uit de Bie
+onder de sterksten gekozen had--hen met hunne kruismessen in stukken
+hadden gekapt.
+
+En, naarmate Uilenspiegel met geweld Stevenijne keersen deed eten,
+sprak hij:
+
+--Deze is voor de pijne der galge; deze voor de kortooring; nog eene
+voor de brandmerking; deze hier voor de tongboring; kom, hier nog twee
+dikke vette voor de galeien des konings en voor de vierendeeling;
+deze is voor uwe spelonk van spionnen; deze is voor uwe deerne met
+heur goudlinnen kleed; en al deze hier voor mijn eigen rekening.
+
+En de meidekens proestten van 't lachen, als ze Stevenijne hoorden
+niezen van gramschap en zagen hoe zij bovenmatige pogingen inspande om
+de keersen uit te spuwen. Maar te vergeefs, want heur mond was te vol.
+
+Uilenspiegel, Lamme en de zeven anderen hielden niet op met zingen
+op maat:
+
+--'t Is van te beven den klinkaard!
+
+Vervolgens scheidde Uilenspiegel uit, en deed hij hun teeken het
+referein zachtjes te mompelen. Zulks deden zij, terwijl hij tot de
+serjanten en meidekens sprak:
+
+--Als een uwer zich vermeet om hulp te roepen, wordt hij onmiddellijk
+gekeeld.
+
+--Gekeeld! bevestigden de beenhouwers,
+
+--Wij zullen zwijgen, maar doe ons geen leed, Uilenspiegel, zeiden
+de meidekens.
+
+Doch Gilline, die met uitpuilende oogen, met toegebeten tanden,
+op de hurken in heuren hoek zat, kon niet spreken en prangde heure
+vedel tegen heure borst.
+
+En de zeven murmelden altijd op maat:
+
+--'t Is van te beven den klinkaard!
+
+Stevenijne wees met den vinger naar de keersen, die in haren mond
+staken, om te bedieden dat zij ook zwijgen zou. De serjanten beloofden
+zulks insgelijks.
+
+Uilenspiegel vervolgde zijne rede en sprak:
+
+--Gij zijt hier allen in onze macht; 't is donker, de nacht is
+gevallen, wij zijn hier dicht bij de Leie, in dewelke men lichtelijk
+verdrinkt, vooral als men daartoe door flinke gasten wordt geholpen.
+
+--De poorten van Kortrijk zijn lang reeds gesloten. Als de nachtwacht
+het gedruisch gehoord heeft, zal zij zich niet verroeren, want zij
+is er te lui voor. Ook meent zij, dat het goede Vlamingen zijn, die
+blijde drinken en zingen bij 't gerinkel van bottels en glazen. Houdt
+u dus koest en luistert naar de bevelen van uwe meesters.
+
+Toen vroeg hij tot de zeven:
+
+--Gaat gij naar Petegem bij de Geuzen?
+
+--Ja; wij hebben onze toebereidselen gemaakt, zoodra wij hoorden,
+dat gij naar de stad kwaamt.
+
+--Van daar gaat gij naar de zee?
+
+--Ja, zeiden zij.
+
+--Kent gij onder die serjanten een of twee, die men zou mogen loslaten,
+om ons te dienen?
+
+--Ja, zeiden ze, twee, Nicolaas en Judocus, die nimmer de arme
+hervormden hebben vervolgd.
+
+--Wij zijn getrouw! riepen Nicolaas en Judocus.
+
+Toen sprak Uilenspiegel:
+
+--Hier hebt gij twintig karolusgulden, tweemaal meer dan gij hadt
+ontvangen als eerloozen prijs uwer aanklacht.
+
+Plotseling riepen de vijf andere:
+
+--Twintig gulden! Voor twintig gulden willen wij ook den prins
+dienen. De koning betaalt slecht. Geef ons enkel de helft van die som,
+en wij vertellen aan den rechter al wat gij wilt.
+
+De beenhouwers en Lamme herhaalden gezamenlijk, met een dof gemurmel:
+
+--'t Is van te beven den klinkaard! 't Is van te beven den klinkaard!
+
+--Opdat gij uwe tong niet zoudt voorbijklappen, sprak Uilenspiegel,
+zullen de zeven u gekneveld en gebonden naar Petegem brengen, bij de
+Geuzen. Gij zult tien gulden hebben als gij op zee zult zijn; op die
+manier zijn wij zeker, dat de keuken van 't kamp u bijhoudt. Als gij
+dient als dappere soldaten, krijgt gij uw deel van de buit. Als gij
+beproeft te ontsnappen wordt gij gehangen. Als gij ontsnapt, om de
+koorde te ontloopen, valt gij gewis op het mes.
+
+--Wij dienen, die ons betaalt, zeiden zij.
+
+Lamme en de zeven sloegen op de tafels met scherven van potten en
+pinten en bekers, en spraken:
+
+--'t Is van te beven den klinkaard! 't Is van te beven den klinkaard!
+
+--Gilline, Stevenijne en drie deernen zult gij insgelijks medenemen,
+vervolgde Uilenspiegel. Als een van heur poogt te ontsnappen, naait
+gij ze in eenen zak en smijt ze in de Leie.
+
+--Hij heeft mij niet gedood, kreet Gilline, uit heuren hoek springend
+en met heure vedel zwaaiend.
+
+En zij zong:
+
+
+    Bloedig was de gedachte
+    Die nog mijn hart ontstelt.
+    Ik ben van Eva's geslachte
+    Door Satan, den fellen held.
+
+
+Stevenijne en de anderen zetten een gezicht alsof zij in tranen
+gingen uitbarsten.
+
+--Vreest niets, mijne liefsten, sprak Uilenspiegel, gij zijt zoo zoet
+en zoo zacht, dat men u overal zal minnen, vieren en streelen. Bij
+elke bemachtiging, door onze legers gedaan, krijgt gij ook uw deel
+van den buit.
+
+--Ik, ik zal niemendal krijgen, ik ben reeds te oud, sprak Stevenijne
+krijtend.
+
+--Eén stuiver daags zult gij krijgen, sprak Uilenspiegel, want gij
+zult de dienaresse dezer vier schoone deernen wezen. Gij zult heure
+rokken, kleeren en hemden wasschen.
+
+--Ik, Heere God? riep zij.
+
+Uilenspiegel antwoordde:
+
+--Lang genoeg hebt gij heure meesteresse gespeeld, lang genoeg
+hebt gij rijkelijk geleefd op heur lijf, terwijl gij ze in armoede
+en ontbering liet sukkelen. Nu moogt gij schreeuwen en ruchelen,
+'t is vergeefs. Zooals ik zeg, zal geschieden.
+
+Daarop schoten de vier meidekens in eenen schaterlach; ze begonnen
+met Stevenijne te lachen en zeiden, terwijl zij spottend de tong naar
+heur uitstaken:
+
+--Elk zijne beurt op de wereld. Wie had dat gedacht van de gierige
+Stevenijne? Zij zal voor ons werken als onze dienstmeid. Gezegend
+zij onze heer, gezegend zij Uilenspiegel!
+
+Vervolgens zei Uilenspiegel tot de zeven beenhouwers en tot Lamme
+Goedzak:
+
+--Ledigt de wijnkelders, neemt al het geld; het zal dienen tot het
+onderhoud van Stevenijne en de vier meidekens.
+
+--Zij knarsetandt, de gierige Stevenijne, zeiden de meidekens. Gij
+waart hard jegens ons, nu is men het ook jegens U. Gezegend zij onze
+heer, gezegend zij Uilenspiegel!
+
+En de drie deernen wendden zich tot Gilline:
+
+--Gij waart heure dochter, heure broodwinster, zeiden zij, met heur
+deeldet gij de vruchten van uw eerloos spionbedrijf. Zoudt gij ons
+nog durven slaan en beleedigen, met uwe goudlinnen kleeren? Voor
+ons koesterdet gij niets dan verachting, omdat wij maar bombazijn
+droegen. Als gij zoo schoon gekleed waart, was het alleen met den
+prijs van het bloed uwer slachtofferen. Wij zullen heur kleed van
+heur lijf rukken, opdat zij onze gelijke zou wezen.
+
+--Dat zal ik niet dulden, sprak Uilenspiegel.
+
+En Gilline vloog hem om den hals en sprak blijde:
+
+--Gezegend zijt gij, die mij spaart van den dood en niet duldt dat
+ik leelijk weze!
+
+En de afgunstige meidekens bezagen Uilenspiegel en spraken tot
+elkander:
+
+--Hij is zot van haar, evenals de anderen.
+
+Gilline nam heure vedel en zong een liedeken van vurige minne.
+
+De zeven vertrokken naar Petegem, langsheen de Leie, en leidden de
+serjanten en de meidekens mede.
+
+Onderweg murmelden zij:
+
+--'t Is van te beven den klinkaard! 't Is van te beven den klinkaard!
+
+Met den dageraad kwamen zij nabij het kamp. Zij zongen als de
+leeuwerik en het gekraai van den haan antwoordde hun. De meidekens
+en de serjanten werden van dichtbij bewaakt.
+
+Edoch, den derden morgen werd Gilline dood gevonden: in heur hert
+stak een groote naald.
+
+Stevenijne werd door de drie meidekens beschuldigd en gebracht voor den
+bentkapitein, zijne tiendeniers en serjanten, in verschaar vergaderd.
+
+Daar bekende zij, zonder dat men heur op de pijnbank moest leggen, dat
+zij Gilline gedood had uit afgunst op heure schoonheid en uit woede,
+omdat de deerne heur zonder mededoogen als eene dienstmeid behandelde.
+
+En Stevenijne werd gehangen en vervolgens begraven in het bosch.
+
+Gilline werd ook begraven, en men las de gebeden der dooden over heur
+liefelijk lichaam.
+
+Doch de twee serjanten Judocus en Nikolaas, dien Uilenspiegel de
+les had gespeld, waren vóór den kastelein van Kortrijk verschenen,
+want het gedruisch, het geweld en de plundering moesten door hem
+gestraft worden, daar het huis van Stevenijne in de kasselrij, buiten
+den bijvang der stad Kortrijk lag. Nadat zij aan den kastelein het
+gebeurde hadden verteld, zeiden zij hem met de innigste overtuiging
+en de nederigste oprechtheid:
+
+--De moordenaars van de predikanten zijn geenszins Uilenspiegel
+en zijn trouwe vriend Lamme Goedzak, die maar naar den Regenboog
+gekomen waren om zich te vermaken. Zij hebben zelfs reispassen van den
+hertog en wij hebben die met eigen oogen gezien. De twee schuldigen
+zijn twee kooplieden van Gent, een magere en een heel dikke, die naar
+Frankrijk getogen zijn, nadat zij alles aan stukken hebben geslagen bij
+Stevenijne, dewelke zij medegenomen hebben met heure vier meidekens,
+voor hun pleizier. Wij hadden ze wel bij den kraag gepakt, doch daar
+waren zeven beenhouwers in het kot, van de sterksten der stad, die
+voor de booswichten aantrokken. Zij hebben ons allen gekneveld en ons
+maar losgelaten als zij verre in Frankrijk waren. Hier ziet gij nog
+het merk van de koorden. De vier andere serjanten zijn achter hunne
+hielen, en wachten op versterking, om de hand op hen te leggen.
+
+De kastelein gaf hun elk twee karolussen en een nieuw kleed, als
+belooning voor hun trouwe en eerlijke diensten.
+
+Vervolgens schreef hij naar den raad van Vlaanderen, naar de
+schepenbank van Kortrijk en naar andere vierscharen om hun kond te
+doen, dat de ware moordenaars ontdekt geweest waren.
+
+En hij legde de zaak uiteen van 't begin tot het einde.
+
+Dat deed al die van den Raad van Vlaanderen en van de smalle
+vierscharen sidderen en beven.
+
+En de kastelein werd om zijne scherpzinnigheid geloofd en geprezen.
+
+En Uilenspiegel en Lamme gingen ongehinderd op den weg van Petegem
+naar Gent, langsheen den oever der Leie; van deze laatste stede zouden
+zij zich begeven naar Brugge, alwaar Lamme zijn vrouw hoopte weder
+te vinden, en naar Damme, alwaar Uilenspiegel reeds had willen zijn,
+om Nele te zien, die treurig leefde bij de uitzinnige Katelijne.
+
+
+
+
+XXXVI.
+
+Sedert lang werden er, in het land van Damme en in de omstreken,
+afschuwelijke gruweldaden gepleegd.
+
+Meidekens, jonge knapen, oude mannen, die met geld naar Gent, Brugge
+of andere steden of dorpen van Vlaanderen waren gegaan, werden dood
+gevonden op den weg, naakt als pieren, den hals doorgebeten met zulke
+lange en scherpe tanden, dat het nekbeen van allen gebroken was.
+
+De geneesheeren en de chirurgijns-baardemakers verklaarden, dat het
+tanden waren van een grooten wolf.
+
+--Dieven waren ongetwijfeld gekomen na den wolf, en hadden den
+slachtofferen geld en kleederen afgenomen, zeiden zij.
+
+Verscheidene aanzienlijke poorters, die zich kloekmoedig zonder
+geleide op weg hadden begeven, verdwenen zonder dat men wist wat zij
+geworden waren, behalve dat men nu en dan eens een landbouwer, die
+'s morgens naar zijn akker ging, wolvesporen vond in zijn kouter,
+terwijl zijn hond met de pooten de aarde openkrabde en een armzalig,
+naakt lijk ontblootte, waarop men, in den nek of onder het oor, de
+tanden van den wolf zag, en menigwerf ook in de beenen, doch altijd
+van achteren. En altijd was het nekbeen gebroken.
+
+De ontstelde boer ging dan schielijk kennis geven van zijne akelige
+vondst aan den baljuw, die met zijn griffier-crimineel, twee schepenen
+en een chirurgijn-baardemaker, ter plaatse kwam, waar het lijk des
+vermoorden lag. Na een neerstig en zorgvuldig onderzoek, lukte het hun
+soms, als het gezicht niet afgeknaagd was door de wormen, den stand,
+zelfs den naam en den toenaam van den verslagene te ontdekken.
+
+Doch ze waren ten zeerste verwonderd, dat de wolf, die uit honger
+slechts menschen aanvalt, nooit het kleinste stuk uit het lijk had
+gebeten.
+
+En die van Damme waren met schrik bevangen en dorsten 's nachts zonder
+goed geleide niet meer uitgaan.
+
+Eindelijk toch werden verscheidene kloekmoedige soldaten uitgezonden om
+den wolf op te sporen, met bevel hem te zoeken, bij dag en bij nacht,
+in het duin, langsheen de zee.
+
+Toen waren ze omtrent Heist, in het groot duin. De nacht was
+gevallen. Een der soldaten, vol vertrouwen op zijne kracht, wilde hen
+verlaten, om alleen op zoek te gaan, gewapend met zijne bus. De anderen
+lieten hem gaan, overtuigd als zij waren dat hij, een kloekmoedig
+en goed gewapend soldaat, den wolf zou dooden, als deze zich dorst
+laten zien.
+
+Toen hun gezel vertrokken was, staken zij een groot vuur aan, bij
+hetwelk zij zich zetten te spelen met dobbelsteenen, en brandewijn
+te drinken.
+
+En van tijd tot tijd riepen zij luide:
+
+--Nu, kameraad, kom maar terug; de wolf heeft schrik; kom, drink
+eenen slok.
+
+Doch hij antwoordde niet.
+
+Eensklaps hoorden zij een grooten schreeuw, als 't gereutel van een
+man, die gekeeld wordt, en terstond liepen zij naar den kant van
+denwelken het geschreeuw kwam.
+
+En zij riepen:
+
+--Verweer u kloekmoedig, wij komen u ter hulp!
+
+Maar 't duurde tamelijk lang, voordat zij hunnen makker vonden, want
+sommigen vermeenden, dat de kreet uit het dal, anderen dat hij van
+de hoogste duin was gekomen.
+
+Toen zij dal en duin met hunne lanteernen goed afgezocht hadden,
+vonden zij eindelijk hunnen gezel, van achteren gebeten in den arm
+en in het been en met gebroken nek, lijk de andere slachtofferen.
+
+Hij lag op den rug, met zijn zweerd in de toegenepen hand; zijne bus
+lag op het zand. Naast hem waren drie afgesneden vingeren, die de zijne
+niet waren, en die zij meedroegen. Zijne gordeltasch was hem ontnomen.
+
+Zij namen het lijk van hunnen gezel op de schouderen; zijn flink
+zweerd en zijn dappere bus droegen zij insgelijks mede, en, grammoedig
+en jammerend, droegen zij het lijk naar het baljuwschap, alwaar de
+baljuw het ontving, bijgestaan door zijnen griffier-crimineel, door
+twee schepenen, alsmede door twee chirurgijns.
+
+De afgesneden vingeren werden onderzocht en bevonden als zijnde die van
+eenen ouderling, dewelke van geenerlei ambacht kon zijn, want zij waren
+dun en fijn, en de nagelen lang, lijk die van rechters en geestelijken.
+
+'s Anderen daags gingen de baljuw, de schepenen, de griffier, de
+chirurgijns en de soldaten naar de plaats, waar de arme doode gebeten
+was, en zij zagen bloeddroppelen op het gras, en stappen die gingen
+tot aan de zee, waar zij ophielden.
+
+
+
+
+XXXVII.
+
+Het was in den tijd der rijpe druiven, de vierde dag van de Wijnmaand,
+als wanneer men te Brussel, na de hoogmis, van op Sint-Nicolaastoren,
+zakken okkernoten te grabbel smijt.
+
+Des nachts werd Nele gewekt door kreten, die kwamen van de straat. Zij
+zocht Katelijne in de kamer, maar vond ze niet. Zij liep naar beneden
+en opende de deur, en Katelijne kwam haastiglijk binnen en sprak:
+
+--Red mij! red mij! De wolf! de wolf!
+
+En Nele hoorde, van verre in het veld, een akelig, schor
+gehuil. Sidderend stak zij al de lampen en keersen aan, die zij vond.
+
+--Wat is er gebeurd, Katelijne? vroeg zij, heur in de armen drukkend.
+
+Katelijne zette zich neer op eenen stoel, en, met verwilderde oogen,
+zeide zij, terwijl zij de keersen aanstaarde:
+
+--Dat is de zonne, die de booze geesten verdrijft. De wolf, de wolf
+huilt in de verte.
+
+--Maar, zeide Nele, waarom zijt gij uit uw bed gekomen, waar gij warm
+laagt, om koorts op te doen in de vochtige najaarsnachten?
+
+En Katelijne sprak:
+
+--Hansken schreeuwde daar even als de nachtuil; en ik heb de deur
+opengedaan. En hij zei tot mij: "Drink den tooverdrank"; en ik
+dronk. Hansken is schoon. Doe het vuur weg. Toen bracht hij mij dicht
+bij de vaart en zeide hij mij: "Katelijne, ik zal u de zevenhonderd
+karolussen teruggeven, gij zult ze geven aan Uilenspiegel, zoon
+van Klaas. Hier zijn twee karolussen voor u, koop er een kleed mee,
+weldra zult gij er duizend hebben".--"Duizend, sprak ik, mijn beminde,
+dan zal ik rijk zijn".--"Gij zult ze hebben, sprak hij. Maar zijn er
+in Damme geene vrouwen of meidekens, die nu zoo rijk zijn als gij dan
+zult wezen?"--"Ik weet het niet", antwoordde ik. Ik wilde heure namen
+niet zeggen, uit vreeze dat hij ze zou beminnen. Toen zeide hij mij:
+"Tracht dit te weten te komen en zeg mij heure namen als ik terugkom".
+
+...Het was koud, de mist hing over de weide, droge takjes vielen van
+de boomen op den weg. En de maan glom, en er waren lichtjes op het
+water van de vaart. Hansken zeide mij: "'t Is nacht van de weerwolven;
+dezen nacht mogen alle schuldige zielen uit de helle komen om op de
+wereld te wandelen. Gij moet driemaal het teeken des kruises met de
+linkerhand maken en roepen: "Zout! zout! zout!" dat het zinnebeeld is
+van onsterfelijkheid; en zij zullen u geenerlei leed doen". En ik zei:
+"Ik zal doen wat gij wilt, Hansken, mijn geliefde".--Hij omhelsde mij
+en sprak: "Gij zijt mijn gade".--"Ja", sprak ik. En bij zijn zoete
+woorden viel een hemelsch geluk als een balsem over mijn lichaam. Hij
+kroonde mij met rozen en sprak: "Gij zijt schoon". En ik zeide hem:
+"Gij ook zijt schoon, Hansken, mijn geliefde, met uw fijne kleederen
+van groene panne met gouden belegsels, met uw lange struisveeren, die
+wuiven op uw toque en met uw bleek gezicht, dat lijkt op de branding
+der zee. En als de meidekens van Damme u zagen, zouden allen achter u
+loopen, om u uw herte te vragen; maar gij moogt het slechts geven aan
+mij, Hansken".--Hij sprak: "Tracht te weten te komen wie de rijksten
+zijn, haar fortuin is voor u". Toen vertrok hij, na mij verboden te
+hebben hem te volgen of te vergezelschappen. Bibberend van koude,
+nat van den mist, bleef ik staan, terwijl ik de twee karolussen in
+mijne hand deed rammelen, toen eensklaps een wolf met groenen muil
+en lange lischblaren in zijn wit haar, den oever van de vaart opklom
+en naar mij kwam. Ik riep: "Zout! zout! zout!" en maakte driemaal
+het teeken des kruises, doch daar scheen hij geenszins schrik voor
+te hebben. En ik liep uit al mijne macht, al schreeuwend, terwijl
+hij achter mij huilde, en ik hoorde het klapperend geluid zijner
+tanden achter mij, en eenmaal dit zóó dicht tegen mijne schouderen,
+dat ik dacht dat hij mij vastgrijpen ging. Maar ik liep gauwer dan
+hij. Tot mijn groot geluk kwam ik aan den hoek van de Reigerstraat
+den nachtwacht met zijne lanteerne tegen. "De wolf! de wolf!" riep
+ik. "Wees niet bevreesd, sprak de nachtwacht tot mij, ik zal u naar
+huis leiden, uitzinnige Katelijne". En ik voelde dat zijne hand,
+die de mijne vasthield, insgelijks beefde. En hij ook was bevreesd.
+
+--Maar reeds heeft hij weer moed gevat, sprak Nele. Hoor, daar zingt
+hij met slepende stemme: "De klok slaat tien, tien slaat de klok!" En
+hij draait met zijnen ratel.
+
+--Doe het vuur weg, sprak Katelijne; mijn hoofd brandt. Kom terug,
+Hansken, mijn liefste!
+
+En Nele keek droevig naar Katelijne; en zij bad Onze-Lieve-Vrouwe,
+de Heilige Moeder Gods, dat zij het vuur der uitzinnigheid uit heur
+hoofd zou wegnemen; en zij weende over heur.
+
+
+
+
+XXXVIII.
+
+Te Bellem, aan den oever van de Brugsche vaart, kwamen Uilenspiegel
+en Lamme eenen ruiter tegen, met drie haneveeren op zijn vilten hoed,
+en die spoorslags naar Gent reed. Uilenspiegel zong als de leeuwerik
+en de ruiter hield zijn peerd in, en antwoordde met Kanteklaar's
+helder gekraai.
+
+--Brengt gij tijdingen mede, onstuimige ruiter? vroeg Uilenspiegel.
+
+--Gewichtige tijdingen, antwoordde de ruiter. Op raadgeving van
+mijnheer de Châtillon, die in Frankrijk admiraal is, heeft de
+prins kaperbrieven uitgegeven; buiten de vaartuigen van Emden en
+Oost-Friesland, worden allerwegen oorlogsschepen uitgerust. De dappere
+mannen, die de brieven ontvingen, zijn: Adriaan van Bergen, heer van
+Dolhain; de baron de Montfaucon, Lodewijk van Brederode; Albrecht van
+Egmond, zoon van den gehalsrechte en geen verrader lijk zijn broeder;
+Berthold Enthens van Mentheda, de Fries; Adriaan Menningh, Hembyse,
+de trotsche, vurige Gentenaar, alsmede Jan Brock.
+
+... De prins heeft heel zijn vermogen gegeven, over de vijftigduizend
+gulden.
+
+--Ik heb er vijfhonderd voor hem, sprak Uilenspiegel.
+
+--Draag ze naar de zee, sprak de ruiter.
+
+En hij reed weg op een draf.
+
+--Hij geeft heel zijn vermogen, zeide Uilenspiegel. Wij, wij hebben
+slechts ons lijf en geven het geerne.
+
+--En heet gij dat niets, vroeg Lamme, en zullen wij altijd leven
+tusschen rooven en moorden? Oranje is ten gronde.
+
+--Ja, sprak Uilenspiegel, ten gronde evenals de eik; maar met eikenhout
+bouwt men schepen voor de vrijheid!
+
+--Tot zijn profijt, sprak Lamme. Maar, nu alle gevaar verdwenen is,
+konden wij ezelen koopen, dunkt mij. Ik zit nog al geerne op mijn gemak
+als ik reis, en ben geen liefhebber van veeren op mijne voetzolen.
+
+--Wij zullen langooren koopen, zeide Uilenspiegel; die kunnen wij
+steeds verkoopen zonder verlies.
+
+Zij trokken naar de merkt en kochten er twee schoone ezelen met het
+noodige tuig.
+
+
+
+
+XXXIX.
+
+Schrijlings op hunne rijdieren gezeten, kwamen zij te Oostkamp,
+alwaar een groot bosch is, hetwelk aan de vaart paalt.
+
+Op zoek naar lommer en naar liefelijke geuren, traden zij er in,
+zonder iets anders te zien dan lange dreven, die in alle richtingen
+naar Gent, Brugge, Zuid- en Noord-Vlaanderen liepen.
+
+Eensklaps sprong Uilenspiegel van zijnen ezel.
+
+--Ziet gij daar niets?
+
+Lamme sprak:
+
+--Ja, ik zie iets.
+
+En bevend vervolgde hij:
+
+--Mijne vrouw, mijn goede vrouw! Zij is het, mijn vriend. Ha! ik zal
+naar heur niet kunnen loopen. Wie had ooit gedacht, dat ik heur aldus
+zou terugvinden?
+
+--Waarover klaagt gij? sprak Uilenspiegel. Zij is schoon, zoo
+half naakt, in dat uitgebekt neteldoeksch wambuis, dat heur vel
+zoo liefelijk doet uitkomen. Die vrouw is te jong, zij kan de uwe
+niet wezen.
+
+--Mijn vriend, sprak Lamme, zij is het, mijn vriend; ik herken
+ze. Draag mij, ik kan niet meer gaan. Wie had dit van heur
+gedacht? Alzoo dansen, in Egyptische deerne verkleed, zonder
+schaamte! Ja, zij is het; zie maar heur schoone beenen, heur tot den
+schouder ontbloote armen, heur ronde lichtbruine borsten, die half
+uitkomen uit heur neteldoeksch wambuis. Zie eens hoe zij dien grooten
+hond plaagt met een rood vlaggetje, en hoe hij er naar toe springt.
+
+--'t Is een Egyptische hond, zeide Uilenspiegel; die soort hoort niet
+te huis in de Nederlanden.
+
+--Of het een Egyptische hond is, weet ik niet juist.... Maar zij
+is het.... Ha! mijn vriend, ik sta het niet langer uit. Zij licht
+heur kleed nog hooger op, om heur ronde beenen nog hooger te laten
+zien. Zij lacht om heur witte tanden te toonen, en schatert om den
+klank heurer zoete stem te laten hooren. Zij opent heur wambuis
+van boven en werpt zich achterover. Ha! die zwanenhals, die bloote
+schouderen, die heldere en stoutmoedige oogen! Ik loop er naar toe!
+
+En hij sprong van zijnen ezel.
+
+Doch Uilenspiegel hield hem tegen en sprak:
+
+--Dat meideken is uwe vrouw niet. Wij zijn omtrent een kamp
+van Egyptenaren. Pas op. Ziet gij den rook tusschen de boomen
+opstijgen? Hoort gij 't geblaf van de honden? Zie maar: hier zijn
+er eenigen, die ons bezien en misschien lust gevoelen om ons te
+bijten. Laat ons terugkeeren, Lamme.
+
+--Ik wil niet terugkeeren, sprak Lamme, die vrouw is de mijne; zij
+is uit Vlaanderen vandaan lijk wij.
+
+--Waanzinnige blinde! zei Uilenspiegel.
+
+--Maar ik ben niet blind, sprak Lamme. Ik zie ze, half naakt, dansen,
+lachen en joelen met dien hond. Zij gebaart mij niet te zien. Maar
+ik verzeker u dat zij ons ziet. Thijl! Thijl! zie, de hond werpt zich
+op heur en smijt ze ten gronde, om het roode vlaggetje te hebben. En
+zij valt met een smertvollen kreet.
+
+En eensklaps vloog Lamme er naar toe, zeggende:
+
+--Mijne vrouw, mijne vrouw! Waar hebt gij zeer, mijne liefste? Waarom
+berst gij in eenen schaterlach uit? Uw oogen staan verwilderd in
+uw hoofd.
+
+En hij kuste, streelde heur, en sprak:
+
+--Dat geboortevlekje, dat gij onder den linkerboezem hadt, zie ik
+niet! Waar is het? Zoudt gij mijne vrouw niet wezen? God van den
+hoogen hemel!
+
+En zij hield op met lachen.
+
+Eensklaps riep Uilenspiegel:
+
+--Pas op, Lamme.
+
+En Lamme keerde zich om, en zag een grooten duivel van een Egyptenaar
+met een mager gezicht vóór zich staan, die bruin was als peperkoek.
+
+Lamme raapte zijnen stok op, stelde zich te weer en riep:
+
+--Ter hulp, Uilenspiegel!
+
+Uilenspiegel was daar met zijn kruismes.
+
+De Egyptenaar zei hem in het Hoogduitsch:
+
+--Gieb mir Geld, einige Thaler.
+
+--Zie, sprak Uilenspiegel, het meideken gaat schaterlachend henen en
+keert zich gedurig om, opdat men heur volge.
+
+--Gieb mir Geld, sprak de man. Betaal uwe minnarijen. Wij zijn arm
+en willen u geen kwaad.
+
+Lamme gaf hem eenen karolus.
+
+--Welk bedrijf voert gij uit? vroeg Uilenspiegel.
+
+--Alle bedrijven, antwoordde de Egyptenaar: zeer bedreven in de
+goochelkunst, doen wij wonderbare en bovennatuurlijke toeren. Wij
+spelen op de tamboerijn en dansen Hongaarsche dansen. Onder ons zijn
+er, die schoone vogelkooien maken en anderen die roosters verveerdigen
+om vleesch op te braden. Doch allen, Vlamingen als Walen, zijn bevreesd
+voor ons en jagen ons weg. Daar wij niets kunnen verdienen, zijn wij
+wel gedwongen, groenten, vleesch en kiekens bij de boeren te stelen,
+vermits zij ons die niet willen geven of laten verdienen.
+
+Lamme vroeg hem:
+
+--Van waar komt dat meideken, dat zoo goed op mijne vrouw trekt?
+
+--Dat is de dochter van onzen hoofdman, antwoordde de zwerver.
+
+Vervolgens zeide hij stiller, als iemand, die vreest dat men hem
+zou afluisteren:
+
+--Zij werd door God getroffen met minnekwaal en kent niets van
+de vrouwelijke eerbaarheid. Zoodra zij eenen man ziet, wordt zij
+blijgeestig en minziek, en lacht zij gedurig. Zij is weinig van
+zeggen; langen tijd meenden wij dat zij doof was. 's Nachts blijft
+zij in alleenigheid vóór het vuur; soms zit zij te weenen, of zonder
+reden te lachen, en wijst zij naar heuren buik, waar zij zeer heeft,
+naar zij zegt. 's Zomers, rond het middaguur, na het eten, is ze 't
+ergst gefolterd door heure kwaal. Dan gaat ze, schier teenemaal naakt,
+dansen omtrent het kamp. Zij wil niets anders dragen dan kleederen
+van gaas of van neteldoek, en 's winters hebben wij alle moeite om
+heur een opperste kleed van geitenlaken te doen omslaan.
+
+--Maar, sprak Lamme, heeft zij dan geen enkelen vriend om haar te
+beletten aldus aan een iegelijk heur lichaam ten beste te geven?
+
+--Neen, sprak de man, zij geeft geenerlei vriend, want als de
+wandelaars, die zij tot zich lokt, heur waanzinnige oogen zien,
+krijgen zij meer schrik dan liefde voor heur. Die dikke man was
+tamelijk stout, sprak hij, naar Lamme wijzend.
+
+Lamme fronste de wenkbrauwen, bij die toespeling op zijne dikte.
+
+--Laat hem maar zeggen, Lamme; 't is de sprot, die kwaad spreekt van
+den walvisch.
+
+--Gij zijt spotziek, dezen morgen, sprak Lamme.
+
+Doch zonder te luisteren, vervolgde Uilenspiegel tot den zwerver:
+
+--Wat doet zij, als anderen zoo stout zijn als mijn vriend Lamme?
+
+De Egyptenaar antwoordde droefgeestig:
+
+--Dan heeft zij genot en profijt. Zij die heur krijgen, betalen hun
+pleizier, en het geld dient om heur te kleeden en ook tot de behoeften
+der grijsaards en vrouwen.
+
+--Zij gehoorzaamt dus aan niemand? vroeg Lamme.
+
+De bruine man antwoordde:
+
+--Laat hen, die God treft, hun zin doen. Aldus beduidt hij zijnen
+wil. En zijn wil is onze wet.
+
+Uilenspiegel en Lamme vervolgden hunnen weg naar Brugge. En de
+Egyptenaar ging ernstig en fier terug naar het kamp. En het meideken
+danste, schaterlachend, in een opene plaats van het bosch.
+
+
+
+
+XL.
+
+Onderweg sprak Uilenspiegel tot Lamme:
+
+--Wij hebben reeds schrikkelijk veel geld uitgegeven: wij hebben
+huurlingen aangeworven, den serjanten eene belooning gegeven,
+een karolus aan dat Egyptisch meideken geschonken; voeg daarbij de
+ontelbare oliekoeken, die het u beliefde zonder ophouden zelf te eten,
+liever dan er éénen te verkoopen. Nu, niettegenstaande het verzet van
+uwen buik, wordt het hoog tijd dat wij ons met minder generen. Geef
+mij uw geld: ik zal de gemeenschappelijke beurs houden.
+
+--Ik wil wel, sprak Lamme.
+
+Hem de beurs langend, sprak hij:
+
+--Laat mij evenwel niet sterven van honger; want bedenk toch: dik en
+struisch als ik ben, moet ik kloek en overvloedig voedsel hebben. Dat
+is goed voor u, die mager en schraal zijt, van onbekommerd te leven,
+onverschillig of gij eten vindt of niet, lijk de planken op de kaaien,
+die leven van regen en lucht. Doch ik, dien de lucht en de regen
+hongerig maken, ik hoef andere festijnen.
+
+--Gij zult ze hebben, die festijnen, maar 't zullen festijnen zijn
+van een deugdzame vasten. De best gevulde buiken zijn daartegen niet
+bestand; zij nemen langzamerhand af en maken de zwaartste mannen
+als een vlinder zoo licht. En weldra zal men Lamme, mijnen vriend,
+genoegzaam ontvet, zien loopen als een hert,
+
+--Laas! sprak Lamme, zou dit voortaan mijn armzalig lot moeten
+wezen? Ik heb honger, mijn vriend, en zou willen eten.
+
+De avond viel. Zij kwamen te Brugge langs de Gentpoort. Zij toonden
+hunne passen. Toen zij een halven stuiver voor zich en twee stuivers
+voor hunne ezelen hadden betaald, traden zij de stad binnen.
+
+Lamme dacht gedurig aan de woorden van Uilenspiegel en was diep
+nedergeslagen.
+
+--Zullen wij haast avondmalen? sprak hij.
+
+--Ja, antwoordde Uilenspiegel.
+
+Zij stapten af in de Meermin, afspanning, die van verre kennelijk was
+door de gouden meermin, die, als windwijzer, bovenop den trappengevel
+stond.
+
+De beide wandelaars brachten hunne ezelen op stal, en Uilenspiegel
+bestelde brood, bier en kaas voor hun avondmaal.
+
+De weerd grijnslachte bij het opdienen van dien schamelen
+maaltijd. Lamme at met lange tanden, en zag vertwijfeld naar
+Uilenspiegel, die het oudbakken brood en de te jonge kaas
+binnenspeelde alsof hij ortolanen at. En Lamme dronk zijn dun bier
+zonder genoegen. Uilenspiegel lachte in zich zelven als hij hem
+zoo jammerend zag zitten. En daar was nog iemand, die lachte in het
+binnenhof van de afspanning, en die van tijd tot tijd den neus voor
+het venster kwam steken. Uilenspiegel zag dat het eene vrouw was, die
+heur aangezicht verborg. In den waan dat het een oolijke dienstmaagd
+was, hield hij er zich niet verder mede bezig, te meer daar hij, naar
+Lamme kijkend, zag dat zijn vriend bleek, treurig en troosteloos was
+ter oorzake van zijne tegengewerkte liefde voor lekkere spijzen en
+dranken. Hij kreeg medelijden met hem en meende voor zijn gezel een
+pannekoek met pensen, eene pateel ossenvleesch met boonen of een ander
+warm gerecht te bestellen, toen de weerd binnenkwam en beleefdelijk
+sprak, met zijne muts in de hand:
+
+--Als die doorluchtige heeren een beter avondmaal wenschen, moeten
+zij maar spreken en zeggen wat hun zal believen.
+
+Lamme sperde de oogen wijd open en den mond nog wijder, en bezag
+Uilenspiegel met angstige onrust.
+
+Deze antwoordde:
+
+--Reizende werklieden hebben geen gouden karolussen te vereten.
+
+--Toch gebeurt het somtijds, sprak de baas, dat zij niet weten wat
+zij bezitten....
+
+En, naar Lamme wijzend, vervolgde hij:
+
+--Die goede tronie is er twee andere weerd. Wat zouden die doorluchtige
+heeren gelieven te eten en te drinken? een pannekoek met vette, lekkere
+hesp? Soezels?--wij hebben er dezen avond gereedgemaakt. Krakelingen,
+een kapoen, die zoo malsch is dat hij smelt in den mond? Geurige
+karbonaden met saus, bereid met de vier specerijen? Antwerpsche
+dobbelen knol, Brugsche dobbele kuite, Leuvenschen wijn bereid naar
+de wijs van Bourgondië? En dit alles zonder een duit te betalen.
+
+--Breng dan maar alles op, sprak Lamme.
+
+Weldra stond de tafel gedekt en schepte Uilenspiegel er oprecht
+vermaak in den armen Lamme bezig te zien, die, hongeriger dan ooit,
+beurtelings alle gerechten aanviel: den pannekoek, de soezels,
+den kapoen, de hesp, de karbonaden, en heele stoopen dobbelen knol,
+dobbele kuite en Leuvenschen wijn, bereid naar de wijs van Bourgondië,
+door zijn keelgat zond.
+
+Toen Lamme zijne bekomst had, blies hij lijk een walvisch van genoegen;
+en hij keek rondom zich op de tafel om te zien of er niets meer te
+peuzelen viel. En zorgvuldig snoepte hij de brokken der krakelingen.
+
+Hij noch Uilenspiegel hadden het lieve gezichtje gezien, dat in het
+binnenhof, glimlachend voor de ruiten kwam lonken. De baas had warmen
+wijn opgebracht, die met kaneel en Madeira-suiker gekookt was. En de
+beide vrienden dronken en zongen.
+
+Bij de slaapklok, vroeg de baas of zij ieder naar hun groote, schoone
+kamer wilden gaan.
+
+Uilenspiegel zeide, dat een klein kamertje voldoende was voor hun
+tweeën.
+
+De baas antwoordde:
+
+--Kleine kamerkens heb ik niet; gij zult elk eene heerenkamer hebben,
+zonder een duit te betalen.
+
+En, inderdaad, hij bracht hen naar rijk gestoffeerde kamers met
+prachtige meubelen. In die van Lamme stond een groot bed.
+
+Uilenspiegel, die veel gedronken had en viel van den vaak, liet hem
+slapen gaan en deed als hij.
+
+'s Anderen daags, rond den middag, trad hij in de kamer zijns vriends
+en vond hem nog in zijne koets aan 't ronken. Naast hem lag een fijn
+geborduurde beugeltasch. Hij opende die en zag dat ze met gouden
+karolussen en zilveren oortjes gevuld was.
+
+Hij schudde Lamme om hem wakker te maken; deze schoot uit zijn slaap,
+wreef zich de oogen en, ongerust rondom zich kijkend, vroeg hij:
+
+--Mijne vrouw? Waar is mijne vrouw?
+
+En, naar de ledige plaats naast zich in het bed wijzend, sprak hij:
+
+--Straks was ze daar nog.
+
+Hij sprong vervolgens uit zijn bed en keek opnieuw overal rond, in
+alle hoeken en kanten der kamer, in de alkoof, tot in de schapraaien.
+
+Stampvoetend herhaalde hij:
+
+--Mijne vrouw? Waar is mijne vrouw?
+
+De baas kwam boven, op 't gerucht dat hij maakte.
+
+--Deugniet, riep Lamme, den weerd bij de keel grijpend, deugniet,
+waar is mijne vrouw? Wat hebt gij gedaan met mijne vrouw?
+
+--Driftige kerel, zeide de baas, uwe vrouw? Welke vrouw? Gij zijt
+hier alleen gekomen. Ik weet niet wat ge vertelt.
+
+--Ha! hij weet het niet, hij weet het niet, sprak Lamme, die opnieuw
+al de hoeken en kanten der kamer afzocht. Laas! Daar, in mijn bed,
+was zij dezen nacht, als in den schoonen tijd onzer liefde. Ja,
+waar zijt ge, mijn hertje?
+
+En, de beurze ten gronde smijtend, vervolgde hij:
+
+--'t Is uw geld niet, dat ik hebben moet; 't is u, 't is uw liefelijk
+lichaam, uw schoonen boezem, 't is uw hert, mijne welbeminde! O,
+genuchten des hemels, zult gij nooit meer terugkomen? Ik had er mij
+aan gewend te leven zonder u te zien, te leven zonder liefde, mijn
+hertediefje. En nu verlaat gij mij opnieuw, na mij uw zoete kussen
+te hebben laten smaken. Maar ik zal het besterven! Mijne vrouw! Waar
+is mijne vrouw?
+
+En hij lag te snikken ten gronde. Doch eensklaps vloog hij naar de
+deur; hij stormde de trap af, en liep in zijn hemd de afspanning door,
+tot op de straat, al roepend:
+
+--Mijne vrouw? waar is mijne vrouw?
+
+Maar hij kwam dadelijk terug, want de straatjongens jouwden hem uit
+en smeten met steenen naar hem.
+
+En Uilenspiegel zeide tot hem:
+
+--Kleed u, Lamme, en wees niet wanhopend, gij zult ze terugzien,
+vermits gij ze heden gezien hebt. Zij mint u nog immer, vermits
+zij bij u is teruggekomen, vermits zij het waarschijnlijk is,
+die het lekkere maal van gisteravond en de heerenkamers betaald,
+en deze volle beurze op het bed gelegd heeft. De assche zegt mij,
+dat dit het werk niet is van een ontrouwe vrouw. Ween niet meer,
+en laat ons gaan voor het heil van den grond onzer vaderen.
+
+--Laat ons te Brugge blijven, zei Lamme; ik zal heel de stad afloopen,
+en zal ze wel vinden.
+
+--Gij zult ze niet vinden, daar zij zich voor u verbergt, sprak
+Uilenspiegel.
+
+Lamme vroeg inlichtingen aan den baas, doch deze wilde niets zeggen.
+
+En zij togen naar Damme.
+
+Onderwege sprak Uilenspiegel tot Lamme:
+
+--Waarom vertelt gij mij niet, hoe gij ze dezen nacht nevens u vondt
+en hoe zij u verliet?
+
+--Mijn vriend, antwoordde Lamme, gij weet dat wij gisterenavond
+gegastreerd hebben met vleesch, met bier en met wijn, en dat ik met
+moeite kon blazen, toen ik de trap opklom om te slapen. Om mij te
+lichten hield ik, als een groot heer, eene waskeers in mijne hand,
+en om te slapen had ik den kandeleer op eene schapraai gezet; de deur
+was tegenaan en de schapraai stond dicht bij de deur. Terwijl ik mij
+ontkleedde, bezag ik mijn bed met genoegen, want ik had grooten vaak;
+de waskeers werd eensklaps uitgeblazen. Ik hoorde als een ademtocht
+lichte stappen in mijne kamer; doch mits ik meer vaak had dan schrik,
+liet ik mij vallen in 't bed. Ik ging slaap vatten, toen eene stem,
+heure stem, o mijne vrouw, mijn arme vrouwe, mij vroeg: "Heeft het
+avondmaal gesmaakt, Lamme?" en heure stem was dicht tegen mij en heur
+aangezicht ook, en heur liefelijk lichaam.
+
+
+
+
+XLI.
+
+Dien dag had koning Philippus te veel lekkernijen gegeten en was
+hij naargeestiger dan gewoonte. Hij had op zijn levende klavecimbel
+gespeeld, eene kist waar katten in waren, dewelke heuren kop door
+ronde gaten staken, boven de toetsen. Telkens dat de koning op eene
+toets sloeg, sloeg deze op hare beurt de kat met eenen schicht; en het
+dier mauwde erbarmelijk, ter oorzake van de smert, die het uitstond.
+
+Doch Phillippus lachte niet.
+
+Gedurig zocht hij in zijnen geest hoe hij Elisabeth, de groote
+koningin, zou kunnen overwinnen om Maria Stuart terug op den troon
+van Engeland te plaatsen. Met dat doel had hij eenen brief geschreven
+aan den Paus, dewelke diep in schulden stak; de Paus had geantwoord
+dat hij, voor die onderneming, geerne de heilige vaten der tempels
+en de schatten van het Vatikaan zou verkocht hebben.
+
+Maar Philippus lachte niet.
+
+Ridolfi, de lieveling van koningin Maria, die heur wilde verlossen
+in de heimelijke hoop naderhand met heur te trouwen en koning van
+Engeland te worden, kwam bij Philippus om met hem Elisabeth's dood
+te beramen. Maar hij had zulke lange tong, lijk de koning naderhand
+schreef, dat men ter Beurze van Antwerpen openlijk van zijn voornemen
+gesproken had; en de moord werd niet bedreven.
+
+En Philippus lachte niet.
+
+Later zond de bloedige hertog, op bevel van den koning, vier
+moordenaars naar Engeland. Zij slaagden er slechts in, zich te
+doen hangen.
+
+En Philippus lachte niet.
+
+En aldus verijdelde God de heerschzuchtige plannen van dien
+bloedzuiger, wiens voornemen was Maria Stuart heuren zoon te ontnemen
+en in zijne plaats, samen met den Paus, over Engeland te regeeren. En
+de moordenaar was verbitterd, omdat dit edele land zoo groot en zoo
+machtig was. Gedurig wendde hij zijn bleeke oogen naar hetzelve,
+en zocht hij het middel om het te verpletten, om vervolgens over de
+wereld te regeeren, de hervormden uit te roeien, en liefst nog de
+rijke, en have en goed te erven van de slachtofferen.
+
+Maar hij lachte niet.
+
+En men bracht hem ratten en muizen in een ijzeren doos met hooge
+randen, open van boven; en hij stelde de doos met den bodem op een
+gloeiende stoof en hij schepte er vermaak in, de arme diertjes te
+zien en te hooren springen, schreeuwen, zuchten en sterven....
+
+Maar hij lachte niet.
+
+Vervolgens ging hij, met bleek gezicht en bevende handen, in de
+armen van mevrouw van Eboli, zijn vuur van geilheid blusschen, dat
+aangestoken was met de toorts van de wreedheid.
+
+En hij lachte niet.
+
+En mevrouw van Eboli ontving hem, uit vrees en geenszins uit liefde.
+
+
+
+
+XLII.
+
+De lucht was warm: van de kalme zee woei geen het minste
+windeken. Nauwelijks trilden de bladeren der boomen aan de vaart van
+Damme; de krekelen bleven in de meerschen, terwijl, in de velden,
+de bedienden der kerken en abdijen het dertiende van de oogsten
+ophaalden, ten profijte van papen en abten. Uit de hoogte van den
+vurigen, diepen, blauwen hemel overstroomde de zonne het aardrijk
+met haar gloed, en de Natuur sliep onder de zonnestralen als een
+dartel meideken, dat trilt onder de kussen van beuren geliefde. De
+karpers sprongen boven het water naar de vliegen, die gonsden als
+een kokende ketel, terwijl de zwaluwen, met heur lang lijf en groote
+vleugelen, hun hunne prooi betwistten. Uit de aarde steeg een warme,
+vochtige damp omhoog, die schitterde in 't licht. Van op den toren
+van Damme liet de koster, door middel eener gebarsten klok, die klonk
+als een ketel, den veldarbeiders weten dat het middag was, en tijd om
+te gaan eten. De vrouwen brachten heure twee handen trechtergewijze
+aan heuren mond om heure mannen en broeders te roepen: Hans, Pieter,
+Dokus; en boven de menigte zag men heure roode huiken uitsteken.
+
+Lamme en Uilenspiegel zagen, in de verte, den hoogen, vierkanten,
+zwaren toren van Onze-Lieve-Vrouwekerk verrijzen.
+
+Lamme sprak:
+
+--Daar, mijn zoon, daar zijn uwe smerten en uwe minne.
+
+Doch Uilenspiegel antwoordde niet.
+
+--Weldra, sprak Lamme nogmaals, zijn wij aan mijn oude woning en wie
+weet of ik daar mijne vrouw niet zie.
+
+Doch Uilenspiegel antwoordde niet.
+
+--Houten man, zeide Lamme, steenen hert, kan niets u dan bewegen,
+noch de nadering van het plekje, waar gij leefdet als kind, noch de
+dierbare schimmen van den armen Klaas en de arme Soetkin, de beide
+martelaren? Hoezoo! gij zijt weemoedig noch blijde van zin; wie dan
+heeft aldus alle gevoel uit uw herte gerukt? Aanschouw mij, zie hoe de
+angst, de aandoening mijn hert in mijnen buik doen schokken; bezie mij.
+
+Lamme keek op naar Uilenspiegel; hij zag hem met een bleek gezicht,
+met gebogen hoofd, met trillende lippen, sprakeloos weenen.
+
+En hij zweeg.
+
+Zonder nog een woord te wisselen, reden zij voort naar Damme;
+zij kwamen de stad langs de Reigerstraat binnen, doch zij zagen
+niemand, ter oorzake van de hitte. De honden lagen op hunne zijde,
+met hangende tong, voor de zullen der deuren. Lamme en Uilenspiegel
+gingen dicht tegen het Schepenhuis, rechtover hetwelk Klaas verbrand
+werd; Uilenspiegel's lippen beefden heviger, doch hij weende niet
+meer. Toen hij noesch over het huis kwam van Klaas, dat nu bewoond
+was door een meester-koolbrander, ging hij er binnen, zeggende:
+
+--Herkent gij mij? Hier wil ik rusten.
+
+De meester-koolbrander sprak:
+
+--Ik herken u; gij zijt de zoon van het slachtoffer. Doe alsof gij
+thuis waart in deze halle.
+
+Uilenspiegel ging in de keuken, vervolgens in de kamer van Klaas en
+van Soetkin en weende.
+
+Toen hij terug beneden was, zeide de meester-koolbrander tot hem:
+
+--Hier is brood, kaas en bier. Eet als gij honger, drink als gij
+dorst hebt.
+
+Uilenspiegel deed teeken met de hand, dat hij honger noch dorst had.
+
+Toen ging hij voort met Lamme, die schrijlings op zijnen ezel bleef,
+terwijl Uilenspiegel den zijnen bij den halster geleidde.
+
+Zij kwamen aan de hut van de uitzinnige Katelijne, bonden hunne ezelen
+vast en gingen binnen. Het was het etensuur. Op de tafel stond eene
+pateel prinsessenboonen, ondereengestoofd met boerenteenen. Katelijne
+was aan 't eten, terwijl Nele recht stond met de sauspan in de hand,
+gereed om saus te gieten in Katelijne's teil.
+
+Toen Uilenspiegel binnentrad, was zij zoo ontroerd, zoo aangedaan,
+dat zij de sauspan met heel den inhoud in de teil van Katelijne
+liet vallen. De uitzinnige schuddebolde, zocht met heuren lepel de
+boerenteenen uit, rondom de sauspan; zij sloeg op heur voorhoofd
+en sprak:
+
+--Doe het vuur weg! mijn hoofd brandt.
+
+De reuk van de azijnsaus streelde Lamme's neus; de dikke man was in
+verzoeking gebracht.
+
+Uilenspiegel bleef staan en, in zijn groote droefheid, bezag hij Nele
+met een teederen, liefderijken glimlach.
+
+En zonder een woord tot hem te richten, vloog Nele hem om den hals. Zij
+ook scheen waanzinnig; zij weende, lachte, en zeide enkellijk,
+blozend van zoet en innig genoegen:
+
+--Thijl! Thijl!
+
+Uilenspiegel, gelukkig, kon zijne oogen niet wenden van zijne geliefde,
+die zich eensklaps zachtjes losmaakte en eenen stap achteruitweek,
+om hem beter te bezien; en opnieuw vloog zij blijde om zijnen hals en
+drukte hem tegen heure borst, en dit herhaalde reizen achtereen. Zalig
+van geluk, hield hij ze vast, zonder van heur te kunnen scheiden,
+totdat zij, moede en als waanzinnig, op eenen stoel nederviel; en
+zonder verlegenheid zeide zij:
+
+--Thijl! Thijl! mijn geliefde, ge zijt dus terug!
+
+Lamme stond nog steeds nabij de deur; toen Nele's aandoening een
+weinig gestild was, bemerkte zij hem en sprak zij:
+
+--Waar heb ik dien dikzak nog gezien?
+
+--Het is mijn vriend, antwoordde Uilenspiegel. In mijn gezelschap
+zoekt hij zijn wettige vrouw.
+
+--Nu herken ik u, zeide Nele tot Lamme; gij hebt gewoond in de
+Reigerstraat. Gij zoekt uwe vrouw; ik heb ze gezien te Brugge, alwaar
+zij godvruchtig en devotelijk leeft. Ik heb heur gevraagd waarom zij
+zoo wreedelijk heuren man had verlaten, en zij gaf mij tot antwoord:
+"Dus was de heilige wil Gods, maar voortaan mag ik met hem niet
+meer wonen".
+
+Lamme werd droevig gestemd bij die rede en keek begeerig naar de
+prinsessen met azijnsaus. En de leeuweriken zongen en verhieven
+zich hoog in den hemel en de smachtende Natuur liet zich kussen door
+het warme zonnelicht. En Katelijne stak met heuren lepel, rondom de
+sauspan naar de boerenteenen en naar de prinsessen.
+
+
+
+
+XLIII.
+
+Omtrent dien tijd ging een meideken van vijftien jaar alleen in vollen
+dag van Heist naar Knokke, langs het duin. Niemand koesterde de minste
+vrees voor heur, want men wist, dat weerwolven en verdoemde zielen
+alleen uitgaan en bijten des nachts. Zij droeg, in eene tassche,
+acht en veertig zilveren stuivers, wat vier karolusgulden uitmaakt,
+die heure moeder Tonia Pietersen, woonachtig te Heist, schuldig was,
+wegens eene verkooping, aan heuren oom Jan Rapen, woonachtig te
+Knokke. Het meideken, Betkin genaamd, had heure beste kleederen aan,
+en was blij te moede vertrokken.
+
+'s Avonds was Betkin nog niet thuis en heure moeder werd ongerust;
+doch daar zij ten slotte onderstelde, dat ze bij heuren oom was
+gebleven, bedaarde zij.
+
+Visschers die, met een goede vangst van de zee kwamen, trokken 's
+anderen daags hunne boot op het strand, en losten hunne visch in
+karren om ze aan de meestbiedenden te doen verkoopen te Heist, in de
+mijn. Zij klommen den weg in het schelpzand op, en vonden, in het duin,
+een naakt meideken liggen, dat gansch uitgeschud was, tot zelfs van
+heur hemde ontdaan, en rondom heur lag bloed. Nader gekomen, zagen zij,
+in heuren armen gebroken nek, het merk van lange, scherpe tanden. Het
+slachtoffer lag op den rug, met de oogen wijd open naar den hemel,
+met den mond insgelijks open, alsof het nog om hulp wou roepen.
+
+Zij bedekten het lichaam van het meideken met een opperste kleed en
+droegen het naar Heist, naar het Schepenhuis. Weldra kwamen aldaar
+de schepenen en de chirurgijn-baardemaker bijeen, dewelke laatste
+verklaarde, dat die lange tanden geenszins wolfstanden waren, zooals
+de Natuur die gemaakt heeft, maar wèl die van een boozen, helschen
+weerwolf, en dat men God diende te bidden om Vlaanderenland van dat
+gedrocht te verlossen.
+
+En, heel het graafschap door, en vooral te Damme, Heist en Knokke,
+werden openbare gebeden bevolen.
+
+En men zag het volk jammerend de kerken afloopen.
+
+En in de kerk van Heist, in dewelke het lijk van het meideken ten
+toon gesteld was, schreiden mannen en vrouwen, als zij den bloedigen,
+verscheurden nek van het slachtoffer zagen.
+
+En de moeder zei in de kerk zelve:
+
+--Ik wil naar den weerwolf gaan en hem vaneenscheuren met mijne tanden.
+
+En weenend hitsten de vrouwen heur in heur voornemen op. Sommigen
+zeiden nochtans:
+
+--Gij zoudt niet levend terugkomen.
+
+En zij ging met heuren man en heure beide broeders--alle vier goed
+gewapend--den wolf zoeken langs strand, duin en dal, maar zij vonden
+hem niet. En heur man moest heur terugbrengen naar huis, want door
+de nachtelijke koude had zij de koorts gekregen; en zij waakten bij
+heur bed terwijl zij hunne netten herstelden.
+
+Overwegende, dat de weerwolf een beest is dat leeft van bloed, doch
+geenszins de dooden besteelt, meende de baljuw van Damme, dat het
+ondier zekerlijk moest gevolgd zijn door diepers, die, voor hun snood
+gewin, rondzwierven langs het strand. Dienvolgens liet hij uitbellen,
+dat hij een iegelijk gelastte en beval, goed gewapend met bussen,
+stokken en anderszins, op zoek te gaan, en alle schooiers en diepers
+te vatten en af te tasten, om te zien of in hunne gordeltasschen
+geen gouden karolussen staken of geenerlei stuk van de kleeding van
+de slachtofferen. En nadien zouden de gezonde en sterke schooiers
+en diepers op de galeien des konings worden gebracht. En de oude en
+gebrekkelijke zou men laten gaan.
+
+Doch men vond niets, dat licht in de zaak bracht.
+
+Uilenspiegel ging tot den baljuw en sprak:
+
+--Ik wil den weerwolf dooden.
+
+--Wat geeft u vertrouwen? vroeg de baljuw.
+
+--De assche klopt op mijn hert, antwoordde Uilenspiegel. Geef mij de
+toelating in de gemeentesmidse te werken.
+
+--Gij moogt, sprak de baljuw.
+
+Zonder tot een man of eene vrouw van Damme een woord over zijn ontwerp
+te spreken, trok Uilenspiegel naar de smidse en verveerdigde daar,
+in 't geheim, eene schoone en groote val om wilde dieren te vangen.
+
+Den volgenden dag, een Zaterdag, de geliefkoosde dag van de weerwolven,
+toog Uilenspiegel henen met eenen brief van den baljuw voor den
+parochiepaap van Heist, en met de val onder zijnen mantel; overigens
+was hij gewapend met een goede bus en een scherp, versch aangezet
+kruismes; in 't heengaan zei hij tot die van Damme:
+
+--Ik ga op jacht naar de meeuwen en zal met haar dons oorkussens
+maken voor mevrouw van den baljuw.
+
+Naar Heist stappend, langs het duin, hoorde hij de woedende baren
+der zee, die schuimend kwamen botsen op de kust, met een gedruisch
+als van den donder, en den wind, die uit Engeland woei en die huilde
+in het want van de gestrande schuiten.
+
+Een schipper zei tot hem:
+
+--Die kwade wind doet ons nadeel. Verleden nacht was de zee kalm,
+doch na zonsopgang rees zij eensklaps woedend omhoog. Wij zullen niet
+kunnen in zee steken.
+
+Uilenspiegel was er blijde om, want aldus was hij zeker des nachts
+hulp te krijgen, als zulks noodig mocht zijn.
+
+Te Heist ging hij naar den pastoor, denwelken hij den brief van den
+baljuw bestelde.
+
+De parochiepaap zeide tot hem:
+
+--Gij zijt een moedige kerel; edoch ik moet u zeggen, dat niemand
+'s Zaterdagavonds langs het duin gaat, zonder gebeten, en dood in
+het zand gevonden te worden. De dijkwerkers en andere arbeidslieden
+wachten steeds op elkaar en begeven zich maar bij troepen op weg. De
+avond valt. Hoort gij in het duin den weerwolf huilen? Zal men weeral,
+lijk gisteren, heel den nacht door, zijn schor gehuil hooren weergalmen
+op den akker der dooden? God zij met u, mijn zoon, maar doe het niet.
+
+En de paap maakte het teeken des kruises, en zegende hem.
+
+--De assche klopt op mijn hert, antwoordde Uilenspiegel.
+
+De pastoor sprak:
+
+--Mits gij zoo'n kloekmoedige wilskracht hebt, zal ik u helpen.
+
+--Heer pastoor, sprak Uilenspiegel, gij zoudt mij en het arme
+geteisterde land grootelijks van dienst zijn, zoo gij bij Tonia, de
+moeder van het slachtoffer, en ook bij heure twee broeders wildet
+gaan, en hun zeggen, dat de wolf in de nabijheid is en dat ik hem
+wil afwachten om hem te dooden.
+
+De parochiepaap sprak:
+
+--Als gij niet weet welken weg gij moet nemen, begeef u op dien, welke
+leidt naar het kerkhof. Hij loopt tusschen twee groene hagen. Twee
+mannen zouden er naast elkander niet kunnen gaan.
+
+--Daar zal ik zijn, antwoordde Uilenspiegel. En gij, messire dappere
+pastoor, gelast en beveel aan de moeder van het meideken, aan heuren
+man en aan heure broeders zich, vóór de slaapklok, goed gewapend
+in de kerk te bevinden. Als zij mij hooren fluiten lijk de meeuw,
+is dit het teeken, dat ik den weerwolf gezien heb. Dan moeten zij
+de wacharmklok luiden en mij ter hulp snellen. Hebt gij ook eenige
+andere wakkere mannen?
+
+--Neen, mijn zoon, antwoordde de pastoor. De visschers vreezen den
+weerwolf meer dan pest en dan dood. Maar doe het niet....
+
+Uilenspiegel antwoordde:
+
+--De assche van Klaas klopt op mijn hert.
+
+Toen zei de paap:
+
+--Ik zal doen wat gij vraagt, wees gezegend. Hebt gij soms honger
+of dorst?
+
+--Beide, antwoordde Uilenspiegel.
+
+De pastoor gaf hem bier, brood en kaas.
+
+Uilenspiegel at en dronk; en hij toog henen.
+
+Onderwege hief hij de oogen op; hij zag Klaas, zijn vader, in
+glorie naast God in den hemel, in denwelken de heldere maan glom,
+en vervolgens zag hij naar de zee en de wolken, en hoorde hij den
+loeienden wind, die uit Engeland blies.
+
+--Laas! sprak hij, zwarte wolken, die voorbijrennen in het nachtelijk
+duister, weest als de Wrake die den Moord achternazet. Loeiende zee,
+pikdonkere hemel; bruisend water, dat driftig, grammoedig rolt of
+woest omhoog slaat, of in branding schuimend en spattend breekt op
+het strand; zwarte zee, in rouw gehulde hemel, komt mij ter hulp in
+mijnen strijd tegen den weerwolf, den vuigen moordenaar van onschuldige
+meidekens. En gij, wind, die klagend huilt in de bremstruiken van
+het duin en in het want van de schepen, gij zijt de stem van de
+slachtofferen, die roepen om wrake bij den Heer, dewelke mij helpe
+in mijne onderneming!
+
+En waggelend op zijne beenen, alsof zijn hoofd honderd pond woog en
+zijne maag overlast was, daalde hij neer van het duin.
+
+Wankelend stapte hij voort met een slepend lied op de lippen, dat
+hij elk oogenblik onderbrak om te hikken, te geeuwen, te spuwen. Van
+tijd tot tijd bleef hij staan en gebaarde hij over te geven, doch
+in werkelijkheid opende hij goed de oogen, om rondom zich alles
+oplettend gade te slaan. Eensklaps hoorde hij een schor geluid; hij
+bleef staan om te spugen als een hond, en, bij het licht der rijzende
+maan, onderscheidde hij de gedaante van eenen wolf, die sloop naar
+het kerkhof.
+
+Waggelend sloeg Uilenspiegel het pad in, tusschen de groene hagen. Daar
+gebaarde hij neder te vallen, doch 't was om de val te plaatsen langs
+den kant, van denwelken de wolf kwam: hij wapende vervolgens zijne
+bus en ging tien stappen verder staan in de houding eens dronkaards,
+en gedurig veinsde hij te waggelen, te hikken, te braken, doch
+werkelijk spande hij zijnen geest als een boog, opende de oogen en
+spitste de ooren.
+
+En niets zag hij dan de zwarte wolken, die als waanzinnig renden
+door 't luchtruim, en een dikke korte en zwarte gedaante, die op hem
+afkwam; en niets hoorde hij dan de wind, die kreunend huilde, de zee,
+die als de donder rolde, en den weg van schelpzand, die kraakte onder
+een zwaren, huppelenden stap.
+
+Uilenspiegel veinsde zich te willen nederzetten en liet zich, als
+een dronkaard, zwaar op den weg vallen. En hij braakte.
+
+Daar hoorde hij ijzerwerk knarsen, op een paar stappen van zich,
+dadelijk daarna het gerucht van de val, die toesloeg, en den gil van
+een mensch.
+
+--De weerwolf, sprak hij bij zich zelven, is met de voorpooten gevangen
+in de val. Huilend richt hij zich op; hij schudt de val heen en weer
+om te ontvluchten. Maar ontsnappen zal hij niet. En hij schoot zijne
+bus af naar zijne beenen.
+
+--Getroffen, sprak hij, want gekwetst valt hij neder!
+
+En hij floot als de zeemeeuw.
+
+Plotseling begon de klok van de kerk wacharm te luiden, en riep de
+schelle stem van een knaapje in 't dorp:
+
+--Wordt wakker, gij allen, die slaapt; de weerwolf is gevangen!
+
+--Hoezee! God zij gedankt! sprak Uilenspiegel.
+
+Tonia, de moeder van Betkin, Lansaem, heur man, Judocus en Michiel,
+heure broeders, kwamen het eerst met hunne lanteernen.
+
+--Hebt gij hem vast? vroegen zij.
+
+--Ziet maar, daar ligt hij op den weg, antwoordde Uilenspiegel.
+
+--God zij gedankt! spraken zij.
+
+En zij maakten het teeken des kruises.
+
+--Wie is daar aan 't luiden? vroeg Uilenspiegel.
+
+Lansaem antwoordde:
+
+--Mijn oudste zoon; de jongste loopt het dorp rond, om de menschen
+op te kloppen en te roepen, dat de wolf gevangen is. Heil U!
+
+--De assche klopt op mijn hert, antwoordde Uilenspiegel.
+
+Plotseling begon de weerwolf te spreken en zeide hij:
+
+--Heb medelijden met mij, Uilenspiegel, heb medelijden.
+
+--De wolf spreekt, zeiden allen een kruis slaande. Hij is de duivel,
+want reeds kent hij Uilenspiegel's naam.
+
+--Heb medelijden, medelijden, smeekte de stem, zeg aan die klok van
+te zwijgen; zij klept als de doodklok; medelijden, ik ben de wolf
+niet. Mijne polsen zijn doorgesneden in de val; ik ben oud en ik
+bloed, medelijden! Welk schelle kinderstem hoor ik daar het dorp
+wakker maken? Medelijden!
+
+--Ik herken uwe stem, ik heb ze vroeger gehoord, sprak Uilenspiegel
+onstuimig. Gij zijt de vischverkooper, de moordenaar van Klaas, de
+bloedzuiger der arme meidekens. Mannen en vrouwlieden, weest zonder
+vrees; 't is de deken, die Soetkin deed sterven van smerte.
+
+En met eene hand hield hij hem bij den nek, onder de kin, terwijl
+hij met de andere zijn kruismes trok.
+
+Maar Tonia, de moeder van Betkin, hield hem tegen en riep:
+
+--Neem hem levend gevangen.
+
+En met klissen trok zij zijn grijze haren uit, terwijl zij zijn
+aangezicht met heure nagelen doorwoelde.
+
+En zij huilde van droefheid en woede.
+
+Met de handen gevat in de val, en kronkelend ter oorzake van de hevige
+smert, riep de weerwolf:
+
+--Hebt medelijden, hebt toch medelijden; o, die vrouw, doet ze
+weggaan. Ik zal twee gouden karolussen geven. Breekt die klokken! Waar
+zijn die tierende kinderen?
+
+--Houdt hem levend! schreeuwde Tonia, houdt hem levend, hij moet het
+betalen. De doodklokken kleppen voor u, moordenaar. Met zacht vuur,
+met gloeiende tangen! Houdt hem levend! dat hij betale!
+
+Intusschen stiet Tonia tegen een voorwerp, dat op den grond lag;
+zij bukte zich en raapte een wafelijzer op. Toen zij het bekeek
+bij den gloed van de toortsen, zag zij, naar de Brabantsche wijs,
+diepe ruitjes in de ijzeren platen, maar daarenboven was het bezet met
+lange en scherpe tanden, als een ijzeren muil. En als zij het toedeed,
+was het als de muil van een wolfshond.
+
+Tonia hield toen het wafelijzer vast, opende het en sloot het
+beurtelings, en deed daarbij het ijzerwerk knarsen. En ze scheen
+waanzinnig en, razend en knarsetandend, reutelend als eene zieltogende,
+zuchtend van de bittere smert, die dorstte naar weerwraak, beet zij
+met het ijzer den gevangene in zijne armen, in zijne beenen, in zijn
+lijf, overal, doch vooral in den nek; en telkens dat zij het ijzer
+toedrukte, sprak zij:
+
+--Zoo deed hij met Betkin, met de ijzeren tanden. Hij betale. Bloedt
+gij, moordenaar? God is rechtveerdig. Hoor maar de doodklok. Betkin
+roept om gewroken te worden. Voelt gij de tanden? 't Zijn de tanden
+van God!
+
+En zij beet zonder ophouden of medelijden, en sloeg met het wafelijzer,
+als zij er hem niet mee kon bijten. Maar gedreven door heur groote
+begeerte naar wraak, doodde zij hem niet.
+
+--Genade, schreeuwde de vischverkooper, Uilenspiegel, steek mij dood
+met uw kruismes, stel aan mijn lijden een einde. Smijt die vrouw
+weg. Breek de klokken. Dood de kinderen, die schreeuwen!
+
+En Tonia folterde hem zonder ophouden, totdat een oud man medelijden
+kreeg en heur het wafelijzer ontnam.
+
+Maar toen spugde Tonia den weerwolf in het gezicht en trok ze zijne
+haren uit, zeggende:
+
+--Gij zult betalen, met zacht vuur, met gloeiende tangen: uwe oogen
+zal ik met mijne nagelen uitrukken!
+
+Intusschen waren al de visschers, boeren en vrouwlieden van Heist
+bijgekomen, als zij vernomen hadden, dat de weerwolf geen duivel,
+maar een man was.
+
+Eenigen droegen lanteernen en toortsen. En allen riepen:
+
+--Dief en moordenaar, waar hebt gij het goud weggestoken, dat gij
+den armen slachtofferen ontroofdet? Hij moet alles teruggeven!
+
+--Ik heb geen goud; hebt medelijden! smeekte de vischverkooper.
+
+En de vrouwlieden smeten zand en steenen naar hem.
+
+--Hij betale! hij betale! schreeuwde Tonia.
+
+--Medelijden, zuchtte hij, ik ben druipend van het bloed, dat gutst
+uit mijn wonden.
+
+--Uw bloed, sprak Tonia. O, gij moet er houden voor de hand van den
+beul. Hij moet sterven met zacht vuur, zijne hand afgekapt worden,
+met gloeiende tangen genepen! Hij zal betalen, hij zal betalen.
+
+En zij wilde hem slaan; doch zij viel buiten kennis op het zand als
+eene doode; en men liet heur daar liggen totdat zij terug tot zich
+zelve kwam.
+
+Intusschen had Uilenspiegel de handen van den gevangene uit de val
+verlost, en toen zag hij, dat drie vingeren ontbraken aan zijne
+rechterhand.
+
+En hij beval hem stevig te knevelen en in eene vischmand te
+binden. Mannen, vrouwlieden en kinderen togen toen henen naar Damme,
+en droegen onderwege beurtelings de benne met haar verachtelijke
+vracht. En anderen droegen lanteernen en toortsen.
+
+En de vischverkooper zei gedurig:
+
+--Breekt de klokken, doodt de kinderen, die schreeuwen.
+
+En Tonia sprak:
+
+--Hij betale, met zacht vuurken, met gloeiende tangen, hij betale!
+
+En dan weer zwegen beiden. En Uilenspiegel hoorde niets meer dan den
+jagenden adem van Tonia, den zwaren stap van de mannen op het krakende
+zand en de zee, die rolde als de donder.
+
+En, met treurig hert, zag hij naar de wolken, die, als waanzinnigen,
+elkander achternazetten in den hemel; naar de zee, waar de branding
+zich als lichtende schaapkens vertoonde, en, bij den gloed van
+lanteernen en toortsen, naar het doodsbleeke gelaat van den
+vischverkooper, dewelke hem bezag met valschheid en wraaklust.
+
+En de assche klopte op zijn hert.
+
+En in vier uren gingen zij naar Damme, alwaar het gemeen reeds te
+hoop geloopen was, daar het de tijding reeds kende. Allen wilden
+den vischverkooper zien en volgden de visschers al dansend, zingend
+en roepend:
+
+--De weerwolf is gevangen; hij is gepakt, de moordenaar! Gezegend
+zij Uilenspiegel! Lang leve onze broeder Uilenspiegel!
+
+En er was veel beweging onder het gemeeen.
+
+Toen zij aan 't huis van den baljuw waren, kwam deze vóór op het
+gerucht en zei tot Uilenspiegel:
+
+--Gij zijt overwinnaar! Heil u!
+
+--De assche van Klaas klopte op mijn hert, antwoordde Uilenspiegel.
+
+Toen sprak de baljuw:
+
+--Gij krijgt de helft van de nalatenschap des moordenaars.
+
+--Geef dat aan de slachtofferen, antwoordde Uilenspiegel.
+
+Lamme en Nele kwamen nader; lachend en weenend van geluk, kuste Nele
+heuren vriend Uilenspiegel; Lamme sprong log als een beer omhoog en
+klopte op den buik van zijn vriend, zeggende:
+
+--Dat is een brave, koene en trouwe gezel; 't is mijn vriend,
+mijn spitsbroeder: zulke vrienden hebt gij niet, gijlieden van
+'t platteland.
+
+Maar de visschers lachten en spotten met hem.
+
+
+
+
+XLIV.
+
+De burgstorm luidde 's anderen daags, om den baljuw, de schepenen
+en de griffiers ter vierschaar te roepen op de banken van graszoden,
+rond den boom der justitie, dewelke een schoone lindeboom was.
+
+En rondom stond het gemeen.
+
+De vischverkooper, ondervraagd, wilde niets belijden, zelfs niet
+wanneer men hem de drie vingeren toonde, die de soldaat afgekapt had,
+en die aan zijne rechterhand ontbraken. Hij antwoordde steeds:
+
+--Ik ben arm en oud, hebt medelijden met mij!
+
+Maar het gemeen jouwde hem uit en riep:
+
+--Gij zijt een oude wolf, een moordenaar van onschuldige kinderen. Geen
+medelijden, heeren rechters!
+
+De vrouwlieden spraken:
+
+--Ge moet ons niet bezien met uwe ijskoude oogen; gij zijt een man en
+geen duivel: wij vreezen u niet. Wreedaardig beest, lafhertiger dan
+eene kat die de vogeltjes in hun nestje opvreet, dooddet gij de arme
+meidekens, die niets vroegen dan in braafheid hun liefelijk leven
+te slijten.
+
+--Hij betale, hij betale met zacht vuur, met gloeiende tangen,
+riep Tonia.
+
+En, hoewel de serjanten van de gemeente het heur verboden, hitsten
+de moeders heure knapen en meidekens op, om steenen te werpen naar
+den vischverkooper. En dezen deden het: en telkens dat hij hen bezag,
+jouwden zij hem uit, en gedurig riepen zij:
+
+--Bloedzuiger! bloedzuiger! slaat dood!
+
+En gedurig riep Tonia:
+
+--Hij betale met zacht vuur, met gloeiende tangen, hij betale!
+
+En het volk morde.
+
+--Ziet eens, zeiden de vrouwen tot elkander, hij heeft koude onder
+de heldere zon, die gloort aan den hemel, en kan zijn witte haren of
+zijn vaneengereten gezicht niet verwarmen.
+
+--Hij siddert van smerte!
+
+--'t Is de rechtveerdigheid Gods!
+
+--Ziet eens hoe jammerlijk hij zich recht houdt!
+
+--En zijne moordenaarshanden, van voren gebonden, bloeden ten gevolge
+van het prangen der val.
+
+--Hij betale, hij betale! schreeuwde Tonia.
+
+En jammerend zuchtte hij:
+
+--Ik ben arm, laat mij gaan.
+
+En iedereen, tot zelfs de rechters, dreef den spot met hem. Toen
+veinsde hij te weenen om het volk te vermurwen. Maar de vrouwen
+lachten.
+
+Gezien de genoegzame gronden tot torture, werd hij veroordeeld om op
+de pijnbank te worden gezet, totdat hij zou bekennen hoe hij doodde,
+van waar hij kwam, waar de kleederen van zijn slachtofferen waren,
+en de plaats, waar hij zijn geld verborg.
+
+Toen hij, met de te smalle nieuwlederen schoenen aan de voeten,
+in de folterkamer gebracht werd, vroeg de baljuw hem, hoe Satan hem
+beroerd had zulke afgrijselijke misdaden te bedrijven; hij antwoordde:
+
+--Ik zelf ben Satan, want ik gelijk hem in alles. Reeds toen ik zeer
+klein was,--ik was leelijk en schraal en onbehendig in alle spelen
+en lichaamsoefeningen,--aanzag een iegelijk mij voor eenen onnoozele,
+en werd ik dikwijls geslagen. Knapen, noch meidekens hadden medelijden
+met mij. Jongeling geworden, wilde geenerlei meideken weten van mij,
+zelfs niet mits betaling. Toen vatte ik wrok en haat op tegen een
+iegelijk wezen, dat komt van de vrouw. Daarom kloeg ik Klaas aan, dien
+een ieder beminde. En ik beminde alleenlijk Munt, die mijn witte of
+goudgele gezelline was; met Klaas te doen sterven, vond ik profijt en
+plezier. Nadien moest ik, meer nog dan vroeger, leven als een wolf,
+en ik droomde van te bijten. Op reize door Brabant, zag ik er de
+wafelijzers van dat land en zei ik bij mij zelven, dat een dergelijk
+ijzer mij zou kunnen dienen als een ijzeren muil. Ha! had ik u bij
+den kraag, gij allen, boosaardige tijgers, die genoegen schept in de
+folteringen eens grijsaards! Ik zou u bijten met nog meerder genoegen
+dan den soldaat en het meideken. Want, als ik heur op het zand, in
+de zonne zoo liefelijk zag slapen met het zakje geld in de handen,
+maakten liefde en medelijden zich meester van mij; doch daar ik te
+oud ben en het kind niet kon nemen, beet ik het met de ijzeren tanden.
+
+De baljuw vroeg hem waar hij woonde; de vischverkooper antwoordde:
+
+--Te Ramskapelle; van daar ga ik naar Blankenberge, naar Heist,
+ja zelfs naar Knokke. Op Zon- en kermisdagen bak ik, met dat ijzer,
+wafelen naar de wijs van die van Brabant. Het was altijd zuiver en goed
+gesmeerd. En in al de dorpen werd die nieuwigheid uit vreemde gewesten
+zeer goed onthaald. En als het u belieft nog meerder te weten, en hoe
+het komt, dat niemand mij kon herkennen, zal ik u zeggen, dat ik mijn
+aangezicht wit en mijne haren ros verfde. Wat de wolfshuid betreft,
+dewelke gij mij toont met uw wreeden, ondervragenden vinger, die komt
+van twee wolven, die ik gedood heb in de bosschen van Raveschoot en
+Maldegem. Ik had de vellen maar aaneen te naaien om er mij mede te
+bedekken. Ik verborg ze in eene kist in het duin van Heist; daar ook
+zijn de kleederen, gestolen door mij, om ze later te verkoopen bij
+een goede gelegenheid.
+
+--Trek hem van voor het vuur weg, sprak de baljuw.
+
+De beul gehoorzaamde.
+
+--Waar is uw goud? vroeg nog de baljuw.
+
+--De koning zal het niet weten, antwoordde de vischverkooper.
+
+--Brand hem van dichtbij met de vlammende keersen, sprak de
+baljuw. Breng hem dichter bij het vuur.
+
+De hangman gehoorzaamde en de vischverkooper schreeuwde:
+
+--Ik zal niets belijden. Ik sprak reeds te veel: gij zult mij
+verbranden. Ik ben geen tooveraar: waarom plaatst gij mij bij het
+vuur? Mijn voeten bloeden ten gevolge van de brandwonden. Ik zal niets
+zeggen. Waarom nu nog dichter? Zij bloeden, zeg ik u, zij bloeden;
+die schoenen zijn van gloeiend ijzer gemaakt! Mijn goud? welnu, mijn
+eenige vriend op deze wereld is ... trek mij weg van het vuur; het
+is in mijnen kelder te Ramskapelle, in eene doos ... laat mij gaan;
+genade, ontferming, heeren rechters; vermaledijde hangman, neem de
+keersen weg.... Hij brandt mij nog meerder ... het ligt in eene doos
+met dubbelen bodem en is gewikkeld in een wollen deken, opdat het
+niet rammelen zou, als men de doos schudt; nu heb ik alles gezegd,
+breng mij weg van het vuur!
+
+Als hij van vóór het vuur werd geschoven, lachte hij valschelijk.
+
+De baljuw vroeg hem waarom hij lachte.
+
+--Van genoegen, omdat ik verlost ben, antwoordde hij.
+
+De baljuw zeide tot hem:
+
+--Vroeg niemand u ooit om uw wafelijzer met wreede tanden te zien?
+
+De vischverkooper antwoordde:
+
+--Men zag, dat het een wafelijzer was, teenemaal gelijk aan de anderen,
+behalve dat er gaten in waren, in dewelke ik's nachts de ijzeren tanden
+vastschroefde; met den dageraad nam ik ze er uit; de boeren verkozen
+mijne wafelen boven die van de andere kooplieden en hieten ze "wafelen
+met Brabantsche knoopen", ter oorzake van de ledige holten,--waarin
+de tanden geschroefd werden,--en dewelke kleine halfronden, die op
+knoopen geleken, op de wafelen maakten.
+
+Maar de baljuw vervolgde.
+
+--Wanneer beet gij de arme slachtofferen?
+
+'s Nachts, en ook 's daags. 's Daags dwaalde ik langs het duin
+en de groote wegen, met mijn wafelijzer steeds op den loer, maar
+voornamelijk 's Zaterdags, de groote merktdag te Brugge. Zag ik een
+boer voorbijkomen met een droevig gezicht, dan liet ik hem gaan,
+want ik dacht, dat zijne droefgeestigheid te wijten was aan den staat
+zijner beurze; doch ik bleef aanstappen naast dengene, die wel te moede
+scheen; en als hij er zich het minst aan verwachtte, beet ik hem in
+den nek, na hetwelk ik zijne beugeltasch nam. En niet alleenlijk in
+het duin liep ik, maar langs alle wegen en paden van 't platteland.
+
+Toen sprak de baljuw:
+
+--Heb berouw en bid God.
+
+Maar godslasterlijk antwoordde de vischverkooper:
+
+--'t Is de Heer God, die wilde dat ik was wat ik ben: ik deed alles
+ondanks mij zelven, beroerd door den wil der Natuur. Boosaardige
+tijgeren, die mij onrechtveerdig wilt straffen! Maar veroordeelt mij
+niet tot het vuur: ik deed alles ondanks mij zelven; hebt medelijden,
+ik ben arm en oud; ik zal sterven van mijne wonden; verbrandt mij
+toch niet!
+
+Toen werd hij terug naar de vierschaar gebracht, onder den lindeboom,
+om er het vonnis te hooren, in bijzijn van het vergaderde volk.
+
+En als schromelijke moordenaar, dief en godslasteraar, werd hij
+veroordeeld om de tong met een gloeienden priem doorstoken te worden,
+de rechterhand afgekapt, en met een zacht vuur verbrand, totdat de
+dood er op volge, vóór de pui van het Schepenhuis.
+
+En Tonia riep:
+
+--'t Is rechtveerdig, hij betale!
+
+En het volk riep:
+
+--Lang leven de Heeren van de Wet!
+
+En hij werd terug naar het Steen gebracht, alwaar men hem vleesch en
+wijn brengen kwam. En hij was blijde, zeggende, dat hij er tot dan
+toe nooit had gegeten en gedronken, maar dat de koning, die zijne
+goederen erfde, wel dien laatsten maaltijd mocht betalen.
+
+En hij grijnslachte.
+
+'s Anderen daags, bij zonsopgang, toen men hem naar het schavot bracht,
+zag hij Uilenspiegel omtrent den brandstapel staan; en hij riep,
+met den vinger naar hem wijzend:
+
+--Die dààr, die moordenaar van grijsaards, moet insgelijks sterven;
+tien jaar geleden smeet hij mij te Damme in de vaart, omdat ik zijn
+vader had aangeklaagd. Daardoor diende ik, als trouw onderdaan,
+Zijne Katholieke Majesteit.
+
+De klokken van Onze-Lieve-Vrouwekerk klepten.
+
+--Voor u ook kleppen die klokken, sprak hij tot Uilenspiegel; gij
+zult gehangen worden, daar gij gemoord hebt!
+
+--De vischverkooper liegt, riepen die van 't gemeen; hij liegt,
+de beul, de moordenaar!
+
+En, als waanzinnig, smeet Tonia eenen steen naar hem, die hem kwetste
+aan 't voorhoofd. En ze riep:
+
+--Had hij u verdronken, ge zoudt niet geleefd hebben om mijn arm
+dochterken te bijten lijk een bloedzuiger, die ge zijt!
+
+Uilenspiegel uitte geen woord; Lamme sprak:
+
+--Heeft iemand den vischverkooper in 't water zien smijten?
+
+Uilenspiegel antwoordde niet.
+
+--Neen, neen, riep het gemeen, hij heeft gelogen, de beul!
+
+--Neen, ik heb geenszins gelogen, schreeuwde de vischverkooper, hij
+wierp mij er in, terwijl ik hem om vergiffenis smeekte, en ik kon
+er maar uitgeraken door middel van een schuitje, dat aan den oever
+vastgemeerd lag. Doornat en bibberend, kwam ik met veel moeite naar
+mijne armzalige hut, alwaar ik de koorts had, alwaar niemand mij
+oppaste, terwijl ik tusschen leven en dood lag.
+
+--Gij liegt, sprak Lamme, niemand heeft het gezien.
+
+--Neen, niemand, riep Tonia. In 't vuur, met den beul! Alvorens te
+sterven, wil hij nog een onschuldig slachtoffer maken; in 't vuur,
+hij betale! Hij heeft gelogen! Belijd niet, Uilenspiegel, al mocht
+het nog waar zijn. Er zijn geene getuigen. Hij betale met zacht vuur,
+met gloeiende tangen!
+
+--Bedreeft gij den moord? vroeg de baljuw tot Uilenspiegel.
+
+Uilenspiegel antwoordde:
+
+--Den aanklager, den moordenaar van Klaas, mijn vader, smeet ik in
+'t water. De assche klopte op mijn hert.
+
+--Hij bekent, sprak de vischverkooper; hij zal insgelijks sterven? Waar
+is de galg, dat ik ze zie? Waar is de beul met het zweerd der
+justitie? De doodklok klept ook voor u, nietdeug, moordenaar van een
+armen grijsaard.
+
+Uilenspiegel sprak:
+
+--Ik smeet u in 't water om u te dooden: de assche van mijn vader
+klopt op mijn hert.
+
+En in het volk spraken de vrouwen:
+
+--Waarom het stuk bekend, Uilenspiegel? Niemand heeft het gezien;
+nu zult gij sterven.
+
+En de vischverkooper lachte, danste van bittere vreugde, zwaaide met
+zijne armen, dewelke met bloedige doeken omwonden waren.
+
+--Hij zal sterven, sprak hij, hij zal ter helle varen met een strop
+om den hals, als dieper, rabauw en truwant: hij zal sterven; God
+is rechtveerdig!
+
+--Neen, hij zal niet sterven, sprak de baljuw. Na tien jaren wordt, in
+Vlaanderenland, de moord niet meer gepunieerd. Uilenspiegel pleegde een
+lakensweerdige daad, maar 't was uit kinderlijke liefde. Uilenspiegel
+zal uit dien hoofde niet worden vervolgd.
+
+--Leve de Wet! riep het volk. Lang leven de Heeren van de Wet!
+
+De klokken van Onze-Lieve-Vrouwekerk klepten. En de vischverkooper
+knarsetandde, boog het hoofd en weende zijn eersten traan.
+
+En men kapte zijne hand af, en men doorstak zijne tong met een
+gloeienden priem, en hij werd levend verbrand met zacht vuur, vóór
+de pui van het Schepenhuis.
+
+Als hij den dood nabij was, riep hij:
+
+--De koning zal mijn goud niet hebben; ik heb gelogen ... Boosaardige
+tijgeren, ik zal weerkomen om u te bijten.
+
+En Tonia riep:
+
+--Hij betale, hij betale! Zie hoe zijne armen en beenen, die naar den
+moord liepen, wringen en smijten: het lichaam van den moordenaar rookt;
+zijn wit haar, hyena's haar, brandt op zijn bleek gezicht. Hij betale,
+hij betale!
+
+En de vischverkooper huilde als een wolf.
+
+En de klokken van Onze-Lieve-Vrouwekerk klepten.
+
+En Lamme en Uilenspiegel stegen terug op hunne ezelen.
+
+En de jammerende Nele bleef bij Katelijne, dewelke gedurig zeide:
+
+--Doe het vuur weg! het hoofd brandt; kom terug, Hansken, mijn liefste.
+
+
+
+
+
+
+
+VIERDE BOEK.
+
+
+I.
+
+Te Heist, op het duin zijnde, zagen Uilenspiegel en Lamme van Oostende,
+Blankenberge, Knokke, menigvuldige visschersschuiten aankomen,
+vol gewapende mannen, die, in navolging van de Zeeuwsche Geuzen,
+een zilveren halve maan op hun hoed droegen met deze woorden: Liever
+den Turc als den Paus.
+
+Uilenspiegel was wel te moede; hij floot als de leeuwerik; allerwegen
+antwoordde het strijdzuchtig gekraai van den haan.
+
+De booten vaarden of vischten, verkochten hare vangst en landden de
+eene na de andere te Emden. Daar huisde Willem van Blois, heer van
+Treslong, die, op last van den prins van Oranje, een schip uitrustte.
+
+Uilenspiegel en Lamme kwamen te Emden, terwijl op bevel van Treslong,
+de booten der Geuzen weder in zee staken.
+
+Treslong, die sedert elf weken te Emden was, verveelde zich diep. Hij
+stapte van de boot op den wal en van den wal op de boot, als een
+geketende beer.
+
+Uilenspiegel en Lamme wandelden langs de kaaien en ontwaarden daar een
+heer met een goede tronie, die er eenigszins droefgeestig uitzag en
+druk bezig was met de steenen van de kaai uit te steken, door middel
+van een breekijzer. Het ging niet gemakkelijk, doch met goeden moed
+zette hij zich steeds opnieuw aan het werk, terwijl achter zijnen
+rug een hond aan een been knaagde.
+
+Uilenspiegel kwam naar den hond toe en gebaarde, dat hij hem zijn
+been wilde afnemen. De hond bromde; Uilenspiegel scheidde niet uit:
+de hond werd kwader en blafte en bromde uit al zijne macht.
+
+De heer keerde zich om op dat gerucht, en zeide tot Uilenspiegel:
+
+--Waarom moet gij dien hond plagen?
+
+--Waarom, messire, moet gij de kasseien plagen?
+
+--Dat is hetzelfde niet, sprak de heer,
+
+--Het verschil is zoo groot niet, antwoordde Uilenspiegel: als de
+hond aan zijn been houdt en het niet loslaten wil, houden de kasseien
+ook aan de kaai en willen zij er aan blijven. En menschen van mijnen
+stand mogen wel eenen hond plagen, als lieden van den uwen de straat
+niet met rust laten.
+
+Lamme stond achter Uilenspiegel en dorst geen woord uiten.
+
+--Wie zijt gij? vroeg de heer.
+
+--Ik ben Thijl Uilenspiegel, zoon van Klaas, die verbrand werd om
+het geloof.
+
+En hij floot als de leeuwerik en de heer kraaide als de haan.
+
+--Ik ben admiraal Treslong, sprak hij; wat wilt gij van mij?
+
+Uilenspiegel vertelde hem zijne lotgevallen en langde hem vijfhonderd
+karolussen.
+
+--Wie is die dikzak? vroeg Treslong, naar Lamme wijzend.
+
+--Mijn gezel en mijn vriend, antwoordde Uilenspiegel: hij wil evenals
+ik, op uw schip, de schoone stem van de donderbus begeleiden, en het
+lied der verlossing van den grond onzer vaderen zingen.
+
+--Gij zijt twee dappere kerels, zeide Treslong, gij moogt op mijne
+boot inschepen.
+
+Toen was men in de Sprokkelmaand: scherp was de wind en vinnig de
+vorst. Na drie weken spijtig wachten, barstte Treslong's ongeduld uit
+en verliet hij Emden. Daar hij Texel dacht binnen te varen, vertrok
+hij van 't Vlie, maar hij was gedwongen Wieringen binnen te loopen,
+alwaar zijn vaartuig omringd werd door 't ijs.
+
+Weldra zag men een vroolijk schouwspel rondom het schip:
+schaatsenrijders heel in de panne, schaatsende vrouwkens met wambuizen
+en rokken met gouden, zilveren, scharlaken, hemelsblauwe borduursels;
+gierende meidekens; en allen gingen, kwamen, joelden, gleden achter
+elkander, of bij paren, terwijl zij op 't ijs een minnelied zongen:
+ofwel trokken zij in kramen en tenten met wimpels versierd, om
+brandewijn, appelsienen, vijgen, peperkoek, eieren, warme worsten,
+heetekoeken en zuurtjes te drinken en te eten, terwijl rond henlieden
+arre- en zeilsleden onder hare sporen het ijs deden krassen.
+
+Lamme, steeds naar zijne vrouw zoekend, schaverdijnde in 't rond,
+gelijk de lustige mannen en vrouwlieden, doch hij viel dikwijls op
+zijn achterste.
+
+Intusschen ging Uilenspiegel eten en drinken in een kleine taveerne
+op de kaai, alwaar hij zijne portie niet duur moest betalen; en hij
+bleef geerne praten met de oude bazinne.
+
+Op een Zondag, rond negen uren, ging hij er binnen en vroeg hij
+zijn eetmaal.
+
+--Maar, sprak hij tot een aanvallige vrouw, die vóórkwam om hem te
+dienen, wat deedt gij met uwe oude rimpelen? Uw mond heeft al zijn
+witte en jeugdige tanden, en uwe lippen zijn als kersen zoo rood. Is
+hij voor mij, die zoete, schalksche glimlach?
+
+--Wel neen, zeide zij, maar wat wilt gij?
+
+--U, sprak hij.
+
+De vrouw antwoordde:
+
+--Dat is te veel voor een spiering lijk gij; wilt gij ander vleesch?
+
+Daar Uilenspiegel niet sprak, ging zij voort:
+
+--Wat hebt gij gedaan, zeide zij, met dien schoonen, welgevormden,
+dikken man, denwelken ik dikwijls bij u zie?
+
+--Lamme? vroeg hij.
+
+--Wat hebt gij er mee gedaan? vroeg zij.
+
+Uilenspiegel antwoordde:
+
+--Hij eet in de kramen, harde eieren, gerookte paling, gezouten visch,
+zuurtjes en alles wat hij tusschen de tanden kan steken; dit alles
+om zijne vrouw op te zoeken. Waarom zijt gij de mijne niet? Wilt gij
+vijftig gulden van mij? Wilt gij een gouden halssnoer?
+
+Maar zij maakte het teeken des kruises.
+
+--Ik ben te verkoopen noch te nemen, zeide zij.
+
+--Bemint gij niemand? vroeg hij.
+
+--Ik bemin u als mijn evennaaste; maar vóór alles bemin ik Onzen
+Lieven Heer en Zijne Moeder de Heilige Maria, die mij bevelen in
+kuischheid mijn leven te slijten. Hard en zwaar zijn mijne plichten,
+doch de Heer is ons, armen vrouwen, behulpzaam. Nochtans zijn er die
+bezwijken. Is uw dikke vriend vroolijk van aard?
+
+Uilenspiegel antwoordde:
+
+--Als hij eet is hij blijde, anders is hij treurig gestemd, en altijd
+zit hij in gedachten verzonken. Maar gij, zijt gij droefgeestig
+of vroolijk?
+
+--Wij, vrouwen, sprak zij, zijn slavinnen.
+
+--Ik ga tot Lamme zeggen, dat hij u moet komen bezoeken.
+
+--Doe dat niet, sprak zij; hij zou weenen en ik insgelijks.
+
+--Zaagt gij ooit zijne vrouw? vroeg Uilenspiegel.
+
+Zuchtend antwoordde zij:
+
+Zij zondigde met hem en werd veroordeeld tot een wreede penitentie. Zij
+weet, dat hij op zee gaat voor de zegepraal der ketterije; 't is droef
+voor een kerstenhert dit te moeten denken. Verdedig hem, als men hem
+aanvalt; verpleeg hem, als hij gewond is: zijne vrouw verzocht mij
+u die bede te doen.
+
+--Lamme is mijn vriend en mijn broeder, antwoordde Uilenspiegel.
+
+--Ha! zuchtte zij, waarom keert gij beiden niet terug in den schoot
+onzer Moeder, de Heilige Kerk!
+
+--Die heure kinderen verbrandt, antwoordde Uilenspiegel.
+
+En hij toog henen.
+
+Daar de wind vinnig blies en het ijs maar immer dikker en sterker
+maakte, kon het schip van Treslong niet vertrekken; de matrozen en
+de soldaten vermaakten zich dus met sleden en schaatsen.
+
+Uilenspiegel was in de taveerne en, jammerend en droevig, zei de
+lieftallige gastvrouw tot hem:
+
+--Arme Lamme! arme Uilenspiegel!
+
+--Waarom beklaagt gij ons zoo zeer? vroeg Uilenspiegel.
+
+--Laas! laas! zeide zij, waarom ook gelooft gij niet aan de
+misse? Zeker gingt gij naar den hemel, en in deze wereld zou ik
+vermogen u te redden.
+
+Ziende, dat zij naar de deur ging en aandachtiglijk luisterde,
+vroeg Uilenspiegel:
+
+--Is 't de sneeuw niet, die gij hoort vallen?
+
+--Neen, sprak zij.
+
+--Luistert gij naar den wind, die huilt in het want?
+
+--Neen, sprak zij nogmaals.
+
+--Of naar het blijde gejuich van onze dappere matrozen in de naburige
+herberg?
+
+--De dood sluipt stil als een dief, zeide zij.
+
+--De dood, zeide Uilenspiegel, ik begrijp u niet; kom binnen en spreek.
+
+--Daar zijn ze, sprak zij.
+
+--Wie?
+
+--Wie? antwoordde zij. De soldaten van Simon Bol, die, in naam van
+den hertog, u allen gaan vangen; zoo men u hier zoo goed behandelt,
+is het om met u te doen als met de ossen, die men mest in de weide. Ha,
+waarom, zeide zij, badend in tranen, waarom wist ik zulks niet vroeger?
+
+--Houd op met uw gejank en geschreeuw, sprak Uilenspiegel, en blijf
+hier!
+
+--Verraad mij niet, sprak zij.
+
+Uilenspiegel ging het huis uit, liep naar al de kramen en taveernen,
+en fluisterde in het oor van de matrozen en de soldaten:
+
+--De Spanjool komt!
+
+Allen liepen naar het schip, bereidden in aller ijl al wat behoefde
+voor het gevecht, en wachtten dan den vijand af.
+
+Uilenspiegel zeide tot Lamme:
+
+--Ziet gij die lieftallige vrouw daar, op de kaai, met heur zwarten
+rok met scharlaken borduurselen, die heur gezicht met heur witte
+huik verbergt?
+
+--'t Is mij eender, antwoordde Lamme. Ik heb koude en zou willen
+slapen.
+
+En hij wikkelde zijn hoofd in zijn opperste kleed. En alzoo hoorde
+hij niet meer dan een doove.
+
+Toen herkende Uilenspiegel de lieftallige vrouw en, van op het schip,
+riep hij heur toe:
+
+--Wilt gij ons volgen?
+
+--Tot in het graf, zeide zij, maar ik mag niet....
+
+--Gij zoudt goed doen, sprak Uilenspiegel; bedenk toch: als de
+nachtegaal in het bosch blijft, is hij gelukkig en zingt hij: maar
+als hij het verlaat en zijne broze vleugelen waagt in den wind van
+de wijde zee, breekt hij ze en sterft hij.
+
+--Thuis heb ik gezongen, sprak zij, en buiten zou ik zingen, zoo ik
+maar mocht.
+
+Vervolgens het schip naderend, sprak zij:
+
+--Neem, Uilenspiegel, neem dezen balsem voor u en uwen vriend, die
+slaapt als hij diende te waken.
+
+En henen gaande, riep zij:
+
+--Lamme! Lamme! God hoede u voor het kwaad!
+
+En zij liet heur gezicht zien.
+
+--Mijne vrouw! mijne vrouw! riep Lamme.
+
+En hij wilde op het ijs springen.
+
+--Uw trouwe vrouw! zeide zij.
+
+En zij liep heen.
+
+Lamme wilde van het dek op het ijs springen, maar een soldaat hield
+hem bij zijn opperste kleed en belette het hem. Hij weende, schreide,
+smeekte, dat men hem zou laten vertrekken. Maar de provoost zeide hem:
+
+--Als gij het schip verlaat, wordt gij gehangen.
+
+Lamme wilde toch op het ijs springen, maar een oude Geus weerhield
+hem en sprak:
+
+--De vloer is nat, gij zoudt koude voeten krijgen.
+
+En Lamme viel op zijn achterste, schreide en herhaalde gedurig:
+
+--Mijne vrouw! mijne vrouw! laat mij bij mijne vrouw gaan!
+
+--Gij zult ze wel weerzien, sprak Uilenspiegel. Zij bemint u, maar
+ziet God liever dan u.
+
+--'t Is een razende duivelin, riep Lamme. Als ze God liever ziet dan
+heuren man, waarom komt ze dan liefelijk en streelend onder mijne
+oogen? En als zij mij bemint, waarom verlaat ze mij steeds?
+
+--Ziet men klaar in de donkere putten? vroeg Uilenspiegel!
+
+--Laas! zuchtte Lamme, ik zal het besterven!
+
+En bleek en droefgeestig bleef hij zitten op het dek.
+
+Intusschen rukten de lieden van Simon Bol aan, met een machtig geschut.
+
+Zij schoten naar het schip, dat hun antwoordde. En de kogels braken
+het ijs in het ronde. En tegen den avond viel een warme regen.
+
+De wind woei uit het Westen; de zee werd omstuimig onder het ijs en
+hief het omhoog met ontzaglijke blokken, dewelke men zag opstaan en
+neervallen met een eentonig gekrakkrak, niet zonder gevaar voor het
+schip, dat, als de morgenstond de zwarte wolken verbrak, zijn linnen
+vleugelen opensperde, als een vogel der vrijheid, en naar de vrije
+zee stevende.
+
+Daar zeilden zij naar de vloot van messire Willem Lumey, graaf van de
+Mark, admiraal van Holland en Zeeland, die als dusdanig eene lanteerne
+omhoog in de mast van zijn schip voerde.
+
+--Bezie hem goed, Lamme, sprak Uilenspiegel; hij zal u niet sparen,
+als gij met geweld het schip wilt verlaten. Hoort gij zijne stem
+bulderen als de donder? Zie hoe groot en breed hij is, zie zijn hooge
+gestalte! Aanschouw zijn groote handen met kromme nagelen. Zie zijn
+ronde koele oogen: 't zijn arendsoogen en zijn langen, puntigen baard,
+denwelken hij gezworen heeft te laten groeien totdat hij alle papen
+en monniken opgeknoopt heeft, om de beide graven te wreken! Zie eens,
+hoe wreed en geducht hij is; gewis doet hij u hangen, zoo gij voortgaat
+met zuchten en klagen: Mijne vrouw! Mijne vrouw!
+
+--Mijn vriend, antwoordde Lamme, wie van koorden spreekt voor zijn
+evennaaste, draagt een hennepen kraag om den hals.
+
+--Gij zult hem dragen vóór mij. Dat is mijn hertelijke wensch,
+sprak Uilenspiegel.
+
+--Aan de galg zal uwe vuile tong eene el lang uit uwen bek steken,
+antwoordde Lamme.
+
+En de beide vrienden proestten van 't lachen.
+
+Dien dag kaapte het vaartuig van Treslong eene kog van Biscaye, die
+geladen was met kwikzilver, stofgoud, wijn en specerijen. En het schip
+werd geledigd tot het merg, bemanning en buit, als een osseschinkel
+onder den tand van den leeuw.
+
+Het was ook te dien tijde, dat de hertog den Nederlanden wreede,
+afschuwelijke belastingen oplegde, en al de inwoneren, die erf of
+have verkochten, tot betaling dwong van duizend op de tienduizend
+gulden. En die last was bestendig. Alle hoegenaamde koopers en
+verkoopers moesten aan den koning den tienden penning van de koopsom
+betalen, wat het volk zeggen deed, dat de handelswaar, die binst
+dezelfde week tienmaal verkocht werd, ganschelijk aan den koning kwam.
+
+En alzoo gingen nering en hanteering naar Dood en naar Ondergang.
+
+En de Geuzen namen den Briel, een versterkte plaats aan de zee,
+die de Bakermat der Vrijheid genoemd werd.
+
+
+
+
+II.
+
+Men was in het begin van de Bloeimaand; de hemel was helder en het
+vaartuig dobberde statig op de wateren. Uilenspiegel zong:
+
+
+    De asch klopt op mijn hart.
+    De beulen kwamen, sloegen
+    Met dolk en vuur, geweld en zwaard.
+    Vuil geld betaalt den vuigen spioen.
+    In stêe van deugden, liefde en geloof,
+    Heerschen verklikking en wantrouwen.
+    De slachters dienen geslacht.
+    Slaat op de krijgstrom.
+
+    Leve de Geus! Slaat op de trom.
+    De Briel is aan ons.
+    Vlissingen ook, de sleutel der Schelde.
+    De Heer is goed. Campveere is aan ons,
+    Met Zeelands schutterij.
+    We hebben kruit en lood en kogels,
+    IJzeren kogels, gegoten kogels.
+    De Heer is met ons, wie tegen?
+
+    Slaat op den trommel. Zege en roem!
+    Leve de Geus! Slaat op de trom.
+
+    Het zwaard is getogen, harten hoog,
+    Vuisten vast; het zwaard is getogen.
+    Weg met den Tienden Penning, den nood, den dood!
+    Ter galge de beul, ter galge de roover!
+    Meineedig vorst wil het volk in oproer.
+    Het zwaard is getogen voor ons rechten,
+    Voor huis en have, voor vrouw en kinderen.
+    Het zwaard is getogen. Slaat op de trom.
+
+    Harten hoog, vuisten vast.
+    Weg met den Tienden Penning, weg met snood pardoen.
+    Slaat op de krijgstrom. Slaat op de trom.
+
+
+... Ja, spitsbroeders en vrienden, ja, te Antwerpen, noesch over het
+Schepenhuis, hebben zij een groot schavot opgericht, dat met rood
+laken bekleed is; de hertog troont er op als een koning te midden van
+staffieren en soldeniers. Hij wil goedgunstig glimlachen, doch trekt
+slechts een afgrijselijk gezicht. Slaat op de trommel! Leve de Geus!
+
+... Hij heeft kwijtschelding geschonken; zwijgt stille: zijn gulden
+harnas flikkert in de zonne, de grootprovoost zit te peerd naast
+den baldakijn; daar komt de heraut met zijn trommelaars; hij leest
+algemeene kwijtschelding af voor al degenen, die niets misdeden;
+de anderen zullen wreedelijk worden gestraft.
+
+... Luistert spitsbroeders, hij leest het plakkaat, hetwelk, onder
+straffe van beschuldiging van muitmakerij, de betaling van den tienden
+en den twinstigsten penning beveelt.
+
+En Uilenspiegel zong:
+
+
+    Hertog, hoort ge de stem van het volk,
+    't Geweldig rumoer? 't Is de zee die zwelt
+    In 't zware gezwoeg der stormen.
+    Geld genoeg, bloed genoeg,
+    Nood genoeg. Slaat op de trom.
+
+    't Is de klauw in de bloedende wonde,
+    De diefstal na den moord. Moet ge ons goud
+    Mengen met ons bloed om het te drinken?
+    Wij stapten in de baan des plichts,
+    Den koning getrouw. De koning is meineedig.
+    Wij zijn van den eed ontslagen. Slaat op de krijgstrom.
+
+    Hertog van Alva, bloedhertog,
+    Zie kramen, en winkels gesloten,
+    Zie brouwers, bakkers, kruideniers,
+    Weigrend te venten om niet te betalen.
+    Wie groet u langs den weg?
+    Niemand. Voelt ge als een mist van pest
+    Haat en smaad u omringen?
+
+    De schoone grond van Vlaanderen,
+    Het lustig land Brabánt,
+    Treuren als kerkhoven.
+    Waar vroeger, in tijden van vrijheid,
+    Vedels zongen, pijpen schalden,
+    Zijn stilte en dood.
+    Slaat op de krijgstrom.
+
+    Geen vrooe gezichten meer
+    Van zingende vrijers en drinkebroers,
+    Maar bleeke gelaten
+    Van wie gelaten
+    Wachten op 't zwaard van het onrecht.
+    Slaat op de krijgstrom.
+
+    Wie hoort nog in de taveernen
+    Het lustig klinken der glazen,
+    Of de helle stemmen der deernen,
+    Bij benden zingend op straat?
+    Brabánt en Vlaanderen, vreugdelanden,
+    Zijn tranenlanden.
+    Slaat op de rouwtrom.
+
+    Grond der vaadren, verdrukte geliefde,
+    Plooi niet onder den voet des moorders.
+    Nijvere bijen, zwiert in zwermen
+    Neer op de wespen van Spanje,
+    Levend begravene vrouwen en dochters,
+    Roept tot Christus: wraak!
+
+    Dwaalt bij nacht in de velden; arme zielen,
+    Roept tot God. De vuist trilt om te slaan.
+    Het zwaard is getogen, hertog, we rukken uw ingewand uit
+    Om u in 't aangezicht te zweepen.
+    Slaat op den trommel. Het zwaard is getogen.
+    Slaat op den trommel. Leve de Geus!
+
+
+En al de matrozen en soldaten van het vaartuig van Uilenspiegel,
+en ook van de andere vaartuigen, zongen in koor:
+
+
+    Slaat op den trommel, leve de Geus!
+
+
+En hunne stemmen rommelden als de donder der verlossing.
+
+
+
+
+III.
+
+Men was in Louwe, de wreede maand, die het kalf in den buik van de
+koe doet vervriezen. Het had gesneeuwd en daarboven gevrozen. De
+knapen vingen, met vogelteer, de musschen, die op de harde sneeuw
+een schamel stuksken brood kwamen zoeken, en brachten dat wild naar
+de hutten hunner ouders. Op den grijzen hemel staken, onbeweeglijk,
+de geraamten der boomen af, welker takken met sneeuwen kussens waren
+versierd, die insgelijks de daken der hutten en de nok van de muren
+bedekten, en in dewelke men pooten van katten zag, want die dieren
+maakten in de sneeuw insgelijks jacht op de musschen. Heinde en ver
+waren de weiden verborgen onder die wonderbare vacht, die de aarde
+tegen de gure winterkoude beschut. De rook uit de schoorsteenen van
+hutten en huizen stak somber af tegen den helderen hemel, en men
+hoorde niet het minste gerucht.
+
+En Katelijne en Nele zaten alleen in hare woning; en Katelijne schudde
+het hoofd en sprak:
+
+--Hans, mijn hart trekt naar u. Gij moet de zevenhonderd karolussen
+teruggeven aan Uilenspiegel, den zoon van Soetkin. Zijt gij nooddruftig
+en kunt gij ze thans niet teruggeven, kom dan toch maar, dat ik uw
+glanzend gelaat zie. Doe het vuur weg, mijn hoofd brandt. Laas! waar
+zijn uw sneeuwen kussen? waar is uw ijskoud lichaam, Hans, mijn
+geliefde?
+
+En troosteloos bleef ze vóór 't venster staan. Eensklaps kwam een
+koerier, met belletjes aan den gordel, voorbijgeloopen.
+
+--Daar komt de baljuw, de hoogbaljuw van Damme! riep de voetlooper.
+
+En aldus liep hij tot aan het Schepenhuis, om er de burgemeesteren
+en schepenen samen te roepen.
+
+Toen hoorde Nele, in de volslagen stilte, twee klaroenen schallen. Die
+van Damme kwamen allen aan hunne deur, in de meening dat het Zijne
+Koninklijke Majesteit was, die zich door zulk een trompetgeschal
+liet aankondigen.
+
+En Katelijne ging ook aan de deur met Nele. In de verte zagen zij
+schitterende ruiters in groepen bijeen en aan hunne spits reed een
+personage, bedekt met een zwart pannen opperste kleed met marter
+afgelegd, gekleed in een pannen wambuis met fijngouden belegsels
+en met roode kalfsleerzen, gevoerd met martervel. En zij herkenden
+den hoogbaljuw.
+
+Achter hem reden jonge heeren, die, niettegenstaande de ordonnantie
+van wijlen Zijne Keizerlijke Majestijt, aan hunne pannen kleederen,
+gouden, zilveren en zijden borduursels, belegsels, banden,
+boordsels droegen. En hun opperste kleederen waren, gelijk die van
+den hoogbaljuw, met pels afgelegd. Zij reden vroolijk voort, met
+fladderende lange struisvederen op hunne met goud afgelegde toques.
+
+En zij zagen er allen als goede vrienden en kameraden van den
+hoogbaljuw uit; en onder hen was een heer met een zure tronie,
+gekleed in groene panne, met goud afgeleid; en zijn opperste kleed
+was van zwarte panne, evenals zijne toque, die met lange pluimen
+versierd was. En hij had een krommen neus als de bek van een gier,
+een dunnen mond, ros haar, een bleek gezicht, en hij zat met fiere
+houding te peerd.
+
+Terwijl die heeren voorbij de woning reden van Katelijne, sprong
+deze eensklaps naar den teugel van 't peerd van den bleeken ruiter,
+en riep zij vol blijdschap:
+
+--Hans, mijn geliefde, ik wist wel dat gij zoudt terugkomen. Zoo
+zijt gij schoon, ganschelijk in de panne en in het goud, lijk eene
+zon op de sneeuw! Brengt gij de zevenhonderd karolussen? Zult gij
+nog schreeuwen lijk de nachtuil?
+
+De hoogbaljuw deed den troep edellieden stilstaan en de bleeke
+ruiter sprak:
+
+--Wat wil die schooister van mij?
+
+Maar Katelijne hield altoos het peerd bij den teugel en sprak:
+
+--Verlaat mij niet; ik heb zoo bitter geweend om uwentwille. Zoete
+nachten, mijn welbeminde, sneeuwen kussen en ijskoud lichaam.
+
+Hier is het kind.
+
+En zij wees naar Nele, die hem grammoedig bezag, want dreigend had
+hij de karwats naar Katelijne opgeheven.
+
+Maar Katelijne sprak schreiend:
+
+--Ha? zoudt gij u niet meer herinneren? Neem uwe dienares in
+genade. Breng mij met u waar gij wilt. Doe het vuur weg. Hans,
+erbarming!
+
+--Ga heen! sprak hij.
+
+En hij stiet zijn peerd zoo geweldig vooruit, dat Katelijne den teugel
+losliet en ten gronde viel; en het peerd trapte op heur en sloeg,
+met zijn hoef, op heur voorhoofd, zoodat zij bloedde.
+
+Toen zeide de baljuw tot den bleeken ruiter:
+
+--Messire, kent gij die vrouwe?
+
+--Ik ken ze niet, zeide hij, 't is zeker een krankzinnige.
+
+Maar Nele, die Katelijne weder opgericht had, sprak luide:
+
+--Is die vrouw krankzinnig, ik ben het niet, en wil hier sterven
+van dit brokje sneeuw, dat ik eet--en zij nam een greepje sneeuw en
+stak het in den mond--als die man mijne moeder niet heeft gekend,
+als hij heur al heur geld niet ontnam, als hij den hond van Klaas
+niet doodde, om, tegen den muur van den steenput onzer lochting,
+de zevenhonderd karolussen te stelen van den armen aflijvige.
+
+Het bloed vloeide uit de wonden van Katelijne, dewelke knielend
+smeekte:
+
+--Hans, mijn liefste, Hans, mijn welbeminde, geef mij den vredekus;
+bezie mij, het bloed vloeit uit mijn voorhoofd; de ziel heeft een
+gat gemaakt en nu wil zij buiten; fluks ga ik sterven: laat mij toch
+niet alleen!
+
+Vervolgens zeide zij met stillere stem:
+
+--Eertijds hebt gij uwen vriend gedood uit jaloerschheid, langs
+den dijk.
+
+En met den vinger wees zij naar den kant van Dudzele.
+
+--Toen bemindet gij mij meerder dan nu.
+
+En zij nam de knie van den edelman vast en omhelsde ze, en zij greep
+zijnen schoen vast en kuste dien.
+
+--Wie is die man, die gedood werd? vroeg de hoogbaljuw.
+
+--Ik weet het niet, genadige heer, antwoordde de bleeke ruiter. Wij
+hebben geene zaken met hetgeen die schooister vertelt. Laat ons
+voortgaan.
+
+Het volk kwam te hoop rond hen; hoogpoorters en gemeen, werklieden
+en boeren trokken partij voor Katelijne, en alle riepen:
+
+--Gerechtigheid, heer baljuw, gerechtigheid!
+
+En de baljuw sprak tot Nele:
+
+--Wie is de man, die gedood werd? spreek volgens God en waarheid.
+
+Nele zeide, naar den bleeken jonker wijzend:
+
+--Deze hier kwam alle Zaterdagen in de keet om mijne moeder te zien en
+heur geld af te doen: hij heeft eenen vriend van hem, Hilbert genoemd,
+gedood in den akker van Servaas Vander Vichte, niet uit jaloerschheid,
+maar om de zevenhonderd karolussen niet te moeten deelen met hem.
+
+En Nele verhaalde de minnarijen van Katelijne en wat deze 's nachts
+hoorde, toen zij verborgen was achter den dijk, die liep door den
+kouter van Servaas Vander Vichte.
+
+--Nele is stout, zeide Katelijne, zij is wel hard jegens Hans, jegens
+heuren vader.
+
+--Ik zweer, zeide Nele, dat hij schreeuwde als de nachtuil, om van
+zijne tegenwoordigheid miede te geven.
+
+--Gij liegt, zeide de edelman.
+
+--Ho, neen! sprak Nele, en mijnheer de baljuw en al die heeren, hier
+tegenwoordig, zien het wel: gij zijt bleek geenszins van koude, maar
+van schrik. Hoe komt het dat uw gezicht niet meer blinkt? Bezigt gij
+de tooverzalve niet meer, met dewelke gij u streekt, opdat gij helder
+zoudt zien als de baren der zee, 's zomers, als 't donkert? Maar,
+vermaledijde tooveraar, verbrand zult gij worden voor de pui van 't
+Schepenhuis. Gij zijt de oorzaak van Soetkin's dood, gij bracht heuren
+zoon, eenen wees, tot ellende; gij, die ongetwijfeld een edelman zijt,
+kwaamt bij ons, werklieden, om mijne moeder een enkele maal een weinig
+geld te brengen en er heur al de andere keeren veel te ontnemen.
+
+--Hans, sprak Katelijne, zult gij mij nog bestrijken met de zalve,
+zult gij mij nog naar den Sabbat leiden? Luister naar Nele niet:
+zij is stout; gij ziet het bloed, de ziel heeft een gat gemaakt en
+wil buiten; fluks zal ik sterven en dan ga ik naar 't voorgeborchte
+der helle, alwaar geen vuur is.
+
+--Zwijg, krankzinnige tooveres, zeide de edelman, ik weet niet wat
+gij zeggen wilt.
+
+--En nochtans, zeide Nele, zijt gij het, die kwaamt met eenen vriend,
+dien gij mij tot man wildet geven; gij weet dat ik van hem niet wilde
+weten; wat heeft hij gedaan, uw vriend Hilbert, wat heeft hij gedaan
+voor zijne oogen, nadat ik er in krabde met mijne nagelen?
+
+--Nele is stout, zeide Katelijne, geloof ze niet, Hans, mijn geliefde:
+zij is grammoedig op Hilbert, die heur met geweld wilde nemen; maar nu
+kan Hilbert dat nimmermeer doen, de wormen hebben hem opgegeten. En
+Hilbert was leelijk; Hansken, mijn liefste, gij alleen zijt schoon;
+Nele is stout!
+
+Daarop sprak de baljuw:
+
+--Vrouwen, gaat henen in vrede.
+
+Maar Katelijne wilde niet weggaan van de plaats waar heur geliefde
+was. En men moest ze met geweld naar heure woonstede brengen.
+
+En al het te hoop gestroomde volk riep:
+
+--Gerechtigheid, heer, gerechtigheid!
+
+De serjanten van de gemeente waren bijeengekomen op het gerucht:
+de baljuw gebood hun te blijven, en sprak tot de heeren en edellieden:
+
+--Heeren en edellieden, niettegenstaande alle privileges, die
+de doorluchtige orde van den adel in Vlaanderenland beschermen,
+moet ik, op de beschuldigingen en hoofdzakelijk op die van hekserij,
+uitgebracht tegen messire Joost Damman, denzelven apprehendeeren totdat
+hij geoordeeld en gevonnist worde volgens de wetten en ordonnantiën
+des Rijks. Geef mij uw zweerd af, messire Joost.
+
+--Heer baljuw, zeide Joost Damman, met grooten hoogmoed en
+adellijke fierheid, als gij mij aanhoudt, overtreedt gij de wetten
+van Vlaanderen, want gij zelf zijt geen rechter. Nu, gij weet, dat
+alleen valsche munters, struikroovers, brandstichters, verkrachters
+van vrouwen en meidekens, soldeniers die hunnen hoofdman ontliepen,
+tooveraars die de wateren vergiftigden, monniken en begijnen die hunne
+kloosters ontliepen, mitsgaders gebannenen, zonder lastgeving van
+den rechter, mogen geapprehendeerd worden. Nu, heeren, verdedigt mij!
+
+Eenigen wilden bijspringen, maar de baljuw zeide tot hen:
+
+--Heeren, ik vertegenwoordig hier onzen koning, grave en heer,
+aan denwelke de beslissing van moeilijke gevallen is voorbehouden;
+en ik gelast en beveel u, op peine als rebellen te worden beschouwd,
+uw zweerd terug in de scheede te steken.
+
+De edellieden gehoorzaamden; doch dewijl messire Joost Damman nog
+aarzelde, riep het gemeen:
+
+--Gerechtigheid, heer, gerechtigheid, hij geve zijn zweerd af.
+
+Toen deed hij het tegen zijn dank, en, van zijn peerd gestegen zijnde,
+werd hij door twee serjanten van de gemeente naar het Steen gebracht.
+
+Doch hij werd niet in de kelders gestoken, maar wel in een getraliede
+kamer, alwaar hij, mits betaling, een goed bed en een goed vuur kreeg
+en ook goed eten mocht laten halen, van hetwelk de cipier minstens
+de helft nam.
+
+
+
+
+IV.
+
+'s Anderen daags gingen de baljuw, de beide griffiers-crimineel, twee
+schepenen en een chirurgijn-baardemaker langs den kant van Dudzele, om
+te zien of zij in den akker van Servaas Vander Vichte het lijk van een
+man zouden vinden, langsheen den dijk, dewelke liep door dien kouter.
+
+Nele had tot Katelijne gezeid:
+
+--Hans, uw lieveling, vraagt een afgesneden hand van Hilbert: dezen
+avond zal hij schreeuwen als de nachtuil, in onze hut komen en u de
+zevenhonderd karolusgulden brengen.
+
+Katelijne had geantwoord:
+
+--De hand zal ik afsnijden.
+
+En, inderdaad, zij nam een mes en ging heen, vergezelschapt door Nele
+en gevolgd door de officieren van justitie.
+
+Zij stapte gauw en fier vooruit met Nele, wier liefelijk gezichtje
+bloosde van de vinnige koude.
+
+Bibberend en kuchend, volgden heur de officieren van justitie, die
+reeds bedaagd waren, en zij allen geleken zwarte schimmen op het
+witte veld, en Nele droeg eene spade.
+
+Toen zij bij den akker van Servaas Vander Vichte, op den dijk, gekomen
+waren, ging Katelijne naar het midden: daar wees zij naar de meersch,
+die op heure rechterhand lag en sprak:
+
+--Hansken, gij wist niet dat ik daar huiverend verborgen was bij 't
+wapengekletter. En Hilbert schreeuwde: Dit ijzer is koud. Hilbert is
+leelijk. Hans is schoon. Gij zult zijne hand hebben, laat mij alleen!
+
+Zij dwaalde toen links af, zette zich in de sneeuw op de knieën en
+schreeuwde driemaal in de lucht, om de geesten aan te roepen.
+
+Nele langde heur toen de spade, op dewelke Katelijne drie kruiskens
+maakte; vervolgens teekende zij op de bevroren sneeuw de beeltenis van
+eene doodkist, alsmede drie kruisen, één naar het Oosten, één naar het
+Westen en één naar het Noorden, en sprak: Drij, dat is Mars omtrent
+Saturnus, en drij is ontdekking onder Venus, de heldere sterre. En
+vervolgens trok zij rondom de doodkist een grooten kring, zeggende:
+
+--Ga heen, booze duivel, die de lijken bewaart!
+
+Vervolgens knielde zij neder en bad:
+
+--Duivel Hilbert, mijn vriend, zeide zij, Hans, mijn heer en meester,
+beveelt mij hier uwe hand af te snijden: ik ben hem gehoorzaamheid
+verschuldigd: doe mij niet treffen met het aardsche vuur, omdat ik
+uw edele grafstee kom storen, en vergeef het mij in name van God en
+zijne santen.
+
+Toen kapte zij in het ijs, naarvolgens het figuur van de doodkist;
+zij maakte de natte graszode bloot, vervolgens het zand, en weldra
+zagen de heer baljuw, zijne officieren, Nele en Katelijne het lijk
+van een jongen man te voorschijn komen, dat wit geworden was als kalk,
+ter oorzake van het zand. Hij was gekleed in grijs lakensch wambuis en
+een eender opperste kleed; zijn zweerd lag aan zijne zijde. Aan zijnen
+gordel had hij eene maliënbeurs, en een breede dolk stak nog in zijn
+lichaam, onder het hert; en er was bloed op het laken van het wambuis,
+en dat bloed was geloopen tot onder den rug. En de man was nog jong.
+
+Katelijne sneed zijne hand af en stak ze in heure gordeltasch. En de
+baljuw liet heur begaan, beval heur vervolgens het lijk te ontdoen
+van alle kleederen en kenteekenen. Katelijne vroeg, of Hans zulks
+had geheeten, maar de baljuw antwoordde, dat hij slechts handelde
+naar zijne bevelen; toen deed Katelijne alles wat hij gebood.
+
+Toen het lijk uitgekleed was, zag men dat het droog lijk hout was:
+en de baljuw en de officieren van de gemeente deden het bedekken met
+zand en de serjanten droegen de kleederen en de wapenen mede.
+
+En toen zij voorbij het Steen kwamen, zeide de baljuw tot Katelijne,
+dat Hans dáár op heur wachtte; en blijde ging zij er binnen.
+
+Nele wilde heur tegenhouden, doch Katelijne antwoordde:
+
+--Ik wil Hans zien, mijn heer en meester.
+
+En Nele weende aan de poort, want zij wist, dat Katelijne als tooveres
+aangehouden was om de bezweringen en teekenen, die zij gemaakt had
+op de sneeuw.
+
+En men zeide te Damme, dat er voor heur geene ontferming zou zijn.
+
+En Katelijne werd gestoken in een onderaardschen kerker van het Steen.
+
+
+
+
+V.
+
+'s Anderen daags woei de wind uit Brabant: de sneeuw smolt en de
+meerschen werden overstroomd.
+
+En de burgstorm luidde, om de rechters naar de vierschaar te roepen,
+onder het afdak, om den wille van de vochtigheid der zodenbanken.
+
+En het volk stond rond de vierschaar.
+
+Joost Damman werd voorgebracht, zonder kluisters, in zijn prachtige
+kleeren. Katelijne werd insgelijks voorgebracht, doch met de handen
+van voren gebonden en gekleed in een grijs lijnwaden kleed, hetwelk
+de dos der gevangenen was.
+
+Joost Damman, ondervraagd, bekende dat hij zijn vriend Hilbert gedood
+had, in tweegevecht, met het zweerd. Als men hem zei, dat hij gedood
+was met een dolk, antwoordde Joos Damman:
+
+--Ik heb hem afgemaakt, omdat hij niet gauw genoeg stierf. Dien moord
+beken ik gereedelijk, vermits ik sta onder de bescherming der wetten
+van Vlaanderen, volgens dewelke, na verloop van tien jaar, de moord
+niet meer vervolgd wordt.
+
+De baljuw vroeg hem:
+
+--Zijt gij geen tooveraar?
+
+--Neen, antwoordde Damman.
+
+--Bewijs het, zeide de baljuw.
+
+--Ik zal het doen op tijd en stond, zeide Joost Damman, maar nu past
+het mij niet.
+
+Toen werd Katelijne ondervraagd; zij hoorde niet wat men vroeg,
+doch keek gedurig naar Hans en sprak:
+
+--Gij zijt mijn groene heer, schoon als de zon zijt ge. Doe het vuur
+weg, mijn liefste!
+
+Nele kwam toen Katelijne voorspreken en zeide:
+
+--Heer baljuw en heeren rechters, meer dan gij weet, kan zij niet
+bekennen; zij is geene tooveres, doch enkel uitzinnig.
+
+Toen sprak de baljuw:
+
+--Tooveraar is hij, die door voorbedachtelijk gebruikte duivelsche
+middelen in iets tracht te slagen. Nu, deze twee, man en vrouw, zijn
+tooveraars met inzicht en met daad; hij, omdat hij de sabbatszalve
+gegeven, en zijn gezicht helder als Lucifer gemaakt heeft, ten
+einde geld en vleeschelijken omgang te bekomen; zij, omdat zij hem
+aangehangen heeft, hem nemende voor eenen echten duivel, en omdat
+zij met hem gehanteerd heeft; hij is pleger van hekserij, en zij
+is zijne baarschuldige. Men mag dus geenerlei ontferming hebben,
+en ik moet het zeggen, want ik zie dat de schepenen en die van 't
+gemeen te goedertieren zijn jegens de vrouw. In der waarheid heeft zij
+gemoord noch gestolen, noch heeft zij personen of hunlieder beestiaal
+mishand; ook heeft zij geenerlei zieken met buitengemeene middelen
+genezen, maar enkellijk met gekende geneeskruiden; doch zij heeft
+heure dochter willen overleveren aan den duivel, en als deze in heur
+jeugdigen ouderdom niet met zooveel dapperheid wederstaan had, dan had
+zij toegegeven aan Hilbert en ware zij, als de tweede beschuldigde,
+insgelijks tooveres geworden. Dienvolgens vraag ik aan de heeren van de
+vierschaar of zij niet van oordeel zijn, beiden ter torture te stellen?
+
+De schepenen antwoordden niet, daardoor beduidende, dat zij niet van
+dat oordeel waren, wat Katelijne betrof.
+
+Zijne rede vervolgende, zeide toen de baljuw:
+
+--Evenals gij, ben ik voor haar vervuld met ontferming en
+medelijden; maar had die krankzinnige tooveres, die zoo goed den
+duivel gehoorzaamt, als haar ontuchtige medebeschuldigde het heur had
+bevolen, het hoofd heurer dochter niet kunnen afhouwen met een kapmes,
+zooals Katelijne Dura, in Frankrijk, met heur twee dochters deed, op
+aanzoek van den duivel? Had zij, zoo heur zwarte bruidegom het heur had
+bevolen, het beestiaal niet kunnen doen sterven; de boter niet kunnen
+doen keeren in de karnton, door er suiker in te smijten; had zij in
+lijve niet kunnen tegenwoordig zijn bij alle duivelsvereeringen,
+heksendansen, verfoeiselen en koppelingen van tooveraars? Had zij
+geen menschenvleesch kunnen eten, geene kinderen kunnen dooden om er
+pasteien van te maken en die te verkoopen, gelijk een pasteibakker
+van Parijs deed; had zij de braaien der gehangenen niet kunnen
+afsnijden en meedragen om ze rauw op te eten, aldus plegende beide
+een schromelijken diefstal en eene heiligschennis? En ik vraag aan
+de vierschaar Katelijne en Joost Damman op de pijnbank te leggen,
+ten einde te weten of zij beiden geenerlei andere misdrijven hebben
+gepleegd dan degene, die reeds gekend en onderzocht zijn. Vermits
+Joost Damman weigert iets meerder te bekennen dan den moord, en
+Katelijne niet alles gezegd heeft, gebieden ons de wetten des Rijks
+te handelen naarvolgens mijn voorstel.
+
+En de sententie der schepenen luidde, dat de torture twee dagen later,
+des Vrijdags, zou plaats hebben.
+
+En Nele schreeuwde:
+
+--Genade, mijne heeren!
+
+En het volk schreeuwde met heur, doch te vergeefs.
+
+En Katelijne bezag Joost Damman en sprak:
+
+--Ik heb Hilbert's hand, kom ze dezen nacht halen, liefste.
+
+En zij werden terug naar het Steen gebracht.
+
+Op bevel van de vierschaar, werd den cipier geheeten hun elk twee
+bewakers te geven, die hen moesten slaan, telkens dat zij zouden willen
+slapen; maar de twee bewakers van Katelijne lieten heur den nacht
+slapende doorbrengen, en die van Joost Damman sloegen hem wreedelijk
+telkens dat hij de oogen look of enkellijk het hoofd vooroverboog.
+
+Heel den Woensdag hadden zij honger, alsook den nacht en heel den
+Donderdag, tot 's avonds, als men hun vleesch te eten en water te
+drinken gaf, beide bereid met zout en met salpeter. Dat was het begin
+der torture. En 's morgens brachten de serjanten de beide gevangenen,
+die schreeuwden van dorst, naar de folterkamer.
+
+Daar werden zij rechtover elkander gezet en ieder gebonden op eene
+bank, bekleed met knoopkoorden, die hen schromelijk pijnigden.
+
+En ieder moest een glas water drinken, met zout en salpeter er in.
+
+Joost Damman kreeg vaak op zijne bank, maar de serjanten sloegen
+hem wakker.
+
+En Katelijne zeide:
+
+--Om Gods wil, slaat hem niet, mijne heeren, gij breekt zijn arm
+lichaam. Hij bedreef maar een enkele misdaad, uit liefde, toen hij
+Hilbert doodde. Ik heb dorst en gij ook, Hans, mijn beminde! Laat hem
+eerst drinken! Water! water! mijn lichaam brandt als vuur. Spaar hem,
+ik zal sterven voor hem! Drinken!
+
+Hans zeide tot haar:
+
+--Heks die gij zijt. Heeren rechters, smijt heure kroenge in 't
+vuur. Ik heb dorst!
+
+De griffiers schreven al zijne woorden op.
+
+Toen zei de baljuw:
+
+--Hebt gij niets te belijden?
+
+--Ik heb niets meer te zeggen, antwoordde Joost Damman: Gij weet alles.
+
+--Daar hij volherdt in zijn loochenen, zeide de baljuw, zal hij tot
+verdere en volledige belijdenis op de koordebank blijven zitten en
+zal hij dorst lijden, en men zal hem beletten te slapen.
+
+--Ik zal blijven, zei Joost Damman, en mij vermaken met die tooveres
+te zien lijden op heure bank. Hoe vindt gij 't huwelijksbed, nichtje?
+
+En zuchtend antwoordde Katelijne:
+
+--Koud van armen en warm van hert, Hans, mijn welbeminde. Ik heb dorst,
+mijn hoofd brandt!
+
+--En gij, vrouwe, sprak de baljuw, hebt gij niets meer te zeggen?
+
+--Ik hoor, zeide zij, de kar van den Dood en een dof gerammel van
+beenderen. Ik heb dorst! En Hij leidt mij naar een grooten troon,
+waar water is, frisch en klaar water; maar dit water is vuur. Hans,
+mijn vriend, verlos mij van die koorden. Ja, ik ben in het vagevuur
+en ginder omhoog zie ik Onzen Heer Jezus in het hemelrijk zitten,
+met zijn allergenadigste moeder, de Maagd Maria. Ho! Heilige Moeder
+Gods, een droppelken water! Eet die sappige vruchten alleen niet op!
+
+--Die vrouw is door wreede uitzinnigheid getroffen, zei een van de
+schepenen. Men moet ze van de pijnbank verwijderen.
+
+--Zij is niet uitzinniger dan ik; zei Joost Damman, 't is gehuichel
+en gemaakt spel.
+
+En met dreigende stemme, sprak hij tot Katelijne:
+
+--Ik zal u zien branden in 't vuur, u, die zoo goed de uitzinnige
+speelt.
+
+En grijnzend, lachte hij om zijn boosaardige leugen.
+
+--Ik heb dorst, zei Katelijne, hebt medelijden, ik heb dorst! Hans
+mijn welbeminde, geef mij te drinken. Hoe helder is uw gezicht! Laat
+mij tot hem gaan, heeren rechters!
+
+En den mond openspalkend, vervolgde zij, smachtend van dorst:
+
+--Ja, ja, nu steken zij vuur in mijne borst, en de duivelen binden
+mij op dit gruwelijk bed. Hans, neem uw zweerd en dood ze, gij,
+die zoo machtig zijt. Water! drinken! drinken!
+
+--Sterf, tooveres, zeide Joost Damman: gij moest heur eene prop in
+den mond steken om heur, eene vrouw uit 't gemeen, te beletten op te
+komen tegen mij, die van adel ben.
+
+Een schepen, vijand des adels, antwoordde op deze rede:
+
+--Heer baljuw, het is strijdig met de rechten en costumen van den
+lande, proppen te steken in den mond van hen, die men ondervraagt, want
+zij zijn hier om de waarheid te zeggen en gevonnist te worden volgens
+hunne rede. Proppen zijn maar toegelaten wanneer de beschuldigde,
+veroordeeld zijnde, van op het schavot tot het volk spreken wil,
+om het te vermurwen of gisting onder het gemeen te verwekken.
+
+--Ik heb dorst, zeide Katelijne, geef mij te drinken, Hans, mijn
+liefste.
+
+--Ha! sprak Joost, gij lijdt, vervloekte heks, eenige schuld van al
+mijne tormenten; maar in deze folterkamer zult gij nog andere smerten
+verduren: de keersen, de wipgalg, de stokskens tusschen de vingeren en
+tusschen de teenen. Men zal u, ganschelijk naakt, schrijlings zetten
+op den rug eener doodkist, scherp als het lemmer van een mes, en dan
+zult gij belijden dat gij geene uitzinnige zijt, maar een tooveres,
+door Satan betaald om den edellieden last aan te doen. Drinken!
+
+--Hans, mijn beminde, sprak Katelijne opnieuw, wees niet grammoedig
+jegens uwe dienares; ik lijd duizenden pijnen voor u, mijn heer en
+meester! Spaart hem, heeren rechters: geeft hem een vollen beker te
+drinken, maar laat eenige droppelen over voor mij. Hans, is 't reeds
+het uur van den nachtuil?
+
+Toen vroeg de baljuw aan Joost Damman:
+
+--Welke was de reden van het tweegevecht, waarin Hilbert den dood vond?
+
+Joost antwoordde:
+
+--Wij vochten om een meideken van Heist, dat wij beiden beminden.
+
+--Een meideken van Heist, riep Katelijne, die met geweld van de
+bank wilde opstaan, gij bedriegt mij dus met eene andere, helsche
+verrader?... Wist gij dat ik stond te luisteren, achter den dijk,
+toen gij zegdet dat gij al het geld wildet hebben, hetwelk het geld
+was van Klaas? 't Was zeker om het met heur te verteren? Laas! en ik,
+die mijn bloed had gegeven, als hij er goud had kunnen van maken! En
+alles voor eene andere! Wees gevloekt!
+
+Doch plotseling begon zij te weenen, en zij poogde zich om te keeren
+op de folterbank:
+
+--Neen, Hans, zeg dat gij uwe arme dienares noch zult liefhebben, en de
+aarde zal ik met mijne vingeren openkrabben; een schat zal ik u vinden;
+ja, een schat is verborgen; en ik zal zoeken met het hazelaarstakje,
+hetwelk nederbuigt als het boven metaal wordt gehouden; en ik zal
+hem vinden en hem u eerlijk brengen; kus mij, liefste, en gij zult
+rijk wezen; en alle dagen zullen wij kuite drinken; ja, ja, zij, die
+daar zitten, drinken ook bier, schuimend bier, dat verkwikt! O! mijne
+heeren, een dropje slechts, ik brand in het vuur! Hans, ik weet waar
+hazelaars groeien, maar gij moet wachten tot in den voortijd.
+
+--Zwijg, ellendige, zei Joost Damman, ik ken u niet. Hilbert hebt
+gij genomen voor mij: hij is 't die boven bij u kwam. En, met uw
+helschen geest, hiet gij hem Hans. Weet dat ik niet Hans heet, maar
+Joost: wij waren van dezelfde grootte, Hilbert en ik; 't was Hilbert,
+waarschijnlijk, die de zevenhonderd karolussen nam. Drinken! mijn
+vader zal honderd gulden betalen voor een kroezeken water; maar die
+vrouw ken ik niet!
+
+--Heer baljuw en heeren rechters, riep Katelijne uit, hij beweert dat
+hij mij niet kent; maar ik, ik ken hem wel en weet, dat hij op den
+rug een bruine, harige geboortevlek heeft, groot als een erwt. Ha! gij
+bemindet een meideken van Heist! Hoeft een oprecht minnaar voor zijn
+geliefde te blozen? Hans, ben ik niet meer schoon?
+
+--Schoon! grijnslachte Damman, gij hebt een gezicht, glad als eene
+mispel, en een lichaam, slank als eene vim takkebossen: bezie mij
+die schooister, die beweert een edelman tot minnaar te hebben! Drinken!
+
+--Zoo spraakt ge niet, Hans, mijn beminde heer en meester, als ik
+zestien jaar jonger was.
+
+Vervolgens op heur hoofd en heure borst kloppend, sprak zij:
+
+--'t Is het vuur, dat daar is, dat mijn hert en mijn gezicht
+verschroeit: verwijt het mij niet; weet gij nog dat wij veel van
+zout eten hielden, om beter te kunnen drinken, naar gij zeidet? Nu is
+al het zout in ons lijf, mijn beminde, en mijnheer de baljuw drinkt
+wijn. Wij vragen geen wijn: geeft ons water. In de beemde kabbelt het
+heldere beekje met zijn frisch, lekker water. Neen, dat water kookt,
+het verbrandt mij! 't Is water uit de helle!
+
+En Katelijne weende en zij sprak:
+
+--Nooit deed ik iemand leed, en iedereen smijt mij in 't
+vuur. Drinken! de straathonden krijgen water; ik ben een kerstene
+vrouw, geeft mij te drinken. Nooit deed ik iemand leed! Geeft mij
+toch te drinken!
+
+Toen sprak een schepen:
+
+--Die tooveres is alleenlijk uitzinnig wat betreft het vuur, dat
+brandt in heur hoofd, naar zij zegt, maar voor alle andere dingen
+is zij het niet, vermits zij met helderen geest ons het lijk van den
+verslagene hielp ontdekken. Als Joost Damman inderdaad een harige vlek
+heeft op zijnen rug, is dit merk voldoende om zijne eenzelvigheid te
+doen vaststellen met den duivel Hans, op denwelken Katelijne verliefd
+was. Beul, toon ons het merk op den rug.
+
+De hangman ontblootte den hals en den schouder, en toonde de bruine,
+harige vlek.
+
+--Ha! sprak Katelijne, hoe wit is uwe huid! zou men niet zeggen dat
+het de schouderen eener maagd zijn? Wat zijt gij schoon, Hans, mijn
+beminde! Drinken!
+
+Toen stak de hangman een lange naald in het merk, doch er kwam geen
+bloed uit.
+
+En de schepenen zeiden tot elkander:
+
+--Dat is een duivel, en hij zal Joost Damman vermoord hebben en
+zijn aanschijn genomen, om des te veiliger de arme lieden te kunnen
+bedriegen.
+
+En de baljuw en de schepenen schrikten:
+
+--Hij is een duivel, en er is een tooverteeken.
+
+En Joost Damman sprak:
+
+--Gij weet wel dat dit geen tooverteeken is, maar dat er vleezige
+uitwassen bestaan, in dewelke men mag steken, zonder dat zij
+bloeden. Heeft Hilbert die tooveres geld ontfutseld,--want tooveres is
+zij, die belijdt met den duivel te hebben geslapen--zoo deed hij het
+met de algeheele toestemming van die boerin en werd hij, edelman,
+om zijne kussen betaald, gelijk zulks telkendage gebeurt met de
+meidekens van pleizier. Zijn er geene mannen, die, als de loddegen,
+de vrouwen hunne kracht en hunne schoonheid met geld doen betalen?
+
+De schepenen zeiden tot elkaar:
+
+--Hoort gij zijn duivelsche, stoutmoedige listen? Zijn harige wrat
+heeft niet gebloed: moordenaar, duivel en tooveraar, wil hij enkellijk
+de schuld van het tweegevecht bekennen, om al zijn andere misdaden
+te schuiven op zijn vriend den duivel, dien hij gedood heeft naar
+lichaam, maar geenszins naar ziel.... En ziet eens hoe bleek zijn
+gezicht is.--Aldus verschijnen al de duivelen, rood in de helle, bleek
+op de wereld, want zij hebben geen levensvuur, dat aan het gezicht zijn
+natuurlijken blos geeft, en zij zijn assche van binnen.--Om hem rood te
+krijgen en hem te doen branden, moet men hem terug op het vuur zetten.
+
+Toen sprak Katelijne:
+
+--Ja, duivel is hij, doch een goede, zoete duivel! En de heilige
+Joannes, zijn patroon, heeft hem de toelating gegeven de helle te
+verlaten. Alle dagen bidt hij den Heer Jezus voor hem. Hij moet maar
+zeven duizend jaar vagevuur meer doen: de Moeder Gods wil het, maar
+Satan verzet er zich tegen. Doch Maria drijft door wat zij wil. Zult
+gijlieden u verzetten tegen heuren wil? Als gij hem goed beziet,
+zult gij merken, dat hij niets meer heeft van zijn duivelschen staat,
+uitgenomen zijn ijskoud lichaam, en ook zijn gezicht, dat glanst lijk,
+in de oogstmaand, de branding der zee, als donder op handen is.
+
+En Joost Damman sprak:
+
+--Zwijg, tooveres, gij doet mij verbranden!
+
+Vervolgens zeide hij tot den baljuw en tot de schepenen:
+
+--Aanziet mij, ik ben geen duivel; ik heb vleesch en been, bloed en
+water. Ik drink en eet, verteer en werp uit lijk gijlie; mijn vel is
+gelijk het uwe en mijn voet insgelijks; beul, trek mijne schoenen uit,
+want met mijn gebonden voeten kan ik mij niet verroeren.
+
+De hangman deed het, niet zonder schrik.
+
+--Ziet, zeide Joost, terwijl hij zijn blanke voeten liet zien: zijn dat
+gespleten klauwen, zijn dat duivelspooten? Wat mijne bleekheid betreft,
+is niemand uwer zoo bleek als ik ben? Ik zie er meer dan drie onder
+ulieden. Maar die zondigde was niet ik, doch die leelijke tooveres en
+heure dochter, de boosaardige aanbrengster. Waar haalde zij het geld,
+dat zij leende aan Hilbert; van waar kwamen de florijnen, die zij
+hem gaf? Waren die niet het loon van den duivel, om de onschuldige
+edellieden aan te klagen en te doen sterven? Het is aan die beide
+vrouwen dat gij moet vragen, wie den hond in de lochting verworgde,
+wie den schat uit den put nam en er mee heenging, wellicht om de
+gestolen karolussen ergens elders te verbergen. Soetkin, de weduwe,
+kon geen vertrouwen stellen in mij, daar zij mij niet kende, doch wel
+in haarlieden, bij dewelken zij heel den dag vertoefde. Zij beiden
+zijn het, die het goed van den keizer hebben gestolen.
+
+--Vrouwe, hebt gij niets te zeggen tot uwe verdediging?
+
+Katelijne keek naar Joost Damman en zeide met liefde:
+
+--'t Is het uur van den nachtuil! Hans, mijn welbeminde, ik heb de
+hand van Hilbert. Zij zeggen, dat gij de zevenhonderd karolussen
+zult teruggeven.
+
+... Doet het vuur weg, doet het vuur weg! kermde zij
+vervolgens. Drinken! drinken! mijn hoofd brandt! God en de engelen
+eten appelsienen in 't hemelrijk.
+
+En zij viel in bezwijming.
+
+--Neem ze weg van de pijnbank, beval de baljuw.
+
+De hangman en zijne knechts gehoorzaamden. Men zag ze wankelen,
+met gezwollen voeten, want de beul had de koorden te hard gespannen.
+
+--Geef heur te drinken, beval de baljuw.
+
+Men gaf heur versch water, hetwelk zij gretig dronk, met den beker
+tusschen heure tanden, als een hond doet met een been, zonder hem te
+willen loslaten. Vervolgens gaf men heur nog water, en zij wilde er
+van dragen aan Joost Damman, maar de beul rukte heur den beker uit
+de hand. En zij viel slapend ten gronde, als een blok lood.
+
+Toen riep Joost Damman met woede:
+
+--Ik ook heb dorst en heb vaak. Waarom laat gij heur drinken en slapen?
+
+--Zij is eene vrouw, en daarbij zwak en uitzinnig, antwoordde de
+baljuw.
+
+--Heure uitzinnigheid is geveinsd, zeide Joost Damman, zij is eene
+tooveres. Ik wil drinken, ik wil slapen!
+
+En hij sloot de oogen, maar de beulsknechten sloegen hem in het
+gezicht.
+
+--Geef mij een mes, riep hij, dat ik al dien gemeenen boeren en
+burgers de les spelle: ik ben een edelman en nooit sloeg men mij in het
+gezicht. Water! laat mij slapen, ik ben onschuldig. Ik ben het niet,
+die de zevenhonderd karolussen stal: 't is Hilbert. Drinken! Nooit
+bedreef ik tooverij of bezwering. Ik ben onschuldig, laat mij
+gaan. Drinken!
+
+Toen vroeg de baljuw:
+
+--Hoe bracht gij den tijd door, sedert dat gij Katelijne verliet?
+
+--Katelijne ken ik niet en heb ze dus niet verlaten, zeide hij. Gij
+ondervraagt mij over stukken, die vreemd aan de zaak zijn. Ik moet
+u niet antwoorden. Drinken! Laat mij slapen! Ik zeg u, dat Hilbert
+alles gedaan heeft.
+
+--Maakt hem los, sprak de baljuw. Brengt hem terug naar het Steen. Maar
+hij zal drinken noch slapen, totdat hij zijne tooverij en bezwering
+bekend heeft.
+
+En voor Damman was dit een schromelijke foltering. In den kerker
+schreeuwde hij zoo luide: "Drinken! Drinken!" dat het volk het
+hoorde, doch zonder mededoogen. En als hij viel van de vaak en zijne
+bewakers hem in het gezicht sloegen, werd hij woedend als een tijger
+en riep hij:
+
+--Ik ben een edelman en zal u allen dooden, boeren! Ik zal gaan bij
+den koning, onzen hoofdman. Drinken!
+
+Doch hij beleed niets, en men liet hem in het Steen.
+
+
+
+
+VI.
+
+Toen was men in de Bloeimaand; de boom der justitie was groen,
+insgelijks groen waren de banken van graszoden, op dewelke de rechters
+waren gezeten. Nele werd ter oorkondschap geroepen. Dien dag moest
+het vonnis uitgesproken worden.
+
+En het volk: mannen, vrouwlieden, poorters en arbeiders stonden rond
+de vierschaar; en de zonne scheen helder.
+
+Katelijne en Joost Damman werden voor de vierschaar gebracht; en
+Damman zag er nog bleeker uit, ter oorzake van de torture, van den
+dorst en van de slapelooze nachten.
+
+Katelijne, die zich op heure waggelende beenen niet rechthouden kon,
+wees naar de zonne en sprak:
+
+--Doe het vuur weg, mijn hoofd brandt!
+
+En met teedere liefde zag zij naar Joost Damman.
+
+En deze bekeek heur met haat en verachting.
+
+En de heeren en edelen, zijne vrienden, die naar Damme waren ontboden,
+waren allen als getuigen voor de vierschaar aanwezig.
+
+Toen sprak de baljuw:
+
+--Nele, de dochter, die heure moeder Katelijne met zooveel
+genegenheid verdedigt, heeft in den genaaiden zak van den besten rok
+derzelfde Katelijne een briefje gevonden, geteekend "Hansken". In de
+beugeltassche, gevonden op het lijk van Hilbert Rijnvisch, stak een
+andere brief, aan hem gezonden door Joost Damman, beschuldigde alhier
+tegenwoordig. Beide brieven heb ik bewaard, opdat gij op het gepaste
+oogenblik, dat thans aangebroken is, zoudt kunnen oordeelen over
+de hardnekkigheid van dien man en hem vrijspreken of veroordeelen,
+naarvolgens wet en gerechtigheid. Hier is het perkament, in de
+beugeltasch gevonden; ik deed het niet open en weet niet of het
+leesbaar is of niet.
+
+Toen waren de rechters in groote verlegenheid.
+
+De baljuw beproefde het bolleken perkament los te maken, doch te
+vergeefs; en Joost Damman schompermuilde.
+
+Toen sprak een schepen:
+
+--Laat ons het bolleken in 't water leggen en vervolgens voor
+'t vuur stellen. Als het door een heimelijk middel toegeplakt is,
+zullen water en vuur het wel losmaken.
+
+Het water werd gebracht, de hangman stak een groot houtvuur aan;
+de blauwe rook steeg recht omhoog in den helderen hemel, tusschen de
+groene takken van den boom der justitie.
+
+--Steek den brief in de kom niet, sprak een schepen, want als hij
+geschreven is met opgelost ammoniakzout, zullen de letteren verdwijnen.
+
+--Neen, zeide een chirurgijn, die daar was, de letteren zullen niet
+verdwijnen, het water zal enkellijk het bestrijksel, hetwelk dit
+tooverbolleken toeplakt, weeker maken.
+
+Het perkament werd geweekt in het water, en, als het zachter was,
+werd het geopend.
+
+--Nu, zeide de chirurgijn, houdt het nu voor het vuur.
+
+--Ja, ja, zeide Nele, houdt het papier voor het vuur; messire
+chirurgijn is op weg naar de waarheid, want de moordenaar verbleekt,
+en siddert over heel zijn lichaam.
+
+Daarop sprak Joost Damman:
+
+--Ik verbleek noch ik sidder, kleine heks uit 't gemeen, die op den
+dood van een edelman aast; maar gij zult er niet in slagen: dat papier
+moet gerot zijn na zestien jaar verblijf in den grond.
+
+--Het perkament is geenszins bedorven, zei de schepen, de beugeltasch
+was met zijde gevoerd; zijde vergaat niet in den grond, en de wormen
+hebben het perkament niet opgegeten.
+
+Het perkament werd voor 't vuur gebracht.
+
+--Heer baljuw, heer baljuw, zeide Nele, hier voor het vuur komen
+reeds letteren te voorschijn: beveel dat men het schrift leze.
+
+De chirurgijn nam het perkament om het te lezen, als messire Joost
+Damman vlug de hand uitstak om het te grijpen; doch rap als de wind
+hield Nele zijnen arm tegen, en zij sprak:
+
+--Gij zult het niet aanraken, want daar staat uw dood of die van
+Katelijne geschreven. Bloedt thans uw herte, moordenaar, weet dat het
+onze reeds vijftien jaar lang bloedt; 't is vijftien jaar dat Katelijne
+lijdt, dat heur geest in heur hoofd verbrand werd om uwentwil; 't
+is vijftien jaar dat Soetkin stierf ten gevolge der smerten; 't is
+vijftien jaar dat wij leven in kommer en ellende, hoewel wij fier het
+hoofd mogen verheffen. Lees het papier, lees het papier! De rechters
+zijn God op de wereld, want zij zijn Gerechtigheid. Lees het papier!
+
+--Lees het papier! riepen de mannen en vrouwlieden snikkend. Nele is
+moedig en braaf! Katelijne is geene tooveres.
+
+En de griffier las:
+
+"Aan Hilbert, zoon van Willem Rijnvisch, schildknaap, Joost Damman,
+schildknaap, Heil!
+
+... Waarde vriend, verlies uw geld niet meer met kaarten, dobbelsteenen
+en andere dergelijke kansspelen. Ik zal u zeggen hoe men zeker is
+altijd geld te winnen: Laat ons duivelen worden, schoone duivelen,
+bemind door vrouwen en meidekens. De schoone en rijke vrouwlieden
+zullen wij nemen en de leelijken en armen daar laten; zij hebben heur
+genoegen maar te betalen. Op die wijze maakte ik in Duitschland, in zes
+maanden, vijfduizend rijksdaalders. De vrouwen zouden zich uitkleeden
+voor den man, dien zij liefhebben; vlied de gierige feeksen, die met
+tegenzin heur pleizier betalen. Wat u betreft, om schoon te wezen en
+een echte nachtduivel te schijnen, kondig uwe komst aan met 't gekras
+van eenen roofvogel, als zij u in het duister willen ontvangen. En om
+u een gezicht te maken van een echten, verschrikkelijken duivel, wrijf
+het in met phosphorus, die bij plaatsen schittert als hij nat is. Hij
+stinkt, maar de vrouwen nemen dat voor den reuk van het solfer der
+helle. Dood al wie u hindert: 't zij man, 't zij vrouw of 't zij beest.
+
+... Binnen kort gaan wij samen bij Katelijne, een schoone, goedhertige
+loddege; heure dochter, Nele, een kind van mij, als Katelijne mij
+trouw was, is een lief en beminnelijk meideken; zonder moeite zult
+gij ze nemen; ik schenk ze u, want ik geef niet om bastaards: men
+kan ze nooit met zekerheid voor zijn kroost erkennen. Heure moeder
+gaf mij reeds meer dan drie en twintig karolussen, gansch heure
+have. Maar zij verbergt eenen schat, die, als ik het goed voorheb,
+het erfdeel van Klaas is, den ketter, die te Damme levend verbrand
+werd: zevenhonderd karolussen, waar verbeurdverklaring op rust;
+doch de goede koning Philippus, die zoovele zijner onderdanen deed
+verbranden om te erven van hen, kon dien lieven schat in zijne klauwen
+niet krijgen. Hij zal zwaarder wegen in mijne tassche dan in de zijne;
+Katelijne zal mij zeggen waar hij is; wij zullen hem deelen. Maar gij
+moet mij 't grootste deel laten, omdat ik de aanbrenger ben. Wat de
+vrouwen betreft, dewelke onze zachtmoedige dienaressen en verliefde
+slavinnen zullen wezen, die zullen wij naar Duitschland brengen. Daar
+zullen wij van heur nachtduivelinnetjes maken, en ze laten beslapen
+door alle rijke poorters en edellieden; wij en haarlieden zullen
+daar leven van de liefde, betaald met schoone rijksdaalders, panne,
+zijde, goud, perelen en juweelen; zoo worden wij, buiten weten van
+onze duivelinnetjes, bemind door de schoonsten onder de schoonen,
+en doen wij heur steeds voor onze liefde betalen. Al de vrouwen zijn
+zot en dwaselijk verknocht aan den man, die in haar het liefdevuur
+doet ontvlammen, hetwelk God onder heuren gordel stak. Katelijne en
+Nele zullen het nog meer wezen dan iemand, en zullen ons in alles
+gehoorzamen: behoud uwen voornaam, maar voer nooit den naam van uwen
+vader Rijnvisch. Neemt de rechter de vrouwen in hechtenis, dadelijk
+vertrekken wij zonder dat zij ons kennen of kunnen verraden. Help
+mij, mijne getrouwe. De fortuin lacht de jongelieden toe, zeide Zijne
+Heilige Majesteit Keizer Karel zaliger, dewelke een meester was in
+zaken van liefde en van oorlog".
+
+En de griffier hield op met lezen en sprak:
+
+--Zoo luidt de brief en hij is geteekend: "Joost Damman, schildknaap".
+
+En het volk riep:
+
+--Ter dood, de moordenaar! Ter dood, de tooveraar! In 't vuur, de
+schavuit, die de vrouwlieden waanzinnig maakt! Aan de galg, de rabauw!
+
+Toen sprak de baljuw:
+
+--Zwijg, volk, opdat wij dien man in volle vrijheid kunnen oordeelen.
+
+En tot de schepenen zeide hij:
+
+--Ik wil u den tweeden brief lezen, dien Nele vond in den zak van
+Katelijne's besten rok; hij luidt als volgt:
+
+"Geliefde tooveres, ziehier het recept eener zalve, dat de vrouw van
+Lucifer zelve mij zond: met die zalve zult gij u kunnen begeven in
+de zonne, de maan en de sterren; kunnen spreken met de sylphen, die
+aan God de gebeden der menschen overbrengen, en alle steden, dorpen,
+rivieren, beemden van 't gansche heelal kunnen bezoeken. Stamp
+ondereen, bij gelijke deelen, stramonium, solanum somniferum,
+bilzenkruid, opium, versche henneptoppen, belladonna en datura.
+
+... Als gij wilt, zullen wij dezen avond samen naar den sabbat der
+geesten gaan: maar gij moet mij meerder beminnen en zoo gierig niet
+zijn, gelijk dien avond, toen gij mij tien gulden weigerdet, onder
+voorwendsel dat gij ze niet hadt. Ik weet, dat gij eenen schat verbergt
+en het mij niet wilt bekennen. Bemint gij mij niet meer, mijne liefste?
+
+"Uw koude duivel,
+
+"Hansken".
+
+--Ter dood, de tooveraar! riep het volk.
+
+De baljuw sprak:
+
+--Wij moeten de twee schriften vergelijken.
+
+Dit werd gedaan, en zij werden eender bevonden.
+
+Toen sprak de baljuw tot de aanwezige heeren en edellieden:
+
+--Herkent gij den beklaagde voor messire Joost Damman, zoon van den
+schepene van de keure van Gent?
+
+--Ja, zeiden zij.
+
+--Kendet gij, sprak hij, messire Hilbert, zoon van Willem Rijnvisch,
+schildknaap?
+
+Een der edellieden, die Vander Zickele hiet, nam het woord en sprak:
+
+--Ik ben van Gent, mijn steen staat op de Hoogpoort; ik ken Willem
+Rijnvisch, schepene van de keure van Gent. Hij verloor, over een
+vijftiental jaren, een zoon van drie en twintig jaar, een losbol,
+een speler, een luierik; maar men vergaf hem zijne gebreken, om den
+wille van zijn jeugdigen leeftijd. Sedert dien tijd kreeg nooit iemand
+miede van hem. Ik vraag om het zweerd, den dolk en de beugeltassche
+van den verslagene te zien.
+
+Toen hij die voor zich had, sprak hij:
+
+--Op den knop van het hecht van het zweerd en den dolk staan de
+wapenen van het geslacht Rijnvisch, hetwelk voert, in blauw, drie
+zilveren visschen. Die zelfde wapenen zie ik op een gouden schild
+tusschen de maliën der beugeltassche. Welke is die andere dolk?
+
+De baljuw sprak:
+
+--Die dolk stak in het lichaam van Hilbert Rijnvisch, zoon van Willem.
+
+--Daarop herken ik de wapens der Damman's: in zilver, een roode toren.
+
+--Zoo waarlijk helpe mij God almachtig!
+
+De andere edellieden zeiden insgelijks:
+
+--Die wapenen herkennen wij voor die van Rijnvisch en van Damman. Zoo
+helpen ons God en al zijne santen!
+
+Toen zei de baljuw:
+
+--Gehoord en gelezen de voor de Vierschaar gebrachte getuigenissen
+en oorkonden, is naar rechte ten genoege gebleken, dat Joost
+Damman, "gecommitteerd hebbende de crimen van tooverije, doodslag,
+zotmaking van vrouwlieden, diefte van 's konings goedingen, wezende
+de abominabelste zonden die men ter wereld kan bedrijven, schuldig
+is aan crimen divinae laesae majestatis, geenszins lijdelijk zonder
+exemplaire pugnitie".
+
+--Dat zegt gij, messire baljuw, hernam Joost, doch bij gebreke aan
+genoegzame bewijzen, kunt gij mij niet veroordeelen; tooveraar ben ik
+niet of was ik nooit; enkellijk speelde ik het spel van den duivel. Wat
+mijn helder gezicht betreft, nu weet gij het middel, dat ik daartoe
+gebruikte. De zalve, hoewel zij bilzenkruid, een vergiftige plant,
+bevat, is enkel slaapverwekkend. Als die vrouw, die een ware tooveres
+is, er van nam, verviel zij in slaapdronkenheid en droomde zij, dat
+zij naar den sabbat ging en er danste met het gezicht buitenwaarts
+van de ronde, alsook dat zij eenen duivel aanbad in de gedaante van
+eenen bok, op een autaar gezeten. Als de rondedans gedaan was, droomde
+zij, dat zij den duivel ging kussen onder zijnen steert, gelijk de
+tooveraars doen, tot teeken van onderdanigheid. Als ik, naar zij zegt,
+koude armen en een frisch lichaam had, is dit een teeken van jeugd
+en geenszins van tooverij. Frischheid is niet bestand tegen het werk
+des vleesches. Maar Katelijne nam heure wenschen voor werkelijkheid
+en aanzag mij dus voor eenen duivel, hoewel ik een mensch ben, gelijk
+gijlie. Zij alleen is schuldig om mij, voor eenen duivel nemende, in
+heur bed aanveerd te hebben; aldus zondigde zij met wil en met daad
+tegen God en tegen den Heiligen Geest. Zij dus is het, maar ik niet,
+die de misdaad van tooverij beging, die strafbaar is met den viere, als
+een razende en boosaardige tooveres, die voor uitzinnig wil doorgaan,
+ten einde heure boosaardigheid te verbergen.
+
+Doch Nele riep:
+
+--Hoort gij den moordenaar? Als loddegen, als veile deernen, dewelke
+een schijfje op den arm dragen, dreef hij handel in liefde. Hoort
+gij hem? om zich te redden, wil hij degene doen verbranden, welke
+hem alles gaf.
+
+--Nele is stout, zeide Katelijne, Hans, mijn liefste, luister naar
+heur niet.
+
+--Neen, vervolgde Nele, gij zijt geen mensch: gij zijt een lafhertige,
+wreedaardige duivel!
+
+En, Katelijne in de armen nemend:
+
+--Heeren rechters, riep zij, luistert niet naar dien bleeken booswicht;
+hij heeft maar éénen wensch: mijne moeder levend te zien verbranden,
+hoewel zij geen andere misdaad bedreef, dan door God met uitzinnigheid
+getroffen te worden en de schimmen heurer droomen voor echt te
+aanzien. Veel reeds heeft zij geleden naar lichaam en geest. Doet ze
+niet sterven, heeren rechters. Laat de uitzinnige heur treurig leven
+eindigen in vrede.
+
+En Katelijne sprak:
+
+--Nele is stout, ge moet ze niet gelooven, Hansken, mijn vriend.
+
+En in het volk weenden de vrouwlieden en riepen de mannen:
+
+--Genade voor Katelijne!
+
+Op belijdenissen, die Joost Damman na nieuwe folteringen deed, brachten
+de baljuw en de schepenen hunne sententie te zijnen opzichte uit:
+hij werd veroordeeld om te worden ontadeld en levend verbrand met
+zacht vuur, totdat de dood er op volgde.
+
+'s Anderen daags doorstond hij de doodstraf voor de pui van het
+Schepenhuis, gedurig roepend:
+
+--Doet de tooveres sterven; zij alleen is schuldig. Gevloekt weze
+God! mijn vader zal de rechters vermoorden!
+
+En hij gaf den geest.
+
+En het volk zeide:
+
+--Hoort hoe hij God vloekt en lastert, hij sterft als een hond.
+
+'s Anderen daags brachten de baljuw en de schepenen hun vonnis uit
+ten opzichte van Katelijne: zij werd veroordeeld om de waterproef
+te doorstaan, in de Brugsche vaart. Zoo zij boven dreef, zou zij als
+tooveres worden verbrand; zoo zij zonk en stierf, zou zij beschouwd
+worden als op kerstene wijze gestorven en als dusdanig op 't kerkhof
+begraven.
+
+'s Anderen daags werd Katelijne, baarvoets, gekleed met een zwart
+linnen hemde, en met eene waskeers in heure hand, processiegewijs
+gebracht tot aan de vaart, langsheen de boomen. Vóór heur gingen,
+de gebeden der dooden zingend, de deken van Onze-Lieve-Vrouwekerk,
+zijne vicarissen, de koster met het kruis; en achter heur, de baljuw
+van Damme, de schepenen, de griffiers, de serjanten der gemeente,
+de provoost, de hangman en zijne beide knechts. Op de beide oevers
+stond een groote menigte vrouwen, die weenden, en mannen, die morden,
+uit medelijden met Katelijne, dewelke gedwee als een lam zich liet
+leiden zonder te weten waarheen, en gedurig zei:
+
+--Doet het vuur weg, mijn hoofd brandt! Hansken, waar zijt gij?
+
+Nele, die te midden van de vrouwen stond, riep:
+
+--Ik wil met heur in 't water worden gesmeten!
+
+Maar de vrouwen lieten heur omtrent Katelijne niet komen.
+
+Een scherpe wind blies van de zee; een fijne hagel viel uit
+den loodgrijzen hemel in het water der vaart; eene boot lag daar
+vastgemeerd; de hangman en zijne knechts namen dezelve in naam Zijner
+Koninklijke Majesteit. Op hun bevel stapte Katelijne er in: de beul
+stond recht in de boot en hield Katelijne vast, en, op een teeken van
+den provoost met de roede der justitie, smeet hij ze in de vaart. Zij
+spartelde, doch niet lang, en zonk nog roepende:
+
+--Hans! Hans! help mij!
+
+En het volk zeide:
+
+--Die vrouw is geene tooveres.
+
+Mannen sprongen in de vaart en trokken Katelijne er uit, dewelke
+van heurzelve was en stijf als eene doode. Zij werd in eene taveerne
+gebracht en voor een groot vuur nedergelegd; Nele trok heur nat hemd
+uit en deed heur een ander aan; toen zij tot zich zelve kwam, zegde
+zij bibberend en klappertandend:
+
+--Hans, geef mij een wollen mantel.
+
+En Katelijne kon zich niet verwarmen. En den derden dag stierf zij. En
+zij werd op 't kerkhof begraven, in gewijde aarde.
+
+En Nele toog henen naar Holland, bij Rosa van Auweghem.
+
+
+
+
+VII.
+
+Op de hulken, op de boeiers, de poonen der Geuzen, vaart Thijl Klaas
+Uilenspiegel.
+
+De vrije zee draagt de wakkere vliebooten, op dewelke acht, tien,
+tot twintig ijzeren stukken staan: zij braken dood en vernieling naar
+de verraderlijke Spanjolen.
+
+Hij is een ervaren kanonnier, Thijl Uilenspiegel, zoon van Klaas:
+het is een lust te zien hoe juist hij het stuk richt, hoe goed hij
+mikt, en, als in boter, een gat boort in de schepen der beulen.
+
+Op den vilten hoed draagt hij de zilveren halvemaan met het opschrift:
+Liever den Turc als den Paus.
+
+De matrozen, die hem, vlug als eene kat, met een referein op de lippen,
+op hunne boot zagen springen, ondervroegen hem nieuwsgieriglijk:
+
+--Hoe komt het, maat, dat gij er nog zoo jeugdig uitziet, want men
+zegt, dat het reeds lang geleden is dat gij te Damme ter wereld kwaamt?
+
+--Ik ben geen lichaam, maar een geest, zei hij, en Nele, mijne
+vriendinne, gelijkt mij. Geest van Vlaanderen, Liefde van Vlaanderen,
+zullen wij beiden nooit sterven.
+
+--Maar, zeiden zij, als men u snijdt, bloedt gij toch?
+
+--Schijn bedriegt, antwoordde Uilenspiegel, het is wijn, maar geen
+bloed.
+
+En de geborduurde banieren uit de ommegangen der Roomschen wapperden
+aan de masten der schepen. En gekleed in panne, in brocaat, in zijde,
+in goud- en zilverlaken, met mijter en staf, den wijn der monniken
+drinkend, hielden de Geuzen de wacht op hunne schepen.
+
+En 't was een vreemdsoortig schouwspel, uit de mouwen der rijke
+kleederen die ruwe handen te zien steken, dewelke bogen of bussen,
+hellebaarden of pieken droegen, en al die mannen met stuursche
+tronie, met flikkerende pistolen en kruismessen in den gordelriem,
+uit gouden kelken den wijn der abten te zien drinken, die nu de wijn
+der vrijheid was.
+
+En zij zongen en riepen: "Vive le Geus!" en dobberden aldus op het
+ruime sop.
+
+
+
+
+VIII.
+
+Te dien tijde namen de Geuzen, onder dewelke Lamme en Uilenspiegel
+waren, het stedeken Gorkum. En zij waren aangevoerd door kapitein
+Marinus. Deze Marinus, die vroeger dijkwerker was, was weergaloos
+trotsch en verwaand en teekende met Gaspard Turk, de verdediger van
+Gorkum, eene capitulatie, bij dewelke Turk, de monniken, poorters en
+soldaten, die binnen de vesting waren, vrijelijk zouden mogen uitgaan
+met den kogel in den mond, het musket op den schouder, met alles
+wat zij zouden kunnen dragen, uitgenomen de goedingen van kerken en
+kloosters, die aan de belegeraars moesten komen.
+
+Maar, op bevel van messire Lumey, wederhield kapitein Marinus negentien
+monniken; alleen de soldaten en poorters liet hij gaan.
+
+En Uilenspiegel sprak:
+
+--Soldatenwoord moet gulden woord wezen. Waarom breekt hij het zijne?
+
+Een oude Geus antwoordde hem:
+
+--De monniken zijn de zonen Satans, de melaatschheid der landen, de
+schande der volken. Sedert de komst van den bloedigen hertog, spelen
+dezen hier den baas in Gorkum. Onder hen is er een, paap Nicolaas,
+dewelke fier is als een pauw en wreed als een tijger. Telkenmale dat
+hij over de straat ging met zijn monstrans, waarin zijn met hondevet
+gebakken ouwel stak, keek hij met grammoedige oogen naar de huizen, uit
+dewelke de vrouwen niet kwamen om neder te knielen, en kloeg hij bij
+den rechter al degenen aan, die de knie niet bogen voor zijnen afgod
+van water en bloem. De andere monniken volgden zijn voorbeeld. Dat
+was de oorzaak van vele gruweldaden, verbrandingen en andere wreede
+folteringen in het stedeken Gorkum. Kapitein Marinus deed wèl van die
+monniken gevangen te houden, die anderszins, met hunne gelijken, in
+vlekken, steden en gehuchten zouden gaan, om te preeken tegen ons, het
+volk op te hitsen en de arme hervormden te doen verbranden. Bloedhonden
+legt men aan de keten totdat zij verrekken; aan de keten, de monniken;
+aan de keten, de bloedhonden van den hertog van Alva; in den kerker,
+de beulen! Vive le Geus!
+
+--Maar, sprak Uilenspiegel, Oranje, onze prins van de vrijheid, wil
+dat men, bij elke overgave, de goedingen der menschen en het vrije
+geweten eerbiedige.
+
+De oude geuzen antwoordden:
+
+--De admiraal wil dat niet voor de monniken: hij is de meester:
+hij nam den Briel. In den kerker, de monniken!
+
+--Soldatenwoord is gulden woord! Waarom schendt hij zijn
+woord? antwoordde Uilenspiegel. De monniken, die in den kerker worden
+gehouden, zijn aan de grofste beleedigingen blootgesteld.
+
+--De assche klopt niet meer op uw hert, spraken zij: ten gevolge van
+de edicten, hebben honderdduizend gezinnen de ambachten, de nijverheid
+onzer landen, overgebracht naar het Noordwesten, naar Engeland; betoon
+maar medelijden voor de bewerkers van onzen ondergang! Sedert Keizer
+Karel V, Beul I, en, onder den huidigen, bloedigen koning, Beul II,
+stierven honderd achttien duizend menschen den marteldood. Wie droeg de
+keersen bij de begrafenissen, in den moorden in de tranen? Monniken en
+Spaansche soldeniers! Hoort gij, hoort gij de zielen der slachtoffers
+niet klagen en kermen in het kille graf?
+
+--De assche klopt op mijn hert, zeide Uilenspiegel. Soldatenwoord is
+gulden woord!
+
+--Wie dan, zeiden zij, wilde door excommunicatie ons in den ban van
+alle landen sluiten? Wie had hemel en aarde, God en duivel en hunne
+dichte gelederen santen en santinnen tegen ons afgezonden? Wie spatte
+er droppelen ossenbloed op de ouwels, wie deed de houten heiligen
+weenen? Wie deed het de Profundis zingen over den grond onzer vaderen,
+anders dan die gevloekte geestelijkheid, die hoop ledige, vadsige
+monniken? En dit alles om hunnen rijkdom te behouden, alsmede hunnen
+invloed op de afgodendienaars, en door ondergang, bloed en vuur te
+heerschen over het arme land. In de kooi, de wolven, die de menschen
+beloeren; in de kooi, de hyena's. Vive le Geus!
+
+--Soldatenwoord is gulden woord!
+
+'s Anderen daags, kwam een bode vanwege messire Lumey, met bevel de
+negentien gevangen monniken te doen overbrengen van Gorkum naar den
+Briel, alwaar de admiraal zich bevond.
+
+--Zij zullen gehangen worden, zei kapitein Marinus tot Uilenspiegel.
+
+--Toch niet zoolang ik zal leven, antwoordde hij.
+
+--Mijn vriend, zeide Lamme, spreek zóó niet tot messire Lumey. Hij is
+wreedaardig en zal u doen hangen in het weinig vereerend gezelschap
+der monniken.
+
+--Ik zal spreken naarvolgens de waarheid, antwoordde Uilenspiegel:
+soldatenwoord is gulden woord!
+
+--Als gij ze kunt redden, zeide Marinus, breng hunne boot naar den
+Briel. Neem Rochus den loods mee, en uwen vriend Lamme, als gij wilt.
+
+--Ik wil, antwoordde Uilenspiegel.
+
+De boot werd gemeerd aan de Groene Kade, de negentien monniken namen er
+plaats in; de vreesachtige Rochus werd gezet aan het roer, Uilenspiegel
+en Lamme, beiden goed gewapend, gingen staan op de voorplecht. Eenige
+schavuiten, die met het oog op de plundering als soldaten bij de Geuzen
+waren gekomen, zaten bij de monniken, die honger hadden. Uilenspiegel
+gaf hun te eten en te drinken. "Die zal verraden!" zeiden de slechte
+soldaten. De negentien monniken zaten in het midden, schijnheilig
+vroom en bibberend, hoewel men in de Hooimaand was en de zon helder
+en warm scheen, en een zachte zeewind de zeilen der boot deed zwellen,
+die log en zwaar over de groene golven gleed.
+
+Pater Nicolaas sprak toen en zeide tot den loods:
+
+--Rochus, leidt men ons naar het Galgeveld?
+
+Vervolgens wendde hij zich in de richting van Gorkum en sprak,
+terwijl hij rechtstond en de hand uitstak:
+
+--O, stede van Gorkum, o stede van Gorkum! Hoevele kwalen hebt gij
+te lijden: gevloekt zult gij wezen onder al de steden, want binnen
+uwe muren hebt gij het zaad der ketterij laten kiemen! O, stede van
+Gorkum! En de engel des Heeren zal bij uwe poorten de wacht niet
+meer houden. Hij zal niet meer zorgen voor de eer uwer maagden, den
+moed uwer mannen, het fortuin uwer kooplieden! O stede van Gorkum,
+gevloekt zijt gij, rampzalige!
+
+--Gevloekt, gevloekt, antwoordde Uilenspiegel, gevloekt zeker als
+de kam, die al de Spaansche luizen afgekamd heeft! Gevloekt als
+de hond, die zijne keten verbreekt, als het trotsche peerd, dat
+een wreedaardigen ruiter ontzadelt! Maar gij zelf zijt gevloekt,
+dompelaar van een predikant, die slecht vindt dat men de roede,
+al ware zij van ijzer, aan stukken slaat op den rug der tirannen!
+
+De monnik zweeg en sloeg de oogen neer; hij scheen ganschelijk
+overgeleverd aan zijn godvruchtigen haat.
+
+De schavuiten, die met het oog op plundering als soldaten bij de
+Geuzen waren gekomen, waren nabij de monniken, dewelke weldra weer
+honger kregen. Uilenspiegel vroeg voor hen haring en beschuit. De
+schipper van de boot antwoordde:
+
+--Smijt ze in de Maas, daar zullen zij versche haring vinden.
+
+Uilenspiegel gaf toen aan de monniken al het brood en al de worst,
+die hij overhad voor zich en voor Lamme.
+
+De schipper en de schavuiten zeiden tot elkander:
+
+--Die is een verrader, hij spijst de monniken. Wij moeten hem
+aanklagen.
+
+Te Dordrecht hield de boot stil in de haven, aan de Bloemenkade;
+mannen, vrouwlieden, knapen en meidekens kwamen in groote menigte
+toeloopen om de monniken te zien en zeiden tot elkander, terwijl zij
+hen met den vinger toonden of met de vuisten bedreigden:
+
+--Beziet die schoften daar, die godmakers, die de lichamen naar de
+brandstapels brengen en de zielen naar 't eeuwige vuur; beziet die
+vetgemeste tijgeren, die dikbuikige jakhalzen.
+
+De monniken lieten het hoofd zakken en dorsten niet spreken. Weer
+zag Uilenspiegel hen zitten bibberen.
+
+--Wij hebben nog honger, medelijdende soldaat, zeiden zij.
+
+Maar de schipper sprak:
+
+--Wie drinkt altijd? Droog zand. Wie eet altijd? Monniken.
+
+Uilenspiegel ging hun in de stad brood, hesp en een grooten pot
+bier koopen.
+
+--Eet en drinkt, zeide hij; gij zijt onze gevangenen, doch als ik kan,
+zal ik u redden. Soldatenwoord is gulden woord!
+
+--Waarom geeft gij hun dat eten en drinken? Nooit zullen zij u betalen,
+zeiden de schavuiten.
+
+En stille spekend, fluisterden zij elkander in 't oor:
+
+--Hij heeft beloofd hen te redden, wij moeten hem gadeslaan.
+
+Met den dageraad kwamen zij aan den Briel. Toen de poorten hun geopend
+waren, ging een voetlooper messire Lumey verwittigen van hunne komst.
+
+Zoodra deze de miede ontving, sprong hij te peerd en, nauwelijks
+gekleed en vergezelschapt door eenige gewapende ruiters en
+voetknechten, kwam hij aan de boot.
+
+En nog eens kon Uilenspiegel den wreeden admiraal zien, gekleed als
+een heer, die in overvloed baadt.
+
+--Goeden dag, heeren monniken, sprak hij. De handen op! Waar is het
+bloed der heeren van Egmond en Hoorn? Gij toont mij uwe pootjes,
+dat is wel van u....
+
+Een monnik, Leonard genoemd, antwoordde:
+
+--Doe met ons wat gij wilt. Wij zijn monniken, niemand zal ons
+opeischen.
+
+--Hij heeft goed gesproken, zeide Uilenspiegel; want vermits de
+monnik afgebroken heeft met de wereld, dewelke vader en moeder,
+broeder en zuster, gade en vriendin is, vindt hij op Gods uur
+niemand, die hem opeischt. Nochtans, Excellentie, wil ik het doen:
+Bij het teekenen van de overgave van Gorkum, bepaalde kapitein
+Marinus dat die monniken vrij zouden wezen, gelijk al degenen,
+die genomen werden in de citadel en die er uitkwamen. Zij werden er
+echter zonder reden gevangen gehouden; ik hoor zeggen, dat zij zullen
+gehangen worden. Heer, ootmoediglijk richt ik mij tot u, om hen voor
+te spreken, want ik weet, dat soldatenwoord gulden woord is.
+
+--Wie zijt gij? vroeg messire Lumey.
+
+--Heer, antwoordde Uilenspiegel, ik ben Vlaming uit het schoone
+Vlaanderenland, boer, edelman, alles te zamen, en door de wereld ga
+ik aldus, om het goede en schoone te prijzen en volmondig te spotten
+met alles wat dwaas en verkeerd is. En u zal ik prijzen, als gij de
+belofte houdt, dewelke de kapitein heeft gesteld: Soldatenwoord is
+gulden woord!
+
+Maar de schavuiten, die met het oog op plundering bij de Geuzen waren
+gekomen, zeiden:
+
+--Heer, die is een verrader: hij heeft beloofd hen te redden; hij
+heeft hun brood, hesp, worst en bier gegeven, en ons niets.
+
+Messire Lumey zeide toen tot Uilenspiegel:
+
+--Vlaming, die het goede prijst en monniken spijst, gij zult met
+henzelven worden gehangen.
+
+--Ik ben zonder vrees, antwoordde Uilenspiegel, soldatenwoord is
+gulden woord!
+
+--Daar hebt gij u iets moois op den hals gehaald, sprak Lamme.
+
+--De assche klopt op mijn hert, zeide Uilenspiegel.
+
+De monniken werden naar eene schuur gebracht, en Uilenspiegel met
+hen; daar wilden zij hem bekeeren met godgeleerde bewijsvoeringen;
+maar hij viel in slaap bij hunne reden.
+
+Terwijl messire Lumey aan tafel zat, welke vol wijn en vol vleesch
+stond, kwam een bode van Gorkum, vanwege kapitein Marinus, met het
+afschrift van de brieven des Prinsen van Oranje, "lastende en bevelende
+aan al de voogden van steden en andere plaatsen, de geestelijken in
+gelijke veiligheid, zekerheid en privilege te houden als de andere
+standen des volks".
+
+De bode vroeg om bij Lumey toegelaten te worden, ten einde hem,
+eigenhandig, het opschrift der brieven te geven.
+
+--Waar is 't origineel? vroeg Lumey.
+
+--Bij mijn meester Marinus, zeide de bode.
+
+--En die boer zendt mij het afschrift! zeide Lumey. Waar is uw pas?
+
+--Hier, heer, sprak de bode.
+
+Messire Lumey las:
+
+--"Mijnheer en meester Marinus Brand last al den ministers, stadhouders
+en officieren der Vereenigde Provinciën, vrijelijk door te laten enz."
+
+Lumey sloeg met de vuisten op de tafel en scheurde den brief aan
+stukken; hij riep woedend uit:
+
+--Verdoemd, waarmede bemoeit hij zich, die Marinus, die schooier,
+die vóór de inneming van den Briel nog geene graat van een haring te
+vreten had? Hij heet zich mijnheer en meester, en zendt bevelen aan
+mij! Hij last en beveelt! Zeg aan uw meester, dat, mits hij zulk een
+mijnheer en zulk een meester is, welk zoo goed lasten en bevelen kan,
+de monniken op staanden voet zullen opgeknoopt worden, en gij daarbij,
+als gij niet dadelijk opkraamt!
+
+En met een schop onder de broek, smeet hij hem buiten de kamer.
+
+--Drinken! riep hij. Hebt gij de verwatenheid van dien Marinus
+gezien? Ik ben woedend! Dat men de monniken dadelijk opknoope in
+hunne schuur, en dat men dien Vlaming voor mij brenge, nadat hij hun
+halsrecht bijgewoond heeft. We zullen eens zien of hij mij zal durven
+zeggen, dat ik slecht deed. Alle duivels! waarom zijn hier nog potten
+en glazen van doen?
+
+En met groot gerucht sloeg hij de bekers en het vaatwerk kapot, en
+niemand durfde hem aanspreken. De knechten wilden de stukken oprapen,
+maar hij liet het niet toe; onmatig ledigde hij de eene flesch na de
+andere, en hij werd nog woedender, want hij liep met groote stappen
+de kamer op en neer, razend de scherven onder de voeten vertrappend.
+
+Uilenspiegel werd vóór hem gebracht.
+
+--Hewel, zeide hij hem, brengt gij mij miede van uwe vrienden,
+de monniken?
+
+--Zij zijn gehangen, sprak Uilenspiegel, en een lafhertige beul,
+door baatzucht gedreven, heeft een hunner, na zijnen dood,
+den buik en de zijden geopend, om aan een apotheker het vet te
+verkoopen. Soldatenwoord is geen gulden woord meer!
+
+Lumey, voort de scherven vertrappend, bulderde:
+
+--Gij trotseert mij, armzalige nietdeug, maar gij ook zult gehangen
+worden, niet in eene schuur, maar schandelijk op de Markt, in het
+aanschijn van elkeen.
+
+--Schande over u, sprak Uilenspiegel, schande over ons: soldatenwoord
+is geen gulden woord meer!
+
+--Wilt gij zwijgen, ijzeren kop! riep messire Lumey.
+
+--Schande over u, sprak Uilenspiegel, soldatenwoord is geen guldenwoord
+meer! Straf liever de nietdeugen, verkoopers van menschenvet!
+
+Messire Lumey vloog naar hem toe en hief de hand op om hem te slaan.
+
+--Sla, sprak Uilenspiegel, ik ben uw gevangene, maar ik heb geen
+schrik van u: Soldatenwoord is geen gulden woord meer!
+
+Toen trok messire Lumey zijn degen en zeker had hij Uilenspiegel
+gedood, zoo Treslong zijn arm niet weerhouden had, zeggende:
+
+--Medelijden! hij is moedig en dapper, en heeft geenerlei misdaad
+bedreven.
+
+Lumey veranderde toen van gedachte en sprak:
+
+--Dat hij vergiffenis vrage!
+
+Maar Uilenspiegel bleef rechtstaan en sprak:
+
+--Ik zal het niet doen.
+
+--Dat hij ten minste zegge, dat ik geen ongelijk had, riep Lumey nog
+blakend van woede.
+
+Uilenspiegel antwoordde:
+
+--Ik lik de hielen der heeren niet: soldatenwoord is geen gulden
+woord meer!
+
+--Dat men de galge oprichte, sprak Lumey, en dat men hem wegbrenge,
+dat zal woord van kemp voor hem wezen.
+
+--Ja, antwoordde Uilenspiegel, en voor het vergaderde volk zal ik u
+toeroepen: Soldatenwoord is geen gulden woord meer!
+
+De galge werd opgericht op de Groote Markt. De mare liep weldra door
+de stad, dat men Uilenspiegel ging hangen, den dapperen Geus. En het
+gemeen was tot weenens toe bewogen. En in groote menigte snelde het
+naar de Groote Markt; messire Lumey, te peerd, kwam er ook, daar hij
+zelf het teeken van de terechtstelling wilde geven.
+
+Wrokkig keek hij naar Uilenspiegel op de ladder, gekleed voor den
+dood, in zijn hemd, de armen op zijn lichaam gebonden, de handen
+samengevouwen, het strop om den hals, met den hangman naast zich,
+welke gereed was om de straf te volbrengen.
+
+Treslong zeide tot Lumey:
+
+--Heer, schenk hem genade; hij is geen verrader, en nimmer zag men
+een man hangen omdat hij openhertig en meewarig was.
+
+Toen de mannen en vrouwlieden uit 't volk de woorden van Treslong
+hoorden, riepen zij:
+
+--Genade heer, genade, heb medelijden met Uilenspiegel.
+
+--Die ijzeren kop heeft mij getrotseerd, sprak Lumey: dat hij berouw
+hebbe en zegge, dat ik wel gedaan heb.
+
+--Wilt gij berouw hebben en zeggen, dat hij wel gedaan heeft? vroeg
+Treslong tot Uilenspiegel.
+
+--Soldatenwoord is geen gulden woord meer, zeide Uilenspiegel.
+
+--Steek het strop over zijnen hals, beval Lumey.
+
+De hangman wilde gehoorzamen, doch een meideken, heel in 't wit
+gekleed, met een kroontje op 't hoofd, beklom als waanzinnig de
+trappen van het schavot, vloog Uilenspiegel om den hals en zeide:
+
+--Die man is de mijne, ik neem hem tot echtgenoot!
+
+En het volk juichte toe, en de vrouwlieden riepen:
+
+--Leve, leve het meideken, dat Uilenspiegel redt van den dood!
+
+--Wat beteekent die zotternij? vroeg messire Lumey.
+
+Treslong antwoordde:
+
+--Volgens de costumen en gebruiken van de stede, is het recht en wet,
+dat een jonge dochter, maagd of ongehuwd, een man van de koord redt,
+als zij hem aan den voet van de galge tot echtgenoot neemt.
+
+--God is met hem, zeide Lumey; maak hem los!
+
+Hij reed tot omtrent het schavot en zag het meideken druk bezig met
+Uilenspiegel's koorden door te snijden, terwijl de beul het heur
+wilde beletten, zeggende:
+
+--Als gij ze doorsnijdt, wie zal ze betalen?
+
+Maar het meideken luisterde niet.
+
+Als hij heur zoo vlug en ijverig en liefdevol bezig zag, was hij
+verteederd.
+
+--Wie zijt gij? vroeg hij.
+
+--Ik ben Nele, zijne bruid, zeide zij, en kom uit Vlaanderen om hem
+te halen.
+
+--Gij kwaamt in tijds, zeide Lumey op barschen toon.
+
+En hij toog henen.
+
+Treslong naderde toen en sprak:
+
+--Brave Vlaming, wilt gij op onze schepen nog dienen, als gij
+getrouwd zijt?
+
+--Ja, messire, antwoordde Uilenspiegel.
+
+--En gij, meideken, wat zult gij doen zonder uwen man?
+
+Nele antwoordde:
+
+--Als gij wel wilt, messire, zal ik bij hem blijven op zijn schip en
+op de pijp spelen.
+
+--Zeker, wil ik, antwoordde Treslong.
+
+En hij gaf heur twee gulden voor de bruiloft.
+
+En Lamme, die weende en lachte van blijdschap, zei:
+
+--Hier zijn nog drie gulden: wij zullen lekker gastreeren; ik
+trakteer. Komt, we gaan naar den Gouden Kam. Hij is niet dood, mijn
+vriend! Vive le Geus!
+
+En het volk juichte toe, en zij trokken naar den Gouden Kam, alwaar
+een groot feestmaal besteld werd, en Lamme smeet, door het venster,
+oortjes te grabbel naar 't volk.
+
+En Uilenspiegel zeide tot Nele:
+
+--Liefste, nu zijt ge bij mij. Hoezee! zij is hier, in levenden
+lijve, met hart en met ziel, mijn zoete vriendin. Ho! die zachte
+oogen en die schoone roode lippen, over dewelke nooit anders dan
+goede woorden kwamen! Zij redde mij 't leven, de welbeminde! Op onze
+schepen zult gij de pijp der verlossing bespelen. Herinnert gij u nog
+... doch neen.... Voor ons is thans blijdschap en vreugde, voor mij
+uw gezichtje, dat zoet is als de bloemen in de Zomermaand. Ik ben in
+het hemelrijk! Maar, zeide hij, gij weent....
+
+--Zij hebben heur gedood, zeide zij.
+
+En zij vertelde hem de rouwvolle mare.
+
+En zij staarden elkander aan, en weenden van minne en van smerte.
+
+En op het festijn aten en dronken zij, en Lamme keek hen jammerlijk
+aan.
+
+--Laas, zuchtte hij, waar zijt gij, mijne vrouw?
+
+En de priester kwam en trouwde Nele en Uilenspiegel.
+
+En de morgenzon vond hen bij elkander in 't huwelijksbed.
+
+En Nele rustte met heur hoofdje op den schouder van Uilenspiegel. En
+als zij ontwaakte in de zonne, zeide hij:
+
+--Frisch gezichtje en zoet hertje, wij zullen de wrekers van Vlaanderen
+wezen!
+
+Zij kuste hem op den mond en zeide:
+
+--Dolle kop en sterke arm, God zegene de pijp en het zweerd!
+
+--Ik zal u een soldatendos maken.
+
+--Dadelijk? vroeg zij.
+
+--Dadelijk, antwoordde Uilenspiegel; maar wie dan zegt, dat aardbeziën
+lekker zijn, 's morgens? Uw mond is veel zoeter!
+
+
+
+
+IX.
+
+Evenals hunne vrienden en gezellen, hadden Uilenspiegel, Lamme en
+Nele, den kloosters het goed teruggenomen, dat deze vergaard hadden,
+door middel van begankenissen, valsche mirakelen en andere Roomsche
+mommerijen, ten koste van 't onnoozele volk. Dit was in strijd met
+de bevelen van den Zwijger, den prins van de vrijheid, maar het
+geld diende voor de kosten des oorlogs. Lamme Goedzak vergenoegde
+zich niet met het geld, doch hij roofde nog in de kloosters hespen,
+worsten, bottels bier, flesschen wijn; niet zelden kwam hij terug met
+eene weitasch vol gevogelte, kalkoenen, ganzen, kapoenen en kiekens
+op den buik en met eenige monnikenverkens en kloosterkalveren achter
+zich aan een touw. En dit krachtens het oorlogsrecht, naar hij zeide.
+
+Vol blijdschap bij elke verovering, bracht hij zijn buit naar het
+vaartuig om er lekker mee te smullen; maar hij deed bitter zijn
+beklag, dat de kok zoo weinig ervaren was in de edele konsten van
+koken en braden.
+
+Nu, dien dag hadden de Geuzen een lekker glaasje op de zege gedronken,
+en ze zeiden tot Uilenspiegel:
+
+--Gij staat steeds met den neus in den wind, om tijdingen van het
+vasteland te vernemen; gij kent al de krijgsavonturen: zing ze ons
+eens. Maar Lamme moet op de trom slaan en de bevallige pijpster zal
+naar de maat van het lied spelen.
+
+En Uilenspiegel zeide:
+
+--Op een frisschen, helderen Meimorgen, vond Lodewijk van Nassau
+dewelke Bergen meende binnen te rukken, zijne voetknechten en zijne
+ruiters niet meer. Eenige vertrouwden hielden eene poort geopend
+en eene brug was neergelaten, opdat hij de stede kon nemen. Maar
+de poorters bemachtigden de brug en de poort. Waar zijn de soldaten
+van graaf Lodewijk? De poorters gaan de brug ophalen. Graaf Lodewijk
+blaast op den horen.
+
+En Uilenspiegel zong:
+
+
+    Waar zijn uw voetgangers? Waar uw ruiters?
+    Verdwaald in het bosch, alles vertredend,
+    Dorre twijgjes en bloeiende klokjes.
+    Vrouw Zon doet blinken
+    Roode strijdlustige wezens
+    En glansende manen van rossen.
+    Graaf Lodewijk steekt den hoorn.
+    Ze hooren 't. Slaat zacht de trom.
+
+    In gestrekte vaart, met schuimend gebit,
+    Bliksemren, wolkenren,
+    Een hoos van kletterend staal!
+    Zij vliegen, de zware ruiters!
+    Spoed, spoed! Ter hulp!
+    De brug gaat op.... De spoor
+    In den bloedenden buik der paarden.
+    De brug gaat op: verloren stad.
+
+    Er vóór reeds. Is het te laat?
+    Te vierklauw, met schuimend gebit!
+    Chaumont, op zijn gelen vos,
+    Springt op de brug die terugvalt.
+    Gewonnen stad! Hoort gij
+    Op Bergens plaveien,
+    Bliksemren, wolkenren,
+    Een hoos van kletterend staal?
+
+    Leve Chaumont en de gele vos!
+    Klaroent uw vreugd uit, slaat op de trom;
+    Hooimaand is 't, de weiden geuren.
+    De leeuwerik stijgt, tiereliert in de lucht:
+    Leve de vrije vogel!
+    Slaat op de trom der glorie.
+    Leve Chaumont en de vos!
+    Alhier, te drinken!
+    Gewonnen stad. Leve de Geus!
+
+
+En de Geuzen zongen op de schepen:
+
+Christus, zie uwe soldaten. Zegen onze wapenen, Heer. Leve de Geus.
+
+En Nele met heur lachend gezichtje speelde op de pijp, en Lamme
+sloeg op de trom, en naar omhoog, naar den hemel, den tempel Gods,
+verhieven zich gouden kelken en lofzangen van vrijheid. En de baren,
+helder en frisch, suisden welluidend rondom het schip als meerminnen,
+
+
+
+
+X.
+
+Eens, in de Oogstmaand, op een zwaren en warmen dag, was Lamme
+droefgeestig. Zijn blijde trom zweeg en sliep stil, de stokken
+staken weemoedig uit de opening zijner tassche. Uilenspiegel en
+Nele, glimlachend van blijde minne, koesterden zich in de zonne; de
+matrozen op kijkuit in de marsen, floten of zongen, en tuurden naar
+de wijde zee, om te weten of zij geene prooi aan den gezichteinder
+zagen. Treslong ondervroeg hen, en steeds antwoordden zij: Niets!
+
+En Lamme, bleek en afgemat, zuchtte jammerlijk. En Nele zei hem:
+
+--Hoe komt het, Lamme, dat gij zoo treurig gestemd zijt?
+
+En Uilenspiegel zei hem:
+
+--Gij wordt mager, mijn jongen.
+
+--ja, zeide Lamme, ik ben treurig en mager. Mijn hert verliest zijne
+vroolijkheid, en mijn goede tronie heure frischheid. Ja, lacht maar met
+mij, gijlie, die, na duizenden gevaren, elkander terugvondt. Spot maar
+met den armen Lamme, die, getrouwd zijnde, leeft als een weduwnaar,
+terwijl deze hier--zeide hij, naar Nele wijzend--heuren man moest
+ontrukken aan de kussen der koorde, welke toch zijne laatste
+minnaresse zal wezen. Zij deed wel, God zij geloofd; maar dat ze
+niet lache met mij. Ja, Nele, mijne vriendin, gij moet met den armen
+Lamme niet spotten. Mijne vrouw lacht voor tien, laas! gijlie vrouwen
+zijt ongevoelig voor eens andermans leed. Ja, mijn hert is treurig,
+het is getroffen door het zweerd der verlatenheid; en niets zal het
+kunnen versterken, dan zij.
+
+--Of een lekkere stoverije, zeide Uilenspiegel.
+
+--Ja, zeide Lamme, waar is het vleesch hier op dit treurig schip? Op
+de bodems des konings hebben zij viermaal vleesch in de week--als er
+geene vasten in valt--en driemaal visch. Wat aangaat de visch, ik mag
+verdoemd zijn als die bloedlooze vezelen iets anders doen dan nutteloos
+mijn arm bloed ontsteken, dat binnenkort in water zal vergaan. De
+Spanjolen hebben bier, kaas, soep en goede dranken. Ja, om hunne
+magen te streelen, hebben zij alles: beschuit, peperkoek, bier, boter,
+gerookt vleesch; ja alles: gedroogde visch, kaas, mosterdzaad, zout,
+boonen, erwten, gort, azijn, olie, vet, hout en kolen. Ons komt men
+verbieden het beestiaal te nemen van wie hoegenaamd, 't zij poorter,
+abt of edelman. Wij eten haring en drinken kort bier. Laas! niets heb
+ik nog: noch liefde der vrouw, noch goeden wijn, noch dobbel bruinbier,
+noch lekkere spijzen. Waar is hier onze vreugde?
+
+--Ik ga het u zeggen, Lamme, antwoordde Uilenspiegel. Oog om oog, tand
+om tand: te Parijs hebben ze, in den Bartholomeusnacht, tienduizend
+vrije herten gedood in de stad alleen; de koning zelf schoot naar zijn
+volk! Ontwaak, Vlaming, grijp naar de bijl, zonder genade! Dáár ligt
+onze vreugde. Tref de vijanden, 't zij Roomschen of Spanjaards, overal
+waar gij ze vindt. Denk thans niet aan uwen buik. De slachtofferen,
+doode en levende, allen ondereen, werden gebracht naar den stroom
+en met gansche karrevrachten in 't water gestort. Hoort gij, Lamme,
+dooden en levenden, allen ondereen? Negen dagen lang was de Seine rood
+van het bloed, en de raven vielen bij zwermen op de stad neder. Te
+La Charité, te Rouaan, Toulouse, Lyon, Bordeaux, Bourges, Meaux was
+de slachting afgrijselijk. Ziet gij die benden volgekropte honden
+liggen omtrent de lijken? Hunne tanden zijn moede. De vlucht van de
+raven is log, zoodanig is heure maag overlast met het vleesch van de
+slachtofferen. Hoort gij, Lamme, de stemme der zielen, die dorsten
+naar wraak? Ontwaak, Vlaming. Gij spreekt van uwe vrouw. Ik geloof
+niet dat ze ontrouw is, maar enkel waanzinnig, en zij bemint u nog
+steeds, arme vriend: zij bevond zich niet te midden dier hofdamen,
+dier wulpsche vampieren, welke, den nacht zelven der slachting, met
+heur fijne handjes de lijken ontblootten. En zij lachten van genot,
+die adellijke hoeren! Verheug u, mijn vriend, niettegenstaande uwe
+visch en uw kort bier. Is de nasmaak van haring wat flauw, flauwer nog
+is de reuk van die laagheid! Zij, die gemoord hebben, gastreeren nu;
+en met hunne handen, waar nog bloed aan kleeft, ziet men ze vette
+ganzen voorsnijden, om de vleugels, de billen en de stuit te bieden
+aan schoone freules van Parijs. Zoo even tastten die jonkvrouwen naar
+ander vleesch, naar koud vleesch!
+
+--Ik zal nimmermeer klagen, zeide Lamme rechtstaande: haring is zalm,
+kort bier is malvezij voor vrije herten! Vive le Geus!
+
+En Uilenspiegel sprak:
+
+
+    Leve de Geus! Niet weenen broeders.
+    In puinen en bloed
+    Bloeit de roos der vrijheid.
+    Is God met ons, wie tegen?
+
+    Zegeviert de hyena,
+    Dra komt de leeuw.
+    Met één klauwslag werpt hij haar, gescheurd, ten gronde.
+    Oog voor oog, tand voor tand. Leve de Geus.
+
+
+En de Geuzen op de schepen zongen:
+
+
+    De hertog bescheert ons het eigenst lot.
+    Oog voor oog, tand voor tand,
+    Wond voor wond. Leve de Geus!
+
+
+
+
+XI.
+
+Het was een stikdonkere nacht; de storm loeide in de zwarte, sombere
+wolken; Uilenspiegel stond met Nele op het dek van het schip en sprak
+tot heur:
+
+--Al onze vuren zijn uitgedoofd. Wij zijn vossen, die des nachts
+azen op Spaansch wild, 't is te zeggen op hunne twee en twintig
+bodemen, rijke schepen waarop lanteernen flikkeren, welke voor hen
+ongelukssterren zijn. En wij, wij zullen ze overvallen.
+
+Nele sprak:
+
+--Deze nacht is een tooveraarsnacht. De hemel is zwart als de monding
+der hel, de bliksemschichten flikkeren als de grimlach van Satan, de
+verre storm bromt met een dof geloei, de meeuwen vliegen met schelle
+kreten voorbij; de zee rolt heure lichtende golven als zilveren
+slangen. Thijl, mijn geliefde, kom mee in de wereld der geesten! Neem
+het tooverpoeder!
+
+--Zal ik de Zeven zien, liefste?
+
+En zij aten het tooverpoeder.
+
+En Nele sloot Uilenspiegel's oogen, en Uilenspiegel sloot Nele's
+oogen. En zij zagen een verschrikkelijk schouwspel.
+
+Hemel, aarde en zee waren vol mannen, vrouwlieden, kinderen, die
+wrochten, dobberden, liepen of droomden. De zee slingerde hen, de
+aarde droeg hen. En zij krielden als palingen in eene ben.
+
+Op tronen in 't midden van den hemel, zaten zeven mannen en
+vrouwen, met een flikkerende ster op het voorhoofd; maar zij waren
+zoo onduidelijk, dat Nele en Uilenspiegel alleen hunne sterren
+onderscheiden konden.
+
+De zee steeg omhoog tot den hemel en rolde in heur schuim de ontelbare
+menigte schepen mede, welker masten en touwen tegen elkander stieten,
+braken, verpletterden naar gelang van de onstuimige bewegingen der
+golven. Toen verscheen een schip te midden van al de anderen. Zijne
+buitenhuid was van vlammend ijzer. Zijne kiel was van staal,
+scherp als een mes. Het water schreeuwde, zuchtte als zij het
+doorkliefde. Grijnzend zat de Dood op de achterplecht van het schip,
+met zijne zeis in eene hand en in de andere een zweep, met dewelke
+hij de zeven personages sloeg. Een derzelven was een treurige,
+magere, trotsche, stilzwijgende vrouw. In eene hand hield zij een
+schepter en, in de andere, een zweerd. Naast haar zat eene vrouw met
+vuurroode wangen schrijlings op eene geit; met heur bloote borsten,
+heur halfgeopend kleed, heur wulpsche oogen, strekte zij zich ontuchtig
+uit naast een oude jodin, die roestige nagelen opraapte, en een dikke,
+opgezwollen vrouw, die nederviel telkens dat zij heur rechthielp,
+terwijl een magere man beiden razend sloeg. Noch de dikke vrouw,
+noch hare roodwangige gezellin sloegen weder. Midden onder hen zat
+een monnik worsten te eten. Eene vrouw, die ten gronde lag, kroop als
+eene slang tusschen de anderen. Zij beet de oude jodin ter oorzake
+van hare nagelen, de opgeblazen vrouw omdat zij te veel genoegen had,
+de roodwangige vrouw ter oorzake van den vochtigen glans heurer oogen,
+den monnik om zijne worsten, en de magere vrouw ter oorzake van haren
+schepter. En allen vochten weldra met elkander.
+
+Toen zij voorbijvoeren, was het gevecht verschrikkelijk op de zee,
+in den hemel en op de aarde. Het regende bloed. De schepen werden
+geslecht met bijlen, met bussen, met kanonnen. De stukken vlogen in
+de lucht, te midden van den rook van het kruit. Op de aarde stieten
+de heiren tegen elkander als muren van staal. Steden, dorpen, oogsten
+brandden onder kreten en tranen; hooge torens, als kantwerk van steen,
+wierpen hunne schaduwen op het midden van 't vuur en vielen neder,
+als gevelde eiken, met een vreeselijk gekraak. Eene menigte zwarte
+ruiters, dicht bijeengedrongen als benden mieren, met het zweerd in
+de hand, de pistool in de vuist, sloegen de mannen, de vrouwlieden
+en kinderen. Eenigen kapten bijten in 't ijs en smeten de grijsaards
+levend onder de schotsen; anderen sneden de borsten der vrouwen af en
+strooiden peper in de gapende wonden; anderen nog hingen de kinderen
+in de schoorsteenen op. Zij, die moede van slaan waren, verkrachtten
+een meideken of eene vrouw, dronken, dobbelden, en roerden stapels
+goudstukken--vrucht van de plundering--met hunne handen, waaraan nog
+bloed kleefde.
+
+De met sterren gekroonde zeven riepen: "Genade voor de arme wereld!"
+
+En de spoken grijnsden. En hunne stemmen geleken op die van duizenden
+nachtuilen, die te gelijk krassen. En de Dood zwaaide met zijne zeis.
+
+--Hoort gij ze? sprak Uilenspiegel; zij zijn de roofvogelen der
+arme menschen. Zij leven van de kleine vogelen, die de goeden en
+eenvoudigen zijn.
+
+En de met sterren gekroonde Zeven riepen: "Liefde, gerechtigheid,
+goedertierenheid!"
+
+En de zeven spoken grijnsden. En hunne stemmen geleken op die van
+duizenden nachtuilen, die te gelijk krassen. En de Dood sloeg hen
+met zijne zweep.
+
+En het schip vaarde op den vloed en sneed alles in twee: booten,
+vaartuigen, mannen, vrouwlieden, kinderen. Op de zee weergalmde het
+gejammer der slachtofferen, die riepen: "Genade!"
+
+En het roode schip ging over hen allen heen, terwijl de grijnzende
+spoken krasten als nachtuilen.
+
+En de Dood dronk dit water, hetwelk rood zag. van bloed.
+
+En toen het schip in de nevelen verdwenen was, hield het gevecht op
+en verzwonden de met sterren gekroonde Zeven.
+
+En Uilenspiegel en Nele zagen anders niets meer dan den pikzwarten
+hemel, de holle, bruisende zee, de donkere wolken, die voortgejaagd
+werden boven het lichtende water en, dichter bij, bleekroode sterren.
+
+Het waren de lanteernen van de twee en twintig bodemen der vloot. De
+zee en de donder lieten een dof gerol hooren.
+
+En Uilenspiegel trok zachtjes aan de wacharmklok en riep:--De
+Spaanjaard! De Spanjaard! Hij stevent op Vlissingen!
+
+En de kreet werd herhaald door geheel de Geuzenvloot.
+
+En Uilenspiegel zeide tot Nele:
+
+--Een grijze tint kleurt de zee en den hemel. De lanteernen flikkeren
+nog slechts zwak; de ochtendschemering breekt aan, de wind wordt
+frisscher, de baren werpen heur schuim over 't dek van de schepen, een
+felle regen valt, doch eindigt weldra, de zon verrijst in volle gloor
+en verguldt de toppen der golven: dat is uw glimlach, Nele, frisch als
+het krieken van den morgen, zacht als de straal van de rijzende zon.
+
+De twee en twintig bodemen varen voorbij; op de schepen der Geuzen
+hoort men trommels en pijpen; Lumey roept: "In name des Prinsen,
+op jacht!" Ewoud Pietersen Worst, schout-bij-nacht, roept: "In name
+van Zijne Hoogheid, den Prins van Oranje en messire den admiraal, op
+jacht!" Op al de schepen: op de Johanna, den Zwaan, de Anne-Mie den
+Geus, het  Eedverbond, den Egmond, den Hoorn, den Willem de Zwijger,
+roepen al de kapiteins: "In name van Zijne Hoogheid, den Prins van
+Oranje en messire den admiraal, op jacht!"
+
+--Op jacht! Vive Le Geus! roepen de soldaten en de matrozen.
+
+De hulk van Treslong, op dewelke Uilenspiegel diende, en den-Briel
+genaamd, van dichtbij gevolgd door de Johanna, den Zwaan en den
+Geus, bemachtigt vier Spaansche bodemen. De Geuzen werpen al wat
+Spaansch is in 't water, nemen de Nederlanders gevangen, ledigen
+de vaartuigen als eierdoppen en laten ze, zonder masten of zeilen,
+dobberen in de reede. Daarna achtervolgen zij de achttien andere
+bodemen. De wind waait geweldig uit het gat van Antwerpen, de muur
+der snelle vaartuigen buigt in het water van den stroom, onder 't
+gewicht van de zeilen, die gezwollen staan als de kaken eens monniks
+bij den wind die waait uit de keuken; de Spaansche bodemen varen snel;
+de Geuzen achtervolgen ze tot in de reede van Middelburg, onder het
+vuur van de forten. Daar ontstaat een bloedig gevecht; de Geuzen,
+met hun enterbijlen in de hand, springen op het dek van de schepen,
+welke weldra vol liggen met afgekapte armen en beenen, die men, na het
+gevecht, bij manden in den vloed werpen moet. De forten schieten naar
+hen; zij lachen er mee, en onder den kreet van: "Vive le Geus", nemen
+zij in de Spaansche bodemen, kruit, kanonnen, kogels en koren. Als
+de vaartuigen geledigd zijn, verbranden zij die; dan varen zij naar
+Vlissingen, en laten ze walmen en uitbranden in de reede.
+
+Van daar zullen zij mannen zenden, die Zeelands en Hollands dijken
+zullen doorsteken, nieuwe schepen zullen helpen maken, en namelijk de
+vliebooten van honderd veertig ton, die tot twintig gegoten ijzeren
+stukken voeren.
+
+
+
+
+XII.
+
+Het sneeuwt op de schepen. Heinde en ver is de lucht wit, en zonder
+ophouden valt de sneeuw immer door in het zwarte water, in hetwelk
+zij smelt.
+
+Het sneeuwt op het land: wit zijn de wegen, ook wit de flauwe schimmen
+der ontbladerde boomen. Geenerlei gerucht is te hooren, tenzij het
+verre gelui van Haarlems klokken, die het uur slaan, en van den
+blijden beiaard, die in de dikke lucht zijn gesmoorde tonen zendt.
+
+Luidt niet, klokken; speel uw zachte, eenvoudige deuntjes niet,
+beiaard: don Frederik nadert, de zoon van den bloedigen hertog. Hij
+komt op u af, gevolgd van vijf en dertig vendels Spanjaarden, uwe
+doodvijanden, Haarlem, o stede van vrijheid; twee en twintig vendels
+Walen, achttien vendels Duitschers, achthonderd peerden, een machtig
+geschut volgen hem. Hoort gij op de wagens het geknars van het doodend
+ijzer? Falkonetten, slangen, donderbussen met wijden mond, dat alles
+is voor u, Haarlem. Luidt niet, klokken; werp uw blijde tonen niet
+meer in de met sneeuw bezwangerde lucht, lustige beiaard.
+
+--Wij, klokken, zullen luiden; ik, beiaard, ik zal zingen en mijn
+stoute tonen werpen in de met sneeuw bezwangerde lucht. Haarlem is de
+stad van de dappere harten, de kloekmoedige vrouwen. Van de hoogte
+heurer torens ziet zij, zonder vrees, de zwarte drommen der beulen,
+als helsche mieren naderen, met golvende bewegingen: Uilenspiegel,
+Lamme en honderd Watergeuzen zijn binnen heure muren. Hunne vloot
+kruist op het meer.
+
+--Laat ze komen! zeggen de inwoners; wij zijn maar poorters, visschers,
+zeelieden en vrouwen. De zoon van den hertog van Alva wil, naar hij
+zegt, om onze stede binnen te komen, geen andere sleutels dan zijne
+donderbus. Dat hij, als hij kan, die zwakke poorten opene: daarachter
+zal hij mannen vinden. Luidt, klokken; werp uw blijde tonen in de
+met sneeuw bezwangerde lucht, beiaard!
+
+... Wij hebben slechts zwakke muren en onze grachten zijn gemaakt naar
+de oude wijs. Veertien donderbussen braken hare zes en veertigponders
+naar de Kruispoort. Stelt mannen daar, waar steenen ontbreken. De
+nacht komt, een ieder werkt, 't is alsof het kanon zich hier nimmer
+hooren liet. Naar de Kruispoort hebben zij zeshonderd tachtig bommen
+geschoten; naar Sint-Janspoort, zeshonderd vijf en zeventig. Die
+sleutels openen niet, want ziet, daarachter verheft zich een nieuw
+bolwerk. Luidt, klokken; werp, beiaard, uw blijde tonen in de
+bezwangerde lucht!
+
+... Het kanon beschiet, beschiet altoos de muren, steenen springen er
+af, muurvlakken storten neer. De bres is breed genoeg om eene compagnie
+in front door te laten. Zij schreeuwen: "Bestorming! doodt! doodt!" Zij
+wagen de beklimming, zij zijn met tienduizend; laat ze komen over
+de grachten met hunne bruggen. Onze kanonnen staan gereed. Daar is
+de kudde, die moet sterven. Groet hen, kanonnen der vrijheid! Zij
+groeten: de kettingkogels, de stormhoepels, de brandende pikkransen
+vliegen en fluiten, boren en kappen in het gros der belegeraars, die
+nederzijgen of in wanorde vluchten. Vijftienhonderd dooden vervullen
+de grachten. Luidt, klokken, en gij, beiaard, werp uw blijde tonen
+in de bezwangerde lucht!
+
+... Komt terug ter bestorming! Zij durven niet. Zij beginnen opnieuw
+te schieten en te mineeren. Wij ook, wij kennen de kunst van de
+mijn. Steekt, steekt de wiek aan onder henzelven; loopt, wij krijgen
+een prachtig vuurwerk te zien. Vierhonderd Spanjolen vliegen in de
+lucht! Dat is de weg niet naar de eeuwige vlammen. O, wat blijde
+dans bij het zilveren geluid onzer klokken, bij de lustige muziek
+van den beiaard!
+
+... Ze weten dus niet, dat de prins waakt over ons, dat ons, alle
+dagen, langs goedbewaakte wegen, sledevrachten koren en buskruit
+geworden; koren voor ons, buskruit voor hen. Waar zijn hunne zeshonderd
+Duitschers, die wij doodden en verdronken in 't Haarlemmermeer? Waar
+zijn de elf vendels, die wij hun namen, de zes donderbussen en de
+vijftig ossen? Wij hadden één ringmuur, nu hebben wij er twee. De
+vrouwen zelven vechten mede, en Kenau Hasselaar voert heure dappere
+zusteren aan. Komt, beulen, komt in onze straten, de kinderen zullen
+u de knieën doorsnijden met hunne mesjes. Luidt, klokken, en gij,
+beiaard, werp uw blijde tonen in de bezwangerde lucht!
+
+... Maar het geluk is met ons niet. De vloot van de Geuzen wordt
+verslagen op het meer. Zij zijn verslagen, de troepen, die de Prins van
+Oranje ons zond. Het vriest, het vriest bitter. Geene hulp meer! Sedert
+vijf maanden, wederstaan wij met duizend man tegen tienmaal zooveel. Nu
+moeten wij met de beulen onderhandelen. Maar zal hij van onderhandeling
+willen hooren, die bloedige hertog, die onzen val heeft gezworen? Laat
+ons een uitval wagen met al onze soldaten: misschien banen zij zich een
+weg door de vijandelijke drommen. Maar de vrouwen staan aan de poorten,
+uit vrees dat men heur alleen de stede late bewaken. Luidt niet meer,
+klokken; werp uw blijde tonen in de lucht niet meer, beiaard.
+
+... Nu zijn wij in de Zomermaand, het hooi riekt lekker, het koren
+rijpt in de zonne, de vogelen zingen: vijf maanden lang hadden wij
+honger; de stede is in rouw; wij zullen allen uit Haarlem trekken, de
+busschutters aan 't hoofd om den weg te banen, de vrouwen, de kinderen
+en de magistraat daarachter, gevolgd door het voetvolk, dat waakt op de
+bres. Een brief, een brief van den zoon van den bloedigen hertog! Is
+'t de dood, dien hij ons meldt? neen, 't is het leven aan allen,
+die zijn in de stede. O, onverbeide genade, o leugen wellicht! Zult
+ge nog zingen, blijde beiaard? Zij komen de stede binnen....
+
+Uilenspiegel, Lamme en Nele hadden den dos van de Duitsche soldaten
+aangetrokken, die met hen, ten getale van zeshonderd, opgesloten
+waren in het Augustijnerklooster.
+
+--Vandaag zullen wij sterven, zei Uilenspiegel stille tot Lamme. En aan
+zijne borst drukte hij het liefelijke lichaam van Nele, die huiverde
+van schrik.
+
+--Laas! mijne vrouw, nimmermeer zal ik ze zien, zeide Lamme.
+
+Maar wellicht redden die kleederen van Duitsche soldaten ons 't leven?
+
+Uilenspiegel schudde het hoofd om te bedieden, dat hij aan geene
+genade geloofde.
+
+--Ik hoor het gerucht van de plundering niet, zeide Lamme.
+
+Uilenspiegel antwoordde:
+
+--Volgens de overeenkomst, hebben de poorters de plundering en
+het leven afgekocht, mits de somme van tweehonderd veertigduizend
+gulden. Binnen twaalf dagen moeten zij honderdduizend gulden in
+klinkende munte betalen, en de rest drie maanden later. Aan de vrouwen
+werd bevolen de wijk te nemen in de kerken. Zij gaan ongetwijfeld de
+slachting beginnen. Hoort gij de galgen en schavotten optimmeren?
+
+--Ha! wij zullen sterven! sprak Nele; ik heb honger.
+
+--Ja, sprak Lamme stille tot Uilenspiegel, de zoon van den bloedigen
+hertog heeft gezeid, dat wij, uitgehongerd zijnde, gedwee naar de
+strafplaats zullen tiegen.
+
+--Ik heb zoo'n honger! sprak Nele.
+
+'s Avonds kwamen soldaten, en zij deelden een brood voor zes man uit.
+
+--Driehonderd soldaten werden gehangen op de Markt, zeiden zij. Weldra
+is 't uwe beurt. Geuzen en galgen hooren immer bijeen.
+
+Den volgenden avond, kwamen zij nog met een brood voor zes man.
+
+--Vier hoogpoorters, zeiden zij, werden onthalsd. Tweehonderd acht
+en veertig soldaten werden twee aan twee gebonden en in de zee
+gesmeten. De krabben zullen vet zijn dees jaar. Gij hebt geen goede
+tronie, gijlie, sedert den 7n van Hooimaand, dat gij hier zijt. Wat
+zijn zij slokkers en dronkaards, die inwoners der Nederlanden! wij,
+Spanjaarden, generen ons met eenige vijgen voor ons avondmaal.
+
+--'t Is zeker daarom, antwoordde Uilenspiegel, dat gij overal bij
+de poorters uw vier eetmalen met vleesch, gevogelte, vla, wijn en
+confituur eischt; en melk om het lichaam van uwe muchachas te wasschen,
+en wijn om de pooten uwer peerden te baden?
+
+Den 18n van Hooimaand zeide Nele:
+
+--Mijne voeten zijn nat; wat is dit?
+
+--'t Is bloed, zeide Uilenspiegel.
+
+'s Avonds kwamen de soldaten opnieuw met hun brood voor zes man.
+
+--Daar waar de koorde niet volstaat, doet het zweerd het werk, zeiden
+zij. Drijhonderd soldaten en zeven en twintig poorters, die de stede
+meenden te ontvluchten, wandelen nu in de helle, met hun hoofd onder
+hunnen arm.
+
+'s Anderen daags stroomde het bloed opnieuw in het klooster; de
+soldaten kwamen geen brood brengen, maar alleenlijk naar de gevangenen
+kijken en zeggen:
+
+--De vijfhonderd Walen, Engelschen en Schotten, die gisteren onthalsd
+werden, hadden een betere tronie. Dezen hebben honger, gewis; doch
+wie dan zou sterven van honger, ten ware de Geus?
+
+En, inderdaad, allen bleek, mager ontdaan en bibberend van koorts,
+stonden zij daar lijk spoken.
+
+Den 16n van Oogstmaand, om vijf uren's avonds, kwamen de soldaten
+lachend binnen en zij gaven hun brood, kaas en bier. Lamme sprak:
+
+--Dit is ons doodmaal.
+
+Te tien uren kwamen vier vendrigs; de hoplieden deden de poorten van
+vier kloosters openen en bevalen den gevangenen gevieren achter de
+pijpen en trommels te gaan, tot aan de plaats, waar men hen zou doen
+stilstaan. Sommige straten waren rood van 't bloed; en zij stapten naar
+'t Galgeveld.
+
+Hier en daar waren de weiden bemorst met plassen bloed; overal was er
+bloed op de muren gespat. De raven kwamen bij zwermen van alle kanten;
+de zonne verborg zich in een bed van dampen, de hemel was nog helder,
+en in het diepste deszelven ontwaakten schuchter de sterren. Eensklaps
+hoorden zij een hertverscheurend gehuil.
+
+De soldaten zeiden:
+
+--Die daar schreeuwen, zijn de Geuzen van het fort Fuike, buiten de
+stad; men laat ze sterven van honger.
+
+--Wij ook, zeide Nele, wij gaan sterven.
+
+En zij weende.
+
+--De assche klopt op mijn hert, zeide Uilenspiegel.
+
+--Ha! zeide Lamme in 't Vlaamsch,--de soldaten van het geleide
+verstonden die mannelijke taal niet,--ha! zeide Lamme, had ik dien
+bloedigen hertog onder handen en kon ik hem, tot zijne kroenge er van
+berst, alle die koorden, galgen, pijnbanken, foltertuigen, gewichten
+en Spaansche leerzen doen eten; kon ik hem doen drinken al het bloed,
+dat door hem werd vergoten; kon ik, na duizenden folteringen, hem het
+hert uit de borst rukken en hem dit rot en giftig ingewand rauw doen
+eten! Dan zou hij voorzeker, van het leven naar den dood tiegend,
+in de solferkolk vallen, alwaar de duivel het hem zonder ophouden
+gelieve te doen eten en nog te doen eten. En aldus tot in de eeuwigheid
+der eeuwigheden!
+
+--Amen! zeiden Uilenspiegel en Nele.
+
+--Maar ziet gij niets? vroeg zij.
+
+--Neen, sprak Uilenspiegel.
+
+--In 't Westen zie ik, zeide zij, zeven mannen en vrouwen in eenen
+kring gezeten. Een der mannen is gekleed in het purper en draagt
+een gouden kroon op het hoofd. Hij schijnt de hoofdman der anderen,
+die allen in lompen en vodden gehuld zijn. In het Oosten zie ik een
+andere groep van zeven komen: insgelijks aangevoerd door iemand, ook
+gekleed in het purper, doch zonder kroon op het hoofd. En zij gaan
+op tegen die van het Westen. En zij vechten tegen hen in de wolken;
+maar nu zie ik niets meer.
+
+--De Zeven, zei Uilenspiegel.
+
+--Ik hoor, zeide Nele, omtrent ons in het loover, eene stem, zacht
+als een ademtocht, neuren:
+
+
+    Door den krijg en het vuur
+    Door de lansen en zwaarden,
+        Zoek;
+    In den dood en het bloed
+    In de puinen en tranen,
+        Vind.
+
+
+--Anderen dan wij zullen de verlossers van Vlaanderen wezen, antwoordde
+Uilenspiegel. De nacht is zwart, en 'k zie de Spaansche huurlingen
+fakkels aansteken. Wij zijn omtrent het Galgeveld. O, mijn zoete
+vriendinne, waarom zijt gij niet ginder gebleven? Hoort gij niets
+meer, Nele?
+
+--'t Doet, zeide zij, een wapengekletter in het koren. En ziet gij,
+op de gindsche heuvelen, aan het einde van den wegel, dien wij begaan,
+den rooden gloed niet van fakkels, die flikkeren op het staal van
+de wapenen? Ik zie de lichtjes van de wieken der bussen. Slapen
+onze wachters of zijn zij met blindheid geslagen? Hoort gij dien
+donderslag? Ziet gij de Spanjolen vallen onder de kogels? Hoort
+gij: "Vive le Geus!" Met de piek vooruit, stormen zij den
+wegel op. Langsheen de heuvelen dalen zij beneden met zwaaiende
+bijlen.... Vive le Geus!
+
+--Vive le Geus! riepen Lamme en Uilenspiegel.
+
+--Daar, zei Nele, daar zijn soldaten, die ons wapenen langen. Neem aan,
+Lamme, neem aan, mijn beminde. Vive le Geus!
+
+--Vive le Geus! riepen al de gevangenen.
+
+--De bussen houden niet op met schieten, zeide Nele, de Spanjolen
+vallen als vliegen, verlicht als ze zijn door den gloed van de
+toortsen. Vive le Geus!
+
+--Vive le Geus! riepen de wakkere redders.
+
+--Vive le Geus! riepen Uilenspiegel en de gevangenen. De Spanjolen
+zijn omsloten in eenen kring van vuur. Slaat dood! Slaat dood! Geen
+enkele ontsnappe! Slaat dood! geene genade, geen kwartier! En nu
+trekken wij, met pak en zak, naar Enkhuizen. Wie heeft de zijden en
+lakensche kleederen van onze beulen? Wie heeft hunne wapenen?
+
+--Allen! Wij allen! riepen zij. Vive le Geus!
+
+En, inderdaad, zij trokken naar Enkhuizen, alwaar zij de met hen
+verloste Duitschers deden blijven, om de stede te bewaken.
+
+En Lamme en Nele en Uilenspiegel keerden naar hunne schepen terug. En
+weer zongen zij op de vrije zee: Vive le Geus!
+
+En zij kruisten in de reede van Vlissingen.
+
+
+
+
+XIII.
+
+Daar was Lamme weder vroolijk gestemd. Hij kwam geerne aan land,
+en joeg toen ossen, schapen en ganzen op, lijk anderen jacht maken
+op hazen, herten en ortolanen.
+
+En hij was niet alleen voor die voedzame jacht. Het deed deugd de
+jagers te zien terugkomen met Lamme aan hunne spits: het hoornvee
+trokken zij voort, terwijl zij het gewold en gevederd vee vóór zich
+dreven en op de punt hunner gaffels kiekens, kapoenen en kalkoenen
+droegen, niettegenstaande het verbod van den Prins.
+
+En toen gastreerde men blijde op de schepen. En Lamme sprak:
+
+--De geur der sausen stijgt tot in den hemel, alwaar hij de santen
+verblijdt, die geerne ons maal kwamen deelen.
+
+Terwijl zij in de reede kruisten, kwam eene koopvaardijvloot van
+Lissabon, welker gezagvoerder niet wist, dat Vlissingen in de macht
+der Geuzen gevallen was. Men beveelt hem het anker te werpen, de vloot
+wordt omsingeld. Vive le Geus! Pijpen en trommen bevelen de entering;
+de kooplieden hebben kanonnen en pieken, bijlen en bussen.
+
+Bommen en kogelen regenen op de schepen der Geuzen. Hunne busschutters,
+verborgen in de schans rondom den grooten mast, vellen, zonder gevaar
+voor zich zelven, bij elk schot eenen man neer. De kooplieden vallen
+als vliegen.
+
+--Helpt mij, vrienden! zeide Uilenspiegel tot Lamme en Nele. Daar
+zijn specerijen, juweelen, kostbaarheden, suiker, muskaatnoten,
+kruidnagelen, gember, realen, dukaten, schoone, blinkende gouden
+lammeren. Daar zijn meer dan vijfhonderd duizend geldstukken. De
+Spanjool betaalt de kosten des oorlogs. Laat ons drinken! Zingen wij
+de misse der Geuzen, dat is het gevecht!
+
+En Uilenspiegel en Lamme liepen overal rond lijk leeuwen. Buiten het
+bereik van de kogels, speelde Nele op de pijp, in de schans. Heel de
+vloot werd genomen.
+
+Als de dooden geteld werden, vond men er duizend langs de zijde der
+Spanjaards, driehonderd langs den kant van de Geuzen; onder hen bevond
+zich de kok van de vlieboot den Briel.
+
+Uilenspiegel vroeg om voor Treslong en de matrozen te spreken, hetwelk
+Treslong hem geerne toestond. En hij hield hun de volgende rede:
+
+--Messire kapitein en gij, maats, wij hebben daar vele specerijen
+geërfd, en Lamme, onze dikzak, hier tegenwoordig, vond steeds dat
+de arme doode, die dáár ligt,--God hebbe zijne ziel,--niet ervaren
+genoeg was in de konsten van zieden en braden. Zoo gij hem als
+kok wildet aanstellen, zou hij u hemelsche stoverije en goddelijke
+soezels bereiden.
+
+--Wij willen, zeiden Treslong en de anderen; Lamme zal de kok van het
+schip zijn. Hij zal den grooten pollepel voeren, om de scheepsjongens
+van zijne sausen te jagen.
+
+--Messire kapitein, gezellen en vrienden, sprak Lamme, ik ween van
+geluk, want die groote onderscheiding verdien ik niet. Doch, vermits
+gij u tot mijne onweerdigheid wilt richten, neem ik de edele bediening
+aan van meester in de konsten van zieden en braden op de wakkere
+vlieboot den Briel; doch ik bid u ootmoediglijk mij wel te willen
+belasten met het opperbevelhebberschap over de keuken, zoodanig dat
+uw kok--dat ben ik,--bij recht, wet ende macht, een iegelijk kunne
+beletten eens andermans portie te komen eten.
+
+Treslong en de anderen riepen:
+
+--Leve Lamme! gij hebt recht, wet ende macht!
+
+--Doch, zeide hij, nog een nederige bede moet ik u doen: ik ben vet,
+groot en struisch, diep is mijn buik, diep mijne maag; mijn arme
+vrouw--God geve ze mij weder--placht mij altijd twee portiën te geven,
+in stede van eene: verleent mij dezelfde gunste.
+
+Treslong, Uilenspiegel en de matrozen zeiden:
+
+--Gij krijgt dobbel rantsoen, Lamme.
+
+En Lamme, die plotseling weemoedig werd, zeide:
+
+--Mijne vrouw, mijn liefste vriendin! als iets vermag mij over onze
+scheiding te troosten, zal het, bij het uitoefenen mijner bediening,
+het aandenken wezen aan uw goddelijke keuken in onze halle vol liefde.
+
+--Gij moet den eed afleggen, mijn zoon, zei Uilenspiegel. Men brenge
+den grooten pollepel en den grooten koperen ketel, op dewelken Lamme
+moet zweren.
+
+--Bij God, sprak Lamme, dewelke mij helpe, zweer ik getrouwheid aan
+Zijn Hoogheid den Prins van Oranje, gezeid den Zwijger, dewelke in naam
+des konings de provinciën Holland en Zeeland bestiert, getrouwheid aan
+messire Lumey, admiraal-bevelhebber onzer edele vloot, en aan messire
+Treslong, schout-bij-nacht en kapitein van het schip den Briel;
+ik zweer, volgens de costumen en gebruiken der groote koks uit de
+oudheid en naarvolgens de schoone boeken met platen, die zij over
+de edele kookkunst nagelaten hebben, zoo goed als mij mogelijk is,
+de vleezen, kiekens, ganzen, mitsgaders kalkoenen te bereiden, die
+Fortuna ons zal zenden; ik zweer te zullen voeden: den gezegden messire
+kapitein Treslong, zijn stuurman, wezende mijn vriend Uilenspiegel,
+en u allen, bootsman, loods, schieman, maats, soldaten, kanonniers,
+keldermeester, scheepsmaker, lijfjonker van den kapitein, chirurgijn,
+hoornblazer, matrozen en wie ook genaamd. Is het gebraad te rauw,
+heeft het gevogelte geen smakelijk uitzicht; verspreidt de soep een
+flauwen geur, wat de voorbode is eener slechte spijsvertering; zet
+de geur van de sausen u niet aan in de keuken te dringen, behoudens
+mijn oorlof nochtans; maak ik u niet allen blijmoedig en wel te pas,
+dan zal ik mijn edel ambt nederleggen, mij onbekwaam oordeelende
+langer in de keuken te tronen. Zoo helpe mij God en zijne santen in
+deze wereld en ook in de andere!
+
+--Leve onze kok, riepen zij, de koning der keuken, de keizer der
+stoverije. 's Zondags krijgt hij drij portiën in stede van twee!
+
+En Lamme werd kok op den Briel. En terwijl zijn lekkere soep op het
+vuur stond, ging hij fier, met den pollepel op den schouder, eene
+handwijl aan de keukendeur staan.
+
+En 's Zondags kreeg hij zijne drij portiën.
+
+Als de Geuzen met den vijand handgemeen werden, bleef hij geerne
+in zijne braderij; doch van tijd tot tijd klom hij naar boven, om
+eenige malen zijne bus af te vuren, na hetwelk hij schielijk weer
+naar beneden ging, om op zijne gerechten te passen.
+
+Als een trouw kok en een dapper soldaat, werd hij hertelijk bemind
+door een iegelijk.
+
+Maar niemand mocht in zijne keuken komen. Want dan werd hij uiterst
+grammoedig, en sloeg hij met zijnen pollepel gelijk de duivel op
+Geeraard.
+
+En wederom werd hij geheeten: Lamme de Leeuw.
+
+
+
+
+XIV.
+
+Bij zonneschijn, bij regen, bij sneeuw, bij hagel, 's winters en
+'s zomers, dobberen de schepen der Geuzen op het ruime sop.
+
+Alle zeilen bijgezet, gelijk zwanen, blanke zwanen der vrijheid.
+
+Wit voor de vrijheid, blauw voor de grootheid, oranje voor den Prins,
+is de standaard der fiere bodems.
+
+Alle zeilen bijgezet! alle zeilen bijgezet, varen de wakkere schepen;
+de golven klotsen er tegen, de baren besproeien ze met schuim.
+
+Zij varen, zij wiegen, zij vliegen op den stroom, de fiere schepen
+der Geuzen, met de zeilen in 't water, snel als de wolken gejaagd
+door den Noordenwind. Hoort gij hoe hun voorsteven klieft door de
+baren? God der vrije mannen, vive le Geus!
+
+Huiken, vliebooten, boeiers, poonen, vlug als de wind, die het orkaan
+met zich voert: als de wolk, die den bliksem met zich draagt. Vive
+le Geus!
+
+Boeiers en poonen, platboomde vaartuigen glijden op den vloed. De
+golven zuchten onder hunne kiel, als zij recht vóór zich stevenen, met
+den moorddadigen muil hunner slang open op de voorplecht. Vive le Geus!
+
+Alle zeilen bijgezet! alle zeilen bijgezet, varen de wakkere schepen;
+de golven klotsen er tegen, de baren besproeien ze met schuim.
+
+Bij dag en bij nacht, bij regen, bij hagel en sneeuw, varen zij
+op de wateren. Christus lacht hen toe in de wolk, in de zon, in de
+sterre. Vive le Geus!
+
+
+
+
+XV.
+
+De bloedige koning kreeg tijding van hunne zegepralen. De dood beloerde
+dien beul, wiens lichaam opgevreten werd door de wormen. Door de gangen
+van 't kasteel van Valladolid sleepte hij, ziekelijk en terugstootend,
+zijn gezwollen voeten en zijn loodzware beenen. Nimmer neurde hij een
+liedeken, de wreedaardige beul; als de Oosterkim kleurde, lachte hij
+niet, en als de zonne zijn rijk verlichtte als met een glimlach des
+Heeren, voelde hij geen de minste vreugd in zijn hert.
+
+Maar Uilenspiegel, Lamme en Nele zongen als lijsters, waagden bestendig
+hun leven; God schiep den dag en zij gingen er door, en zij vonden
+meer genoegen in het uitdooven van eenen brandstapel, dan de zwarte
+koning vreugde smaakte in het verbranden van gansch eene stad.
+
+In dien tijd ook was Willem de Zwijger, Prins van Oranje, gedwongen
+messire Lumey, graaf van der Marck, zijnen graad van admiraal te
+ontnemen, uit oorzake van de ijselijke wreedheden, die hij bedreef. Hij
+benoemde messire Bouwen Ewoutsen Worst in zijne plaats. Hij zag mede
+naar middelen uit om den boeren het koren te betalen, dat de Geuzen
+hadden genomen; om de gedwongen schattingen terug te geven, die
+door dezen gelicht waren; om den Roomschen, gelijk een iegelijk, de
+vrije beoefening van hunnen godsdienst te schenken, zonder vervolging
+of nadeel.
+
+
+
+
+XVI.
+
+Op de schepen der Geuzen, onder den helderen hemel, op de schuimende
+golven, weerklinken pijpen en doedelzakken, klokken de flesschen,
+rinkelen de klinkaards, flikkeren de bussen der geweren.
+
+--Nu, sprak Uilenspiegel, slaat op de trom van de zege, slaat de
+trom van de vreugde! Vive le Geus! Spanje is verslagen, de vampier
+is getemd. Aan ons de zee, Brielle is genomen! Aan ons heel de kust
+van Nieuwpoort tot Helder, met Oostende, Blankenberge, de Zeeuwsche
+eilanden, de monden der Schelde, de monden der Maas, de monden van
+den Rijn! Aan ons Texel, Vlieland, Terschelling, Ameland, Rottum en
+Borkum.... Vive le Geus!
+
+... Aan ons Delft, Dordrecht! 't Is een loopend vuur. God houdt de
+vuurlont. De beulen verlaten Rotterdam. Het vrije geweten, lijk een
+leeuw met klauwen en tanden van gerechtigheid, neemt het graafschap
+Zutfen, de steden Deutekom, Doesburg, Goor, Oldenzaal en, in de Veluwe,
+Hattem, Elburg en Harderwijk.... Vive le Geus!
+
+... 't Is klaar, 't is als de bliksem: Kampen, Zwolle, Hasselt,
+Steenwijk vallen in onze handen met Oudewater, Gouda en Leiden.... Vive
+le Geus!
+
+... Aan ons Buren, Enkhuizen! Ja, Amsterdam, Schoonhoven, Middelburg
+zijn nog in onze macht niet. Doch alles komt op tijd voor geduldige
+klingen.... Vive le Geus!
+
+... Laat ons Spaanschen wijn drinken! Laat ons drinken uit de
+kelken, uit dewelke zij het bloed van de slachtoffers dronken: Wij
+gaan langs de Zuiderzee, langs stroomen, rivieren en vaarten; wij
+hebben Noord-Holland, Zuid-Holland en Zeeland; wij zullen ook Oost-
+en West-Friesland nemen; Brielle zal de wijkplaaats wezen voor onze
+vloot, de bakermat der vrijheid.... Vive le Geus!
+
+... Hoor, Vlaanderen, geliefde vadergrond, hoor den kreet van wrake
+weerklinken! Men slijpt de wapenen, men zet de zweerden aan op den
+steen. Allen bewegen zich, trillen als de snaren eener harp bij den
+warmen ademtocht, adem van de zielen, die stijgt uit de putten, uit
+de brandstapels, uit de bloedige lijken der slachtofferen. Allen:
+Henegouwen, Brabant, Luxemburg, Limburg, Namen, Luik, de vrije,
+vurige stede, allen! Het bloed kiemt en rijst. De oogst is rijp voor
+de zeis.... Vive le Geus!
+
+... Aan ons de Noordzee, de wijde zee van het Noorden! Aan ons de
+goede kanonnen, de slanke schepen, het stoutmoedige heir van de
+dappere zeelieden: edelen, poorters en arbeiders, die de vervolging
+ontvluchten. Aan ons, allen, die vereenigd opstaan voor het werk van
+de vrijheid.... Vive le Geus!
+
+... Waar zijt gij, Philippus, bloedige koning? Gedekt met den heiligen
+hoed,--geschenk van den paus,--vloekt en tiert gij. Slaat op de trom
+van vreugde!... Vive le Geus! Laat ons drinken!
+
+... De wijn stroomt in de gouden kelken. Drinkt blijde een
+heildronk. De priesterkleeren, dewelke die ruwe mannen bedekken,
+zijn nat van het roode druivensap; de Roomsche banieren wapperen in
+den wind. Eeuwige muziek! komaan, pijpen, doedelzakken, trommels,
+zingt nu de lofzang der zege.... Vive le Geus!
+
+
+
+
+XVII.
+
+Toen was men in de Wintermaand, dat is de maand van de wolven. Een
+scherpe regen viel als naalden in den vloed neder. De Geuzen kruisten
+in de Zuiderzee. Bij trompetgeschal ontbood messire de admiraal op
+zijn schip de gezagvoerders der hulken en vliebooten, en samen met
+hen ook Uilenspiegel.
+
+--Nu, zei de admiraal, eerst tot dezen sprekend, de Prins wil uw
+goede en trouwe diensten erkennen en benoemt u tot gezagvoerder op
+het vaartuig den Briel. Hier hebt gij uwe aanstelling op perkament.
+
+--God zegene U, heer admiraal, antwoordde Uilenspiegel; ik zal zoo
+goed gezag voeren als mij mogelijk is, en aldus gezag voerende, hoop
+ik wel, met Gods hulp, Spanje het gezagvoerderschap te ontnemen over
+Vlaanderen en Holland: ik wil zeggen over Zuid- en Noord-Nederland.
+
+--Goed zoo, zei de admiraal. En nu, voegde hij er bij, tot al de
+aanwezigen sprekend: moet ik u zeggen, dat die van het katholieke
+Amsterdam van zins zijn Enkhuizen te belegeren. Zij zijn nog het IJ
+niet uitgevaren: wij zullen kruisen vóór deze vaart, zoodat wij ze
+sluiten, en elken bodem overvallen, die zijnen romp in de Zuiderzee
+durft vertoonen.
+
+Zij antwoordden:
+
+--Wij zullen ze in den grond boren!... Vive le Geus!
+
+Toen Uilenspiegel weder op zijn schip was gestegen, deed hij zijne
+matrozen en soldaten vergaderen op het dek en deed hun kond van de
+woorden des admiraals.
+
+Zij antwoordden:
+
+--Wij hebben vleugelen, dat zijn onze zeilen; schaatsen, dat zijn de
+kielen onzer schepen; reuzenhanden, dat zijn onze enterhaken. Vive
+le Geus!
+
+De vloot vertrok en kruiste vóór Amsterdam, op eene mijl van het
+strand, zoodanig dat geen schip kon binnen- of buitenvaren, als zij
+het niet wilde.
+
+Den vijfden dag hield het op met regenen; de wind woei scherper in
+den helderen hemel; die van Amsterdam verroerden zich niet.
+
+Eensklaps zag Uilenspiegel zijn vriend den kok op het dek stormen
+en den scheepsjongen--een jongen snaak, ervaren in de Fransche en
+in de Vlaamsche taal, maar nog meer in het smullen--achternazetten,
+met zijn grooten houten pollepel in de hand.
+
+--Nietdeug, zeide Lamme, duchtig met zijnen stoklepel slaande,
+dacht gij dan, zonder eenige straf, voorbarig mijne stoverije op te
+peuzelen? Klim hoog in den mast en zie of er nog geene beweging komt
+op de schepen van Amsterdam; wilt ge wèldoen?
+
+Maar de jongen antwoordde:
+
+--Wat zult ge mij geven?
+
+--Meent gij, dat ik u zal betalen vóór dat gij gewerkt
+hebt? Dievengebroed, als gij niet omhoog klimt, laat ik u geeselen. En
+uw Fransch zal u niet redden.
+
+--'t Is een schoone tale, zeide de knaap, tale van minne en van oorlog.
+
+En hij klom in den mast.
+
+--Wel luiaard? vroeg Lamme.
+
+De scheepsjongen antwoordde:
+
+--Ik zie niets in de stad noch op de schepen.
+
+En beneden gekomen, sprak hij:
+
+--Betaal mij nu.
+
+--Houd het gestolene voor uwe moeite, antwoordde Lamme; maar het zal
+niet gedijen: voorzeker spuwt gij het uit.
+
+De jongen, die weder in den mast was geklommen, riep eensklaps:
+
+--Lamme! Lamme! daar sluipt een dief in uwe keuken!
+
+--Daar is geen nood van, antwoordde Lamme, de sleutel steekt in
+mijne tassche.
+
+Toen nam Uilenspiegel zijnen vriend ter zijde en sprak:
+
+--Lamme, die groote kalmte van Amsterdam verontrust mij. Zij voeren
+iets in hun schild.
+
+--Ik dacht er aan, zeide Lamme. Het water vervriest in de kruiken in de
+schapraai; de kiekens zijn hard als hout; de worsten gansch berijmd;
+de boter is als steen, de olie geklonterd, het zout droog als zand
+in de zonne.
+
+--Vorst is op handen, zeide Uilenspiegel. Zij zullen, in grooten
+getale, ons komen beschieten met donderbussen.
+
+Hij begaf zich naar het admiraalschip en zei daar wat hij vreesde;
+de vlootvoogd antwoordde:
+
+--De wind blaast uit Engeland: we krijgen sneeuw, maar geen vorst:
+keer terug naar uw schip.
+
+En Uilenspiegel ging henen.
+
+'s Nachts woedde een hevige sneeuwstorm; maar weldra blies de wind
+uit Noorwegen, de zee vroor toe, zij was effen als een vloer. De
+admiraal zag dit schouwspel.
+
+In de vrees, dat die van Amsterdam de schepen in brand zouden steken,
+beval hij den soldaten hunne schaatsen in gereedheid te houden,
+voor het geval dat zij buiten en rondom de schepen moesten vechten,
+en den kanonniers de kogels bij hoopen naast de affuiten te leggen,
+de stukken te laden en de lonten gedurig in brand te houden.
+
+Maar die van Amsterdam kwamen niet.
+
+En aldus zeven dagen lang.
+
+Tegen den avond van den zevenden dag beval Uilenspiegel, dat een goed
+festijn gegeven werd aan de matrozen en soldaten, om hen te wapenen
+tegen den scherpen wind, die woei uit het Noorden.
+
+Maar Lamme zeide:
+
+--Er blijft ons niets meer over dan beschuit en kort bier.
+
+--Vive le Geus! zeiden zij. Dit zal ons een vastenfestijn zijn,
+in afwachting van het uur van 't gevecht.
+
+--Dat nog zoo gauw niet zal slaan, zeide Lamme. Die van Amsterdam
+zullen komen om onze schepen te verbranden, maar dezen nacht nog
+niet. Eerst zullen ze te hoop moeten komen rondom het vuur, en daar
+menigen beker warmen wijn ledigen,--God verleene er u,--vervolgens,
+als zij tot middernacht zullen beraadslaagd hebben met kalmte,
+verstand en geduld, zullen zij beslissen morgen te besluiten of zij,
+al dan niet, ons de toekomende week zouden aanvallen. Morgen zullen
+zij, opnieuw onder het drinken van warmen wijn,--God verleene er
+u,--opnieuw met kalmte, geduld en volle kannen beslissen dat zij een
+anderen dag zullen vergaderen, ten einde uit te maken of het ijs, al
+dan niet, een groote menigte kan dragen. En zij zullen het ijs doen
+onderzoeken door deskundigen, dewelke hunne besluiten op perkament
+zullen neerschrijven. Als zij die ontvangen en gelezen hebben, zullen
+zij daarover verslag maken, waaruit zal blijken, dat het ijs een halve
+el dik is, dat het sterk genoeg is om eenige honderden soldaten met
+donderbussen en veldgeschut te dragen. Vervolgens opnieuw bijeenkomend,
+om met kalmte en geduld, onder het drinken van menigen beker warmen
+wijn te beraadslagen, zullen zij berekenen of het, om den wille van
+den schat van Lissabon, dien wij hebben gekaapt, raadzaam is onze
+schepen te bestormen of wel te verbranden. En, aldus besluiteloos,
+maar dralend, zullen zij nochtans beslissen dat zij onze schepen
+moeten nemen, en geenszins verbranden, niettegenstaande al het leed
+en de schade, die zij ons daarmee zouden doen.
+
+--Gij spreekt goed, antwoordde Uilenspiegel; maar ziet eens die
+vuren aansteken in de stad en al die lieden haastig rondloopen met
+lanteernen in de hand?
+
+--'t Is van groote koude, zei Lamme.
+
+En, zuchtend, voegde hij er bij:
+
+--Alles is opgegeten. Geen ossevleesch, geen pekelvleesch, geen
+gevogelte meer; geen wijn meer, laas! noch goed dobbel bier; niets
+dan beschuit en kort bier. Wie komt er mee?
+
+--Waar gaat gij? vroeg Uilenspiegel. Niemand mag het schip verlaten.
+
+--Mijn vriend, zeide Lamme, thans zijt gij kapitein en
+gezagvoerder. Zonder uwe toestemming zal ik het schip niet
+verlaten. Doch gelief te bedenken, dat onze laatste worst er
+eergisteren aan was; dat, in dezen harden tijd, keukenvuur de vreugd
+van de goede maats is. Wie onzer is niet bereid den geur van goede saus
+op te snuiven, of een lekker glaasje te drinken, hetwelk vroolijkheid
+en goeden wil voor een ieder baart? Nu, kapitein en trouwe vriend,
+ik durf het u zeggen: ik vreet mij het hert op, ik eet niet; ik, die
+voor de rust ben, die niet geerne moord, tenzij een malsche gansch,
+een vet kieken, een smakelijken kalkoen; ik volg u in de vermoeienissen
+des oorlogs. Zie gindsche lichten, 't zijn die eener rijke hoeve,
+goed voorzien van groot en klein vee. Weet gij wie daar woont? 't Is
+die schipper van Friesland, die messire Dandelot verried en achttien
+arme heeren en vrienden naar het nog Spaanschgezinde Enkhuizen
+bracht, dewelke door zijn toedoen op de Peerdenmarkt--dat is de
+Kleine Zavel--te Brussel, onthalsd werden. Die verrader, die Slosse
+heet, ontving van den hertog twee duizend florijnen als prijs zijns
+verraads. Met het geld van het bloed kocht hij, als een ware Judas,
+de hoeve, die gij daar ziet, en zijn groot vee, en de velden in 't
+ronde, dewelke gedijen en bloeien; ik zeg, dat hij schatrijk wordt
+met zijnen grond en zijn vee.
+
+Uilenspiegel antwoordde:
+
+--De assche klopt op mijn hert. Het uur van God is geslagen.
+
+--En ook het uur van het eten, zeide Lamme. Geef mij twintig wakkere
+gasten, soldaten en matrozen, en ik breng u den verrader.
+
+--Ik zelf wil hen aanvoeren, zeide Uilenspiegel. Wie voor de
+rechtveerdigheid is, volge mij. Doch allen niet, mijne vrienden;
+er zijn er maar twintig van doen; wie anders zou op het schip
+letten? Laat de dobbelsteenen beslissen. Goed, nu zijt gij twintig,
+komt mee. Riemt uwe schaatsen om en legt aan op Venus, de heldere
+sterre, die flikkert boven de hoeve van den verrader.
+
+... Komt dus, vrienden; rijdend en glijdend, met de akst op den
+schouder, worden wij geleid door het glimmend licht van de heldere
+maan.
+
+... De wind fluit en jaagt witte sneeuwvlagen vóór zich op het
+ijs. Komt, dappere mannen!
+
+... Gij zingt noch gij spreekt; gij gaat, stilzwijgend, recht voor
+u uit op de sterre; uwe schaatsen krassen op 't ijs.
+
+... Wie valt, sta aanstonds weer op. Wij naderen den oever: geen
+enkele menschelijke gedaante op de witte sneeuw, geen enkele vogel
+vertoont zich in de ijskoude lucht. Doet uwe schaatsen af.
+
+... Hier zijn wij op 't land, hier zijn wij in de weide, riemt uwe
+schaatsen weer om. Wij zijn rondom de hoeve, houdt uwen adem in.
+
+Uilenspiegel klopt op de deur, de honden bassen. Hij klopt nogmaals;
+een venster wordt geopend en de boer, die het hoofd buitensteekt,
+vraagt:
+
+--Wie zijt gij?
+
+Hij ziet niemand dan Uilenspiegel: de anderen zijn verborgen achter
+de keet.
+
+Uilenspiegel antwoordde:
+
+--Messire Bossu gelast u oogenblikkelijk bij hem, naar Amsterdam,
+te komen.
+
+--Waar is uwe vrijgeleide? vroeg de baas, toen hij beneden was en de
+deur had geopend.
+
+--Hier, antwoordde Uilenspiegel, hem de twintig Geuzen toonend,
+die achter hem het huis binnenstormden.
+
+Toen sprak Uilenspiegel tot hem:
+
+--Gij zijt schipper Slosse, de verrader, die Dandelot, Battenburg
+en andere heeren in eene hinderlaag loktet. Waar is de prijs van
+het bloed?
+
+Over al zijn ledematen bevend, antwoordde de hoevenaar:
+
+--Gij zijt de Geuzen, schenkt mij vergiffenis; ik wist niet wat
+ik deed. Ik heb hier geen geld in mijn huis; alles wat ik heb, zal
+ik geven.
+
+Lamme sprak:
+
+--Het is donker, geef ons keersen.
+
+De baas antwoordde:
+
+--Dáár hangen vetkeersen.
+
+Toen eene keers aangestoken was, zeide, in den heerd, een van de
+Geuzen:
+
+--Het is koud, laat ons vuur maken. Hier zijn schoone, dikke mutsaards.
+
+En hij wees naar eene plank, op dewelke bloempotten stonden, waarvan
+al de planten verdroogd waren. Hij nam er eene bij den kop en schudde
+ze; de pot viel ten gronde, gevolgd door dukaten, realen, florijnen.
+
+Daar is de schat, zeide hij, naar de andere bloempotten wijzend.
+
+En, inderdaad, toen zij geledigd waren, vonden zij er tien duizend
+florijnen.
+
+Als de boer dat zag, begon hij te weenen en te huilen.
+
+Op dat geroep kwamen de knechts en meiden der hoeve toegeloopen in
+hun hemde. Daar de mannen hunnen meester wilden verdedigen, werden
+zij gevat en gebonden. Maar de dienstmaagden waren beschaamd, en
+vooral de jonge, en zij verborgen zich achter de mannen.
+
+Lamme kwam toen vooruit, en hij sprak:
+
+--Verrader, waar zijn de sleutels van den kelder, den stal en de
+schaapskooi?
+
+--Schaamtelooze diepers, zeide de baas, gij zult gehangen worden
+totdat de dood er op volge!
+
+Uilenspiegel antwoordde.
+
+--Het is het uur van God, geef de sleutels!
+
+Toen de Geuzen de hoeve geledigd hadden, reden zij op hunne schaatsen
+terug naar de schepen, lichte hallen van vrijheid.
+
+--Ik ben de kok, zeide Lamme hen leidend; ik ben de kok. Stoot de
+wakkere sleden vooruit, beladen met wijn en met bier; drijft vóór u,
+met zeelen of anderszins, ossen, varkens en schapen. De duiven kirren
+in de kevies; de volgepropte kapoenen kijken beteuterd in de houten
+kooien, in dewelke zij zich niet kunnen verroeren. Ik ben de kok. Het
+ijs kraakt onder de schaatsijzers. Wij zijn nabij de schepen. Morgen
+speelt er muziek in de keuken. Laat de katrollen beneden. Bindt de
+banden om de koeien en ossen. 't Is een schoon schouwspel, ze aldus
+bij den buik te zien hangen; morgen zullen wij hangen met de tong aan
+hun vette stoverije. De katrol hijscht ze op tot boven het ruim. Het
+zijn karbonaden. Smijt maar overhoop in het ruim, eenden, kapoenen,
+ganzen en hoenders. Wie zal hun den nek omwringen? de kok. De deur
+is gesloten, de sleutel steekt in mijne tassche. God zij geloofd in
+de keuken! Vive le Geus!
+
+Vervolgens begaf Uilenspiegel zich naar het admiraalschip, met Diederik
+Slosse en de andere gevangenen, die zuchtten en weenden uit vrees
+voor de koorde.
+
+Messire Worst kwam bij het gerucht: hij bemerkte Uilenspiegel en
+zijne gezellen, verlicht door den rooden gloed van de toortsen.
+
+--Wat wilt gij? zeide hij.
+
+Uilenspiegel antwoordde:
+
+--Dezen nacht namen wij, in zijne hoeve, Diederik Slosse, die de
+achttien in een hinderlaag deed vallen. Hier is hij. De anderen zijn
+onschuldige knechten en meiden.
+
+Vervolgens langde hij hem een tassche, en hij sprak:
+
+--Deze guldens groeiden in bloempotten in het huis des verraders:
+er zijn er tienduizend.
+
+Messire Worst zeide hun:
+
+--Gij misdeedt de schepen te verlaten; doch gezien den goeden uitslag,
+zal u vergiffenis worden geschonken. Welkom zijn de gevangenen en de
+tassche vol guldens, en eere aan u, dappere lieden, aan dewelken ik,
+volgens de rechten en costumen ter zee, het derde deel van den buit
+schenk; het tweede deel zal zijn voor de vloot, en het andere derde
+voor onzen hoofdman, den Prins van Oranje; knoopt den verrader op
+staanden voet op.
+
+De Geuzen gehoorzaamden; daarna kapten zij eene bijt in het ijs,
+waarin zij het lijk smeten van Diederik Slosse.
+
+Toen zeide messire Worst:
+
+--Groeit er gras rond de schepen? Me dunkt, ik hoor hoenders kakelen,
+schapen blaten en runderen loeien?
+
+--Dat zijn de gevangenen voor onzen mond, antwoordde Uilenspiegel;
+zij zullen hun rantsoen in stoverije betalen. Messire admiraal krijgt
+het beste stuk van dezelve.
+
+... Wat deze knechten en meiden betreft, onder dewelken zich
+verscheidene lieftallige en poezele vrouwen bevinden, die ga ik weer
+op mijn schip brengen.
+
+Toen zulks gedaan was, hield hij hun de volgende rede:
+
+--Mannen en vrouwen, gij zijt hier op het beste schip van de
+wereld. Wij brengen er den tijd door met smullen; 't is een festijn
+zonder einde. Als 't u belieft van hier weg te gaan, kunt gij het
+doen, mits een rantsoen te betalen; verkiest gij te blijven, dan
+zult gij leven lijk wij: dapper werken en flink eten. Wat die lieve
+vrouwlieden betreft, ik geef haar bij gezagvoerderlijke macht de
+volle vrijheid van lijf: 't is te zeggen, dat het mij heel eender
+is of zij heure vrienden houden, die met haar op het schip kwamen,
+of eene keuze doen onder onze dappere Geuzen, hier tegenwoordig,
+om heur huwelijksch gezelschap te houden.
+
+Maar al de lieftallige vrouwlieden bleven trouw aan heure vrienden,
+uitgenomen een enkele, dewelke glimlachend keek naar Lamme en hem
+vroeg of hij van heur wilde weten.
+
+--God zegene u, liefste, zeide hij, maar ik ben reeds genomen.
+
+--Hij is getrouwd, de dikzak, zeiden de Geuzen tot de spijtige schoone.
+
+Maar zij keerde hen den rug toe en koos er een anderen, die, gelijk
+Lamme, een goede tronie en een dikken buik had.
+
+Dien dag en den volgenden gastreerde men aan boord van de schepen
+met wijn, met vleesch en met gevogelte. En Uilenspiegel zeide:
+
+--Vive le Geus! Blaas maar aan, scherpe Noordenwind, wij zullen de
+lucht met onzen adem verwarmen. Ons hert is van vuur voor het vrije
+geweten, van vuur onze maag voor het gebraad van den vijand. Laat
+ons wijn drinken, dat is de melk van de dapperen. Vive le Geus!
+
+Nele dronk ook uit een grooten gouden beker; zij bloosde van koude,
+doch blijde bespeelde zij de pijp. En ondanks de koude, aten en
+dronken de Geuzen juichend en vroolijk op het dek van de schepen.
+
+
+
+
+XVIII.
+
+Eensklaps zag heel de vloot op den oever zwarte drommen, onder
+dewelke toortsen flikkerden en wapens glinsterden; vervolgens werden
+de toortsen uitgedoofd, en heerschte volledigste duisternis.
+
+De bevelen van den admiraal werden overgebracht, het sein tot
+waakzaamheid gegeven, en alle de vuren uitgedoofd; matrozen en soldaten
+gingen, met bijlen gewapend, op hun buik op het dek liggen. De wakkere
+kanonniers, met hunne lont in de hand, waakten omtrent de donderbussen,
+dewelke geladen waren met zakken kruit en met kettingkogels. Zoodra
+de admiraal en de kapiteins zouden roepen: "Honderd passen!"--wat
+de stelling van den vijand aanwees,--moesten zij vuren van voren,
+van achterboeg of van boord, naarvolgens hunne stelling op het ijs.
+
+En men hoorde de stem van messire Worst, dewelke sprak:
+
+--Ter dood, hij die luide durft spreken!
+
+En de kapiteins zeiden hem na:
+
+--Ter dood, hij die luide durft spreken!
+
+Het uitspansel was vol sterren, doch zonder maan.
+
+--Hoort gij, zeide Uilenspiegel tot Lamme stil als de adem van
+een spook. Hoort gij de stem van die van Amsterdam, en het ijzer
+hunner schaatsen krassen op 't ijs? Zij rijden snel. Men hoort hen
+spreken. Zij zeggen: "Die luie Geuzen liggen te slapen. Aan ons de
+schat van Lissabon". Zij steken hunne toortsen weer aan. Ziet gij
+hunne bestormingsladders en hunne leelijke tronies, en de breede
+linie van hun aanvalsfront? Zij zijn duizend en meer.
+
+--Honderd passen! riep messire Worst.
+
+En men hoorde een geluid als van een donder, en een jammerlijk gehuil
+op het ijs.
+
+--Tachtig kanonnen bulderen tegelijk! zeide Uilenspiegel. Zij
+vluchten! Ziet gij de toortsen verwijderen?
+
+--Achtervolgt ze! zeide admiraal Worst.
+
+--Achtervolgt! zeiden de kapiteins.
+
+Maar de vervolging duurde niet lang, daar de vluchtelingen honderd
+passen vóór waren en liepen als hazen.
+
+En op de mannen, die kermden en reutelden op 't ijs, vond men goud,
+kleinoodiën, en ook koorden om de Geuzen te binden.
+
+En, na deze zegepraal, zeiden de Geuzen tot elkaar: "Als God met ons
+is, wie zal tegen ons zijn?"
+
+Nu, in den morgen van den derden dag, werd messire Worst ongerust,
+want hij verwachtte een nieuwen aanval. Lamme sprong op het dek en
+zeide tot Uilenspiegel:
+
+--Breng mij bij dien admiraal, die u niet wilde gelooven toen gij
+vorst voorspeldet.
+
+--Ga zonder dat men u leide, zeide Uilenspiegel.
+
+Lamme toog henen, nadat hij de deur zijner keuken goed dichtgedaan
+had. De admiraal stond op het dek in de verte te turen, om te zien
+of hij geenerlei beweging bespeurde langs den kant van de stad.
+
+Lamme naderde hem en sprak:
+
+--Messire admiraal, mag een nederige kok u zijne meening laten kennen?
+
+--Spreek, mijn jongen, zei de admiraal.
+
+--Heer, zeide Lamme, het water ontdooit in de kruiken, het gevogelte
+wordt weder murw; de worst verliest hare schimmel van rijm; de boter
+wordt slap; de olie vloeibaar; het zout vochtig. Weldra valt de regen
+en zijn wij gered, heer admiraal.
+
+--Wie zijt gij? vroeg messire Worst.
+
+--Ik ben, zeide hij, Lamme Goedzak, kok op de vlieboot den Briel. En
+als al de groote geleerden, die sterrekijkers beweren te zijn, zoo
+goed in de sterren kunnen lezen als ik in mijne sausen, zouden zij
+ons kunnen zeggen, dat het dezen nacht zal dooien, met groot gedruisch
+van tempeest en van hagel; maar de dooi zal niet aanhouden.
+
+En Lamme keerde terug bij Uilenspiegel, tot denwelken hij zei rond
+den middag:
+
+--Wat heb ik voorspeld? De hemel wordt duister, de wind blaast
+geweldig; een warme regen valt; daar is reeds een voet water op 't ijs.
+
+En 's avonds riep hij blijde uit:
+
+--De Noordzee is gezwollen: het is het uur van den vloed; de hooge
+baren, die in de Zuiderzee komen, breken het ijs, hetwelk in groote
+stukken barst en springt op de schepen; het fonkelt en glinstert;
+daar is de hagel. De admiraal beveelt ons met onze vloot terug te
+trekken van vóór Amsterdam, en dit met zooveel water als ons grootste
+schip noodig heeft. Hier zijn wij in de haven van Enkhuizen. De zee
+vriest weer toe. Ik ben profeet, en 't is een gunst van den Heer.
+
+En Uilenspiegel zeide:
+
+--Wij zullen een glas drinken en Hem loven en danken.
+
+En de winter verzwond en de zomer kwam.
+
+
+
+
+XIX.
+
+In de Oogstmaand, als de volgepropte hennen doof blijven voor 't geroep
+van den haan, die heur zijne liefde toekraait, zeide Uilenspiegel
+tot zijne matrozen en soldaten:
+
+--De bloedige hertog is te Utrecht; hij durft er een lieftallig
+plakkaat afkondigen, hetwelk onder meer genadige giften belooft:
+honger, dood, ondergang voor de inwoneren der Nederlanden, die zich
+niet onderwerpen. Alles wat nog recht staat, zegt hij, zal neergehaald
+worden, en Zijn Koninklijke Majesteit zal het land bevolken met
+vreemdelingen. Bijt, hertog, bijt! De vijl breekt de tanden der
+adderen; wij, wij zijn vijlen! Vive le Geus!
+
+... Alva, het bloed maakt u dronken! Meent gij, dat wij uwe
+bedreigingen vreezen of aan uwe goedertierenheid gelooven? Uw
+roemrijke regimenten, wier lof gij door heel de wereld verkondigdet,
+uwe schepen, wier naam alleen uwen overmoed schetsen, bleven zeven
+maanden lang Haarlem beschieten, een zwakke stede, door heure poorters
+verdedigd. Zij zijn als gewone stervelingen in de lucht gesprongen,
+bij 't ontploffen der mijnen; poorters begoten ze edelmoedig met pik;
+eindelijk behaalden zij een roemvolle zege: zij keelden ontwapende
+vijanden. Hoort gij Gods uur slaan, bloedige beul?
+
+... De stede verloor haar wakkere verdedigers, hare steenen zweetten
+bloed. Bij heure belegering verloor en verteerde zij twaalfhonderd
+tachtigduizend gulden. De bisschop is terug in de stede; met vlugge
+hand en vroolijke tronie herwijdt hij de kerken; don Frederik woont die
+wijdingen bij; de bisschop wascht hem de handen, dewelke voor God rood
+zullen blijven, en hij gebruikt het Avondmaal onder de beide gedaanten,
+wat aan het arme gemeen niet geoorloofd wordt. En de klokken luiden, en
+de beiaard werpt in de lucht zijn stille, welluidende tonen: 't is als
+een engelenkoor op een kerkhof. Oog om oog, tand om tand! Vive le Geus!
+
+
+
+
+XX.
+
+Toen waren de Geuzen te Vlissingen, waar Nele koorts vatte. Gedwongen
+het schip te verlaten, werd zij ingenomen bij Peeters, een hervormde,
+op de Turfkaai.
+
+Uilenspiegel, hoewel treurig, was toch blijde als hij dacht, dat de
+Spaansche kogels heur niet konden treffen in dat bed, waar zij zeker
+zou genezen.
+
+En, met Lamme, was hij gedurig bij heur, om heur goed en liefdevol
+te verzorgen. En daar koutten zij met elkander.
+
+--Trouwe vriend, zei Uilenspiegel eens, kent gij het nieuws?
+
+--Neen, mijn zoon, zei Lamme.
+
+--Hebt gij de vlieboot gezien, die laatst onze vloot kwam versterken,
+en weet gij wie daar alle dagen speelt op de vedel?
+
+--Ten gevolge van de laatste verkoudheid, zeide Lamme, tuiten mijne
+beide ooren en ben ik wat doof. Waarom lacht gij, mijn zoon?
+
+Maar Uilenspiegel vervolgde zijn rede en sprak:
+
+--Eens hoorde ik heur een Vlaamsch liedeken zingen, en heure stem
+was zoo zoet als die van een engel.
+
+--Laas! zeide Lamme, zij ook speelde op de vedel en zong.
+
+--Kent gij de andere tijding? vervolgde Uilenspiegel.
+
+--Neen, mijn zoon, antwoordde Lamme.
+
+Uilenspiegel antwoordde:
+
+--Bevel is ons gegeven, met onze booten de Schelde op te varen tot vóór
+Antwerpen, om daar vijandelijke schepen te kapen of te verbranden. Maar
+geen kwartier aan de mannen! Wat denkt gij daarvan, dikzak?
+
+--Laas, zeide Lamme, zullen wij in deze droeve landen nooit van
+anders hooren dan van verbrandingen, verhangingen, verdrinkingen en
+andere uitroeiingen van 't arme menschdom? Wanneer zal de gezegende
+vrede komen, om rustig patrijzen te braden, kiekens te stoven en,
+te midden van de eieren, de pensen te doen sissen in de braadpan? Ik
+eet liever de zwarte; de witte zijn wat vet.
+
+--Die zoete tijd zal komen, antwoordde Uilenspiegel, als wij, in
+Vlaanderens boomgaarden, aan de appelaars, pruimelaars en kerselaars,
+in stede van appels, pruimen en kersen, aan elken tak eenen Spanjaard
+zien hangen.
+
+--Ha, zeide Lamme, kon ik maar mijne vrouw terugvinden, mijn
+teerbeminde, zeer geliefde, beminnelijke, zoete, trouwe vrouw! Want,
+weet, mijn zoon, dat ik nooit horens droeg of zal dragen; daarvoor
+was zij veel te ingetogen van aard; zij vluchtte den omgang met
+andere mannen; zoo zij van schoone kleederen hield, was het alleen
+uit vrouwelijke behoefte. Ik was heure keukenmeid, ik beken het
+volgeerne; waarom ben ik het niet meer! Doch ik was ook haar meester
+en echtgenoot.
+
+--Zwijg toch met uw gesuf, zei Uilenspiegel. Hoort gij den admiraal
+roepen: "Licht de ankers!" en de kapiteins, die zijn commando
+herhalen? Wij moeten in zee steken.
+
+--Waarom vertrekt gij zoo vroeg? zeide Nele tot Uilenspiegel.
+
+--Wij gaan naar de schepen, antwoordde hij.
+
+--Zonder mij? sprak zij.
+
+--Ja, zei Uilenspiegel.
+
+--Bedenkt gij niet, vroeg zij, hoe ongerust ik over u wezen zal?
+
+--Liefste, sprak Uilenspiegel, mijn vel is van ijzer.
+
+--Gij spot, zeide zij. Ik zie niets dan uw wambuis, dat van laken is,
+doch geenszins van ijzer; daaronder is uw lijf, dat van vleesch en been
+is, lijk het mijne. Wie zal u verbinden als gij gekwetst zijt? Moet
+gij moederziel alleen sterven, te midden van de strijders? Ik zal
+met u gaan.
+
+--Laas, zeide hij, als de lansen, kogels, zweerden, aksten, hamers,
+mij sparen, maar op uw liefelijk lichaam vallen, wat moet ik, nietdeug,
+dan doen op de wereld zonder u?
+
+Maar Nele zeide:
+
+--Ik wil u volgen, er zal geen gevaar zijn; ik zal mij verbergen in
+de houten schansen, waar de busschutters staan.
+
+--Als gij vertrekt, dan blijf ik; en men zal zeggen, dat uw vriend
+Uilenspiegel lafaard is en verrader; maar luister naar mijn lied:
+
+
+    IJzeren is mijn harentuit,
+    Daar schutte natuur mij mede.
+    Lederen is mijn eersten huid,
+    Stalen is mijn tweede.
+
+    Laat de dood, de leelijke, wreede,
+    Loeren naar een ander buit.
+    Lederen is mijn eerste huid,
+    Stalen is mijn tweede.
+
+    "Leven" steekt op mijn vendel uit,
+    Leven in 't licht der rede.
+    Lederen is mijn eerste huid,
+    Stalen is mijn tweede.
+
+
+En zingend toog hij henen, niet zonder den trillenden mond en de
+liefelijke oogen te kussen van de koortsachtige Nele, die lachte en
+weende te gelijk.
+
+De Geuzen zijn vóór Antwerpen, zij kapen Alva's schepen tot in de
+haven. Zij komen in lichten dag in de stad, verlossen gevangenen en
+nemen paapschgezinden om tot rantsoen te dienen. Met geweld doen zij de
+poorters opstaan, en dwingen eenigen hunner hen sprakeloos te volgen,
+onder doodsbedreiging.
+
+Uilenspiegel zeide tot Lamme:
+
+--De zoon des admiraals is gevangen bij den schouteet; wij moeten
+hem verlossen.
+
+Zij dringen in het huis van den schout en vinden den jongeling,
+dien zij zochten, in gezelschap van een dikbuikigen monnik, dewelke
+hem een grammoedige predikatie hield om hem terug te brengen in
+den schoot Onzer Moeder, de Heilige Kerk. Maar de jonge snaak
+vroeg of hij hem niets beters kon aanbieden. Hij gaat henen met
+Uilenspiegel. Ondertusschen grijpt Lamme den monnik bij zijne kap,
+en doet hem vóór zich gaan in de straten van Antwerpen, zeggende:
+
+--Gij zijt honderd gulden weerd: maak uw pak en ga vóór. Waarom gaat
+gij zoo traag? Hebt gij lood in uwe schoenen? Wat rapper, spekzak,
+vleeschbank, soepketel!
+
+De monnik antwoordde, in woede ontstoken:
+
+--Goed, mijnheer de Geus, ik ga; maar, met al den eerbied, dien ik
+uwe schietbus verschuldigd ben, veroorloof ik mij te zeggen, dat gij
+zoo dik zijt als ik.
+
+Maar Lamme stiet hem voort en sprak:
+
+--Hoe vermeet gij u uw onnut, vadsig kloostervet te vergelijken met
+mijn Vlamingvet, dat eerlijk gekweekt werd door arbeid, vermoeienis
+en gevecht? Gauw wat, of ik jaag u voort met eene spoor op de punt
+van mijnen schoen.
+
+Maar de monnik kon niet loopen, hij was gansch buiten adem, en Lamme
+insgelijks. En zoo kwamen zij op het schip.
+
+
+
+
+XXI.
+
+Nadat de Geuzen, Rammekens, Geertruidenberg, Alkmaar hadden genomen,
+stevenden zij weder naar Vlissingen.
+
+Nele, die genezen was, wachtte Uilenspiegel af aan de haven.
+
+Hem ontwarend, riep zij:
+
+--Thijl, mijn vriend Thijl, zijt ge niet gewond?
+
+Uilenspiegel zong:
+
+
+    "Leven" steekt op mijn vendel uit,
+    Leven in 't licht der rede.
+    Lederen is mijn eerste huid,
+    Stalen is mijn tweede.
+
+
+--Laas! zeide Lamme, trekkebeenend: de kogels, granaten, kettingkogels
+regenen rondom hem, en hij voelt er niets van dan den wind. Gij zijt
+voorzeker een geest, Uilenspiegel, en gij ook Nele, want gij zijt
+beiden altijd jeugdig en luimig.
+
+--Wat hebt gij aan uw been? vroeg Nele tot Lamme.
+
+--Ik ben geen geest en zal het nooit wezen, sprak hij. Ik heb dan
+ook een bijlslag gekregen in mijne bil,--mijne vrouw had er zulke
+ronde en schoone!--zie, ik bloed. Laas! waarom is ze niet hier om
+mij te verzorgen?
+
+Maar Nele antwoordde grammoedig:
+
+--Waarom vraagt gij naar een meineedige vrouwe?
+
+--Spreek geen kwaad van haar, antwoordde Lamme.
+
+--Neem, zeide Nele, hier is balsem, dien ik meebracht voor
+Uilenspiegel; strijk hem op uwe wond.
+
+Toen Lamme zijne wond verbonden had, werd hij blijgeestig, want de
+balsem stilde de bijtende smert; en zij klommen alle drie op het schip.
+
+Toen Nele den monnik met gekluisterde handen op het dek zag wandelen,
+vroeg zij:
+
+--Wie is die? Dien zag ik reeds; en ik meen hem te kennen.
+
+--Gelijk hij waait en draait, is die honderd gulden rantsoen weerd,
+zeide Lamme.
+
+
+
+
+XXII.
+
+Dien dag was 't kermis op de vloot van de Geuzen. Niettegenstaande
+het gure weder der Wintermaand, niettegenstaande regen en sneeuw,
+waren al de Geuzen op het dek van de schepen. De zilveren halvemanen
+flikkerden op de Zeeuwsche hoedekens.
+
+En Uilenspiegel zong:
+
+
+    Leiden is ontzet, de bloedhertog
+    Wijkt uit de Nederlanden;
+    Klare klokken, klinkt,
+    Beiaards, schatert uw deuntjes uit;
+    Rinkelt, roomers en bottels.
+
+    Kreeg de doghond slaag,
+    Staartneder, met bloedend oog,
+    Loopt hij de stokken weer in.
+    Zijn gescheurde muil
+    Hijgt en huivert.
+    Weg is de bloedhertog:
+    Rinkelt, roomers en bottels. Leve de Geus!
+
+    Bijten wou hij zijn eigen.
+    De stokken brijzelden zijn gebit.
+    Met hangenden suffen kop,
+    Denkt hij aan dagen van moord en vraatlust.
+    Weg is de bloedhertog:
+    Slaat op de glorietrom,
+    Slaat op de krijgstrom!
+    Leve de Geus!
+
+    Thans schreeuwt hij den duivel toe: "Koop
+    Mijn hondsche ziel voor één uur kracht".
+    "Uw ziel, roept de duivel,
+    Uw ziel of een boestring, dat 's eender."
+    Geen tand past op een tand.
+    De harde brokken moest ge maar laten.
+    Weg is de bloedhertog:
+    Leve de Geus!
+
+    De straathondjes, scheef, scheel, schurftig,
+    Die leven en krepeeren op vuilnishoopen,
+    Heffen hun poot op, beurt om beurt,
+    Naar hem, die doodde uit moordzucht....
+    Leve de Geus!
+
+    "Hij hield van vrouw noch vriend,
+    Van vreugd, noch zon, noch meester,
+    Slechts van de Dood, zijn bruid,
+    Die hem de pooten knakte,
+    Tot blijdans vóór de bruiloft;
+    Want heele menschen lust ze niet.
+    Slaat op de vreugdtrom.
+    Leve de Geus!"
+
+    En de straathondjes mank,
+    Scheef, schurftig en scheel,
+    Heffen nog eens den poot op
+    Dat het ziedt en zout,
+    En met hen brakken en winden,
+    Rekels van Hongarije,
+    Van Brabant, Namen en Luxemburg.
+    Leve de Geus!
+
+    En triestig, met schuimmuil,
+    Krepeert hij vóór zijn meester,
+    Die hem schopt met den voet,
+    Wijl hij te weinig beet.
+    Ter helle huwt hij Dood.
+    Hem heet zij: Mijn hertog;
+    Hij haar: Mijn inquisitie.
+    Leve de Geus!
+
+    Klare klokken, klinkt,
+    Beiaard, schater uw deuntjes uit;
+    Rinkelt, roomers en bottels:
+    Leve de Geus!
+
+
+
+
+
+
+
+VIJFDE BOEK.
+
+
+I.
+
+Als Lamme's monnik gewaar werd, dat de Geuzen geenszins zijnen dood
+wilden, doch een rantsoen voor hem eischten, begon hij het hoofd op
+te steken.
+
+--Ziet, zeide hij, terwijl hij met woede op het dek stapte en
+schuddebolde, ziet in welken afgrond van vuile, zwarte en afgrijselijke
+gruwelen ik gevallen ben, toen ik den voet in deze verdoemde kuip
+zette. Zoo ik hier niet was, zou ik, gezalfd door den Heer....
+
+--Met hondenvet? vroegen de Geuzen.
+
+--Honden zijt gij zelven, antwoordde de monnik, zijne rede vervolgend,
+ja, schurftige, drekkige straathonden, met het vel over de beenderen,
+die het lustige pad van Onze Moeder, de Heilige Roomsche Kerk, hebt
+verlaten om de schrale wegen van uwe havelooze Hervormde Kerk in te
+slaan. Ja! ware ik hier niet op uwen klomp, lang reeds had de Heer,
+Onze God hem doen verzwelgen in den diepsten afgrond der zee, met u,
+uw vermaledijde wapenen, uwe duivelsche donderbussen, uw zingenden
+kapitein, uw heiligschennende halvemanen, ja! tot in het diepste
+van den onpeilbaren bodem van het rijk Satans, waar gijlie niet
+zult branden, o neen! maar vervriezen, beven en sterven van koude,
+de eeuwigheid der eeuwigheden lang. Ja, de God des hemels zal aldus
+het vuur uitdooven van uwen goddeloozen haat tegen Onze Zoete Moeder,
+de Heilige Roomsche Kerk, tegen de genadige santen, de eerwaarde
+bisschoppen en de gezegende plakkaten, die zoo zachtmoedig en wijselijk
+uitgedacht zijn. Ja, en van het hoogste des hemelrijks zal ik u zien,
+paars lijk beeten, of wit lijk rapen, van koude. Zoo zij en zoo weze!
+
+De matrozen, soldaten en scheepsjongens spotten met hem en schoten,
+met blaaspijpen, droge erwten naar hem. En met zijne handen beschermde
+hij zijn gelaat tegen die kogels.
+
+
+
+
+II.
+
+De bloedige hertog had onze landen verlaten, en de heeren Medina Celi
+en Requesens regeerden ze met minder wreedheid. Vervolgens bestuurden
+de Staten-Generaal, in naam van den koning.
+
+Die van Zeeland en Holland, bevoordeeld door de zee en de dijken,
+die hun natuurlijke wallen en vestingen zijn, openden ondertusschen,
+aan den God der vrijen, vrije tempelen, alwaar de paapschgezinde
+beulen naast hen hunne lofzangen konden aanheffen; en de Prins van
+Oranje, de edele Zwijger, hield zich druk bezig met het stichten van
+een stadhouderlijk en koninklijk huis.
+
+Belgieland werd verwoest door de Walen, die ontevreden waren over
+de Pacificatie van Gent, dewelke, naar men zeide, allen haat moest
+uitdooven. En die Waalsche Paternosterknechten, met groote zwarte
+rozenkransen om den hals, van dewelke tweeduizend te Spienne,
+in Henegouw, werden gevonden, stalen twaalfhonderd, ja, tot twee
+duizend ossen en peerden, onder de beste, trokken door velden en
+sompen, ontvoerden vrouwen en meidekens, aten steeds zonder betalen,
+en verbrandden in de schuren de gewapende boeren, die niet gedwee de
+vrucht van hunne noeste vlijt lieten rooven.
+
+En die van het volk zeiden tot elkander: "Don Juan gaat komen
+met zijne Spanjolen, en Zijne Groote Hoogheid zal komen met zijne
+paapschgezinde Franschen: en de Zwijger, dewelke gerust over Holland,
+Zeeland, Gelderland, het Sticht, Overijsel wil heerschen, staat bij
+geheime overeenkomst Belgieland af, opdat de heer van Anjou koning
+kunne worden van hetzelve".
+
+Eenigen uit het volk behielden nochtans hun vertrouwen. "De heeren
+der Staten, zeiden zij, hebben twintig duizend goed gewapende mannen,
+met vele kanonnen en een goede ruiterij. Zij zullen al de uitheemsche
+soldaten wederstaan".
+
+Maar de omzichtigen spraken: "De Heeren der Staten hebben twintig
+duizend man op papier, maar geenszins te velde; zij hebben geene
+ruiterij en laten, op eene mijl van hun kamp, hunne peerden stelen
+door de Paternosterknechten. Zij hebben geen geschut, want, terwijl
+wij er hier van doen hebben, hebben zij besloten honderd donderbussen
+met kogels en kruit te zenden aan don Sebastiaan van Portugal; en men
+weet niet waar de twee millioen daalders henen zijn, die wij in vier
+maal als beden en schattingen hebben betaald. De poorters van Gent en
+Brussel wapenen zich: Gent voor de hervorming en Brussel eveneens. Te
+Brussel spelen de vrouwen op de tamboerijn, terwijl heure mannen aan
+de vestingen werken. En het onversaagde Gent stuurt aan het lustige
+Brussel het kruit en de donderbussen, welke hem ontbreken, om zich
+te verdedigen tegen Malcontenten en Spanjaards.
+
+"En elkeen, in de steden en op het platteland, ziet, dat men vertrouwen
+moet hebben noch in onze heeren noch in zoovele anderen. En wij,
+poorters en die van 't gemeen, zijn treurig in ons hert als wij
+zien, dat, terwijl wij ons geld gaven en bereid zijn ook ons bloed
+te geven, er geen vooruitgang komt voor het welzijn van den grond
+onzer vaderen. En Belgieland is bang en gram, omdat het geen trouwe
+hoofdmannen heeft, die het naar het gevecht brengen en naar de zege,
+met groote inspanning van de wapenen, die gereed zijn tegen de vijanden
+der vrijheid".
+
+En de omzichtigen prevelden tot elkaar:
+
+"In de Pacificatie van Gent bezwoeren de heeren van Holland en België
+de uitdooving van allen haat, wederkeerigen onderstand tusschen
+de Belgische Staten en de Nederlandsche Staten; verklaarden zij de
+plakkaten van geener weerde, alle verbeurdverklaringen opgeheven, den
+vrede tusschen de beide godsdiensten; zij beloofden alle hoegenaamde
+zuilen, zegeteekenen, opschriften en standbeelden te zullen afbreken,
+welke de hertog van Alva tot onze schande opgericht heeft. Doch in de
+herten der hoofden blijft alle haat woeden; edelen en geestelijken
+stoken verdeeldheid onder de Staten van het Verbond; zij krijgen
+geld om de soldaten te betalen, en houden het voor zich om te zuipen
+en te vreten; vijftien duizend gedingen wegens terugvordering van
+verbeurdverklaarde goederen blijven opgeschort; Lutheranen en Roomschen
+verbinden zich tegen de Calvinisten; de wettige erfgenamen vermogen
+niet, de roovers uit hunne goederen te drijven; het standbeeld van
+den hertog is nedergehaald, maar de beeltenis van de Inquisitie is
+in al de herten".
+
+En het arme volk en de jammerende poorters wachtten steeds op den
+trouwen en wakkeren hoofdman, die hen zou brengen naar het gevecht
+voor de vrijheid.
+
+En zij zeiden tot elkander: "Waar zijn de doorluchtige onderteekenaren
+van het Eedverbond, allen vereenigd, naar zij zeiden, voor het heil
+des Vaderlands? Waarom sloten die valsche lieden een zoo "heilig
+verbond", als zij het dadelijk daarna zouden verbreken? Waarom zich
+met zooveel gezwets vereenigen, de gramschap des konings verwekken,
+om daarna uiteen te gaan, als verraders en bloodaards? Met vijfhonderd
+als zij waren, groote en kleine heeren, als broeders vereenigd, konden
+zij ons van de Spaansche furie bevrijden; maar zij offeren België's
+heil op aan hun eigen welzijn, zooals ook Egmond en Hoorne deden.
+
+... Laas! zeiden zij, nu zal don Juan komen, die heerschzuchtige
+vrouwengek, vijand van Philippus, maar nog grootere vijand van onze
+landen. Hij komt voor den paus en zich zelf. Edelen en geestelijken
+plegen verraad".
+
+En zij beginnen een schijnoorlog. Op de muren van de straten en
+stegen van Gent en van Brussel, tot zelfs op de masten van de schepen
+der Geuzen, zag men toen uitplakken de namen van de legerhoofden
+en bevelhebbers van versterkte plaatsen, die verraad pleegden:
+die van den graaf van Liedekerke, dewelke zijn slot niet verdedigde
+tegen don Juan; van den provoost van Luik, dewelke de stede aan don
+Juan wilde verkoopen; van de heeren van Aerschot, van Mansfeld, van
+Berlaymont, van Rennenberg; van den Staatsraad, van George Lalaing,
+stadhouder van Friesland; van het legerhoofd, den heer van Rossignol,
+afgezant van don Juan, bemiddelaar tusschen Philippus en Jaureguy,
+den onbehendige, die moord wilde plegen op den Prins van Oranje; den
+naam van den aartsbisschop van Kamerijk, die de Spanjaards binnen
+de stede wilde laten komen; de namen der jezuïeten van Antwerpen,
+die drie tonnen gouds--dat maakt twee millioen gulden--boden aan
+de Staten om het kasteel niet af te breken, om het voor don Juan te
+behouden; van den bisschop van Luik; van de Roomsche predikanten, die
+de patriotten belaagden; van den bisschop van Utrecht, door de poorters
+om zijn verraad uit het Sticht verdreven; van de bedelorden, die te
+Gent konkelden ten voordeele van don Juan. Die van 's Hertogenbosch
+stelden aan de kaak den naam van den karmeliet Pieter, die, geholpen
+door zijnen bisschop en de geestelijkheid, zich sterk maakte de stede
+aan don Juan over te leveren.
+
+Te Dowaai hingen zij echter den rector der Hoogeschool in beeltenis
+niet op, die insgelijks Spaanschgezind was geworden. Doch op de schepen
+der Geuzen las men, op den buik van groote poppen, die bij den hals
+aan de raas hingen, de namen van monniken, abten en prelaten; die van
+de achttienhonderd rijke vrouwen en dochters uit het begijnenhof van
+Mechelen, die, op eigen kosten, de beulen des vaderlands met vederen
+en goudborduurselen versierden, en voorzagen in hunlieder onderhoud.
+
+En op die poppen, schandpalen voor de verraders, las men de namen
+van den markgraaf van Harrault, bevelhebber van de versterkte plaats
+Philippeville, die oorlogsmunitie en mondbehoeften vermorste, om
+naderhand de plaats aan den vijand te leveren, onder voorwendsel
+dat hij gebrek had aan leeftocht; dien van Belver, dewelke Limburg
+overgaf, alswanneer de stede het nog acht maanden volhouden kon; dien
+van den voorzitter van den Raad van Vlaanderen; van den magistraat
+van Mechelen, die zijne stede bewaarde voor don Juan, van de heeren
+van het Rekenhof van Gelderland, dat gesloten was uit hoofde van
+verraad; van die van den Raad van Brabant, van de kanselarij des
+hertogdoms; van den privaten raad en van den raad van financiën; van
+den hoogbaljuw en burgemeester van Meenen; van de slechte buren van
+Artesië, die ongehinderd twee duizend Franschen doorlieten, dewelken
+hier kwamen plunderen.
+
+--Laas! zeiden de burgers tot elkaar, nu dat de hertog van Anjou den
+voet in onze landen gezet heeft, wil hij hier koning zijn; zaagt gij
+hem bij zijne inkomst in Bergen, klein, met groote heupen, een dikken
+neus, een gele tronie, een spottenden mond?
+
+... 't Is een groote prins, liefhebber van buitengewone minnarijen;
+het moet een reus van een prins zijn, want men noemt hem: monseigneur
+en mijnheer Zijne Groote Hoogheid van Anjou.
+
+Uilenspiegel was droomerig.
+
+En hij zong:
+
+
+    De lucht is blauw, de lucht is klaar,
+    Rouwfloers over de vanen!
+    Rouw om 't gevest der degens!
+    Verbergt uw juweelen,
+    Uw spiegels gekeerd:
+    Ik zing het lied van den Dood,
+    Het lied der verraders.
+
+    Ze hebben de fiere landen
+    Op den buik en de keel getrapt,
+    Brabant, Vlaanderen, Henegouw,
+    Antwerpen, Artoois, Luxemburg.
+    Adel en clerus verraden.
+    Vuig loon verlokt, verleidt.
+    Ik zing het lied der verraders.
+
+    Als de vijand overal plundert,
+    Als de Spanjaard Antwerpen binnenrukt,
+    Trekken priesters, prelaten, legerhoofden
+    De straten der stede door,
+    Met zijden gewaden, vol goudstikkerij,
+    En tronies blinkend van goeden wijn,
+    Stellend hun schande ten toon.
+
+    Door hen zal Inquisitie
+    Herrijzen in triomf;
+    En nieuwe titellui,
+    Zullen doofstommen vastzetten
+    Voor ketterij.
+    Ik zing het lied der verraders.
+
+    Onderteekenaren van 't Eedverbond,
+    Lafhartige onderteekenaren,
+    Wezen uw namen gevloekt.
+    Waar blijft gij in 't uur des strijds?
+    Als raven volgt gij
+    Den drijf der Spanjaards.
+    Slaat op de rouwtrom.
+
+    Belgenland, eenmaal
+    Veroordeelt u de toekomst,
+    Daar ge, gewapend, u plunderen liet.
+    Doch, toekomst, draal;
+    Zie de verraders aan 't werk:
+    Met twintig, met duizend,
+    Bekleeden ze alle posten,
+    De grooten stellen de kleinen aan.
+
+    Het eens zijn ze 't
+    Om den weerstand te verhindren,
+    Door verdeeldheid en traagheid:
+    Hun verradersleus!
+    Rouwfloers over de spiegels,
+    Rouw om 't gevest der degens.
+    't Is het lied der verraders.
+
+    Rebellen verklaren zij
+    Spanjolen en malcontenten,
+    Verbiedend hun bij te staan
+    Met brood en bed,
+    Met lood en kruit.
+    En wordt er een gevangen,
+    Om te hangen,
+    Dadelijk laten zij hem los.
+
+    Staat op! roepen die van Brussel;
+    Staat op! roepen die van Gent
+    En het Belgische volk.
+    Arme lui, men wil u verpletteren,
+    Tusschen den koning en den paus,
+    Die tegen Vlaanderen
+    Een kruistocht predikt.
+
+    Ze komen, de veile knechten,
+    Af op den reuk van het bloed;
+    Benden honden,
+    Slangen en hyena's,
+    Hongerig, dorstig.
+    Arme vadergrond,
+    Rijp voor verval en dood!
+
+    Niet don Juan maakt het Farnese,
+    Des pausen lieveling,
+    Makkelijk in 't land,
+    Maar wie gij overlaaddet
+    Met goed en eere,
+    Wie uw vrouwen de biecht afnamen,
+    Uw dochters en uw kinderen!
+
+    Die wierpen u ter aarde,
+    En de Spanjaard zet u
+    Het mes op de keel.
+    Een snoode spot was 't
+    Dat ze te Brussel
+    De komst van Oranje vierden!
+
+    Toen men op de vaart
+    Die macht van vuurwerk zag,
+    Waar de vreugd uit sprankte en knalde,
+    En al die zegebooten,
+    Tafreelen en tapijten,
+    Arm België, dan vertoonde men
+    Een oude historie:
+    Joseph verkocht door zijn broeders.
+
+
+
+
+III.
+
+Daar de monnik zag, dat men hem maar liet praten, maakte hij nog
+grooter misbaar, en de matrozen en soldaten, om hem nog meer op
+te hitsen, spraken kwaad van de Maagd, van de santen en van de
+godvruchtige praktijken der Heilige Roomsche Kerk.
+
+En, in woede ontstoken, braakte hij duizend beleedigingen uit:
+
+--Ja! schreeuwde hij, ja, ik ben hier wel in het hol van de Geuzen! Ja,
+dat zijn wel die verdoemde opvreters van de landen! En men zegt,
+dat de inquisiteur, de heilige man, te veel van die galgebrokken
+verbrand heeft! Integendeel: er blijft nog veel te veel van dat
+gebroed over. Ja, op die goede en brave schepen van Onzen Heer Koning,
+die vroeger zoo zindelijk waren en zoo goed geschrobd, wemelt nu dat
+ongedierte van Geuzen, ja, het stinkend ongedierte. Ja, allen zijn
+vuil, stinkend, afschuwelijk ongedierte, de kapitein, die zingt van
+'s morgens tot 's avonds, de kok met zijn dikken, goddeloozen buik,
+en ook al de anderen, met hun heiligschennende halvemanen. Ja, als de
+koning zijne schepen met geschut zal doen kuischen, zal er voor meer
+dan honderdduizend gulden kruit en kogelen noodig zijn om die vuile,
+leelijke, stinkende besmetting te verdrijven. Ja, gij allen zijt
+geboren in de alkoof van vrouwe Lucifer, die veroordeeld was om te
+wonen met Satan, tusschen muren van ongedierte, onder gordijnen van
+ongedierte, op een bed van ongedierte. Ja, en dáár is het, dat zij,
+in hun afschuwelijke minnarijen, de Geuzen ter wereld brachten. Ja,
+en ik spuw op ulieden.
+
+Bij die rede, zeiden de Geuzen tot elkander, zoodat hij het hoorde:
+
+--Waarom onderhouden wij dien luien hond, dewelke niets doet dan
+beleedigingen braken? Wij zouden hem beter ophangen!
+
+En dra brachten zij alles in gereedheid.
+
+Toen de monnik zag, dat de koorde vastgeknoopt was en de ladder tegen
+den mast stond, en dat men zijne handen ging binden, zeide hij op
+jammerenden toon:
+
+--Hebt medelijden met mij, heeren Geuzen, 't is de duivel der
+grammoedigheid, die spreekt in mijn hert, maar geenszins uw nederige
+gevangene, een arme monnik, die maar éénen hals heeft op deze wereld;
+genadige heeren, weest bermhertig: 't was niet gemeend; sluit mijnen
+mond, als gij wilt, met eene prop; aangenaam is dit niet, neen,
+maar om Godswil, hangt mij niet op!
+
+Maar zij luisterden niet en trokken hem naar de ladder,
+niettegenstaande zijn heftigen wederstand. Toen huilde hij zoo
+schromelijk, dat Lamme zeide tot Uilenspiegel, die bij hem in de
+keuken was om hem op te passen:
+
+--Mijn vriend! mijn vriend! zij hebben in den stal een verken gestolen
+en daar zijn ze bezig met het te kelen. Ho! de dieven! kon ik maar op!
+
+Uilenspiegel klom op het dek en zag niets dan den monnik. Toen deze
+hem ontwaarde, viel hij op zijne knieën en riep, met de handen naar
+hem uitgestoken:
+
+--Messire kapitein, kapitein van de wakkere Geuzen, geducht te land
+en ter zee, uwe soldaten willen mij ophangen, omdat ik zondigde met
+mijn tonge; dat is een onrechtveerdige straf, messire kapitein, want
+dan moesten al de advocaten, procureurs, predikanten en al de vrouwen
+met hennep begiftigd worden, en zou de wereld zekerlijk uitsterven;
+messire, red mij van de koorde: ik zal voor u bidden, gij zult niet
+verdoemd wezen; schenk mij vergiffenis. De spreekduivel sleepte mij mee
+en deed mij gedurig snateren: dit is een groot ongeluk voor mij. Dan
+verbittert zich mijn arme gal en doet ze mij allerhande dingen zeggen,
+die niet gemeend zijn. Genade, messire kapitein, en gij allen, mijne
+heeren, bidt voor mij.
+
+Plotseling verscheen Lamme in zijn hemde op het dek, en hij zei:
+
+--Kapitein en vrienden, wat ben ik blijde: 't was maar de monnik,
+dien ik hoorde schreeuwen, en geenszins het verken. Uilenspiegel,
+mijn zoon, ik heb een uitmuntend plan uitgedacht ten opzichte van
+Zijne Paterschap; schenk hem het leven, maar laat hem niet vrij, of
+hij speelt ons nog slechte poetsen op het schip: laat liever voor hem
+op het dek een enge, goed verluchte kooi maken, in dewelke hij slechts
+kan zitten en slapen, gelijk voor de kapoenen; laat mij hem spijzen,
+en hij worde gehangen als hij zooveel niet eet als ik wil.
+
+--Hij worde gehangen, als hij niet eet, zeiden Uilenspiegel en
+de Geuzen.
+
+--Wat schikt gij met mij te doen, dikzak? vroeg de monnik.
+
+--Dat zult ge later gewaarworden, antwoordde Lamme.
+
+En Uilenspiegel deed zooals Lamme wilde, en de monnik werd in de kooi
+gestoken, en elkeen kon hem op het gemak komen zien.
+
+Lamme was terug in de keuken gekeerd; Uilenspiegel volgde hem daar
+en hoorde hem twisten met Nele:
+
+--Ik leg mij te bed niet, zeide hij, neen, ik leg mij te bed niet;
+anderen zouden mijne sausen komen vermorsen; neen, ik blijf in mijn
+bed niet liggen lijk een kalf!
+
+--Maak u niet boos, Lamme, zeide Nele, of uwe wond gaat opnieuw open,
+en gij sterft.
+
+--Wel, zeide hij, dan sterf ik: ik ben moede van te leven zonder mijne
+vrouw. Is het niet hard genoeg voor mij, heur verloren te hebben, dat
+gij mij, den kok van het schip, nog wilt beletten zelf te zorgen voor
+den pot? Weet gij dan niet, dat geur van sausen en stoverije gezondheid
+baart? Zij voedt zelfs mijnen geest en pantsert mij tegen rampspoed.
+
+--Lamme, zeide Nele, gij moet luisteren naar onzen raad en u laten
+genezen door ons.
+
+--Ik wil mij laten genezen, sprak Lamme; maar dat geen andere, geen
+weetniet, geen leepoogige, stinkneuzige, etterige, slijmerige rabauw
+zich verstoute hier binnen te komen, om hier als kok te tronen in
+mijne plaats, en met zijn vuile vingeren mijne sausen te vermorsen,
+of ik sla hem den kop in met mijn houten pollepel, dewelke dan van
+ijzer zou zijn.
+
+--Maar, zeide Uilenspiegel, gij moet toch een helper hebben, gij
+zijt ziek....
+
+--Een helper, ik! zeide Lamme; ik, een helper! Om dat te zeggen,
+moet gij zoo vol ondankbaarheid zijn als eene worst, vol gekapt
+vleesch. Een helper, Thijl, en gij zijt het, die dit zegt tot mij,
+uwen vriend, die u zoo lang en zoo lekker gevoed heeft! Nu gaat mijne
+wond zeker weer open. Slechte vriend, wie anders hier zou uwe spijzen
+bereiden, dan ik? Wat zoudt gij beiden doen, als ik hier niet was om
+u, kapitein-hoofdman, en u, Nele, een of ander smakelijk gerecht voor
+te dienen?
+
+--Wij zouden ons behelpen en zelven den pot koken, zeide Uilenspiegel.
+
+--Den pot koken? zeide Lamme. Gij zijt goed om er van te eten, om zijn
+reuk op te snuiven; maar om hem gereed te maken, neen: arme vriend en
+kapitein-hoofdman, met al den eerbied, dien ik u verschuldigd ben,
+ik zou u in reepen gesneden weitasschen geven en gij zoudt ze eten
+voor vette darmen; laat mij, mijn vriend, hier kok blijven, of ik
+verdroog als een stok.
+
+--Blijf dan kok, zeide Uilenspiegel; maar geneest gij niet, dan sluit
+ik de keuken en eten wij niets dan beschuit.
+
+--Ha! mijn zoon, zeide Lamme, die weende van geluk, gij zijt goed
+als de Moeder Gods.
+
+
+
+
+IV.
+
+Doch hij scheen aan de beterhand.
+
+Alle Zaterdagen zagen de Geuzen hem het middel van den monnik meten,
+met een langen lederen riem.
+
+Den eersten Zaterdag zeide hij:
+
+--Vier voet.
+
+Daarna mat hij zich zelven en sprak:
+
+--Vier voet en half.
+
+En hij scheen weemoedig.
+
+Maar den achtsten Zaterdag, van den monnik sprekend, zeide hij vol
+blijdschap:
+
+--Vier voet en drij kwart.
+
+En als hij den monnik de maat nam, zeide deze grammoedig tot Lamme:
+
+--Wat wilt ge van mij, dikzak?
+
+Maar Lamme stak zijne tong uit naar hem en zeide geen woord.
+
+En, zevenmaal daags, zagen de soldaten en matrozen hem met een of
+ander nieuw gerecht afkomen en hoorden zij hem zeggen tot den monnik:
+
+--Hier zijn boonen met Vlaamsche boter: at gij er dergelijke in
+uw convent? Gij hebt een goede tronie: mager wordt men niet op
+de vloot van de Geuzen. Voelt gij geen kussen van vet in uwen rug
+groeien? Weldra hoeft gij, om te slapen, op geene matras meer te
+liggen.
+
+Bij het tweede maal, zeide hij:
+
+--Zie, hier zijn koekebakken naar de Brusselsche wijs; zie maar
+wat blonde, goudgele tint zij kregen in de oven: ziet gij de boter
+afdruipen? Zoo ook zal geschieden met het vet van uwen buik.
+
+--Ik heb geen eetlust, zei de monnik.
+
+--Maar gij moet eten, zei Lamme. Meent gij misschien, dat het
+heetekoeken van boekweitbloem zijn? 't Is zuivere tarwe, eerweerde
+vader, dikke, vette vader, 't is bloem van tarwemeel, vader met
+vierdubbele kin: ik zie de vijfde reeds aankomen, en mijn hert is
+verblijd. Eet!
+
+--Laat mij met vrede, dikzak, zei de monnik.
+
+Lamme, die grammoedig werd antwoordde:
+
+--Ik beschik over uw leven: hebt gij liever de koorde dan een goede
+teil erwtensoep met stukjes geroosterd brood, zooals ik er u dadelijk
+eene zal brengen?
+
+En toen Lamme met de teil kwam, vervolgde hij:
+
+--Erwtensoep alleen is eigenlijk geen eetmaal: ik heb er dan ook een
+schotel knoedelen naar Duitsche wijs bijgevoegd: dat zijn balletjes
+deeg met krenten, in het kokend water geworpen; knoedelen zijn zware
+kost, doch kweeken spek. Eet zooveel als gij kunt: hoe meer gij eet,
+hoe liever ik u zie: gij moet den viesneus niet spelen, en niet blazen
+alsof gij meer dan uwe bekomst hadt: eet! Is het niet beter te eten
+dan hangen te bengelen aan eene koord? Laat uwe dij zien! zij wordt
+ook dikker; twee voet en zeven duim omtrek. Waar vindt men nog eene
+hesp, die zoo dik is?
+
+Een uur naderhand kwam hij weer bij den monnik:
+
+--Neem, zeide hij, hier zijn negen duifjes: men heeft ze opzettelijk
+geschoten voor u, de onschuldige dieren, die, onbevreesd, boven de
+schepen vlogen; versmaad ze niet; in hunnen buik stak ik een balletje
+boter, broodkruim, geraspte muskaatnoot, kruidnagelen gestampt in een
+koperen vijzel, dewelke blinkt als uw vel: mevrouw de zonne is gansch
+verheugd zich te mogen spiegelen in een zoo helder gezicht als het uwe;
+dat komt van het vet, van het goede vet, dat ik u bezorgde!
+
+Voor den vijfden maaltijd, bracht hij een waterzoo.
+
+--Wat denkt gij hiervan? vroeg hij hem. De zee draagt en spijst u;
+meerder zou zij niet kunnen doen voor Zijne Koninklijke Majesteit. Ja,
+ja, klaarblijkelijk zie ik de vijfde kin wassen, een weinigje meer
+links dan rechts; wij zullen dien benadeelden kant moeten aanvetten,
+want de Heer heeft gezeid: "Weest rechtveerdig jegens elkeen". Waarin
+zou de rechtveerdigheid anders bestaan, dan in een rechtmatige
+verdeeling van vet? Voor uw zesde maal breng ik u mosselen--die
+oesters der armen--zooals gij er nooit kreegt in 't convent; dommeriken
+laten ze koken en eten ze zóó op, doch dat is maar de inleiding der
+stoverije: als zij gekookt zijn, moet men ze uit heure schelpen nemen,
+heure tengere lichaampjes in een stoofpan leggen, dan zachtjes laten
+stoven met selder, muskaatnoot en kruidnagelen en de saus binden met
+bier en meel; de mosselen worden dan voorgediend met sneden geroosterd
+en geboterd brood. Zoo deed ik voor u. Waarom zijn de kinderen een
+zoo groote erkentelijkheid verschuldigd aan vader en moeder? Omdat
+zij hun eene schuilplaats en liefde, maar vooral omdat zij hun eten
+gaven: dienvolgens moet ge mij beminnen als uw vader en uwe moeder
+te zamen, en zijt ge mij dezelfde dankbaarheid verschuldigd als hun:
+maar zie toch zoo verbolgen naar mij niet.
+
+... Als de mosselen gezakt zijn, breng ik u bierpap, goed gebonden met
+meel, goed gesuikerd, met veel kaneel. Weet gij waarom? Opdat uw vet
+doorschijnend zou worden en lustig op uw vel zou waggelen: als gij u
+verroert, ziet men het alreeds. Daar klinkt de taptoe: slaap in vrede
+zonder aan den dag van morgen te denken, in de zekerheid steeds uw
+vette eetmalen terug te vinden, alsmede uw verkleefden vriend Lamme,
+die ze u liefdevol zal geven.
+
+--Ga henen, satansjong, en laat mij bidden, zeide de monnik.
+
+--Bid, zeide Lamme, bid met begeleiding van een vroolijk gesnork:
+bier en slaap geven vet, goed vet. Ik, ik ben blijde!
+
+En Lamme trok naar zijn bed.
+
+En de matrozen en soldaten zeiden tot hem:
+
+--Waarom toch wilt gij dien vuilen monnik, die u geenerlei goed wil,
+zoo rijkelijk spijzen?
+
+--Laat mij begaan, zeide Lamme, ik verricht een schoon werk.
+
+
+
+
+V.
+
+Toen Wintermaand was gekomen, de maand der donkere dagen, zong
+Uilenspiegel:
+
+
+    Monseigneur, Zijn Doorluchtige Hoogheid,
+    Rukt zijn mom af,
+    Willend heerschen over België.
+    De verspaanschte staten,
+    Doch niet verangevijnscht,
+    Beschikken over de belastingen.
+    Slaat op de trommel
+    Der angevijnsche davering!
+
+    In hunne handen houden ze
+    Domeinen, accijns en renten,
+    't Benoemen der magistraten
+    En de ambten meteen.
+    Op de hervormden heeft hij 't gemunt,
+    Monsieur Zijn Doorluchtige Hoogheid,
+    Die in Frankrijk doorgaat voor atheïst.
+    O, de angevijnsche davering!
+
+    Want koning wil hij worden
+    Door het zwaard en 't geweld,
+    Alleenheerschend koning voorgoed,
+    Die Monseigneur, en Doorluchtige Hoogheid.
+    Innemen wil hij door verraad,
+    Menig schoone stad en Antwerpen mee;
+    Signorkens en pagaders, vroeg opgestaan,
+    O, de angevijnsche davering!
+
+    Niet op u, Frankrijk,
+    Werpt zich het volk, in blinde woede;
+    Niet uw edel lichaam treffen
+    Moorddadige wapenen;
+    Niet uw kinderen zijn het,
+    Wier lijken, hoop op hoop,
+    De Kipdorppoorte vullen.
+    O, de angevijnsche davering!
+
+    Neen, niet uw kinderen zijn het
+    Die het volk van de schansen neergooit,
+    Anjou is 't, Zijn Doorluchtige Hoogheid,
+    Anjou is 't, de lijdelijke wufteling,
+    Die leeft van uw bloed, o Frankrijk,
+    En het onze wil drinken.
+    Maar tusschen beker en lippen....
+    O, de angevijnsche davering!
+
+    Monsieur Zijn Doorluchtige Hoogheid,
+    Schreeuwt in een weerlooze stad:
+    Tue, tue, vive la messe!
+    Met zijn mooie lievelingen,
+    Wier oogen blinken
+    Van 't schandevuur, schaamteloos schuw,
+    Der ontucht zonder liefde.
+    O, de angevijnsche davering!
+
+    Hen velt men, niet u, arm volk,
+    Op wien ze drukken met belasting,
+    Zoutgeld, hoofdgeld, 't eerstenachtrecht,
+    U misprijzend, daar ze u afpersen
+    Koorn, paarden, wagens,
+    Gij, die hun een vader zijt,
+    O, de angevijnsche davering!
+
+    Gij, die hun een moeder zijt,
+    Zogend de brooddronkendheid
+    Dier moedermoorders, welke, in den vreemde
+    Uw naam bevlekken, o Frankrijk, overdaan
+    Met den smook van hun glorie,
+    Als ze hechten
+    Door woeste wapenfeiten....
+    O, de angevijnsche davering!
+
+    Een bloempjen aan uw krijgskroon,
+    Een provincie aan uw grondgebied.
+    Laat den dwazen haan, ontucht en oorlog,
+    Den voet op den strot,
+    Fransch volk, manhaftig volk,
+    Den voet die verplet!
+    En al de volkeren krijgen u lief
+    Om de angevijnsche davering!
+
+
+
+
+VI.
+
+In de Bloeimaand, als wanneer de Vlaamsche boerinnen 's nachts
+langzaam drie zwarte boonen achter zich over het hoofd werpen, om
+zich voor ziekte en dood te behoeden, ging Lamme's wond weder open;
+de kok had een zware koorts en vroeg, dat men hem zou leggen op het
+dek van het schip, rechtover de kooi van den monnik.
+
+Uilenspiegel stond het geerne toe; doch uit vreeze, dat zijn vriend
+in eenen aanval der ziekte overboord zou vallen, deed hij hem stevig
+binden op zijn bed.
+
+Zoodra Lamme een oogenblik bij zijn verstand was, vroeg hij of men
+den monnik niet vergat; en hij stak zijne tong naar hem uit.
+
+En de monnik zei:
+
+--Gij beleedigt mij, dikzak.
+
+--Toch niet, zeide Lamme, ik wil u vetmesten.
+
+De wind waaide zachtjes, de zonne was warm; Lamme leed aan de koorts,
+maar hij was stevig gebonden op zijn bed, opdat hij in zijne vlagen
+van ijlhoofdigheid niet overboord zou vallen; doch hij waande zich
+nog in de keuken en zei:
+
+--Dat fornuis staat heel gereed. Aanstonds zal het ortolanen
+regenen. Vrouw, span de strikken in onzen boomgaard. Zoo zijt
+gij schoon, met uwe mouwen opgestroopt tot aan uwe ellebogen. Uw
+arm is wit, ik wil er in bijten, bijten met mijne lippen, dewelke
+fluweelen tanden zijn. Wien hoort dat schoon vleesch, die prachtige
+boezem, dien ik zie dwars door uw wit, fijnlinnen jakje? Die
+zoete schat is mijn! Wie zal de stoverije maken van hanekammetjes
+en kiekenstuiten? Niet te veel muskaatnoot, daarvan krijgt men
+koorts. Witte saus, tijm en laurier. Waar zijn de eierdooiers?
+
+Vervolgens wenkte hij Uilenspiegel tot zich en zeide:
+
+--Straks zal het wild regenen: ik zal u vier ortolanen meer geven
+dan aan de anderen. Gij zijt de gezagvoerder, maar verraad mij niet!
+
+Toen hij de golven zachtjes tegen den wand van het schip hoorde
+klotsen, sprak hij verder:
+
+--De soep kookt, mijn zoon, de soep kookt, maar met dat fornuis kan
+ik geen vuur krijgen.
+
+Zoodra hij weer tot zijne zinnen kwam, vroeg hij naar den monnik.
+
+--Waar is hij? Vet hij aan?
+
+En als zijn blik op hem viel, stak hij zijne tong naar hem uit,
+zeggende:
+
+--Het groote werk wordt voltooid.
+
+Eens vroeg hij, dat men de groote waag op het dek zou brengen,
+dat men hem zelven op een schaal zou zetten en den monnik op de
+andere. Nauwelijks was de monnik erop, of Lamme steeg omhoog lijk
+een vuurpijl in de lucht en, hem vreugdevol beziende, zeide hij:
+
+--Hij is zwaarder! hij is zwaarder! ik ben licht als een geest tegen
+hem: ik wil als een vogel de lucht klieven; ik heb mijn plan: neemt
+er hem af, dat ik beneden kunne; legt er nu de gewichten op: zet hem
+weder op de schaal. Hoeveel weegt hij? Driehonderd veertien pond. En
+ik? Tweehonderd twintig!
+
+
+
+
+VII.
+
+In den nacht van den volgenden dag, bij de eerste ochtendschemering,
+werd Uilenspiegel gewekt door Lamme, die schreeuwde:
+
+--Uilenspiegel! Uilenspiegel! help, laat heur niet vertrekken. Snijd
+de koorden door! snijd ze door!
+
+Uilenspiegel klom op het dek en vroeg:
+
+--Waarom roept gij? ik zie niets.
+
+--Zij is 't, antwoordde Lamme, zij is 't, mijne vrouw, daar in die
+sloep, welke de vlieboot omvaart; ja, om de vlieboot, van welke die
+zangen en die vedeltonen kwamen.
+
+Nele was ook op het dek geklommen.
+
+--Snijd de koorden door, mijne vriendin, zei Lamme. Ziet gij niet,
+dat mijne wond genezen is? Heur zachte hand heeft ze verbonden; zij,
+ja, zij. Ziet gij ze rechtstaan in de sloep? Hoort gij? Zij zingt
+nog. Kom, mijne liefste, kom, ontvlucht uwen armen Lamme niet meer,
+die zonder u zoo moederziel alleen was op de wereld.
+
+Nele nam zijne hand vast en legde de heure op zijn voorhoofd.
+
+--Hij heeft nog koorts, sprak zij.
+
+--Snijdt de koorden door, zei Lamme; geeft mij eene sloep! Ik ben
+levend, ik ben gelukkig, ik ben genezen!
+
+Uilenspiegel sneed de koorden door: Lamme sprong in zijn wit linnen
+hooze, zonder wambuis, uit zijn bed, en wilde zelf de sloep in
+zee laten.
+
+--Zie hem bezig, zeide Nele tot Uilenspiegel: zijne handen beven
+van ongeduld.
+
+Toen de sloep gereed was, daalden Uilenspiegel, Nele en Lamme er in
+met eenen roeier, en deze wriggelde naar de vlieboot, die, verre in
+de reede, op anker lag.
+
+--Zie, wat schoone vlieboot, zeide Lamme, die weldra, uit ongeduld,
+de plaats van den roeier ingenomen had.
+
+De romp en de masten van de vlieboot kwamen slank uit op den frisschen
+morgenhemel, die, als verguld kristal, gekleurd werd door de rijzende
+zonne.
+
+Terwijl Lamme dapper doorwrikte, vroeg Uilenspiegel hem:
+
+--Zeg ons nu hoe gij ze terugvondt.
+
+Lamme antwoordde met horten en stooten:
+
+--Ik sliep, reeds aan de beterzijde. Eensklaps dof gerucht. Stuk hout
+klopt op het schip. Sloep! Op het gerucht een matroos toegeloopen:
+Wie daar? Een zoete stem, de heure, mijn zoon, de heure antwoordt:
+"Vrienden". Vervolgens grovere stem: "Vive le Geus: bevelhebber van
+vlieboot Johanna moet Lamme Goedzak spreken". Matroos laat de ladder
+beneden. De maan glom. Ik zie mannelijke gedaante op het dek klimmen:
+breede heupen, ronde knieën, breed bekken; vrouw, maar geen man, zei
+ik bij mij zelven: ik voel als eene roos die ontluikt en mijne kaak
+streelt: heure lippen, mijn zoon, en ik hoor heur zeggen, begrijpt
+gij? zij zelve, mij met kussen en tranen bedekkend--vloeibaar vuur,
+dat als balsem nederviel op mijn gelaat--zij zelve zeide mij: "Ik weet,
+dat ik misdoe, maar ik bemin u, mijn man! Ik heb voor God gezworen: ik
+verbreek mijnen eed, mijn man, mijn arme man! dikwijls ben ik gekomen
+zonder u te durven naderen; eindelijk stond de matroos het mij toe:
+ik verbond uwe wond, gij herkendet mij niet; maar ik heb u genezen,
+wees niet grammoedig, man! Ik ben u gevolgd, maar ik ben bevreesd,
+hij is op dit schip: laat mij vertrekken; zoo hij mij zag, zou hij mij
+verdoemen en zou ik branden in het eeuwige vuur!" Zij kuste mij nog,
+weenend en gelukkig, en vertrok, mijns ondanks, in spijt van mijne
+tranen: gij hadt mijne armen en beenen gebonden, mijn zoon, maar nu....
+
+Dit zeggende, gaf hij krachtdadige riemslagen; het was als de gespannen
+koord van eenen boog, die den pijl in de lucht schiet.
+
+Naarmate zij de vlieboot naderden, zeide Lamme:
+
+--Daar staat zij op het dek, zij speelt op de vedel, mijn beminnelijke
+vrouw, met heur goudbruine lokken, heur bruine oogen, heur frissche
+koonen, heur bloote, ronde armen, heur witte handjes. Vlieg over den
+vloed, sloep!
+
+Toen de kapitein van de vlieboot de sloep zag naderen en Lamme als een
+duivel wriggelen, liet hij eene ladder uitwerpen. Toen Lamme er dicht
+bij was, sprong hij van de sloep op de ladder, op gevaar af van in
+zee te vallen, zoodat de sloep meer dan drie vademen achteruit gleed;
+en, vlug als eene kat op het dek klaverend, liep hij naar zijne vrouw,
+die, buiten zich zelve van geluk, hem kuste en omhelsde, en zeide:
+
+--Lamme! breng mij niet ten verderve; ik heb voor God gezworen,
+maar ik bemin u. Ha! lieve man!
+
+Nele riep:
+
+--'t Is Kalleken Huybrechts, het schoone Kalleken!
+
+--Ik ben het, sprak zij, ja, Kalleken, maar schoon is ze niet meer!
+
+En zij zette een jammerlijk gezicht.
+
+--Wat hebt gij gedaan, vroeg Lamme, wat zijt gij geworden? waarom
+liet ge mij zitten? waarom wilt gij mij weder verlaten?
+
+--Luister, zeide zij, wees niet grammoedig, ik zal u alles bekennen:
+wetende dat al de monniken mannen Gods zijn, vertrouwde ik mij aan
+een hunner; hij heet broer Cornelis Adriaensen.
+
+Toen Lamme dit hoorde, riep hij uit:
+
+--Wat, die smerige paap, wiens mond een rioolgat was, vol drek en vol
+modder, en die steeds dorstte naar het bloed der hervormden! Wat! die
+verdediger der brandstapels en der plakkaten! Ha! 't was die gemeene
+schavuit!
+
+Kalleken sprak:
+
+--Laster den man Gods niet!
+
+--De man Gods! zeide Lamme, ik ken hem: het was de man van vuilnis en
+vuigheid. Wat rampspoed! mijn schoon Kalleken gevallen in de handen
+van dien ontuchtigen vuilbaard! Nader mij niet, of ik dood u; en ik,
+die heur zoozeer beminde! mijn arm bedrogen hert, dat ganschelijk
+heur was! Wat komt gij hier doen op onze schepen? waarom hebt gij mij
+opgepast? waarom liet ge mij niet sterven? Ga heen, ik wil u voor mijne
+oogen niet meer zien; ga heen, of ik smijt u in de zee. Mijn mes!...
+
+Doch zij vloog om zijnen hals en sprak:
+
+--Lamme, mijn man, ween niet: ik ben niet wat gij denkt: ik behoorde
+nooit aan dien monnik.
+
+--Gij liegt, zeide Lamme weenend en knarsetandend tegelijk. Ha! nooit
+was ik jaloersch, doch nu ben ik het! Ongelukkige drift, grammoedigheid
+en liefde, behoefte aan dooden en worgen. Uit mijne oogen! neen,
+blijf! Ik was zoo goed voor heur! De moordlust is meester in mij. Mijn
+mes! Ho! hier brandt, verteert, knaagt iets in mij; gij spot met
+mij....
+
+Zoet en onderdanig, omhelsde zij hem weenend.
+
+--Ja, zeide hij, ik ben belachelijk met mijne gramschap: ja, gij
+bewaardet mijne eer, die eer, die men dwaselijk hangt aan den rok
+eener vrouw. Daarom was het dus, dat gij uw zoetste lonkjes koost om
+mij te vragen of gij met uwe vriendinnen naar het sermoen mocht gaan?
+
+--Laat mij spreken, zei de vrouw hem omhelzend: ik mag op staanden
+voet doodvallen, zoo ik u ooit bedroog.
+
+--Wel, val dan dood, zeide Lamme, want gij gaat liegen!
+
+--Luister, zeide zij.
+
+--Spreek of zwijg, sprak Lamme, 't is mij eender.
+
+--Broer Adriaensen, zeide zij, ging door voor een bespraakt predikant;
+hij stelde den geestelijken en den ongehuwden staat verre boven
+den anderen, als best geschikt om de geloovigen in het hemelrijk te
+brengen; zijne welsprekendheid was groot en onstuimig: daardoor bracht
+hij het verstand op hol van meerdere eerlijke vrouwen, onder dewelke
+ik telde, en ook van een groot aantal weduwen en meidekens. Vermits
+de ongehuwde staat zoo volmaakt was, bezwoer hij ons in denzelven te
+blijven: wij zwoeren, dat wij ons nimmermeer zouden laten trouwen....
+
+--Behalve door hem ... zei Lamme weenend.
+
+--Zwijg toch, zeide zij grammoedig.
+
+--Komaan, sprak hij, voltooi uw werk: gij hebt mij een harden slag
+toegebracht, ik zal hem niet overleven.
+
+--'t Doet, zeide zij, zoo ik altijd bij u blijf, man.
+
+Zij wilde hem omhelzen en kussen, maar hij stiet heur van zich af.
+
+--De weduwen, zeide zij, zwoeren vóór hem, nooit te zullen hertrouwen.
+
+En Lamme aanhoorde heur, gedachteloos in zijn jaloersche droomerij.
+
+Kalleken vervolgde, beschaamd, heure rede:
+
+--Hij wilde, zeide zij, geen andere biechtelingen dan jonge en schoone
+vrouwen of meidekens: de anderen stuurde hij naar den paap heurer
+parochie. Hij stelde eene orde van godvruchtige vrouwen in, en deed
+ons allen zweren niemand anders tot biechtvader te zullen nemen dan
+hem: dat zwoer ik; mijne gezellinnen, beter onderricht dan ik, vroegen
+mij of ik mij wilde laten onderwijzen in de Heilige Geeseling en in de
+Heilige Boete: ik stemde toe. Er was te Brugge, op de Steenkappersrei,
+omtrent het Minderbroedersklooster, een huis bewoond door eene vrouw,
+genoemd Kalle de Naeyer, welke aan de meidekens kost en onderricht
+gaf, tegen een karolusgulden per maand: Broer Cornelis kon bij Kalle
+de Naeyer binnen, zonder oogenschijnlijk uit zijn klooster te komen,
+het was in dit huis dat ik ging, in een kleine kamer, in dewelke hij
+zich alleen bevond; daar gebood hij mij, hem al mijn natuurlijke en
+vleeschelijke neigingen te zeggen; eerst durfde ik niet, maar ten
+slotte gaf ik toe: ik weende en zeide hem alles.
+
+--Laas! schreide Lamme, en alzoo ontving die zwijnachtige monnik uw
+zoete biechte!
+
+--Hij zeide mij steeds, en dit is waar, mijn man, dat er boven de
+aardsche eerbaarheid een hemelsche eerbaarheid bestaat, door dewelke
+wij God onze wereldsche schaamte offeren, en dat wij aldus aan onzen
+biechtvader al onze geheime lusten moeten bekennen, en dan weerdig
+zijn de Heilige Geeseling en de Heilige Boete te ontvangen.
+
+Eindelijk beval hij mij, naakt vóór hem te gaan staan, om op mijn
+lichaam, dat gezondigd had, de al te lichte kastijding mijner schulden
+te ontvangen. Eens gebood hij mij, mij te ontkleeden; ik viel in
+onmacht toen ik mijn hemde moest uitdoen: hij bracht mij weer tot
+mij zelve, door middel van fleschjes.--"'t Is goed voor deze reize,
+mijne dochter, sprak hij, kom binnen twee dagen terug en breng eene
+roede mee". Dit duurde lang, zonder dat hij ooit ... ik zweer het
+voor God en al zijne santen ... mijn man ... begrijp mij ... kijk
+naar mij ... zie of ik lieg: ik bleef zuiver en trouw ... ik beminde u.
+
+--Arm zoet lichaam, zeide Lamme. O, vlek van schande op uw bruidskleed!
+
+--Lamme, zeide zij, hij sprak in den naam Gods en onzer Moeder,
+de Heilige Kerk; moest ik hem niet aanhooren? Ik beminde u steeds,
+maar door schromelijke eeden had ik de Maagd gezworen mij aan u te
+onttrekken; ik was nochtans zwak voor u, Lamme. Herinnert gij u nog het
+gasthof te Brugge? Ik was bij Kalle de Naeyer, gij reedt daar voorbij
+op uwen ezel, met Uilenspiegel. Ik volgde u; ik had een schoone som
+gelds op zak, want ik verteerde niets voor mij zelve; ik zag, dat
+gij honger hadt: mijn hert trok naar u, ik had medelijden en liefde!
+
+--Waar is hij nu? vroeg Uilenspiegel.
+
+Kalleken antwoordde:
+
+--Na een onderzoek, bevolen door den magistraat, en eene nasporing
+van de boozen, moest broer Adriaensen de stede Brugge verlaten,
+en hij nam de wijk naar Antwerpen. Op de vlieboot zeide men mij,
+dat mijn man hem gevangen nam.
+
+--Wat! riep Lamme, die monnik dien ik vetmest, is....
+
+--Hij zelf, antwoordde Kalleken, terwijl zij heur aangezicht met
+heure handen bedekte.
+
+--Eene akst! eene akst! zeide Lamme, dat ik hem doode, dat ik het
+vet van dien geilen bok bij opbod verkoope! Gauw, laat ons naar het
+schip terugkeeren. De sloep! Waar is de sloep?
+
+Nele sprak:
+
+--Het is een eerlooze wreedheid eenen gevangene te dooden of te
+kwetsen.
+
+--Gij beziet mij zoo verschrikkelijk, zeide hij, zoudt gij het mij
+beletten?
+
+--Ja, zeide zij.
+
+--Wel, sprak Lamme, ik zal hem geenerlei leed doen: laat mij hem
+slechts uit zijne kooi trekken. De sloep! Waar is de sloep?
+
+Zij stapten weldra in de sloep. Lamme wrikte zoo vlug als hij kon en
+schreide tegelijk.
+
+--Zijt gij droef, man? vroeg Kalleken hem.
+
+--Neen, zeide hij, ik ben gelukkig: zult ge mij niet meer verlaten?
+
+--Nooit! zeide zij.
+
+--Gij waart zuiver en trouw, zegt gij; maar, zoet, lief Kalleken,
+ik leefde enkel om u weder te vinden, en nu zal, door de schuld van
+dien monnik, ons geluk vergiftigd zijn door jaloerschheid.... Zoodra
+ik droef zal wezen of enkellijk moede, zal ik u in verbeelding
+naakt zien, uw schoon lichaam onderwerpende aan die schandelijke
+geeseling. De lente onzer liefde was aan mij, doch de zomer aan hem;
+de herfst zal grauw zijn; weldra komt de winter en die zal mijn trouwe
+liefde begraven.
+
+--Gij weent, zeide zij.
+
+--Ja, sprak hij, wat voorbij is, komt nimmer terug.
+
+Toen zei Nele:
+
+--Als Kalleken trouw was, moest zij u weer alleen laten om uw leelijke
+woorden.
+
+--Hij weet niet hoezeer ik hem altoos beminde, zei Kalleken.
+
+--Zegt gij de waarheid? riep Lamme uit; kom, liefste, kom, mijne vrouw;
+geen grauwe herfst, en geen winter des doods meer!
+
+En hij zag er blijde uit, en zij kwamen op het schip.
+
+Uilenspiegel gaf de sleutels van de kooi aan Lamme, die deze opende;
+hij wilde den monnik bij een oor op het dek trekken, maar het ging
+niet; toen wilde hij hem zijdelings doen buitenkomen, maar het ging
+ook niet.
+
+Wij moeten het kot uitbreken; de kapoen is gemest, zeide hij.
+
+De monnik kwam er toen uit, keek met groote, verdwaasde oogen in
+het rond, hield met de beide handen zijn buik op, en viel op zijn
+achterste, ter oorzake van een hevige baar, die het schip ophief.
+
+En Lamme zei tot den monnik:
+
+--Zult ge mij nog dikzak heeten? gij zijt dikker dan ik! Wie diende
+u zeven eetmalen daags vóór? Ik! Hoe komt het, schreeuwer, dat gij
+nu zachtmoediger zijt jegens de arme Geuzen?
+
+En, zijne rede vervolgend:
+
+--Als gij nog een jaar in uwe kooi blijft, kunt gij er niet meer uit:
+bij de minste beweging lillen uwe kaken als verkensgelei; gij schreeuwt
+al niet meer; weldra zult gij niet meer kunnen blazen.
+
+--Zwijg, dikzak, zeide de monnik.
+
+--Dikzak, zei Lamme, in woede ontstekend, ik ben Lamme Goedzak;
+gij zijt broer Dikzak, Vetzak, Slokzak, Leugenzak, Modderzak; gij
+hebt vier duim spek onder uw vel; men ziet uwe oogen niet meer;
+Uilenspiegel en ik zouden, op ons gemak, huizen in uwen buik, die
+groot is als eene kerk. Gij heet mij dikzak, wilt gij eenen spiegel
+om Uwe Dikbuikigheid te bewonderen? Ik ben het, die u voed, gevaarte
+van vleesch en been. Ik heb gezworen, dat gij vet zult spuwen, dat
+gij vet zult zweeten, dat gij sporen van vet achter u zult nalaten,
+als eene keers, die smelt in de zonne. Men zei mij, dat de geraaktheid
+komt met de zevende kin: de zesde is in aantocht!
+
+Vervolgens wendde hij zich tot de Geuzen:
+
+--Aanschouwt dien hoereerder! sprak hij. Het is broer Cornelis
+Adriaensen, van Brugge: dáár preekte hij een nieuwe eerbaarheid. Zijn
+vet is zijne straf, en zijne straf is mijn werk. Nu, luistert,
+gij allen, matrozen en soldaten: ik ga u verlaten, u verlaten,
+Uilenspiegel, u verlaten, u ook, kleine Nele, om naar Vlissingen
+te tiegen, alwaar ik eenig goed bezit, en er te leven met mijn arme
+wedergevondene vrouw. Vroeger zwoert gij, mij alles toe te staan wat
+ik zou vragen....
+
+--Dat is Geuzenwoord zeiden zij.
+
+--Dus, zeide Lamme, aanschouwt dien hoereerder, dien broer Adriaensen,
+Vetlap-aensen van Bruggen; ik zwoer hem te doen sterven in zijn vet
+als een zwijn; maakt hem een grootere kooi, doet hem met geweld twaalf
+eetmalen daags verorberen in stede van zeven; geeft hem vetten en
+gesuikerden kost; hij lijkt reeds een os, maakt er een olifant van,
+en weldra zult gij hem de hoeken zijner kooi zien vullen.
+
+--Wij zullen hem voortmesten, zeiden zij.
+
+--En nu, vervolgde Lamme, tot den monnik sprekend, u ook, rabauw,
+dien ik doe voeden op kloosterwijs, in stee van u te doen hangen,
+u ook zeg ik vaarwel: en leef op hoop van vet en van geraaktheid!
+
+Vervolgens zijne vrouw, zijn Kalleken, in de armen drukkend, voegde
+hij er bij:
+
+--Kijk, gij moogt knorren of balken, maar ik neem ze mee, gij zult
+ze niet langer geeselen!
+
+Maar de monnik, in woede ontstoken, zeide tot Kalleken:
+
+--Gij keert dus terug naar uw leger van wellust, o zinnelijke
+vrouwe! Ja, gij gaat henen zonder mededoogen met den armen martelaar
+voor Gods woord, die u de heilige, zoete en hemelsche geeseling
+leerde. Wees gedoemd! Nooit schenke een priester u vergiffenis;
+de grond brande onder uwe voeten; suiker weze u zout; ossevleesch
+weze u kroengevleesch; brood weze u assche; de zonne weze u ijs,
+en sneeuw een hellevuur; de vrucht uws lichaams weze gevloekt;
+uwe kinderen wezen afschuwelijk: met de leden van een aap, een
+verkenshoofd grooter dan hun buik; lijden, weenen, zuchten weze uw lot
+in deze wereld en in de andere, in de helle die u wacht, de helle van
+zwavel en pik, die branden voor de wijven van uw slag; gij weigerdet
+mijn vaderlijke liefde: wees driemaal vermaledijd door de heilige
+Drievuldigheid; zevenmaal vermaledijd door de kandeleers der Ark;
+de biecht weze u verdoemenis; de hostie weze u doodelijk venijn; en,
+in de kerken, richte elke vloersteen zich op om u te verpletteren en
+u te zeggen: "Hier is de hoereerster; hier is de verdoemde; hier is
+de vermaledijde!"
+
+En Lamme sprong op van geluk en riep blijde uit:
+
+--Zij was trouw, de monnik heeft het gezegd! Leve Kalleken!
+
+Doch zij, weenend en sidderend, zeide:
+
+--O, Lamme, neem die verdoemenis over mij weg! Ik zie de helle! Neem
+de verdoemenis weg!
+
+--Monnik, trek de verdoemenis in, gebood Lamme.
+
+--Ik zal het niet doen, dikzak, antwoordde de monnik.
+
+En de vrouw, bleek en sidderend, viel op de knieën en smeekte broer
+Adriaensen met de handen te zamen.
+
+En Lamme zei tot den monnik:
+
+--Trek de verdoemenis in of gij wordt gehangen: en, breekt de koorde,
+uit hoofde van uwe zwaarte, zoo wordt gij herhangen, totdat de dood
+er op volge.
+
+--Gehangen en herhangen! zeiden de Geuzen.
+
+--Als het zoo is, zei de monnik tot Kalleken, ga dan, ontuchtige
+vrouwe; ga dan met dien dikzak; ga, ik hef mijne verdoemenis op, maar
+God en al zijne santen houden u in het oog: ga met dien dikzak, ga!
+
+En hij zweeg, blazend en zweetend.
+
+Plotseling riep Lamme uit:
+
+--Hij zwelt op, hij zwelt op! Daar is de zesde kin: de zevende kin
+is de geraaktheid!
+
+... En nu, zeide hij tot de Geuzen, ik beveel u aan God, u,
+Uilenspiegel aan God, u allen, mijn goede vrienden, aan God, Nele
+mijne vriendin, aan God, de heilige zaak van de vrijheid: ik kan
+niets meer voor haar....
+
+Vervolgens, als hij iedereen omhelsd had, zeide hij tot zijne vrouw
+Kalleken:
+
+--Kom, het is het uur van onze wettige liefde.
+
+Terwijl het bootje, dat Lamme en zijne welbeminde meevoerde, over
+het water gleed, riepen al de matrozen, soldaten en scheepsjongens
+met hunnen hoed zwaaiend:
+
+--Vaarwel, broeder; vaarwel, Lamme; vaarwel, broeder, broeder en
+vriend!
+
+En Nele wischte met heur liefelijken vinger eenen traan uit het oog
+van Uilenspiegel en zeide tot hem:
+
+--Gij zijt droef, mijn vriend?
+
+--Hij was goed, zeide hij.
+
+--Ha! zeide zij, zal die oorlog dan nooit een einde nemen, zullen
+wij dan immer gedwongen zijn te leven in bloed en in tranen?
+
+--Laat ons de Zeven zoeken, antwoordde Uilenspiegel: het is nakend,
+het uur der verlossing....
+
+Volgens de belofte, die zij aan Lamme gedaan hadden, mestten de
+Geuzen den monnik voort in zijne kooi. Doch op zekeren dag werden
+zij het moede, en ze stelden hem in vrijheid tegen een rantsoen bij
+'t gewicht; en hij bracht een mooien stuiver op, want hij woog toen
+driehonderd zeventien pond en vijf onsen, Vlaamsch gewicht.
+
+En hij stierf als prior van zijn convent.
+
+
+
+
+VIII.
+
+Te dien tijde vergaderden de heeren van de Staten-Generaal te
+'s-Gravenhage, om Philippus, koning van Spanje, grave van Vlaanderen,
+van Holland enz., te oordeelen naarvolgens de door hem verleende
+charters en privileges.
+
+En de griffier sprak als volgt:
+
+--Het is een iegelijk bekend, dat een landvorst aangesteld is door
+God, als souverein en hoofd zijner onderdanen, om ze te verdedigen
+en te vrijwaren van alle beleediging, verdrukking en geweld, evenals
+een herder aangesteld is voor de verdediging en de hoede zijner
+kudde. Het is mede algemeen bekend, dat de onderdanen geenszins door
+God geschapen zijn ten gerieve des prinsen, om hem gehoorzaam te wezen
+in alles wat hij zou heeten, hetzij dat het vroom is of goddeloos,
+rechtveerdig of onrechtveerdig, noch om denzelven te dienen als
+slaven. Maar de vorst is vorst ten behoeve van zijne onderdanen,
+zonder dewelke hij niet kan wezen, om naar recht en rede te bestieren;
+om ze te behouden en te beminnen als een vader zijne kinderen, als
+een herder zijn kudde, en zijn leven te wagen om ze te verdedigen;
+doet hij het niet, zoo moet hij aanzien worden, niet voor eenen
+vorst, maar voor eenen dwingeland. Door oproeping van soldaten,
+door bullen van kruistocht en van kerkban, zond Philippus koning,
+vier uitheemsche legers af tegen ons. Welke zal zijne straf wezen,
+overeenkomstig de wetten en costumen van den lande?
+
+--Hij weze vervallen, antwoordden de heeren der Staten.
+
+--Philippus heeft zijne eeden verbroken; hij vergat de diensten, welke
+wij hem bewezen, de zegepralen, welke wij hem hielpen behalen. Toen
+hij zag, dat wij rijk waren, liet hij ons afzetten en bestelen door
+die van den raad van Spanje.
+
+--Hij weze vervallen als ondankbare en dief, antwoordden de heeren
+der Staten.
+
+--Philippus, vervolgde de griffier, stelde in de machtigste steden
+des lands bisschoppen aan, begiftigde en bevoordeelde dezelven met
+de goedingen der grootste abdijen; door de hulp van dezelven, bracht
+hij de Spaansche Inquisitie in onze landen.
+
+--Hij weze vervallen als beul, verkwister van eens andermans goeding,
+antwoordden de heeren der Staten.
+
+--Ten aanzien van de dwingelandij, vertoonden de edelen van de landen
+ten jare 1566 een verzoekschrift, bij hetwelk zij den souvereinen
+vorst smeekten zijn strenge plakkaten te verzachten en namelijk die
+op het stuk der inquisitie: hij weigerde steeds.
+
+--Hij weze vervallen als een tijger, die hardnekkig is in de wreedheid,
+antwoordden de heeren der Staten.
+
+De griffier vervolgde:
+
+--Philippus wordt ernstig verdacht van, door die van zijnen raad
+van Spanje, heimelijk den beeldenstorm en de plundering der kerken
+te hebben bewerkt, ten einde, onder voorwendsel van misdaad en
+wanordelijkheden, vreemde legers tegen ons te kunnen afzenden.
+
+--Hij weze vervallen als een werktuig des doods, antwoordden de heeren
+der Staten.
+
+--Te Antwerpen deed Philippus de inwoneren slachten, en de Vlaamsche
+en vreemde kooplieden ten onder brengen. Hij en zijn raad van
+Spanje gaven, door heimelijke onderrichtingen, aan zekeren Roda,
+een beruchten rabauw, het recht zich hoofdman der plunderaars te
+verklaren, den buit op te garen, zijn naam, van hem, Philippus koning,
+te gebruiken, zijne zegelen na te maken en zich te gedragen als zijn
+landvoogd en stedehouder. De onderschepte koninklijke brieven, welke
+zich in onze handen bevinden, bewijzen het stuk. Alles is gebeurd
+met zijne toestemming en na overleg met den raad van Spanje. Leest
+zijne brieven: daarin looft hij het feit van Antwerpen, bekent hij een
+uitstekenden dienst ontvangen te hebben, belooft hij dien te zullen
+beloonen, zet hij Roda en de andere Spanjaards aan, voort te gaan op
+dien roemvollen weg.
+
+--Hij weze vervallen als dief, als plunderaar, als moordenaar,
+antwoordden de heeren der Staten.
+
+--Wij willen slechts het behoud van onze privileges, een eerlijken
+en verzekerden vrede, meer vrijheid, namelijk op het stuk van den
+godsdienst, welke hoofdzakelijk eene gewetenszaak is: van Philippus
+kregen wij niets dan leugenachtige verdragen, welke tweedracht
+moesten zaaien onder de provinciën, om ze de eene na de andere te
+onderwerpen en met haar te handelen als met Indië, door plundering,
+verbeurdverklaring, terdoodbrenging en inquisitie.
+
+--Hij weze vervallen als moordenaar, die den moord van de landen
+beraamt, antwoordden de heeren der Staten.
+
+--Hij deed de landen bloeden door den hertog van Alva en zijne
+trawanten, door Medina Celi, Requesens, de judassen der raden van
+State en van de provinciën; don Juan en Alexander Farnese beval hij
+met ongemeene en bloedige strengheid te werk te gaan (zooals weer
+blijkt uit zijne onderschepte brieven); hij sloeg in den rijksban Prins
+Willem van Oranje, betaalde drie moordenaars, in afwachting dat hij den
+vierden betaalt; deed in de landen kasteelen en vestingen oprichten,
+deed de mannen levend verbranden, de vrouwlieden en meidekens levend
+begraven; erfde hunne goedingen, verworgde Montigny, Bergen en andere
+heeren, in weerwil van zijn koninklijk woord; hij doodde zijn zoon
+Carlos; vergiftigde prins Ascoly, dien hij deed trouwen met dona
+Eufrasia, dewelke door hem was bezwangerd, ten einde den bastaard,
+die moest geboren worden, met zijne goederen te verrijken; veerdigde
+tegen ons een edict uit, hetwelk ons allen verraders verklaarde, ons
+lijf en goed ontnemend, en bedreef die in een kersten land ongekende
+misdaad, geen onderscheid te maken tusschen schuldigen en onschuldigen.
+
+--Uit hoofde van alle wetten, rechten en privilegiën, weze hij
+vervallen, antwoordden de heeren der Staten.
+
+En de zegels des konings werden gebroken.
+
+En de zonne gloorde over land en zee, verguldde de gezwollen korenaren,
+rijpte de druiven en strooide op elke baar van de zee flikkerende
+perelen, het sieraad van Neerlands bruid: de Vrijheid.
+
+Vervolgens werd de Prins, te Delft zijnde, door een vierden moordenaar
+met drie kogels in de borst getroffen. En hij stierf, volgens zijne
+spreuk: "Rustig onder de wreede baren".
+
+Zijne vijanden zeiden van hem, dat hij, om koning Philippus te
+bestoken, en daar hij toch niet hoopte over de zuidelijke, katholieke
+Nederlanden te regeeren, deze bij geheim verdrag aangeboden had aan
+monseigneur Zijne Groote Hoogheid van Anjou. Doch deze was geenszins
+geboren om de telg Belgieland te verwekken bij de Vrijheid, dewelke
+niet houdt van buitensporige minnarijen.
+
+En Uilenspiegel verliet met Nele de vloot.
+
+En het Belgische vaderland zuchtte onder het juk, geworgd, gekneveld
+door de verraders.
+
+
+
+
+IX.
+
+Toen was men in de maand van het rijpe koren; de lucht was drukkend,
+de wind zoel: onder den vrijen hemel, op een vrijen grond, konden
+maaiers en pikkers in de akkers vrijelijk het koren oogsten, dat zij
+gezaaid hadden.
+
+Friesland, Drente, Overijsel, Gelderland, Utrecht, Noord-Brabant,
+Noord- en Zuid-Holland; Walcheren, Noord- en Zuid-Beveland, Duiveland
+en Schouwen, welke Zeeland uitmaken; heel de kust der Noordzee,
+van Knokke tot den Helder; de eilanden Texel, Vlieland, Ameland,
+Schiermonnikoog zouden, van de Wester-schelde tot de Ooster-Eems,
+het Spaansche juk afschudden; Maurits, zoon van den Zwijger, zette
+den oorlog voort.
+
+Nog ten volle in het bezit van hunne jeugd, hunne kracht en hunne
+schoonheid,--want de liefde en de geest van Vlaanderen blijven immer
+jong,--leefden Uilenspiegel en Nele rustig in den toren van Veere,
+in afwachting, dat, na menigvuldige wreede beproevingen, de wind der
+vrijheid over het Belgische vaderland zou waaien.
+
+Uilenspiegel had gevraagd om bevelhebber en wachter van den toren
+te worden benoemd, aanvoerende, dat hij, met zijne arendsoogen en
+hazenooren, zou kunnen zien en hooren of de Spanjaard het soms niet
+beproefde terug te komen naar de verloste landen en dat hij alsdan
+wacharm zou luiden.
+
+De magistraat deed wat hij vroeg: om den wille van zijn goede diensten,
+gaf men hem een gulden daags, twee pinten bier, boonen, kaas, beschuit,
+alsmede drie pond vleesch in de week.
+
+Aldus leefden Uilenspiegel en Nele getweeën heel goed; van verre zagen
+zij met vreugde de vrije Zeeuwsche eilanden: weiden en bosschen,
+kasteelen en vestingen, en de gewapende schepen der Geuzen, die de
+kusten bewaakten.
+
+'s Nachts klommen zij zeer dikwijls omhoog op den toren en, daar naast
+elkander gezeten, koutten zij over de harde gevechten, de schoone
+minnarijen van het verleden en ook van de toekomst. Van daar zagen zij
+de zee, welker lichtende golven zich braken en in schuim uiteenspatten,
+en als vurige spoken op de eilanden vielen. En Nele was verschrikt
+als zij in de polders dwaallichtjes zag, welke, zeide zij, zielen
+van arme dooden zijn. En al deze plaatsen waren slagvelden geweest.
+
+De dwaallichtjes stegen op uit de polders, huppelden langshenen
+de dijken, keerden vervolgens terug naar de polders, alsof zij de
+lichamen niet wilden verlaten, uit welke zij kwamen.
+
+Op zekeren nacht zei Nele tot Uilenspiegel:
+
+--Zie hoe talrijk zij zijn in Beveland, en hoe hoog zij zweven in de
+lucht: langs den kant van de vogeleilanden zie ik er het meest. Wilt
+gij medekomen, Thijl? wij zullen ons strijken met de zalve, welke
+dingen toont, die onzichtbaar zijn voor de oogen der stervelingen.
+
+Uilenspiegel antwoordde:
+
+--Als 't die zalve is, die mij naar den grooten sabbat bracht, heb
+ik er geen vertrouwen meer in.
+
+--Loochen de kracht der tooverije niet. Kom mee, Uilenspiegel.
+
+'s Anderen daags vroeg hij aan den magistraat, dat een trouw en
+scherpziend soldaat hem zou vervangen om den toren te wachten en te
+waken over het land.
+
+En hij toog henen met Nele naar de vogeleilanden.
+
+Terwijl zij stapten langs akkers en dijken, zagen zij kleine
+groene eilandjes, tusschen dewelke het zeewater stroomde, en, op de
+begraasde heuvelen, die zich tot het duin uitstrekten, een groote
+menigte kieviten, meeuwen en zeezwaluwen, die onbeweeglijk zaten
+en met hunne ruggen witte eilandjes uitmaakten; daarboven vlogen
+duizenden van die vogelen. De grond was vol nesten: Uilenspiegel,
+die zich bukte om een ei van den weg op te rapen, zag eene meeuw
+fladderend naar hem komen en een grooten schreeuw slaken. Op dien
+kreet kwamen meer dan honderd andere bij, die schreeuwden van angst
+en boven het hoofd van Uilenspiegel en de naburige nesten vlogen,
+doch zij durfden hem niet naderen.
+
+--Uilenspiegel, zeide Nele, die vogelen vragen genade voor hunne
+eieren.
+
+Vervolgens begon zij te beven, en zij zeide:
+
+--Ik ben bang, de zonne gaat onder, de hemel is wit, de sterren
+ontwaken, dit is het uur van de geesten. Zie, die roode uitwasemingen
+rakelings zweven langs den grond; Thijl, mijn beminde, wie is
+het helsche monster, dat aldus in de wolken zijn vurigen muil open
+doet? Zie, langs den kant van Philips-land, waar de koninklijke beul,
+uit wreedaardige heerschzucht, tweemaal achtereen zooveel arme menschen
+liet dooden, zie die dwaallichtjes dansen; 't is de nacht in denwelken
+de zielen der arme mannen, die gedood werden in de gevechten, het
+koude voorgeborchte des vagevuurs verlaten, om zich te komen warmen
+in de zoele lucht van de aarde: dit is het uur, waarop gij alles
+moogt vragen aan Christus, welke de God van de goede tooveraars is.
+
+--De assche klopt op mijn hert, zeide Uilenspiegel. Kon Christus maar
+die Zeven toonen, wier in den wind gesmeten assche ons Vlaanderen en
+heel de wereld gelukkig zou maken.
+
+--Ongeloovige, zeide Nele, gij zult ze zien met de zalve.
+
+--Misschien, als een geest wil nederdalen uit de koude sterre, zei
+Uilenspiegel, met den vinger naar Sirius wijzend.
+
+Bij dat gebaar hechtte een dwaallichtje, dat rondom hem fladderde,
+zich vast aan zijn vinger, en hoe meer hij het los wilde maken,
+hoe vaster het er aan bleef gehecht.
+
+Doch terwijl Nele beproefde Uilenspiegel los te maken, kreeg zij ook
+haar dwaallichtje aan de toppen heurer vingeren.
+
+Uilenspiegel sloeg op het zijne en sprak:
+
+--Antwoord! zijt gij de ziel van eenen Geus of van eenen Spanjool? Zijt
+gij de ziel van eenen Geus, ga dan naar het hemelrijk; zijt gij die
+van eenen Spanjool, keer terug naar de helle, die u braakte.
+
+Nele zeide hem:
+
+--Beleedig nooit de zielen, al waren het zielen van beulen.
+
+En, terwijl zij heur dwaallichtje op den top van heuren vinger deed
+dansen, zeide zij:
+
+--Lichtje, liefelijk lichtje, welke miede brengt gij uit het land van
+de zielen? Wat doen zij? Eten en drinken zij, hoewel zij geen mond
+hebben? Want gij ook hebt er geen, bevallig lichtje! ofwel, nemen
+zij slechts in het gezegende hemelrijk de menschelijke gedaante aan?
+
+--Hoe kunt gij, sprak Uilenspiegel, aldus uwen tijd verliezen met
+te spreken tot dat droef vlammetje, dat geene ooren heeft om u te
+aanhooren, en geenen mond om u te woord te staan?
+
+Maar zonder naar hem te luisteren;
+
+--Lichtje, zeide Nele, antwoord al dansend, want ik ga u driemaal
+ondervragen: eenmaal in den naam Gods, eenmaal in den naam der Heilige
+Maagd, en eenmaal in den naam der sylphen, die de boden zijn tusschen
+God en de menschen.
+
+Zij deed het, en het lichtje danste drie keeren.
+
+--Trek uwe kleederen uit; ik zal hetzelfde doen: hier is de zilveren
+doos met de tooverzalve, zei Nele tot Uilenspiegel.
+
+--'t Is mij eender, antwoordde Uilenspiegel.
+
+Toen zij zich ontkleed en met zalve bestreken hadden, legden zij zich
+naast elkander op het gras.
+
+De meeuwen kloegen; de donder rammelde dof in het zwerk, waarin een
+helle flits flikkerde; de wassende maan toonde tusschen twee vluchtige
+wolken nauwelijks hare twee gulden horens; Nele's en Uilenspiegel's
+dwaallichtjes gingen met de anderen dansen in den beemd.
+
+Plotseling werden Nele en heur vriend gegrepen met de groote hand
+van eenen reus, dewelke ze in de lucht smeet als sneeuwballen, ze
+weder opving, ze tusschen zijne handen ineenrolde en kneedde met
+zijne vingeren, ze smeet in de waddenplassen tusschen de duinen, en
+ze er weder uittrok, vol zeewier. En terwijl de reus ze vervolgens
+ronddroeg in het luchtruim, zong hij met eene stem, die al de meeuwen
+der eilanden van schrik deed ontwaken:
+
+
+    Lezen willen luizedwergen
+    Met ziekelijk troebel oog,
+    Wat wij zoo weigerlijk bergen:
+    De teekenen heilig en hoog.
+
+    Lelie, luis, het eerwaarde,
+    Lelie, vloo, de geheimenis,
+    Die in hemel, lucht en aarde
+    Met zeven nagels vernageld is.
+
+
+En inderdaad, Uilenspiegel en Nele zagen op het gras, in de lucht en
+in den hemel, zeven lichtende koperen tafelen, bevestigd door middel
+van zeven vlammende nagelen. Op de tafelen stond geschreven:
+
+
+    Onder den mesthoop kiemt de plant.
+    Is zeven slecht, zeven is goed.
+    Kolen vormen diamant,
+    Dwaze doctoren, leerlingen vroed.
+    Is zeven slecht, zeven is goed.
+
+
+En de reus stapte voort, gevolgd door al die dwaallichtjes, die,
+gonzend als krekelen, zeiden:
+
+
+    Kijkt toe wie de macht hier torst,
+    Der pausen paus, der vorsten vorst;
+    Wie Caesar aan den leiband houdt,
+    Kijkt toe, hij is van hout!
+
+
+Eensklaps veranderden zijne trekken, hij scheen magerder, treuriger,
+grooter. In eene hand hield hij eenen schepter en in de andere een
+zweerd. Hij hiet Hooveerdigheid.
+
+En Nele en Uilenspiegel ten gronde smijtend, zeide hij:
+
+--Ik ben God!
+
+En daar kwam naast hem, op eenen ezel gezeten, een dikke, roodwangige
+meid, nauwelijks gekleed, met bloote borsten, en wulpsche oogen:
+zij heette Onkuischheid; vervolgens kwam een oude jodin, die schalen
+van meeuweneieren opraapte: zij heette Gierigheid; dan een dikke,
+vraatzuchtige monnik, die worsten verslond, zich volpropte met
+pensen en gedurig mommelde als de zeug, op dewelke hij zat: het was
+de Gulzigheid; vervolgens kwam de Traagheid, trekkebeenend, bleek
+en opgezwollen, met doffe oogen, die de Gramschap met een prikstok
+voor zich dreef. Jammerend en badend in tranen, viel de Traagheid van
+vermoeienis op heure knieën; vervolgens kwam de magere Nijd, met een
+slangekop en hoektanden, die de Traagheid beet omdat zij te veel heur
+gemak zocht, de Gramschap omdat zij te levendig was, de Gulzigheid
+omdat zij te veel gegeten had, de Onkuischheid omdat zij te rood was,
+de Gierigheid ter oorzake van de schalen, de Hooveerdigheid omdat
+zij een purperen kleed en op het hoofd eene kroon droeg.
+
+En de dwaallichtjes dansten rondom hen.
+
+En, sprekend met stemmen als van kermende mannen, vrouwlieden,
+meidekens en kinderen, zeiden zij zuchtend:
+
+--Hooveerdigheid, bron van heerschzucht, Gramschap, moeder der
+wreedheid, gij dooddet ons op slagveld, in gevangenis en door
+marteling, om uwe schepters en kronen te behouden! Nijd, gij vernieldet
+in hunne kiem velerlei edele en nuttige denkbeelden: wij zijn de zielen
+van de verdrukte uitvinders; Gierigheid, gij veranderdet in goud,
+het zweet en het bloed van het arme volk: wij zijn de geesten van
+de zwoegers, uwe slachtofferen; Onkuischheid, gezellin en boelin van
+den Moord, die samen Nero, Messalina en Philippus, koning van Spanje,
+verwektet, gij koopt de deugd om en betaalt de verleiding; wij zijn de
+zielen der dooden; Traagheid en Gulzigheid, gij bevuilt en onteert de
+wereld: wij moeten u van haar verjagen, wij zijn de zielen der dooden.
+
+En men hoorde eene stem zeggen:
+
+
+    Onder den mesthoop kiemt de plant.
+    Is zeven slecht, zeven is goed.
+    Bij dwaze doctoren, leerlingen vroed;
+    Om asch te krijgen en tevens kool
+    Wat doet een vlooken op den dool?
+
+
+En de dwaallichtjes zeiden:
+
+--Wij zijn het vuur, de weerwraak van de oude tranen, de smerten van
+het gemeen; de weerwraak op de heeren, die joegen op menschelijk wild;
+de weerwraak van de onnutte gevechten, van het in de gevangenissen
+vergoten bloed, van de levend verbrande mannen, de levend begraven
+vrouwlieden en meidekens; de weerwraak van het akelig en bloedig
+verleden. Wij zijn het vuur, wij zijn de zielen der dooden!
+
+Bij die woorden werden de Zeven veranderd in houten standbeelden,
+waarbij zij hunne vroegere gedaante behielden.
+
+En eene stem zeide:
+
+--Uilenspiegel, verbrand het hout.
+
+En Uilenspiegel, zich naar de dwaallichtjes wendend, zeide:
+
+--Gij, die het vuur zijt, verricht uwe taak.
+
+En de dwaallichtjes omringden in groote menigte de Zeven, welke
+verbrandden tot assche.
+
+En het bloed vloeide bij stroomen.
+
+En uit de assche kwamen zeven andere beelden te voorschijn; het
+eerste zeide:
+
+--Ik was Hooveerdigheid, nu heet ik edele Fierheid.
+
+De anderen spraken ook, en Uilenspiegel en Nele zagen Zuinigheid komen
+uit Gierigheid, Levendigheid uit Gramschap, Eetlust uit Gulzigheid,
+Wedijver uit Nijd, Droomerij van dichters en denkers uit Traagheid. En
+de Onkuischheid, op hare geit, veranderde in een schoone vrouw,
+die Liefde hiet.
+
+En de dwaallichtjes dansten een blijden dans rondom dezelve.
+
+Uilenspiegel en Nele hoorden toen duizend heldere, grinnikende stemmen
+van verborgen mannen en vrouwen, die zongen:
+
+
+    Als over land en wateren
+    Die Zeven, hervormd, zullen heerschen,
+    Menschen, hoofden hoog!
+    't Is het heil der wereld.
+
+
+En Uilenspiegel zeide:
+
+--Nele, die geesten spotten met ons.
+
+Maar een machtige hand greep Nele bij den arm en wierp heur in het
+luchtruim.
+
+En de geesten zongen:
+
+
+    Raakt het Noorden,
+    Kussend het Westen,
+    Rampspoed is uit.
+    Vind de Zeven
+    En den Gordel.
+
+
+--Laas, zeide Uilenspiegel: Noord, West en Gordel.... Gij spreekt
+wel raadselachtig, heeren Geesten.
+
+En grinnikend zongen zij:
+
+
+    't Noorden is Nederland,
+    België 't Westen.
+    Gordel is vriendschap,
+    Gordel verbond.
+
+
+--Dat is wijs gesproken, heeren Geesten, zeide Uilenspiegel.
+
+En grinnikend zongen zij nog:
+
+
+    De gordel, arme,
+    Om Neerland en België,
+    Zal vriendschap wezen,
+    Vroom verbond.
+
+    Met raad
+    En daad,
+    Met dood
+    En bloed,
+    Als 't moet,
+    Was de Schelde daar niet,
+    Arme, de Schelde.
+
+
+--Laas, zei Uilenspiegel, dat is dus ons veelbewogen leven: tranen van
+'t menschdom en spotternij van 't lot.
+
+Grinnikend hernamen de geesten:
+
+
+    Verbond
+    Met bloed
+    En dood,
+    Was de Schelde daar niet!
+
+
+En een machtige hand greep Uilenspiegel en smeet hem in het luchtruim.
+
+
+
+
+X.
+
+Toen Nele ten gronde te recht kwam, zag zij niets anders meer dan
+de zonne, die opstond te midden van de gulden dampen, de toppen
+der grashalmen, die insgelijks als in goud gedoopt waren, en den
+zonnestraal, die de veeren der slapende meeuwen kleurde. Maar de
+meeuwen ontwaakten weldra.
+
+Vervolgens bekeek Nele zich zelve, zij zag, dat ze naakt was, en ze
+trok in der haast heure kleederen aan; vervolgens zag zij Uilenspiegel,
+insgelijks naakt, en zij bedekte hem; zij dacht, dat hij sliep, en
+zij schudde hem; maar hij verroerde zich niet meer dan een doode;
+zij werd van schrik bevangen.
+
+--Ha! zeide zij, heb ik mijnen vriend gedood met de tooverzalf? Ik
+wil ook sterven! Ha! Thijl, word wakker! Hij is als marmer zoo koud!
+
+Uilenspiegel werd niet wakker. Een dag en een nacht liepen voorbij,
+en Nele, koortsachtig van smert, waakte bij heuren vriend Uilenspiegel.
+
+In den morgen van den tweeden dag, hoorde Nele het geklingel eener bel,
+en zij zag een boer komen met eene spade op den schouder; achter hem
+gingen een burgemeester en twee schepenen met eene waskeers in de hand,
+de parochiepaap van Stavenisse en een koster, die een zonnescherm
+hield boven het hoofd van den paap.
+
+Zij gingen, naar zij zeiden, het heilig oliesel toedienen aan den
+dapperen Jacobsen, die vroeger Geus was uit schrik, maar die, nu het
+gevaar voorbij was, vóór zijn dood terugkeerde tot den schoot der
+Heilige Roomsche Kerke.
+
+Weldra waren zij dicht bij Nele, die schreide, en zij zagen het lichaam
+van Uilenspiegel uitgestrekt op het gras, met zijne kleederen aan.
+
+Nele knielde neder.
+
+--Meideken, zeide de burgemeester, wat doet gij bij dien doode?
+
+Zij antwoordde, zonder de oogen te durven opslaan:
+
+--Ik bid voor mijnen vriend, die hier viel, als door den bliksem
+getroffen. Nu ben ik alleen: daarom wil ik insgelijks sterven!
+
+De parochiepaap blies van genoegen en zei:
+
+--God zij geloofd, de Geus Uilenspiegel is dood! Boer, haast u en delf
+een graf; trek zijne kleederen uit, alvorens hem in de aarde te steken.
+
+--Neen, zei Nele, rechtspringend, men zal ze hem aanlaten, hij zou
+koude hebben in den killen grond.
+
+--Delf een graf, zeide de parochiepaap tot den boer, die de spade
+droeg.
+
+--Ik wil wel, zeide Nele badend in tranen; daar zijn geene wormen in
+het schelpzand, hij zal schoon en gaaf blijven, mijn geliefde.
+
+En, als waanzinnig, bukte zij zich over het lichaam van Uilenspiegel
+en kuste zij het met tranen en snikken.
+
+De burgemeester, de schepenen en de boer hadden medelijden, maar de
+pastoor zeide en herhaalde gedurig met blijdschap:
+
+--De groote Geus is dood, God zij geloofd!
+
+De boer dolf vervolgens een graf, legde Uilenspiegel er in en bedekte
+hem met zand. En de parochiepaap las over het graf de gebeden der
+dooden: allen knielden neder rondom het graf; doch plotseling zag men
+onder het zand een groote beweging, en Uilenspiegel keek rond zich,
+niesde en schudde het zand uit zijn haar, en greep den pastoor bij
+de keel en zeide:
+
+--Ketterbeul, gij begraaft mij levend in mijnen slaap. Waar is
+Nele? Hebt gij ze ook in de aarde gedolven? Wie zijt gij?
+
+De parochiepaap riep:
+
+--De groote Geus verrijst op deze wereld! Heere God! wees mijne
+ziele genadig!
+
+En hij vluchtte weg als een hert voor de honden.
+
+Nele kwam bij Uilenspiegel.
+
+--Kus mij, liefste, zeide hij.
+
+Toen keek hij opnieuw rondom zich; boer en koster waren op den loop
+gegaan met den pastoor, en hadden, om rapper te loopen, spade,
+waskeersen en zonnescherm ten gronde geworpen; burgemeester en
+schepenen hielden van schrik hunne ooren vast en lagen te jammeren op
+'t gras.
+
+Uilenspiegel ging tot hen en schudde hen.
+
+--Begraaft men, zeide hij, Uilenspiegel, den geest, Nele, het hert
+van Vlaanderen? Neen! Vlaanderen kan ook slapen, maar sterven,
+nooit! Kom, Nele.
+
+En hij toog henen met heur en zong zijn zesde liedeken, maar niemand
+weet waar hij zijn laatste zingen zal....
+
+
+                                 EINDE.
+
+
+
+
+
+
+
+AANTEEKENINGEN
+
+
+[1] Deze Voorrede werd, met een bepaald aantal platen, gevoegd in de
+eerste Fransche uitgave. (Lacroix-Verboeckhoven & Co.)
+
+[2] Die bewering is nauwkeurig. Aan een Vlaamsch boekje van den
+uitgever Van Paemel, getiteld: Het aerdig leven van Thyl Uylenspiegel,
+ontleende de dichter een aantal hoofdstukken van het Eerste Boek van
+zijn werk.
+
+[3] Over afleiding en beteekenis van het woord "Uilenspiegel"
+verschillen wij--en zeker de meeste Vlamingen met ons--teenemaal met
+Ch. de Coster. Omstandige, langdradige dissertatiën daaromtrent zullen
+wel overbodig zijn, en hooren ook in dit boek niet te huis. Zoo wij
+deze Voorrede in de Vlaamsche uitgave brachten, was het dus enkel
+met het inzicht het werk van Charles De Coster te eerbiedigen, en
+het, in zijn geheel, den Vlaamschen lezer aan te bieden. (Noot van
+den Vertaler.)
+EOT;
+}
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/nl_NL/Address.php b/vendor/fzaninotto/faker/src/Faker/Provider/nl_NL/Address.php
index 04554146..6e91dc09 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/nl_NL/Address.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/nl_NL/Address.php
@@ -6,7 +6,43 @@ class Address extends \Faker\Provider\Address
 {
     protected static $buildingNumber = array('%', '%#', '%##', '%###', '%-?', '%#-?', '%?', '%#?', '%-#', '%#-##');
 
-    protected static $postcode = array('%### ??');
+    protected static $postcodes = array(
+        '1013PT', '1015GZ', '1053GS', '1058EG', '1060PM', '1068NE', '1072NL', '1073SK', '1074JA', '1078NH', '1111LW',
+        '1121JC', '1141RP', '1141VM', '1161TC', '1183CH', '1187RK', '1188LP', '1271KZ', '1312SG', '1323CW', '1325EZ',
+        '1333EJ', '1334DP', '1339VJ', '1351AC', '1352AC', '1354LM', '1356AC', '1391RX', '1406MZ', '1411JM', '1435GS',
+        '1443CK', '1444TM', '1448VB', '1505WL', '1509GP', '1531CZ', '1531KA', '1561ZV', '1602EP', '1606BS', '1619KB',
+        '1674PG', '1689BJ', '1702LB', '1761GN', '1775BR', '1782SK', '1788WE', '1862BK', '1901CT', '1911CH', '1949AN',
+        '1951MS', '1962PL', '1972DA', '2015HA', '2022RM', '2171XJ', '2231BB', '2231DG', '2231NZ', '2242PK', '2245VZ',
+        '2261BH', '2262EA', '2264BK', '2264TS', '2266AA', '2274GD', '2316XD', '2332KV', '2333CW', '2403CG', '2512VH',
+        '2516XJ', '2518ER', '2521SZ', '2531BH', '2544KR', '2562VH', '2564CJ', '2595BK', '2597PL', '2613DC', '2622DX',
+        '2623HS', '2631VK', '2671LD', '2675EE', '2685VZ', '2771JD', '2801JS', '2802ED', '2803ZN', '2841AK', '2903XH',
+        '2905PN', '2908KA', '2922AG', '2935RD', '2951JC', '3015XB', '3021WL', '3026RC', '3034VE', '3035CE', '3044AB',
+        '3054XL', '3055AK', '3068DL', '3069HH', '3073DW', '3075AH', '3132CS', '3135EX', '3143KB', '3145CN', '3202AN',
+        '3208LB', '3209BE', '3222CK', '3223VD', '3232TN', '3235NS', '3241BG', '3247CN', '3252CJ', '3255SC', '3274LD',
+        '3312CV', '3317HR', '3319BN', '3319RG', '3351RJ', '3411AK', '3439LB', '3511PL', '3513GS', '3514CR', '3515GC',
+        '3527EJ', '3551GH', '3572KA', '3573AL', '3608VJ', '3628AC', '3704MK', '3731EP', '3739JJ', '3741ZC', '3771RK',
+        '3824HR', '3843BB', '3871GE', '3882CG', '3892BA', '3904NB', '3981KE', '3985SG', '4011KH', '4021EB', '4103XV',
+        '4131NE', '4142WE', '4201BS', '4209SE', '4261ZC', '4283HA', '4307LC', '4334HG', '4337VE', '4371EN', '4382JC',
+        '4382NC', '4385AS', '4401CA', '4401CG', '4521BW', '4553NG', '4581CA', '4614BD', '4614GX', '4698BG', '4702HJ',
+        '4703LB', '4706CN', '4707WJ', '4735AS', '4793CM', '4797HE', '4811SH', '4814NJ', '4815CJ', '4835GG', '4871DD',
+        '4921PK', '5011HS', '5013BE', '5061NA', '5103KD', '5105AC', '5111XN', '5126NT', '5126WR', '5151LR', '5151RZ',
+        '5152VB', '5171GH', '5223BK', '5231PS', '5268GE', '5298AL', '5301HE', '5403NJ', '5469AT', '5481NC', '5482XE',
+        '5575CS', '5611LP', '5644KR', '5645KR', '5651LX', '5654AX', '5684CP', '5712BR', '5751LD', '5753RJ', '5754GE',
+        '5912SP', '6019CW', '6021BT', '6021KJ', '6049BL', '6085EX', '6097DG', '6097ZH', '6118BW', '6163KG', '6164GP',
+        '6165XE', '6222BT', '6222VD', '6222VJ', '6226WC', '6365BJ', '6411ND', '6415BX', '6417BV', '6461JD', '6524SR',
+        '6534XT', '6538CX', '6538RV', '6541AD', '6581BZ', '6584AM', '6605DP', '6621KN', '6651KG', '6655AE', '6671DV',
+        '6673DB', '6716ND', '6741BR', '6822JL', '6823JD', '6871ZM', '6905SG', '6915TT', '6922EG', '6942LX', '6952ET',
+        '6961XV', '6971GW', '7009CN', '7011JD', '7051JB', '7121LZ', '7136LH', '7261CN', '7273PP', '7311AL', '7312DG',
+        '7314BK', '7315CW', '7323KB', '7361TD', '7391CZ', '7391SG', '7411VR', '7425EB', '7441GB', '7442CW', '7442GX',
+        '7481DX', '7481SL', '7544XD', '7557VC', '7558GR', '7574PG', '7606XL', '7607RE', '7615RD', '7622VX', '7627SE',
+        '7642EN', '7645AL', '7678RM', '7681ZA', '7707RL', '7722LG', '7722XJ', '7761AJ', '7825VC', '7833JJ', '7906NK',
+        '7942JG', '7957DD', '7981BC', '8061BA', '8075AT', '8121HA', '8121SB', '8141HR', '8152BA', '8171JC', '8181VZ',
+        '8226HJ', '8231DH', '8231JL', '8252HG', '8262EA', '8265GX', '8302AR', '8321KC', '8322EH', '8421PG', '8431MC',
+        '8446CM', '8472DA', '8502CA', '8521DE', '8573WP', '8602XV', '8605AV', '8606XZ', '8701EG', '8701ZE', '8711EJ',
+        '8802VB', '8861KZ', '8862AC', '8933EK', '9057LC', '9061AS', '9073LK', '9164LC', '9201TM', '9203PZ', '9269SV',
+        '9269SZ', '9289ZH', '9354VD', '9401MA', '9406BM', '9431GV', '9501AM', '9502CX', '9642EA', '9651AR', '9675LR',
+        '9712LJ', '9742GT', '9745EH', '9751TA', '9751TS', '9752BK', '9752GE', '9801TA', '9901EH', '9991EG', '9999XK',
+    );
 
     protected static $streetNameFormats = array('{{lastName}}{{streetSuffix}}');
 
@@ -109,4 +145,9 @@ class Address extends \Faker\Provider\Address
     {
         return static::randomElement(static::$cityNames);
     }
+    
+    public static function postcode()
+    {
+        return static::randomElement(static::$postcodes);
+    }
 }
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/nl_NL/Person.php b/vendor/fzaninotto/faker/src/Faker/Provider/nl_NL/Person.php
index 075628d5..0bd09a44 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/nl_NL/Person.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/nl_NL/Person.php
@@ -314,4 +314,37 @@ class Person extends \Faker\Provider\Person
     {
         return static::randomElement(static::$prefix);
     }
+    
+    /**
+     * @link https://nl.wikipedia.org/wiki/Burgerservicenummer#11-proef
+     *
+     * @return string
+     */
+    public function idNumber()
+    {
+        $return = '';
+        $nr     = array();
+        $nr[]   = 0;
+        while (count($nr) < 8) {
+            $nr[] = static::randomDigit();
+        }
+        $nr[] = mt_rand(0, 6);
+        if ($nr[7] == 0 && $nr[8] == 0) {
+            $nr[7] = 0;
+        }
+
+        $bsn   = (9 * $nr[8]) + (8 * $nr[7]) + (7 * $nr[6]) + (6 * $nr[5]) + (5 * $nr[4]) + (4 * $nr[3]) + (3 * $nr[2]) + (2 * $nr[1]);
+        $nr[0] = floor($bsn - floor($bsn / 11) * 11);
+        if ($nr[0] > 9) {
+            if ($nr[1] > 0) {
+                $nr[0] = 8;
+                $nr[1]--;
+            } else {
+                $nr[0] = 1;
+                $nr[1]++;
+
+            }
+        }
+        return implode('', array_reverse($nr));
+    }
 }
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/pl_PL/Payment.php b/vendor/fzaninotto/faker/src/Faker/Provider/pl_PL/Payment.php
index cc5f9581..ffd0cb6a 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/pl_PL/Payment.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/pl_PL/Payment.php
@@ -5,81 +5,76 @@ namespace Faker\Provider\pl_PL;
 class Payment extends \Faker\Provider\Payment
 {
     /**
-     * @var array list of Polish banks, source: http://www.nbp.pl/banki_w_polsce/ewidencja/ewidencja.html
+     * @var array list of Polish banks, source: https://ewib.nbp.pl/
      */
     protected static $banks = array(
-        '251' => 'Aareal Bank Aktiengesellschaft (Spółka Akcyjna) - Oddział w Polsce',
-        '249' => 'Alior Bank SA',
-        '247' => 'Banco Espirito Santo de Investimento, S.A. Spółka Akcyjna Oddział w Polsce',
-        '238' => 'Banco Mais S.A. (SA) Oddział w Polsce',
+        '101' => 'Narodowy Bank Polski',
+        '102' => 'Powszechna Kasa Oszczędności Bank Polski SA',
+        '103' => 'Bank Handlowy w Warszawie SA',
+        '105' => 'ING Bank Śląski SA',
         '106' => 'Bank BPH SA',
-        '219' => 'Bank DnB NORD Polska SA',
-        '203' => 'Bank Gospodarki Żywnościowej SA',
+        '109' => 'Bank Zachodni WBK SA',
         '113' => 'Bank Gospodarstwa Krajowego',
-        '122' => 'Bank Handlowo - Kredytowy SA (w likwidacji 31.03.92)',
-        '103' => 'Bank Handlowy w Warszawie SA',
+        '114' => 'mBank SA',
         '116' => 'Bank Millennium SA',
-        '154' => 'Bank Ochrony Środowiska SA',
-        '260' => 'Bank of China (Luxembourg)S.A. Spółka Akcyjna Oddział w Polsce',
-        '221' => 'Bank of Tokyo-Mitsubishi UFJ (Polska) SA',
-        '132' => 'Bank Pocztowy SA',
+        '122' => 'Bank Handlowo-Kredytowy Spółka Akcyjna w Katowicach w likwidacji',
         '124' => 'Bank Polska Kasa Opieki SA',
+        '128' => 'HSBC Bank Polska SA',
+        '132' => 'Bank Pocztowy SA',
+        '147' => 'Euro Bank SA',
+        '154' => 'Bank Ochrony Środowiska SA',
+        '158' => 'Mercedes-Benz Bank Polska SA',
+        '161' => 'SGB-Bank SA',
+        '167' => 'RBS Bank (Polska) SA',
+        '168' => 'PLUS BANK SA',
+        '175' => 'Raiffeisen Bank Polska SA',
+        '184' => 'Societe Generale SA Oddział w Polsce',
+        '187' => 'Nest Bank S.A.',
+        '189' => 'Pekao Bank Hipoteczny SA',
+        '191' => 'Deutsche Bank Polska SA',
         '193' => 'BANK POLSKIEJ SPÓŁDZIELCZOŚCI SA',
-        '109' => 'Bank Zachodni WBK SA',
+        '194' => 'Credit Agricole Bank Polska SA',
+        '195' => 'Idea Bank SA',
+        '203' => 'Bank BGŻ BNP Paribas SA',
+        '212' => 'Santander Consumer Bank SA',
+        '213' => 'VOLKSWAGEN BANK POLSKA SA',
+        '214' => 'FCA-Group Bank Polska SA',
+        '215' => 'mBank Hipoteczny SA',
+        '216' => 'Toyota Bank Polska SA',
+        '219' => 'DNB Bank Polska SA',
         '224' => 'Banque PSA Finance SA Oddział w Polsce',
-        '160' => 'BNP PARIBAS BANK POLSKA SA',
-        '235' => 'BNP PARIBAS SA Oddział w Polsce',
-        '243' => 'BNP Paribas Securities Services SKAOddział w Polsce',
+        '225' => 'Svenska Handelsbanken AB SA Oddział w Polsce',
         '229' => 'BPI Bank Polskich Inwestycji SA',
-        '215' => 'BRE Bank Hipoteczny SA',
-        '114' => 'BRE Bank SA',
-        '239' => 'CAIXABANK, S.A. (SPÓŁKA AKCYJNA)ODDZIAŁ W POLSCE',
-        '254' => 'Citibank Europe plc (Publiczna Spółka Akcyjna) Oddział w Polsce',
-        '194' => 'Credit Agricole Bank Polska SA',
-        '252' => 'CREDIT SUISSE (LUXEMBOURG) S.A. Spółka Akcyjna, Oddział w Polsce',
+        '232' => 'Nykredit Realkredit A/S SA - Oddział w Polsce',
+        '235' => 'BNP PARIBAS SA Oddział w Polsce',
         '236' => 'Danske Bank A/S SA Oddział w Polsce',
-        '191' => 'Deutsche Bank PBC SA',
-        '188' => 'Deutsche Bank Polska SA',
-        '174' => 'DZ BANK Polska SA',
-        '241' => 'Elavon Financial Services Limited (Spółka z ograniczoną odpowiedzialnością) Oddział w Polsce',
-        '147' => 'Euro Bank SA',
-        '265' => 'EUROCLEAR Bank SA/NV (Spółka Akcyjna) - Oddział w Polsce',
-        '207' => 'FCE Bank Polska SA',
-        '214' => 'Fiat Bank Polska SA',
-        '253' => 'FM Bank SA',
+        '237' => 'Skandinaviska Enskilda Banken AB (SA) - Oddział w Polsce',
+        '239' => 'CAIXABANK, S.A. (SPÓŁKA AKCYJNA)ODDZIAŁ W POLSCE',
+        '241' => 'Elavon Financial Services Designated Activity Company (spółka z o.o. o wyznaczonym przedmiocie działalności) Oddział w Polsce',
+        '243' => 'BNP Paribas Securities Services SKA Oddział w Polsce',
+        '247' => 'HAITONG BANK, S.A. Spółka Akcyjna Oddział w Polsce',
         '248' => 'Getin Noble Bank SA',
-        '128' => 'HSBC Bank Polska SA',
-        '195' => 'Idea Bank SA',
-        '255' => 'Ikano Bank GmbH (Sp. z o.o.) Oddział w Polsce',
-        '262' => 'Industrial and Commercial Bank of China (Europe) S.A. (Spółka Akcyjna) Oddział w Polsce',
-        '105' => 'ING Bank Śląski SA',
-        '266' => 'Intesa Sanpaolo S.p.A. Spółka Akcyjna Oddział w Polsce',
-        '168' => 'INVEST - BANK SA',
-        '258' => 'J.P. Morgan Europe Limited Sp. z o.o. Oddział w Polsce',
-        '158' => 'Mercedes-Benz Bank Polska SA',
-        '130' => 'Meritum Bank ICB SA',
-        '101' => 'Narodowy Bank Polski',
+        '249' => 'Alior Bank SA',
+        '251' => 'Aareal Bank Aktiengesellschaft (Spółka Akcyjna) - Oddział w Polsce',
+        '254' => 'Citibank Europe plc (Publiczna Spółka Akcyjna) Oddział w Polsce',
+        '255' => 'Ikano Bank AB (publ) Spółka Akcyjna Oddział w Polsce',
         '256' => 'Nordea Bank AB SA Oddział w Polsce',
-        '144' => 'NORDEA BANK POLSKA SA',
-        '232' => 'Nykredit Realkredit A/S SA - Oddział w Polsce',
-        '189' => 'Pekao Bank Hipoteczny SA',
-        '187' => 'Polski Bank Przedsiębiorczości SA',
-        '102' => 'Powszechna Kasa Oszczędności Bank Polski SA',
-        '200' => 'Rabobank Polska SA',
-        '175' => 'Raiffeisen Bank Polska SA',
-        '167' => 'RBS Bank (Polska) SA',
-        '264' => 'RCI Banque Spółka Akcyjna Oddział w Polsce',
-        '212' => 'Santander Consumer Bank SA',
-        '263' => 'Saxo Bank A/S Spółka Akcyjna Oddział w Polsce',
-        '161' => 'SGB-Bank SA',
-        '237' => 'Skandinaviska Enskilda Banken AB (SA) - Oddział w Polsce',
-        '184' => 'Societe Generale SA Oddział w Polsce',
-        '225' => 'Svenska Handelsbanken AB SA Oddział w Polsce',
-        '227' => 'Sygma Banque Societe Anonyme (SA) Oddział w Polsce',
-        '216' => 'Toyota Bank Polska SA',
         '257' => 'UBS Limited (spółka z ograniczoną odpowiedzialnością) Oddział w Polsce',
-        '261' => 'Vanquis Bank Limited (spółka z ograniczoną odpowiedzialnością) Oddział w Polsce',
-        '213' => 'VOLKSWAGEN BANK POLSKA SA',
+        '258' => 'J.P. Morgan Europe Limited Sp. z o.o. Oddział w Polsce',
+        '260' => 'Bank of China (Luxembourg) S.A. Spółka Akcyjna Oddział w Polsce',
+        '262' => 'Industrial and Commercial Bank of China (Europe) S.A. (Spółka Akcyjna) Oddział w Polsce',
+        '263' => 'Saxo Bank A/S Spółka Akcyjna Oddział w Polsce w likwidacji',
+        '264' => 'RCI Banque Spółka Akcyjna Oddział w Polsce',
+        '265' => 'EUROCLEAR Bank SA/NV (Spółka Akcyjna) - Oddział w Polsce',
+        '266' => 'Intesa Sanpaolo S.p.A. Spółka Akcyjna Oddział w Polsce',
+        '267' => 'Western Union International Bank GmbH, Sp. z o.o. Oddział w Polsce',
+        '269' => 'PKO Bank Hipoteczny SA',
+        '270' => 'TF BANK AB (Spółka z ograniczoną odpowiedzialnością) Oddział w Polsce',
+        '271' => 'FCE Bank Spółka Akcyjna Oddział w Polsce',
+        '272' => 'AS Inbank Spółka Akcyjna - Oddział w Polsce',
+        '273' => 'China Construction Bank (Europe) S.A. (Spółka Akcyjna) Oddział w Polsce',
+        '274' => 'MUFG Bank (Europe) N.V. S.A. Oddział w Polsce',
+        '275' => 'John Deere Bank S.A. Spółka Akcyjna Oddział w Polsce',
     );
 
     /**
@@ -105,7 +100,7 @@ class Payment extends \Faker\Provider\Payment
 
     protected static function addBankCodeChecksum($iban, $countryCode = 'PL')
     {
-        if ($countryCode != "PL" || strlen($iban) <= 8) {
+        if ($countryCode != 'PL' || strlen($iban) <= 8) {
             return $iban;
         }
         $checksum = 0;
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/pl_PL/Person.php b/vendor/fzaninotto/faker/src/Faker/Provider/pl_PL/Person.php
index c6b2402e..380f4d9f 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/pl_PL/Person.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/pl_PL/Person.php
@@ -159,11 +159,12 @@ class Person extends \Faker\Provider\Person
         for ($i = 6; $i < $length; $i++) {
             $result[$i] = static::randomDigit();
         }
-        if ($sex == "M") {
-            $result[$length - 1] |= 1;
-        } elseif ($sex == "F") {
-            $result[$length - 1] ^= 1;
+
+        $result[$length - 1] |= 1;
+        if ($sex == "F") {
+            $result[$length - 1] -= 1;
         }
+
         $checksum = 0;
         for ($i = 0; $i < $length; $i++) {
             $checksum += $weights[$i] * $result[$i];
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/pt_BR/PhoneNumber.php b/vendor/fzaninotto/faker/src/Faker/Provider/pt_BR/PhoneNumber.php
index 9224b08e..4949eef3 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/pt_BR/PhoneNumber.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/pt_BR/PhoneNumber.php
@@ -4,18 +4,31 @@ namespace Faker\Provider\pt_BR;
 
 class PhoneNumber extends \Faker\Provider\PhoneNumber
 {
+    protected static $landlineFormats = array('2###-####', '3###-####', '4###-####');
 
-    protected static $landlineFormats = array('2###-####', '3###-####');
-
+    /**
+    * Since december 2016 all mobile phone numbers in brazil begin with 9 and landlines 2, 3 or 4.
+    * @link http://www.anatel.gov.br/Portal/exibirPortalPaginaEspecial.do?org.apache.struts.taglib.html.TOKEN=9594e1d11fbc996d52bda44e608bb744&codItemCanal=1794&pastaSelecionada=2984
+    */
     protected static $cellphoneFormats = array('9####-####');
 
     /**
      * Generates a 2-digit area code not composed by zeroes.
+     * @link http://www.anatel.gov.br/legislacao/resolucoes/16-2001/383-resolucao-263.
      * @return string
      */
     public static function areaCode()
     {
-        return static::randomDigitNotNull().static::randomDigitNotNull();
+        $areaCodes = array(
+            '11', '12', '13', '14', '15', '16', '17', '18', '19', '21', '22', '24',
+            '27', '28', '31', '32', '33', '34', '35', '37', '38', '41', '42', '43',
+            '44', '45', '46', '47', '48', '49', '51', '53', '54', '55', '61', '62',
+            '63', '64', '65', '66', '67', '68', '69', '71', '73', '74', '75', '77',
+            '79', '81', '82', '83', '84', '85', '86', '87', '88', '89', '91', '92',
+            '93', '94', '95', '96', '97', '98', '99'
+        );
+
+        return self::randomElement($areaCodes);
     }
 
     /**
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/ru_RU/Address.php b/vendor/fzaninotto/faker/src/Faker/Provider/ru_RU/Address.php
index 6174cedd..aa0d4088 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/ru_RU/Address.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/ru_RU/Address.php
@@ -14,55 +14,38 @@ class Address extends \Faker\Provider\Address
 
     protected static $buildingNumber = array('##');
     protected static $postcode = array('######');
+    
+    /**
+     * @link https://ru.wikipedia.org/wiki/Общероссийский_классификатор_стран_мира#Список_стран_согласно_Классификатору
+     */
     protected static $country = array(
-        'Украина', 'Российская Федерация', 'США', 'Канада', 'Австралия', 'Австрия',
-        'Азербайджан', 'Аландские острова', 'Албания', 'Алжир', 'Американские острова Самоа', 'Ангилья',
-        'Ангола', 'Андорра', 'Антарктика', 'Антигуа и Барбуда', 'Аргентина', 'Армения',
-        'Аруба', 'Афганистан, Исламская Республика', 'Багамы', 'Бангладеш', 'Барбадос', 'Бахрейн',
-        'Белиз', 'Белоруссия', 'Бельгия', 'Бермудские Острова', 'Болгария', 'Боливия',
-        'Босния и Герцеговина', 'Ботсвана', 'Бразилия', 'Британская территория Индийского океана',
-        'Бруней Даруссалам', 'Буркина Фасо', 'Бурунди', 'Бутан', 'Вануату',
-        'Великобритания', 'Венгрия', 'Венесуэла', 'Виргинские о-ва, Великобритания', 'Виргинские о-ва, США',
-        'Восточный Тимор', 'Вьетнам', 'Габон', 'Гаити', 'Гайана',
-        'Гамбия', 'Гана', 'Гваделупа', 'Гватемала', 'Гвинея',
-        'Гвинея-Биссау', 'Германия', 'Гибралтар', 'Гонгконг', 'Гондурас',
-        'Государство-город Ватикан', 'Гренада', 'Гренландия', 'Греция', 'Грузия',
-        'Гуам', 'Дания', 'Джерси', 'Джибути', 'Доминиканская Республика',
-        'Египет', 'Замбия', 'Западная Сахара', 'Зимбабве', 'Израиль',
-        'Индия', 'Индонезия', 'Иордания', 'Ирак', 'Иран',
-        'Ирландия', 'Исландия', 'Испания', 'Италия', 'Йемен',
-        'Казахстан, Республика', 'Каймановы Острова', 'Камбоджа', 'Камерун', 'Катар',
-        'Кения', 'Кипр', 'Кирибати', 'Китай', 'Кокосовые острова',
-        'Колумбия', 'Коморские Острова', 'Конго, Демократическая Республика', 'Конго, Республика', 'Коста-Рика',
-        'Кот-д’Ивуар', 'Куба', 'Кувейт', 'Кыргызстан', 'Лаос',
-        'Латвия', 'Лесото', 'Либерия', 'Ливан', 'Ливия',
-        'Литва', 'Лихтенштейн', 'Люксембург', 'Маврикий', 'Мавритания',
-        'Мадагаскар, Республика', 'Майотта', 'Макао', 'Македония, Республика', 'Малави',
-        'Малайзия', 'Мали', 'Мальдивы', 'Мальта', 'Марокко',
-        'Мартиник', 'Маршалловы Острова', 'Мексика', 'Мелкие отдаленные острова США', 'Мозамбик',
-        'Молдова', 'Монако', 'Монголия', 'Монтсеррат', 'Мьянма',
-        'Намибия', 'Науру', 'Непал', 'Нигер', 'Нигерия',
-        'Нидерландские Антильские острова', 'Нидерланды', 'Никарагуа', 'Ниуэ', 'Новая Зеландия',
-        'Новая Каледония', 'Норвегия', 'Объединённые Арабские Эмираты', 'О. Гернси', 'Оман',
-        'Острова Зеленого Мыса', 'Острова Кука', 'Острова Теркс И Кайкос', 'Острова Уоллис и Футуна', 'Острова Херд и Макдональд',
-        'Остров Буве', 'Остров Доминика', 'Остров Мэн', 'Остров Норфолк', 'Остров Святого Мартина',
-        'Остров Святой Елены', 'О. Южная Георгия И Южные Сандвичевы Острова', 'Пакистан', 'Палау', 'Палестина',
-        'Панама', 'Папуа-Новая Гвинея', 'Парагвай', 'Перу', 'Питкерн',
-        'Польша', 'Португалия', 'Пуэрто-Рико', 'Реюньон', 'Рождественские острова',
-        'Руанда', 'Румыния', 'Сальвадор', 'Самоа', 'Сан-Марино',
-        'Сан-Томе и Принсипи', 'Саудовская Аравия', 'Свазиленд', 'Северная Корея', 'Северные Марианские Острова',
-        'Сейшельские Острова', 'Сен-Бартельми', 'Сенегал', 'Сен-Пьер и Микелон', 'Сент-Винсент и Гренадины',
-        'Сент-Киттс и Невис', 'Сент-Люсия', 'Сербия', 'Сербия и Черногория, Государственный Союз', 'Сингапур',
-        'Сирия', 'Словацкая республика', 'Словения', 'Соломонские острова', 'Сомали',
-        'Судан', 'Суринам', 'Сьерра-Леоне', 'Таджикистан', 'Тайвань',
-        'Тайланд', 'Танзания', 'Того', 'Токелау', 'Тонга',
-        'Тринидад и Тобаго', 'Тувалу', 'Тунис', 'Туркмения', 'Турция',
-        'Уганда', 'Узбекистан', 'Уругвай', 'Фарерские острова', 'Федеративные Штаты Микронезии',
-        'Фиджи', 'Филиппины', 'Финляндия', 'Фолклендские о-ва', 'Франция',
-        'Французская Гвинея', 'Французская Полинезия', 'Французские Южные Территории', 'Хорватия', 'Чад',
-        'Черногория', 'Чешская Республика', 'Чили', 'Швейцария', 'Швеция',
-        'Шпицберген и Ян-Майен', 'Шри-Ланка', 'Эквадор', 'Экваториальная Гвинея', 'Эритрея',
-        'Эстония', 'Эфиопия', 'Южная Корея', 'Южно-Африканская Республика', 'Ямайка', 'Япония',
+        'Абхазия', 'Австралия', 'Австрия', 'Азербайджан', 'Албания', 'Алжир', 'Американское Самоа', 'Ангилья', 'Ангола', 'Андорра', 'Антарктида', 'Антигуа и Барбуда', 'Аргентина', 'Армения', 'Аруба', 'Афганистан',
+        'Багамы', 'Бангладеш', 'Барбадос', 'Бахрейн', 'Беларусь', 'Белиз', 'Бельгия', 'Бенин', 'Бермуды', 'Болгария', 'Боливия', 'Бонэйр, Синт-Эстатиус и Саба', 'Босния и Герцеговина', 'Ботсвана', 'Бразилия', 'Британская Территория в Индийском Океане', 'Британские Виргинские Острова', 'Бруней', 'Буркина-Фасо', 'Бурунди', 'Бутан',
+        'Вануату', 'Ватикан', 'Венгрия', 'Венесуэла', 'Великобритания', 'Виргинские Острова Соединённых Штатов', 'Вьетнам',
+        'Габон', 'Гаити', 'Гайана', 'Гамбия', 'Гана', 'Гваделупа', 'Гватемала', 'Гвинея', 'Гвинея-Бисау', 'Германия', 'Гернси', 'Гибралтар', 'Гондурас', 'Гонконг', 'Гренада', 'Гренландия', 'Греция', 'Грузия', 'Гуам',
+        'Дания', 'Демократическая Республика Конго', 'Джерси', 'Джибути', 'Доминика', 'Доминиканская Республика',
+        'Египет',
+        'Замбия', 'Западная Сахара', 'Зимбабве',
+        'Израиль', 'Индия', 'Индонезия', 'Иордания', 'Ирак', 'Иран', 'Ирландия', 'Исландия', 'Испания', 'Италия',
+        'Йемен',
+        'Кабо-Верде', 'Казахстан', 'Камбоджа', 'Камерун', 'Канада', 'Катар', 'Кения', 'Кипр', 'Киргизия', 'Кирибати', 'Китай', 'Кокосовые острова', 'Колумбия', 'Коморы', 'Конго', 'Корейская Народно-Демократическая Республика', 'Корея', 'Коста-Рика', 'Кот-д\'Ивуар', 'Куба', 'Кувейт', 'Кюрасао',
+        'Лаос', 'Латвия', 'Лесото', 'Либерия', 'Ливан', 'Ливия', 'Литва', 'Лихтенштейн', 'Люксембург',
+        'Маврикий', 'Мавритания', 'Мадагаскар', 'Майотта', 'Макао', 'Малави', 'Малайзия', 'Мали', 'Малые Тихоокеанские Отдаленные Острова Соединенных Штатов', 'Мальдивы', 'Мальта', 'Марокко', 'Мартиника', 'Маршалловы Острова', 'Мексика', 'Микронезия', 'Мозамбик', 'Молдова', 'Монако', 'Монголия', 'Монтсеррат', 'Мьянма',
+        'Намибия', 'Науру', 'Непал', 'Нигер', 'Нигерия', 'Нидерланды', 'Никарагуа', 'Ниуэ', 'Новая Зеландия', 'Новая Каледония', 'Норвегия',
+        'Объединенные Арабские Эмираты', 'Оман', 'Острова Кайман', 'Острова Кука', 'Острова Теркс и Кайкос', 'Остров Буве', 'Остров Мэн', 'Остров Норфолк', 'Остров Рождества', 'Остров Херд и Острова Макдональд',
+        'Пакистан', 'Палау', 'Палестина', 'Панама', 'Папуа-Новая Гвинея', 'Парагвай', 'Перу', 'Питкерн', 'Польша', 'Португалия', 'Пуэрто-Рико',
+        'Республика Македония', 'Реюньон', 'Россия', 'Руанда', 'Румыния',
+        'Самоа', 'Сан-Марино', 'Сан-Томе и Принсипи', 'Саудовская Аравия', 'Свазиленд', 'Святая Елена, Остров Вознесения, Тристан-да-кунья', 'Северные Марианские Острова', 'Сейшелы', 'Сен-Бартелеми', 'Сен-Мартен', 'Сенегал', 'Сент-Винсент и Гренадины', 'Сент-Китс и Невис', 'Сент-Люсия', 'Сент-Пьер и Микелон', 'Сербия', 'Сингапур', 'Сирийская Арабская Республика', 'Словакия', 'Словения', 'Соединенные Штаты Америки', 'Соломоновы Острова', 'Сомали', 'Судан', 'Суринам', 'Сьерра-Леоне',
+        'Таджикистан', 'Таиланд', 'Тайвань', 'Танзания', 'Тимор-лесте', 'Того', 'Токелау', 'Тонга', 'Тринидад и Тобаго', 'Тувалу', 'Тунис', 'Туркмения', 'Турция',
+        'Уганда', 'Узбекистан', 'Украина', 'Уоллис и Футуна', 'Уругвай',
+        'Фарерские острова', 'Фиджи', 'Филиппины', 'Финляндия', 'Фолклендские острова', 'Франция', 'Французская Гвиана', 'Французская Полинезия', 'Французские Южные Территории',
+        'Хорватия',
+        'Центрально-Африканская Республика',
+        'Чад', 'Черногория', 'Чехия', 'Чили',
+        'Швейцария', 'Швеция', 'Шпицберген и Ян-Майен', 'Шри-Ланка',
+        'Эквадор', 'Экваториальная Гвинея', 'Эландские Острова', 'Эль-Сальвадор', 'Эритрея', 'Эстония', 'Эфиопия',
+        'Южная Африка', 'Южная Джорджия и Южные Сандвичевы Острова', 'Южная Осетия', 'Южный Судан',
+        'Ямайка', 'Япония',
     );
 
     protected static $region = array(
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/ru_RU/Text.php b/vendor/fzaninotto/faker/src/Faker/Provider/ru_RU/Text.php
index b785cfbc..7a989c28 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/ru_RU/Text.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/ru_RU/Text.php
@@ -4,6 +4,13 @@ namespace Faker\Provider\ru_RU;
 
 class Text extends \Faker\Provider\Text
 {
+    public function realText($maxNbChars = 200, $indexSize = 2)
+    {
+        $realText = parent::realText($maxNbChars, $indexSize);
+
+        return iconv('UTF-8', 'UTF-8//IGNORE', $realText);
+    }
+    
     /**
      * From ru.wikisource.org
      *
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/sl_SI/Company.php b/vendor/fzaninotto/faker/src/Faker/Provider/sl_SI/Company.php
new file mode 100644
index 00000000..0e899bfe
--- /dev/null
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/sl_SI/Company.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Faker\Provider\sl_SI;
+
+class Company extends \Faker\Provider\Company
+{
+    protected static $formats = array(
+        '{{firstName}} {{lastName}} s.p.',
+        '{{lastName}} {{companySuffix}}',
+        '{{lastName}}, {{lastName}} in {{lastName}} {{companySuffix}}',
+    );
+
+    protected static $companySuffix = array('d.o.o.', 'd.d.', 'k.d.', 'k.d.d.','d.n.o.','so.p.');
+}
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/th_TH/Color.php b/vendor/fzaninotto/faker/src/Faker/Provider/th_TH/Color.php
new file mode 100644
index 00000000..48272ac8
--- /dev/null
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/th_TH/Color.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Faker\Provider\th_TH;
+
+class Color extends \Faker\Provider\Color
+{
+    protected static $safeColorNames = array(
+        'ขาว','ชมพู','ดำ','น้ำตาล','น้ำเงิน','ฟ้า','ม่วง','ส้ม','เขียว','เขียวอ่อน','เหลือง','แดง'
+    );
+
+    protected static $allColorNames = array(
+         'กากี','ขาว','คราม','ชมพู','ดำ','ทอง','นาค','น้ำตาล',
+         'น้ำเงิน','ฟ้า','ม่วง','ส้ม','เขียว','เขียวอ่อน',
+         'เงิน','เทา','เหลือง','เหลืองอ่อน','แดง','่ขี้ม้า'
+    );
+}
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/th_TH/PhoneNumber.php b/vendor/fzaninotto/faker/src/Faker/Provider/th_TH/PhoneNumber.php
index 7377363f..c4d5286c 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/th_TH/PhoneNumber.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/th_TH/PhoneNumber.php
@@ -22,6 +22,8 @@ class PhoneNumber extends \Faker\Provider\PhoneNumber
       '08 #### ####',
       '09# ### ####',
       '09 #### ####',
+      '06# ### ####',
+      '06 #### ####',
     );
 
     /**
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/tr_TR/Company.php b/vendor/fzaninotto/faker/src/Faker/Provider/tr_TR/Company.php
new file mode 100644
index 00000000..f26c722a
--- /dev/null
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/tr_TR/Company.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace Faker\Provider\tr_TR;
+
+class Company extends \Faker\Provider\Company
+{
+    protected static $formats = array(
+        '{{lastName}} {{companySuffix}}',
+        '{{lastName}}oğlu {{companySuffix}}',
+        '{{lastName}} {{lastName}} {{companySuffix}}',
+        '{{lastName}} {{companyField}} {{companySuffix}}',
+        '{{lastName}} {{companyField}} {{companySuffix}}',
+        '{{lastName}} {{companyField}} {{companySuffix}}',
+        '{{lastName}} {{lastName}} {{companyField}} {{companySuffix}}',
+    );
+
+    protected static $companySuffix = array('A.Ş.', 'Ltd. Şti.');
+
+    protected static $companyField = array(
+        'Akaryakıt', 'Beyaz Eşya', 'Bilgi İşlem', 'Bilgisayar', 'Bilişim Hizmetleri',
+        'Biracılık ve Malt Sanayii', 'Cam Sanayii', 'Çimento', 'Demir ve Çelik',
+        'Dış Ticaret', 'Eczacılık', 'Elektrik İletim', 'Elektrik Üretim', 'Elektronik',
+        'Emlak', 'Enerji', 'Giyim', 'Gıda', 'Holding', 'Isıtma ve Soğutma Sistemleri',
+        'İletişim Hizmetleri', 'İnşaat ve Sanayi', 'İthalat ve İhracat', 'Kimya',
+        'Kurumsal Hizmetler', 'Lojistik', 'Madencilik', 'Makina', 'Mağazalar', 'Nakliyat',
+        'Otomotiv', 'Pazarlama', 'Perakende Ticaret', 'Petrol', 'Petrolcülük', 'Sanayi',
+        'Sağlık Hizmetleri', 'Servis ve Ticaret', 'Süt Ürünleri', 'Tarım Sanayi',
+        'Tavukçuluk', 'Tekstil', 'Telekomunikasyon', 'Tersane ve Ulaşım Sanayi',
+        'Ticaret', 'Ticaret ve Sanayi', 'Ticaret ve Taahhüt', 'Turizm', 'Yatırım'
+    );
+
+    /**
+    * @link https://tr.wikipedia.org/wiki/Meslekler_listesi
+    * @note Randomly took 300 from this list
+    */
+    protected static $jobTitleFormat = array(
+        'Acil tıp teknisyeni', 'Agronomist', 'Aile hekimi', 'Aktar', 'Aktör', 'Aktüer',
+        'Akustikçi', 'Albay', 'Ambarcı', 'Ambulans şoförü', 'Amiral', 'Analist',
+        'Antika satıcısı', 'Araba tamircisi', 'Arabacı', 'Araştırmacı', 'Armatör', 'Artist',
+        'Asker', 'Astrofizikçi', 'Astrolog', 'Astronom', 'Astronot', 'Atlet', 'Avukat',
+        'Ayakkabı boyacısı', 'Ayakkabı tamircisi', 'Ayakçı', 'Ağ yöneticisi', 'Aşçıbaşı',
+        'Bacacı', 'Badanacı', 'Baharatçı', 'Bahçe bitkileri uzmanı', 'Bakkal', 'Bakteriyolog',
+        'Balon pilotu', 'Bankacı', 'Banker', 'Barmeyd', 'Başdümenci', 'Başpiskopos',
+        'Başçavuş', 'Bebek Bakıcısı', 'Belediye başkanı', 'Belediye meclisi üyesi', 'Besteci',
+        'Biletçi', 'Bilgi İşlemci', 'Bilgisayar mühendisi', 'Binicilik', 'Biyografi yazarı',
+        'Bobinajcı', 'Borsacı', 'Boyacı', 'Bulaşıkçı', 'Börekç', 'Çamaşırcı', 'Çantacı',
+        'Çevik Kuvvet', 'Çevirmen', 'Çevre Mühendisi', 'Çevrebilimci', 'Çeyizci',
+        'Çiftlik işletici', 'Çiftçi', 'Çinici', 'Çoban', 'Çırak', 'Dadı', 'Daktilograf',
+        'Dalgıç', 'Dansöz', 'Dedektif', 'Derici', 'Değirmen işçisi', 'Değirmenci', 'Dilci',
+        'Diplomat', 'Doktor', 'Dokumacı', 'Dondurmacı', 'Doğramacı', 'Dövizci', 'Döşemeci',
+        'Elektrik mühendisi', 'Elektronik mühendisi', 'Elektronik ve Haberleşme mühendisi',
+        'Embriyolog', 'Emniyet amiri', 'Emniyet genel müdürü', 'Ergonomist', 'Eskici', 'Fahişe',
+        'Fizikçi', 'Fizyoterapist', 'Fotoğrafçı', 'Fıçıcı', 'Galerici', 'Garson',
+        'Gazete dağıtıcısı', 'Gazete satıcısı', 'Gazeteci', 'Gelir uzman yardımcısı', 'General',
+        'Genetik mühendisi', 'Gezici vaiz', 'Gondolcu', 'Guru', 'Gökbilimci', 'Gözlükçü',
+        'Güfteci', 'Gümrük uzmanı', 'Haham', 'Hakem', 'Halkbilimci', 'Hamal', 'Hamurkâr',
+        'Hareket memuru', 'Hava trafikçisi', 'Havacı', 'Hayvan terbiyecisi', 'Hesap uzmanı',
+        'Heykeltıraş', 'Hokkabaz', 'Irgat', 'İcra memuru', 'İllüzyonist', 'İmam',
+        'İnsan kaynakları uzmanı', 'İplikçi', 'İthalatçı', 'İş ve uğraşı terapisti', 'İşaretçi',
+        'Jimnastikçi', 'Jokey', 'Kabin görevlisi', 'Kabuk soyucusu', 'Kadın berberi', 'Kahveci',
+        'Kalaycı', 'Kaplamacı', 'Kapı satıcısı', 'Kardinal', 'Kardiyolog', 'Karikatürist',
+        'Kat görevlisi', 'Kaymakam', 'Kayıkçı', 'Kazıcı', 'Klarnetçi', 'Konserveci',
+        'Konveyör operatörü', 'Koramiral', 'Korgeneral', 'Kozmolog', 'Kuaför', 'Kumaşçı', 'Kumcu',
+        'Kuruyemişçi', 'Kurye', 'Kuyumcu', 'Kâğıtçı', 'Köpek eğiticisi', 'Köşe yazarı', 'Kürkçü',
+        'Kırtasiyeci', 'Laborant', 'Laboratuar işçisi', 'Lahmacuncu', 'Lehimci', 'Levazımcı',
+        'Lobici', 'Lokantacı', 'Lokman', 'Lostracı', 'Madenci', 'Makastar', 'Makine mühendisi',
+        'Makine zabiti', 'Makyajcı', 'Mali hizmetler uzmanı', 'Manastır baş rahibesi',
+        'Manifaturacı', 'Manikürcü', 'Masör', 'Matematikçi', 'Memur', 'Mermerci',
+        'Meteoroloji uzmanı', 'Misyoner', 'Model', 'Modelci', 'Modelist', 'Montajcı', 'Montör',
+        'Muallim', 'Muhafız', 'Mumyalayıcı', 'Müzik yönetmeni', 'Müşavir', 'Nalbant', 'Nalbur',
+        'Oduncu', 'Orgcu', 'Ornitolog', 'Oto elektrikçisi', 'Oto lastik tamircisi', 'Oyuncakçı',
+        'Oyuncu', 'Ön muhasebe yardımcı elemanı', 'Ön muhasebeci', 'Öğretim elemanı',
+        'Öğretim görevlisi', 'Öğretim üyesi', 'Papaz', 'Paramedik', 'Pastörizör', 'Pencereci',
+        'Perukçu', 'Peyzaj teknikeri', 'Peçeteci', 'Pideci', 'Pilot', 'Piyanist', 'Politikacı',
+        'Pompacı', 'Psikolog', 'Radyolog', 'Radyoloji teknisyeni/teknikeri', 'Rejisör',
+        'Reklamcı', 'Rektör', 'Rot balansçı', 'Saat tamircisi', 'Sanat yönetmeni', 'Saraç',
+        'Saz şairi', 'Sekreter', 'Ses teknisyeni', 'Sicil memuru', 'Sihirbaz', 'Sistem mühendisi',
+        'Sosyal hizmet uzmanı', 'Sosyolog', 'Soğuk demirci', 'Stenograf', 'Stilist', 'Striptizci',
+        'Sucu', 'Sunucu', 'Susuz araç yıkama', 'Sünnetçi', 'Sürveyan', 'Şapel papazı',
+        'Şarkı sözü yazarı', 'Şehir Plancısı', 'Şekerci', 'Şimşirci', 'Şoför', 'Tahsildar',
+        'Tarihçi', 'Tasarımcı', 'Taşlayıcı', 'Taşçı', 'Tekniker', 'Teknisyen', 'Teknoloji uzmani',
+        'Televizyon tamircisi', 'Terapist', 'Tesisatçı', 'Teşrifatçı', 'Tornacı', 'Tuğgeneral',
+        'Ulaşım sorumlusu', 'Ustabaşı', 'Uydu antenci', 'Üst Düzey Yönetici', 'Ütücü',
+        'Uzay bilimcisi', 'Vali', 'Veri hazırlama ve kontrol işletmeni', 'Veteriner hekim',
+        'Veteriner sağlık teknikeri', 'Veznedar', 'Vinç operatörü', 'Vitrinci', 'Yarbay',
+        'Yardımcı pilot', 'Yargıç', 'Yazar', 'Yazı işleri müdürü', 'Yazılım mühendisi',
+        'Yer gösterici', 'Yol bekçisi', 'Yorgancı', 'Yoğurtçu', 'Yıkıcı', 'Zabıta', 'Zoolog'
+    );
+
+    /**
+     * Returns a random company field.
+     *
+     * @return string
+     */
+    public static function companyField()
+    {
+        return static::randomElement(static::$companyField);
+    }
+}
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/tr_TR/Person.php b/vendor/fzaninotto/faker/src/Faker/Provider/tr_TR/Person.php
index 2d37d62e..a937377f 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/tr_TR/Person.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/tr_TR/Person.php
@@ -2,6 +2,8 @@
 
 namespace Faker\Provider\tr_TR;
 
+use Faker\Calculator\TCNo;
+
 class Person extends \Faker\Provider\Person
 {
     /**
@@ -94,4 +96,17 @@ class Person extends \Faker\Provider\Person
     {
         return static::titleMale();
     }
+
+    /**
+     * National Personal Identity number (tc kimlik no)
+     * @link https://en.wikipedia.org/wiki/Turkish_Identification_Number
+     * @return string on format XXXXXXXXXXX
+     */
+    public function tcNo()
+    {
+        $randomDigits = static::numerify('#########');
+        $checksum = TCNo::checksum($randomDigits);
+
+        return $randomDigits . $checksum;
+    }
 }
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/uk_UA/Address.php b/vendor/fzaninotto/faker/src/Faker/Provider/uk_UA/Address.php
index dc0091c3..1ff77a47 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/uk_UA/Address.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/uk_UA/Address.php
@@ -252,7 +252,7 @@ class Address extends \Faker\Provider\Address
         'Тернопіль',
         'Харків',
         'Херсон',
-        'Хмельницьк',
+        'Хмельницький',
         'Черкаси',
         'Чернівці',
         'Чернігів'
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/uk_UA/Payment.php b/vendor/fzaninotto/faker/src/Faker/Provider/uk_UA/Payment.php
index eaad1c34..81ad024c 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/uk_UA/Payment.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/uk_UA/Payment.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Faker\Provider\uk_Ua;
+namespace Faker\Provider\uk_UA;
 
 class Payment extends \Faker\Provider\Payment
 {
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/zh_TW/Address.php b/vendor/fzaninotto/faker/src/Faker/Provider/zh_TW/Address.php
index 990d347c..bd0b766d 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/zh_TW/Address.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/zh_TW/Address.php
@@ -176,10 +176,10 @@ class Address extends \Faker\Provider\Address
             '壯圍鄉', '員山鄉', '冬山鄉', '五結鄉', '三星鄉',
             '大同鄉', '南澳鄉',
         ),
-        '桃園縣' => array(
-            '桃園市', '中壢市', '大溪鎮', '楊梅鎮', '蘆竹鄉',
-            '大園鄉', '龜山鄉', '八德市', '龍潭鄉', '平鎮市',
-            '新屋鄉', '觀音鄉', '復興鄉',
+        '桃園市' => array(
+            '桃園區', '中壢區', '大溪區', '楊梅區', '蘆竹區',
+            '大園區', '龜山區', '八德區', '龍潭區', '平鎮區',
+            '新屋區', '觀音區', '復興區',
         ),
         '新竹縣' => array(
             '竹北市', '竹東鎮', '新埔鎮', '關西鎮', '湖口鄉',
diff --git a/vendor/fzaninotto/faker/src/Faker/Provider/zh_TW/Text.php b/vendor/fzaninotto/faker/src/Faker/Provider/zh_TW/Text.php
index ea34445f..887d12bb 100644
--- a/vendor/fzaninotto/faker/src/Faker/Provider/zh_TW/Text.php
+++ b/vendor/fzaninotto/faker/src/Faker/Provider/zh_TW/Text.php
@@ -15,85 +15,787 @@ class Text extends \Faker\Provider\Text
     protected static $notBeginPunct = array('、', '。', '」', '』', '！', '？', 'ー', '，', '：', '；');
 
     /**
-     * Title: 三國演義 Romance of the Three Kingdoms
-     * Author: 羅貫中 Luo Guanzhong
+     * Title: 吶喊 Call to Arms (1922)
+     * Author: 魯迅 Lu Xun
      * Language: Traditional Chinese
-     *
-     * @see http://cls.hs.yzu.edu.tw/san/bin/body.asp?CHNO=001
+     * @see https://zh.wikisource.org/wiki/%E5%90%B6%E5%96%8A
      * @var string
      */
     protected static $baseText = <<<'EOT'
-第一回：宴桃園豪傑三結義，斬黃巾英雄首立功
-詞曰：滾滾長江東逝水，浪花淘盡英雄。是非成敗轉頭空：青山依舊在，幾度夕陽紅。白髮漁樵江渚上，慣看秋月春風。一壺濁酒喜相逢：古今多少事，
-都付笑談中。話說天下大勢，分久必合，合久必分：周末七國分爭，并入於秦。及秦滅之後，楚、漢分爭，又并入於漢。漢朝自高祖斬白蛇而起義，一統天下。
-後來光武中興，傳至獻帝，遂分為三國。推其致亂之由，殆始於桓、靈二帝。桓帝禁錮善類，崇信宦官。及桓帝崩，靈帝即位，大將軍竇武、太傅陳蕃，共相輔佐。
-時有宦官曹節等弄權，竇武、陳蕃謀誅之，作事不密，反為所害。中涓自此愈橫。建寧二年四月望日，帝御溫德殿。方陞座，殿角狂風驟起，只見一條大青蛇，
-從梁上飛將下來，蟠於椅上。帝驚倒，左右急救入宮，百官俱奔避。須臾，蛇不見了。忽然大雷大雨，加以冰雹，落到半夜方止，壞卻房屋無數。建寧四年二月，
-洛陽地震；又海水泛溢，沿海居民，盡被大浪捲入海中。光和元年，雌雞化雄。六月朔，黑氣十餘丈，飛入溫德殿中。秋七月，有虹見於玉堂；五原山岸，
-盡皆崩裂。種種不祥，非止一端。帝下詔問群臣以災異之由，議郎蔡邕上疏，以為蜺墮雞化，乃婦寺干政之所致，言頗切直。帝覽奏歎息，因起更衣。
-曹節在後竊視，悉宣告左右，遂以他事陷邕於罪，放歸田里。後張讓，趙忠，封諝，段珪，曹節，候覽，蹇碩，程曠，夏惲，郭勝十人朋比為奸，號為「十常侍」。
-帝尊信張讓，呼為「阿父」，朝政日非，以致天下人心思亂，盜賊蜂起。時鉅鹿郡有兄弟三人：一名張角，一名張寶，一名張梁。那張角本是個不第秀才。
-因入山採藥，遇一老人，碧眼童顏，手執藜杖，喚角至一洞中，以天書三卷授之，曰：「此名太平要術。汝得之，當代天宣化，普救世人；若萌異心，必獲惡報。」
-角拜問姓名。老人曰：「吾乃南華老仙也。」言訖，化陣清風而去。角得此書，曉夜攻習，能呼風喚雨，號為太平道人。中平元年正月內，疫氣流行，
-張角散施符水，為人治病，自稱大賢良師。角有徒弟五百餘人，雲游四方，皆能書符念咒。次後徒眾日多，角乃立三十六方，ー大方萬餘人，小方六七千ー，
-各立渠帥，稱為將軍。訛言「蒼天已死，黃天當立。」又云「歲在甲子，天下大吉。」令人各以白土，書「甲子」二字於家中大門上。青、幽、徐、冀、荊、揚、
-兗、豫八州之人，家家侍奉大賢良師張角名字。角遣其黨馬元義，暗齎金帛，結交中涓封諝，以為內應。角與二弟商議曰：「至難得者，民心也。今民心已順，
-若不乘勢取天下，誠為可惜。」遂一面私造黃旗，約期舉事；一面使弟子唐州，馳書報封諝。唐州乃逕赴省中告變。帝召大將軍何進調兵擒馬元義，斬之；
-次收封諝等一干人下獄。張角聞知事露，星夜舉兵，自稱天公將軍，ー張寶稱地公將軍，張梁稱人公將軍ー。申言於眾曰：「今漢運將終，大聖人出；
-汝等皆宜順從天意，以槳太平。」四方百姓，裹黃巾從張角反者，四五十萬。賊勢浩大，官軍望風而靡。何進奏帝火速降詔，令各處備禦，討賊立功；
-一面遣中郎將盧植，皇甫嵩，朱雋，各引精兵，分三路討之。且說張角一軍，前犯幽州界分。幽州太守劉焉，乃江夏竟陵人氏，漢魯恭王之後也；
-當時聞得賊兵將至，召校尉鄒靖計議。靖曰：「賊兵眾，我兵寡，明公宜作速招軍應敵。」劉焉然其說，隨即出榜招募義兵。榜文行到涿縣，
-乃引出涿縣中一個英雄。那人不甚好讀書；性寬和，寡言語，喜怒不形於色；素有大志，專好結交天下豪傑；生得身長七尺五寸，兩耳垂肩，雙手過膝，
-目能自顧其耳，面如冠玉，脣若塗脂；中山靖王劉勝之後，漢景帝閣下玄孫；姓劉，名備，字玄德。昔劉勝之子劉貞，漢武時封涿鹿亭侯，後坐酬金失侯，
-因此遺這一枝在涿縣。玄德祖劉雄，父劉弘。弘曾舉孝廉，亦嘗作吏，早喪。玄德幼孤，事母至孝；家貧，販屨織蓆為業。家住本縣樓桑村。其家之東南，
-有一大桑樹，高五丈餘，遙望之，童童如車蓋。相者云：「此家必出貴人。」玄德幼時，與鄉中小兒戲於樹下，曰：「我為天子，當乘此車蓋。」
-叔父劉元起奇其言，曰：「此兒非常人也！」因見玄德家貧，常資給之。年十五歲，母使游學，嘗師事鄭玄、盧植；與公孫瓚等為友。及劉焉發榜招軍時，
-玄德年己二十八歲矣。當日見了榜文，慨然長歎。隨後一人厲聲言曰：「大丈夫不與國家出力，何故長歎？」玄德回視其人：身長八尺，豹頭環眼，燕頷虎鬚，
-聲若巨雷，勢如奔馬。玄德見他形貌異常，問其姓名。其人曰：「某姓張，名飛，字翼德。世居涿郡，頗有莊田，賣酒屠豬，專好結交天下豪傑。
-適纔見公看榜而歎，故此相問。」玄德曰：「我本漢室宗親，姓劉，名備。今聞黃巾倡亂，有志欲破賊安民；恨力不能，故長歎耳。」飛曰：「吾頗有資財，
-當招募鄉勇，與公同舉大事，如何？」玄德甚喜，遂與同入村店中飲酒。正飲間，見一大漢，推著一輛車子，到店門首歇了；入店坐下，便喚酒保：「快斟酒來吃，
-我待趕入城去投軍。」玄德看其人：身長九尺，髯長二尺：面如重棗，脣若塗脂；丹鳳眼，臥蠶眉：相貌堂堂，威風凜凜。玄德就邀他同坐，叩其姓名。
-其人曰：「吾姓關，名羽，字壽長，後改雲長，河東解良人也。因本處勢豪，倚勢凌人，被吾殺了；逃難江湖，五六年矣。今聞此處招軍破賊，特來應募。」
-玄德遂以己志告之。雲長大喜。同到張飛莊上，共議大事。飛曰：「吾莊後有一桃園，花開正盛；明日當於園中祭告天地，我三人結為兄弟，協力同心，
-然後可圖大事。」玄德、雲長、齊聲應曰：「如此甚好。」次日，於桃園中，備下烏牛白馬祭禮等項，三人焚香，再拜而說誓曰：「念劉備、關羽、張飛，
-雖然異姓，既結為兄弟，則同心協力，救困扶危；上報國家，下安黎庶；不求同年同月同日生，但願同年同月同日死。皇天后土，實鑒此心。背義忘恩，
-天人共戮。」誓畢，拜玄德為兄，關羽次之，張飛為弟。祭罷天地，復宰牛設酒，聚鄉中勇士，得三百餘人，就桃園中痛飲一醉。來日收拾軍器，但恨無馬匹可乘。
-正思慮間，人報「有兩個客人，引一夥伴儅，趕一群馬，投莊上來。」玄德曰：「此天佑我也！」三人出莊迎接。原來二客乃中山大商：一名張世平，一名蘇雙，
-每年往北販馬，近因寇發而回。玄德請二人到莊，置酒管待，訴說欲討賊安民之意。二客大喜，願將良馬五十匹相送；又贈金銀五百兩，鑌鐵一千斤，以資器用。
-玄德謝別二客，便命良匠打造雙股劍。雲長造青龍偃月刀，又名冷豔鋸，重八十二斤。張飛造丈八點鋼矛。各置全身鎧甲。共聚鄉勇五百餘人，來見鄒靖。
-鄒靖引見太守劉焉。三人參見畢，各通姓名。玄德說起宗派，劉焉大喜，遂認玄德為姪。不數日，人報黃巾賊將程遠志統兵五萬來犯涿郡。
-劉焉令鄒靖引玄德等三人，統兵五百，前去破敵。玄德等欣然領軍前進，直至大興山下，與賊相見。賊眾皆披髮，以黃巾抹額。當下兩軍相對，玄德出馬，
-ー左有雲長，右有翼德ー，揚鞭大罵：「反國逆賊，何不早降！」程遠志大怒，遣副將鄧茂出戰。張飛挺丈八蛇矛直出，手起處，刺中鄧茂心窩，翻身落馬。
-程遠志見折了鄧茂，拍馬舞刀，直取張飛。雲長舞動大刀，縱馬飛迎。程遠志見了，早吃一驚；措手不及，被雲長刀起處，揮為兩段。
-後人有詩讚二人曰：英雄發穎在今朝，一試矛兮一試刀。初出便將威力展，三分好把姓名標。眾賊見程遠志被斬，皆倒戈而走。玄德揮軍追趕，投降者不計其數，
-大勝而回。劉焉親自迎接，賞勞軍士。次日，接得青州太守龔景牒文，言黃巾賊圍城將陷，乞賜救援。劉焉與玄德商議。玄德曰：「備願往救之。」
-劉焉令鄒靖將兵五千，同玄德，關，張，投青州來。賊眾見救軍至，分兵混戰。玄德兵寡不勝，退三十里下寨。玄德謂關、張曰、「賊眾我寡，必出奇兵，
-方可取勝。」乃分關公引一千軍伏山左，張飛引一千軍伏山右，鳴金為號，齊出接應。次日，玄德與鄒靖，引軍鼓譟而進。賊眾迎戰，玄德引軍便退。
-賊眾乘勢追趕，方過山嶺，玄德軍中一齊鳴金，左右兩軍齊出，玄德麾軍回身復殺。三路夾攻，賊眾大潰。直趕至青州城下，太守龔景亦率民兵出城助戰。
-賊勢大敗，剿戮極多，遂解青州之圍。後人有詩讚玄德曰：運籌決算有神功，二虎還須遜一龍。初出便能垂偉績，自應分鼎在孤窮。龔景犒軍畢，鄒靖欲回。
-玄德曰：「近聞中郎將盧植與賊首張角戰於廣宗，備昔曾師事盧植，欲往助之。」於是鄒靖引軍自回，玄德與關、張引本部五百人投廣宗來。至盧植軍中，
-入帳施禮，具道來意。盧植大喜，留在帳前聽調。時張角賊眾十五萬，植兵五萬，相拒於廣宗，未見勝負。植謂玄德曰：「我今圍賊在此，賊弟張梁，張寶在潁川，
-與皇甫嵩、朱雋對壘。汝可引本部人馬，我更助汝一千官軍，前去潁川打探消息，約期剿捕。」玄德領命，引軍星夜投潁川來。時皇甫嵩、朱雋領軍拒賊，
-賊戰不利，退入長社，依草結營。嵩與雋計曰：「賊依草結營，當用火攻之。」遂令軍士，每人束草一把，暗地埋伏。其夜大風忽起。二更以後，一齊縱火，
-嵩與雋各引兵攻擊賊寨，火燄張天，賊眾驚慌，馬不及鞍，人不及甲，四散奔走。殺到天明，張梁、張寶引敗殘軍士，奪路而走。忽見一彪軍馬，盡打紅旗，
-當頭來到，截往去路。為首閃出一將，身長七尺，細眼長髯；官拜騎都尉；沛國譙郡人也：姓曹，名操，字孟德。操父曹嵩，本姓夏侯氏；因為中常侍曹騰之養子，
-故冒姓曹。曹嵩生操，小字阿瞞，一名吉利。操幼時，好游獵，喜歌舞；有權謀，多機變。操有叔父，見操游蕩無度，嘗怒之，言於曹嵩。嵩責操。
-操忽心生一計：見叔父來，詐倒於地，作中風之狀。叔父驚告嵩，嵩急視之，操故無恙。嵩曰：「叔言汝中風，今己愈乎？」操曰：「兒自來無此病；
-因失愛於叔父，故見罔耳。」嵩信其言。後叔父但言操過，嵩並不聽。因此，操得恣意放蕩。時人有橋玄者，謂操曰：「天下將亂，非命世之才，不能濟。
-能安之者，其在君乎？」南陽何顒見操，言：「漢室將亡，安天下者，必此人也。」汝南許劭，有知人之名。操往見之，問曰：「我何如人？」劭不答。
-又問，劭曰：「子治世之能臣，亂世之奸雄也。」操聞言大喜。年二十，舉孝廉，為郎，除洛陽北都尉。初到任，即設五色棒十餘條於縣之四門。有犯禁者，
-不避豪貴，皆責之。中常侍蹇碩之叔，提刀夜行，操巡夜拏住，就棒責之。由是，內外莫敢犯者，威名頗震。後為頓丘令。因黃巾起，拜為騎都尉，引馬步軍五千，
-前來潁川助戰。正值張梁、張寶敗走，曹操攔住，大殺一陣，斬首萬餘級，奪得旗旛、金鼓馬匹極多。張梁、張寶死戰得脫。操見過皇甫嵩，朱雋，
-隨即引兵追襲張梁、張寶去了。卻說玄德引關、張來潁川，聽得喊殺之聲，又望見火光燭天，急引兵來時，賊已敗散。玄德見皇甫嵩，朱雋，其道盧植之意。
-嵩曰：「張梁、張寶勢窮力乏，必投廣宗去依張角。玄德可即星夜往助。」玄德領命，遂引兵復回。到得半路，只見一簇軍馬，護送一輛檻車，車中之囚，
-乃盧植也。玄德大驚，滾鞍下馬，問其緣故。植曰：「我圍張角，將次可破；因角用妖術，未能即勝。朝廷差黃門左豐前來體探，問我索取賄賂。
-我答曰：『軍糧尚缺，安有餘錢奉承天使？』左豐挾恨，回奏朝廷，說我高壘不戰，惰慢軍心；因此朝廷震怒，遣中郎將董卓來代將我兵，取我回京問罪。」
-張飛聽罷，大怒，要斬護送軍人，以救盧植。玄德急止之曰：「朝廷自有公論，汝豈可造次？」軍士簇擁盧植去了。關公曰：「盧中郎已被逮，別人領兵，
-我等去無所依，不如且回涿郡。」玄德從其言，遂引軍北行。行無二日，忽聞山後喊聲大震。玄德引關、張縱馬上高岡望之，見漢軍大敗，後面漫山塞野，
-黃巾蓋地而來，旗上大書「天公將軍」。玄德曰：「此張角也！可速戰！」三人飛馬引軍而出。張角正殺敗董卓，乘勢趕來，忽遇三人衝殺，角軍大亂，
-敗走五十餘里。三人救了董卓回寨。卓問三人現居何職。玄德曰：「白身。」卓甚輕之，不為禮。玄德出，張飛大怒曰：「我等親赴血戰，救了這廝，
-他卻如此無禮；若不殺之，難消我氣！」便要提刀入帳來殺董卓。正是：人情勢利古猶今，誰識英雄是白身？安得快人如翼德，盡誅世上負心人！
-畢竟董卓性命如何，且看下文分解。
+我在年青時候也曾經做過許多夢，後來大半忘卻了，但自己也並不以爲可惜。所謂回憶者，雖說可以使人歡欣，有時也不免使人寂寞，使精神的絲縷還牽著已逝的寂寞的時光，又有什麼意味呢，而我偏苦于不能全忘卻，這不能全忘的一部分，到現在便成了《吶喊》的來由。
+我有四年多，曾經常常，——幾乎是每天，出入于質鋪和藥店裏，年紀可是忘卻了，總之是藥店的櫃臺正和我一樣高，質鋪的是比我高一倍，我從一倍高的櫃臺外送上衣服或首飾去，在侮蔑裡接了錢，再到一樣高的櫃臺上給我久病的父親去買藥。回家之後，又須忙別的事了，因爲開方的醫生是最有名的，以此所用的藥引也奇特：冬天的蘆根，經霜三年的甘蔗，蟋蟀要原對的，結子的平地木，……多不是容易辦到的東西。然而我的父親終于日重一日的亡故了。
+有誰從小康人家而墜入困頓的麼，我以爲在這途路中，大概可以看見世人的真面目；我要到N進K學堂去了，仿佛是想走異路，逃異地，去尋求別樣的人們。我的母親沒有法，辦了八元的川資，說是由我的自便；然而伊哭了，這正是情理中的事，因爲那時讀書應試是正路，所謂學洋務，社會上便以爲是一種走投無路的人，只得將靈魂賣給鬼子，要加倍的奚落而且排斥的，而況伊又看不見自己的兒子了。然而我也顧不得這些事，終于到N去進了K學堂了，在這學堂裏，我纔知道世上還有所謂格致，算學，地理，歷史，繪圖和體操。生理學並不教，但我們卻看到些木版的《全體新論》和《化學衛生論》之類了。我還記得先前的醫生的議論和方藥，和現在所知道的比較起來，便漸漸的悟得中醫不過是一種有意的或無意的騙子，同時又很起了對于被騙的病人和他的家族的同情；而且從譯出的歷史上，又知道了日本維新是大半發端于西方醫學的事實。
+因爲這些幼稚的知識，後來便使我的學籍列在日本一個鄉間的醫學專門學校裏了。我的夢很美滿，預備卒業回來，救治像我父親似的被誤的病人的疾苦，戰爭時候便去當軍醫，一面又促進了國人對于維新的信仰。我已不知道教授微生物學的方法，現在又有了怎樣的進步了，總之那時是用了電影，來顯示微生物的形狀的，因此有時講義的一段落已完，而時間還沒有到，教師便映些風景或時事的畫片給學生看，以用去這多餘的光陰。其時正當日俄戰爭的時候，關于戰事的畫片自然也就比較的多了，我在這一個講堂中，便須常常隨喜我那同學們的拍手和喝采。有一回，我竟在畫片上忽然會見我久違的許多中國人了，一個綁在中間，許多站在左右，一樣是強壯的體格，而顯出麻木的神情。據解說，則綁著的是替俄國做了軍事上的偵探，正要被日軍砍下頭顱來示衆，而圍著的便是來賞鑑這示衆的盛舉的人們。
+這一學年沒有完畢，我已經到了東京了，因爲從那一回以後，我便覺得醫學並非一件緊要事，凡是愚弱的國民，卽使體格如何健全，如何茁壯，也只能做毫無意義的示衆的材料和看客，病死多少是不必以爲不幸的。所以我們的第一要著，是在改變他們的精神，而善于改變精神的是，我那時以爲當然要推文藝，于是想提倡文藝運動了。在東京的留學生很有學法政理化以至警察工業的，但沒有人治文學和美術；可是在冷淡的空氣中，也幸而尋到幾個同志了，此外又邀集了必須的幾個人，商量之後，第一步當然是出雜誌，名目是取“新的生命”的意思，因爲我們那時大抵帶些復古的傾向，所以只謂之《新生》。
+《新生》的出版之期接近了，但最先就隱去了若干擔當文字的人，接着又逃走了資本，結果只剩下不名一錢的三個人。創始時候旣已背時，失敗時候當然無可吿語，而其後卻連這三個人也都爲各自的運命所驅策，不能在一處縱談將來的好夢了，這就是我們的並未產生的《新生》的結局。
+我感到未嘗經驗的無聊，是自此以後的事。我當初是不知其所以然的；後來想，凡有一人的主張，得了贊和，是促其前進的，得了反對，是促其奮鬭的，獨有叫喊于生人中，而生人並無反應，既非贊同，也無反對，如置身毫無邊際的荒原，無可措手的了，這是怎樣的悲哀呵，我于是以我所感到者爲寂寞。
+這寂寞又一天一天的長大起來，如大毒蛇，纏住了我的靈魂了。
+然而我雖然自有無端的悲哀，卻也並不憤懣，因爲這經驗使我反省，看見自己了：就是我決不是一個振臂一呼應者雲集的英雄。
+只是我自己的寂寞是不可不驅除的，因爲這于我太痛苦。我于是用了種種法，來麻醉自己的靈魂，使我沈入于國民中，使我回到古代去，後來也親歷或旁觀過幾樣更寂寞更悲哀的事，都爲我所不願追懷，甘心使他們和我的腦一同消滅在泥土裏的，但我的麻醉法卻也似乎已經奏了功，再沒有青年時候的慷慨激昂的意思了。
+S會館裏有三間屋，相傳是往昔曾在院子裏的槐樹上縊死過一個女人的，現在槐樹已經高不可攀了，而這屋還沒有人住；許多年，我便寓在這屋裏鈔古碑。客中少有人來，古碑中也遇不到什麼問題和主義，而我的生命卻居然暗暗的消去了，這也就是我惟一的願望。夏夜，蚊子多了，便搖著蒲扇坐在槐樹下，從密葉縫裡看那一點一點的青天，晚出的槐蠶又每每冰冷的落在頭頸上。
+那時偶或來談的是一個老朋友金心異，將手提的大皮夾放在破桌上，脫下長衫，對面坐下了，因爲怕狗，似乎心房還在怦怦的跳動。
+“你鈔了這些有什麼用？”有一夜，他翻著我那古碑的鈔本，發了研究的質問了。“沒有什麼用。”“那麼，你鈔他是什麼意思呢？”“沒有什麼意思。”“我想，你可以做點文章……”
+我懂得他的意思了，他們正辦《新青年》，然而那時仿佛不特沒有人來贊同，並且也還沒有人來反對，我想，他們許是感到寂寞了，但是說：
+“假如一間鐵屋子，是絕無窗戶而萬難破毀的，裏面有許多熟睡的人們，不久都要悶死了，然而是從昏睡入死滅，並不感到就死的悲哀。現在你大嚷起來，驚起了較爲清醒的幾個人，使這不幸的少數者來受無可挽救的臨終的苦楚，你倒以爲對得起他們麼？”
+“然而幾個人旣然起來，你不能說決沒有毀壞這鐵屋的希望。”
+是的，我雖然自有我的確信，然而說到希望，卻是不能抹殺的，因爲希望是在于將來，決不能以我之必無的證明，來折服了他之所謂可有，于是我終于答應他也做文章了，這便是最初的一篇《狂人日記》。從此以後，便一發而不可收，每寫些小說模樣的文章，以敷衍朋友們的囑托，積久就有了十餘篇。
+在我自己，本以爲現在是已經並非一個切迫而不能已于言的人了，但或者也還未能忘懷于當日自己的寂寞的悲哀罷，所以有時候仍不免吶喊幾聲，聊以慰藉那在寂寞裏奔馳的猛士，使他不憚于前驅。至于我的喊聲是勇猛或是悲哀，是可憎或是可笑，那倒是不暇顧及的；但旣然是吶喊，則當然須聽將令的了，所以我往往不恤用了曲筆，在《藥》的瑜兒的墳上平空添上一個花環，在《明天》裏也不敍單四嫂子竟沒有做到看見兒子的夢，因爲那時的主將是不主張消極的。至于自己，卻也並不願將自以爲苦的寂寞，再來傳染給也如我那年青時候似的正做著好夢的青年。
+這樣說來，我的小說和藝術的距離之遠，也就可想而知了，然而到今日還能蒙着小說的名，甚而至于且有成集的機會，無論如何總不能不說是一件徼幸的事，但徼幸雖使我不安于心，而懸揣人間暫時還有讀者，則究竟也仍然是高興的。
+所以我竟將我的短篇小說結集起來，而且付印了，又因爲上面所說的緣由，便稱之爲《吶喊》。
+魯鎭的酒店的格局，是和別處不同的：都是當街一個曲尺形的大櫃臺，櫃裏面豫備着熱水，可以隨時溫酒。做工的人，傍午傍晚散了工，每每花四文銅錢，買一碗酒，——這是二十多年前的事，現在每碗要漲到十文，——靠櫃外站着，熱熱的喝了休息；倘肯多花一文，便可以買一碟鹽煮筍，或者茴香豆，做下酒物了，如果出到十幾文，那就能買一樣葷菜，但這些顧客，多是短衣幫，大抵沒有這樣闊綽。只有穿長衫的，纔踱進店面隔壁的房子裏，要酒要菜，慢慢地坐喝。
+我從十二歲起，便在鎭口的咸亨酒店裏當夥計，掌櫃說，樣子太傻，怕侍候不了長衫主顧，就在外面做點事罷。外面的短衣主顧，雖然容易說話，但嘮嘮叨叨纏夾不清的也很不少。他們往往要親眼看着黃酒從罎子裏舀出，看過壺子底裏有水沒有，又親看將壺子放在熱水裏，然後放心：在這嚴重監督下，羼水也很爲難。所以過了幾天，掌櫃又說我幹不了這事。幸虧薦頭的情面大，辭退不得，便改爲專管溫酒的一種無聊職務了。
+我從此便整天的站在櫃臺裏，專管我的職務。雖然沒有什麼失職，但總覺得有些單調，有些無聊。掌櫃是一副凶臉孔，主顧也沒有好聲氣，教人活潑不得；只有孔乙己到店，纔可以笑幾聲，所以至今還記得。
+孔乙己是站着喝酒而穿長衫的唯一的人。他身材很高大；青白臉色，皺紋間時常夾些傷痕；一部亂蓬蓬的花白的鬍子。穿的雖然是長衫，可是又髒又破，似乎十多年沒有補，也沒有洗。他對人說話，總是滿口之乎者也，教人半懂不懂的。因爲他姓孔，別人便從描紅紙上的「上大人孔乙己」這半懂不懂的話裏，替他取下一個綽號，叫作孔乙己。孔乙己一到店，所有喝酒的人便都看着他笑，有的叫道，「孔乙己，你臉上又添上新傷疤了！」他不回答，對櫃裏說，「溫兩碗酒，要一碟茴香豆。」便排出九文大錢。他們又故意的高聲嚷道，「你一定又偷了人家的東西了！」孔乙己睜大眼睛說，「你怎麼這樣憑空汚人清白……」「什麼清白？我前天親眼見你偷了何家的書，弔着打。」孔乙己便漲紅了臉，額上的青筋條條綻出，爭辯道，「竊書不能算偷……竊書！……讀書人的事，能算偷麼？」接連便是難懂的話，什麼「君子固窮」，什麼「者乎」之類，引得衆人都哄笑起來：店內外充滿了快活的空氣。
+聽人家背地裏談論，孔乙己原來也讀過書，但終于沒有進學，又不會營生；于是愈過愈窮，弄到將要討飯了。幸而寫得一筆好字，便替人家鈔鈔書，換一碗飯喫。可惜他又有一樣壞脾氣，便是好喝嬾做。坐不到幾天，便連人和書籍紙張筆硯，一齊失蹤。如是幾次，叫他鈔書的人也沒有了。孔乙己沒有法，便免不了偶然做些偷竊的事。但他在我們店裏，品行卻比別人都好，就是從不拖欠；雖然間或沒有現錢，暫時記在粉板上，但不出一月，定然還清，從粉板上拭去了孔乙己的名字。
+孔乙己喝過半碗酒，漲紅的臉色漸漸復了原，旁人便又問道，「孔乙己，你當眞認識字麼？」孔乙己看着問他的人，顯出不屑置辯的神氣。他們便接着說道，「你怎的連半個秀才也撈不到呢？」孔乙己立刻顯出頹唐不安模樣，臉上籠上了一層灰色，嘴裏說些話；這回可是全是之乎者也之類，一些不懂了。在這時候，衆人也都哄笑起來：店內外充滿了快活的空氣。
+在這些時候，我可以附和着笑，掌櫃是決不責備的。而且掌櫃見了孔乙己，也每每這樣問他，引人發笑。孔乙己自己知道不能和他們談天，便只好向孩子說話。有一回對我說道，「你讀過書麼？」我略略點一點頭。他說，「讀過書，……我便考你一考。茴香豆的茴字，怎樣寫的？」我想，討飯一樣的人，也配考我麼？便回過臉去，不再理會。孔乙己等了許久，很懇切的說道，「不能寫罷？……我教給你，記着！這些字應該記着。將來做掌櫃的時候，寫賬要用。」我暗想我和掌櫃的等級還很遠呢，而且我們掌櫃也從不將茴香豆上賬；又好笑，又不耐煩，嬾嬾的答他道，「誰要你教，不是草頭底下一個來回的回字麼？」孔乙己顯出極高興的樣子，將兩個指頭的長指甲敲着櫃臺，點頭說，「對呀對呀！……回字有四樣寫法，你知道麼？」我愈不耐煩了，努着嘴走遠。孔乙己剛用指甲蘸了酒，想在櫃上寫字，見我毫不熱心，便又歎一口氣，顯出極惋惜的樣子。
+有幾回，鄰舍孩子聽得笑聲，也趕熱鬧，圍住了孔乙己。他便給他們茴香豆喫，一人一顆。孩子喫完豆，仍然不散，眼睛都望着碟子。孔乙己着了慌，伸開五指將碟子罩住，彎腰下去說道，「不多了，我已經不多了。」直起身又看一看豆，自己搖頭說，「不多不多！多乎哉？不多也。」於是這一羣孩子都在笑聲裏走散了。
+孔乙己是這樣的使人快活，可是沒有他，別人也便這麼過。
+有一天，大約是中秋前的兩三天，掌櫃正在慢慢的結賬，取下粉板，忽然說，「孔乙己長久沒有來了。還欠十九個錢呢！」我纔也覺得他的確長久沒有來了。一個喝酒的人說道，「他怎麼會來？……他打折了腿了。」掌櫃說，「哦！」「他總仍舊是偷。這一回，是自己發昏，竟偷到丁舉人家裏去了。他家的東西，偷得的麼？」「後來怎麼樣？」「怎麼樣？先寫服辯，後來是打，打了大半夜，再打折了腿。」「後來呢？」「後來打折了腿了。」「打折了怎樣呢？」「怎樣？……誰曉得？許是死了。」掌櫃也不再問，仍然慢慢的算他的賬。
+中秋之後，秋風是一天涼比一天，看看將近初冬；我整天的靠着火，也須穿上棉襖了。一天的下半天，沒有一個顧客，我正合了眼坐着。忽然間聽得一個聲音，「溫一碗酒。」這聲音雖然極低，卻很耳熟。看時又全沒有人。站起來向外一望，那孔乙己便在櫃臺下對了門檻坐着。他臉上黑而且瘦，已經不成樣子；穿一件破夾襖，盤着兩腿，下面墊一個蒲包，用草繩在肩上掛住；見了我，又說道，「溫一碗酒。」掌櫃也伸出頭去，一面說，「孔乙己麼？你還欠十九個錢呢！」孔乙己很頹唐的仰面答道，「這……下回還清罷。這一回是現錢，酒要好。」掌櫃仍然同平常一樣，笑着對他說，「孔乙己，你又偷了東西了！」但他這回卻不十分分辯，單說了一句「不要取笑！」「取笑？要是不偷，怎麼會打斷腿？」孔乙己低聲說道，「跌斷，跌，跌……」他的眼色，很像懇求掌櫃，不要再提。此時已經聚集了幾個人，便和掌櫃都笑了。我溫了酒，端出去，放在門檻上。他從破衣袋裏摸出四文大錢，放在我手裏，見他滿手是泥，原來他便用這手走來的。不一會，他喝完酒，便又在旁人的說笑聲中，坐着用這手慢慢走去了。
+自此以後，又長久沒有看見孔乙己。到了年關，掌櫃取下粉板說，「孔乙己還欠十九個錢呢！」到第二年的端午，又說「孔乙己還欠十九個錢呢！」到中秋可是沒有說，再到年關也沒有看見他。
+我到現在終于沒有見——大約孔乙己的確死了。
+秋天的後半夜，月亮下去了，太陽還沒有出，只剩下一片烏藍的天；除了夜遊的東西，什麽都睡著。華老栓忽然坐起身，擦着火柴，點上遍身油膩的燈盞，茶館的兩間屋子裏，便彌滿了青白的光。
+「小栓的爹，你就去麽？」是一個老女人的聲音。裏邊的小屋子裏，也發出一陣咳嗽。「唔。」老栓一面聽，一面應，一面扣上衣服；伸手過去說，「你給我罷。」
+華大媽在枕頭底下掏了半天，掏出一包洋錢，交給老栓，老栓接了，抖抖的裝入衣袋，又在外面按了兩下；便點上燈籠，吹熄燈盞，走向裏屋子去了。那屋子裏面，正在窸窸窣窣的響，接著便是一通咳嗽。老栓候他平靜下去，才低低的叫道，「小栓……你不要起來。……店麽？你娘會安排的。」
+老栓聽得兒子不再說話，料他安心睡了；便出了門，走到街上。街上黑沈沈的一無所有，只有一條灰白的路，看得分明。燈光照着他的兩腳，一前一後的走。有時也遇到幾隻狗，可是一隻也沒有叫。天氣比屋子裏冷多了；老栓倒覺爽快，彷彿一旦變了少年，得了神通，有給人生命的本領似的，跨步格外高遠。而且路也愈走愈分明，天也愈走愈亮了。
+老栓正在專心走路，忽然吃了一驚，遠遠裏看見一條丁字街，明明白白橫著。他便退了幾步，尋到一家關着門的鋪子，蹩進簷下，靠門立住了。好一會，身上覺得有些發冷。「哼，老頭子。」「倒高興……。」
+老栓又喫一驚，睜眼看時，幾個人從他面前過去了。一個還回頭看他，樣子不甚分明，但很像久餓的人見了食物一般，眼裏閃出一種攫取的光。老栓看看燈籠，已經熄了。按一按衣袋，硬硬的還在。仰起頭兩面一望，只見許多古怪的人，三三兩兩，鬼似的在那裏徘徊；定睛再看，卻也看不出什麼別的奇怪。
+沒有多久，又見幾個兵，在那邊走動；衣服前後的一個大白圓圈，遠地裏也看得清楚，走過面前的，並且看出號衣上暗紅的鑲邊。——一陣腳步聲響，一眨眼，已經擁過了一大簇人。那三三兩兩的人，也忽然合作一堆，潮一般向前趕；將到丁字街口，便突然立住，簇成一個半圓。
+老栓也向那邊看，卻只見一堆人的後背；頸項都伸得很長，彷彿許多鴨，被無形的手揑住了的，向上提着。靜了一會，似乎有點聲音，便又動搖起來，轟的一聲，都向後退；一直散到老栓立着的地方，幾乎將他擠倒了。
+「喂！一手交錢，一手交貨！」一個渾身黑色的人，站在老栓面前，眼光正像兩把刀，刺得老栓縮小了一半。那人一隻大手，向他攤着；一隻手卻撮着一個鮮紅的饅頭，那紅的還是一點一點的往下滴。
+老栓慌忙摸出洋錢，抖抖的想交給他，卻又不敢去接他的東西。那人便焦急起來，嚷道，「怕什麼？怎的不拿！」老栓還躊躇着；黑的人便搶過燈籠，一把扯下紙罩，裹了饅頭，塞與老栓；一手抓過洋錢，揑一揑，轉身去了。嘴裏哼着說，「這老東西……。」
+「這給誰治病的呀？」老栓也似乎聽得有人問他，但他並不答應；他的精神，現在只在一個包上，彷彿抱着一個十世單傳的嬰兒，別的事情，都已置之度外了。他現在要將這包裏的新的生命，移植到他家裏，收穫許多幸福。太陽也出來了；在他面前，顯出一條大道，直到他家中，後面也照見丁字街頭破匾上「古口亭口」這四個黯淡的金字。
+老栓走到家，店面早經收拾乾淨，一排一排的茶桌，滑溜溜的發光。但是沒有客人；只有小栓坐在裏排的桌前吃飯，大粒的汗，從額上滾下，夾襖也帖住了脊心，兩塊肩胛骨高高凸出，印成一個陽文的「八字」。老栓見這樣子，不免皺一皺展開的眉心。他的女人，從竈下急急走出，睜着眼睛，嘴唇有些發抖。「得了麼？」「得了。」
+兩個人一齊走進竈下，商量了一會；華大媽便出去了，不多時，拏着一片老荷葉回來，攤在桌上。老栓也打開燈籠罩，用荷葉重新包了那紅的饅頭。小栓也吃完飯，他的母親慌忙說：「小栓——你坐着，不要到這裏來。」一面整頓了竈火，老栓便把一個碧綠的包，一個紅紅白白的破燈籠，一同塞在竈裏；一陣紅黑的火焰過去時，店屋裏散滿了一種奇怪的香味。
+「好香！你們吃什麼點心呀？」這是駝背五少爺到了。這人每天總在茶館裏過日，來得最早，去得最遲，此時恰恰蹩到臨街的壁角的桌邊，便坐下問話，然而沒有人答應他。「炒米粥麽？」仍然沒有人應。老栓匆匆走出，給他泡上茶。
+「小栓進來罷！」華大媽叫小栓進了裏面的屋子，中間放好一條凳，小栓坐了。他的母親端過一碟烏黑的圓東西，輕輕說：——「喫下去罷，——病便好了。」
+小栓撮起這黑東西，看了一會，似乎拏着自己的性命一般，心裏說不出的奇怪。十分小心的拗開了，焦皮裏面竄出一道白氣，白氣散了，是兩半個白麵的饅頭。——不多工夫，已經全在肚裏了，卻全忘了什麼味；面前只剩下一張空盤。他的旁邊，一面立着他的父親，一面立着他的母親，兩人的眼光，都彷彿要在他身裏注進什麽又要取出什麽似的；便禁不住心跳起來，按着胸膛，又是一陣咳嗽。
+「睡一會罷，——便好了。」
+小栓依他母親的話，咳着睡了。華大媽候他喘氣平靜，才輕輕的給他蓋上了滿幅補釘的夾被。
+店裏坐着許多人，老栓也忙了，提着大銅壺，一趟一趟的給客人沖茶；兩個眼眶，都圍着一圈黑線。
+「老栓，你有些不舒服麽？——你生病麽？」一個花白鬍子的人說。「沒有。」
+「沒有？——我想笑嘻嘻的，原也不像……」花白鬍子便取消了自己的話。
+「老栓只是忙。要是他的兒子……」駝背五少爺話還未完，突然闖進了一個滿臉橫肉的人，披一件玄色布衫，散着紐扣，用很寬的玄色腰帶，胡亂捆在腰間。剛進門，便對老栓嚷道：
+「吃了麽？好了麽？老栓，就是運氣了你！你運氣，要不是我信息靈……。」
+老栓一手提了茶壺，一手恭恭敬敬的垂着；笑嘻嘻的聽。滿座的人，也都恭恭敬敬的聽。華大媽也黑着眼眶，笑嘻嘻的送出茶碗茶葉來，加上一個橄欖，老栓便去沖了水。
+「這是包好！這是與眾不同的。你想，趁熱的拏來，趁熱吃下。」橫肉的人只是嚷。
+「真的呢，要沒有康大叔照顧，怎麽會這樣……」華大媽也很感激的謝他。
+「包好，包好！這樣的趁熱吃下。這樣的人血饅頭，什麽癆病都包好！」
+華大媽聽到「癆病」這兩個字，變了一點臉色，似乎有些不高興；但又立刻堆上笑，搭訕着走開了。這康大叔卻沒有覺察，仍然提高了喉嚨只是嚷，嚷得裏面睡着的小栓也合夥咳嗽起來。
+「原來你家小栓碰到了這樣的好運氣了。這病自然一定全好；怪不得老栓整天的笑着呢。」花白鬍子一面說，一面走到康大叔面前，低聲下氣的問道，「康大叔——聽說今天結果的一個犯人，便是夏家的孩子，那是誰的孩子？究竟是什麼事？」
+「誰的？不就是夏四奶奶的兒子麽？那個小傢伙！」康大叔見眾人都聳起耳朵聽他，便格外高興，橫肉塊塊飽綻，越發大聲說，「這小東西不要命，不要就是了。我可是這一回一點沒有得到好處；連剝下來的衣服，都給管牢的紅眼睛阿義拏去了。——第一要算我們栓叔運氣；第二是夏三爺賞了二十五兩雪白的銀子，獨自落腰包，一文不花。」
+小栓慢慢的從小屋子裏走出，兩手按了胸口，不住的咳嗽；走到竈下，盛出一碗冷飯，泡上熱水，坐下便吃。華大媽跟着他走，輕輕的問道，「小栓，你好些麽？——你仍舊只是肚餓？……」
+「包好，包好！」康大叔瞥了小栓一眼，仍然回過臉，對眾人說，「夏三爺真是乖角兒，要是他不先告官，連他滿門抄斬。現在怎樣？銀子！——這小東西也真不成東西！關在牢裏，還要勸牢頭造反。」
+「阿呀，那還了得。」坐在後排的一個二十多歲的人，很現出氣憤模樣。
+「你要曉得紅眼睛阿義是去盤盤底細的，他卻和他攀談了。他說：這大清的天下是我們大家的。你想：這是人話麽？紅眼睛原知道他家裏只有一個老娘，可是沒有料到他竟會那麽窮，搾不出一點油水，已經氣破肚皮了。他還要老虎頭上搔癢，便給他兩個嘴巴！」
+「義哥是一手好拳棒，這兩下，一定夠他受用了。」壁角的駝背忽然高興起來。
+「他這賤骨頭打不怕，還要說可憐可憐哩。」
+花白鬍子的人說，「打了這種東西，有什麽可憐呢？」
+康大叔顯出看他不上的樣子，冷笑着說，「你沒有聽清我的話；看他神氣，是說阿義可憐哩！」
+聽着的人的眼光，忽然有些板滯；話也停頓了。小栓已經吃完飯，吃得滿身流汗，頭上都冒出蒸氣來。
+「阿義可憐——瘋話，簡直是發了瘋了。」花白鬍子恍然大悟似的說。
+「發了瘋了。」二十多歲的人也恍然大悟的說。
+店裏的坐客，便又現出活氣，談笑起來。小栓也趁着熱鬧，拚命咳嗽；康大叔走上前，拍他肩膀說：
+「包好！小栓——你不要這麼咳。包好！」
+「瘋了。」駝背五少爺點着頭說。
+西關外靠着城根的地面，本是一塊官地；中間歪歪斜斜一條細路，是貪走便道的人，用鞋底造成的，但卻成了自然的界限。路的左邊，都埋着死刑和瘐斃的人，右邊是窮人的叢塚。兩面都已埋到層層疊疊，宛然闊人家裏祝壽時候的饅頭。
+這一年的清明，分外寒冷；楊柳才吐出半粒米大的新芽。天明未久，華大媽已在右邊的一坐新墳前面，排出四碟菜，一碗飯，哭了一場。化過紙，呆呆的坐在地上；彷彿等候什麽似的，但自己也說不出等候什麽。微風起來，吹動他短髮，確乎比去年白得多了。
+小路上又來了一個女人，也是半白頭髮，襤褸的衣裙；提一個破舊的朱漆圓籃，外掛一串紙錠，三步一歇的走。忽然見華大媽坐在地上看他，便有些躊躇，慘白的臉上，現出些羞愧的顏色；但終於硬着頭皮，走到左邊的一坐墳前，放下了籃子。
+那墳與小栓的墳，一字兒排着，中間只隔一條小路。華大媽看他排好四碟菜，一碗飯，立着哭了一通，化過紙錠；心裏暗暗地想，「這墳裏的也是兒子了。」那老女人徘徊觀望了一回，忽然手腳有些發抖，蹌蹌踉踉退下幾步，瞪着眼只是發怔。
+華大媽見這樣子，生怕他傷心到快要發狂了；便忍不住立起身，跨過小路，低聲對他說，「你這位老奶奶不要傷心了，——我們還是回去罷。」
+那人點一點頭，眼睛仍然向上瞪着；也低聲吃吃的說道，「你看，——看這是什麽呢？」
+華大媽跟了他指頭看去，眼光便到了前面的墳，這墳上草根還沒有全合，露出一塊一塊的黃土，煞是難看。再往上仔細看時，卻不覺也吃一驚；——分明有一圈紅白的花，圍着那尖圓的墳頂。
+他們的眼睛都已老花多年了，但望這紅白的花，卻還能明白看見。花也不很多，圓圓的排成一個圈，不很精神，倒也整齊。華大媽忙看他兒子和別人的墳，卻只有不怕冷的幾點青白小花，零星開着；便覺得心裏忽然感到一種不足和空虛，不願意根究。那老女人又走近幾步，細看了一遍，自言自語的說，「這沒有根，不像自己開的。——這地方有誰來呢？孩子不會來玩；——親戚本家早不來了。——這是怎麼一回事呢？」他想了又想，忽又流下淚來，大聲說道：
+「瑜兒，他們都冤枉了你，你還是忘不了，傷心不過，今天特意顯點靈，要我知道麽？」他四面一看，只見一隻烏鴉，站在一株沒有葉的樹上，便接着說，「我知道了。——瑜兒，可憐他們坑了你，他們將來總有報應，天都知道；你閉了眼睛就是了。——你如果真在這裏，聽到我的話，——便教這烏鴉飛上你的墳頂，給我看罷。」
+微風早經停息了；枯草支支直立，有如銅絲。一絲發抖的聲音，在空氣中愈顫愈細，細到沒有，周圍便都是死一般靜。兩人站在枯草叢裏，仰面看那烏鴉；那烏鴉也在筆直的樹枝間，縮着頭，鐵鑄一般站著。
+許多的工夫過去了；上墳的人漸漸增多，幾個老的小的，在土墳間出沒。
+華大媽不知怎的，似乎卸下了一挑重擔，便想到要走；一面勸着說，「我們還是回去罷。」
+那老女人嘆一口氣，無精打采的收起飯菜；又遲疑了一刻，終於慢慢地走了。嘴裏自言自語的說，「這是怎麼一回事呢？……」
+他們走不上二三十步遠，忽聽得背後「啞——」的一聲大叫；兩個人都竦然的回過頭，只見那烏鴉張開兩翅，一挫身，直向着遠處的天空，箭也似的飛去了。
+住在我們後進院子裏的三太太，在夏間買了一對白兔，是給伊的孩子們看的。
+這一對白兔，似乎離娘並不久，雖然是異類，也可以看出他們的天真爛熳來。但也豎直了小小的通紅的長耳朵，動著鼻子，眼睛裏頗現些驚疑的神色，大約究竟覺得人地生疏，沒有在老家時候的安心了。這種東西，倘到廟會日期自己出去買，每個至多不過兩弔錢，而三太太卻花了一元，因為是叫小使上店買來的。
+孩子們自然大得意了，嚷著圍住了看；大人也都圍著看；還有一匹小狗名叫S的也跑來，闖過去一嗅，打了一個噴嚏，退了幾步。三太太吆喝道，「S，聽著，不准你咬他！」於是在他頭上打了一拳，S便退開了，從此並不咬。
+這一對兔總是關在後窗後面的小院子裏的時候多，聽說是因為太喜歡撕壁紙，也常常啃木器腳。這小院子裏有一株野桑樹，桑子落地，他們最愛吃，便連喂他們的菠菜也不吃了。烏鴉喜鵲想要下來時，他們便躬著身子用後腳在地上使勁的一彈，砉的一聲直跳上來，像飛起了一團雪，鴉鵲嚇得趕緊走，這樣的幾回，再也不敢近來了。三太太說，鴉鵲到不打緊，至多也不過搶吃一點食料，可惡的是一匹大黑貓，常在矮牆上惡狠狠的看，這卻要防的，幸而S和貓是對頭，或者還不至於有什麼罷。
+孩子們時時捉他們來玩耍；他們很和氣，豎起耳朵，動著鼻子，馴良的站在小手的圈子裏，但一有空，卻也就溜開去了。他們夜裏的臥榻是一個小木箱，裏面鋪些稻草，就在後窗的房檐下。
+這樣的幾個月之後，他們忽而自己掘土了，掘得非常快，前腳一抓，後腳一踢，不到半天，已經掘成一個深洞。大家都奇怪，後來仔細看時，原來一個的肚子比別一個的大得多了。他們第二天便將乾草和樹葉銜進洞裏去，忙了大半天。
+大家都高興，說又有小兔可看了；三太太便對孩子們下了戒嚴令，從此不許再去捉。我的母親也很喜歡他們家族的繁榮，還說待生下來的離了乳，也要去討兩匹來養在自己的窗外面。
+他們從此便住在自造的洞府裏，有時也出來吃些食，後來不見了，可不知道他們是預先運糧存在裏面呢還是竟不吃。過了十多天，三太太對我說，那兩匹又出來了，大約小兔是生下來又都死掉了，因為雌的一匹的奶非常多，卻並不見有進去哺養孩子的形跡。伊言語之間頗氣憤，然而也沒有法。
+有一天，太陽很溫暖，也沒有風，樹葉都不動，我忽聽得許多人在那裏笑，尋聲看時，卻見許多人都靠著三太太的後窗看：原來有一個小兔，在院子裏跳躍了。這比他的父母買來的時候還小得遠，但也已經能用後腳一彈地，迸跳起來了。孩子們爭著告訴我說，還看見一個小兔到洞口來探一探頭，但是即刻便縮回去了，那該是他的弟弟罷。
+那小的也撿些草葉吃，然而大的似乎不許他，往往夾口的搶去了，而自己並不吃。孩子們笑得響，那小的終於吃驚了，便跳著鑽進洞裏去；大的也跟到洞門口，用前腳推著他的孩子的脊樑，推進之後，又爬開泥土來封了洞。
+從此小院子裏更熱鬧，窗口也時時有人窺探了。
+然而竟又全不見了那小的和大的。這時是連日的陰天，三太太又慮到遭了那大黑貓的毒手的事去。我說不然，那是天氣冷，當然都躲著，太陽一齣，一定出來的。
+太陽出來了，他們卻都不見。於是大家就忘卻了。
+惟有三太太是常在那裏喂他們菠菜的，所以常想到。伊有一回走進窗後的小院子去，忽然在牆角發見了一個別的洞，再看舊洞口，卻依稀的還見有許多爪痕。這爪痕倘說是大兔的，爪該不會有這樣大，伊又疑心到那常在牆上的大黑貓去了，伊於是也就不能不定下發掘的決心了。伊終於出來取了鋤子，一路掘下去，雖然疑心，卻也希望著意外的見了小白兔的，但是待到底，卻只見一堆爛草夾些兔毛，怕還是臨蓐時候所鋪的罷，此外是冷清清的，全沒有什麼雪白的小兔的蹤跡，以及他那隻一探頭未出洞外的弟弟了。
+氣憤和失望和淒涼，使伊不能不再掘那牆角上的新洞了。一動手，那大的兩匹便先竄出洞外面。伊以為他們搬了家了，很高興，然而仍然掘，待見底，那裏面也鋪著草葉和兔毛，而上面卻睡著七個很小的兔，遍身肉紅色，細看時，眼睛全都沒有開。
+一切都明白了，三太太先前的預料果不錯。伊為預防危險起見，便將七個小的都裝在木箱中，搬進自己的房裏，又將大的也捺進箱裏面，勒令伊去哺乳。
+三太太從此不但深恨黑貓，而且頗不以大兔為然了。據說當初那兩個被害之先，死掉的該還有，因為他們生一回，決不至於只兩個，但為了哺乳不勻，不能爭食的就先死了。這大概也不錯的，現在七個之中，就有兩個很瘦弱。所以三太太一有閑空，便捉住母兔，將小兔一個一個輪流的擺在肚子上來喝奶，不准有多少。
+母親對我說，那樣麻煩的養兔法，伊歷來連聽也未曾聽到過，恐怕是可以收入《無雙譜》的。
+白兔的家族更繁榮；大家也又都高興了。
+但自此之後，我總覺得淒涼。夜半在燈下坐著想，那兩條小性命，竟是人不知鬼不覺的早在不知什麼時候喪失了，生物史上不著一些痕跡，並S也不叫一聲。我於是記起舊事來，先前我住在會館裏，清早起身，只見大槐樹下一片散亂的鴿子毛，這明明是膏於鷹吻的了，上午長班來一打掃，便什麼都不見，誰知道曾有一個生命斷送在這裏呢？我又曾路過西四牌樓，看見一匹小狗被馬車軋得快死，待回來時，什麼也不見了，搬掉了罷，過往行人憧憧的走著，誰知道曾有一個生命斷送在這裏呢？夏夜，窗外面，常聽到蒼蠅的悠長的吱吱的叫聲，這一定是給蠅虎咬住了，然而我向來無所容心於其間，而別人並且不聽到……
+假使造物也可以責備，那麼，我以為他實在將生命造得太濫了，毀得太濫了。
+嗥的一聲，又是兩條貓在窗外打起架來。「迅兒！你又在那裏打貓了？」「不，他們自己咬。他那裏會給我打呢。」
+我的母親是素來很不以我的虐待貓為然的，現在大約疑心我要替小兔抱不平，下什麼辣手，便起來探問了。而我在全家的口碑上，卻的確算一個貓敵。我曾經害過貓，平時也常打貓，尤其是在他們配合的時候。但我之所以打的原因並非因為他們配合，是因為他們嚷，嚷到使我睡不著，我以為配合是不必這樣大嚷而特嚷的。
+況且黑貓害了小兔，我更是「師出有名」的了。我覺得母親實在太修善，於是不由的就說出模棱的近乎不以為然的答話來。
+造物太胡鬧，我不能不反抗他了，雖然也許是倒是幫他的忙……
+那黑貓是不能久在矮牆上高視闊步的了，我決定的想，於是又不由的一瞥那藏在書箱裏的一瓶青酸鉀。
+我在倒數上去的二十年中，只看過兩回中國戲，前十年是絕不看，因為沒有看戲的意思和機會，那兩回全在後十年，然而都沒有看出什麼來就走了。
+第一回是民國元年我初到北京的時候，當時一個朋友對我說，北京戲最好，你不去見見世面麽？我想，看戲是有味的，而況在北京呢。於是都興緻勃勃的跑到什麼園，戲文已經開場了，在外面也早聽到鼕鼕地響。我們挨進門，幾個紅的綠的在我的眼前一閃爍，便又看見戲臺下滿是許多頭，再定神四面看，卻見中間也還有幾個空座，擠過去要坐時，又有人對我發議論，我因為耳朵已經喤的響著了，用了心，纔聽到他是說「有人，不行！」。
+我們退到後面，一個辮子很光的卻來領我們到了側面，指出一個地位來。這所謂地位者，原來是一條長凳，然而他那坐板比我的上腿要狹到四分之三，他的腳比我的下腿要長過三分之二。我先是沒有爬上去的勇氣，接著便聯想到私刑拷打的刑具，不由的毛骨悚然的走出了。
+走了許多路，忽聽得我的朋友的聲音道，「究竟怎的？」我回過臉去，原來他也被我帶出來了。他很詫異的說，「怎麼總是走，不答應？」我說，「朋友，對不起，我耳朵只在鼕鼕喤喤的響，並沒有聽到你的話。」
+後來我每一想到，便很以為奇怪，似乎這戲太不好，——否則便是我近來在戲臺下不適於生存了。
+第二回忘記了那一年，總之是募集湖北水災捐而譚叫天還沒有死。捐法是兩元錢買一張戲票，可以到第一舞臺去看戲，扮演的多是名角，其一就是小叫天。我買了一張票，本是對於勸募人聊以塞責的，然而似乎又有好事家乘機對我說了些叫天不可不看的大法要了。我於是忘了前幾年的鼕鼕喤喤之災，竟到第一舞臺去了，但大約一半也因為重價購來的寶票，總得使用了纔舒服。我打聽得叫天出臺是遲的，而第一舞臺卻是新式構造，用不著爭座位，便放了心，延宕到九點鐘纔去，誰料照例，人都滿了，連立足也難，我只得擠在遠處的人叢中看一個老旦在臺上唱。那老旦嘴邊插著兩個點火的紙撚子，旁邊有一個鬼卒，我費盡思量，纔疑心他或者是目連的母親，因為後來又出來了一個和尚。然而我又不知道那名角是誰，就去問擠小在我的左邊的一位胖紳士。他很看不起似的斜瞥了我一眼，說道， 「龔雲甫！」我深愧淺陋而且粗疏，臉上一熱，同時腦裡也制出了決不再問的定章，於是看小旦唱，看花旦唱，看老生唱，看不知什麼角色唱，看一大班人亂打，看兩三個人互打，從九點多到十點，從十點到十一點，從十一點到十一點半，從十一點半到十二點，——然而叫天竟還沒有來。
+我向來沒有這樣忍耐的等待過什麼事物，而況這身邊的胖紳士的吁吁的喘氣，這臺上的鼕鼕喤喤的敲打，紅紅綠綠的晃蕩，加之以十二點，忽而使我省誤到在這裡不適於生存了。我同時便機械的擰轉身子，用力往外只一擠，覺得背後便已滿滿的，大約那彈性的胖紳士早在我的空處胖開了他的右半身了。我後無迴路，自然擠而又擠，終於出了大門。街上除了專等看客的車輛之外，幾乎沒有什麼行人了，大門口卻還有十幾個人昂著頭看戲目，別有一堆人站著並不看什麼，我想：他們大概是看散戲之後出來的女人們的，而叫天卻還沒有來……
+然而夜氣很清爽，真所謂「沁人心脾」，我在北京遇著這樣的好空氣，仿佛這是第一遭了。
+這一夜，就是我對於中國戲告了別的一夜，此後再沒有想到他，即使偶而經過戲園，我們也漠不相關，精神上早已一在天之南一在地之北了。
+但是前幾天，我忽在無意之中看到一本日本文的書，可惜忘記了書名和著者，總之是關於中國戲的。其中有一篇，大意仿佛說，中國戲是大敲，大叫，大跳，使看客頭昏腦眩，很不適於劇場，但若在野外散漫的所在，遠遠的看起來，也自有他的風致。我當時覺著這正是說了在我意中而未曾想到的話，因為我確記得在野外看過很好的戲，到北京以後的連進兩回戲園去，也許還是受了那時的影響哩。可惜我不知道怎麼一來，竟將書名忘卻了。
+至於我看好戲的時候，卻實在已經是「遠哉遙遙」的了，其時恐怕我還不過十一二歲。我們魯鎮的習慣，本來是凡有出嫁的女兒，倘自己還未當家，夏間便大抵回到母家去消夏。那時我的祖母雖然還康建，但母親也已分擔了些家務，所以夏期便不能多日的歸省了，只得在掃墓完畢之後，抽空去住幾天，這時我便每年跟了我的母親住在外祖母的家裡。那地方叫平橋村，是一個離海邊不遠，極偏僻的，臨河的小村莊；住戶不滿三十家，都種田，打魚，只有一家很小的雜貨店。但在我是樂土：因為我在這裡不但得到優待，又可以免念「秩秩斯乾幽幽南山」了。
+和我一同玩的是許多小朋友，因為有了遠客，他們也都從父母那裡得了減少工作的許可，伴我來遊戲。在小村裡，一家的客，幾乎也就是公共的。我們年紀都相仿，但論起行輩來，卻至少是叔子，有幾個還是太公，因為他們合村都同姓，是本家。然而我們是朋友，即使偶而吵鬧起來，打了太公，一村的老老少少，也決沒有一個會想出「犯上」這兩個字來，而他們也百分之九十九不識字。
+我們每天的事情大概是掘蚯蚓，掘來穿在銅絲做的小鉤上，伏在河沿上去釣蝦。蝦是水世界裡的呆子，決不憚用了自己的兩個鉗捧著鉤尖送到嘴裡去的，所以不半天便可以釣到一大碗。這蝦照例是歸我吃的。其次便是一同去放牛，但或者因為高等動物了的緣故罷，黃牛水牛都欺生，敢於欺侮我，因此我也總不敢走近身，只好遠遠地跟著，站著。這時候，小朋友們便不再原諒我會讀「秩秩斯干」，卻全都嘲笑起來了。
+至於我在那裡所第一盼望的，卻在到趙莊去看戲。趙莊是離平橋村五里的較大的村莊；平橋村太小，自己演不起戲，每年總付給趙莊多少錢，算作合做的。當時我並不想到他們為什麼年年要演戲。現在想，那或者是春賽，是社戲了。
+就在我十一二歲時候的這一年，這日期也看看等到了。不料這一年真可惜，在早上就叫不到船。平橋村只有一隻早出晚歸的航船是大船，決沒有留用的道理。其餘的都是小船，不合用；央人到鄰村去問，也沒有，早都給別人定下了。外祖母很氣惱，怪家裡的人不早定，絮叨起來。母親便寬慰伊，說我們魯鎮的戲比小村裡的好得多，一年看幾回，今天就算了。只有我急得要哭，母親卻竭力的囑咐我，說萬不能裝模裝樣，怕又招外祖母生氣，又不准和別人一同去，說是怕外祖母要擔心。
+總之，是完了。到下午，我的朋友都去了，戲已經開場了，我似乎聽到鑼鼓的聲音，而且知道他們在戲臺下買豆漿喝。
+這一天我不釣蝦，東西也少吃。母親很為難，沒有法子想。到晚飯時候，外祖母也終於覺察了，並且說我應當不高興，他們太怠慢，是待客的禮數裡從來沒有的。吃飯之後，看過戲的少年們也都聚攏來了，高高興興的來講戲。只有我不開口；他們都嘆息而且表同情。忽然間，一個最聰明的雙喜大悟似的提議了，他說，「大船？八叔的航船不是回來了麽？」十幾個別的少年也大悟，立刻攛掇起來，說可以坐了這航船和我一同去。我高興了。然而外祖母又怕都是孩子，不可靠；母親又說是若叫大人一同去，他們白天全有工作，要他熬夜，是不合情理的。在這遲疑之中，雙喜可又看出底細來了，便又大聲的說道，「我寫包票！船又大；迅哥兒向來不亂跑；我們又都是識水性的！」
+誠然！這十多個少年，委實沒有一個不會鳧水的，而且兩三個還是弄潮的好手。
+外祖母和母親也相信，便不再駁回，都微笑了。我們立刻一哄的出了門。
+我的很重的心忽而輕鬆了，身體也似乎舒展到說不出的大。一出門，便望見月下的平橋內泊著一隻白篷的航船，大家跳下船，雙喜拔前篙，阿發拔後篙，年幼的都陪我坐在艙中，較大的聚在船尾。母親送出來吩咐「要小心」的時候，我們已經點開船，在橋石上一磕，退後幾尺，即又上前出了橋。於是架起兩支櫓，一支兩人，一里一換，有說笑的，有嚷的，夾著潺潺的船頭激水的聲音，在左右都是碧綠的豆麥田地的河流中，飛一般徑向趙莊前進了。
+兩岸的豆麥和河底的水草所發散出來的清香，夾雜在水氣中撲面的吹來；月色便朦朧在這水氣裡。淡黑的起伏的連山，仿佛是踴躍的鐵的獸脊似的，都遠遠的向船尾跑去了，但我卻還以為船慢。他們換了四回手，漸望見依稀的趙莊，而且似乎聽到歌吹了，還有幾點火，料想便是戲臺，但或者也許是漁火。
+那聲音大概是橫笛，宛轉，悠揚，使我的心也沉靜，然而又自失起來，覺得要和他彌散在含著豆麥蘊藻之香的夜氣裡。
+那火接近了，果然是漁火；我纔記得先前望見的也不是趙莊。那是正對船頭的一叢松柏林，我去年也曾經去遊玩過，還看見破的石馬倒在地下，一個石羊蹲在草裡呢。過了那林，船便彎進了叉港，於是趙莊便真在眼前了。
+最惹眼的是屹立在莊外臨河的空地上的一座戲臺，模胡在遠處的月夜中，和空間幾乎分不出界限，我疑心畫上見過的仙境，就在這裡出現了。這時船走得更快，不多時，在臺上顯出人物來，紅紅綠綠的動，近臺的河裡一望烏黑的是看戲的人家的船篷。
+「近臺沒有什麼空了，我們遠遠的看罷。」阿發說。
+這時船慢了，不久就到，果然近不得台旁，大家只能下了篙，比那正對戲臺的神棚還要遠。其實我們這白篷的航船，本也不願意和烏篷的船在一處，而況沒有空地呢……
+在停船的匆忙中，看見臺上有一個黑的長鬍子的背上插著四張旗，捏著長槍，和一群赤膊的人正打仗。雙喜說，那就是有名的鐵頭老生，能連翻八十四個筋斗，他日裡親自數過的。
+我們便都擠在船頭上看打仗，但那鐵頭老生卻又並不翻筋斗，只有幾個赤膊的人翻，翻了一陣，都進去了，接著走出一個小旦來，咿咿呀呀的唱。雙喜說，「晚上看客少，鐵頭老生也懈了，誰肯顯本領給白地看呢？」我相信這話對，因為其時臺下已經不很有人，鄉下人為了明天的工作，熬不得夜，早都睡覺去了，疏疏朗朗的站著的不過是幾十個本村和鄰村的閑漢。烏篷船裡的那些土財主的家眷固然在，然而他們也不在乎看戲，多半是專到戲臺下來吃糕餅水果和瓜子的。所以簡直可以算白地。
+然而我的意思卻也並不在乎看翻筋斗。我最願意看的是一個人蒙了白布，兩手在頭上捧著一支棒似的蛇頭的蛇精，其次是套了黃布衣跳老虎。但是等了許多時都不見，小旦雖然進去了，立刻又出來了一個很老的小生。我有些疲倦了，託桂生買豆漿去。他去了一刻，回來說，「沒有。賣豆漿的聾子也回去了。日裡倒有，我還喝了兩碗呢。現在去舀一瓢水來給你喝罷。」
+我不喝水，支撐著仍然看，也說不出見了些什麼，只覺得戲子的臉都漸漸的有些稀奇了，那五官漸不明顯，似乎融成一片的再沒有什麼高低。年紀小的幾個多打呵欠了，大的也各管自己談話。忽而一個紅衫的小丑被綁在臺柱子上，給一個花白鬍子的用馬鞭打起來了，大家纔又振作精神的笑著看。在這一夜裡，我以為這實在要算是最好的一折。
+然而老旦終於出臺了。老旦本來是我所最怕的東西，尤其是怕他坐下了唱。這時候，看見大家也都很掃興，纔知道他們的意見是和我一致的。那老旦當初還只是踱來踱去的唱，後來竟在中間的一把交椅上坐下了。我很擔心；雙喜他們卻就破口喃喃的罵。我忍耐的等著，許多工夫，只見那老旦將手一抬，我以為就要站起來了，不料他卻又慢慢的放下在原地方，仍舊唱。全船裡幾個人不住的吁氣，其餘的也打起哈欠來。雙喜終於熬不住了，說道，怕他會唱到天明還不完，還是我們走的好罷。大家立刻都贊成，和開船時候一樣踴躍，三四人徑奔船尾，拔了篙，點退幾丈，迴轉船頭，駕起櫓，罵著老旦，又向那松柏林前進了。
+月還沒有落，仿佛看戲也並不很久似的，而一離趙莊，月光又顯得格外的皎潔。回望戲臺在燈火光中，卻又如初來未到時候一般，又漂渺得像一座仙山樓閣，滿被紅霞罩著了。吹到耳邊來的又是橫笛，很悠揚；我疑心老旦已經進去了，但也不好意思說再回去看。
+不多久，松柏林早在船後了，船行也並不慢，但周圍的黑暗只是濃，可知已經到了深夜。他們一面議論著戲子，或罵，或笑，一面加緊的搖船。這一次船頭的激水聲更其響亮了，那航船，就像一條大白魚背著一群孩子在浪花裡躥，連夜漁的幾個老漁父，也停了艇子看著喝采起來。
+離平橋村還有一里模樣，船行卻慢了，搖船的都說很疲乏，因為太用力，而且許久沒有東西吃。這回想出來的是桂生，說是羅漢豆正旺相，柴火又現成，我們可以偷一點來煮吃。大家都贊成，立刻近岸停了船；岸上的田裡，烏油油的都是結實的羅漢豆。
+「阿阿，阿發，這邊是你家的，這邊是老六一家的，我們偷那一邊的呢？」雙喜先跳下去了，在岸上說。
+我們也都跳上岸。阿發一面跳，一面說道，「且慢，讓我來看一看罷，」他於是往來的摸了一回，直起身來說道，「偷我們的罷，我們的大得多呢。」一聲答應，大家便散開在阿發家的豆田裡，各摘了一大捧，拋入船艙中。雙喜以為再多偷，倘給阿發的娘知道是要哭罵的，於是各人便到六一公公的田裡又各偷了一大捧。
+我們中間幾個年長的仍然慢慢的搖著船，幾個到後艙去生火，年幼的和我都剝豆。不久豆熟了，便任憑航船浮在水面上，都圍起來用手撮著吃。吃完豆，又開船，一面洗器具，豆莢豆殼全拋在河水裡，什麼痕跡也沒有了。雙喜所慮的是用了八公公船上的鹽和柴，這老頭子很細心，一定要知道，會罵的。然而大家議論之後，歸結是不怕。他如果罵，我們便要他歸還去年在岸邊拾去的一枝枯桕樹，而且當面叫他「八癩子」。
+「都回來了！那裡會錯。我原說過寫包票的！」雙喜在船頭上忽而大聲的說。
+我向船頭一望，前面已經是平橋。橋腳上站著一個人，卻是我的母親，雙喜便是對伊說著話。我走出前艙去，船也就進了平橋了，停了船，我們紛紛都上岸。母親頗有些生氣，說是過了三更了，怎麼回來得這樣遲，但也就高興了，笑著邀大家去吃炒米。
+大家都說已經吃了點心，又渴睡，不如及早睡的好，各自回去了。
+第二天，我向午纔起來，並沒有聽到什麼關係八公公鹽柴事件的糾葛，下午仍然去釣蝦。
+「雙喜，你們這班小鬼，昨天偷了我的豆了罷？又不肯好好的摘，蹋壞了不少。」 我抬頭看時，是六一公公棹著小船，賣了豆回來了，船肚裡還有剩下的一堆豆。
+「是的。我們請客。我們當初還不要你的呢。你看，你把我的蝦嚇跑了！」雙喜說。
+六一公公看見我，便停了楫，笑道，「請客？——這是應該的。」於是對我說， 「迅哥兒，昨天的戲可好麽？」
+我點一點頭，說道，「好。」「豆可中吃呢？」我又點一點頭，說道，「很好。」
+不料六一公公竟非常感激起來，將大拇指一翹，得意的說道，「這真是大市鎮裡出來的讀過書的人纔識貨！我的豆種是粒粒挑選過的，鄉下人不識好歹，還說我的豆比不上別人的呢。我今天也要送些給我們的姑奶奶嘗嘗去……」他於是打著楫子過去了。
+待到母親叫我回去吃晚飯的時候，桌上便有一大碗煮熟了的羅漢豆，就是六一公公送給母親和我吃的。聽說他還對母親極口誇獎我，說「小小年紀便有見識，將來一定要中狀元。姑奶奶，你的福氣是可以寫包票的了。」但我吃了豆，卻並沒有昨夜的豆那麼好。
+真的，一直到現在，我實在再沒有吃到那夜似的好豆，——也不再看到那夜似的好戲了。
+方玄綽近來愛說「差不多」這一句話，幾乎成了「口頭禪」似的；而且不但說，的確也盤據在他腦裏了。他最初說的是「都一樣」，後來大約覺得欠穩當了，便改為「差不多」，一直使用到現在。
+他自從發見了這一句平凡的警句以後，雖然引起了不少的新感慨，同時卻也到許多新慰安。譬如看見老輩威壓青年，在先是要憤憤的，但現在卻就轉念道，將來這少年有了兒孫時，大抵也要擺這架子的罷，便再沒有什麼不平了。又如看見兵士打車夫，在先也要憤憤的，但現在也就轉念道，倘使這車夫當了兵，這兵拉了車，大抵也就這麼打，便再也不放在心上了。他這樣想著的時候，有時也疑心是因為自己沒有和惡社會奮鬥的勇氣，所以瞞心昧己的故意造出來的一條逃路，很近於「無是非之心」，遠不如改正了好。然而這意見總反而在他腦裏生長起來。
+他將這「差不多說」最初公表的時候是在北京首善學校的講堂上，其時大概是提起關於歷史上的事情來，於是說到「古今人不相遠」，說到各色人等的「性相近」，終於牽扯到學生和官僚身上，大發其議論道：
+「現在社會上時髦的都通行罵官僚，而學生罵得尤利害。然而官僚並不是天生的特別種族，就是平民變就的。現在學生出身的官僚就不少，和老官僚有什麼兩樣呢？『易地則皆然』，思想言論舉動豐采都沒有什麼大區別……便是學生團體新辦的許多事業，不是也已經難免出弊病，大半煙消火滅了麽？差不多的。但中國將來之可慮就在此……」
+散坐在講堂裏的二十多個聽講者，有的悵然了，或者是以為這話對；有的勃然了，大約是以為侮辱了神聖的青年；有幾個卻對他微笑了，大約以為這是他替自己的辯解：因為方玄綽就是兼做官僚的。
+而其實卻是都錯誤。這不過是他的一種新不平；雖說不平，又只是他的一種安分的空論。他自己雖然不知道是因為懶，還是因為無用，總之覺得是一個不肯運動，十分安分守己的人。總長冤他有神經病，只要地位還不至於動搖，他決不開一開口；教員的薪水欠到大半年了，只要別有官俸支持，他也決不開一開口。不但不開口，當教員聯合索薪的時候，他還暗地裏以為欠斟酌，太嚷嚷；直到聽得同寮過分的奚落他們了，這纔略有些小感慨，後來一轉念，這或者因為自己正缺錢，而別的官並不兼做教員的緣故罷，於是就釋然了。
+他雖然也缺錢，但從沒有加入教員的團體內，大家議決罷課，可是不去上課了。政府說「上了課纔給錢」，他纔略恨他們的類乎用果子耍猴子；一個大教育家說道「教員一手挾書包一手要錢不高尚」，他纔對於他的太太正式的發牢騷了。
+「喂，怎麼只有兩盤？」聽了「不高尚說」這一日的晚餐時候，他看著菜蔬說。
+他們是沒有受過新教育的，太太並無學名或雅號，所以也就沒有什麼稱呼了，照老例雖然也可以叫「太太」但他又不願意太守舊，於是就發明瞭一個「喂」字。太太對他卻連「喂」字也沒有，只要臉向著他說話，依據習慣法，他就知道這話是對他而發的。
+「可是上月領來的一成半都完了……昨天的米，也還是好容易纔賒來的呢。」伊站在桌旁臉對著他說。
+「你看，還說教書的要薪水是卑鄙哩。這種東西似乎連人要吃飯，飯要米做，米要錢買這一點粗淺事情都不知道……」
+「對啦。沒有錢怎麼買米，沒有米怎麼煮……」
+他兩頰都鼓起來了，仿佛氣惱這答案正和他的議論「差不多」，近乎隨聲附和模樣；接著便將頭轉向別一面去了，依據習慣法，這是宣告討論中止的表示。
+待到淒風冷雨這一天，教員們因為向政府去索欠薪，在新華門前爛泥裏被國軍打得頭破血出之後，倒居然也發了一點薪水。方玄綽不費舉手之勞的領了錢，酌還些舊債，卻還缺一大筆款，這是因為官俸也頗有些拖欠了。當是時，便是廉吏清官們也漸以為薪之不可不索，而況兼做教員的方玄綽，自然更表同情於學界起來，所以大家主張繼續罷課的時候，他雖然仍未到場，事後卻尤其心悅誠服的確守了公共的決議。
+然而政府竟又付錢，學校也就開課了。但在前幾天，卻有學生總會上一個呈文給政府，說「教員倘若不上課，便要付欠薪。」這雖然並無效，而方玄綽卻忽而記起前回政府所說的「上了課纔給錢」的話來，「差不多」這一個影子在他眼前又一幌，而且並不消滅，於是他便在講堂上公表了。
+準此，可見如果將「差不多說」鍛煉羅織起來，自然也可以判作一種挾帶私心的不平，但總不能說是專為自己做官的辯解。只是每到這些時，他又常常喜歡拉上中國將來的命運之類的問題，一不小心，便連自己也以為是一個憂國的志士；人們是每苦於沒有「自知之明」的。
+但是「差不多」的事實又發生了，政府當初雖只不理那些招人頭痛的教員，後來竟不理到無關痛癢的官吏，欠而又欠，終於逼得先前鄙薄教員要錢的好官，也很有幾員化為索薪大會裏的驍將了。惟有幾種日報上卻很發了些鄙薄譏笑他們的文字。方玄綽也毫不為奇，毫不介意，因為他根據了他的「差不多說」，知道這是新聞記者還未缺少潤筆的緣故，萬一政府或是闊人停了津貼，他們多半也要開大會的。
+他既已表同情於教員的索薪，自然也贊成同寮的索俸，然而他仍安坐在衙門中，照例的並不一同去討債。至於有人疑心他孤高，那可也不過是一種誤解罷了。他自己說，他是自從出世以來，只有人向他來要債，他從沒有向人去討過債，所以這一端是「非其所長」。而且他是不敢見手握經經濟之權的人物，這種人待到失了權勢之後，捧著一本《大乘起信論》講佛學的時候，固然也很是「藹然可親」的了，但還在寶座上時，卻總是一副閻王臉，將別人都當奴才看自以為手操著你們這些窮小子們的生殺之權。他因此不敢見，也不願見他們。這種脾氣，雖然有時連自己也覺得是孤高，但往往同時也疑心這其實是沒本領。
+大家左索右索，總自一節一節的挨過去了，但比起先前來，方玄綽究竟是萬分的拮据，所以使用的小廝和交易的店家不消說，便是方太太對於他也漸漸的缺了敬意，只要看伊近來不很附和，而且常常提出獨創的意見，有些唐突的舉動，也就可以瞭然了。到了陰曆五月初四的午前，他一回來，伊便將一疊賬單塞在他的鼻子跟前，這也是往常所沒有的。
+「一總總得一百八十塊錢纔夠開消……發了麽？」伊並不對著他看的說。
+「哼，我明天不做官了。錢的支票是領來的了，可是索薪大會的代表不發放，先說是沒有同去的人都不發，後來又說是要到他們跟前去親領。他們今天單捏著支票，就變了閻王臉了，我實在怕看見……我錢也不要了，官也不做了，這樣無限量的卑屈……」
+方太太見了這少見的義憤，倒有些愕然了，但也就沉靜下來。
+「我想，還不如去親領罷，這算什麼呢。」伊看著他的臉說。
+「我不去！這是官俸，不是賞錢，照例應該由會計科送來的。」
+「可是不送來又怎麼好呢……哦，昨夜忘記說了，孩子們說那學費，學校裏已經催過好幾次了，說是倘若再不繳……」
+「胡說！做老子的辦事教書都不給錢，兒子去念幾句書倒要錢？」
+伊覺得他已經不很顧忌道理，似乎就要將自己當作校長來出氣，犯不上，便不再言語了。
+兩個默默的吃了午飯。他想了一會，又懊惱的出去了。
+照舊例，近年是每逢節根或年關的前一天，他一定須在夜裏的十二點鐘纔回家，一面走，一面掏著懷中，一面大聲的叫道，「喂，領來了！」於是遞給伊一疊簇新的中交票，臉上很有些得意的形色。誰知道初四這一天卻破了例，他不到七點鐘便回家來。方太太很驚疑，以為他竟已辭了職了，但暗暗地察看他臉上，卻也並不見有什麼格外倒運的神情。「怎麼了？……這樣早？……」伊看定了他說。「發不及了，領不出了，銀行已經關了門，得等初八。」「親領？……」伊惴惴的問。
+「親領這一層也已經取消了，聽說仍舊由會計科分送。可是銀行今天已經關了門，休息三天，得等到初八的上午。」他坐下，眼睛看著地面了，喝過一口茶，纔又慢慢的開口說，「幸而衙門裏也沒有什麼問題了，大約到初八就準有錢……向不相干的親戚朋友去借錢，實在是一件煩難事。我午後硬著頭皮去尋金永生，談了一會，他先恭維我不去索薪，不肯親領，非常之清高，一個人正應該這樣做；待到知道我想要向他通融五十元，就像我在他嘴裏塞了一大把鹽似的，凡有臉上可以打皺的地迫都打起皺來，說房租怎樣的收不起，買賣怎樣的賠本，在同事面前親身領款，也不算什麼的，即刻將我支使出來了。」
+「這樣緊急的節根，誰還肯借出錢去呢。」方太太卻只淡淡的說，並沒有什麼慨然。
+方玄綽低下頭來了，覺得這也無怪其然的，況且自己和金永生本來很疏遠。他接著就記起去年年關的事來，那時有一個同鄉來借十塊錢，他其時明明已經收到了衙門的領款憑單的了，因為死怕這人將來未必會還錢，便裝了副為難的神色，說道衙門裏既然領不到俸錢，學校裏又不發薪水，實在「愛莫能助」，將他空手送走了。他雖然自已並不看見裝了怎樣的臉，但此時卻覺得很局促，嘴唇微微一動，又搖一搖頭。
+然而不多久，他忽而恍然大悟似的發命令了：叫小廝即刻上街去賒一瓶蓮花白。他知道店家希圖明天多還帳，大抵是不敢不賒的，假如不賒，則明天分文不還，正是他們應得的懲罰。蓮花白竟賒來了，他喝了兩杯，青白色的臉上泛了紅，吃完飯，又頗有些高興了，他點上一枝大號哈德門香煙，從桌上抓起一本《嘗試集》來，躺在床上就要看。
+「那麼明天怎麼對付店家呢？」方太太追上去，站在床面前看著他的臉說。「店家？……教他們初八的下半天來。」「我可不能這麼說。他們不相信，不答應的。」「有什麼不相信。他們可以問去，全衙門裏什麼人也沒有領到，都得初八！」他戟著第二個指頭在帳子裏的空中畫了一個半圓，方太太跟著指頭也看了一個半圓，只見這手便去翻開了《嘗試集》。
+方太太見他強橫到出乎情理之外了，也暫時開不得口。
+「我想，這模樣是鬧不下去的，將來總得想點法，做點什麼別的事……」伊終於尋到了別的路，說。「什麼法呢？我『文不像謄錄生，武不像救火兵』，別的做什麼？」「你不是給上海的書鋪子做過文章麽？」
+「上海的書鋪子？買稿要一個一個的算字，空格不算數。你看我做在那裏的白話詩去，空白有多少，怕只值三百大錢一本罷。收版權稅又半年六月沒消息，『遠水救不得近火』，誰耐煩。」「那麼，給這裏的報館裏……」
+「給報館裏？便在這裏很大的報館裏，我靠著一個學生在那裏做編輯的大情面，一千字也就是這幾個錢，即使一早做到夜，能夠養活你們麽？況且我肚子裏也沒有這許多文章。」
+「那麼，過了節怎麼辦呢？」「過了節麽？——仍舊做官……明天店家來要錢，你只要說初八的下午。」
+他又要看《嘗試集》了。方太太怕失了機會，連忙吞吞吐吐的說：「我想，過了節，到了初八，我們……倒不如去買一張彩票……」「胡說！會說出這樣無教育的……」
+這時候，他忽而又記起被金永生支使出來以後的事了。那時他惘惘的走過稻香村，看店門口豎著許多斗大的字的廣告道「頭彩幾萬元」，仿佛記得心裏也一動，或者也許放慢了腳步的罷，但似乎因為捨不得皮夾裏僅存的六角錢，所以竟也毅然決然的走遠了。他臉色一變，方太太料想他是在惱著伊的無教育，便趕緊退開，沒有說完話。方玄綽也沒有說完話，將腰一伸，咿咿嗚嗚的就念《嘗試集》。
+我冒了嚴寒，回到相隔二千餘里，別了二十餘年的故鄉去。
+時候既然是深冬；漸近故鄉時，天氣又陰晦了，冷風吹進船艙中，嗚嗚的響，從蓬隙向外一望，蒼黃的天底下，遠近橫著幾個蕭索的荒村，沒有一些活氣。我的心禁不住悲涼起來了。
+阿！這不是我二十年來時時記得的故鄉？
+我所記得的故鄉全不如此。我的故鄉好得多了。但要我記起他的美麗，說出他的佳處來，卻又沒有影像，沒有言辭了。仿佛也就如此。於是我自己解釋說：故鄉本也如此，——雖然沒有進步，也未必有如我所感的悲涼，這只是我自己心情的改變罷了，因為我這次回鄉，本沒有什麼好心緒。
+我這次是專為了別他而來的。我們多年聚族而居的老屋，已經公同賣給別姓了，交屋的期限，只在本年，所以必須趕在正月初一以前，永別了熟識的老屋，而且遠離了熟識的故鄉，搬家到我在謀食的異地去。
+第二日清早晨我到了我家的門口了。瓦楞上許多枯草的斷莖當風抖著，正在說明這老屋難免易主的原因。幾房的本家大約已經搬走了，所以很寂靜。我到了自家的房外，我的母親早已迎著出來了，接著便飛出了八歲的侄兒宏兒。
+我的母親很高興，但也藏著許多淒涼的神情，教我坐下，歇息，喝茶，且不談搬家的事。宏兒沒有見過我，遠遠的對面站著只是看。
+但我們終於談到搬家的事。我說外間的寓所已經租定了，又買了幾件傢具，此外須將家裡所有的木器賣去，再去增添。母親也說好，而且行李也略已齊集，木器不便搬運的，也小半賣去了，只是收不起錢來。
+「你休息一兩天，去拜望親戚本家一回，我們便可以走了。」母親說。
+「是的。」
+「還有閏土，他每到我家來時，總問起你，很想見你一回面。我已經將你到家的大約日期通知他，他也許就要來了。」
+這時候，我的腦裡忽然閃出一幅神異的圖畫來：深藍的天空中掛著一輪金黃的圓月，下麵是海邊的沙地，都種著一望無際的碧綠的西瓜，其間有一個十一二歲的少年，項帶銀圈，手捏一柄鋼叉，向一匹猹盡力的刺去，那猹卻將身一扭，反從他的胯下逃走了。
+這少年便是閏土。我認識他時，也不過十多歲，離現在將有三十年了；那時我的父親還在世，家景也好，我正是一個少爺。那一年，我家是一件大祭祀的值年。這祭祀，說是三十多年才能輪到一回，所以很鄭重；正月裡供祖像，供品很多，祭器很講究，拜的人也很多，祭器也很要防偷去。我家只有一個忙月（我們這裡給人做工的分三種：整年給一定人家做工的叫長工；按日給人做工的叫短工；自己也種地，只在過年過節以及收租時候來給一定人家做工的稱忙月），忙不過來，他便對父親說，可以叫他的兒子閏土來管祭器的。
+我的父親允許了；我也很高興，因為我早聽到閏土這名字，而且知道他和我仿佛年紀，閏月生的，五行缺土，所以他的父親叫他閏土。他是能裝弶捉小鳥雀的。
+我於是日日盼望新年，新年到，閏土也就到了。好容易到了年末，有一日，母親告訴我，閏土來了，我便飛跑的去看。他正在廚房裡，紫色的圓臉，頭戴一頂小氈帽，頸上套一個明晃晃的銀項圈，這可見他的父親十分愛他，怕他死去，所以在神佛面前許下願心，用圈子將他套住了。他見人很怕羞，只是不怕我，沒有旁人的時候，便和我說話，於是不到半日，我們便熟識了。
+我們那時候不知道談些什麼，只記得閏土很高興，說是上城之後，見了許多沒有見過的東西。
+第二日，我便要他捕鳥。他說：
+"這不能。須大雪下了才好。我們沙地上，下了雪，我掃出一塊空地來，用短棒支起一個大竹匾，撒下秕穀，看鳥雀來吃時，我遠遠地將縛在棒上的繩子只一拉，那鳥雀就罩在竹匾下了。什麼都有：稻雞，角雞，鵓鴣，藍背……"
+我於是又很盼望下雪。
+閏土又對我說：
+"現在太冷，你夏天到我們這裡來。我們日裡到海邊撿貝殼去，紅的綠的都有，鬼見怕也有，觀音手也有。晚上我和爹管西瓜去，你也去。"
+"管賊麽？"
+"不是。走路的人口渴了摘一個瓜吃，我們這裡是不算偷的。要管的是獾豬，刺蝟，猹。月亮底下，你聽，啦啦的響了，猹在咬瓜了。你便捏了胡叉，輕輕地走去……"
+我那時並不知道這所謂猹的是怎麼一件東西——便是現在也沒有知道——只是無端的覺得狀如小狗而很兇猛。
+"他不人麽？"
+"有胡叉呢。走到了，看見猹了，你便刺。這畜生很伶俐，倒向你奔來，反從胯下竄了。他的皮毛是油一般的滑……"
+我素不知道天下有這許多新鮮事：海邊有如許五色的貝殼；西瓜有這樣危險的經歷，我先前單知道他在水果店裡出賣罷了。
+"我們沙地裡，潮汛要來的時候，就有許多跳魚兒只是跳，都有青蛙似的兩個腳……"
+阿！閏土的心裡有無窮無盡的希奇的事，都是我往常的朋友所不知道的。他們不知道一些事，閏土在海邊時，他們都和我一樣只看見院子裡高牆上的四角的天空。
+可惜正月過去了，閏土須回家裡去，我急得大哭，他也躲到廚房裡，哭著不肯出門，但終於被他父親帶走了。他後來還托他的父親帶給我一包貝殼和幾支很好看的鳥毛，我也曾送他一兩次東西，但從此沒有再見面。
+現在我的母親提起了他，我這兒時的記憶，忽而全都閃電似的蘇生過來，似乎看到了我的美麗的故鄉了。我應聲說：
+"這好極！他，——怎樣？……"
+"他？……他景況也很不如意……"母親說著，便向房外看，"這些人又來了。說是買木器，順手也就隨便拿走的，我得去看看。"
+母親站起身，出去了。門外有幾個女人的聲音。我便招宏兒走近面前，和他閑話：問他可會寫字，可願意出門。
+"我們坐火車去麽？"
+"我們坐火車去。"
+"船呢？"
+"先坐船，……"
+"哈！這模樣了！鬍子這麼長了！"一種尖利的怪聲突然大叫起來。
+我吃了一嚇，趕忙抬起頭，卻見一個凸顴骨，薄嘴唇，五十歲上下的女人站在我面前，兩手搭在髀間，沒有系裙，張著兩腳，正像一個畫圖儀器裡細腳伶仃的圓規。
+我愕然了。
+"不認識了麽？我還抱過你咧！"
+我愈加愕然了。幸而我的母親也就進來，從旁說：
+"他多年出門，統忘卻了。你該記得罷，"便向著我說，"這是斜對門的楊二嫂，……開豆腐店的。"
+哦，我記得了。我孩子時候，在斜對門的豆腐店裡確乎終日坐著一個楊二嫂，人都叫伊"豆腐西施"⑹。但是擦著白粉，顴骨沒有這麼高，嘴唇也沒有這麼薄，而且終日坐著，我也從沒有見過這圓規式的姿勢。那時人說：因為伊，這豆腐店的買賣非常好。但這大約因為年齡的關係，我卻並未蒙著一毫感化，所以竟完全忘卻了。然而圓規很不平，顯出鄙夷的神色，仿佛嗤笑法國人不知道拿破侖，美國人不知道華盛頓似的，冷笑說：
+"忘了？這真是貴人眼高……"
+"那有這事……我……"我惶恐著，站起來說。
+"那麼，我對你說。迅哥兒，你闊了，搬動又笨重，你還要什麼這些破爛木器，讓我拿去罷。我們小戶人家，用得著。"
+"我並有闊哩。我須賣了這些，再去……"
+"阿呀呀，你放了道台了，還說不闊？你現在有三房姨太太；出門便是八抬的大轎，還說不闊？嚇，什麼都瞞不過我。"
+我知道無話可說了，便閉了口，默默的站著。
+"阿呀阿呀，真是愈有錢，便愈是一毫不肯放鬆，愈是一毫不肯放鬆，便愈有錢……"圓規一面憤憤的迴轉身，一面絮絮的說，慢慢向外走，順便將我母親的一副手套塞在褲腰裡，出去了。
+此後又有近處的本家和親戚來訪問我。我一面應酬，偷空便收拾些行李，這樣的過了三四天。
+一日是天氣很冷的午後，我吃過午飯，坐著喝茶，覺得外面有人進來了，便回頭去看。我看時，不由的非常出驚，慌忙站起身，迎著走去。
+這來的便是閏土。雖然我一見便知道是閏土，但又不是我這記憶上的閏土了。他身材增加了一倍；先前的紫色的圓臉，已經變作灰黃，而且加上了很深的皺紋；眼睛也像他父親一樣，周圍都腫得通紅，這我知道，在海邊種地的人，終日吹著海風，大抵是這樣的。他頭上是一頂破氈帽，身上只一件極薄的棉衣，渾身瑟索著；手裡提著一個紙包和一支長煙管，那手也不是我所記得的紅活圓實的手，卻又粗又笨而且開裂，像是松樹皮了。
+我這時很興奮，但不知道怎麼說才好，只是說：
+
+"阿！閏土哥，——你來了？……"
+
+我接著便有許多話，想要連珠一般湧出：角雞，跳魚兒，貝殼，猹，……但又總覺得被什麼擋著似的，單在腦裡面迴旋，吐不出口外去。
+
+他站住了，臉上現出歡喜和淒涼的神情；動著嘴唇，卻沒有作聲。他的態度終於恭敬起來了，分明的叫道：
+"老爺！……"
+我似乎打了一個寒噤；我就知道，我們之間已經隔了一層可悲的厚障壁了。我也說不出話。
+他回過頭去說，"水生，給老爺磕頭。"便拖出躲在背後的孩子來，這正是一個廿年前的閏土，只是黃瘦些，頸子上沒有銀圈罷了。"這是第五個孩子，沒有見過世面，躲躲閃閃……"
+母親和宏兒樓來了，他們大約也聽到了聲音。
+"老太太。信是早收到了。我實在喜歡的不得了，知道老爺回來……"閏土說。
+"阿，你怎的這樣客氣起來。你們先前不是哥弟稱呼麽？還是照舊：迅哥兒。"母親高興的說。
+"阿呀，老太太真是……這成什麼規矩。那時是孩子，不懂事……"閏土說著，又叫水生上來打拱，那孩子卻害羞，緊緊的只貼在他背後。
+"他就是水生？第五個？都是生人，怕生也難怪的；還是宏兒和他去走走。"母親說。
+宏兒聽得這話，便來招水生，水生卻鬆鬆爽爽同他一路出去了。母親叫閏土坐，他遲疑了一回，終於就了坐，將長煙管靠在桌旁，遞過紙包來，說：
+"冬天沒什麼東西了。這一點乾青豆倒是自家曬在那裡的，請老爺……"
+我問問他的景況。他只是搖頭。
+"非常難。第六個孩子也會幫忙了，卻總是吃不夠……又不太平……什麼地方都要錢，沒有規定……收成又壞。種出東西來，挑去賣，總要捐幾回錢，折了本；不去賣，又只能爛掉……"
+他只是搖頭；臉上雖然刻著許多皺紋，卻全然不動，仿佛石像一般。他大約只是覺得苦，卻又形容不出，沉默了片時，便拿起煙管來默默的吸煙了。
+母親問他，知道他的家裡事務忙，明天便得回去；又沒有吃過午飯，便叫他自己到廚下炒飯吃去。
+他出去了；母親和我都嘆息他的景況：多子，饑荒，苛稅，兵，匪，官，紳，都苦得他像一個木偶人了。母親對我說，凡是不必搬走的東西，盡可以送他，可以聽他自己去揀擇。
+下午，他揀好了幾件東西：兩條長桌，四個椅子，一副香爐和燭臺，一桿抬秤。他又要所有的草灰（我們這裡煮飯是燒稻草的，那灰，可以做沙地的肥料），待我們啟程的時候，他用船來載去。
+夜間，我們又談些閑天，都是無關緊要的話；第二天早晨，他就領了水生回去了。
+又過了九日，是我們啟程的日期。閏土早晨便到了，水生沒有同來，卻只帶著一個五歲的女兒管船隻。我們終日很忙碌，再沒有談天的工夫。來客也不少，有送行的，有拿東西的，有送行兼拿東西的。待到傍晚我們上船的時候，這老屋裡的所有破舊大小粗細東西，已經一掃而空了。
+我們的船向前走，兩岸的青山在黃昏中，都裝成了深黛顏色，連著退向船後梢去。
+宏兒和我靠著船窗，同看外面模糊的風景，他忽然問道：
+"大伯！我們什麼時候回來？"
+"回來？你怎麼還沒有走就想回來了。"
+"可是，水生約我到他家玩去咧……"他睜著大的黑眼睛，癡癡的想。
+我和母親也都有些惘然，於是又提起閏土來。母親說，那豆腐西施的楊二嫂，自從我家收拾行李以來，本是每日必到的，前天伊在灰堆裡，掏出十多個碗碟來，議論之後，便定說是閏土埋著的，他可以在運灰的時候，一齊搬回家裡去；楊二嫂發見了這件事，自己很以為功，便拿了那狗氣殺（這是我們這裡養雞的器具，木盤上面有著柵欄，內盛食料，雞可以伸進頸子去啄，狗卻不能，只能看著氣死），飛也似的跑了，虧伊裝著這麼高低的小腳，竟跑得這樣快。
+老屋離我愈遠了；故鄉的山水也都漸漸遠離了我，但我卻並不感到怎樣的留戀。我只覺得我四面有看不見的高牆，將我隔成孤身，使我非常氣悶；那西瓜地上的銀項圈的小英雄的影像，我本來十分清楚，現在卻忽地模糊了，又使我非常的悲哀。
+母親和宏兒都睡著了。
+我躺著，聽船底潺潺的水聲，知道我在走我的路。我想：我竟與閏土隔絕到這地步了，但我們的後輩還是一氣，宏兒不是正在想念水生麽。我希望他們不再像我，又大家隔膜起來……然而我又不願意他們因為要一氣，都如我的辛苦展轉而生活，也不願意他們都如閏土的辛苦麻木而生活，也不願意都如別人的辛苦恣睢而生活。他們應該有新的生活，為我們所未經生活過的。
+我想到希望，忽然害怕起來了。閏土要香爐和燭臺的時候，我還暗地裡笑他，以為他總是崇拜偶像，什麼時候都不忘卻。現在我所謂希望，不也是我自己手製的偶像麽？只是他的願望切近，我的願望茫遠罷了。
+我在朦朧中，眼前展開一片海邊碧綠的沙地來，上面深藍的天空中掛著一輪金黃的圓月。我想：希望本是無所謂有，無所謂無的。這正如地上的路；其實地上本沒有路，走的人多了，也便成了路。
+臨河的土場上，太陽漸漸的收了他通黃的光線了。場邊靠河的烏桕樹葉，乾巴巴的纔喘過氣來，幾個花腳蚊子在下面哼著飛舞。面河的農家的煙突裏，逐漸減少了炊煙，女人孩子們都在自己門口的土場上波些水，放下小桌子和矮凳；人知道，這已經是晚飯的時候了。
+老人男人坐在矮凳上，搖著大芭蕉扇閑談，孩子飛也似的跑，或者蹲在烏桕樹下賭玩石子。女人端出烏黑的蒸乾菜和松花黃的米飯，熱蓬蓬冒煙。河裏駛過文人的酒船，文豪見了，大發詩興，說：「無思無慮，這真是田家樂呵！」
+但文豪的話有些不合事實，就因為他們沒有聽到九斤老太的話。這時候，九斤老太正在大怒，拿破芭蕉扇敲著凳腳說：
+「我活到七十九歲了，活夠了，不願意眼見這些敗家相，——還是死的好。立刻就要喫飯了，還喫炒豆子，喫窮了一家子！」
+伊的曾孫女兒六斤捏著一把豆，正從對面跑來，見這情形，便直奔河邊，藏在烏桕樹後，伸出雙丫角的小頭，大聲說，「這老不死的！」
+九斤老太雖然高壽，耳朵卻還不很聾，但也沒有聽到孩子的話，仍舊自己說，「這真是一代不如一代！」
+這村莊的習慣有點特別，女人生下孩子，多喜歡用秤稱了輕重，便用斤數當作小名。九斤老太自從慶祝了五十大壽以後，便漸漸的變了不平家，常說伊年青的時候，天氣沒有現在這般熱，豆子也沒有現在這般硬；總之現在的時世是不對了。何況六斤比伊的曾祖，少了三斤，比伊父親七斤，又少了一斤，這真是一條顛撲不破的實例。所以伊又用勁說，「這真是一代不如一代！」
+伊的兒媳七斤嫂子正捧著飯籃走到桌邊，便將飯籃在桌上一摔，憤憤的說，「你老人家又這麼說了。六斤生下來的時候，不是六斤五兩麽？你家的秤又是私秤，加重稱，十八兩秤；用了準十六，我們的六斤該有七斤多哩。我想便是太公和公公，也不見得正是九斤八斤十足，用的秤也許是十四兩……」
+「一代不如一代！」
+七斤嫂還沒有答話，忽然看見七斤從小巷口轉出，便移了方向，對他嚷道，「你這死屍怎麼這時候纔回來，死到那裏去了！不管人家等著你開飯！」
+七斤雖然住在農村，卻早有些飛黃騰達的意思。從他的祖父到他，三代不捏鋤頭柄了；他也照例的幫人撐著航船，每日一回，早晨從魯鎮進城，傍晚又回到魯鎮，因此很知道些時事：例如什麼地方，雷公劈死了蜈蚣精；什麼地方，閨女生了一個夜叉之類。他在村人裏面，的確已經是一名出場人物了。但夏天喫飯不點燈，卻還守著農家習慣，所以回家太遲，是該罵的。
+七斤一手捏著象牙嘴白銅斗六尺多長的湘妃竹煙管，低著頭，慢慢地走來，坐在矮凳上。六斤也趁勢溜出，坐在他身邊，叫他爹爹。七斤沒有應。
+「一代不如一代！」九斤老太說。
+七斤慢慢地抬起頭來，嘆一口氣說，「皇帝坐了龍庭了。」
+七斤嫂呆了一刻，忽而恍然大悟的道，「這可好了，這不是又要皇恩大赦了麽！」
+七斤又嘆一口氣，說，「我沒有辮子。」
+「皇帝要辮子麽？」
+「皇帝要辮子。」
+「你怎麼知道呢？」七斤嫂有些著急，趕忙的問。
+「咸亨酒店裏的人，都說要的。」
+七斤嫂這時從直覺上覺得事情似乎有些不妙了，因為咸亨酒店是消息靈通的所在。伊一轉眼瞥見七斤的光頭，便忍不住動怒，怪他恨他怨他；忽然又絕望起來，裝好一碗飯，搡在七斤的面前道，「還是趕快喫你的飯罷！哭喪著臉，就會長出辮子來麽？」
+太陽收盡了他最末的光線了，水面暗暗地回覆過涼氣來；土場上一片碗筷聲響，人人的脊樑上又都吐出汗粒。七斤嫂喫完三碗飯，偶然抬起頭，心坎裏便禁不住突突地發跳。伊透過烏桕葉，看見又矮又胖的趙七爺正從獨木橋上走來，而且穿著寶藍色竹布的長衫。
+趙七爺是鄰村茂源酒店的主人，又是這三十裏方圓以內的唯一的出色人物兼學問家；因為有學問，所以又有些遺老的臭味。他有十多本金聖嘆批評的《三國志》，時常坐著一個字一個字的讀；他不但能說出五虎將姓名，甚而至於還知道黃忠表字漢昇和馬超表字孟起。革命以後，他便將辮子盤在頂上，像道士一般；常常嘆息說，倘若趙子龍在世，天下便不會亂到這地步了。七斤嫂眼睛好，早望見今天的趙七爺已經不是道士，卻變成光滑頭皮，烏黑髮頂；伊便知道這一定是皇帝坐了龍庭，而且一定須有辮子，而且七斤一定是非常危險。因為趙七爺的這件竹布長衫，輕易是不常穿的，三年以來，只穿過兩次：一次是和他嘔氣的麻子阿四病了的時候，一次是曾經砸爛他酒店的魯大爺死了的時候；現在是第三次了，這一定又是於他有慶，於他的仇家有殃了。
+七斤嫂記得，兩年前七斤喝醉了酒，曾經罵過趙七爺是「賤胎」，所以這時便立刻直覺到七斤的危險，心坎裏突突地發起跳來。
+趙七爺一路走來，坐著喫飯的人都站起身，拿筷子點著自己的飯碗說，「七爺，請在我們這裏用飯！」七爺也一路點頭，說道「請請」，卻一徑走到七斤家的桌旁。七斤們連忙招呼，七爺也微笑著說「請請」，一面細細的研究他們的飯菜。
+「好香的菜乾，——聽到了風聲了麽？」趙七爺站在七斤的後面七斤嫂的對面說。
+「皇帝坐了龍庭了。」七斤說。
+七斤嫂看著七爺的臉，竭力陪笑道，「皇帝已經坐了龍庭，幾時皇恩大赦呢？」
+「皇恩大赦？——大赦是慢慢的總要大赦罷。」七爺說到這裏，聲色忽然嚴厲起來，「但是你家七斤的辮子呢，辮子？這倒是要緊的事。你們知道：長毛時候，留髮不留頭，留頭不留髮，……」
+七斤和他的女人沒有讀過書，不很懂得這古典的奧妙，但覺得有學問的七爺這麼說，事情自然非常重大，無可輓回，便仿佛受了死刑宣告似的，耳朵裏嗡的一聲，再也說不出一句話。
+「一代不如一代，——」九斤老太正在不平，趁這機會，便對趙七爺說，「現在的長毛，只是剪人家的辮子，僧不僧，道不道的。從前的長毛，這樣的麽？我活到七十九歲了，活夠了。從前的長毛是——整匹的紅緞子裹頭，拖下去，拖下去，一直拖到腳跟；王爺是黃緞子，拖下去，黃緞子；紅緞子，黃緞子，—— 我活夠了，七十九歲了。」
+七斤嫂站起身，自言自語的說，「這怎麼好呢？這樣的一班老小，都靠他養活的人，……」
+趙七爺搖頭道，「那也沒法。沒有辮子，該當何罪，書上都一條一條明明白白寫著的。不管他家裏有些什麼人。」
+七斤嫂聽到書上寫著，可真是完全絕望了；自己急得沒法，便忽然又恨到七斤。伊用筷子指著他的鼻尖說，「這死屍自作自受！造反的時候，我本來說，不要撐船了，不要上城了。他偏要死進城去，滾進城去，進城便被人剪去了辮子。從前是絹光烏黑的辮子，現在弄得僧不僧道不道的。這囚徒自作自受，帶累了我們又怎麼說呢？這活死屍的囚徒……」
+村人看見趙七爺到村，都趕緊喫完飯，聚在七斤家飯桌的周圍。七斤自己知道是出場人物，被女人當大眾這樣辱罵，很不雅觀，便只得抬起頭，慢慢地說道：
+「你今天說現成話，那時你……」
+「你這活死屍的囚徒……」
+看客中間，八一嫂是心腸最好的人，抱著伊的兩周歲的遺腹子，正在七斤嫂身邊看熱鬧；這時過意不去，連忙解勸說，「七斤嫂，算了罷。人不是神仙，誰知道未來事呢？便是七斤嫂，那時不也說，沒有辮子倒也沒有什麼醜麽？況且衙門裏的大老爺也還沒有告示，……」
+七斤嫂沒有聽完，兩個耳朵早通紅了；便將筷子轉過向來，指著八一嫂的鼻子，說，「阿呀，這是什麼話呵！八一嫂，我自己看來倒還是一個人，會說出這樣昏誕胡塗話麽？那時我是，整整哭了三天，誰都看見；連六斤這小鬼也都哭，……」六斤剛喫完一大碗飯，拿了空碗，伸手去嚷著要添。七斤嫂正沒好氣，便用筷子在伊的雙丫角中間，直紮下去，大喝道，「誰要你來多嘴！你這偷漢的小寡婦！」
+撲的一聲，六斤手裏的空碗落在地上了，恰巧又碰著一塊磚角，立刻破成一個很大的缺口。七斤直跳起來，撿起破碗，合上檢查一回，也喝道，「入娘的！」一巴掌打倒了六斤。六斤躺著哭，九斤老太拉了伊的手，連說著「一代不如一代」，一同走了。
+八一嫂也發怒，大聲說，「七斤嫂，你『恨棒打人』……」
+趙七爺本來是笑著旁觀的；但自從八一嫂說了「衙門裏的大老爺沒有告示」這話以後，卻有些生氣了。這時他已經繞出桌旁，接著說，「『恨棒打人』，算什麼呢。大兵是就要到的。你可知道，這回保駕的是張大帥，張大帥就是燕人張翼德的後代，他一支丈八蛇矛，就有萬夫不當之勇，誰能抵擋他？」他兩手同時捏起空拳，仿佛握著無形的蛇矛模樣，向八一嫂搶進幾步道，「你能抵擋他麽！」
+八一嫂正氣得抱著孩子發抖，忽然見趙七爺滿臉油汗，瞪著眼，準對伊衝過來，便十分害怕，不敢說完話，回身走了。趙七爺也跟著走去，眾人一面怪八一嫂多事，一面讓開路，幾個剪過辮子重新留起的便趕快躲在人叢後面，怕他看見。趙七爺也不細心察訪，通過人叢，忽然轉入烏桕樹後，說道「你能抵擋他麽！」 跨上獨木橋，揚長去了。
+村人們呆呆站著，心裏計算，都覺得自己確乎抵不住張翼德，因此也決定七斤便要沒有性命。七斤既然犯了皇法，想起他往常對人談論城中的新聞的時候，就不該含著長煙管顯出那般驕傲模樣，所以對七斤的犯法，也覺得有些暢快。他們也仿佛想發些議論，卻又覺得沒有什麼議論可發。嗡嗡的一陣亂嚷，蚊子都撞過赤膊身子，闖到烏桕樹下去做市；他們也就慢慢地走散回家，關上門去睡覺。七斤嫂咕噥著，也收了傢伙和桌子矮凳回家，關上門睡覺了。
+七斤將破碗拿回家裏，坐在門檻上吸煙；但非常憂愁，忘卻了吸煙，象牙嘴六尺多長湘妃竹煙管的白銅鬥裏的火光，漸漸發黑了。他心裏但覺得事情似乎十分危急，也想想些方法，想些計畫，但總是非常模糊，貫穿不得：「辮子呢辮子？丈八蛇矛。一代不如一代！皇帝坐龍庭。破的碗須得上城去釘好。誰能抵擋他？書上一條一條寫著。入娘的！……」
+第二日清晨，七斤依舊從魯鎮撐航船進城，傍晚回到魯鎮，又拿著六尺多長的湘妃竹煙管和一個飯碗回村。他在晚飯席上，對九斤老太說，這碗是在城內釘合的，因為缺口大，所以要十六個銅釘，三文一個，一總用了四十八文小錢。
+九斤老太很不高興的說，「一代不如一代，我是活夠了。三文錢一個釘；從前的釘，這樣的麽？從前的釘是……我活了七十九歲了，——」
+此後七斤雖然是照例日日進城，但家景總有些黯淡，村人大抵迴避著，不再來聽他從城內得來的新聞。七斤嫂也沒有好聲氣，還時常叫他「囚徒」。
+過了十多日，七斤從城內回家，看見他的女人非常高興，問他說，「你在城裏可聽到些什麼？」
+「沒有聽到些什麼。」
+「皇帝坐了龍庭沒有呢？」
+「他沒有說。」
+「咸亨酒店裏也沒有人說麽？」
+「也沒人說。」
+「我想皇帝一定是不坐龍庭了。我今天走過趙七爺的店前，看見他又坐著念書了，辮子又盤在頂上了，也沒有穿長衫。」
+「…………」
+「你想，不坐龍庭了罷？」
+「我想，不坐了罷。」
+現在的七斤，是七斤嫂和村人又都早給他相當的尊敬，相當的待遇了。到夏天，他們仍舊在自家門口的土場上喫飯；大家見了，都笑嘻嘻的招呼。九斤老太早已做過八十大壽，仍然不平而且健康。六斤的雙丫角，已經變成一支大辮子了；伊雖然新近裹腳，卻還能幫同七斤嫂做事，捧著十八個銅釘的飯碗，在土場上一瘤一拐的往來。
+星期日的早晨，我揭去一張隔夜的日曆，向著新的那一張上看了又看的說：
+“啊，十月十日，——今天原來正是雙十節。這裏卻一點沒有記載！”
+我的一位前輩先生N，正走到我的寓裏來談閑天，一聽這話，便很不高興的對我說：
+“他們對！他們不記得，你怎樣他；你記得，又怎樣呢？”
+這位N先生本來脾氣有點乖張，時常生些無謂的氣，說些不通世故的話。當這時候，我大抵任他自言自語，不贊一辭；他獨自發完議論，也就算了。
+他說：
+“我最佩服北京雙十節的情形。早晨，員警到門，吩咐道：『掛旗！』『是，掛旗！』”各家大半懶洋洋的踱出一個國民來，撅起一塊斑駁陸離的洋布。這樣一直到夜，——收了旗關門；幾家偶然忘卻的，便掛到第二天的上午。
+“他們忘卻了紀念，紀念也忘卻了他們！”
+“我也是忘卻了紀念的一個人。倘使紀念起來，那第一個雙十節前後的事，便都上我的心頭，使我坐立不穩了。”
+“多少故人的臉，都浮在我眼前。幾個少年辛苦奔走了十多年，暗地裏一顆彈丸要了他的性命；幾個少年一擊不中，在監牢裏身受一個多月的苦刑；幾個少年懷著遠志，忽然蹤影全無，連屍首也不知那裏去了。——”
+“他們都在社會的冷笑惡罵迫害傾陷裏過了一生；現在他們的墳墓也早在忘卻裏漸漸平塌下去了。”
+“我不堪紀念這些事。”
+“我們還是記起一點得意的事來談談吧。”
+N忽然現出笑容，伸手在自己頭上一摸，高聲說：
+“我最得意的是自從第一個雙十節以後，我在路上走，不再被人笑駡了。”
+“老兄，你可知道頭髮是我們中國人的寶貝和冤家，古今來多少人在這上頭吃些毫無價值的苦呵！”
+“我們的很古的古人，對於頭髮似乎也還看輕。據刑法看來，最要緊的自然是腦袋，所以大辟是上刑；次要便是生殖器了，所以宮刑和幽閉也是一件嚇人的罰；至於髡，那是微乎其微了，然而推想起來，正不知道曾有多少人們因為光著頭皮便被社會踐踏了一生世。”
+“我們講革命的時候，大談什麼揚州三日，嘉定屠城，其實也不過一種手段；老實說：那時中國人的反抗，何嘗因為亡國，只是因為拖辮子。”
+“頑殺盡了，遺老都壽終了，辮子早留定了，洪楊又鬧起來了。我的祖母曾對我說，那時做百姓才難哩，全留著頭髮的被官兵殺，還是辮子的便被長毛殺！”
+“我不知道有多少中國人只因為這不痛不癢的頭髮而吃苦，受難，滅亡。”
+N兩眼望著屋樑，似乎想些事，仍然說：
+“誰知道頭髮的苦輪到我了。”
+“我出去留學，便剪掉了辮子，這並沒有別的奧妙，只為他不太便當罷了。不料有幾位辮子盤在頭頂上的同學們便很厭惡我；監督也大怒，說要停了我的官費，送回中國去。”
+“不幾天，這位監督卻自己被人剪去辮子逃走了。去剪的人們裏面，一個便是做《革命軍》的鄒容，這人也因此不能再留學，回到上海來，後來死在西牢裏。你也早忘卻了罷？”
+“過了幾年，我的家景大不如前了，非謀點事做便要受餓，只得也回到中國來。我一到上海，便買定一條假辮子，那時是二元的市價，帶著回家。我的母親倒也不說什麼，然而旁人一見面，便都首先研究這辮子，待到知道是假，就一聲冷笑，將我擬為殺頭的罪名；有一位本家，還預備去告官，但後來因為恐怕革命黨的造反或者要成功，這才中止了。”
+“我想，假的不如真的直截爽快，我便索性廢了假辮子，穿著西裝在街上走。”
+“一路走去，一路便是笑駡的聲音，有的還跟在後面罵：『這冒失鬼！』『假洋鬼子！』”
+“我於是不穿洋服了，改了大衫，他們罵得更厲害。”
+“在這日暮途窮的時候，我的手裏才添出一支手杖來，拚命的打了幾回，他們漸漸的不罵了。只是走到沒有打過的生地方還是罵。”
+“這件事很使我悲哀，至今還時時記得哩。我在留學的時候，曾經看見日報上登載一個遊歷南洋和中國的本多博士的事；這位博士是不懂中國和馬來語的，人問他，你不懂話，怎麼走路呢？他拿起手杖來說，這便是他們的話，他們都懂！我因此氣憤了好幾天，誰知道我竟不知不覺的自己也做了，而且那些人都懂了。……”
+“宣統初年，我在本地的中學校做監學，同事是避之惟恐不遠，官僚是防之惟恐不嚴，我終日如坐在冰窖子裏，如站在刑場旁邊，其實並非別的，只因為缺少了一條辮子！”
+“有一日，幾個學生忽然走到我的房裏來，說：『先生，我們要剪辮子了。』我說：『不行！』『有辮子好呢，沒有辮子好呢？』『沒有辮子好……』『你怎麼說不行呢？』『犯不上，你們還是不剪上算，——等一等罷。』”他們不說什麼，撅著嘴唇走出房去，然而終於剪掉了。
+“呵！不得了了，人言嘖嘖了；我卻只裝作不知道，一任他們光著頭皮，和許多辮子一齊上講堂。”
+“然而這剪辮病傳染了；第三天，師範學堂的學生忽然也剪下了六條辮子，晚上便開除了六個學生。這六個人，留校不能，回家不得，一直挨到第一個雙十節之後又一個多月，才消去了犯罪的火烙印。”
+“我呢？也一樣，只是元年冬天到北京，還被人罵過幾次，後來罵我的人也被員警剪去了辮子，我就不再被人辱駡了；但我沒有到鄉間去。”N顯出非常得意模樣，忽而又沉下臉來：“現在你們這些理想家，又在那裏嚷什麼女子剪髮了，又要造出許多毫無所得而痛苦的人！”“現在不是已經有剪掉頭發的女人，因此考不進學校去，或者被學校除了名麼？”“改革嘛，武器在那裏？工讀麼，工廠在那裏？”“仍然留起，嫁給人家做媳婦去：忘卻了一切還是幸福，倘使伊記著些平等自由的話，便要苦痛一生世！”“我要借了阿爾志跋綏夫的話問你們：『你們將黃金時代的出現豫約給這些人們的子孫了，但有什麼給這些人們自己呢？』”“啊，造物的皮鞭沒有到中國的脊樑上時，中國便永遠是這一樣的中國，絕不肯自己改變一隻毫毛！”“你們的嘴裏既然並無毒牙，何以偏要在額上帖起『蝮蛇』兩個大字，引乞丐來打殺？……”N愈說愈離奇了，但一見到我不很願聽的神情，便立刻閉了口，站起來取帽子。我說：“回去麼？”他答道：“是的，天要下雨了。”我默默的送他到門口。他戴上帽子說：“再見！請你恕我打攪，好在明天便不是雙十節，我們統可以忘卻了。”
+我從鄉下跑到京城裏，一轉眼已經六年了。其間耳聞目睹的所謂國家大事，算起來也很不少；但在我心裏，都不留什麼痕跡，倘要我尋出這些事的影響來說，便只是增長了我的壞脾氣，——老實說，便是教我一天比一天的看不起人。
+但有一件小事，卻於我有意義，將我從壞脾氣裏拖開，使我至今忘記不得。
+這是民國六年的冬天，大北風颳得正猛，我因為生計關係，不得不一早在路上走。一路幾乎遇不見人，好容易才雇定了一輛人力車，教他拉到S門去。不一會，北風小了，路上浮塵早已刮淨，剩下一條潔白的大道來，車夫也跑得更快。剛近S門，忽而車把上帶著一個人，慢慢地倒了。
+跌倒的是一個女人，花白頭髮，衣服都很破爛。伊從馬路上突然向車前橫截過來；車夫已經讓開道，但伊的破棉背心沒有上扣，微風吹著，向外展開，所以終於兜著車把。幸而車夫早有點停步，否則伊定要栽一個大斤斗，跌到頭破血出了。
+伊伏在地上；車夫便也立住腳。我料定這老女人並沒有傷，又沒有別人看見，便很怪他多事，要自己惹出是非，也誤了我的路。
+我便對他說，"沒有什麼的。走你的罷！"
+車夫毫不理會，——或者並沒有聽到，——卻放下車子，扶那老女人慢慢起來，攙著臂膊立定，問伊說："你怎麼啦？""我摔壞了。"
+我想，我眼見你慢慢倒地，怎麼會摔壞呢，裝腔作勢罷了，這真可憎惡。車夫多事，也正是自討苦吃，現在你自己想法去。
+車夫聽了這老女人的話，卻毫不躊躇，仍然攙著伊的臂膊，便一步一步的向前走。我有些詫異，忙看前面，是一所巡警分駐所，大風之後，外面也不見人。這車夫扶著那老女人，便正是向那大門走去。
+我這時突然感到一種異樣的感覺，覺得他滿身灰塵的後影，剎時高大了，而且愈走愈大，須仰視才見。而且他對於我，漸漸的又幾乎變成一種威壓，甚而至於要榨出皮袍下面藏著的"小"來。
+我的活力這時大約有些凝滯了，坐著沒有動，也沒有想，直到看見分駐所裏走出一個巡警，才下了車。
+巡警走近我說，"你自己雇車罷，他不能拉你了。"
+我沒有思索的從外套袋裏抓出一大把銅元，交給巡警，說，"請你給他……"
+風全住了，路上還很靜。我走著，一面想，幾乎怕敢想到自己。以前的事姑且擱起，這一大把銅元又是什麼意思？獎他麼？我還能裁判車夫麼？我不能回答自己。
+這事到了現在，還是時時記起。我因此也時時煞了苦痛，努力的要想到我自己。幾年來的文治武力，在我早如幼小時候所讀過的"子曰詩云"一般，背不上半句了。獨有這一件小事，卻總是浮在我眼前，有時反更分明，教我慚愧，催我自新，並且增長我的勇氣和希望。
+「沒有聲音，——小東西怎了？」紅鼻子老拱手裏擎了一碗黃酒，說著，向間壁努一努嘴。藍皮阿五便放下酒碗，在他脊梁上用死勁的打了一掌，含含糊糊嚷道：「你……你你又在想心思。……」
+原來魯鎮是僻靜地方，還有些古風：不上一更，大家便都關門睡覺。深更半夜沒有睡的只有兩家：一家是咸亨酒店，幾個酒肉朋友圍著櫃臺，吃喝得正高興；一家便是間壁的單四嫂子，他自從前年守了寡，便須專靠著自己的一雙手紡出綿紗來，養活他自己和他三歲的兒子，所以睡的也遲。
+這幾天，確鑿沒有紡紗的聲音了。但夜深沒有睡的既然只有兩家，這單四嫂子家有聲音，便自然只有老拱們聽到，沒有聲音，也只有老拱們聽到。
+老拱挨了打，仿佛很舒服似的喝了一大口酒，嗚嗚的唱起小曲來。
+這時候，單四嫂子正抱著他的寶兒，坐在床沿上，紡車靜靜的立在地上。黑沉沉的燈光，照著寶兒的臉，緋紅裏帶一點青。單四嫂子心裏計算：神簽也求過了，願心也許過了，單方也吃過了，要是還不見效，怎麼好？——那隻有去診何小仙了。但寶兒也許是日輕夜重，到了明天，太陽一出，熱也會退，氣喘也會平的：這實在是病人常有的事。
+單四嫂子是一個粗笨女人，不明白這「但」字的可怕：許多壞事固然幸虧有了他才變好，許多好事卻也因為有了他都弄糟。夏天夜短，老拱們嗚嗚的唱完了不多時，東方已經發白；不一會，窗縫裏透進了銀白色的曙光。
+單四嫂子等候天明，卻不像別人這樣容易，覺得非常之慢，寶兒的一呼吸，幾乎長過一年。現在居然明亮了；天的明亮，壓倒了燈光，——看見寶兒的鼻翼，已經一放一收的扇動。
+單四嫂子知道不妙，暗暗叫一聲「阿呀！」心裏計算：怎麼好？只有去診何小仙這一條路了。他雖然是粗笨女人，心裏卻有決斷，便站起身，從木柜子里掏出每天節省下來的十三個小銀元和一百八十銅錢，都裝在衣袋里，鎖上門，抱著寶兒直向何家奔過去。
+天氣還早，何家已經坐著四個病人了。他摸出四角銀元，買了號簽，第五個輪到寶兒。何小仙伸開兩個指頭按脈，指甲足有四寸多長，單四嫂子暗地納罕，心裏計算：寶兒該有活命了。但總免不了著急，忍不住要問，便局局促促的說：
+「先生，——我家的寶兒什麼病呀？」「他中焦塞著。」「不妨事麽？他……」「先去吃兩帖。」「他喘不過氣來，鼻翅子都扇著呢。」這是火克金……」
+何小仙說了半句話，便閉上眼睛；單四嫂子也不好意思再問。在何小仙對面坐著的一個三十多歲的人，此時已經開好一張藥方，指著紙角上的幾個字說道：
+「這第一味保嬰活命丸，須是賈家濟世老店才有！」單四嫂子接過藥方，一面走，一面想。他雖是粗笨女人，卻知道何家與濟世老店與自己的家，正是一個三角點；自然是買了藥回去便宜了。於是又徑向濟世老店奔過去。店夥也翹了長指甲慢慢的看方，慢慢的包藥。單四嫂子抱了寶兒等著；寶兒忽然擎起小手來，用力拔他散亂著的一綹頭髮，這是從來沒有的舉動，單四嫂子怕得發怔。
+太陽早出了。單四嫂子抱了孩子，帶著藥包，越走覺得越重；孩子又不住的掙扎，路也覺得越長。沒奈何坐在路旁一家公館的門檻上，休息了一會，衣服漸漸的冰著肌膚，才知道自己出了一身汗；寶兒卻仿佛睡著了。他再起來慢慢地走，仍然支撐不得，耳朵邊忽然聽得人說：
+「單四嫂子，我替你抱勃羅！」似乎是藍皮阿五的聲音。
+他抬頭看時，正是藍皮阿五，睡眼朦朧的跟著他走。
+單四嫂子在這時候，雖然很希望降下一員天將，助他一臂之力，卻不願是阿五。但阿五有些俠氣，無論如何，總是偏要幫忙，所以推讓了一會，終於得了許可了。他便伸開臂膊，從單四嫂子的乳房和孩子之間，直伸下去，抱去了孩子。單四嫂子便覺乳房上發了一條熱，剎時間直熱到臉上和耳根。
+他們兩人離開了二尺五寸多地，一同走著。阿五說些話，單四嫂子卻大半沒有答。走了不多時候，阿五又將孩子還給他，說是昨天與朋友約定的吃飯時候到了；單四嫂子便接了孩子。幸而不遠便是家，早看見對門的王九媽在街邊坐著，遠遠地說話：
+「單四嫂子，孩子怎了？——看過先生了麽？」「看是看了。——王九媽，你有年紀，見的多，不如請你老法眼看一看，怎樣……」「唔……」「怎樣……？」「唔……」王九媽端詳了一番，把頭點了兩點，搖了兩搖。
+寶兒吃下藥，已經是午後了。單四嫂子留心看他神情，似乎仿佛平穩了不少；到得下午，忽然睜開眼叫一聲「媽！」又仍然合上眼，像是睡去了。他睡了一刻，額上鼻尖都沁出一粒一粒的汗珠，單四嫂子輕輕一摸，膠水般粘著手；慌忙去摸胸口，便禁不住嗚咽起來。
+寶兒的呼吸從平穩到沒有，單四嫂子的聲音也就從嗚咽變成號啕。這時聚集了幾堆人：門內是王九媽藍皮阿五之類，門外是咸亨的掌柜和紅鼻老拱之類。王九媽便發命令，燒了一串紙錢；又將兩條板凳和五件衣服作抵，替單四嫂子借了兩塊洋錢，給幫忙的人備飯。
+第一個問題是棺木。單四嫂子還有一副銀耳環和一支裹金的銀簪，都交給了咸亨的掌柜，托他作一個保，半現半賒的買一具棺木。藍皮阿五也伸出手來，很願意自告奮勇；王九媽卻不許他，只准他明天抬棺材的差使，阿五罵了一聲「老畜生」，怏怏的努了嘴站著。掌柜便自去了；晚上回來，說棺木須得現做，後半夜才成功。
+掌柜回來的時候，幫忙的人早吃過飯；因為魯鎮還有些古風，所以不上一更，便都回家睡覺了。只有阿五還靠著咸亨的櫃臺喝酒，老拱也嗚嗚的唱。
+這時候，單四嫂子坐在床沿上哭著，寶兒在床上躺著，紡車靜靜的在地上立著。許多工夫，單四嫂子的眼淚宣告完結了，眼睛張得很大，看看四面的情形，覺得奇怪：所有的都是不會有的事。他心裏計算：不過是夢罷了，這些事都是夢。明天醒過來，自己好好的睡在床上，寶兒也好好的睡在自己身邊。他也醒過來，叫一聲「媽」，生龍活虎似的跳去玩了。
+老拱的歌聲早經寂靜，咸亨也熄了燈。單四嫂子張著眼，總不信所有的事。——雞也叫了；東方漸漸發白，窗縫裏透進了銀白色的曙光。
+銀白的曙光又漸漸顯出緋紅，太陽光接著照到屋脊。單四嫂子張著眼，呆呆坐著；聽得打門聲音，才吃了一嚇，跑出去開門。門外一個不認識的人，背了一件東西；後面站著王九媽。
+哦，他們背了棺材來了。
+下半天，棺木才合上蓋：因為單四嫂子哭一回，看一回，總不肯死心塌地的蓋上；幸虧王九媽等得不耐煩，氣憤憤的跑上前，一把拖開他，才七手八腳的蓋上了。
+但單四嫂子待他的寶兒，實在已經盡了心，再沒有什麼缺陷。昨天燒過一串紙錢，上午又燒了四十九捲《大悲咒》；收斂的時候，給他穿上頂新的衣裳，平日喜歡的玩意兒，——一個泥人，兩個小木碗，兩個玻璃瓶，——都放在枕頭旁邊。後來王九媽掐著指頭子細推敲，也終於想不出一些什麼缺陷。
+這日里，藍皮阿五簡直整天沒有到；咸亨掌柜便替單四嫂子雇了兩名腳夫，每名二百另十個大錢，抬棺木到義冢地上安放。王九媽又幫他煮了飯，凡是動過手開過口的人都吃了飯。太陽漸漸顯出要落山的顏色；吃過飯的人也不覺都顯出要回家的顏色，——於是他們終於都回了家。
+單四嫂子很覺得頭眩，歇息了一會，倒居然有點平穩了。但他接連著便覺得很異樣：遇到了平生沒有遇到過的事，不像會有的事，然而的確出現了。他越想越奇，又感到一件異樣的事——這屋子忽然太靜了。
+他站起身，點上燈火，屋子越顯得靜。他昏昏的走去關上門，回來坐在床沿上，紡車靜靜的立在地上。他定一定神，四面一看，更覺得坐立不得，屋子不但太靜，而且也太大了，東西也太空了。太大的屋子四麵包圍著他，太空的東西四面壓著他，叫他喘氣不得。
+他現在知道他的寶兒確乎死了；不願意見這屋子，吹熄了燈，躺著。他一面哭，一面想：想那時候，自己紡著棉紗，寶兒坐在身邊吃茴香豆，瞪著一雙小黑眼睛想了一刻，便說，「媽！爹賣餛飩，我大了也賣餛飩，賣許多許多錢，——我都給你。」那時候，真是連紡出的棉紗，也仿佛寸寸都有意思，寸寸都活著。但現在怎麼了？現在的事，單四嫂子卻實在沒有想到什麼。——我早經說過：他是粗笨女人。他能想出什麼呢？他單覺得這屋子太靜，太大，太空罷了。
+但單四嫂子雖然粗笨，卻知道還魂是不能有的事，他的寶兒也的確不能再見了。嘆一口氣，自言自語的說，「寶兒，你該還在這裏，你給我夢裏見見罷。」於是合上眼，想趕快睡去，會他的寶兒，苦苦的呼吸通過了靜和大和空虛，自己聽得明白。
+單四嫂子終於朦朦朧朧的走入睡鄉，全屋子都很靜。這時紅鼻子老拱的小曲，也早經唱完；蹌蹌踉踉出了咸亨，卻又提尖了喉嚨，唱道：
+「我的冤家呀！——可憐你，——孤另另的……」
+藍皮阿五便伸手揪住了老拱的肩頭，兩個人七歪八斜的笑著擠著走去。
+單四嫂子早睡著了，老拱們也走了，咸亨也關上門了。這時的魯鎮，便完全落在寂靜里。只有那暗夜為想變成明天，卻仍在這寂靜里奔波；另有幾條狗，也躲在暗地裏嗚嗚的叫。
+陳士成看過縣考的榜、回到家裏的時候，已經是下午了。他去得本很早，一見榜，便先在這上面尋陳字。陳字也不少，似乎也都爭先恐後的跳進他眼睛裏來，然而接著的卻全不是士成這兩個字。他於是重新再在十二張榜的圓圖裏細細地搜尋，看的人全已散盡了，而陳士成在榜上終於沒有見，單站在試院的照壁的面前。
+涼風雖然拂拂的吹動他斑白的短髮，初冬的太陽卻還是很溫和的來曬他。但他似乎被太陽曬得頭暈了，臉色越加變成灰白，從勞乏的紅腫的兩眼裏，發出古怪的閃光。這時他其實早已不看到什麼牆上的榜文了，只見有許多烏黑的圓圈，在眼前泛泛的遊走。
+雋了秀才，上省去鄉試，一徑聯捷上去，……紳士們既然千方百計的來攀親，人們又都像看見神明似的敬畏，深悔先前的輕薄，發昏，……趕走了租住在自己破宅門裏的雜姓——那是不勞說趕，自己就搬的，——屋宇全新了，門口是旗竿和扁額，……要清高可以做京官，否則不如謀外放。……他平日安排停當的前程，這時候又像受潮的糖塔一般，剎時倒塌，只剩下一堆碎片了。他不自覺的旋轉了覺得渙散了身軀，惘惘的走向歸家的路。
+他剛到自己的房門口，七個學童便一齊放開喉嚨，吱的念起書來。他大吃一驚，耳朵邊似乎敲了一聲磬，只見七個頭拖了小辮子在眼前幌，幌得滿房，黑圈子也夾著跳舞。他坐下了，他們送上晚課來，臉上都顯出小覷他的神色。
+「回去罷。」他遲疑了片時，這才悲慘的說。
+他們胡亂的包了書包，挾著，一溜煙跑走了。
+陳士成還看見許多小頭夾著黑圓圈在眼前跳舞，有時雜亂，有時也擺成異樣的陣圖，然而漸漸的減少了，模胡了。
+「這回又完了！」
+他大吃一驚，直跳起來，分明就在耳邊的話，回過頭去卻並沒有什麼人，仿佛又聽得嗡的敲了一聲磬，自己的嘴也說道：
+「這回又完了！」
+他忽而舉起一隻手來，屈指計數著想，十一，十三回，連今年是十六回，竟沒有一個考官懂得文章，有眼無珠，也是可憐的事，便不由嘻嘻的失了笑。然而他憤然了，驀地從書包布底下抽出謄真的制藝和試帖來，拿著往外走，剛近房門，卻看見滿眼都明亮，連一群雞也正在笑他，便禁不住心頭突突的狂跳，只好縮回裏面了。
+他又就了坐，眼格外的閃爍；他目睹著許多東西，然而很模胡，——是倒塌了的糖塔一般的前程躺在他面前，這前程又只是廣大起來，阻住了他的一切路。
+別家的炊煙早消歇了，碗筷也洗過了，而陳士成還不去做飯。寓在這裏的雜姓是知道老例的，凡遇到縣考的年頭，看見發榜後的這樣的眼光，不如及早關了門，不要多管事。最先就絕了人聲，接著是陸續的熄了燈火，獨有月亮，卻緩緩的出現在寒夜的空中。
+空中青碧到如一片海，略有些浮雲，仿佛有誰將粉筆洗在筆洗裏似的搖曳。月亮對著陳士成註下寒冷的光波來，當初也不過像是一面新磨的鐵鏡罷了，而這鏡卻詭秘的照透了陳士成的全身，就在他身上映出鐵的月亮的影。
+他還在房外的院子裏徘徊，眼裏頗清靜了，四近也寂靜。但這寂靜忽又無端的紛擾起來，他耳邊又確鑿聽到急促的低聲說：
+「左彎右彎……」
+他聳然了，傾耳聽時，那聲音卻又提高的複述道：「右彎！」
+他記得了。這院子，是他家還未如此雕零的時候，一到夏天的夜間，夜夜和他的祖母在此納涼的院子。那時他不過十歲有零的孩子，躺在竹榻上，祖母便坐在榻旁邊，講給他有趣的故事聽。伊說是曾經聽得伊的祖母說，陳氏的祖宗是巨富的，這屋子便是祖基，祖宗埋著無數的銀子，有福氣的子孫一定會得到的罷，然而至今還沒有現。至於處所，那是藏在一個謎語的中間：
+「左彎右彎，前走後走，量金量銀不論斗。」
+對於這謎語，陳士成便在平時，本也常常暗地裏加以揣測的，可惜大抵剛以為可以通，卻又立刻覺得不合了。有一回，他確有把握，知道這是在租給唐家的房底下的了，然而總沒有前去發掘的勇氣；過了幾時，可又覺得太不相像了。至於他自己房子裏的幾個掘過的舊痕跡，那卻全是先前幾回下第以後的發了怔忡的舉動，後來自己一看到，也還感到慚愧而且羞人。
+但今天鐵的光罩住了陳士成，又軟軟的來勸他了，他或者偶一遲疑，便給他正經的證明，又加上陰森的摧逼，使他不得不又向自己的房裏轉過眼光去。
+白光如一柄白團扇，搖搖擺擺的閃起在他房裏了。
+「也終於在這裏！」
+他說著，獅子似的趕快走進那房裏去，但跨進裏面的時候，便不見了白光的影蹤，只有莽蒼蒼的一間舊房，和幾個破書桌都沒在昏暗裏。他爽然的站著，慢慢的再定睛，然而白光卻分明的又起來了，這回更廣大，比硫黃火更白凈，比朝霧更霏微，而且便在靠東牆的一張書桌下。
+陳士成獅子似的奔到門後邊，伸手去摸鋤頭，撞著一條黑影。他不知怎的有些怕了，張惶的點了燈，看鋤頭無非倚著。他移開桌子，用鋤頭一氣掘起四塊大方磚，蹲身一看，照例是黃澄澄的細沙，揎了袖爬開細沙，便露出下面的黑土來。他極小心的，幽靜的，一鋤一鋤往下掘，然而深夜究竟太寂靜了，尖鐵觸土的聲音，總是鈍重的不肯瞞人的發響。
+土坑深到二尺多了，並不見有甕口，陳士成正心焦，一聲脆響，頗震得手腕痛，鋤尖碰到什麼堅硬的東西了；他急忙拋下鋤頭，摸索著看時，一塊大方磚在下麵。他的心抖得很利害，聚精會神的挖起那方磚來，下麵也滿是先前一樣的黑土，爬鬆了許多土，下麵似乎還無窮。但忽而又觸著堅硬的小東西了，圓的，大約是一個銹銅錢；此外也還有幾片破碎的磁片。
+陳士成心裏仿佛覺得空虛了，渾身流汗，急躁的只爬搔；這其間，心在空中一抖動，又觸著一種古怪的小東西了，這似乎約略有些馬掌形的，但觸手很鬆脆。他又聚精會神的挖起那東西來，謹慎的撮著，就燈光下仔細看時，那東西斑斑剝剝的像是爛骨頭，上面還帶著一排零落不全的牙齒。他已經誤到這許是下巴骨了，而那下巴骨也便在他手裏索索的動彈起來，而且笑吟吟的顯出笑影，終於聽得他開口道：
+「這回又完了！」
+他慄然的發了大冷，同時也放了手，下巴骨輕飄飄的回到坑底裏不多久，他也就逃到院子裏了。他偷看房裏面，燈火如此輝煌，下巴骨如此嘲笑，異乎尋常的怕人，便再不敢向那邊看。他躲在遠處的簷下的陰影裏，覺得較為安全了；但在這平安中，忽而耳朵邊又聽得竊竊的低聲說：
+「這裏沒有……到山裏去……」
+陳士成似乎記得白天在街上也曾聽得有人說這種話，他不待再聽完，已經恍然大悟了。他突然仰面向天，月亮已向西高峰這方面隱去，遠想離城三十五里的西高峰正在眼前，朝笏一般黑魆魆的挺立著，周圍便放出浩大閃爍的白光來。
+而且這白光又遠遠的就在前面了。
+「是的，到山裏去！」
+他決定的想，慘然的奔出去了。幾回的開門之後，門裏面便再不聞一些聲息。燈火結了大燈花照著空屋和坑洞，畢畢剝剝的炸了幾聲之後，便漸漸的縮小以至於無有，那是殘油已經燒盡了。
+「開城門來～～」
+含著大希望的恐怖的悲聲，遊絲似的在西關門前的黎明中，戰戰兢兢的叫喊。
+第二天的日中，有人在離西門十五里的萬流湖裏看見一個浮屍，當即傳揚開去，終於傳到地保的耳朵裏了，便叫鄉下人撈將上來。那是一個男屍，五十多歲，「身中面白無鬚」，渾身也沒有什麼衣褲。或者說這就是陳士成。但鄰居懶得去看，也並無屍親認領，於是經縣委員相驗之後，便由地保埋了。至於死因，那當然是沒有問題的，剝取死屍的衣服本來是常有的事，夠不上疑心到謀害去：而且仵作也證明是生前的落水，因為他確鑿曾在水底裏掙命，所以十個指甲裏都滿嵌著河底泥。
+有鬼似的。
+然而要做這一篇速朽的文章，纔下筆，便感到萬分的困難了。第一是文章的名目。孔子曰，“名不正則言不順”。這原是應該極註意的。傳的名目很繁多：列傳，自傳，內傳，外傳，別傳，家傳，小傳……，而可惜都不合。“列傳”麽，這一篇並非和許多闊人排在“正史”裏；“自傳”麽，我又並非就是阿Q。說是“外傳”，“內傳”在那裏呢？倘用“內傳”，阿Q又決不是神仙。“別傳”呢，阿Q實在未曾有大總統上諭宣付國史館立“本傳”——雖說英國正史上並無“博徒列傳”，而文豪迭更司也做過《博徒別傳》這一部書，但文豪則可，在我輩卻不可。其次是“家傳”，則我既不知與阿Q是否同宗，也未曾受他子孫的拜託；或“小傳”，則阿Q又更無別的“大傳”了。總而言之，這一篇也便是“本傳”，但從我的文章著想，因為文體卑下，是“引車賣漿者流”所用的話，所以不敢僭稱，便從不入三教九流的小說家所謂“閑話休題言歸正傳”這一句套話裏，取出“正傳”兩個字來，作為名目，即使與古人所撰《書法正傳》的“正傳”字面上很相混，也顧不得了。
+第二，立傳的通例，開首大抵該是“某，字某，某地人也”，而我並不知道阿Q姓什麼。有一回，他似乎是姓趙，但第二日便模糊了。那是趙太爺的兒子進了秀才的時候，鑼聲鏜鏜的報到村裏來，阿Q正喝了兩碗黃酒，便手舞足蹈的說，這於他也很光采，因為他和趙太爺原來是本家，細細的排起來他還比秀才長三輩呢。其時幾個旁聽人倒也肅然的有些起敬了。那知道第二天，地保便叫阿Q到趙太爺家裏去；太爺一見，滿臉濺朱，喝道：
+“阿Q，你這渾小子！你說我是你的本家麽？”阿Q不開口。趙太爺愈看愈生氣了，搶進幾步說：“你敢胡說！我怎麼會有你這樣的本家？你姓趙麽？”阿Q不開口，想往後退了；趙太爺跳過去，給了他一個嘴巴。
+“你怎麼會姓趙！——你那裏配姓趙！”
+阿Q並沒有抗辯他確鑿姓趙，只用手摸著左頰，和地保退出去了；外面又被地保訓斥了一番，謝了地保二百文酒錢。知道的人都說阿Q太荒唐，自己去招打；他大約未必姓趙，即使真姓趙，有趙太爺在這裏，也不該如此胡說的。此後便再沒有人提起他的氏族來，所以我終於不知道阿Q究竟什麼姓。
+第三，我又不知道阿Q的名字是怎麼寫的。他活著的時候，人都叫他阿Quei，死了以後，便沒有一個人再叫阿Quei了，那裏還會有“著之竹帛”的事。若論“著之竹帛”，這篇文章要算第一次，所以先遇著了這第一個難關。我曾仔細想：阿Quei，阿桂還是阿貴呢？倘使他號月亭，或者在八月間做過生日，那一定是阿桂了；而他既沒有號——也許有號，只是沒有人知道他，——又未嘗散過生日徵文的帖子：寫作阿桂，是武斷的。又倘使他有一位老兄或令弟叫阿富，那一定是阿貴了；而他又只是一個人：寫作阿貴，也沒有佐證的。其餘音Quei的偏僻字樣，更加湊不上了。先前，我也曾問過趙太爺的兒子茂才先生，誰料博雅如此公，竟也茫然，但據結論說，是因為陳獨秀辦了《新青年》提倡洋字，所以國粹淪亡，無可查考了。我的最後的手段，只有托一個同鄉去查阿Q犯事的案卷，八個月之後纔有回信，說案卷裏並無與阿Quei的聲音相近的人。我雖不知道是真沒有，還是沒有查，然而也再沒有別的方法了。生怕註音字母還未通行，只好用了“洋字”，照英國流行的拼法寫他為阿Quei，略作阿Q。這近於盲從《新青年》，自己也很抱歉，但茂才公尚且不知，我還有什麼好辦法呢。
+第四，是阿Q的籍貫了。倘他姓趙，則據現在好稱郡望的老例，可以照《郡名百家姓》上的註解，說是“隴西天水人也”，但可惜這姓是不甚可靠的，因此籍貫也就有些決不定。他雖然多住未莊，然而也常常宿在別處，不能說是未莊人，即使說是“未莊人也”，也仍然有乖史法的。
+我所聊以自慰的，是還有一個“阿”字非常正確，絕無附會假借的缺點，頗可以就正於通人。至於其餘，卻都非淺學所能穿鑿，只希望有“歷史癖與考據癖”的胡適之先生的門人們，將來或者能夠尋出許多新端緒來，但是我這《阿Q正傳》到那時卻又怕早經消滅了。
+阿Q不獨是姓名籍貫有些渺茫，連他先前的“行狀”也渺茫。因為未莊的人們之於阿Q，只要他幫忙，只拿他玩笑，從來沒有留心他的“行狀”的。而阿Q自己也不說，獨有和別人口角的時候，間或瞪著眼睛道：
+“我先前——比你闊的多啦！你算是什麼東西！”
+阿Q沒有家，住在未莊的土穀祠裏；也沒有固定的職業，只給人家做短工，割麥便割麥，舂米便舂米，撐船便撐船。工作略長久時，他也或住在臨時主人的家裏，但一完就走了。所以，人們忙碌的時候，也還記起阿Q來，然而記起的是做工，並不是“行狀”；一閑空，連阿Q都早忘卻，更不必說“行狀”了。只是有一回，有一個老頭子頌揚說：“阿Q真能做！”這時阿Q赤著膊，懶洋洋的瘦伶仃的正在他面前，別人也摸不著這話是真心還是譏笑，然而阿Q很喜歡。
+阿Q又很自尊，所有未莊的居民，全不在他眼神裏，甚而至於對於兩位“文童”也有以為不值一笑的神情。夫文童者，將來恐怕要變秀才者也；趙太爺錢太爺大受居民的尊敬，除有錢之外，就因為都是文童的爹爹，而阿Q在精神上獨不表格外的崇奉，他想：我的兒子會闊得多啦！加以進了幾回城，阿Q自然更自負，然而他又很鄙薄城裏人，譬如用三尺三寸寬的木板做成的凳子，未莊人叫“長凳”，他也叫“長凳”，城裏人卻叫“條凳”，他想：這是錯的，可笑！油煎大頭魚，未莊都加上半寸長的蔥葉，城裏卻加上切細的蔥絲，他想：這也是錯的，可笑！然而未莊人真是不見世面的可笑的鄉下人呵，他們沒有見過城裏的煎魚！
+阿Q“先前闊”，見識高，而且“真能做”，本來幾乎是一個“完人”了，但可惜他體質上還有一些缺點。最惱人的是在他頭皮上，頗有幾處不知於何時的癩瘡疤。這雖然也在他身上，而看阿Q的意思，倒也似乎以為不足貴的，因為他諱說“癩”以及一切近於“賴”的音，後來推而廣之，“光”也諱，“亮”也諱，再後來，連“燈”“燭”都諱了。一犯諱，不問有心與無心，阿Q便全疤通紅的發起怒來，估量了對手，口訥的他便罵，氣力小的他便打；然而不知怎麼一回事，總還是阿Q吃虧的時候多。於是他漸漸的變換了方針，大抵改為怒目而視了。
+誰知道阿Q採用怒目主義之後，未莊的閑人們便愈喜歡玩笑他。一見面，他們便假作吃驚的說：
+“噲，亮起來了。”
+阿Q照例的發了怒，他怒目而視了。
+“原來有保險燈在這裏！”他們並不怕。
+阿Q沒有法，只得另外想出報複的話來：
+“你還不配……”這時候，又仿佛在他頭上的是一種高尚的光容的癩頭瘡，並非平常的癩頭瘡了；但上文說過，阿Q是有見識的，他立刻知道和“犯忌”有點抵觸，便不再往底下說。
+閒人還不完，只撩他，於是終而至於打。阿Q在形式上打敗了，被人揪住黃辮子，在壁上碰了四五個響頭，閒人這纔心滿意足的得勝的走了，阿Q站了一刻，心裏想，“我總算被兒子打了，現在的世界真不像樣……”於是也心滿意足的得勝的走了。
+阿Q想在心裏的，後來每每說出口來，所以凡是和阿Q玩笑的人們，幾乎全知道他有這一種精神上的勝利法，此後每逢揪住他黃辮子的時候，人就先一著對他說：
+“阿Q，這不是兒子打老子，是人打畜生。自己說：人打畜生！”
+阿Q兩隻手都捏住了自己的辮根，歪著頭，說道：
+“打蟲豸，好不好？我是蟲豸——還不放麽？”
+但雖然是蟲豸，閒人也並不放，仍舊在就近什麼地方給他碰了五六個響頭，這纔心滿意足的得勝的走了，他以為阿Q這回可遭了瘟。然而不到十秒鐘，阿Q也心滿意足的得勝的走了，他覺得他是第一個能夠自輕自賤的人，除了“自輕自賤”不算外，餘下的就是“第一個”。狀元不也是“第一個”麽？“你算是什麼東西”呢！？
+阿Q以如是等等妙法剋服怨敵之後，便愉快的跑到酒店裏喝幾碗酒，又和別人調笑一通，口角一通，又得了勝，愉快的回到土穀祠，放倒頭睡著了。假使有錢，他便去押牌寶，一堆人蹲在地面上，阿Q即汗流滿面的夾在這中間，聲音他最響：
+“青龍四百！”
+“咳～～開～～啦！”樁家揭開盒子蓋，也是汗流滿面的唱。“天門啦～～角回啦～～！人和穿堂空在那裏啦～～！阿Q的銅錢拿過來～～！
+“穿堂一百——一百五十！”
+阿Q的錢便在這樣的歌吟之下，漸漸的輸入別個汗流滿面的人物的腰間。他終於只好擠出堆外，站在後面看，替別人著急，一直到散場，然後戀戀的回到土穀祠，第二天，腫著眼睛去工作。
+但真所謂“塞翁失馬安知非福”罷，阿Q不幸而贏了一回，他倒幾乎失敗了。
+這是未莊賽神的晚上。這晚上照例有一臺戲，戲臺左近，也照例有許多的賭攤。做戲的鑼鼓，在阿Q耳朵裏仿佛在十里之外；他只聽得樁家的歌唱了。他贏而又贏，銅錢變成角洋，角洋變成大洋，大洋又成了疊。他興高采烈得非常：“天門兩塊！”
+他不知道誰和誰為什麼打起架來了。罵聲打聲腳步聲，昏頭昏腦的一大陣，他纔爬起來，賭攤不見了，人們也不見了，身上有幾處很似乎有些痛，似乎也挨了幾拳幾腳似的，幾個人詫異的對他看。他如有所失的走進土穀祠，定一定神，知道他的一堆洋錢不見了。趕賽會的賭攤多不是本村人，還到那裏去尋根柢呢？
+很白很亮的一堆洋錢！而且是他的——現在不見了！說是算被兒子拿去了罷，總還是忽忽不樂；說自己是蟲豸罷，也還是忽忽不樂：他這回纔有些感到失敗的苦痛了。
+但他立刻轉敗為勝了。他擎起右手，用力的在自己臉上連打了兩個嘴巴，熱剌剌的有些痛；打完之後，便心平氣和起來，似乎打的是自己，被打的是別一個自己，不久也就仿佛是自己打了別個一般，——雖然還有些熱剌剌，——心滿意足的得勝的躺下了。他睡著了。
+然而阿Q雖然常優勝，卻直待蒙趙太爺打他嘴巴之後，這纔出了名。
+他付過地保二百文酒錢，憤憤的躺下了，後來想：“現在的世界太不成話，兒子打老子……”於是忽而想到趙太爺的威風，而現在是他的兒子了，便自己也漸漸的得意起來，爬起身，唱著《小孤孀上墳》到酒店去。這時候，他又覺得趙太爺高人一等了。
+說也怪，從此之後，果然大家也仿佛格外尊敬他。這在阿Q，或者以為因為他是趙太爺的父親，而其實也不然。未莊通例，倘如阿七打阿八，或者李四打張三，向來本不算口碑。一上口碑，則打的既有名，被打的也就托庇有了名。至於錯在阿Q，那自然是不必說。所以者何？就因為趙太爺是不會錯的。但他既然錯，為什麼大家又仿佛格外尊敬他呢？這可難解，穿鑿起來說，或者因為阿Q說是趙太爺的本家，雖然挨了打，大家也還怕有些真，總不如尊敬一些穩當。否則，也如孔廟裏的太牢一般，雖然與豬羊一樣，同是畜生，但既經聖人下箸，先儒們便不敢妄動了。
+阿Q此後倒得意了許多年。
+有一年的春天，他醉醺醺的在街上走，在牆根的日光下，看見王胡在那裏赤著膊捉蝨子，他忽然覺得身上也癢起來了。這王胡，又癩又胡，別人都叫他王癩胡，阿Q卻刪去了一個癩字，然而非常渺視他。阿Q的意思，以為癩是不足為奇的，只有這一部絡腮鬍子，實在太新奇，令人看不上眼。他於是併排坐下去了。倘是別的閑人們，阿Q本不敢大意坐下去。但這王胡旁邊，他有什麼怕呢？老實說：他肯坐下去，簡直還是抬舉他。
+阿Q也脫下破夾襖來，翻檢了一回，不知道因為新洗呢還是因為粗心，許多工夫，只捉到三四個。他看那王胡，卻是一個又一個，兩個又三個，只放在嘴裏畢畢剝剝的響。
+阿Q最初是失望，後來卻不平了：看不上眼的王胡尚且那麼多，自己倒反這樣少，這是怎樣的大失體統的事呵！他很想尋一兩個大的，然而竟沒有，好容易纔捉到一個中的，恨恨的塞在厚嘴唇裏，狠命一咬，劈的一聲，又不及王胡的響。
+他癩瘡疤塊塊通紅了，將衣服摔在地上，吐一口唾沫，說：
+“這毛蟲！”
+“癩皮狗，你罵誰？”王胡輕蔑的抬起眼來說。
+阿Q近來雖然比較的受人尊敬，自己也更高傲些，但和那些打慣的閑人們見面還膽怯，獨有這回卻非常武勇了。這樣滿臉鬍子的東西，也敢出言無狀麽？
+“誰認便罵誰！”他站起來，兩手叉在腰間說。
+“你的骨頭癢了麽？”王胡也站起來，披上衣服說。
+阿Q以為他要逃了，搶進去就是一拳。這拳頭還未達到身上，已經被他抓住了，只一拉，阿Q蹌蹌踉踉的跌進去，立刻又被王胡扭住了辮子，要拉到牆上照例去碰頭。
+“‘君子動口不動手’！”阿Q歪著頭說。
+王胡似乎不是君子，並不理會，一連給他碰了五下，又用力的一推，至於阿Q跌出六尺多遠，這纔滿足的去了。
+在阿Q的記憶上，這大約要算是生平第一件的屈辱，因為王胡以絡腮鬍子的缺點，向來只被他奚落，從沒有奚落他，更不必說動手了。而他現在竟動手，很意外，難道真如市上所說，皇帝已經停了，不要秀才和舉人了，因此趙家減了威風，因此他們也便小覷了他麽？
+阿Q無可適從的站著。
+遠遠的走來了一個人，他的對頭又到了。這也是阿Q最厭惡的一個人，就是錢太爺的大兒子。他先前跑上城裏去進洋學堂，不知怎麼又跑到東洋去了，半年之後他回到家裏來，腿也直了，辮子也不見了，他的母親大哭了十幾場，他的老婆跳了三回井。後來，他的母親到處說，“這辮子是被壞人灌醉了酒剪去了。本來可以做大官，現在只好等留長再說了。”然而阿Q不肯信，偏稱他“假洋鬼子”，也叫作“裏通外國的人”，一見他，一定在肚子裏暗暗的咒罵。
+阿Q尤其“深惡而痛絕之”的，是他的一條假辮子。辮子而至於假，就是沒有了做人的資格；他的老婆不跳第四回井，也不是好女人。
+這“假洋鬼子”近來了。
+“禿兒。驢……”阿Q歷來本只在肚子裏罵，沒有出過聲，這回因為正氣忿，因為要報仇，便不由的輕輕的說出來了。
+不料這禿兒卻拿著一支黃漆的棍子——就是阿Q所謂哭喪棒——大蹋步走了過來。阿Q在這剎那，便知道大約要打了，趕緊抽緊筋骨，聳了肩膀等候著，果然，拍的一聲，似乎確鑿打在自己頭上了。
+“我說他！”阿Q指著近旁的一個孩子，分辯說。
+拍！拍拍！
+在阿Q的記憶上，這大約要算是生平第二件的屈辱。幸而拍拍的響了之後，於他倒似乎完結了一件事，反而覺得輕鬆些，而且“忘卻”這一件祖傳的寶貝也發生了效力，他慢慢的走，將到酒店門口，早已有些高興了。
+但對面走來了靜修庵裏的小尼姑。阿Q便在平時，看見伊也一定要唾罵，而況在屈辱之後呢？他於是發生了回憶，又發生了敵愾了。
+“我不知道我今天為什麼這樣晦氣，原來就因為見了你！”他想。
+他迎上去，大聲的吐一口唾沫：
+“咳，呸！”
+小尼姑全不睬，低了頭只是走。阿Q走近伊身旁，突然伸出手去摩著伊新剃的頭皮，呆笑著，說：
+“禿兒！快回去，和尚等著你……”
+“你怎麼動手動腳……”尼姑滿臉通紅的說，一面趕快走。
+酒店裏的人大笑了。阿Q看見自己的勛業得了賞識，便愈加興高采烈起來：
+“和尚動得，我動不得？”他扭住伊的面頰。
+酒店裏的人大笑了。阿Q更得意，而且為了滿足那些賞鑒家起見，再用力的一擰，纔放手。
+他這一戰，早忘卻了王胡，也忘卻了假洋鬼子，似乎對於今天的一切“晦氣”都報了仇；而且奇怪，又仿佛全身比拍拍的響了之後輕鬆，飄飄然的似乎要飛去了。
+“這斷子絕孫的阿Q！”遠遠地聽得小尼姑的帶哭的聲音。
+“哈哈哈！”阿Q十分得意的笑。
+“哈哈哈！”酒店裏的人也九分得意的笑。
+有人說：有些勝利者，願意敵手如虎，如鷹，他纔感得勝利的歡喜；假使如羊，如小雞，他便反覺得勝利的無聊。又有些勝利者，當剋服一切之後，看見死的死了，降的降了，“臣誠惶誠恐死罪死罪”，他於是沒有了敵人，沒有了對手，沒有了朋友，只有自己在上，一個，孤另另，淒涼，寂寞，便反而感到了勝利的悲哀。然而我們的阿Q卻沒有這樣乏，他是永遠得意的：這或者也是中國精神文明冠於全球的一個證據了。
+看那，他飄飄然的似乎要飛去了！
+然而這一次的勝利，卻又使他有些異樣。他飄飄然的飛了大半天，飄進土穀祠，照例應該躺下便打鼾。誰知道這一晚，他很不容易合眼，他覺得自己的大拇指和第二指有點古怪：仿佛比平常滑膩些。不知道是小尼姑的臉上有一點滑膩的東西粘在他指上，還是他的指頭在小尼姑臉上磨得滑膩了？……
+“斷子絕孫的阿Q！”
+阿Q的耳朵裏又聽到這句話。他想：不錯，應該有一個女人，斷子絕孫便沒有人供一碗飯，……應該有一個女人。夫“不孝有三無後為大”，而“若敖之鬼餒而”，也是一件人生的大哀，所以他那思想，其實是樣樣合於聖經賢傳的，只可惜後來有些“不能收其放心”了。
+“女人，女人！……”他想。
+“……和尚動得……女人，女人！……女人！”他又想。
+我們不能知道這晚上阿Q在什麼時候纔打鼾。但大約他從此總覺得指頭有些滑膩，所以他從此總有些飄飄然；“女……”他想。
+即此一端，我們便可以知道女人是害人的東西。
+中國的男人，本來大半都可以做聖賢，可惜全被女人毀掉了。商是妲己鬧亡的；周是褒姒弄壞的；秦……雖然史無明文，我們也假定他因為女人，大約未必十分錯；而董卓可是的確給貂蟬害死了。
+阿Q本來也是正人，我們雖然不知道他曾蒙什麼明師指授過，但他對於“男女之大防”卻歷來非常嚴；也很有排斥異端——如小尼姑及假洋鬼子之類——的正氣。他的學說是：凡尼姑，一定與和尚私通；一個女人在外面走，一定想引誘野男人；一男一女在那裏講話，一定要有勾當了。為懲治他們起見，所以他往往怒目而視，或者大聲說幾句“誅心”話，或者在冷僻處，便從後面擲一塊小石頭。
+誰知道他將到“而立”之年，竟被小尼姑害得飄飄然了。這飄飄然的精神，在禮教上是不應該有的，——所以女人真可惡，假使小尼姑的臉上不滑膩，阿Q便不至於被蠱，又假使小尼姑的臉上蓋一層布，阿Q便也不至於被蠱了，——他五六年前，曾在戲臺下的人叢中擰過一個女人的大腿，但因為隔一層褲，所以此後並不飄飄然，——而小尼姑並不然，這也足見異端之可惡。
+“女……”阿Q想。
+他對於以為“一定想引誘野男人”的女人，時常留心看，然而伊並不對他笑。他對於和他講話的女人，也時常留心聽，然而伊又並不提起關於什麼勾當的話來。哦，這也是女人可惡之一節：伊們全都要裝“假正經”的。
+這一天，阿Q在趙太爺家裏舂了一天米，吃過晚飯，便坐在廚房裏吸旱煙。倘在別家，吃過晚飯本可以回去的了，但趙府上晚飯早，雖說定例不准掌燈，一吃完便睡覺，然而偶然也有一些例外：其一，是趙大爺未進秀才的時候，准其點燈讀文章；其二，便是阿Q來做短工的時候，准其點燈舂米。因為這一條例外，所以阿Q在動手舂米之前，還坐在廚房裏吸旱煙。
+吳媽，是趙太爺家裏唯一的女僕，洗完了碗碟，也就在長凳上坐下了，而且和阿Q談閑天：
+“太太兩天沒有吃飯哩，因為老爺要買一個小的……”
+女人……吳媽……這小孤孀……”阿Q想。
+“我們的少奶奶是八月裏要生孩子了……”
+“女人……”阿Q想。
+阿Q放下煙管，站了起來。
+“我們的少奶奶……”吳媽還嘮叨說。
+“我和你困覺，我和你困覺！”阿Q忽然搶上去，對伊跪下了。
+一剎時中很寂然。
+“阿呀！”吳媽楞了一息，突然發抖，大叫著往外跑，且跑且嚷，似乎後來帶哭了。
+阿Q對了牆壁跪著也發楞，於是兩手扶著空板凳，慢慢的站起來，仿佛覺得有些糟。他這時確也有些忐忑了，慌張的將煙管插在褲帶上，就想去舂米。蓬的一聲，頭上著了很粗的一下，他急忙迴轉身去，那秀才便拿了一支大竹杠站在他面前。
+“你反了，……你這……”
+大竹杠又向他劈下來了。阿Q兩手去抱頭，拍的正打在指節上，這可很有些痛。他衝出廚房門，仿佛背上又著了一下似的。
+“忘八蛋！”秀才在後面用了官話這樣罵。
+阿Q奔入舂米場，一個人站著，還覺得指頭痛，還記得“忘八蛋”，因為這話是未莊的鄉下人從來不用，專是見過官府的闊人用的，所以格外怕，而印象也格外深。但這時，他那“女……”的思想卻也沒有了。而且打罵之後，似乎一件事也已經收束，倒反覺得一無掛礙似的，便動手去舂米。舂了一會，他熱起來了，又歇了手脫衣服。
+脫下衣服的時候，他聽得外面很熱鬧，阿Q生平本來最愛看熱鬧，便即尋聲走出去了。尋聲漸漸的尋到趙太爺的內院裏，雖然在昏黃中，卻辨得出許多人，趙府一家連兩日不吃飯的太太也在內，還有間壁的鄒七嫂，真正本家的趙白眼，趙司晨。
+少奶奶正拖著吳媽走出下房來，一面說：
+“你到外面來，……不要躲在自己房裏想……”
+“誰不知道你正經，……短見是萬萬尋不得的。”鄒七嫂也從旁說。
+吳媽只是哭，夾些話，卻不甚聽得分明。
+阿Q想：“哼，有趣，這小孤孀不知道鬧著什麼玩意兒了？”他想打聽，走近趙司晨的身邊。這時他猛然間看見趙大爺向他奔來，而且手裏捏著一支大竹杠。他看見這一支大竹杠，便猛然間悟到自己曾經被打，和這一場熱鬧似乎有點相關。他翻身便走，想逃回舂米場，不圖這支竹杠阻了他的去路，於是他又翻身便走，自然而然的走出後門，不多工夫，已在土穀祠內了。
+阿Q坐了一會，皮膚有些起粟，他覺得冷了，因為雖在春季，而夜間頗有餘寒，尚不宜於赤膊。他也記得布衫留在趙家，但倘若去取，又深怕秀才的竹杠。然而地保進來了。
+“阿Q，你的媽媽的！你連趙家的用人都調戲起來，簡直是造反。害得我晚上沒有覺睡，你的媽媽的！……”
+如是云云的教訓了一通，阿Q自然沒有話。臨末，因為在晚上，應該送地保加倍酒錢四百文，阿Q正沒有現錢，便用一頂氈帽做抵押，並且訂定了五條件：
+一　明天用紅燭——要一斤重的——一對，香一封，到趙府上去賠罪。
+二　趙府上請道士祓除縊鬼，費用由阿Q負擔。
+三　阿Q從此不准踏進趙府的門檻。四　吳媽此後倘有不測，惟阿Q是問。
+五　阿Q不准再去索取工錢和布衫。
+阿Q自然都答應了，可惜沒有錢。幸而已經春天，棉被可以無用，便質了二千大錢，履行條約。赤膊磕頭之後，居然還剩幾文，他也不再贖氈帽，統統喝了酒了。但趙家也並不燒香點燭，因為太太拜佛的時候可以用，留著了。那破布衫是大半做了少奶奶八月間生下來的孩子的襯尿布，那小半破爛的便都做了吳媽的鞋底。
+第五章　生計問題[编辑
+阿Q禮畢之後，仍舊回到土穀祠，太陽下去了，漸漸覺得世上有些古怪。他仔細一想，終於省悟過來：其原因蓋在自己的赤膊。他記得破夾襖還在，便披在身上，躺倒了，待張開眼睛，原來太陽又已經照在西牆上頭了。他坐起身，一面說道，“媽媽的……”
+他起來之後，也仍舊在街上逛，雖然不比赤膊之有切膚之痛，卻又漸漸的覺得世上有些古怪了。仿佛從這一天起，未莊的女人們忽然都怕了羞，伊們一見阿Q走來，便個個躲進門裏去。甚而至於將近五十歲的鄒七嫂，也跟著別人亂鑽，而且將十一歲的女兒都叫進去了。阿Q很以為奇，而且想：“這些東西忽然都學起小姐模樣來了。這娼婦們……”
+，卻是許多日以後的事。其一，酒店不肯賒欠了；其二，管土穀祠的老頭子說些廢話，似乎叫他走；其三，他雖然記不清多少日，但確乎有許多日，沒有一個人來叫他做短工。酒店不賒，熬著也罷了；老頭子催他走，嚕囌一通也就算了；只是沒有人來叫他做短工，卻使阿Q肚子餓：這委實是一件非常“媽媽的”的事情。
+阿Q忍不下去了，他只好到老主顧的家裏去探問，——但獨不許踏進趙府的門檻，——然而情形也異樣：一定走出一個男人來，現了十分煩厭的相貌，像回覆乞丐一般的搖手道：
+“沒有沒有！你出去！”
+阿Q愈覺得稀奇了。他想，這些人家向來少不了要幫忙，不至於現在忽然都無事，這總該有些蹊蹺在裏面了。他留心打聽，纔知道他們有事都去叫小Don。這小D，是一個窮小子，又瘦又乏，在阿Q的眼睛裏，位置是在王胡之下的，誰料這小子竟謀了他的飯碗去。所以阿Q這一氣，更與平常不同，當氣憤憤的走著的時候，忽然將手一揚，唱道：
+“我手執鋼鞭將你打！……”
+幾天之後，他竟在錢府的照壁前遇見了小D。“仇人相見分外眼明”，阿Q便迎上去，小D也站住了。
+“畜生！”阿Q怒目而視的說，嘴角上飛出唾沫來。
+“我是蟲豸，好麽？……”小D說。
+這謙遜反使阿Q更加憤怒起來，但他手裏沒有鋼鞭，於是只得撲上去，伸手去拔小D的辮子。小D一手護住了自己的辮根，一手也來拔阿Q的辮子，阿Q便也將空著的一隻手護住了自己的辮根。從先前的阿Q看來，，小D本來是不足齒數的，但他近來挨了餓，又瘦又乏已經不下於小D，所以便成了勢均力敵的現象，四隻手拔著兩顆頭，都彎了腰，在錢家粉牆上映出一個藍色的虹形，至於半點鐘之久了。
+“好了，好了！”看的人們說，大約是解勸的。
+“好，好！”看的人們說，不知道是解勸，是頌揚，還是煽動。
+然而他們都不聽。阿Q進三步，小D便退三步，都站著；小D進三步，阿Q便退三步，又都站著。大約半點鐘，——未莊少有自鳴鐘，所以很難說，或者二十分，——他們的頭髮裏便都冒煙，額上便都流汗，阿Q的手放鬆了，在同一瞬間，小D的手也正放鬆了，同時直起，同時退開，都擠出人叢去。
+“記著罷，媽媽的……”阿Q回過頭去說。
+“媽媽的，記著罷……”小D也回過頭來說。
+這一場“龍虎鬥”似乎並無勝敗，也不知道看的人可滿足，都沒有發什麼議論，而阿Q卻仍然沒有人來叫他做短工。
+有一日很溫和，微風拂拂的頗有些夏意了，阿Q卻覺得寒冷起來，但這還可擔當，第一倒是肚子餓。棉被，氈帽，布衫，早已沒有了，其次就賣了棉襖；現在有褲子，卻萬不可脫的；有破夾襖，又除了送人做鞋底之外，決定賣不出錢。他早想在路上拾得一註錢，但至今還沒有見；他想在自己的破屋裏忽然尋到一註錢，慌張的四顧，但屋內是空虛而且瞭然。於是他決計出門求食去了。
+他在路上走著要“求食”，看見熟識的酒店，看見熟識的饅頭，但他都走過了，不但沒有暫停，而且並不想要。他所求的不是這類東西了；他求的是什麼東西，他自己不知道。
+未莊本不是大村鎮，不多時便走盡了。村外多是水田，滿眼是新秧的嫩綠，夾著幾個圓形的活動的黑點，便是耕田的農夫。阿Q並不賞鑒這田家樂，卻只是走，因為他直覺的知道這與他的“求食”之道是很遼遠的。但他終於走到靜修庵的牆外了。
+庵周圍也是水田，粉牆突出在新綠裏，後面的低土牆裏是菜園。阿Q遲疑了一會，四面一看，並沒有人。他便爬上這矮牆去，扯著何首烏藤，但泥土仍然簌簌的掉，阿Q的腳也索索的抖；終於攀著桑樹枝，跳到裏面了。裏面真是鬱鬱蔥蔥，但似乎並沒有黃酒饅頭，以及此外可吃的之類。靠西牆是竹叢，下麵許多筍，只可惜都是並未煮熟的，還有油菜早經結子，芥菜已將開花，小白菜也很老了。
+阿Q仿佛文童落第似的覺得很冤屈，他慢慢走近園門去，忽而非常驚喜了，這分明是一畦老蘿蔔。他於是蹲下便拔，而門口突然伸出一個很圓的頭來，又即縮回去了，這分明是小尼姑。小尼姑之流是阿Q本來視若草芥的，但世事須“退一步想”，所以他便趕緊拔起四個蘿蔔，擰下青葉，兜在大襟裏。然而老尼姑已經出來了。
+“阿彌陀佛，阿Q，你怎麼跳進園裏來偷蘿蔔！……阿呀，罪過呵，阿唷，阿彌陀佛！……”
+“我什麼時候跳進你的園裏來偷蘿蔔？”阿Q且看且走的說。
+“現在……這不是？”老尼姑指著他的衣兜。
+“這是你的？你能叫得他答應你麽？你……”
+阿Q沒有說完話，拔步便跑；追來的是一匹很肥大的黑狗。這本來在前門的，不知怎的到後園來了。黑狗哼而且追，已經要咬著阿Q的腿，幸而從衣兜裏落下一個蘿蔔來，那狗給一嚇，略略一停，阿Q已經爬上桑樹，跨到土牆，連人和蘿蔔都滾出牆外面了。只剩著黑狗還在對著桑樹嗥，老尼姑念著佛。
+阿Q怕尼姑又放出黑狗來，拾起蘿蔔便走，沿路又撿了幾塊小石頭，但黑狗卻並不再現。阿Q於是拋了石塊，一面走一面吃，而且想道，這裏也沒有什麼東西尋，不如進城去……
+待三個蘿蔔吃完時，他已經打定了進城的主意了。
+第六章　從中興到末路[编辑]
+在未莊再看見阿Q出現的時候，是剛過了這年的中秋。人們都驚異，說是阿Q回來了，於是又回上去想道，他先前那裏去了呢？阿Q前幾回的上城，大抵早就興高采烈的對人說，但這一次卻並不，所以也沒有一個人留心到。他或者也曾告訴過管土穀祠的老頭子，然而未莊老例，只有趙太爺、錢太爺和秀才大爺上城纔算一件事。假洋鬼子尚且不足數，何況是阿Q：因此老頭子也就不替他宣傳，而未莊的社會上也就無從知道了。
+但阿Q這回的回來，卻與先前大不同，確乎很值得驚異。天色將黑，他睡眼蒙朧的在酒店門前出現了，他走近櫃臺，從腰間伸出手來，滿把是銀的和銅的，在櫃上一扔說，“現錢！打酒來！”穿的是新夾襖，看去腰間還掛著一個大搭連，沉鈿鈿的將褲帶墜成了很彎很彎的弧線。未莊老例，看見略有些醒目的人物，是與其慢也寧敬的，現在雖然明知道是阿Q，但因為和破夾襖的阿Q有些兩樣了，古人云，“士別三日便當刮目相待”，所以堂倌，掌櫃，酒客，路人，便自然顯出一種凝而且敬的形態來。掌櫃既先之以點頭，又繼之以談話：
+“豁，阿Q，你回來了！”
+“回來了。”
+“發財發財，你是——在……”
+“上城去了！”
+這一件新聞，第二天便傳遍了全未莊。人人都願意知道現錢和新夾襖的阿Q的中興史，所以在酒店裏，茶館裏，廟簷下，便漸漸的探聽出來了。這結果，是阿Q得了新敬畏。
+據阿Q說，他是在舉人老爺家裏幫忙。這一節，聽的人都肅然了。這老爺本姓白，但因為合城裏只有他一個舉人，所以不必再冠姓，說起舉人來就是他。這也不獨在未莊是如此，便是一百里方圓之內也都如此，人們幾乎多以為他的姓名就叫舉人老爺的了。在這人的府上幫忙，那當然是可敬的。但據阿Q又說，他卻不高興再幫忙了，因為這舉人老爺實在太“媽媽的”了。這一節，聽的人都嘆息而且快意，因為阿Q本不配在舉人老爺家裏幫忙，而不幫忙是可惜的。
+據阿Q說，他的回來，似乎也由於不滿意城裏人，這就在他們將長凳稱為條凳，而且煎魚用蔥絲，加以最近觀察所得的缺點，是女人的走路也扭得不很好。然而也偶有大可佩服的地方，即如未莊的鄉下人不過打三十二張的竹牌，只有假洋鬼子能夠叉“麻醬”，城裏卻連小烏龜子都叉得精熟的。什麼假洋鬼子，只要放在城裏的十幾歲的小烏龜子的手裏，也就立刻是“小鬼見閻王”。這一節，聽的人都赧然了。
+“你們可看見過殺頭麽？”阿Q說，“咳，好看。殺革命黨。唉，好看好看，……”他搖搖頭，將唾沫飛在正對面的趙司晨的臉上。這一節，聽的人都凜然了。但阿Q又四面一看，忽然揚起右手，照著伸長脖子聽得出神的王胡的後項窩上直劈下去道：
+“嚓！”
+王胡驚得一跳，同時電光石火似的趕快縮了頭，而聽的人又都悚然而且欣然了。從此王胡瘟頭瘟腦的許多日，並且再不敢走近阿Q的身邊；別的人也一樣。
+阿Q這時在未莊人眼睛裏的地位，雖不敢說超過趙太爺，但謂之差不多，大約也就沒有什麼語病的了。
+然而不多久，這阿Q的大名忽又傳遍了未莊的閨中。雖然未莊只有錢趙兩姓是大屋，此外十之九都是淺閨，但閨中究竟是閨中，所以也算得一件神異。女人們見面時一定說，鄒七嫂在阿Q那裏買了一條藍綢裙，舊固然是舊的，但只化了九角錢。還有趙白眼的母親，——一說是趙司晨的母親，待考，——也買了一件孩子穿的大紅洋紗衫，七成新，只用三百大錢九二串。於是伊們都眼巴巴的想見阿Q，缺綢裙的想問他買綢裙，要洋紗衫的想問他買洋紗衫，不但見了不逃避，有時阿Q已經走過了，也還要追上去叫住他，問道：
+“阿Q，你還有綢裙麽？沒有？紗衫也要的，有罷？”
+後來這終於從淺閨傳進深閨裏去了。因為鄒七嫂得意之餘，將伊的綢裙請趙太太去鑒賞，趙太太又告訴了趙太爺而且著實恭維了一番。趙太爺便在晚飯桌上，和秀才大爺討論，以為阿Q實在有些古怪，我們門窗應該小心些；但他的東西，不知道可還有什麼可買，也許有點好東西罷。加以趙太太也正想買一件價廉物美的皮背心。於是家族決議，便托鄒七嫂即刻去尋阿Q，而且為此新闢了第三種的例外：這晚上也姑且特准點油燈。
+油燈幹了不少了，阿Q還不到。趙府的全眷都很焦急，打著呵欠，或恨阿Q太飄忽，或怨鄒七嫂不上緊。趙太太還怕他因為春天的條件不敢來，而趙太爺以為不足慮：因為這是“我”去叫他的。果然，到底趙太爺有見識，阿Q終於跟著鄒七嫂進來了。“他只說沒有沒有，我說你自己當面說去，他還要說，我說……”鄒七嫂氣喘吁吁的走著說。
+“太爺！”阿Q似笑非笑的叫了一聲，在簷下站住了。
+“阿Q，聽說你在外面發財，”趙太爺踱開去，眼睛打量著他的全身，一面說。“那很好，那很好的。這個，……聽說你有些舊東西，……可以都拿來看一看，……這也並不是別的，因為我倒要……”“我對鄒七嫂說過了。都完了。”“完了？”趙太爺不覺失聲的說，“那裏會完得這樣快呢？”“那是朋友的，本來不多。他們買了些，……”“總該還有一點罷。”“現在，只剩了一張門幕了。”“就拿門幕來看看罷。”趙太太慌忙說。
+“那麼，明天拿來就是，”趙太爺卻不甚熱心了。“阿Q，你以後有什麼東西的時候，你儘先送來給我們看，……”
+“價錢決不會比別家出得少！”秀才說。秀才娘子忙一瞥阿Q的臉，看他感動了沒有。
+“我要一件皮背心。”趙太太說。
+阿Q雖然答應著，卻懶洋洋的出去了，也不知道他是否放在心上。這使趙太爺很失望，氣憤而且擔心，至於停止了打呵欠。秀才對於阿Q的態度也很不平，於是說，這忘八蛋要提防，或者不如吩咐地保，不許他住在未莊。但趙太爺以為不然，說這也怕要結怨，況且做這路生意的大概是“老鷹不吃窩下食”，本村倒不必擔心的；只要自己夜裏警醒點就是了。秀才聽了這“庭訓”，非常之以為然，便即刻撤銷了驅逐阿Q的提議，而且叮囑鄒七嫂，請伊千萬不要向人提起這一段話。
+但第二日，鄒七嫂便將那藍裙去染了皂，又將阿Q可疑之點傳揚出去了，可是確沒有提起秀才要驅逐他這一節。然而這已經於阿Q很不利。最先，地保尋上門了，取了他的門幕去，阿Q說是趙太太要看的，而地保也不還並且要議定每月的孝敬錢。其次，是村人對於他的敬畏忽而變相了，雖然還不敢來放肆，卻很有遠避的神情，而這神情和先前的防他來“嚓”的時候又不同，頗混著“敬而遠之”的分子了。
+只有一班閑人們卻還要尋根究底的去探阿Q的底細。阿Q也並不諱飾，傲然的說出他的經驗來。從此他們纔知道，他不過是一個小腳色，不但不能上牆，並且不能進洞，只站在洞外接東西。有一夜，他剛纔接到一個包，正手再進去，不一會，只聽得裏面大嚷起來，他便趕緊跑，連夜爬出城，逃回未莊來了，從此不敢再去做。然而這故事卻於阿Q更不利，村人對於阿Q的“敬而遠之”者，本因為怕結怨，誰料他不過是一個不敢再偷的偷兒呢？這實在是“斯亦不足畏也矣”。
+第七章　革命[编辑]
+宣統三年九月十四日——即阿Q將搭連賣給趙白眼的這一天——三更四點，有一隻大烏篷船到了趙府上的河埠頭。這船從黑魆魆中盪來，鄉下人睡得熟，都沒有知道；出去時將近黎明，卻很有幾個看見的了。據探頭探腦的調查來的結果，知道那竟是舉人老爺的船！
+那船便將大不安載給了未莊，不到正午，全村的人心就很動搖。船的使命，趙家本來是很秘密的，但茶坊酒肆裏卻都說，革命黨要進城，舉人老爺到我們鄉下來逃難了。惟有鄒七嫂不以為然，說那不過是幾口破衣箱，舉人老爺想來寄存的，卻已被趙太爺回覆轉去。其實舉人老爺和趙秀才素不相能，在理本不能有“共患難”的情誼，況且鄒七嫂又和趙家是鄰居，見聞較為切近，所以大概該是伊對的。
+阿Q的耳朵裏，本來早聽到過革命黨這一句話，今年又親眼見過殺掉革命黨。但他有一種不知從那裏來的意見，以為革命黨便是造反，造反便是與他為難，所以一向是“深惡而痛絕之”的。殊不料這卻使百里聞名的舉人老爺有這樣怕，於是他未免也有些“神往”了，況且未莊的一群鳥男女的慌張的神情，也使阿Q更快意。
+“革命也好罷，”阿Q想，“革這夥媽媽的的命，太可惡！太可恨！……便是我，也要投降革命黨了。”
+阿Q近來用度窘，大約略略有些不平；加以午間喝了兩碗空肚酒，愈加醉得快，一面想一面走，便又飄飄然起來。不知怎麼一來，忽而似乎革命黨便是自己，未莊人卻都是他的俘虜了。他得意之餘，禁不住大聲的嚷道：
+“造反了！造反了！”
+未莊人都用了驚懼的眼光對他看。這一種可憐的眼光，是阿Q從來沒有見過的，一見之下，又使他舒服得如六月裏喝了雪水。他更加高興的走而且喊道：
+“好，……我要什麼就是什麼，我歡喜誰就是誰。得得，鏘鏘！悔不該，酒醉錯斬了鄭賢弟，悔不該，呀呀呀……得得，鏘鏘，得，鏘令鏘！我手執鋼鞭將你打……”
+趙府上的兩位男人和兩個真本家，也正站在大門口論革命。阿Q沒有見，昂了頭直唱過去。“得得，……”
+“老Q，”趙太爺怯怯的迎著低聲的叫。“鏘鏘，”阿Q料不到他的名字會和“老”字聯結起來，以為是一句別的話，與己無幹，只是唱。“得，鏘，鏘令鏘，鏘！”“老Q。”“悔不該……”
+“阿Q！”秀才只得直呼其名了。
+阿Q這纔站住，歪著頭問道，“什麼？”
+“老Q，…現在……”趙太爺卻又沒有話，“現在……發財麽？”
+“發財？自然。要什麼就是什麼……”
+“阿……Q哥，像我們這樣窮朋友是不要緊的……”趙白眼惴惴的說，似乎想探革命黨的口風。
+“窮朋友？你總比我有錢。”阿Q說著自去了。
+大家都憮然，沒有話。趙太爺父子回家，晚上商量到點燈。趙白眼回家，便從腰間扯下搭連來，交給他女人藏在箱底裏。
+阿Q飄飄然的飛了一通，回到土穀祠，酒已經醒透了。這晚上，管祠的老頭子也意外的和氣，請他喝茶；阿Q便向他要了兩個餅，吃完之後，又要了一支點過的四兩燭和一個樹燭臺，點起來，獨自躺在自己的小屋裏。他說不出的新鮮而且高興，燭火像元夜似的閃閃的跳，他的思想也迸跳起來了：
+“造反？有趣，……來了一陣白盔白甲的革命黨，都拿著板刀，鋼鞭，炸彈，洋炮，三尖兩刃刀，鉤鐮槍，走過土穀祠，叫道，‘阿Q！同去同去！’於是一同去。……
+“這時未莊的一夥鳥男女纔好笑哩，跪下叫道，‘阿Q，饒命！’誰聽他！第一個該死的是小D和趙太爺，還有秀才，還有假洋鬼子，……留幾條麽？王胡本來還可留，但也不要了。……
+“東西，……直走進去打開箱子來：元寶，洋錢，洋紗衫，……秀才娘子的一張寧式床先搬到土穀祠，此外便擺了錢家的桌椅，——或者也就用趙家的罷。自己是不動手的了，叫小D來搬，要搬得快，搬得不快打嘴巴。……
+“趙司晨的妹子真醜。鄒七嫂的女兒過幾年再說。假洋鬼子的老婆會和沒有辮子的男人睡覺，嚇，不是好東西！秀才的老婆是眼胞上有疤的。……吳媽長久不見了，不知道在那裏，——可惜腳太大。”
+阿Q沒有想得十分停當，已經發了鼾聲，四兩燭還只點去了小半寸，紅焰焰的光照著他張開的嘴。
+“荷荷！”阿Q忽而大叫起來，抬了頭倉皇的四顧，待到看見四兩燭，卻又倒頭睡去了。
+第二天他起得很遲，走出街上看時，樣樣都照舊。他也仍然肚餓，他想著，想不起什麼來；但他忽而似乎有了主意了，慢慢的跨開步，有意無意的走到靜修庵。
+庵和春天時節一樣靜，白的牆壁和漆黑的門。他想了一想，前去打門，一隻狗在裏面叫。他急急拾了幾塊斷磚，再上去較為用力的打，打到黑門上生出許多麻點的時候，纔聽得有人來開門。
+阿Q連忙捏好磚頭，擺開馬步，準備和黑狗來開戰。但庵門只開了一條縫，並無黑狗從中衝出，望進去只有一個老尼姑。
+“你又來什麼事？”伊大吃一驚的說。
+“革命了……你知道？……”阿Q說得很含糊。
+“革命革命，革過一革的，……你們要革得我們怎麼樣呢？”老尼姑兩眼通紅的說。
+“什麼？……”阿Q詫異了。
+“你不知道，他們已經來革過了！”
+“誰？……”阿Q更其詫異了。
+“那秀才和洋鬼子！”
+阿Q很出意外，不由的一錯愕；老尼姑見他失了銳氣，便飛速的關了門，阿Q再推時，牢不可開，再打時，沒有回答了。
+那還是上午的事。趙秀才消息靈，一知道革命黨已在夜間進城，便將辮子盤在頂上，一早去拜訪那歷來也不相能的錢洋鬼子。這是“咸與維新”的時候了，所以他們便談得很投機，立刻成了情投意合的同志，也相約去革命。他們想而又想，纔想出靜修庵裏有一塊“皇帝萬歲萬萬歲”的龍牌，是應該趕緊革掉的，於是又立刻同到庵裏去革命。因為老尼姑來阻擋，說了三句話，他們便將伊當作滿政府，在頭上很給了不少的棍子和栗鑿。尼姑待他們走後，定了神來檢點，龍牌固然已經碎在地上了，而且又不見了觀音娘娘座前的一個宣德爐。
+這事阿Q後來纔知道。他頗悔自己睡著，但也深怪他們不來招呼他。他又退一步想道：
+“難道他們還沒有知道我已經投降了革命黨麽？”
+第八章　不准革命[编辑]
+未莊的人心日見其安靜了。據傳來的消息，知道革命黨雖然進了城，倒還沒有什麼大異樣。知縣大老爺還是原官，不過改稱了什麼，而且舉人老爺也做了什麼——這些名目，未莊人都說不明白——官，帶兵的也還是先前的老把總。只有一件可怕的事是另有幾個不好的革命黨夾在裏面搗亂，第二天便動手剪辮子，聽說那鄰村的航船七斤便著了道兒，弄得不像人樣子了。但這卻還不算大恐怖，因為未莊人本來少上城，即使偶有想進城的，也就立刻變了計，碰不著這危險。阿Q本也想進城去尋他的老朋友，一得這消息，也只得作罷了。
+但未莊也不能說是無改革。幾天之後，將辮子盤在頂上的逐漸增加起來了，早經說過，最先自然是茂才公，其次便是趙司晨和趙白眼，後來是阿Q。倘在夏天，大家將辮子盤在頭頂上或者打一個結，本不算什麼稀奇事，但現在是暮秋，所以這“秋行夏令”的情形，在盤辮家不能不說是萬分的英斷，而在未莊也不能說無關於改革了。
+趙司晨腦後空蕩盪的走來，看見的人大嚷說，
+“豁，革命黨來了！”
+阿Q聽到了很羡慕。他雖然早知道秀才盤辮的大新聞，但總沒有想到自己可以照樣做，現在看見趙司晨也如此，纔有了學樣的意思，定下實行的決心。他用一支竹筷將辮子盤在頭頂上，遲疑多時，這纔放膽的走去。
+他在街上走，人也看他，然而不說什麼話，阿Q當初很不快，後來便很不平。他近來很容易鬧脾氣了；其實他的生活，倒也並不比造反之前反艱難，人見他也客氣，店鋪也不說要現錢。而阿Q總覺得自己太失意：既然革了命，不應該只是這樣的。況且有一回看見小D，愈使他氣破肚皮了。
+小D也將辮子盤在頭頂上了，而且也居然用一支竹筷。阿Q萬料不到他也敢這樣做，自己也決不准他這樣做！小D是什麼東西呢？他很想即刻揪住他，拗斷他的竹筷，放下他的辮子，並且批他幾個嘴巴，聊且懲罰他忘了生辰八字，也敢來做革命黨的罪。但他終於饒放了，單是怒目而視的吐一口唾沫道“呸！”
+這幾日裏，進城去的只有一個假洋鬼子。趙秀才本也想靠著寄存箱子的淵源，親身去拜訪舉人老爺的，但因為有剪辮的危險，所以也中止了。他寫了一封“黃傘格”的信，托假洋鬼子帶上城，而且托他給自己紹介紹介，去進自由黨。假洋鬼子回來時，向秀才討還了四塊洋錢，秀才便有一塊銀桃子掛在大襟上了；未莊人都驚服，說這是柿油黨的頂子，抵得一個翰林；趙太爺因此也驟然大闊，遠過於他兒子初雋秀才的時候，所以目空一切，見了阿Q，也就很有些不放在眼裏了。
+阿Q正在不平，又時時刻刻感著冷落，一聽得這銀桃子的傳說，他立即悟出自己之所以冷落的原因了：要革命，單說投降，是不行的；盤上辮子，也不行的；第一著仍然要和革命黨去結識。他生平所知道的革命黨只有兩個，城裏的一個早已“嚓”的殺掉了，現在只剩了一個假洋鬼子。他除卻趕緊去和假洋鬼子商量之外，再沒有別的道路了。
+錢府的大門正開著，阿Q便怯怯的躄進去。他一到裏面，很吃了驚，只見假洋鬼子正站在院子的中央，一身烏黑的大約是洋衣，身上也掛著一塊銀桃子，手裏是阿Q曾經領教過的棍子，已經留到一尺多長的辮子都拆開了披在肩背上，蓬頭散髮的像一個劉海仙。對面挺直的站著趙白眼和三個閑人，正在必恭必敬的聽說話。
+阿Q輕輕的走近了，站在趙白眼的背後，心裏想招呼，卻不知道怎麼說纔好：叫他假洋鬼子固然是不行的了，洋人也不妥，革命黨也不妥，或者就應該叫洋先生了罷。
+洋先生卻沒有見他，因為白著眼睛講得正起勁：
+“我是性急的，所以我們見面，我總是說：洪哥！我們動手罷！他卻總說道No！——這是洋話，你們不懂的。否則早已成功了。然而這正是他做事小心的地方。他再三再四的請我上湖北，我還沒有肯。誰願意在這小縣城裏做事情。……”
+“唔，……這個……”阿Q候他略停，終於用十二分的勇氣開口了，但不知道因為什麼，又並不叫他洋先生。
+聽著說話的四個人都吃驚的回顧他。洋先生也纔看見：
+“什麼？”
+“我……”
+“出去！”
+“我要投……”
+“滾出去！”洋先生揚起哭喪棒來了。
+趙白眼和閑人們便都吆喝道：“先生叫你滾出去，你還不聽麽！”
+阿Q將手向頭上一遮，不自覺的逃出門外；洋先生倒也沒有追。他快跑了六十多步，這纔慢慢的走，於是心裏便湧起了憂愁：洋先生不准他革命，他再沒有別的路；從此決不能望有白盔白甲的人來叫他，他所有的抱負，志向，希望，前程，全被一筆勾銷了。至於閑人們傳揚開去，給小D王胡等輩笑話，倒是還在其次的事。
+他似乎從來沒有經驗過這樣的無聊。他對於自己的盤辮子，仿佛也覺得無意味，要侮蔑；為報仇起見，很想立刻放下辮子來，但也沒有竟放。他遊到夜間，賒了兩碗酒，喝下肚去，漸漸的高興起來了，思想裏纔又出現白盔白甲的碎片。
+有一天，他照例的混到夜深，待酒店要關門，纔踱回土穀祠去。
+拍，吧～～！
+他忽而聽得一種異樣的聲音，又不是爆竹。阿Q本來是愛看熱鬧，愛管閑事的，便在暗中直尋過去。似乎前面有些腳步聲；他正聽，猛然間一個人從對面逃來了。阿Q一看見，便趕緊翻身跟著逃。那人轉彎，阿Q也轉彎，那人站住了，阿Q也站住。他看後面並無什麼，看那人便是小D。
+“什麼？”阿Q不平起來了。
+“趙……趙家遭搶了！”小D氣喘吁吁的說。
+阿Q的心怦怦的跳了。小D說了便走；阿Q卻逃而又停的兩三回。但他究竟是做過“這路生意”，格外膽大，於是躄出路角，仔細的聽，似乎有些嚷嚷，又仔細的看，似乎許多白盔白甲的人，絡繹的將箱子抬出了，器具抬出了，秀才娘子的寧式床也抬出了，但是不分明，他還想上前，兩隻腳卻沒有動。
+這一夜沒有月，未莊在黑暗裏很寂靜，寂靜到像羲皇時候一般太平。阿Q站著看到自己發煩，也似乎還是先前一樣，在那裏來來往往的搬，箱子抬出了，器具抬出了，秀才娘子的寧式床也抬出了，……抬得他自己有些不信他的眼睛了。但他決計不再上前，卻回到自己的祠裏去了。
+土穀祠裏更漆黑；他關好大門，摸進自己的屋子裏。他躺了好一會，這纔定了神，而且發出關於自己的思想來：白盔白甲的人明明到了，並不來打招呼，搬了許多好東西，又沒有自己的份，——這全是假洋鬼子可惡，不准我造反，否則，這次何至於沒有我的份呢？阿Q越想越氣，終於禁不住滿心痛恨起來，毒毒的點一點頭：“不准我造反，只准你造反？媽媽的假洋鬼子，——好，你造反！造反是殺頭的罪名呵，我總要告一狀，看你抓進縣裏去殺頭，——滿門抄斬，——嚓！嚓！”
+第九章　大團圓[编辑]
+趙家遭搶之後，未莊人大抵很快意而且恐慌，阿Q也很快意而且恐慌。但四天之後，阿Q在半夜裏忽被抓進縣城裏去了。那時恰是暗夜，一隊兵，一隊團丁，一隊員警，五個偵探，悄悄地到了未莊，乘昏暗圍住土穀祠，正對門架好機關槍；然而阿Q不衝出。許多時沒有動靜，把總焦急起來了，懸了二十千的賞，纔有兩個團丁冒了險，逾垣進去，裏應外合，一擁而入，將阿Q抓出來；直待擒出祠外面的機關槍左近，他纔有些清醒了。
+到進城，已經是正午，阿Q見自己被攙進一所破衙門，轉了五六個彎，便推在一間小屋裏。他剛剛一蹌踉，那用整株的木料做成的柵欄門便跟著他的腳跟闔上了，其餘的三面都是牆壁，仔細看時，屋角上還有兩個人。
+阿Q雖然有些忐忑，卻並不很苦悶，因為他那土穀祠裏的臥室，也並沒有比這間屋子更高明。那兩個也仿佛是鄉下人，漸漸和他兜搭起來了，一個說是舉人老爺要追他祖父欠下來的陳租，一個不知道為了什麼事。他們問阿Q，阿Q爽利的答道，“因為我想造反。”
+他下半天便又被抓出柵欄門去了，到得大堂，上面坐著一個滿頭剃得精光的老頭子。阿Q疑心他是和尚，但看見下麵站著一排兵，兩旁又站著十幾個長衫人物，也有滿頭剃得精光像這老頭子的，也有將一尺來長的頭髮披在背後像那假洋鬼子的，都是一臉橫肉，怒目而視的看他；他便知道這人一定有些來歷，膝關節立刻自然而然的寬鬆，便跪了下去了。
+“站著說！不要跪！”長衫人物都吆喝說。
+阿Q雖然似乎懂得，但總覺得站不住，身不由己的蹲了下去，而且終於趁勢改為跪下了。
+“奴隸性！……”長衫人物又鄙夷似的說，但也沒有叫他起來。
+“你從實招來罷，免得吃苦。我早都知道了。招了可以放你。”那光頭的老頭子看定了阿Q的臉，沉靜的清楚的說。
+“招罷！”長衫人物也大聲說。
+“我本來要……來投……”阿Q胡裏胡塗的想了一通，這纔斷斷續續的說。
+“那麼，為什麼不來的呢？”老頭子和氣的問。
+“假洋鬼子不准我！”
+“胡說此刻說，也遲了。現在你的同黨在那裏？”
+“什麼？……
+“那一晚打劫趙家的一夥人。”
+“他們沒有來叫我。他們自己搬走了。”阿Q提起來便憤憤。
+“走到那裏去了呢？說出來便放你了。”老頭子更和氣了。
+“我不知道，……他們沒有來叫我……”
+然而老頭子使了一個眼色，阿Q便又被抓進柵欄門裏了。他第二次抓出柵欄門，是第二天的上午。
+大堂的情形都照舊。上面仍然坐著光頭的老頭子，阿Q也仍然下了跪。
+老頭子和氣的問道，“你還有什麼話說麽？”
+阿Q一想，沒有話，便回答說，“沒有。”
+於是一個長衫人物拿了一張紙，並一支筆送到阿Q的面前，要將筆塞在他手裏。阿Q這時很吃驚，幾乎“魂飛魄散”了：因為他的手和筆相關，這回是初次。他正不知怎樣拿；那人卻又指著一處地方教他畫花押。
+“我……我……不認得字。”阿Q一把抓住了筆，惶恐而且慚愧的說。
+“那麼，便宜你，畫一個圓圈！”
+阿Q要畫圓圈了，那手捏著筆卻只是抖。於是那人替他將紙鋪在地上，阿Q伏下去，使盡了平生的力氣畫圓圈。他生怕被人笑話，立志要畫得圓，但這可惡的筆不但很沉重，並且不聽話，剛剛一抖一抖的幾乎要合縫，卻又向外一聳，畫成瓜子模樣了。
+阿Q正羞愧自己畫得不圓，那人卻不計較，早已掣了紙筆去，許多人又將他第二次抓進柵欄門。
+他第二次進了柵欄，倒也並不十分懊惱。他以為人生天地之間，大約本來有時要抓進抓出，有時要在紙上畫圓圈的，惟有圈而不圓，卻是他“行狀”上的一個汙點。但不多時也就釋然了，他想：孫子纔畫得很圓的圓圈呢。於是他睡著了。
+然而這一夜，舉人老爺反而不能睡：他和把總嘔了氣了。舉人老爺主張第一要追贓，把總主張第一要示眾。把總近來很不將舉人老爺放在眼裏了，拍案打凳的說道，“懲一儆百！你看，我做革命黨還不上二十天，搶案就是十幾件，全不破案，我的面子在那裏？破了案，你又來迂。不成！這是我管的！”舉人老爺窘急了，然而還堅持，說是倘若不追贓，他便立刻辭了幫辦民政的職務。而把總卻道，“請便罷！”於是舉人老爺在這一夜竟沒有睡，但幸第二天倒也沒有辭。
+阿Q第三次抓出柵欄門的時候，便是舉人老爺睡不著的那一夜的明天的上午了。他到了大堂，上面還坐著照例的光頭老頭子；阿Q也照例的下了跪。
+老頭子很和氣的問道，“你還有什麼話麽？”
+阿Q一想，沒有話，便回答說，“沒有。”
+許多長衫和短衫人物，忽然給他穿上一件洋布的白背心，上面有些黑字。阿Q很氣苦：因為這很像是帶孝，而帶孝是晦氣的。然而同時他的兩手反縛了，同時又被一直抓出衙門外去了。
+阿Q被抬上了一輛沒有蓬的車，幾個短衣人物也和他同坐在一處。這車立刻走動了，前面是一班背著洋炮的兵們和團丁，兩旁是許多張著嘴的看客，後面怎樣，阿Q沒有見。但他突然覺到了：這豈不是去殺頭麽？他一急，兩眼發黑，耳朵裏喤的一聲，似乎發昏了。然而他又沒有全發昏，有時雖然著急，有時卻也泰然；他意思之間，似乎覺得人生天地間，大約本來有時也未免要殺頭的。
+他還認得路，於是有些詫異了：怎麼不向著法場走呢？他不知道這是在遊街，在示眾。但即使知道也一樣，他不過便以為人生天地間，大約本來有時也未免要遊街要示眾罷了
+他省悟了，這是繞到法場去的路，這一定是“嚓”的去殺頭。他惘惘的向左右看，全跟著馬蟻似的人，而在無意中，卻在路旁的人叢中發見了一個吳媽。很久違，伊原來在城裏做工了。阿Q忽然很羞愧自己沒志氣：竟沒有唱幾句戲。他的思想仿佛旋風似的在腦裏一迴旋：《小孤孀上墳》欠堂皇，《龍虎鬥》裏的“悔不該……”也太乏，還是“手執鋼鞭將你打”罷。他同時想手一揚，纔記得這兩手原來都捆著，於是“手執鋼鞭”也不唱了。
+“過了二十年又是一個……”阿Q在百忙中，“無師自通”的說出半句從來不說的話。
+“好！！！”從人叢裏，便發出豺狼的嗥叫一般的聲音來。
+車子不住的前行，阿Q在喝采聲中，輪轉眼睛去看吳媽，似乎伊一向並沒有見他，卻只是出神的看著兵們背上的洋炮。
+阿Q於是再看那些喝采的人們
+這剎那中，他的思想又仿佛旋風似的在腦裏一迴旋了。四年之前，他曾在山腳下遇見一隻餓狼，永是不近不遠的跟定他，要吃他的肉。他那時嚇得幾乎要死，幸而手裏有一柄斫柴刀，纔得仗這壯了膽，支持到未莊；可是永遠記得那狼眼睛，又凶又怯，閃閃的像兩顆鬼火，似乎遠遠的來穿透了他的皮肉。而這回他又看見從來沒有見過的更可怕的眼睛了，又鈍又鋒利，不但已經咀嚼了他的話，並且還要咀嚼他皮肉以外的東西，永是不近不遠的跟他走。
+這些睛們似乎連成一氣，已經在那裏咬他的靈魂。
+“救命，……”
+然而阿Q沒有說。他早就兩眼發黑，耳朵裏嗡的一聲，覺得全身仿佛微塵似的迸散了。
+至於當時的影響，最大的倒反在舉人老爺，因為終於沒有追贓，他全家都號啕了。其次是趙府，非特秀才因為上城去報官，被不好的革命黨剪了辮子，而且又破費了二十千的賞錢，所以全家也號啕了。從這一天以來，他們便漸漸的都發生了遺老的氣味。
+至於輿論，在未莊是無異議，自然都說阿Q壞，被槍斃便是他的壞的證據：不壞又何至於被槍斃呢？而城裏的輿論卻不佳，他們多半不滿足，以為槍斃並無殺頭這般好看；而且那是怎樣的一個可笑的死囚呵，游了那麼久的街，竟沒有唱一句戲：他們白跟一趟了。
 EOT;
 
     protected static $encoding = 'UTF-8';
diff --git a/vendor/fzaninotto/faker/test/Faker/Calculator/IbanTest.php b/vendor/fzaninotto/faker/test/Faker/Calculator/IbanTest.php
index 12fe8e6d..197048e5 100644
--- a/vendor/fzaninotto/faker/test/Faker/Calculator/IbanTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Calculator/IbanTest.php
@@ -3,8 +3,9 @@
 namespace Faker\Test\Calculator;
 
 use Faker\Calculator\Iban;
+use PHPUnit\Framework\TestCase;
 
-class IbanTest extends \PHPUnit_Framework_TestCase
+class IbanTest extends TestCase
 {
 
     public function checksumProvider()
diff --git a/vendor/fzaninotto/faker/test/Faker/Calculator/InnTest.php b/vendor/fzaninotto/faker/test/Faker/Calculator/InnTest.php
index 4dfb8802..71d9193f 100644
--- a/vendor/fzaninotto/faker/test/Faker/Calculator/InnTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Calculator/InnTest.php
@@ -3,8 +3,9 @@
 namespace Faker\Test\Calculator;
 
 use Faker\Calculator\Inn;
+use PHPUnit\Framework\TestCase;
 
-class InnTest extends \PHPUnit_Framework_TestCase
+class InnTest extends TestCase
 {
 
     public function checksumProvider()
diff --git a/vendor/fzaninotto/faker/test/Faker/Calculator/LuhnTest.php b/vendor/fzaninotto/faker/test/Faker/Calculator/LuhnTest.php
index 9eb30b5d..2e814144 100644
--- a/vendor/fzaninotto/faker/test/Faker/Calculator/LuhnTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Calculator/LuhnTest.php
@@ -3,8 +3,9 @@
 namespace Faker\Test\Calculator;
 
 use Faker\Calculator\Luhn;
+use PHPUnit\Framework\TestCase;
 
-class LuhnTest extends \PHPUnit_Framework_TestCase
+class LuhnTest extends TestCase
 {
 
     public function checkDigitProvider()
diff --git a/vendor/fzaninotto/faker/test/Faker/Calculator/TCNoTest.php b/vendor/fzaninotto/faker/test/Faker/Calculator/TCNoTest.php
new file mode 100644
index 00000000..9e40d794
--- /dev/null
+++ b/vendor/fzaninotto/faker/test/Faker/Calculator/TCNoTest.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Faker\Test\Calculator;
+
+use Faker\Calculator\TCNo;
+use PHPUnit\Framework\TestCase;
+
+class TCNoTest extends TestCase
+{
+    public function checksumProvider()
+    {
+        return array(
+            array('553006348', '82'),
+            array('350630743', '78'),
+            array('550600932', '88'),
+            array('487932947', '70'),
+            array('168113862', '40')
+        );
+    }
+
+    /**
+     * @dataProvider checksumProvider
+     * @param $tcNo
+     * @param $checksum
+     */
+    public function testChecksum($tcNo, $checksum)
+    {
+        $this->assertEquals($checksum, TCNo::checksum($tcNo), $tcNo);
+    }
+
+    public function validatorProvider()
+    {
+        return array(
+            array('22978160678', true),
+            array('26480045324', true),
+            array('47278360658', true),
+            array('34285002510', true),
+            array('19874561012', true),
+
+            array('11111111111', false),
+            array('11234567899', false),
+        );
+    }
+
+    /**
+     * @dataProvider validatorProvider
+     * @param $tcNo
+     * @param $isValid
+     */
+    public function testIsValid($tcNo, $isValid)
+    {
+        $this->assertEquals($isValid, TCNo::isValid($tcNo), $tcNo);
+    }
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/DefaultGeneratorTest.php b/vendor/fzaninotto/faker/test/Faker/DefaultGeneratorTest.php
index 262243d1..fa9eb852 100644
--- a/vendor/fzaninotto/faker/test/Faker/DefaultGeneratorTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/DefaultGeneratorTest.php
@@ -3,20 +3,21 @@
 namespace Faker\Test;
 
 use Faker\DefaultGenerator;
+use PHPUnit\Framework\TestCase;
 
-class DefaultGeneratorTest extends \PHPUnit_Framework_TestCase
+class DefaultGeneratorTest extends TestCase
 {
     public function testGeneratorReturnsNullByDefault()
     {
         $generator = new DefaultGenerator;
-        $this->assertSame(null, $generator->value);
+        $this->assertNull($generator->value);
     }
 
     public function testGeneratorReturnsDefaultValueForAnyPropertyGet()
     {
         $generator = new DefaultGenerator(123);
         $this->assertSame(123, $generator->foo);
-        $this->assertNotSame(null, $generator->bar);
+        $this->assertNotNull($generator->bar);
     }
 
     public function testGeneratorReturnsDefaultValueForAnyMethodCall()
diff --git a/vendor/fzaninotto/faker/test/Faker/GeneratorTest.php b/vendor/fzaninotto/faker/test/Faker/GeneratorTest.php
index e437292a..f15df441 100644
--- a/vendor/fzaninotto/faker/test/Faker/GeneratorTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/GeneratorTest.php
@@ -3,8 +3,9 @@
 namespace Faker\Test;
 
 use Faker\Generator;
+use PHPUnit\Framework\TestCase;
 
-class GeneratorTest extends \PHPUnit_Framework_TestCase
+class GeneratorTest extends TestCase
 {
     public function testAddProviderGivesPriorityToNewlyAddedProvider()
     {
@@ -19,7 +20,7 @@ class GeneratorTest extends \PHPUnit_Framework_TestCase
         $generator = new Generator;
         $provider = new FooProvider();
         $generator->addProvider($provider);
-        $this->assertTrue(is_callable($generator->getFormatter('fooFormatter')));
+        $this->assertInternalType('callable', $generator->getFormatter('fooFormatter'));
     }
 
     public function testGetFormatterReturnsCorrectFormatter()
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/AddressTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/AddressTest.php
index 5a5f66d4..c7f1814c 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/AddressTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/AddressTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider;
 
 use Faker\Generator;
 use Faker\Provider\Address;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
     private $faker;
 
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/BarcodeTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/BarcodeTest.php
index 1373b2b5..16ca3cd8 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/BarcodeTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/BarcodeTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider;
 
 use Faker\Generator;
 use Faker\Provider\Barcode;
+use PHPUnit\Framework\TestCase;
 
-class BarcodeTest extends \PHPUnit_Framework_TestCase
+class BarcodeTest extends TestCase
 {
     private $faker;
 
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/BaseTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/BaseTest.php
index 313b0021..e619d5be 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/BaseTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/BaseTest.php
@@ -3,33 +3,35 @@
 namespace Faker\Test\Provider;
 
 use Faker\Provider\Base as BaseProvider;
+use PHPUnit\Framework\TestCase;
+use Traversable;
 
-class BaseTest extends \PHPUnit_Framework_TestCase
+class BaseTest extends TestCase
 {
     public function testRandomDigitReturnsInteger()
     {
-        $this->assertTrue(is_integer(BaseProvider::randomDigit()));
+        $this->assertInternalType('integer', BaseProvider::randomDigit());
     }
 
     public function testRandomDigitReturnsDigit()
     {
-        $this->assertTrue(BaseProvider::randomDigit() >= 0);
-        $this->assertTrue(BaseProvider::randomDigit() < 10);
+        $this->assertGreaterThanOrEqual(0, BaseProvider::randomDigit());
+        $this->assertLessThan(10, BaseProvider::randomDigit());
     }
 
     public function testRandomDigitNotNullReturnsNotNullDigit()
     {
-        $this->assertTrue(BaseProvider::randomDigitNotNull() > 0);
-        $this->assertTrue(BaseProvider::randomDigitNotNull() < 10);
+        $this->assertGreaterThan(0, BaseProvider::randomDigitNotNull());
+        $this->assertLessThan(10, BaseProvider::randomDigitNotNull());
     }
 
 
     public function testRandomDigitNotReturnsValidDigit()
     {
         for ($i = 0; $i <= 9; $i++) {
-            $this->assertTrue(BaseProvider::randomDigitNot($i) >= 0);
-            $this->assertTrue(BaseProvider::randomDigitNot($i) < 10);
-            $this->assertTrue(BaseProvider::randomDigitNot($i) !== $i);
+            $this->assertGreaterThanOrEqual(0, BaseProvider::randomDigitNot($i));
+            $this->assertLessThan(10, BaseProvider::randomDigitNot($i));
+            $this->assertNotSame(BaseProvider::randomDigitNot($i), $i);
         }
     }
 
@@ -51,14 +53,14 @@ class BaseTest extends \PHPUnit_Framework_TestCase
 
     public function testRandomNumberReturnsInteger()
     {
-        $this->assertTrue(is_integer(BaseProvider::randomNumber()));
-        $this->assertTrue(is_integer(BaseProvider::randomNumber(5, false)));
+        $this->assertInternalType('integer', BaseProvider::randomNumber());
+        $this->assertInternalType('integer', BaseProvider::randomNumber(5, false));
     }
 
     public function testRandomNumberReturnsDigit()
     {
-        $this->assertTrue(BaseProvider::randomNumber(3) >= 0);
-        $this->assertTrue(BaseProvider::randomNumber(3) < 1000);
+        $this->assertGreaterThanOrEqual(0, BaseProvider::randomNumber(3));
+        $this->assertLessThan(1000, BaseProvider::randomNumber(3));
     }
 
     public function testRandomNumberAcceptsStrictParamToEnforceNumberSize()
@@ -98,7 +100,7 @@ class BaseTest extends \PHPUnit_Framework_TestCase
 
     public function testRandomLetterReturnsString()
     {
-        $this->assertTrue(is_string(BaseProvider::randomLetter()));
+        $this->assertInternalType('string', BaseProvider::randomLetter());
     }
 
     public function testRandomLetterReturnsSingleLetter()
@@ -109,12 +111,12 @@ class BaseTest extends \PHPUnit_Framework_TestCase
     public function testRandomLetterReturnsLowercaseLetter()
     {
         $lowercaseLetters = 'abcdefghijklmnopqrstuvwxyz';
-        $this->assertTrue(strpos($lowercaseLetters, BaseProvider::randomLetter()) !== false);
+        $this->assertNotFalse(strpos($lowercaseLetters, BaseProvider::randomLetter()));
     }
 
     public function testRandomAsciiReturnsString()
     {
-        $this->assertTrue(is_string(BaseProvider::randomAscii()));
+        $this->assertInternalType('string', BaseProvider::randomAscii());
     }
 
     public function testRandomAsciiReturnsSingleCharacter()
@@ -125,7 +127,7 @@ class BaseTest extends \PHPUnit_Framework_TestCase
     public function testRandomAsciiReturnsAsciiCharacter()
     {
         $lowercaseLetters = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
-        $this->assertTrue(strpos($lowercaseLetters, BaseProvider::randomAscii()) !== false);
+        $this->assertNotFalse(strpos($lowercaseLetters, BaseProvider::randomAscii()));
     }
 
     public function testRandomElementReturnsNullWhenArrayEmpty()
@@ -133,6 +135,11 @@ class BaseTest extends \PHPUnit_Framework_TestCase
         $this->assertNull(BaseProvider::randomElement(array()));
     }
 
+    public function testRandomElementReturnsNullWhenCollectionEmpty()
+    {
+        $this->assertNull(BaseProvider::randomElement(new Collection(array())));
+    }
+
     public function testRandomElementReturnsElementFromArray()
     {
         $elements = array('23', 'e', 32, '#');
@@ -145,6 +152,12 @@ class BaseTest extends \PHPUnit_Framework_TestCase
         $this->assertContains(BaseProvider::randomElement($elements), $elements);
     }
 
+    public function testRandomElementReturnsElementFromCollection()
+    {
+        $collection = new Collection(array('one', 'two', 'three'));
+        $this->assertContains(BaseProvider::randomElement($collection), $collection);
+    }
+
     public function testShuffleReturnsStringWhenPassedAStringArgument()
     {
         $this->assertInternalType('string', BaseProvider::shuffle('foo'));
@@ -553,3 +566,7 @@ class BaseTest extends \PHPUnit_Framework_TestCase
         $this->assertContainsOnly('string', $allowDuplicates);
     }
 }
+
+class Collection extends \ArrayObject
+{
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/BiasedTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/BiasedTest.php
index 1f7a99ac..cce3dc0a 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/BiasedTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/BiasedTest.php
@@ -3,14 +3,15 @@ namespace Faker\Test\Provider;
 
 use Faker\Provider\Biased;
 use Faker\Generator;
+use PHPUnit\Framework\TestCase;
 
-class BiasedTest extends \PHPUnit_Framework_TestCase
+class BiasedTest extends TestCase
 {
     const MAX = 10;
     const NUMBERS = 25000;
     protected $generator;
     protected $results = array();
-    
+
     protected function setUp()
     {
         $this->generator = new Generator();
@@ -18,14 +19,14 @@ class BiasedTest extends \PHPUnit_Framework_TestCase
 
         $this->results = array_fill(1, self::MAX, 0);
     }
-    
+
     public function performFake($function)
     {
         for($i = 0; $i < self::NUMBERS; $i++) {
             $this->results[$this->generator->biasedNumberBetween(1, self::MAX, $function)]++;
         }
     }
-    
+
     public function testUnbiased()
     {
         $this->performFake(array('\Faker\Provider\Biased', 'unbiased'));
@@ -40,7 +41,7 @@ class BiasedTest extends \PHPUnit_Framework_TestCase
             $this->assertLessThan(self::NUMBERS * $assumed * 1.05, $amount, "Value was more than 5 percent over the expected value");
         }
     }
-    
+
     public function testLinearHigh()
     {
         $this->performFake(array('\Faker\Provider\Biased', 'linearHigh'));
@@ -54,7 +55,7 @@ class BiasedTest extends \PHPUnit_Framework_TestCase
             $this->assertLessThan(self::NUMBERS * $assumed * 1.1, $amount, "Value was more than 10 percent over the expected value");
         }
     }
-    
+
     public function testLinearLow()
     {
         $this->performFake(array('\Faker\Provider\Biased', 'linearLow'));
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/ColorTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/ColorTest.php
index f73831b1..ff5edac2 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/ColorTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/ColorTest.php
@@ -3,8 +3,9 @@
 namespace Faker\Test\Provider;
 
 use Faker\Provider\Color;
+use PHPUnit\Framework\TestCase;
 
-class ColorTest extends \PHPUnit_Framework_TestCase
+class ColorTest extends TestCase
 {
 
     public function testHexColor()
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/CompanyTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/CompanyTest.php
index ac26c5a0..28ce0eb4 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/CompanyTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/CompanyTest.php
@@ -5,8 +5,9 @@ namespace Faker\Test\Provider;
 use Faker\Generator;
 use Faker\Provider\Company;
 use Faker\Provider\Lorem;
+use PHPUnit\Framework\TestCase;
 
-class CompanyTest extends \PHPUnit_Framework_TestCase
+class CompanyTest extends TestCase
 {
     /**
      * @var Generator
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/DateTimeTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/DateTimeTest.php
index 91b17f81..ec3ad867 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/DateTimeTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/DateTimeTest.php
@@ -3,27 +3,77 @@
 namespace Faker\Test\Provider;
 
 use Faker\Provider\DateTime as DateTimeProvider;
+use PHPUnit\Framework\TestCase;
 
-class DateTimeTest extends \PHPUnit_Framework_TestCase
+class DateTimeTest extends TestCase
 {
     public function setUp()
     {
-        $this->originalTz = date_default_timezone_get();
         $this->defaultTz = 'UTC';
-        date_default_timezone_set($this->defaultTz);
+        DateTimeProvider::setDefaultTimezone($this->defaultTz);
     }
 
     public function tearDown()
     {
-        date_default_timezone_set($this->originalTz);
+        DateTimeProvider::setDefaultTimezone();
+    }
+
+    public function testPreferDefaultTimezoneOverSystemTimezone()
+    {
+        /**
+         * Set the system timezone to something *other* than the timezone used
+         * in setUp().
+         */
+        $originalSystemTimezone = date_default_timezone_get();
+        $systemTimezone = 'Antarctica/Vostok';
+        date_default_timezone_set($systemTimezone);
+
+        /**
+         * Get a new date/time value and assert that it prefers the default
+         * timezone over the system timezone.
+         */
+        $date = DateTimeProvider::dateTime();
+        $this->assertNotSame($systemTimezone, $date->getTimezone()->getName());
+        $this->assertSame($this->defaultTz, $date->getTimezone()->getName());
+
+        /**
+         * Restore the system timezone.
+         */
+        date_default_timezone_set($originalSystemTimezone);
+    }
+
+    public function testUseSystemTimezoneWhenDefaultTimezoneIsNotSet()
+    {
+        /**
+         * Set the system timezone to something *other* than the timezone used
+         * in setUp() *and* reset the default timezone.
+         */
+        $originalSystemTimezone = date_default_timezone_get();
+        $originalDefaultTimezone = DateTimeProvider::getDefaultTimezone();
+        $systemTimezone = 'Antarctica/Vostok';
+        date_default_timezone_set($systemTimezone);
+        DateTimeProvider::setDefaultTimezone();
+
+        /**
+         * Get a new date/time value and assert that it uses the system timezone
+         * and not the system timezone.
+         */
+        $date = DateTimeProvider::dateTime();
+        $this->assertSame($systemTimezone, $date->getTimezone()->getName());
+        $this->assertNotSame($this->defaultTz, $date->getTimezone()->getName());
+
+        /**
+         * Restore the system timezone.
+         */
+        date_default_timezone_set($originalSystemTimezone);
     }
 
     public function testUnixTime()
     {
         $timestamp = DateTimeProvider::unixTime();
         $this->assertInternalType('int', $timestamp);
-        $this->assertTrue($timestamp >= 0);
-        $this->assertTrue($timestamp <= time());
+        $this->assertGreaterThanOrEqual(0, $timestamp);
+        $this->assertLessThanOrEqual(time(), $timestamp);
     }
 
     public function testDateTime()
@@ -186,7 +236,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
 
     public function testFixedSeedWithMaximumTimestamp()
     {
-        $max = '2018-03-01 12:00:00';
+        $max = '2118-03-01 12:00:00';
 
         mt_srand(1);
         $unixTime = DateTimeProvider::unixTime($max);
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/HtmlLoremTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/HtmlLoremTest.php
index f40e0a28..f7814faf 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/HtmlLoremTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/HtmlLoremTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider;
 
 use Faker\Generator;
 use Faker\Provider\HtmlLorem;
+use PHPUnit\Framework\TestCase;
 
-class HtmlLoremTest extends \PHPUnit_Framework_TestCase
+class HtmlLoremTest extends TestCase
 {
 
     public function testProvider()
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/ImageTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/ImageTest.php
index 12109d19..c73992ce 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/ImageTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/ImageTest.php
@@ -3,8 +3,9 @@
 namespace Faker\Test\Provider;
 
 use Faker\Provider\Image;
+use PHPUnit\Framework\TestCase;
 
-class ImageTest extends \PHPUnit_Framework_TestCase
+class ImageTest extends TestCase
 {
     public function testImageUrlUses640x680AsTheDefaultSize()
     {
@@ -45,7 +46,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
 
     public function testDownloadWithDefaults()
     {
-        $url = "http://www.lorempixel.com/";
+        $url = "http://lorempixel.com/";
         $curlPing = curl_init($url);
         curl_setopt($curlPing, CURLOPT_TIMEOUT, 5);
         curl_setopt($curlPing, CURLOPT_CONNECTTIMEOUT, 5);
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/InternetTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/InternetTest.php
index 11ad2c6e..93fe7b48 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/InternetTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/InternetTest.php
@@ -7,8 +7,9 @@ use Faker\Provider\Company;
 use Faker\Provider\Internet;
 use Faker\Provider\Lorem;
 use Faker\Provider\Person;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
     /**
      * @var Generator
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/LocalizationTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/LocalizationTest.php
index 347b1351..6cfcc891 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/LocalizationTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/LocalizationTest.php
@@ -3,8 +3,9 @@
 namespace Faker\Test\Provider;
 
 use Faker\Factory;
+use PHPUnit\Framework\TestCase;
 
-class LocalizationTest extends \PHPUnit_Framework_TestCase
+class LocalizationTest extends TestCase
 {
     public function testLocalizedNameProvidersDoNotThrowErrors()
     {
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/LoremTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/LoremTest.php
index 62785d43..16d98891 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/LoremTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/LoremTest.php
@@ -3,8 +3,9 @@
 namespace Faker\Test\Provider;
 
 use Faker\Provider\Lorem;
+use PHPUnit\Framework\TestCase;
 
-class LoremTest extends \PHPUnit_Framework_TestCase
+class LoremTest extends TestCase
 {
     /**
      * @expectedException \InvalidArgumentException
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/MiscellaneousTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/MiscellaneousTest.php
index 8e39eb2c..6a29cd55 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/MiscellaneousTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/MiscellaneousTest.php
@@ -3,8 +3,9 @@
 namespace Faker\Test\Provider;
 
 use Faker\Provider\Miscellaneous;
+use PHPUnit\Framework\TestCase;
 
-class MiscellaneousTest extends \PHPUnit_Framework_TestCase
+class MiscellaneousTest extends TestCase
 {
     public function testBoolean()
     {
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/PaymentTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/PaymentTest.php
index 773b7227..966b9d63 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/PaymentTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/PaymentTest.php
@@ -9,8 +9,9 @@ use Faker\Provider\Base as BaseProvider;
 use Faker\Provider\DateTime as DateTimeProvider;
 use Faker\Provider\Payment as PaymentProvider;
 use Faker\Provider\Person as PersonProvider;
+use PHPUnit\Framework\TestCase;
 
-class PaymentTest extends \PHPUnit_Framework_TestCase
+class PaymentTest extends TestCase
 {
     private $faker;
 
@@ -47,14 +48,15 @@ class PaymentTest extends \PHPUnit_Framework_TestCase
 
     public function testCreditCardTypeReturnsValidVendorName()
     {
-        $this->assertTrue(in_array($this->faker->creditCardType, array('Visa', 'MasterCard', 'American Express', 'Discover Card')));
+        $this->assertContains($this->faker->creditCardType, array('Visa', 'Visa Retired', 'MasterCard', 'American Express', 'Discover Card'));
     }
 
     public function creditCardNumberProvider()
     {
         return array(
             array('Discover Card', '/^6011\d{12}$/'),
-            array('Visa', '/^4\d{12,15}$/'),
+            array('Visa', '/^4\d{15}$/'),
+            array('Visa Retired', '/^4\d{12}$/'),
             array('MasterCard', '/^(5[1-5]|2[2-7])\d{14}$/')
         );
     }
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/PersonTest.php
index a8d1c0f2..f53076f7 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/PersonTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/PersonTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider;
 
 use Faker\Provider\Person;
 use Faker\Generator;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     /**
      * @dataProvider firstNameProvider
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/PhoneNumberTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/PhoneNumberTest.php
index f73bda88..520ecea3 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/PhoneNumberTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/PhoneNumberTest.php
@@ -5,8 +5,9 @@ namespace Faker\Test\Provider;
 use Faker\Generator;
 use Faker\Calculator\Luhn;
 use Faker\Provider\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/ProviderOverrideTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/ProviderOverrideTest.php
index 7fa046ba..61d7d63a 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/ProviderOverrideTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/ProviderOverrideTest.php
@@ -6,6 +6,7 @@
 namespace Faker\Test\Provider;
 
 use Faker;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class ProviderOverrideTest
@@ -16,7 +17,7 @@ use Faker;
  * locale specific provider (can) has specific implementations. The goal of this test is to test the common denominator
  * and to try to catch possible invalid multi-byte sequences.
  */
-class ProviderOverrideTest extends \PHPUnit_Framework_TestCase
+class ProviderOverrideTest extends TestCase
 {
     /**
      * Constants with regular expression patterns for testing the output.
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/TextTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/TextTest.php
index 3baf49f3..a43d8d43 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/TextTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/TextTest.php
@@ -3,8 +3,9 @@ namespace Faker\Test\Provider;
 
 use Faker\Provider\en_US\Text;
 use Faker\Generator;
+use PHPUnit\Framework\TestCase;
 
-class TextTest extends \PHPUnit_Framework_TestCase
+class TextTest extends TestCase
 {
     public function testTextMaxLength()
     {
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/UserAgentTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/UserAgentTest.php
index b45b9f86..5ba2459c 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/UserAgentTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/UserAgentTest.php
@@ -3,8 +3,9 @@
 namespace Faker\Test\Provider;
 
 use Faker\Provider\UserAgent;
+use PHPUnit\Framework\TestCase;
 
-class UserAgentTest extends \PHPUnit_Framework_TestCase
+class UserAgentTest extends TestCase
 {
     public function testRandomUserAgent()
     {
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/UuidTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/UuidTest.php
index 22f9efb7..5c639cac 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/UuidTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/UuidTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider;
 
 use Faker\Generator;
 use Faker\Provider\Uuid as BaseProvider;
+use PHPUnit\Framework\TestCase;
 
-class UuidTest extends \PHPUnit_Framework_TestCase
+class UuidTest extends TestCase
 {
     public function testUuidReturnsUuid()
     {
@@ -15,6 +16,9 @@ class UuidTest extends \PHPUnit_Framework_TestCase
 
     public function testUuidExpectedSeed()
     {
+        if (pack('L', 0x6162797A) == pack('N', 0x6162797A)) {
+            $this->markTestSkipped('Big Endian');
+        }
         $faker = new Generator();
         $faker->seed(123);
         $this->assertEquals("8e2e0c84-50dd-367c-9e66-f3ab455c78d6", BaseProvider::uuid());
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/ar_JO/InternetTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/ar_JO/InternetTest.php
index d323f1e7..33d70c43 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/ar_JO/InternetTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/ar_JO/InternetTest.php
@@ -6,8 +6,9 @@ use Faker\Generator;
 use Faker\Provider\fi_FI\Person;
 use Faker\Provider\fi_FI\Internet;
 use Faker\Provider\fi_FI\Company;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/ar_SA/InternetTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/ar_SA/InternetTest.php
index 3765a107..8059f000 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/ar_SA/InternetTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/ar_SA/InternetTest.php
@@ -6,8 +6,9 @@ use Faker\Generator;
 use Faker\Provider\ar_SA\Person;
 use Faker\Provider\ar_SA\Internet;
 use Faker\Provider\ar_SA\Company;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/at_AT/PaymentTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/at_AT/PaymentTest.php
index afc8c27b..f62dae81 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/at_AT/PaymentTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/at_AT/PaymentTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\at_AT;
 
 use Faker\Generator;
 use Faker\Provider\at_AT\Payment;
+use PHPUnit\Framework\TestCase;
 
-class PaymentTest extends \PHPUnit_Framework_TestCase
+class PaymentTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/bg_BG/PaymentTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/bg_BG/PaymentTest.php
index 31c6325c..b5645f9b 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/bg_BG/PaymentTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/bg_BG/PaymentTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\bg_BG;
 
 use Faker\Generator;
 use Faker\Provider\bg_BG\Payment;
+use PHPUnit\Framework\TestCase;
 
-class PaymentTest extends \PHPUnit_Framework_TestCase
+class PaymentTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/bn_BD/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/bn_BD/PersonTest.php
index 606599ff..e82fe8b7 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/bn_BD/PersonTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/bn_BD/PersonTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\bn_BD;
 
 use Faker\Generator;
 use Faker\Provider\bn_BD\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     public function setUp()
     {
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/cs_CZ/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/cs_CZ/PersonTest.php
index 40023cfe..0b198725 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/cs_CZ/PersonTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/cs_CZ/PersonTest.php
@@ -5,8 +5,9 @@ namespace Faker\Test\Provider\cs_CZ;
 use Faker\Generator;
 use Faker\Provider\cs_CZ\Person;
 use Faker\Provider\Miscellaneous;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     public function testBirthNumber()
     {
@@ -14,7 +15,7 @@ class PersonTest extends \PHPUnit_Framework_TestCase
         $faker->addProvider(new Person($faker));
         $faker->addProvider(new Miscellaneous($faker));
 
-        for ($i = 0; $i < 1000; $i++) { 
+        for ($i = 0; $i < 1000; $i++) {
             $birthNumber = $faker->birthNumber();
             $birthNumber = str_replace('/', '', $birthNumber);
 
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/da_DK/InternetTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/da_DK/InternetTest.php
index ddbdd7af..43c09be4 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/da_DK/InternetTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/da_DK/InternetTest.php
@@ -6,8 +6,9 @@ use Faker\Generator;
 use Faker\Provider\da_DK\Person;
 use Faker\Provider\da_DK\Internet;
 use Faker\Provider\da_DK\Company;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/de_AT/InternetTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/de_AT/InternetTest.php
index 91ce5ca5..1d778eea 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/de_AT/InternetTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/de_AT/InternetTest.php
@@ -6,8 +6,9 @@ use Faker\Generator;
 use Faker\Provider\de_AT\Person;
 use Faker\Provider\de_AT\Internet;
 use Faker\Provider\de_AT\Company;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/de_AT/PhoneNumberTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/de_AT/PhoneNumberTest.php
index 2d61ad5e..7cc6e6b1 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/de_AT/PhoneNumberTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/de_AT/PhoneNumberTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\de_AT;
 
 use Faker\Generator;
 use Faker\Provider\de_AT\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/de_CH/AddressTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/de_CH/AddressTest.php
index 2f2de276..668f2117 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/de_CH/AddressTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/de_CH/AddressTest.php
@@ -5,8 +5,9 @@ namespace Faker\Test\Provider\de_CH;
 use Faker\Generator;
 use Faker\Provider\de_CH\Address;
 use Faker\Provider\de_CH\Person;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/de_CH/InternetTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/de_CH/InternetTest.php
index 907af210..31dcc552 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/de_CH/InternetTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/de_CH/InternetTest.php
@@ -6,8 +6,9 @@ use Faker\Generator;
 use Faker\Provider\de_CH\Person;
 use Faker\Provider\de_CH\Internet;
 use Faker\Provider\de_CH\Company;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/de_CH/PhoneNumberTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/de_CH/PhoneNumberTest.php
index 0c5f9379..5102297c 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/de_CH/PhoneNumberTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/de_CH/PhoneNumberTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\de_CH;
 
 use Faker\Generator;
 use Faker\Provider\de_CH\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/de_DE/InternetTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/de_DE/InternetTest.php
index 8d39ff08..a15f3664 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/de_DE/InternetTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/de_DE/InternetTest.php
@@ -6,8 +6,9 @@ use Faker\Generator;
 use Faker\Provider\de_DE\Person;
 use Faker\Provider\de_DE\Internet;
 use Faker\Provider\de_DE\Company;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/el_GR/TextTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/el_GR/TextTest.php
new file mode 100644
index 00000000..3f03dd3a
--- /dev/null
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/el_GR/TextTest.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Faker\Test\Provider\el_GR;
+
+use PHPUnit\Framework\TestCase;
+
+class TextTest extends TestCase
+{
+    private $textClass;
+
+    public function setUp()
+    {
+        $this->textClass = new \ReflectionClass('Faker\Provider\el_GR\Text');
+    }
+
+    protected function getMethod($name) {
+        $method = $this->textClass->getMethod($name);
+
+        $method->setAccessible(true);
+
+        return $method;
+    }
+
+    /** @test */
+    function testItShouldAppendEndPunctToTheEndOfString()
+    {
+        $this->assertSame(
+            'Και δεν άκουσες το κλοπακλόπ, κλοπακλόπ, κλοπακλόπ.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('Και δεν άκουσες το κλοπακλόπ, κλοπακλόπ, κλοπακλόπ '))
+        );
+
+        $this->assertSame(
+            'Και δεν άκουσες το κλοπακλόπ, κλοπακλόπ, κλοπακλόπ.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('Και δεν άκουσες το κλοπακλόπ, κλοπακλόπ, κλοπακλόπ—'))
+        );
+
+        $this->assertSame(
+            'Και δεν άκουσες το κλοπακλόπ, κλοπακλόπ, κλοπακλόπ.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('Και δεν άκουσες το κλοπακλόπ, κλοπακλόπ, κλοπακλόπ,'))
+        );
+
+        $this->assertSame(
+            'Και δεν άκουσες το κλοπακλόπ, κλοπακλόπ, κλοπακλόπ!.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('Και δεν άκουσες το κλοπακλόπ, κλοπακλόπ, κλοπακλόπ! '))
+        );
+
+        $this->assertSame(
+            'Και δεν άκουσες το κλοπακλόπ, κλοπακλόπ, κλοπακλόπ.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('Και δεν άκουσες το κλοπακλόπ, κλοπακλόπ, κλοπακλόπ; '))
+        );
+
+        $this->assertSame(
+            'Και δεν άκουσες το κλοπακλόπ, κλοπακλόπ, κλοπακλόπ.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('Και δεν άκουσες το κλοπακλόπ, κλοπακλόπ, κλοπακλόπ: '))
+        );
+    }
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/en_AU/AddressTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/en_AU/AddressTest.php
index ef8e9f2e..b2f72e8b 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/en_AU/AddressTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/en_AU/AddressTest.php
@@ -4,8 +4,9 @@ namespace Faker\Provider\en_AU;
 
 use Faker\Generator;
 use Faker\Provider\en_AU\Address;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
 
   /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/en_CA/AddressTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/en_CA/AddressTest.php
index fb17c09f..6b1ece72 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/en_CA/AddressTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/en_CA/AddressTest.php
@@ -4,8 +4,9 @@ namespace Faker\Provider\en_CA;
 
 use Faker\Generator;
 use Faker\Provider\en_CA\Address;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
 
   /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/en_GB/AddressTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/en_GB/AddressTest.php
index 0bad562e..762e11a8 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/en_GB/AddressTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/en_GB/AddressTest.php
@@ -3,8 +3,9 @@
 namespace Faker\Provider\en_GB;
 
 use Faker\Generator;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/en_IN/AddressTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/en_IN/AddressTest.php
index a5e965b2..125cbdf0 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/en_IN/AddressTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/en_IN/AddressTest.php
@@ -4,8 +4,9 @@ namespace Faker\Provider\en_IN;
 
 use Faker\Generator;
 use Faker\Provider\en_IN\Address;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
 
   /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/en_NG/AddressTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/en_NG/AddressTest.php
index 912de541..27c591b7 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/en_NG/AddressTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/en_NG/AddressTest.php
@@ -4,8 +4,9 @@ namespace Faker\Provider\ng_NG;
 
 use Faker\Generator;
 use Faker\Provider\en_NG\Address;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
 
     /**
@@ -53,4 +54,4 @@ class AddressTest extends \PHPUnit_Framework_TestCase
         $this->assertInternalType('string', $region);
     }
 
-}
\ No newline at end of file
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/en_NG/InternetTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/en_NG/InternetTest.php
index fd1a0e76..6ebc620f 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/en_NG/InternetTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/en_NG/InternetTest.php
@@ -5,8 +5,9 @@ namespace Faker\Test\Provider\ng_NG;
 use Faker\Generator;
 use Faker\Provider\en_NG\Person;
 use Faker\Provider\en_NG\Internet;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/en_NG/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/en_NG/PersonTest.php
index 50760a43..2180e36e 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/en_NG/PersonTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/en_NG/PersonTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\ng_NG;
 
 use Faker\Generator;
 use Faker\Provider\en_NG\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
      /**
      * @var Generator
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/en_NG/PhoneNumberTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/en_NG/PhoneNumberTest.php
index a8997e6c..c591b8ab 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/en_NG/PhoneNumberTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/en_NG/PhoneNumberTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\ng_NG;
 
 use Faker\Generator;
 use Faker\Provider\en_NG\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
     public function setUp()
     {
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/en_NZ/PhoneNumberTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/en_NZ/PhoneNumberTest.php
index f8a8f6cf..14b145c7 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/en_NZ/PhoneNumberTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/en_NZ/PhoneNumberTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\en_NZ;
 
 use Faker\Generator;
 use Faker\Provider\en_NZ\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/en_PH/AddressTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/en_PH/AddressTest.php
index d3b4682b..19367a49 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/en_PH/AddressTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/en_PH/AddressTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\en_PH;
 
 use Faker\Generator;
 use Faker\Provider\en_PH\Address;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/en_SG/AddressTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/en_SG/AddressTest.php
index a62e1c6d..abc62aac 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/en_SG/AddressTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/en_SG/AddressTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\en_SG;
 
 use Faker\Factory;
 use Faker\Provider\en_SG\Address;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
     public function setUp()
     {
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/en_SG/PhoneNumberTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/en_SG/PhoneNumberTest.php
index 9b72d14a..c8bb13f8 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/en_SG/PhoneNumberTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/en_SG/PhoneNumberTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\en_SG;
 
 use Faker\Factory;
 use Faker\Provider\en_SG\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
     private $faker;
 
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/en_UG/AddressTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/en_UG/AddressTest.php
index 484b125b..571d93fb 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/en_UG/AddressTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/en_UG/AddressTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\en_UG;
 
 use Faker\Generator;
 use Faker\Provider\en_UG\Address;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
 
 /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/en_US/CompanyTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/en_US/CompanyTest.php
new file mode 100644
index 00000000..735d8339
--- /dev/null
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/en_US/CompanyTest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Faker\Test\Provider\en_US;
+
+use Faker\Provider\en_US\Company;
+use Faker\Generator;
+
+class CompanyTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * @var Generator
+     */
+    private $faker;
+
+    public function setUp()
+    {
+        $faker = new Generator();
+        $faker->addProvider(new Company($faker));
+        $this->faker = $faker;
+    }
+
+    /**
+     * @link https://stackoverflow.com/questions/4242433/regex-for-ein-number-and-ssn-number-format-in-jquery/35471665#35471665
+     */
+    public function testEin()
+    {
+        $number = $this->faker->ein;
+
+        // should be in the format ##-#######, with a valid prefix
+        $this->assertRegExp('/^(0[1-6]||1[0-6]|2[0-7]|[35]\d|[468][0-8]|7[1-7]|9[0-58-9])-\d{7}$/', $number);
+    }
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/en_US/PaymentTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/en_US/PaymentTest.php
index d17593fe..ec82691b 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/en_US/PaymentTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/en_US/PaymentTest.php
@@ -4,8 +4,9 @@
 namespace Faker\Provider\en_US;
 
 use Faker\Generator;
+use PHPUnit\Framework\TestCase;
 
-class PaymentTest extends \PHPUnit_Framework_TestCase
+class PaymentTest extends TestCase
 {
     /**
      * @var Generator
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/en_US/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/en_US/PersonTest.php
index 544a7b38..3ddb38b2 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/en_US/PersonTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/en_US/PersonTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\en_US;
 
 use Faker\Provider\en_US\Person;
 use Faker\Generator;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/en_US/PhoneNumberTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/en_US/PhoneNumberTest.php
index ae2951a5..a54ff882 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/en_US/PhoneNumberTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/en_US/PhoneNumberTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\en_US;
 
 use Faker\Generator;
 use Faker\Provider\en_US\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/en_ZA/CompanyTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/en_ZA/CompanyTest.php
index 678a3886..0e51d492 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/en_ZA/CompanyTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/en_ZA/CompanyTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\en_ZA;
 
 use Faker\Generator;
 use Faker\Provider\en_ZA\Company;
+use PHPUnit\Framework\TestCase;
 
-class CompanyTest extends \PHPUnit_Framework_TestCase
+class CompanyTest extends TestCase
 {
     private $faker;
 
@@ -23,4 +24,4 @@ class CompanyTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(14, strlen($companyRegNo));
         $this->assertRegExp('#^\d{4}/\d{6}/\d{2}$#', $companyRegNo);
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/en_ZA/InternetTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/en_ZA/InternetTest.php
index 7edd63f9..02c29404 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/en_ZA/InternetTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/en_ZA/InternetTest.php
@@ -6,8 +6,9 @@ use Faker\Generator;
 use Faker\Provider\en_ZA\Person;
 use Faker\Provider\en_ZA\Internet;
 use Faker\Provider\en_ZA\Company;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/en_ZA/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/en_ZA/PersonTest.php
index 557ec8fc..d7973e72 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/en_ZA/PersonTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/en_ZA/PersonTest.php
@@ -5,8 +5,9 @@ namespace Faker\Test\Provider\en_ZA;
 use Faker\Generator;
 use Faker\Provider\en_ZA\Person;
 use Faker\Provider\DateTime;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     private $faker;
 
@@ -44,4 +45,25 @@ class PersonTest extends \PHPUnit_Framework_TestCase
 
         $this->assertContains($genderDigit, array('0', '1', '2', '3', '4'));
     }
+
+    public function testLicenceCode()
+    {
+        $validLicenceCodes = array('A', 'A1', 'B', 'C', 'C1', 'C2', 'EB', 'EC', 'EC1', 'I', 'L', 'L1');
+
+        $this->assertContains($this->faker->licenceCode, $validLicenceCodes);
+    }
+
+    public function testMaleTitles()
+    {
+        $validMaleTitles = array('Mr.', 'Dr.', 'Prof.', 'Rev.', 'Hon.');
+
+        $this->assertContains(Person::titleMale(), $validMaleTitles);
+    }
+
+    public function testFemaleTitles()
+    {
+        $validateFemaleTitles = array('Mrs.', 'Ms.', 'Miss', 'Dr.', 'Prof.', 'Rev.', 'Hon.');
+
+        $this->assertContains(Person::titleFemale(), $validateFemaleTitles);
+    }
 }
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/en_ZA/PhoneNumberTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/en_ZA/PhoneNumberTest.php
index bfb516a4..37b781b5 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/en_ZA/PhoneNumberTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/en_ZA/PhoneNumberTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\en_ZA;
 
 use Faker\Generator;
 use Faker\Provider\en_ZA\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
     private $faker;
 
@@ -62,4 +63,4 @@ class PhoneNumberTest extends \PHPUnit_Framework_TestCase
             $this->assertRegExp('/^(\+27|27)?(\()?0?([6][0-4]|[7][1-9]|[8][1-9])(\))?( |-|\.|_)?(\d{3})( |-|\.|_)?(\d{4})/', $number);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/es_ES/PaymentTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/es_ES/PaymentTest.php
index 344ce236..e636544b 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/es_ES/PaymentTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/es_ES/PaymentTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\es_ES;
 
 use Faker\Generator;
 use Faker\Provider\es_ES\Payment;
+use PHPUnit\Framework\TestCase;
 
-class PaymentTest extends \PHPUnit_Framework_TestCase
+class PaymentTest extends TestCase
 {
     /**
      * @var Generator
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/es_ES/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/es_ES/PersonTest.php
index 55360bac..e29f3f90 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/es_ES/PersonTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/es_ES/PersonTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\es_ES;
 
 use Faker\Generator;
 use Faker\Provider\es_ES\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     public function setUp()
     {
@@ -35,4 +36,11 @@ class PersonTest extends \PHPUnit_Framework_TestCase
 
         return strtoupper($letter) === $map[((int) $number) % 23];
     }
+
+    public function testLicenceCode()
+    {
+        $validLicenceCodes = array('AM', 'A1', 'A2', 'A','B', 'B+E', 'C1', 'C1+E', 'C', 'C+E', 'D1', 'D1+E', 'D', 'D+E');
+
+        $this->assertContains($this->faker->licenceCode, $validLicenceCodes);
+    }
 }
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/es_ES/TextTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/es_ES/TextTest.php
index 75bfee5f..a8ae3486 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/es_ES/TextTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/es_ES/TextTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\es_ES;
 
 use Faker\Generator;
 use Faker\Provider\es_ES\Text;
+use PHPUnit\Framework\TestCase;
 
-class TextTest extends \PHPUnit_Framework_TestCase
+class TextTest extends TestCase
 {
     /**
      * @var Generator
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/es_PE/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/es_PE/PersonTest.php
index 666ed2bf..60149387 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/es_PE/PersonTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/es_PE/PersonTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\es_PE;
 
 use Faker\Generator;
 use Faker\Provider\es_PE\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     /**
      * @var Generator
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/es_VE/CompanyTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/es_VE/CompanyTest.php
new file mode 100644
index 00000000..3c9b162a
--- /dev/null
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/es_VE/CompanyTest.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Created by Domingo Oropeza <dioh_@hotmail.com> for Faker
+ * Date: 01/09/2017
+ * Time: 09:45 PM
+ */
+
+namespace Faker\Test\Provider\es_VE;
+
+use Faker\Generator;
+use Faker\Provider\es_VE\Company;
+use PHPUnit\Framework\TestCase;
+
+class CompanyTest extends TestCase
+{
+    /**
+     * @var Generator
+     */
+    private $faker;
+
+    public function setUp()
+    {
+        $faker = new Generator();
+        $faker->seed(1);
+        $faker->addProvider(new Company($faker));
+        $this->faker = $faker;
+    }
+
+    /**
+     * national Id format validator
+     */
+    public function testNationalId()
+    {
+        $pattern = '/^[VJGECP]-?\d{8}-?\d$/';
+        $rif = $this->faker->taxpayerIdentificationNumber;
+        $this->assertRegExp($pattern, $rif);
+
+        $rif = $this->faker->taxpayerIdentificationNumber('-');
+        $this->assertRegExp($pattern, $rif);
+    }
+
+
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/es_VE/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/es_VE/PersonTest.php
new file mode 100644
index 00000000..bb42cd75
--- /dev/null
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/es_VE/PersonTest.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Created by Domingo Oropeza for Faker
+ * Date: 01/09/2017
+ * Time: 11:02 PM
+ */
+
+namespace Faker\Test\Provider\es_VE;
+
+use Faker\Generator;
+use Faker\Provider\es_VE\Person;
+use PHPUnit\Framework\TestCase;
+
+class PersonTest extends TestCase
+{
+
+    /**
+     * @var Generator
+     */
+    private $faker;
+
+    public function setUp()
+    {
+        $faker = new Generator();
+        $faker->seed(1);
+        $faker->addProvider(new Person($faker));
+        $this->faker = $faker;
+    }
+
+    /**
+     * national Id format validator
+     */
+    public function testNationalId()
+    {
+        $pattern = '/(?:^V-?\d{5,9}$)|(?:^E-?\d{8,9}$)/';
+
+        $cedula = $this->faker->nationalId;
+        $this->assertRegExp($pattern, $cedula);
+
+        $cedula = $this->faker->nationalId('-');
+        $this->assertRegExp($pattern, $cedula);
+    }
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/fi_FI/InternetTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/fi_FI/InternetTest.php
index 3f0e5067..6009bbd1 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/fi_FI/InternetTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/fi_FI/InternetTest.php
@@ -6,8 +6,9 @@ use Faker\Generator;
 use Faker\Provider\fi_FI\Person;
 use Faker\Provider\fi_FI\Internet;
 use Faker\Provider\fi_FI\Company;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/fi_FI/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/fi_FI/PersonTest.php
index 6c77097e..b979666e 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/fi_FI/PersonTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/fi_FI/PersonTest.php
@@ -5,8 +5,9 @@ namespace Faker\Test\Provider\fi_FI;
 use Faker\Generator;
 use Faker\Provider\DateTime;
 use Faker\Provider\fi_FI\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     /** @var Generator */
     protected $faker;
@@ -43,18 +44,25 @@ class PersonTest extends \PHPUnit_Framework_TestCase
 
     public function testPersonalIdentityNumberGeneratesCompliantNumbers()
     {
-        for ($i = 0; $i < 10; $i++) {
-            $birthdate = $this->faker->dateTimeBetween('1800-01-01 00:00:00', '1899-12-31 23:59:59');
-            $pin = $this->faker->personalIdentityNumber($birthdate);
-            $this->assertRegExp('/^[0-9]{6}\+[0-9]{3}[0-9ABCDEFHJKLMNPRSTUVWXY]$/', $pin);
+        if (strtotime('1800-01-01 00:00:00')) {
+            $min="1900";
+            $max="2099";
+            for ($i = 0; $i < 10; $i++) {
+                $birthdate = $this->faker->dateTimeBetween('1800-01-01 00:00:00', '1899-12-31 23:59:59');
+                $pin = $this->faker->personalIdentityNumber($birthdate, NULL, true);
+                $this->assertRegExp('/^[0-9]{6}\+[0-9]{3}[0-9ABCDEFHJKLMNPRSTUVWXY]$/', $pin);
+            }
+        } else { // timestamp limit for 32-bit computer
+            $min="1902";
+            $max="2037";
         }
         for ($i = 0; $i < 10; $i++) {
-            $birthdate = $this->faker->dateTimeBetween('1900-01-01 00:00:00', '1999-12-31 23:59:59');
+            $birthdate = $this->faker->dateTimeBetween("$min-01-01 00:00:00", '1999-12-31 23:59:59');
             $pin = $this->faker->personalIdentityNumber($birthdate);
             $this->assertRegExp('/^[0-9]{6}-[0-9]{3}[0-9ABCDEFHJKLMNPRSTUVWXY]$/', $pin);
         }
         for ($i = 0; $i < 10; $i++) {
-            $birthdate = $this->faker->dateTimeBetween('2000-01-01 00:00:00', '2099-12-31 23:59:59');
+            $birthdate = $this->faker->dateTimeBetween('2000-01-01 00:00:00', "$max-12-31 23:59:59");
             $pin = $this->faker->personalIdentityNumber($birthdate);
             $this->assertRegExp('/^[0-9]{6}A[0-9]{3}[0-9ABCDEFHJKLMNPRSTUVWXY]$/', $pin);
         }
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/fr_BE/PaymentTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/fr_BE/PaymentTest.php
index 46c1cd77..6944c55f 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/fr_BE/PaymentTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/fr_BE/PaymentTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\fr_BE;
 
 use Faker\Generator;
 use Faker\Provider\fr_BE\Payment;
+use PHPUnit\Framework\TestCase;
 
-class PaymentTest extends \PHPUnit_Framework_TestCase
+class PaymentTest extends TestCase
 {
     /**
      * @var Generator
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/fr_CH/AddressTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/fr_CH/AddressTest.php
index f589c1f8..217ac9f6 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/fr_CH/AddressTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/fr_CH/AddressTest.php
@@ -5,8 +5,9 @@ namespace Faker\Test\Provider\fr_CH;
 use Faker\Generator;
 use Faker\Provider\fr_CH\Address;
 use Faker\Provider\fr_CH\Person;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/fr_CH/InternetTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/fr_CH/InternetTest.php
index 2f20871a..f4e94848 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/fr_CH/InternetTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/fr_CH/InternetTest.php
@@ -6,8 +6,9 @@ use Faker\Generator;
 use Faker\Provider\fr_CH\Person;
 use Faker\Provider\fr_CH\Internet;
 use Faker\Provider\fr_CH\Company;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/fr_CH/PhoneNumberTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/fr_CH/PhoneNumberTest.php
index 1f3fc20f..7bfcca76 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/fr_CH/PhoneNumberTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/fr_CH/PhoneNumberTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\fr_CH;
 
 use Faker\Generator;
 use Faker\Provider\fr_CH\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/fr_FR/AddressTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/fr_FR/AddressTest.php
new file mode 100644
index 00000000..50b40f4b
--- /dev/null
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/fr_FR/AddressTest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Faker\Test\Provider\fr_FR;
+
+use Faker\Generator;
+use Faker\Provider\fr_FR\Address;
+use PHPUnit\Framework\TestCase;
+
+class AddressTest extends TestCase
+{
+
+/**
+ * @var Faker\Generator
+ */
+  private $faker;
+
+  public function setUp()
+  {
+      $faker = new Generator();
+      $faker->addProvider(new Address($faker));
+      $this->faker = $faker;
+  }
+
+  /**
+   * @test
+   */
+  public function testSecondaryAddress()
+  {
+    $secondaryAdress = $this->faker->secondaryAddress();
+    $this->assertNotEmpty($secondaryAdress);
+    $this->assertInternalType('string', $secondaryAdress);
+  }
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/fr_FR/CompanyTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/fr_FR/CompanyTest.php
index 5486cf9d..83e54d92 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/fr_FR/CompanyTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/fr_FR/CompanyTest.php
@@ -5,8 +5,9 @@ namespace Faker\Test\Provider\fr_FR;
 use Faker\Calculator\Luhn;
 use Faker\Generator;
 use Faker\Provider\fr_FR\Company;
+use PHPUnit\Framework\TestCase;
 
-class CompanyTest extends \PHPUnit_Framework_TestCase
+class CompanyTest extends TestCase
 {
     private $faker;
 
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/fr_FR/PaymentTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/fr_FR/PaymentTest.php
new file mode 100644
index 00000000..d00a7c83
--- /dev/null
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/fr_FR/PaymentTest.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Faker\Test\Provider\fr_FR;
+
+use Faker\Calculator\Luhn;
+use Faker\Generator;
+use Faker\Provider\fr_FR\Payment;
+use PHPUnit\Framework\TestCase;
+
+class PaymentTest extends TestCase
+{
+    private $faker;
+
+    public function setUp()
+    {
+        $faker = new Generator();
+        $faker->addProvider(new Payment($faker));
+        $this->faker = $faker;
+    }
+
+    public function testFormattedVat()
+    {
+        $vat = $this->faker->vat(true);
+        $this->assertRegExp("/^FR\s\w{2}\s\d{3}\s\d{3}\s\d{3}$/", $vat);
+
+        $vat = str_replace(' ', '', $vat);
+        $siren = substr($vat, 4, 12);
+        $this->assertTrue(Luhn::isValid($siren));
+
+        $key = (int) substr($siren, 2, 2);
+        if ($key === 0) {
+            $this->assertEqual($key, (12 + 3 * ($siren % 97)) % 97);            
+        }
+    }
+
+    public function testUnformattedVat()
+    {
+        $vat = $this->faker->vat(false);
+        $this->assertRegExp("/^FR\w{2}\d{9}$/", $vat);
+
+        $siren = substr($vat, 4, 12);
+        $this->assertTrue(Luhn::isValid($siren));
+
+        $key = (int) substr($siren, 2, 2);
+        if ($key === 0) {
+            $this->assertEqual($key, (12 + 3 * ($siren % 97)) % 97);            
+        }
+    }
+}
\ No newline at end of file
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/fr_FR/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/fr_FR/PersonTest.php
index b5bc8056..8c5fc654 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/fr_FR/PersonTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/fr_FR/PersonTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\fr_FR;
 
 use Faker\Generator;
 use Faker\Provider\fr_FR\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     private $faker;
 
@@ -21,13 +22,13 @@ class PersonTest extends \PHPUnit_Framework_TestCase
 		$nir = $this->faker->nir(\Faker\Provider\Person::GENDER_MALE);
 		$this->assertStringStartsWith('1', $nir);
     }
-	
+
 	public function testNIRReturnsTheRightPattern()
     {
 		$nir = $this->faker->nir;
 		$this->assertRegExp("/^[12]\d{5}[0-9A-B]\d{8}$/", $nir);
 	}
-	
+
 	public function testNIRFormattedReturnsTheRightPattern()
     {
 		$nir = $this->faker->nir(null, true);
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/fr_FR/PhoneNumberTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/fr_FR/PhoneNumberTest.php
new file mode 100644
index 00000000..d4179709
--- /dev/null
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/fr_FR/PhoneNumberTest.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Faker\Test\Provider\fr_FR;
+
+use Faker\Generator;
+use Faker\Provider\fr_FR\PhoneNumber;
+
+class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Generator
+     */
+    private $faker;
+
+    public function setUp()
+    {
+        $faker = new Generator();
+        $faker->addProvider(new PhoneNumber($faker));
+        $this->faker = $faker;
+    }
+
+    public function testMobileNumber()
+    {
+        $mobileNumber = $this->faker->mobileNumber();
+        $this->assertRegExp('/^(\+33 |\+33 \(0\)|0)(6|7)(?:(\s{1})?\d{2}){4}$/', $mobileNumber);
+    }
+
+    public function testMobileNumber07Format()
+    {
+        $mobileNumberFormat = $this->faker->phoneNumber07();
+        $this->assertRegExp('/^([3-9]{1})\d(\d{2}){3}$/', $mobileNumberFormat);
+    }
+
+    public function testMobileNumber07WithSeparatorFormat()
+    {
+        $mobileNumberFormat = $this->faker->phoneNumber07WithSeparator();
+        $this->assertRegExp('/^([3-9]{1})\d( \d{2}){3}$/', $mobileNumberFormat);
+    }
+
+    public function testServiceNumber()
+    {
+        $serviceNumber = $this->faker->serviceNumber();
+        $this->assertRegExp('/^(\+33 |\+33 \(0\)|0)8(?:(\s{1})?\d{2}){4}$/', $serviceNumber);
+    }
+    
+    public function testServiceNumberFormat()
+    {
+        $serviceNumberFormat = $this->faker->phoneNumber08();
+        $this->assertRegExp('/^((0|1|2)\d{1}|9[^46])\d{6}$/', $serviceNumberFormat);
+    }
+
+    public function testServiceNumberWithSeparatorFormat()
+    {
+        $serviceNumberFormat = $this->faker->phoneNumber08WithSeparator();
+        $this->assertRegExp('/^((0|1|2)\d{1}|9[^46])( \d{2}){3}$/', $serviceNumberFormat);
+    }
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/fr_FR/TextTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/fr_FR/TextTest.php
new file mode 100644
index 00000000..c9c7a4ff
--- /dev/null
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/fr_FR/TextTest.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Faker\Test\Provider\fr_FR;
+
+use PHPUnit\Framework\TestCase;
+
+class TextTest extends TestCase
+{
+    private $textClass;
+
+    public function setUp()
+    {
+        $this->textClass = new \ReflectionClass('Faker\Provider\fr_FR\Text');
+    }
+
+    protected function getMethod($name) {
+        $method = $this->textClass->getMethod($name);
+
+        $method->setAccessible(true);
+
+        return $method;
+    }
+
+    /** @test */
+    function testItShouldAppendEndPunctToTheEndOfString()
+    {
+        $this->assertSame(
+            'Que faisaient-elles maintenant? À.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('Que faisaient-elles maintenant? À '))
+        );
+
+        $this->assertSame(
+            'Que faisaient-elles maintenant? À.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('Que faisaient-elles maintenant? À—   '))
+        );
+
+        $this->assertSame(
+            'Que faisaient-elles maintenant? À.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('Que faisaient-elles maintenant? À,'))
+        );
+
+        $this->assertSame(
+            'Que faisaient-elles maintenant? À!.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('Que faisaient-elles maintenant? À! '))
+        );
+
+        $this->assertSame(
+            'Que faisaient-elles maintenant? À.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('Que faisaient-elles maintenant? À: '))
+        );
+
+        $this->assertSame(
+            'Que faisaient-elles maintenant? À.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('Que faisaient-elles maintenant? À; '))
+        );
+    }
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/id_ID/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/id_ID/PersonTest.php
index abd039f0..5ebfeee4 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/id_ID/PersonTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/id_ID/PersonTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\id_ID;
 
 use Faker\Generator;
 use Faker\Provider\id_ID\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     public function setUp()
     {
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/it_CH/AddressTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/it_CH/AddressTest.php
index 76122532..0f0df5e9 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/it_CH/AddressTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/it_CH/AddressTest.php
@@ -5,8 +5,9 @@ namespace Faker\Test\Provider\it_CH;
 use Faker\Generator;
 use Faker\Provider\it_CH\Address;
 use Faker\Provider\it_CH\Person;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/it_CH/InternetTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/it_CH/InternetTest.php
index 16616c70..d46f6b7d 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/it_CH/InternetTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/it_CH/InternetTest.php
@@ -6,8 +6,9 @@ use Faker\Generator;
 use Faker\Provider\it_CH\Person;
 use Faker\Provider\it_CH\Internet;
 use Faker\Provider\it_CH\Company;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/it_CH/PhoneNumberTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/it_CH/PhoneNumberTest.php
index d3f17b8a..5cda5345 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/it_CH/PhoneNumberTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/it_CH/PhoneNumberTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\it_CH;
 
 use Faker\Generator;
 use Faker\Provider\it_CH\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/it_IT/CompanyTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/it_IT/CompanyTest.php
index 7bef3fae..33977e13 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/it_IT/CompanyTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/it_IT/CompanyTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\it_IT;
 
 use Faker\Generator;
 use Faker\Provider\it_IT\Company;
+use PHPUnit\Framework\TestCase;
 
-class CompanyTest extends \PHPUnit_Framework_TestCase
+class CompanyTest extends TestCase
 {
     public function setUp()
     {
@@ -19,5 +20,5 @@ class CompanyTest extends \PHPUnit_Framework_TestCase
         $vatId = $this->faker->vatId();
         $this->assertRegExp('/^IT[0-9]{11}$/', $vatId);
     }
-    
+
 }
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/it_IT/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/it_IT/PersonTest.php
index 5d0dc231..3e7b1a4f 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/it_IT/PersonTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/it_IT/PersonTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\it_IT;
 
 use Faker\Generator;
 use Faker\Provider\it_IT\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     public function setUp()
     {
@@ -19,5 +20,5 @@ class PersonTest extends \PHPUnit_Framework_TestCase
         $taxId = $this->faker->taxId();
         $this->assertRegExp('/^[a-zA-Z]{6}[0-9]{2}[a-zA-Z][0-9]{2}[a-zA-Z][0-9]{3}[a-zA-Z]$/', $taxId);
     }
-    
+
 }
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/ja_JP/InternetTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/ja_JP/InternetTest.php
index 355567a5..b4a19fde 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/ja_JP/InternetTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/ja_JP/InternetTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\ja_JP;
 
 use Faker\Generator;
 use Faker\Provider\ja_JP\Internet;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
     public function testUserName()
     {
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/ja_JP/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/ja_JP/PersonTest.php
index d64ac043..e7854826 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/ja_JP/PersonTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/ja_JP/PersonTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\ja_JP;
 
 use Faker\Generator;
 use Faker\Provider\ja_JP\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     public function testKanaNameMaleReturns()
     {
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/ja_JP/PhoneNumberTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/ja_JP/PhoneNumberTest.php
index d90d9743..158718a7 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/ja_JP/PhoneNumberTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/ja_JP/PhoneNumberTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\ja_JP;
 
 use Faker\Generator;
 use Faker\Provider\ja_JP\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
     public function testPhoneNumber()
     {
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/ka_GE/TextTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/ka_GE/TextTest.php
new file mode 100644
index 00000000..0201ceee
--- /dev/null
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/ka_GE/TextTest.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Faker\Test\Provider\ka_GE;
+
+use PHPUnit\Framework\TestCase;
+
+class TextTest extends TestCase
+{
+    private $textClass;
+
+    public function setUp()
+    {
+        $this->textClass = new \ReflectionClass('Faker\Provider\el_GR\Text');
+    }
+
+    protected function getMethod($name) {
+        $method = $this->textClass->getMethod($name);
+
+        $method->setAccessible(true);
+
+        return $method;
+    }
+
+    /** @test */
+    function testItShouldAppendEndPunctToTheEndOfString()
+    {
+        $this->assertSame(
+            'ჭეშმარიტია. ჩვენც ისე.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('ჭეშმარიტია. ჩვენც ისე '))
+        );
+
+        $this->assertSame(
+            'ჭეშმარიტია. ჩვენც ისე.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('ჭეშმარიტია. ჩვენც ისე— '))
+        );
+
+        $this->assertSame(
+            'ჭეშმარიტია. ჩვენც ისე.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('ჭეშმარიტია. ჩვენც ისე,  '))
+        );
+
+        $this->assertSame(
+            'ჭეშმარიტია. ჩვენც ისე!.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('ჭეშმარიტია. ჩვენც ისე! '))
+        );
+
+        $this->assertSame(
+            'ჭეშმარიტია. ჩვენც ისე.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('ჭეშმარიტია. ჩვენც ისე; '))
+        );
+
+        $this->assertSame(
+            'ჭეშმარიტია. ჩვენც ისე.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('ჭეშმარიტია. ჩვენც ისე: '))
+        );
+    }
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/kk_KZ/CompanyTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/kk_KZ/CompanyTest.php
index 779e73a6..b6a3c061 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/kk_KZ/CompanyTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/kk_KZ/CompanyTest.php
@@ -3,8 +3,9 @@ namespace Faker\Test\Provider\kk_KZ;
 
 use Faker\Generator;
 use Faker\Provider\kk_KZ\Company;
+use PHPUnit\Framework\TestCase;
 
-class CompanyTest extends \PHPUnit_Framework_TestCase
+class CompanyTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/kk_KZ/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/kk_KZ/PersonTest.php
index 0f2f981c..c5657352 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/kk_KZ/PersonTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/kk_KZ/PersonTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\kk_KZ;
 use Faker\Generator;
 use Faker\Provider\DateTime;
 use Faker\Provider\kk_KZ\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
 
     /**
@@ -24,6 +25,6 @@ class PersonTest extends \PHPUnit_Framework_TestCase
         $individualIdentificationNumber = $this->faker->individualIdentificationNumber($birthDate);
         $controlDigit                   = Person::checkSum($individualIdentificationNumber);
 
-        $this->assertTrue($controlDigit === (int)substr($individualIdentificationNumber, 11, 1));
+        $this->assertSame($controlDigit, (int)substr($individualIdentificationNumber, 11, 1));
     }
 }
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/kk_KZ/TextTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/kk_KZ/TextTest.php
new file mode 100644
index 00000000..2c780506
--- /dev/null
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/kk_KZ/TextTest.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Faker\Test\Provider\kk_KZ;
+
+use PHPUnit\Framework\TestCase;
+
+class TextTest extends TestCase
+{
+    private $textClass;
+
+    public function setUp()
+    {
+        $this->textClass = new \ReflectionClass('Faker\Provider\kk_KZ\Text');
+    }
+
+    protected function getMethod($name) {
+        $method = $this->textClass->getMethod($name);
+
+        $method->setAccessible(true);
+
+        return $method;
+    }
+
+    /** @test */
+    function testItShouldAppendEndPunctToTheEndOfString()
+    {
+        $this->assertSame(
+            'Арыстан баб кесенесі - көне Отырар.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('Арыстан баб кесенесі - көне Отырар '))
+        );
+
+        $this->assertSame(
+            'Арыстан баб кесенесі - көне Отырар.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('Арыстан баб кесенесі - көне Отырар— '))
+        );
+
+        $this->assertSame(
+            'Арыстан баб кесенесі - көне Отырар.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('Арыстан баб кесенесі - көне Отырар,  '))
+        );
+
+        $this->assertSame(
+            'Арыстан баб кесенесі - көне Отырар!.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('Арыстан баб кесенесі - көне Отырар! '))
+        );
+
+        $this->assertSame(
+            'Арыстан баб кесенесі - көне Отырар.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('Арыстан баб кесенесі - көне Отырар: '))
+        );
+
+        $this->assertSame(
+            'Арыстан баб кесенесі - көне Отырар.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('Арыстан баб кесенесі - көне Отырар; '))
+        );
+    }
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/ko_KR/TextTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/ko_KR/TextTest.php
new file mode 100644
index 00000000..336acc8a
--- /dev/null
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/ko_KR/TextTest.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Faker\Test\Provider\ko_KR;
+
+use PHPUnit\Framework\TestCase;
+
+class TextTest extends TestCase
+{
+    private $textClass;
+
+    public function setUp()
+    {
+        $this->textClass = new \ReflectionClass('Faker\Provider\el_GR\Text');
+    }
+
+    protected function getMethod($name) {
+        $method = $this->textClass->getMethod($name);
+
+        $method->setAccessible(true);
+
+        return $method;
+    }
+
+    /** @test */
+    function testItShouldAppendEndPunctToTheEndOfString()
+    {
+        $this->assertSame(
+            '최석(崔晳)으로부터 최후의 편지가.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('최석(崔晳)으로부터 최후의 편지가 '))
+        );
+
+        $this->assertSame(
+            '최석(崔晳)으로부터 최후의 편지가.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('최석(崔晳)으로부터 최후의 편지가—'))
+        );
+
+        $this->assertSame(
+            '최석(崔晳)으로부터 최후의 편지가.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('최석(崔晳)으로부터 최후의 편지가,'))
+        );
+
+        $this->assertSame(
+            '최석(崔晳)으로부터 최후의 편지가!.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('최석(崔晳)으로부터 최후의 편지가! '))
+        );
+
+        $this->assertSame(
+            '최석(崔晳)으로부터 최후의 편지가.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('최석(崔晳)으로부터 최후의 편지가: '))
+        );
+
+        $this->assertSame(
+            '최석(崔晳)으로부터 최후의 편지가.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('최석(崔晳)으로부터 최후의 편지가; '))
+        );
+    }
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/mn_MN/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/mn_MN/PersonTest.php
index f3c9572e..232f8f4b 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/mn_MN/PersonTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/mn_MN/PersonTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\mn_MN;
 
 use Faker\Generator;
 use Faker\Provider\mn_MN\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     public function testName()
     {
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/ms_MY/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/ms_MY/PersonTest.php
new file mode 100644
index 00000000..c35c698d
--- /dev/null
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/ms_MY/PersonTest.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Faker\Test\Provider\ms_MY;
+
+use Faker\Generator;
+use Faker\Provider\ms_MY\Person;
+use PHPUnit\Framework\TestCase;
+
+class PersonTest extends TestCase
+{
+    /**
+     * @var Generator
+     */
+    private $faker;
+
+    public function setUp()
+    {
+        $faker = new Generator();
+        $faker->addProvider(new Person($faker));
+        $this->faker = $faker;
+    }
+
+    /**
+     * @link https://en.wikipedia.org/wiki/Malaysian_identity_card#Structure_of_the_National_Registration_Identity_Card_Number_(NRIC)
+     */
+    public function testPersonalIdentityCardNumber()
+    {
+        $myKadNumber = $this->faker->myKadNumber;
+
+        $yy = substr($myKadNumber, 0, 2);
+        //match any year from 00-99
+        $this->assertRegExp("/^[0-9]{2}$/", $yy);
+
+        $mm = substr($myKadNumber, 2, 2);
+        //match any month from 01-12
+        $this->assertRegExp("/^0[1-9]|1[0-2]$/", $mm);
+
+        $dd = substr($myKadNumber, 4, 2);
+        //match any date from 01-31
+        $this->assertRegExp("/^0[1-9]|1[0-9]|2[0-9]|3[0-1]$/", $dd);
+
+        $pb = substr($myKadNumber, 6, 2);
+        //match any valid place of birth code from 01-59 except 17-20
+        $this->assertRegExp("/^(0[1-9]|1[0-6])|(2[1-9]|3[0-9]|4[0-9]|5[0-9])$/", $pb);
+
+        $nnnn = substr($myKadNumber, 8, 4);
+        //match any number from 0000-9999
+        $this->assertRegExp("/^[0-9]{4}$/", $nnnn);
+    }
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/nl_BE/PaymentTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/nl_BE/PaymentTest.php
index 9216de75..e8441033 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/nl_BE/PaymentTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/nl_BE/PaymentTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\nl_BE;
 
 use Faker\Generator;
 use Faker\Provider\nl_BE\Payment;
+use PHPUnit\Framework\TestCase;
 
-class PaymentTest extends \PHPUnit_Framework_TestCase
+class PaymentTest extends TestCase
 {
     /**
      * @var Generator
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/nl_BE/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/nl_BE/PersonTest.php
new file mode 100644
index 00000000..4885cc3d
--- /dev/null
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/nl_BE/PersonTest.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Faker\Test\Provider\nl_BE;
+
+use Faker\Generator;
+use Faker\Provider\nl_BE\Person;
+use PHPUnit\Framework\TestCase;
+use Datetime;
+
+/**
+ * @group Person
+ */
+class PersonTest extends TestCase
+{
+    /**
+     * @var Generator
+     */
+    private $faker;
+
+    public function setUp()
+    {
+        $faker = new Generator();
+        $faker->addProvider(new Person($faker));
+        $this->faker = $faker;
+    }
+
+    public function testRrnIsValid()
+    {
+        $rrn = $this->faker->rrn();
+
+        $this->assertEquals(11, strlen($rrn));
+
+        $ctrlNumber = substr($rrn, 9, 2);
+        $calcCtrl = 97 - (substr($rrn, 0, 9) % 97);
+        $altcalcCtrl = 97 - ((2 . substr($rrn, 0, 9)) % 97);
+        $this->assertContains($ctrlNumber, array($calcCtrl, $altcalcCtrl));
+
+        $middle = substr($rrn, 6, 3);
+        $this->assertGreaterThan(1, $middle);
+        $this->assertLessThan(997, $middle);
+    }
+
+    public function testRrnIsMale()
+    {
+        $rrn = $this->faker->rrn('male');
+        $this->assertEquals(substr($rrn, 6, 3) % 2, 1);
+    }
+
+    public function testRrnIsFemale()
+    {
+        $rrn = $this->faker->rrn('female');
+        $this->assertEquals(substr($rrn, 6, 3) % 2, 0);
+    }
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/nl_NL/CompanyTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/nl_NL/CompanyTest.php
index 4775b14e..6d5484ce 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/nl_NL/CompanyTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/nl_NL/CompanyTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\nl_NL;
 
 use Faker\Generator;
 use Faker\Provider\nl_NL\Company;
+use PHPUnit\Framework\TestCase;
 
-class CompanyTest extends \PHPUnit_Framework_TestCase
+class CompanyTest extends TestCase
 {
     private $faker;
 
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/nl_NL/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/nl_NL/PersonTest.php
new file mode 100644
index 00000000..c8735f5f
--- /dev/null
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/nl_NL/PersonTest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Faker\Test\Provider\nl_NL;
+
+use Faker\Generator;
+use Faker\Provider\nl_NL\Person;
+use PHPUnit\Framework\TestCase;
+
+class PersonTest extends TestCase
+{
+    private $faker;
+
+    public function setUp()
+    {
+        $faker = new Generator();
+        $faker->addProvider(new Person($faker));
+        $this->faker = $faker;
+    }
+
+    public function testGenerateValidIdNumber()
+    {
+        $idNumber = $this->faker->idNumber();
+        $this->assertEquals(9, strlen($idNumber));
+
+
+        $sum = -1 * $idNumber % 10;
+        for ($multiplier = 2; $idNumber > 0; $multiplier++) {
+            $val = ($idNumber /= 10) % 10;
+            $sum += $multiplier * $val;
+        }
+        $this->assertTrue($sum != 0 && $sum % 11 == 0);
+    }
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/pl_PL/AddressTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/pl_PL/AddressTest.php
index 9bdc0515..bbfdf4d3 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/pl_PL/AddressTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/pl_PL/AddressTest.php
@@ -3,8 +3,9 @@
 namespace Faker\Provider\pl_PL;
 
 use Faker\Generator;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
     /**
      * @var Generator
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/pl_PL/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/pl_PL/PersonTest.php
new file mode 100644
index 00000000..e5e0edc1
--- /dev/null
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/pl_PL/PersonTest.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace Faker\Provider\pl_PL;
+
+use DateTime;
+use Faker\Generator;
+use PHPUnit\Framework\TestCase;
+
+class PersonTest extends TestCase
+{
+    /**
+     * @var Generator
+     */
+    private $faker;
+
+    public function setUp()
+    {
+        $faker = new Generator();
+        $faker->addProvider(new Person($faker));
+        $this->faker = $faker;
+    }
+
+    public function testPeselLenght()
+    {
+        $pesel = $this->faker->pesel();
+
+        $this->assertEquals(11, strlen($pesel));
+    }
+
+    public function testPeselDate()
+    {
+        $date  = new DateTime('1990-01-01');
+        $pesel = $this->faker->pesel($date);
+
+        $this->assertEquals('90', substr($pesel, 0, 2));
+        $this->assertEquals('01', substr($pesel, 2, 2));
+        $this->assertEquals('01', substr($pesel, 4, 2));
+    }
+
+    public function testPeselDateWithYearAfter2000()
+    {
+        $date  = new DateTime('2001-01-01');
+        $pesel = $this->faker->pesel($date);
+
+        $this->assertEquals('01', substr($pesel, 0, 2));
+        $this->assertEquals('21', substr($pesel, 2, 2));
+        $this->assertEquals('01', substr($pesel, 4, 2));
+    }
+
+    public function testPeselDateWithYearAfter2100()
+    {
+        $date  = new DateTime('2101-01-01');
+        $pesel = $this->faker->pesel($date);
+
+        $this->assertEquals('01', substr($pesel, 0, 2));
+        $this->assertEquals('41', substr($pesel, 2, 2));
+        $this->assertEquals('01', substr($pesel, 4, 2));
+    }
+
+    public function testPeselDateWithYearAfter2200()
+    {
+        $date  = new DateTime('2201-01-01');
+        $pesel = $this->faker->pesel($date);
+
+        $this->assertEquals('01', substr($pesel, 0, 2));
+        $this->assertEquals('61', substr($pesel, 2, 2));
+        $this->assertEquals('01', substr($pesel, 4, 2));
+    }
+
+    public function testPeselDateWithYearBefore1900()
+    {
+        $date  = new DateTime('1801-01-01');
+        $pesel = $this->faker->pesel($date);
+
+        $this->assertEquals('01', substr($pesel, 0, 2));
+        $this->assertEquals('81', substr($pesel, 2, 2));
+        $this->assertEquals('01', substr($pesel, 4, 2));
+    }
+
+    public function testPeselSex()
+    {
+        $male   = $this->faker->pesel(null, 'M');
+        $female = $this->faker->pesel(null, 'F');
+
+        $this->assertEquals(1, $male[9] % 2);
+        $this->assertEquals(0, $female[9] % 2);
+    }
+
+    public function testPeselCheckSum()
+    {
+        $pesel   = $this->faker->pesel();
+        $weights = array(1, 3, 7, 9, 1, 3, 7, 9, 1, 3, 1);
+        $sum     = 0;
+
+        foreach ($weights as $key => $weight) {
+            $sum += $pesel[$key] * $weight;
+        }
+
+        $this->assertEquals(0, $sum % 10);
+    }
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/pt_BR/CompanyTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/pt_BR/CompanyTest.php
index f59142bd..b0feecac 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/pt_BR/CompanyTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/pt_BR/CompanyTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\pt_BR;
 
 use Faker\Generator;
 use Faker\Provider\pt_BR\Company;
+use PHPUnit\Framework\TestCase;
 
-class CompanyTest extends \PHPUnit_Framework_TestCase
+class CompanyTest extends TestCase
 {
 
     public function setUp()
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/pt_BR/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/pt_BR/PersonTest.php
index 767c1887..0b8318dd 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/pt_BR/PersonTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/pt_BR/PersonTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\pt_BR;
 
 use Faker\Generator;
 use Faker\Provider\pt_BR\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
 
     public function setUp()
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/pt_PT/AddressTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/pt_PT/AddressTest.php
index 7db5b68f..3783fd52 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/pt_PT/AddressTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/pt_PT/AddressTest.php
@@ -5,8 +5,9 @@ namespace Faker\Test\Provider\pt_PT;
 use Faker\Generator;
 use Faker\Provider\pt_PT\Address;
 use Faker\Provider\pt_PT\Person;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/pt_PT/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/pt_PT/PersonTest.php
index 9bfb7a2f..662f12a7 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/pt_PT/PersonTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/pt_PT/PersonTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\pt_PT;
 
 use Faker\Generator;
 use Faker\Provider\pt_PT\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
 
     public function setUp()
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/pt_PT/PhoneNumberTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/pt_PT/PhoneNumberTest.php
index 04b2f63d..fd5d3194 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/pt_PT/PhoneNumberTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/pt_PT/PhoneNumberTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\pt_PT;
 
 use Faker\Generator;
 use Faker\Provider\pt_PT\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
     public function setUp()
     {
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/ro_RO/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/ro_RO/PersonTest.php
index 2777f770..2c7fadce 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/ro_RO/PersonTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/ro_RO/PersonTest.php
@@ -5,8 +5,9 @@ namespace Faker\Test\Provider\ro_RO;
 use Faker\Generator;
 use Faker\Provider\DateTime;
 use Faker\Provider\ro_RO\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     const TEST_CNP_REGEX = '/^[1-9][0-9]{2}(?:0[1-9]|1[012])(?:0[1-9]|[12][0-9]|3[01])(?:0[1-9]|[123][0-9]|4[0-6]|5[12])[0-9]{3}[0-9]$/';
 
@@ -15,22 +16,19 @@ class PersonTest extends \PHPUnit_Framework_TestCase
      *
      */
     protected $faker;
-    protected $originalTz;
 
     public function setUp()
     {
-        $this->originalTz = @date_default_timezone_get();
-        date_default_timezone_set('Europe/Bucharest');
-
         $faker = new Generator();
         $faker->addProvider(new DateTime($faker));
         $faker->addProvider(new Person($faker));
+        $faker->setDefaultTimezone('Europe/Bucharest');
         $this->faker = $faker;
     }
 
     public function tearDown()
     {
-        date_default_timezone_set($this->originalTz);
+        $this->faker->setDefaultTimezone();
     }
 
     public function invalidGenderProvider()
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/ro_RO/PhoneNumberTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/ro_RO/PhoneNumberTest.php
index 8a406da9..b7965cd8 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/ro_RO/PhoneNumberTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/ro_RO/PhoneNumberTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\ro_RO;
 
 use Faker\Generator;
 use Faker\Provider\ro_RO\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
     public function setUp()
     {
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/ru_RU/CompanyTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/ru_RU/CompanyTest.php
index 08dd2477..8fbcf265 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/ru_RU/CompanyTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/ru_RU/CompanyTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\ru_RU;
 
 use Faker\Generator;
 use Faker\Provider\ru_RU\Company;
+use PHPUnit\Framework\TestCase;
 
-class CompanyTest extends \PHPUnit_Framework_TestCase
+class CompanyTest extends TestCase
 {
     /**
      * @var Generator
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/ru_RU/TextTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/ru_RU/TextTest.php
new file mode 100644
index 00000000..bbb0eae6
--- /dev/null
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/ru_RU/TextTest.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Faker\Test\Provider\ru_RU;
+
+use PHPUnit\Framework\TestCase;
+
+class TextTest extends TestCase
+{
+    private $textClass;
+
+    public function setUp()
+    {
+        $this->textClass = new \ReflectionClass('Faker\Provider\ru_RU\Text');
+    }
+
+    protected function getMethod($name) {
+        $method = $this->textClass->getMethod($name);
+
+        $method->setAccessible(true);
+
+        return $method;
+    }
+
+    /** @test */
+    function testItShouldAppendEndPunctToTheEndOfString()
+    {
+        $this->assertSame(
+            'На другой день Чичиков отправился на обед и вечер.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('На другой день Чичиков отправился на обед и вечер '))
+        );
+
+        $this->assertSame(
+            'На другой день Чичиков отправился на обед и вечер.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('На другой день Чичиков отправился на обед и вечер—'))
+        );
+
+        $this->assertSame(
+            'На другой день Чичиков отправился на обед и вечер.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('На другой день Чичиков отправился на обед и вечер,'))
+        );
+
+        $this->assertSame(
+            'На другой день Чичиков отправился на обед и вечер!.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('На другой день Чичиков отправился на обед и вечер! '))
+        );
+
+        $this->assertSame(
+            'На другой день Чичиков отправился на обед и вечер.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('На другой день Чичиков отправился на обед и вечер; '))
+        );
+
+        $this->assertSame(
+            'На другой день Чичиков отправился на обед и вечер.',
+            $this->getMethod('appendEnd')->invokeArgs(null, array('На другой день Чичиков отправился на обед и вечер: '))
+        );
+    }
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/sv_SE/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/sv_SE/PersonTest.php
index 623723a6..584998da 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/sv_SE/PersonTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/sv_SE/PersonTest.php
@@ -5,8 +5,9 @@ namespace Faker\Test\Provider\sv_SE;
 use Faker\Calculator\Luhn;
 use Faker\Generator;
 use Faker\Provider\sv_SE\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     /** @var Generator */
     protected $faker;
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/tr_TR/CompanyTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/tr_TR/CompanyTest.php
new file mode 100644
index 00000000..badf905f
--- /dev/null
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/tr_TR/CompanyTest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Faker\Test\Provider\tr_TR;
+
+use Faker\Provider\tr_TR\Company;
+use Faker\Generator;
+
+class CompanyTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * @var Generator
+     */
+    private $faker;
+
+    public function setUp()
+    {
+        $faker = new Generator();
+        $faker->addProvider(new Company($faker));
+        $this->faker = $faker;
+    }
+
+    public function testCompany()
+    {
+        $company = $this->faker->companyField;
+        $this->assertNotNull($company);
+    }
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/tr_TR/PaymentTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/tr_TR/PaymentTest.php
new file mode 100644
index 00000000..7c8ffdb2
--- /dev/null
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/tr_TR/PaymentTest.php
@@ -0,0 +1,29 @@
+<?php
+
+
+namespace Faker\Provider\tr_TR;
+
+use Faker\Generator;
+use PHPUnit\Framework\TestCase;
+
+class PaymentTest extends TestCase
+{
+    /**
+     * @var Generator
+     */
+    private $faker;
+
+    public function setUp()
+    {
+        $faker = new Generator();
+        $faker->addProvider(new Payment($faker));
+        $this->faker = $faker;
+    }
+
+    public function testBankAccountNumber()
+    {
+        $accNo = $this->faker->bankAccountNumber;
+        $this->assertEquals(substr($accNo, 0, 2), 'TR');
+        $this->assertEquals(26, strlen($accNo));
+    }
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/tr_TR/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/tr_TR/PersonTest.php
new file mode 100644
index 00000000..ad9db9c7
--- /dev/null
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/tr_TR/PersonTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Faker\Test\Provider\tr_TR;
+
+use Faker\Calculator\TCNo;
+use Faker\Provider\tr_TR\Person;
+use Faker\Generator;
+use PHPUnit\Framework\TestCase;
+
+class PersonTest extends TestCase
+{
+
+    /**
+     * @var Generator
+     */
+    private $faker;
+
+    public function setUp()
+    {
+        $faker = new Generator();
+        $faker->addProvider(new Person($faker));
+        $this->faker = $faker;
+    }
+
+    public function testTCNo()
+    {
+        for ($i = 0; $i < 100; $i++) {
+            $number = $this->faker->tcNo;
+
+            $this->assertEquals(11, strlen($number));
+            $this->assertTrue(TCNo::isValid($number));
+        }
+    }
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/tr_TR/PhoneNumberTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/tr_TR/PhoneNumberTest.php
new file mode 100644
index 00000000..0971d04b
--- /dev/null
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/tr_TR/PhoneNumberTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Faker\Test\Provider\tr_TR;
+
+use Faker\Generator;
+use Faker\Provider\tr_TR\PhoneNumber;
+use PHPUnit\Framework\TestCase;
+
+class PhoneNumberTest extends TestCase
+{
+
+    /**
+     * @var Generator
+     */
+    private $faker;
+
+    public function setUp()
+    {
+        $faker = new Generator();
+        $faker->addProvider(new PhoneNumber($faker));
+        $this->faker = $faker;
+    }
+
+    public function testPhoneNumber()
+    {
+        for ($i = 0; $i < 100; $i++) {
+            $number = $this->faker->phoneNumber;
+            $baseNumber = preg_replace('/ *x.*$/', '', $number); // Remove possible extension
+            $digits = array_values(array_filter(str_split($baseNumber), 'ctype_digit'));
+
+            $this->assertGreaterThan(10, count($digits));
+        }
+    }
+}
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/uk_UA/AddressTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/uk_UA/AddressTest.php
index a3e38d73..4c4a0612 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/uk_UA/AddressTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/uk_UA/AddressTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\uk_UA;
 
 use Faker\Generator;
 use Faker\Provider\uk_UA\Address;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/uk_UA/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/uk_UA/PersonTest.php
index 5d73d725..a8d70f69 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/uk_UA/PersonTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/uk_UA/PersonTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\uk_UA;
 
 use Faker\Generator;
 use Faker\Provider\uk_UA\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     public function testFirstNameMaleReturns()
     {
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/uk_UA/PhoneNumberTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/uk_UA/PhoneNumberTest.php
index 13620c72..f7f9f14b 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/uk_UA/PhoneNumberTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/uk_UA/PhoneNumberTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\uk_UA;
 
 use Faker\Generator;
 use Faker\Provider\uk_UA\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
 
     /**
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/zh_TW/CompanyTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/zh_TW/CompanyTest.php
index 329c3a8a..f2134b9b 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/zh_TW/CompanyTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/zh_TW/CompanyTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\zh_TW;
 
 use Faker\Generator;
 use Faker\Provider\zh_TW\Company;
+use PHPUnit\Framework\TestCase;
 
-class CompanyTest extends \PHPUnit_Framework_TestCase
+class CompanyTest extends TestCase
 {
     /**
      * @var Generator
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/zh_TW/PersonTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/zh_TW/PersonTest.php
index 1ba05a53..167d0fa0 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/zh_TW/PersonTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/zh_TW/PersonTest.php
@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\zh_TW;
 
 use Faker\Generator;
 use Faker\Provider\zh_TW\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     /**
      * @var Generator
diff --git a/vendor/fzaninotto/faker/test/Faker/Provider/zh_TW/TextTest.php b/vendor/fzaninotto/faker/test/Faker/Provider/zh_TW/TextTest.php
index 5bcabe44..ab56f83c 100644
--- a/vendor/fzaninotto/faker/test/Faker/Provider/zh_TW/TextTest.php
+++ b/vendor/fzaninotto/faker/test/Faker/Provider/zh_TW/TextTest.php
@@ -2,7 +2,9 @@
 
 namespace Faker\Test\Provider\zh_TW;
 
-class TextTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class TextTest extends TestCase
 {
     private $textClass;
 
diff --git a/vendor/jakub-onderka/php-console-color/.travis.yml b/vendor/jakub-onderka/php-console-color/.travis.yml
index 4671dca5..49175a99 100644
--- a/vendor/jakub-onderka/php-console-color/.travis.yml
+++ b/vendor/jakub-onderka/php-console-color/.travis.yml
@@ -1,15 +1,24 @@
 language: php
 
 php:
-  - 5.3.3
   - 5.4
   - 5.5
+  - 5.6
+  - 7.0
+  - 7.1
+  - 7.2
+
+sudo: false
+
+cache:
+  directories:
+    - vendor
+    - $HOME/.composer/cache
 
 before_script:
-  - composer self-update
-  - composer install --no-interaction --prefer-source --dev
+  - composer install --no-interaction --prefer-source
 
 script:
   - ant phplint
   - ant phpcs
-  - ant phpunit
\ No newline at end of file
+  - ant phpunit
diff --git a/vendor/jakub-onderka/php-console-color/LICENSE b/vendor/jakub-onderka/php-console-color/LICENSE
new file mode 100644
index 00000000..0954fc94
--- /dev/null
+++ b/vendor/jakub-onderka/php-console-color/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2014-2018, Jakub Onderka
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/jakub-onderka/php-console-color/README.md b/vendor/jakub-onderka/php-console-color/README.md
new file mode 100644
index 00000000..39e55d92
--- /dev/null
+++ b/vendor/jakub-onderka/php-console-color/README.md
@@ -0,0 +1,10 @@
+PHP Console Color
+=================
+
+[![Build Status](https://travis-ci.org/JakubOnderka/PHP-Console-Color.svg?branch=master)](https://travis-ci.org/JakubOnderka/PHP-Console-Color)
+
+Simple library for creating colored console ouput.
+
+See `example.php` how to use this library.
+
+![Example from Windows 10](https://user-images.githubusercontent.com/89590/40762008-687f909a-646c-11e8-88d6-e268a064be4c.png)
\ No newline at end of file
diff --git a/vendor/jakub-onderka/php-console-color/composer.json b/vendor/jakub-onderka/php-console-color/composer.json
index 0721abca..6481cb51 100644
--- a/vendor/jakub-onderka/php-console-color/composer.json
+++ b/vendor/jakub-onderka/php-console-color/composer.json
@@ -1,7 +1,6 @@
 {
     "name": "jakub-onderka/php-console-color",
     "license": "BSD-2-Clause",
-    "version": "0.1",
     "authors": [
         {
             "name": "Jakub Onderka",
@@ -9,16 +8,16 @@
         }
     ],
     "autoload": {
-        "psr-0": {"JakubOnderka\\PhpConsoleColor": "src/"}
+        "psr-4": {"JakubOnderka\\PhpConsoleColor\\": "src/"}
     },
     "require": {
-        "php": ">=5.3.2"
+        "php": ">=5.4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "3.7.*",
-        "jakub-onderka/php-parallel-lint": "0.*",
+        "phpunit/phpunit": "~4.3",
+        "jakub-onderka/php-parallel-lint": "1.0",
         "jakub-onderka/php-var-dump-check": "0.*",
         "squizlabs/php_codesniffer": "1.*",
         "jakub-onderka/php-code-style": "1.0"
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/jakub-onderka/php-console-color/phpunit.xml b/vendor/jakub-onderka/php-console-color/phpunit.xml
index 74011d9d..f1105cc4 100644
--- a/vendor/jakub-onderka/php-console-color/phpunit.xml
+++ b/vendor/jakub-onderka/php-console-color/phpunit.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="tests/bootstrap.php">
+<phpunit
+    bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite>
-            <directory>tests/*</directory>
+            <directory suffix="Test.php">tests</directory>
         </testsuite>
     </testsuites>
 
@@ -12,4 +13,4 @@
             <directory>vendor</directory>
         </blacklist>
     </filter>
-</phpunit>
\ No newline at end of file
+</phpunit>
diff --git a/vendor/jakub-onderka/php-console-color/src/JakubOnderka/PhpConsoleColor/ConsoleColor.php b/vendor/jakub-onderka/php-console-color/src/ConsoleColor.php
similarity index 90%
rename from vendor/jakub-onderka/php-console-color/src/JakubOnderka/PhpConsoleColor/ConsoleColor.php
rename to vendor/jakub-onderka/php-console-color/src/ConsoleColor.php
index c367a765..90fd1252 100644
--- a/vendor/jakub-onderka/php-console-color/src/JakubOnderka/PhpConsoleColor/ConsoleColor.php
+++ b/vendor/jakub-onderka/php-console-color/src/ConsoleColor.php
@@ -201,10 +201,15 @@ class ConsoleColor
     public function isSupported()
     {
         if (DIRECTORY_SEPARATOR === '\\') {
-            return getenv('ANSICON') !== false || getenv('ConEmuANSI') === 'ON';
+            if (function_exists('sapi_windows_vt100_support') && @sapi_windows_vt100_support(STDOUT)) {
+                return true;
+            } elseif (getenv('ANSICON') !== false || getenv('ConEmuANSI') === 'ON') {
+                return true;
+            }
+            return false;
+        } else {
+            return function_exists('posix_isatty') && @posix_isatty(STDOUT);
         }
-
-        return function_exists('posix_isatty') && @posix_isatty(STDOUT);
     }
 
     /**
@@ -212,7 +217,11 @@ class ConsoleColor
      */
     public function are256ColorsSupported()
     {
-        return DIRECTORY_SEPARATOR === '/' && strpos(getenv('TERM'), '256color') !== false;
+        if (DIRECTORY_SEPARATOR === '\\') {
+            return function_exists('sapi_windows_vt100_support') && @sapi_windows_vt100_support(STDOUT);
+        } else {
+            return strpos(getenv('TERM'), '256color') !== false;
+        }
     }
 
     /**
@@ -225,8 +234,7 @@ class ConsoleColor
 
     /**
      * @param string $name
-     * @return string
-     * @throws InvalidStyleException
+     * @return string[]
      */
     private function themeSequence($name)
     {
@@ -240,7 +248,6 @@ class ConsoleColor
     /**
      * @param string $style
      * @return string
-     * @throws InvalidStyleException
      */
     private function styleSequence($style)
     {
@@ -277,4 +284,4 @@ class ConsoleColor
     {
         return "\033[{$value}m";
     }
-}
\ No newline at end of file
+}
diff --git a/vendor/jakub-onderka/php-console-color/src/JakubOnderka/PhpConsoleColor/InvalidStyleException.php b/vendor/jakub-onderka/php-console-color/src/InvalidStyleException.php
similarity index 100%
rename from vendor/jakub-onderka/php-console-color/src/JakubOnderka/PhpConsoleColor/InvalidStyleException.php
rename to vendor/jakub-onderka/php-console-color/src/InvalidStyleException.php
diff --git a/vendor/jakub-onderka/php-console-color/tests/JakubOnderka/PhpConsoleColor/ConsoleColorTest.php b/vendor/jakub-onderka/php-console-color/tests/ConsoleColorTest.php
similarity index 100%
rename from vendor/jakub-onderka/php-console-color/tests/JakubOnderka/PhpConsoleColor/ConsoleColorTest.php
rename to vendor/jakub-onderka/php-console-color/tests/ConsoleColorTest.php
diff --git a/vendor/jakub-onderka/php-console-color/tests/bootstrap.php b/vendor/jakub-onderka/php-console-color/tests/bootstrap.php
deleted file mode 100644
index 7500417e..00000000
--- a/vendor/jakub-onderka/php-console-color/tests/bootstrap.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-$loader = require_once __DIR__ . '/../vendor/autoload.php';
\ No newline at end of file
diff --git a/vendor/jakub-onderka/php-console-highlighter/.travis.yml b/vendor/jakub-onderka/php-console-highlighter/.travis.yml
index 2f7e8c89..c88c4ec9 100644
--- a/vendor/jakub-onderka/php-console-highlighter/.travis.yml
+++ b/vendor/jakub-onderka/php-console-highlighter/.travis.yml
@@ -1,21 +1,22 @@
 language: php
 
 php:
-  - 5.3.3
   - 5.4
   - 5.5
   - 5.6
   - 7.0
-  - hhvm
-  - hhvm-nightly
+  - 7.1
+  - 7.2
+  
+sudo: false
 
-matrix:
-  allowed_failures:
-    - php: 7.0
-    - php: hhvm-nightly
+cache:
+  directories:
+    - vendor
+    - $HOME/.composer/cache
 
 before_script:
   - composer install --no-interaction --prefer-source
 
 script:
-  - ant
\ No newline at end of file
+  - ant
diff --git a/vendor/jakub-onderka/php-console-highlighter/README.md b/vendor/jakub-onderka/php-console-highlighter/README.md
index 432ea0a7..1ef3d134 100644
--- a/vendor/jakub-onderka/php-console-highlighter/README.md
+++ b/vendor/jakub-onderka/php-console-highlighter/README.md
@@ -37,4 +37,6 @@ echo $highlighter->getWholeFile($fileContent);
 
 ------
 
+[![Downloads this Month](https://img.shields.io/packagist/dm/jakub-onderka/php-console-highlighter.svg)](https://packagist.org/packages/jakub-onderka/php-console-highlighter)
 [![Build Status](https://travis-ci.org/JakubOnderka/PHP-Console-Highlighter.svg?branch=master)](https://travis-ci.org/JakubOnderka/PHP-Console-Highlighter)
+[![License](https://poser.pugx.org/jakub-onderka/php-console-highlighter/license.svg)](https://packagist.org/packages/jakub-onderka/php-console-highlighter)
diff --git a/vendor/jakub-onderka/php-console-highlighter/composer.json b/vendor/jakub-onderka/php-console-highlighter/composer.json
index bd2f47a2..21c29f71 100644
--- a/vendor/jakub-onderka/php-console-highlighter/composer.json
+++ b/vendor/jakub-onderka/php-console-highlighter/composer.json
@@ -1,5 +1,6 @@
 {
     "name": "jakub-onderka/php-console-highlighter",
+    "description": "Highlight PHP code in terminal",
     "type": "library",
     "license": "MIT",
     "authors": [
@@ -10,15 +11,16 @@
         }
     ],
     "autoload": {
-        "psr-0": {"JakubOnderka\\PhpConsoleHighlighter": "src/"}
+        "psr-4": {"JakubOnderka\\PhpConsoleHighlighter\\": "src/"}
     },
     "require": {
-        "php": ">=5.3.0",
-        "jakub-onderka/php-console-color": "~0.1"
+        "php": ">=5.4.0",
+        "ext-tokenizer": "*",
+        "jakub-onderka/php-console-color": "~0.2"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0",
-        "jakub-onderka/php-parallel-lint": "~0.5",
+        "jakub-onderka/php-parallel-lint": "~1.0",
         "jakub-onderka/php-var-dump-check": "~0.1",
         "squizlabs/php_codesniffer": "~1.5",
         "jakub-onderka/php-code-style": "~1.0"
diff --git a/vendor/jakub-onderka/php-console-highlighter/phpunit.xml b/vendor/jakub-onderka/php-console-highlighter/phpunit.xml
index 74011d9d..9c653a68 100644
--- a/vendor/jakub-onderka/php-console-highlighter/phpunit.xml
+++ b/vendor/jakub-onderka/php-console-highlighter/phpunit.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="tests/bootstrap.php">
+<phpunit bootstrap="./vendor/autoload.php">
     <testsuites>
         <testsuite>
-            <directory>tests/*</directory>
+            <directory suffix="Test.php">tests</directory>
         </testsuite>
     </testsuites>
 
@@ -12,4 +12,4 @@
             <directory>vendor</directory>
         </blacklist>
     </filter>
-</phpunit>
\ No newline at end of file
+</phpunit>
diff --git a/vendor/jakub-onderka/php-console-highlighter/src/JakubOnderka/PhpConsoleHighlighter/Highlighter.php b/vendor/jakub-onderka/php-console-highlighter/src/Highlighter.php
similarity index 94%
rename from vendor/jakub-onderka/php-console-highlighter/src/JakubOnderka/PhpConsoleHighlighter/Highlighter.php
rename to vendor/jakub-onderka/php-console-highlighter/src/Highlighter.php
index b908e931..47ce30d2 100644
--- a/vendor/jakub-onderka/php-console-highlighter/src/JakubOnderka/PhpConsoleHighlighter/Highlighter.php
+++ b/vendor/jakub-onderka/php-console-highlighter/src/Highlighter.php
@@ -31,6 +31,7 @@ class Highlighter
 
     /**
      * @param ConsoleColor $color
+     * @throws \JakubOnderka\PhpConsoleColor\InvalidStyleException
      */
     public function __construct(ConsoleColor $color)
     {
@@ -118,20 +119,6 @@ class Highlighter
         foreach ($tokens as $token) {
             if (is_array($token)) {
                 switch ($token[0]) {
-                    case T_INLINE_HTML:
-                        $newType = self::TOKEN_HTML;
-                        break;
-
-                    case T_COMMENT:
-                    case T_DOC_COMMENT:
-                        $newType = self::TOKEN_COMMENT;
-                        break;
-
-                    case T_ENCAPSED_AND_WHITESPACE:
-                    case T_CONSTANT_ENCAPSED_STRING:
-                        $newType = self::TOKEN_STRING;
-                        break;
-
                     case T_WHITESPACE:
                         break;
 
@@ -151,17 +138,26 @@ class Highlighter
                     case T_LINE:
                     case T_CLASS_C:
                     case T_FUNC_C:
-                    //case T_TRAIT_C:
+                    case T_TRAIT_C:
                         $newType = self::TOKEN_DEFAULT;
                         break;
 
+                    case T_COMMENT:
+                    case T_DOC_COMMENT:
+                        $newType = self::TOKEN_COMMENT;
+                        break;
+
+                    case T_ENCAPSED_AND_WHITESPACE:
+                    case T_CONSTANT_ENCAPSED_STRING:
+                        $newType = self::TOKEN_STRING;
+                        break;
+
+                    case T_INLINE_HTML:
+                        $newType = self::TOKEN_HTML;
+                        break;
+
                     default:
-                        // Compatibility with PHP 5.3
-                        if (defined('T_TRAIT_C') && $token[0] === T_TRAIT_C) {
-                            $newType = self::TOKEN_DEFAULT;
-                        } else {
-                            $newType = self::TOKEN_KEYWORD;
-                        }
+                        $newType = self::TOKEN_KEYWORD;
                 }
             } else {
                 $newType = $token === '"' ? self::TOKEN_STRING : self::TOKEN_KEYWORD;
@@ -171,7 +167,7 @@ class Highlighter
                 $currentType = $newType;
             }
 
-            if ($currentType != $newType) {
+            if ($currentType !== $newType) {
                 $output[] = array($currentType, $buffer);
                 $buffer = '';
                 $currentType = $newType;
diff --git a/vendor/jakub-onderka/php-console-highlighter/tests/JakubOnderka/PhpConsoleHighligter/HigligterTest.php b/vendor/jakub-onderka/php-console-highlighter/tests/HigligterTest.php
similarity index 93%
rename from vendor/jakub-onderka/php-console-highlighter/tests/JakubOnderka/PhpConsoleHighligter/HigligterTest.php
rename to vendor/jakub-onderka/php-console-highlighter/tests/HigligterTest.php
index 269d03da..187beb67 100644
--- a/vendor/jakub-onderka/php-console-highlighter/tests/JakubOnderka/PhpConsoleHighligter/HigligterTest.php
+++ b/vendor/jakub-onderka/php-console-highlighter/tests/HigligterTest.php
@@ -8,7 +8,9 @@ class HighlighterTest extends \PHPUnit_Framework_TestCase
 
     protected function getConsoleColorMock()
     {
-        $mock = $this->getMock('\JakubOnderka\PhpConsoleColor\ConsoleColor');
+        $mock = method_exists($this, 'createMock')
+            ? $this->createMock('\JakubOnderka\PhpConsoleColor\ConsoleColor')
+            : $this->getMock('\JakubOnderka\PhpConsoleColor\ConsoleColor');
 
         $mock->expects($this->any())
             ->method('apply')
@@ -260,4 +262,13 @@ EOL
             ''
         );
     }
-}
\ No newline at end of file
+
+    public function testWhitespace()
+    {
+        $this->compare(
+            ' '
+            ,
+            '<token_html> </token_html>'
+        );
+    }
+}
diff --git a/vendor/jakub-onderka/php-console-highlighter/tests/bootstrap.php b/vendor/jakub-onderka/php-console-highlighter/tests/bootstrap.php
deleted file mode 100644
index 7500417e..00000000
--- a/vendor/jakub-onderka/php-console-highlighter/tests/bootstrap.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-$loader = require_once __DIR__ . '/../vendor/autoload.php';
\ No newline at end of file
diff --git a/vendor/laravel/framework/README.md b/vendor/laravel/framework/README.md
index d5c2fa27..834277a6 100644
--- a/vendor/laravel/framework/README.md
+++ b/vendor/laravel/framework/README.md
@@ -30,7 +30,7 @@ If you're not in the mood to read, [Laracasts](https://laracasts.com) contains o
 
 ## Contributing
 
-Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](http://laravel.com/docs/contributions).
+Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions).
 
 ## Code of Conduct
 
@@ -42,4 +42,4 @@ If you discover a security vulnerability within Laravel, please send an e-mail t
 
 ## License
 
-The Laravel framework is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT).
+The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
diff --git a/vendor/laravel/framework/composer.json b/vendor/laravel/framework/composer.json
index f892a85e..26cc83ea 100644
--- a/vendor/laravel/framework/composer.json
+++ b/vendor/laravel/framework/composer.json
@@ -15,29 +15,30 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
+        "php": "^7.1.3",
         "ext-mbstring": "*",
         "ext-openssl": "*",
-        "doctrine/inflector": "~1.1",
-        "erusev/parsedown": "~1.7",
+        "doctrine/inflector": "^1.1",
+        "dragonmantank/cron-expression": "^2.0",
+        "erusev/parsedown": "^1.7",
         "league/flysystem": "^1.0.8",
-        "monolog/monolog": "~1.12",
-        "mtdowling/cron-expression": "~1.0",
-        "nesbot/carbon": "^1.24.1",
-        "psr/container": "~1.0",
+        "monolog/monolog": "^1.12",
+        "nesbot/carbon": "^1.26.3",
+        "opis/closure": "^3.1",
+        "psr/container": "^1.0",
         "psr/simple-cache": "^1.0",
-        "ramsey/uuid": "~3.0",
-        "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"
+        "ramsey/uuid": "^3.7",
+        "swiftmailer/swiftmailer": "^6.0",
+        "symfony/console": "^4.1",
+        "symfony/debug": "^4.1",
+        "symfony/finder": "^4.1",
+        "symfony/http-foundation": "^4.1",
+        "symfony/http-kernel": "^4.1",
+        "symfony/process": "^4.1",
+        "symfony/routing": "^4.1",
+        "symfony/var-dumper": "^4.1",
+        "tijsverkoyen/css-to-inline-styles": "^2.2.1",
+        "vlucas/phpdotenv": "^2.2"
     },
     "replace": {
         "illuminate/auth": "self.version",
@@ -67,20 +68,25 @@
         "illuminate/support": "self.version",
         "illuminate/translation": "self.version",
         "illuminate/validation": "self.version",
-        "illuminate/view": "self.version",
+        "illuminate/view": "self.version"
+    },
+    "conflict": {
         "tightenco/collect": "<5.5.33"
     },
     "require-dev": {
-        "aws/aws-sdk-php": "~3.0",
-        "doctrine/dbal": "~2.5",
+        "aws/aws-sdk-php": "^3.0",
+        "doctrine/dbal": "^2.6",
         "filp/whoops": "^2.1.4",
-        "mockery/mockery": "~1.0",
-        "orchestra/testbench-core": "3.5.*",
-        "pda/pheanstalk": "~3.0",
-        "phpunit/phpunit": "~6.0",
+        "league/flysystem-cached-adapter": "^1.0",
+        "mockery/mockery": "^1.0",
+        "moontoast/math": "^1.1",
+        "orchestra/testbench-core": "3.7.*",
+        "pda/pheanstalk": "^3.0",
+        "phpunit/phpunit": "^7.0",
         "predis/predis": "^1.1.1",
-        "symfony/css-selector": "~3.3",
-        "symfony/dom-crawler": "~3.3"
+        "symfony/css-selector": "^4.1",
+        "symfony/dom-crawler": "^4.1",
+        "true/punycode": "^2.1"
     },
     "autoload": {
         "files": [
@@ -101,27 +107,29 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "suggest": {
         "ext-pcntl": "Required to use all features of the queue worker.",
         "ext-posix": "Required to use all features of the queue worker.",
-        "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).",
-        "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).",
-        "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).",
-        "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).",
-        "league/flysystem-cached-adapter": "Required to use Flysystem caching (~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 (~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)."
+        "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.6).",
+        "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).",
+        "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).",
+        "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).",
+        "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (^1.0).",
+        "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
+        "moontoast/math": "Required to use ordered UUIDs (^1.1).",
+        "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 (^3.0).",
+        "symfony/css-selector": "Required to use some of the crawler integration testing tools (^4.1).",
+        "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (^4.1).",
+        "symfony/psr-http-message-bridge": "Required to psr7 bridging features (^1.0)."
     },
     "config": {
         "sort-packages": true
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Access/Gate.php b/vendor/laravel/framework/src/Illuminate/Auth/Access/Gate.php
index dfc72cf0..e7a3f9cc 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/Access/Gate.php
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Access/Gate.php
@@ -2,6 +2,9 @@
 
 namespace Illuminate\Auth\Access;
 
+use Exception;
+use ReflectionClass;
+use ReflectionFunction;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use InvalidArgumentException;
@@ -108,7 +111,7 @@ class Gate implements GateContract
     {
         if (is_callable($callback)) {
             $this->abilities[$ability] = $callback;
-        } elseif (is_string($callback) && Str::contains($callback, '@')) {
+        } elseif (is_string($callback)) {
             $this->abilities[$ability] = $this->buildAbilityCallback($ability, $callback);
         } else {
             throw new InvalidArgumentException("Callback must be a callable or a 'Class@method' string.");
@@ -122,7 +125,7 @@ class Gate implements GateContract
      *
      * @param  string  $name
      * @param  string  $class
-     * @param  array   $abilities
+     * @param  array|null   $abilities
      * @return $this
      */
     public function resource($name, $class, array $abilities = null)
@@ -151,7 +154,11 @@ class Gate implements GateContract
     protected function buildAbilityCallback($ability, $callback)
     {
         return function () use ($ability, $callback) {
-            list($class, $method) = Str::parseCallback($callback);
+            if (Str::contains($callback, '@')) {
+                [$class, $method] = Str::parseCallback($callback);
+            } else {
+                $class = $callback;
+            }
 
             $policy = $this->resolvePolicy($class);
 
@@ -167,7 +174,9 @@ class Gate implements GateContract
                 return $result;
             }
 
-            return $policy->{$method}(...func_get_args());
+            return isset($method)
+                    ? $policy->{$method}(...func_get_args())
+                    : $policy(...func_get_args());
         };
     }
 
@@ -294,14 +303,12 @@ class Gate implements GateContract
      * @param  array|mixed  $arguments
      * @return mixed
      */
-    protected function raw($ability, $arguments = [])
+    public function raw($ability, $arguments = [])
     {
-        if (! $user = $this->resolveUser()) {
-            return false;
-        }
-
         $arguments = Arr::wrap($arguments);
 
+        $user = $this->resolveUser();
+
         // First we will call the "before" callbacks for the Gate. If any of these give
         // back a non-null response, we will immediately return that result in order
         // to let the developers override all checks for some authorization cases.
@@ -316,17 +323,94 @@ class Gate implements GateContract
         // After calling the authorization callback, we will call the "after" callbacks
         // that are registered with the Gate, which allows a developer to do logging
         // if that is required for this application. Then we'll return the result.
-        $this->callAfterCallbacks(
+        return $this->callAfterCallbacks(
             $user, $ability, $arguments, $result
         );
+    }
 
-        return $result;
+    /**
+     * Determine whether the callback/method can be called with the given user.
+     *
+     * @param  \Illuminate\Contracts\Auth\Authenticatable|null  $user
+     * @param  \Closure|string|array  $class
+     * @param  string|null $method
+     * @return bool
+     */
+    protected function canBeCalledWithUser($user, $class, $method = null)
+    {
+        if (! is_null($user)) {
+            return true;
+        }
+
+        if (! is_null($method)) {
+            return $this->methodAllowsGuests($class, $method);
+        }
+
+        if (is_array($class)) {
+            $className = is_string($class[0]) ? $class[0] : get_class($class[0]);
+
+            return $this->methodAllowsGuests($className, $class[1]);
+        }
+
+        return $this->callbackAllowsGuests($class);
+    }
+
+    /**
+     * Determine if the given class method allows guests.
+     *
+     * @param  string  $class
+     * @param  string  $method
+     * @return bool
+     */
+    protected function methodAllowsGuests($class, $method)
+    {
+        try {
+            $reflection = new ReflectionClass($class);
+
+            $method = $reflection->getMethod($method);
+        } catch (Exception $e) {
+            return false;
+        }
+
+        if ($method) {
+            $parameters = $method->getParameters();
+
+            return isset($parameters[0]) && $this->parameterAllowsGuests($parameters[0]);
+        }
+
+        return false;
+    }
+
+    /**
+     * Determine if the callback allows guests.
+     *
+     * @param  callable  $callback
+     * @param  array  $arguments
+     * @return bool
+     */
+    protected function callbackAllowsGuests($callback)
+    {
+        $parameters = (new ReflectionFunction($callback))->getParameters();
+
+        return isset($parameters[0]) && $this->parameterAllowsGuests($parameters[0]);
+    }
+
+    /**
+     * Determine if the given parameter allows guests.
+     *
+     * @param  \ReflectionParameter  $parameter
+     * @return bool
+     */
+    protected function parameterAllowsGuests($parameter)
+    {
+        return ($parameter->getClass() && $parameter->allowsNull()) ||
+               ($parameter->isDefaultValueAvailable() && is_null($parameter->getDefaultValue()));
     }
 
     /**
      * Resolve and call the appropriate authorization callback.
      *
-     * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
+     * @param  \Illuminate\Contracts\Auth\Authenticatable|null  $user
      * @param  string  $ability
      * @param  array  $arguments
      * @return bool
@@ -341,7 +425,7 @@ class Gate implements GateContract
     /**
      * Call all of the before callbacks and return if a result is given.
      *
-     * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
+     * @param  \Illuminate\Contracts\Auth\Authenticatable|null  $user
      * @param  string  $ability
      * @param  array  $arguments
      * @return bool|null
@@ -351,6 +435,10 @@ class Gate implements GateContract
         $arguments = array_merge([$user, $ability], [$arguments]);
 
         foreach ($this->beforeCallbacks as $before) {
+            if (! $this->canBeCalledWithUser($user, $before)) {
+                continue;
+            }
+
             if (! is_null($result = $before(...$arguments))) {
                 return $result;
             }
@@ -368,17 +456,23 @@ class Gate implements GateContract
      */
     protected function callAfterCallbacks($user, $ability, array $arguments, $result)
     {
-        $arguments = array_merge([$user, $ability, $result], [$arguments]);
-
         foreach ($this->afterCallbacks as $after) {
-            $after(...$arguments);
+            if (! $this->canBeCalledWithUser($user, $after)) {
+                continue;
+            }
+
+            $afterResult = $after($user, $ability, $result, $arguments);
+
+            $result = $result ?? $afterResult;
         }
+
+        return $result;
     }
 
     /**
      * Resolve the callable for the given ability and arguments.
      *
-     * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
+     * @param  \Illuminate\Contracts\Auth\Authenticatable|null  $user
      * @param  string  $ability
      * @param  array  $arguments
      * @return callable
@@ -391,12 +485,13 @@ class Gate implements GateContract
             return $callback;
         }
 
-        if (isset($this->abilities[$ability])) {
+        if (isset($this->abilities[$ability]) &&
+            $this->canBeCalledWithUser($user, $this->abilities[$ability])) {
             return $this->abilities[$ability];
         }
 
         return function () {
-            return false;
+            return null;
         };
     }
 
@@ -468,18 +563,9 @@ class Gate implements GateContract
                 return $result;
             }
 
-            $ability = $this->formatAbilityToMethod($ability);
+            $method = $this->formatAbilityToMethod($ability);
 
-            // If this first argument is a string, that means they are passing a class name
-            // to the policy. We will remove the first argument from this argument array
-            // because this policy already knows what type of models it can authorize.
-            if (isset($arguments[0]) && is_string($arguments[0])) {
-                array_shift($arguments);
-            }
-
-            return is_callable([$policy, $ability])
-                        ? $policy->{$ability}($user, ...$arguments)
-                        : false;
+            return $this->callPolicyMethod($policy, $method, $user, $arguments);
         };
     }
 
@@ -494,11 +580,42 @@ class Gate implements GateContract
      */
     protected function callPolicyBefore($policy, $user, $ability, $arguments)
     {
-        if (method_exists($policy, 'before')) {
+        if (! method_exists($policy, 'before')) {
+            return null;
+        }
+
+        if ($this->canBeCalledWithUser($user, $policy, 'before')) {
             return $policy->before($user, $ability, ...$arguments);
         }
     }
 
+    /**
+     * Call the appropriate method on the given policy.
+     *
+     * @param  mixed  $policy
+     * @param  string  $method
+     * @param  \Illuminate\Contracts\Auth\Authenticatable|null  $user
+     * @param  array  $arguments
+     * @return mixed
+     */
+    protected function callPolicyMethod($policy, $method, $user, array $arguments)
+    {
+        // If this first argument is a string, that means they are passing a class name
+        // to the policy. We will remove the first argument from this argument array
+        // because this policy already knows what type of models it can authorize.
+        if (isset($arguments[0]) && is_string($arguments[0])) {
+            array_shift($arguments);
+        }
+
+        if (! is_callable([$policy, $method])) {
+            return null;
+        }
+
+        if ($this->canBeCalledWithUser($user, $policy, $method)) {
+            return $policy->{$method}($user, ...$arguments);
+        }
+    }
+
     /**
      * Format the policy ability into a method name.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Access/Response.php b/vendor/laravel/framework/src/Illuminate/Auth/Access/Response.php
index a2baff36..7fab01ef 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/Access/Response.php
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Access/Response.php
@@ -39,6 +39,6 @@ class Response
      */
     public function __toString()
     {
-        return $this->message();
+        return (string) $this->message();
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/AuthManager.php b/vendor/laravel/framework/src/Illuminate/Auth/AuthManager.php
index 49825fae..05fefe17 100755
--- a/vendor/laravel/framework/src/Illuminate/Auth/AuthManager.php
+++ b/vendor/laravel/framework/src/Illuminate/Auth/AuthManager.php
@@ -94,7 +94,7 @@ class AuthManager implements FactoryContract
             return $this->{$driverMethod}($name, $config);
         }
 
-        throw new InvalidArgumentException("Auth guard driver [{$name}] is not defined.");
+        throw new InvalidArgumentException("Auth driver [{$config['driver']}] for guard [{$name}] is not defined.");
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/AuthenticationException.php b/vendor/laravel/framework/src/Illuminate/Auth/AuthenticationException.php
index 3445b23a..ef7dbee6 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/AuthenticationException.php
+++ b/vendor/laravel/framework/src/Illuminate/Auth/AuthenticationException.php
@@ -13,18 +13,27 @@ class AuthenticationException extends Exception
      */
     protected $guards;
 
+    /**
+     * The path the user should be redirected to.
+     *
+     * @var string
+     */
+    protected $redirectTo;
+
     /**
      * Create a new authentication exception.
      *
      * @param  string  $message
      * @param  array  $guards
+     * @param  string|null  $redirectTo
      * @return void
      */
-    public function __construct($message = 'Unauthenticated.', array $guards = [])
+    public function __construct($message = 'Unauthenticated.', array $guards = [], $redirectTo = null)
     {
         parent::__construct($message);
 
         $this->guards = $guards;
+        $this->redirectTo = $redirectTo;
     }
 
     /**
@@ -36,4 +45,14 @@ class AuthenticationException extends Exception
     {
         return $this->guards;
     }
+
+    /**
+     * Get the path the user should be redirected to.
+     *
+     * @return string
+     */
+    public function redirectTo()
+    {
+        return $this->redirectTo;
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Console/AuthMakeCommand.php b/vendor/laravel/framework/src/Illuminate/Auth/Console/AuthMakeCommand.php
index 52041fa3..cfe95977 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/Console/AuthMakeCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Console/AuthMakeCommand.php
@@ -33,6 +33,7 @@ class AuthMakeCommand extends Command
     protected $views = [
         'auth/login.stub' => 'auth/login.blade.php',
         'auth/register.stub' => 'auth/register.blade.php',
+        'auth/verify.stub' => 'auth/verify.blade.php',
         'auth/passwords/email.stub' => 'auth/passwords/email.blade.php',
         'auth/passwords/reset.stub' => 'auth/passwords/reset.blade.php',
         'layouts/app.stub' => 'layouts/app.blade.php',
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/login.stub b/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/login.stub
index 07924ce6..47e3f530 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/login.stub
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/login.stub
@@ -2,61 +2,63 @@
 
 @section('content')
 <div class="container">
-    <div class="row">
-        <div class="col-md-8 col-md-offset-2">
-            <div class="panel panel-default">
-                <div class="panel-heading">Login</div>
+    <div class="row justify-content-center">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header">{{ __('Login') }}</div>
 
-                <div class="panel-body">
-                    <form class="form-horizontal" method="POST" action="{{ route('login') }}">
-                        {{ csrf_field() }}
+                <div class="card-body">
+                    <form method="POST" action="{{ route('login') }}">
+                        @csrf
 
-                        <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
-                            <label for="email" class="col-md-4 control-label">E-Mail Address</label>
+                        <div class="form-group row">
+                            <label for="email" class="col-sm-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
 
                             <div class="col-md-6">
-                                <input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required autofocus>
+                                <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required autofocus>
 
                                 @if ($errors->has('email'))
-                                    <span class="help-block">
+                                    <span class="invalid-feedback" role="alert">
                                         <strong>{{ $errors->first('email') }}</strong>
                                     </span>
                                 @endif
                             </div>
                         </div>
 
-                        <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
-                            <label for="password" class="col-md-4 control-label">Password</label>
+                        <div class="form-group row">
+                            <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
 
                             <div class="col-md-6">
-                                <input id="password" type="password" class="form-control" name="password" required>
+                                <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required>
 
                                 @if ($errors->has('password'))
-                                    <span class="help-block">
+                                    <span class="invalid-feedback" role="alert">
                                         <strong>{{ $errors->first('password') }}</strong>
                                     </span>
                                 @endif
                             </div>
                         </div>
 
-                        <div class="form-group">
-                            <div class="col-md-6 col-md-offset-4">
-                                <div class="checkbox">
-                                    <label>
-                                        <input type="checkbox" name="remember" {{ old('remember') ? 'checked' : '' }}> Remember Me
+                        <div class="form-group row">
+                            <div class="col-md-6 offset-md-4">
+                                <div class="form-check">
+                                    <input class="form-check-input" type="checkbox" name="remember" id="remember" {{ old('remember') ? 'checked' : '' }}>
+
+                                    <label class="form-check-label" for="remember">
+                                        {{ __('Remember Me') }}
                                     </label>
                                 </div>
                             </div>
                         </div>
 
-                        <div class="form-group">
-                            <div class="col-md-8 col-md-offset-4">
+                        <div class="form-group row mb-0">
+                            <div class="col-md-8 offset-md-4">
                                 <button type="submit" class="btn btn-primary">
-                                    Login
+                                    {{ __('Login') }}
                                 </button>
 
                                 <a class="btn btn-link" href="{{ route('password.request') }}">
-                                    Forgot Your Password?
+                                    {{ __('Forgot Your Password?') }}
                                 </a>
                             </div>
                         </div>
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/passwords/email.stub b/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/passwords/email.stub
index ad38245b..ccbee595 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/passwords/email.stub
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/passwords/email.stub
@@ -2,39 +2,39 @@
 
 @section('content')
 <div class="container">
-    <div class="row">
-        <div class="col-md-8 col-md-offset-2">
-            <div class="panel panel-default">
-                <div class="panel-heading">Reset Password</div>
+    <div class="row justify-content-center">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header">{{ __('Reset Password') }}</div>
 
-                <div class="panel-body">
+                <div class="card-body">
                     @if (session('status'))
-                        <div class="alert alert-success">
+                        <div class="alert alert-success" role="alert">
                             {{ session('status') }}
                         </div>
                     @endif
 
-                    <form class="form-horizontal" method="POST" action="{{ route('password.email') }}">
-                        {{ csrf_field() }}
+                    <form method="POST" action="{{ route('password.email') }}">
+                        @csrf
 
-                        <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
-                            <label for="email" class="col-md-4 control-label">E-Mail Address</label>
+                        <div class="form-group row">
+                            <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
 
                             <div class="col-md-6">
-                                <input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required>
+                                <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required>
 
                                 @if ($errors->has('email'))
-                                    <span class="help-block">
+                                    <span class="invalid-feedback" role="alert">
                                         <strong>{{ $errors->first('email') }}</strong>
                                     </span>
                                 @endif
                             </div>
                         </div>
 
-                        <div class="form-group">
-                            <div class="col-md-6 col-md-offset-4">
+                        <div class="form-group row mb-0">
+                            <div class="col-md-6 offset-md-4">
                                 <button type="submit" class="btn btn-primary">
-                                    Send Password Reset Link
+                                    {{ __('Send Password Reset Link') }}
                                 </button>
                             </div>
                         </div>
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/passwords/reset.stub b/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/passwords/reset.stub
index 84ec0101..bf27f4c8 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/passwords/reset.stub
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/passwords/reset.stub
@@ -2,62 +2,57 @@
 
 @section('content')
 <div class="container">
-    <div class="row">
-        <div class="col-md-8 col-md-offset-2">
-            <div class="panel panel-default">
-                <div class="panel-heading">Reset Password</div>
+    <div class="row justify-content-center">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header">{{ __('Reset Password') }}</div>
 
-                <div class="panel-body">
-                    <form class="form-horizontal" method="POST" action="{{ route('password.request') }}">
-                        {{ csrf_field() }}
+                <div class="card-body">
+                    <form method="POST" action="{{ route('password.update') }}">
+                        @csrf
 
                         <input type="hidden" name="token" value="{{ $token }}">
 
-                        <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
-                            <label for="email" class="col-md-4 control-label">E-Mail Address</label>
+                        <div class="form-group row">
+                            <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
 
                             <div class="col-md-6">
-                                <input id="email" type="email" class="form-control" name="email" value="{{ $email or old('email') }}" required autofocus>
+                                <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ $email ?? old('email') }}" required autofocus>
 
                                 @if ($errors->has('email'))
-                                    <span class="help-block">
+                                    <span class="invalid-feedback" role="alert">
                                         <strong>{{ $errors->first('email') }}</strong>
                                     </span>
                                 @endif
                             </div>
                         </div>
 
-                        <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
-                            <label for="password" class="col-md-4 control-label">Password</label>
+                        <div class="form-group row">
+                            <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
 
                             <div class="col-md-6">
-                                <input id="password" type="password" class="form-control" name="password" required>
+                                <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required>
 
                                 @if ($errors->has('password'))
-                                    <span class="help-block">
+                                    <span class="invalid-feedback" role="alert">
                                         <strong>{{ $errors->first('password') }}</strong>
                                     </span>
                                 @endif
                             </div>
                         </div>
 
-                        <div class="form-group{{ $errors->has('password_confirmation') ? ' has-error' : '' }}">
-                            <label for="password-confirm" class="col-md-4 control-label">Confirm Password</label>
+                        <div class="form-group row">
+                            <label for="password-confirm" class="col-md-4 col-form-label text-md-right">{{ __('Confirm Password') }}</label>
+
                             <div class="col-md-6">
                                 <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
-
-                                @if ($errors->has('password_confirmation'))
-                                    <span class="help-block">
-                                        <strong>{{ $errors->first('password_confirmation') }}</strong>
-                                    </span>
-                                @endif
                             </div>
                         </div>
 
-                        <div class="form-group">
-                            <div class="col-md-6 col-md-offset-4">
+                        <div class="form-group row mb-0">
+                            <div class="col-md-6 offset-md-4">
                                 <button type="submit" class="btn btn-primary">
-                                    Reset Password
+                                    {{ __('Reset Password') }}
                                 </button>
                             </div>
                         </div>
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/register.stub b/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/register.stub
index 38eef838..ad95f2cf 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/register.stub
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/register.stub
@@ -2,69 +2,69 @@
 
 @section('content')
 <div class="container">
-    <div class="row">
-        <div class="col-md-8 col-md-offset-2">
-            <div class="panel panel-default">
-                <div class="panel-heading">Register</div>
+    <div class="row justify-content-center">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header">{{ __('Register') }}</div>
 
-                <div class="panel-body">
-                    <form class="form-horizontal" method="POST" action="{{ route('register') }}">
-                        {{ csrf_field() }}
+                <div class="card-body">
+                    <form method="POST" action="{{ route('register') }}">
+                        @csrf
 
-                        <div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
-                            <label for="name" class="col-md-4 control-label">Name</label>
+                        <div class="form-group row">
+                            <label for="name" class="col-md-4 col-form-label text-md-right">{{ __('Name') }}</label>
 
                             <div class="col-md-6">
-                                <input id="name" type="text" class="form-control" name="name" value="{{ old('name') }}" required autofocus>
+                                <input id="name" type="text" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" name="name" value="{{ old('name') }}" required autofocus>
 
                                 @if ($errors->has('name'))
-                                    <span class="help-block">
+                                    <span class="invalid-feedback" role="alert">
                                         <strong>{{ $errors->first('name') }}</strong>
                                     </span>
                                 @endif
                             </div>
                         </div>
 
-                        <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
-                            <label for="email" class="col-md-4 control-label">E-Mail Address</label>
+                        <div class="form-group row">
+                            <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
 
                             <div class="col-md-6">
-                                <input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required>
+                                <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required>
 
                                 @if ($errors->has('email'))
-                                    <span class="help-block">
+                                    <span class="invalid-feedback" role="alert">
                                         <strong>{{ $errors->first('email') }}</strong>
                                     </span>
                                 @endif
                             </div>
                         </div>
 
-                        <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
-                            <label for="password" class="col-md-4 control-label">Password</label>
+                        <div class="form-group row">
+                            <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
 
                             <div class="col-md-6">
-                                <input id="password" type="password" class="form-control" name="password" required>
+                                <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required>
 
                                 @if ($errors->has('password'))
-                                    <span class="help-block">
+                                    <span class="invalid-feedback" role="alert">
                                         <strong>{{ $errors->first('password') }}</strong>
                                     </span>
                                 @endif
                             </div>
                         </div>
 
-                        <div class="form-group">
-                            <label for="password-confirm" class="col-md-4 control-label">Confirm Password</label>
+                        <div class="form-group row">
+                            <label for="password-confirm" class="col-md-4 col-form-label text-md-right">{{ __('Confirm Password') }}</label>
 
                             <div class="col-md-6">
                                 <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
                             </div>
                         </div>
 
-                        <div class="form-group">
-                            <div class="col-md-6 col-md-offset-4">
+                        <div class="form-group row mb-0">
+                            <div class="col-md-6 offset-md-4">
                                 <button type="submit" class="btn btn-primary">
-                                    Register
+                                    {{ __('Register') }}
                                 </button>
                             </div>
                         </div>
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/verify.stub b/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/verify.stub
new file mode 100644
index 00000000..c742cb4b
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/auth/verify.stub
@@ -0,0 +1,24 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header">{{ __('Verify Your Email Address') }}</div>
+
+                <div class="card-body">
+                    @if (session('resent'))
+                        <div class="alert alert-success" role="alert">
+                            {{ __('A fresh verification link has been sent to your email address.') }}
+                        </div>
+                    @endif
+
+                    {{ __('Before proceeding, please check your email for a verification link.') }}
+                    {{ __('If you did not receive the email') }}, <a href="{{ route('verification.resend') }}">{{ __('click here to request another') }}</a>.
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/home.stub b/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/home.stub
index d8437bf8..05dfca92 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/home.stub
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/home.stub
@@ -2,14 +2,14 @@
 
 @section('content')
 <div class="container">
-    <div class="row">
-        <div class="col-md-8 col-md-offset-2">
-            <div class="panel panel-default">
-                <div class="panel-heading">Dashboard</div>
+    <div class="row justify-content-center">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header">Dashboard</div>
 
-                <div class="panel-body">
+                <div class="card-body">
                     @if (session('status'))
-                        <div class="alert alert-success">
+                        <div class="alert alert-success" role="alert">
                             {{ session('status') }}
                         </div>
                     @endif
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/layouts/app.stub b/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/layouts/app.stub
index f97a8a20..dc245d98 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/layouts/app.stub
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/layouts/app.stub
@@ -1,8 +1,7 @@
 <!DOCTYPE html>
-<html lang="{{ app()->getLocale() }}">
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
 <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <!-- CSRF Token -->
@@ -10,60 +9,62 @@
 
     <title>{{ config('app.name', 'Laravel') }}</title>
 
+    <!-- Scripts -->
+    <script src="{{ asset('js/app.js') }}" defer></script>
+
+    <!-- Fonts -->
+    <link rel="dns-prefetch" href="https://fonts.gstatic.com">
+    <link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet" type="text/css">
+
     <!-- Styles -->
     <link href="{{ asset('css/app.css') }}" rel="stylesheet">
 </head>
 <body>
     <div id="app">
-        <nav class="navbar navbar-default navbar-static-top">
+        <nav class="navbar navbar-expand-md navbar-light navbar-laravel">
             <div class="container">
-                <div class="navbar-header">
-
-                    <!-- Collapsed Hamburger -->
-                    <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#app-navbar-collapse" aria-expanded="false">
-                        <span class="sr-only">Toggle Navigation</span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                    </button>
-
-                    <!-- Branding Image -->
-                    <a class="navbar-brand" href="{{ url('/') }}">
-                        {{ config('app.name', 'Laravel') }}
-                    </a>
-                </div>
+                <a class="navbar-brand" href="{{ url('/') }}">
+                    {{ config('app.name', 'Laravel') }}
+                </a>
+                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
+                    <span class="navbar-toggler-icon"></span>
+                </button>
 
-                <div class="collapse navbar-collapse" id="app-navbar-collapse">
+                <div class="collapse navbar-collapse" id="navbarSupportedContent">
                     <!-- Left Side Of Navbar -->
-                    <ul class="nav navbar-nav">
-                        &nbsp;
+                    <ul class="navbar-nav mr-auto">
+
                     </ul>
 
                     <!-- Right Side Of Navbar -->
-                    <ul class="nav navbar-nav navbar-right">
+                    <ul class="navbar-nav ml-auto">
                         <!-- Authentication Links -->
                         @guest
-                            <li><a href="{{ route('login') }}">Login</a></li>
-                            <li><a href="{{ route('register') }}">Register</a></li>
+                            <li class="nav-item">
+                                <a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a>
+                            </li>
+                            <li class="nav-item">
+                                @if (Route::has('register'))
+                                    <a class="nav-link" href="{{ route('register') }}">{{ __('Register') }}</a>
+                                @endif
+                            </li>
                         @else
-                            <li class="dropdown">
-                                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false" aria-haspopup="true" v-pre>
+                            <li class="nav-item dropdown">
+                                <a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
                                     {{ Auth::user()->name }} <span class="caret"></span>
                                 </a>
 
-                                <ul class="dropdown-menu">
-                                    <li>
-                                        <a href="{{ route('logout') }}"
-                                            onclick="event.preventDefault();
+                                <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
+                                    <a class="dropdown-item" href="{{ route('logout') }}"
+                                       onclick="event.preventDefault();
                                                      document.getElementById('logout-form').submit();">
-                                            Logout
-                                        </a>
+                                        {{ __('Logout') }}
+                                    </a>
 
-                                        <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
-                                            {{ csrf_field() }}
-                                        </form>
-                                    </li>
-                                </ul>
+                                    <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
+                                        @csrf
+                                    </form>
+                                </div>
                             </li>
                         @endguest
                     </ul>
@@ -71,10 +72,9 @@
             </div>
         </nav>
 
-        @yield('content')
+        <main class="py-4">
+            @yield('content')
+        </main>
     </div>
-
-    <!-- Scripts -->
-    <script src="{{ asset('js/app.js') }}"></script>
 </body>
 </html>
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/DatabaseUserProvider.php b/vendor/laravel/framework/src/Illuminate/Auth/DatabaseUserProvider.php
index d69cfc62..f8005b7d 100755
--- a/vendor/laravel/framework/src/Illuminate/Auth/DatabaseUserProvider.php
+++ b/vendor/laravel/framework/src/Illuminate/Auth/DatabaseUserProvider.php
@@ -4,6 +4,7 @@ namespace Illuminate\Auth;
 
 use Illuminate\Support\Str;
 use Illuminate\Contracts\Auth\UserProvider;
+use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Database\ConnectionInterface;
 use Illuminate\Contracts\Hashing\Hasher as HasherContract;
 use Illuminate\Contracts\Auth\Authenticatable as UserContract;
@@ -110,7 +111,13 @@ class DatabaseUserProvider implements UserProvider
         $query = $this->conn->table($this->table);
 
         foreach ($credentials as $key => $value) {
-            if (! Str::contains($key, 'password')) {
+            if (Str::contains($key, 'password')) {
+                continue;
+            }
+
+            if (is_array($value) || $value instanceof Arrayable) {
+                $query->whereIn($key, $value);
+            } else {
                 $query->where($key, $value);
             }
         }
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/EloquentUserProvider.php b/vendor/laravel/framework/src/Illuminate/Auth/EloquentUserProvider.php
index 1630ebe9..23b5b792 100755
--- a/vendor/laravel/framework/src/Illuminate/Auth/EloquentUserProvider.php
+++ b/vendor/laravel/framework/src/Illuminate/Auth/EloquentUserProvider.php
@@ -4,6 +4,7 @@ namespace Illuminate\Auth;
 
 use Illuminate\Support\Str;
 use Illuminate\Contracts\Auth\UserProvider;
+use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Hashing\Hasher as HasherContract;
 use Illuminate\Contracts\Auth\Authenticatable as UserContract;
 
@@ -76,7 +77,7 @@ class EloquentUserProvider implements UserProvider
     /**
      * Update the "remember me" token for the given user in storage.
      *
-     * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
+     * @param  \Illuminate\Contracts\Auth\Authenticatable|\Illuminate\Database\Eloquent\Model  $user
      * @param  string  $token
      * @return void
      */
@@ -113,7 +114,13 @@ class EloquentUserProvider implements UserProvider
         $query = $this->createModel()->newQuery();
 
         foreach ($credentials as $key => $value) {
-            if (! Str::contains($key, 'password')) {
+            if (Str::contains($key, 'password')) {
+                continue;
+            }
+
+            if (is_array($value) || $value instanceof Arrayable) {
+                $query->whereIn($key, $value);
+            } else {
                 $query->where($key, $value);
             }
         }
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Events/Attempting.php b/vendor/laravel/framework/src/Illuminate/Auth/Events/Attempting.php
index 8353021f..3f911bac 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/Events/Attempting.php
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Events/Attempting.php
@@ -4,6 +4,13 @@ namespace Illuminate\Auth\Events;
 
 class Attempting
 {
+    /**
+     * The authentication guard name.
+     *
+     * @var string
+     */
+    public $guard;
+
     /**
      * The credentials for the user.
      *
@@ -21,12 +28,14 @@ class Attempting
     /**
      * Create a new event instance.
      *
+     * @param  string  $guard
      * @param  array  $credentials
      * @param  bool  $remember
      * @return void
      */
-    public function __construct($credentials, $remember)
+    public function __construct($guard, $credentials, $remember)
     {
+        $this->guard = $guard;
         $this->remember = $remember;
         $this->credentials = $credentials;
     }
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Events/Authenticated.php b/vendor/laravel/framework/src/Illuminate/Auth/Events/Authenticated.php
index f33c198d..faefcbec 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/Events/Authenticated.php
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Events/Authenticated.php
@@ -8,6 +8,13 @@ class Authenticated
 {
     use SerializesModels;
 
+    /**
+     * The authentication guard name.
+     *
+     * @var string
+     */
+    public $guard;
+
     /**
      * The authenticated user.
      *
@@ -18,11 +25,13 @@ class Authenticated
     /**
      * Create a new event instance.
      *
+     * @param  string  $guard
      * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
      * @return void
      */
-    public function __construct($user)
+    public function __construct($guard, $user)
     {
         $this->user = $user;
+        $this->guard = $guard;
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Events/Failed.php b/vendor/laravel/framework/src/Illuminate/Auth/Events/Failed.php
index 31e999c9..34f81248 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/Events/Failed.php
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Events/Failed.php
@@ -4,6 +4,13 @@ namespace Illuminate\Auth\Events;
 
 class Failed
 {
+    /**
+     * The authentication guard name.
+     *
+     * @var string
+     */
+    public $guard;
+
     /**
      * The user the attempter was trying to authenticate as.
      *
@@ -21,13 +28,15 @@ class Failed
     /**
      * Create a new event instance.
      *
+     * @param  string  $guard
      * @param  \Illuminate\Contracts\Auth\Authenticatable|null  $user
      * @param  array  $credentials
      * @return void
      */
-    public function __construct($user, $credentials)
+    public function __construct($guard, $user, $credentials)
     {
         $this->user = $user;
+        $this->guard = $guard;
         $this->credentials = $credentials;
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Events/Login.php b/vendor/laravel/framework/src/Illuminate/Auth/Events/Login.php
index 88167459..3005183a 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/Events/Login.php
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Events/Login.php
@@ -8,6 +8,13 @@ class Login
 {
     use SerializesModels;
 
+    /**
+     * The authentication guard name.
+     *
+     * @var string
+     */
+    public $guard;
+
     /**
      * The authenticated user.
      *
@@ -25,13 +32,15 @@ class Login
     /**
      * Create a new event instance.
      *
+     * @param  string $guard
      * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
      * @param  bool  $remember
      * @return void
      */
-    public function __construct($user, $remember)
+    public function __construct($guard, $user, $remember)
     {
         $this->user = $user;
+        $this->guard = $guard;
         $this->remember = $remember;
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Events/Logout.php b/vendor/laravel/framework/src/Illuminate/Auth/Events/Logout.php
index ea788e71..bc8c3940 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/Events/Logout.php
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Events/Logout.php
@@ -8,6 +8,13 @@ class Logout
 {
     use SerializesModels;
 
+    /**
+     * The authentication guard name.
+     *
+     * @var string
+     */
+    public $guard;
+
     /**
      * The authenticated user.
      *
@@ -18,11 +25,13 @@ class Logout
     /**
      * Create a new event instance.
      *
+     * @param  string $guard
      * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
      * @return void
      */
-    public function __construct($user)
+    public function __construct($guard, $user)
     {
         $this->user = $user;
+        $this->guard = $guard;
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Events/Verified.php b/vendor/laravel/framework/src/Illuminate/Auth/Events/Verified.php
new file mode 100644
index 00000000..1d6e4c0f
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Events/Verified.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Illuminate\Auth\Events;
+
+use Illuminate\Queue\SerializesModels;
+
+class Verified
+{
+    use SerializesModels;
+
+    /**
+     * The verified user.
+     *
+     * @var \Illuminate\Contracts\Auth\MustVerifyEmail
+     */
+    public $user;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param  \Illuminate\Contracts\Auth\MustVerifyEmail  $user
+     * @return void
+     */
+    public function __construct($user)
+    {
+        $this->user = $user;
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/GuardHelpers.php b/vendor/laravel/framework/src/Illuminate/Auth/GuardHelpers.php
index 9a682c3d..8bfa77a0 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/GuardHelpers.php
+++ b/vendor/laravel/framework/src/Illuminate/Auth/GuardHelpers.php
@@ -25,7 +25,7 @@ trait GuardHelpers
     protected $provider;
 
     /**
-     * Determine if the current user is authenticated.
+     * Determine if current user is authenticated. If not, throw an exception.
      *
      * @return \Illuminate\Contracts\Auth\Authenticatable
      *
@@ -40,6 +40,16 @@ trait GuardHelpers
         throw new AuthenticationException;
     }
 
+    /**
+     * Determine if the guard has a user instance.
+     *
+     * @return bool
+     */
+    public function hasUser()
+    {
+        return ! is_null($this->user);
+    }
+
     /**
      * Determine if the current user is authenticated.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Listeners/SendEmailVerificationNotification.php b/vendor/laravel/framework/src/Illuminate/Auth/Listeners/SendEmailVerificationNotification.php
new file mode 100644
index 00000000..12dfa697
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Listeners/SendEmailVerificationNotification.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Illuminate\Auth\Listeners;
+
+use Illuminate\Auth\Events\Registered;
+use Illuminate\Contracts\Auth\MustVerifyEmail;
+
+class SendEmailVerificationNotification
+{
+    /**
+     * Handle the event.
+     *
+     * @param  \Illuminate\Auth\Events\Registered  $event
+     * @return void
+     */
+    public function handle(Registered $event)
+    {
+        if ($event->user instanceof MustVerifyEmail && ! $event->user->hasVerifiedEmail()) {
+            $event->user->sendEmailVerificationNotification();
+        }
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Middleware/Authenticate.php b/vendor/laravel/framework/src/Illuminate/Auth/Middleware/Authenticate.php
index 21ea4b22..98b9bc67 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/Middleware/Authenticate.php
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Middleware/Authenticate.php
@@ -38,7 +38,7 @@ class Authenticate
      */
     public function handle($request, Closure $next, ...$guards)
     {
-        $this->authenticate($guards);
+        $this->authenticate($request, $guards);
 
         return $next($request);
     }
@@ -46,15 +46,16 @@ class Authenticate
     /**
      * Determine if the user is logged in to any of the given guards.
      *
+     * @param  \Illuminate\Http\Request  $request
      * @param  array  $guards
      * @return void
      *
      * @throws \Illuminate\Auth\AuthenticationException
      */
-    protected function authenticate(array $guards)
+    protected function authenticate($request, array $guards)
     {
         if (empty($guards)) {
-            return $this->auth->authenticate();
+            $guards = [null];
         }
 
         foreach ($guards as $guard) {
@@ -63,6 +64,19 @@ class Authenticate
             }
         }
 
-        throw new AuthenticationException('Unauthenticated.', $guards);
+        throw new AuthenticationException(
+            'Unauthenticated.', $guards, $this->redirectTo($request)
+        );
+    }
+
+    /**
+     * Get the path the user should be redirected to when they are not authenticated.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return string
+     */
+    protected function redirectTo($request)
+    {
+        //
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Middleware/AuthenticateWithBasicAuth.php b/vendor/laravel/framework/src/Illuminate/Auth/Middleware/AuthenticateWithBasicAuth.php
index 71f8be87..c51df906 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/Middleware/AuthenticateWithBasicAuth.php
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Middleware/AuthenticateWithBasicAuth.php
@@ -31,10 +31,11 @@ class AuthenticateWithBasicAuth
      * @param  \Illuminate\Http\Request  $request
      * @param  \Closure  $next
      * @param  string|null  $guard
+     * @param  string|null  $field
      * @return mixed
      */
-    public function handle($request, Closure $next, $guard = null)
+    public function handle($request, Closure $next, $guard = null, $field = null)
     {
-        return $this->auth->guard($guard)->basic() ?: $next($request);
+        return $this->auth->guard($guard)->basic($field ?: 'email') ?: $next($request);
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Middleware/Authorize.php b/vendor/laravel/framework/src/Illuminate/Auth/Middleware/Authorize.php
index 45d523b5..d1774d79 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/Middleware/Authorize.php
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Middleware/Authorize.php
@@ -5,17 +5,9 @@ namespace Illuminate\Auth\Middleware;
 use Closure;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Contracts\Auth\Access\Gate;
-use Illuminate\Contracts\Auth\Factory as Auth;
 
 class Authorize
 {
-    /**
-     * The authentication factory instance.
-     *
-     * @var \Illuminate\Contracts\Auth\Factory
-     */
-    protected $auth;
-
     /**
      * The gate instance.
      *
@@ -26,13 +18,11 @@ class Authorize
     /**
      * Create a new middleware instance.
      *
-     * @param  \Illuminate\Contracts\Auth\Factory  $auth
      * @param  \Illuminate\Contracts\Auth\Access\Gate  $gate
      * @return void
      */
-    public function __construct(Auth $auth, Gate $gate)
+    public function __construct(Gate $gate)
     {
-        $this->auth = $auth;
         $this->gate = $gate;
     }
 
@@ -42,7 +32,7 @@ class Authorize
      * @param  \Illuminate\Http\Request  $request
      * @param  \Closure  $next
      * @param  string  $ability
-     * @param  array|null  $models
+     * @param  array|null  ...$models
      * @return mixed
      *
      * @throws \Illuminate\Auth\AuthenticationException
@@ -50,8 +40,6 @@ class Authorize
      */
     public function handle($request, Closure $next, $ability, ...$models)
     {
-        $this->auth->authenticate();
-
         $this->gate->authorize($ability, $this->getGateArguments($request, $models));
 
         return $next($request);
@@ -84,7 +72,7 @@ class Authorize
      */
     protected function getModel($request, $model)
     {
-        return $this->isClassName($model) ? $model : $request->route($model);
+        return $this->isClassName($model) ? trim($model) : $request->route($model, $model);
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Middleware/EnsureEmailIsVerified.php b/vendor/laravel/framework/src/Illuminate/Auth/Middleware/EnsureEmailIsVerified.php
new file mode 100644
index 00000000..f43855d3
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Middleware/EnsureEmailIsVerified.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Illuminate\Auth\Middleware;
+
+use Closure;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Contracts\Auth\MustVerifyEmail;
+
+class EnsureEmailIsVerified
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     */
+    public function handle($request, Closure $next)
+    {
+        if (! $request->user() ||
+            ($request->user() instanceof MustVerifyEmail &&
+            ! $request->user()->hasVerifiedEmail())) {
+            return $request->expectsJson()
+                    ? abort(403, 'Your email address is not verified.')
+                    : Redirect::route('verification.notice');
+        }
+
+        return $next($request);
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/MustVerifyEmail.php b/vendor/laravel/framework/src/Illuminate/Auth/MustVerifyEmail.php
new file mode 100644
index 00000000..d7782cd6
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Auth/MustVerifyEmail.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Illuminate\Auth;
+
+trait MustVerifyEmail
+{
+    /**
+     * Determine if the user has verified their email address.
+     *
+     * @return bool
+     */
+    public function hasVerifiedEmail()
+    {
+        return ! is_null($this->email_verified_at);
+    }
+
+    /**
+     * Mark the given user's email as verified.
+     *
+     * @return bool
+     */
+    public function markEmailAsVerified()
+    {
+        return $this->forceFill([
+            'email_verified_at' => $this->freshTimestamp(),
+        ])->save();
+    }
+
+    /**
+     * Send the email verification notification.
+     *
+     * @return void
+     */
+    public function sendEmailVerificationNotification()
+    {
+        $this->notify(new Notifications\VerifyEmail);
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Notifications/ResetPassword.php b/vendor/laravel/framework/src/Illuminate/Auth/Notifications/ResetPassword.php
index cd1ca866..c2978fe6 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/Notifications/ResetPassword.php
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Notifications/ResetPassword.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Auth\Notifications;
 
+use Illuminate\Support\Facades\Lang;
 use Illuminate\Notifications\Notification;
 use Illuminate\Notifications\Messages\MailMessage;
 
@@ -14,6 +15,13 @@ class ResetPassword extends Notification
      */
     public $token;
 
+    /**
+     * The callback that should be used to build the mail message.
+     *
+     * @var \Closure|null
+     */
+    public static $toMailCallback;
+
     /**
      * Create a notification instance.
      *
@@ -44,9 +52,25 @@ class ResetPassword extends Notification
      */
     public function toMail($notifiable)
     {
+        if (static::$toMailCallback) {
+            return call_user_func(static::$toMailCallback, $notifiable, $this->token);
+        }
+
         return (new MailMessage)
-            ->line('You are receiving this email because we received a password reset request for your account.')
-            ->action('Reset Password', url(config('app.url').route('password.reset', $this->token, false)))
-            ->line('If you did not request a password reset, no further action is required.');
+            ->subject(Lang::getFromJson('Reset Password Notification'))
+            ->line(Lang::getFromJson('You are receiving this email because we received a password reset request for your account.'))
+            ->action(Lang::getFromJson('Reset Password'), url(config('app.url').route('password.reset', $this->token, false)))
+            ->line(Lang::getFromJson('If you did not request a password reset, no further action is required.'));
+    }
+
+    /**
+     * Set a callback that should be used when building the notification mail message.
+     *
+     * @param  \Closure  $callback
+     * @return void
+     */
+    public static function toMailUsing($callback)
+    {
+        static::$toMailCallback = $callback;
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Notifications/VerifyEmail.php b/vendor/laravel/framework/src/Illuminate/Auth/Notifications/VerifyEmail.php
new file mode 100644
index 00000000..f8f31626
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Notifications/VerifyEmail.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Illuminate\Auth\Notifications;
+
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\URL;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Notifications\Notification;
+use Illuminate\Notifications\Messages\MailMessage;
+
+class VerifyEmail extends Notification
+{
+    /**
+     * The callback that should be used to build the mail message.
+     *
+     * @var \Closure|null
+     */
+    public static $toMailCallback;
+
+    /**
+     * Get the notification's channels.
+     *
+     * @param  mixed  $notifiable
+     * @return array|string
+     */
+    public function via($notifiable)
+    {
+        return ['mail'];
+    }
+
+    /**
+     * Build the mail representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+    public function toMail($notifiable)
+    {
+        if (static::$toMailCallback) {
+            return call_user_func(static::$toMailCallback, $notifiable);
+        }
+
+        return (new MailMessage)
+            ->subject(Lang::getFromJson('Verify Email Address'))
+            ->line(Lang::getFromJson('Please click the button below to verify your email address.'))
+            ->action(
+                Lang::getFromJson('Verify Email Address'),
+                $this->verificationUrl($notifiable)
+            )
+            ->line(Lang::getFromJson('If you did not create an account, no further action is required.'));
+    }
+
+    /**
+     * Get the verification URL for the given notifiable.
+     *
+     * @param  mixed  $notifiable
+     * @return string
+     */
+    protected function verificationUrl($notifiable)
+    {
+        return URL::temporarySignedRoute(
+            'verification.verify', Carbon::now()->addMinutes(60), ['id' => $notifiable->getKey()]
+        );
+    }
+
+    /**
+     * Set a callback that should be used when building the notification mail message.
+     *
+     * @param  \Closure  $callback
+     * @return void
+     */
+    public static function toMailUsing($callback)
+    {
+        static::$toMailCallback = $callback;
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBroker.php b/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBroker.php
index 07d046fb..66918fca 100755
--- a/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBroker.php
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBroker.php
@@ -146,7 +146,7 @@ class PasswordBroker implements PasswordBrokerContract
     public function validateNewPassword(array $credentials)
     {
         if (isset($this->passwordValidator)) {
-            list($password, $confirm) = [
+            [$password, $confirm] = [
                 $credentials['password'],
                 $credentials['password_confirmation'],
             ];
@@ -167,7 +167,7 @@ class PasswordBroker implements PasswordBrokerContract
      */
     protected function validatePasswordWithDefaults(array $credentials)
     {
-        list($password, $confirm) = [
+        [$password, $confirm] = [
             $credentials['password'],
             $credentials['password_confirmation'],
         ];
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBrokerManager.php b/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBrokerManager.php
index 8c21e111..1d943bd6 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBrokerManager.php
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBrokerManager.php
@@ -39,7 +39,7 @@ class PasswordBrokerManager implements FactoryContract
     /**
      * Attempt to get the broker from the local cache.
      *
-     * @param  string  $name
+     * @param  string|null  $name
      * @return \Illuminate\Contracts\Auth\PasswordBroker
      */
     public function broker($name = null)
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Recaller.php b/vendor/laravel/framework/src/Illuminate/Auth/Recaller.php
index 4545a3bc..5809f1e8 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/Recaller.php
+++ b/vendor/laravel/framework/src/Illuminate/Auth/Recaller.php
@@ -21,7 +21,7 @@ class Recaller
      */
     public function __construct($recaller)
     {
-        $this->recaller = $recaller;
+        $this->recaller = @unserialize($recaller, ['allowed_classes' => false]) ?: $recaller;
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/SessionGuard.php b/vendor/laravel/framework/src/Illuminate/Auth/SessionGuard.php
index 2e40c473..6d980b8d 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/SessionGuard.php
+++ b/vendor/laravel/framework/src/Illuminate/Auth/SessionGuard.php
@@ -4,6 +4,7 @@ namespace Illuminate\Auth;
 
 use RuntimeException;
 use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Traits\Macroable;
 use Illuminate\Contracts\Session\Session;
 use Illuminate\Contracts\Auth\UserProvider;
@@ -90,7 +91,7 @@ class SessionGuard implements StatefulGuard, SupportsBasicAuth
      * @param  string  $name
      * @param  \Illuminate\Contracts\Auth\UserProvider  $provider
      * @param  \Illuminate\Contracts\Session\Session  $session
-     * @param  \Symfony\Component\HttpFoundation\Request  $request
+     * @param  \Symfony\Component\HttpFoundation\Request|null  $request
      * @return void
      */
     public function __construct($name,
@@ -127,10 +128,8 @@ class SessionGuard implements StatefulGuard, SupportsBasicAuth
         // First we will try to load the user using the identifier in the session if
         // one exists. Otherwise we will check for a "remember me" cookie in this
         // request, and if one exists, attempt to retrieve the user using that.
-        if (! is_null($id)) {
-            if ($this->user = $this->provider->retrieveById($id)) {
-                $this->fireAuthenticatedEvent($this->user);
-            }
+        if (! is_null($id) && $this->user = $this->provider->retrieveById($id)) {
+            $this->fireAuthenticatedEvent($this->user);
         }
 
         // If the user is null, but we decrypt a "recaller" cookie we can attempt to
@@ -330,6 +329,7 @@ class SessionGuard implements StatefulGuard, SupportsBasicAuth
      * Get the response for basic authentication.
      *
      * @return void
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException
      */
     protected function failedBasicResponse()
@@ -494,7 +494,7 @@ class SessionGuard implements StatefulGuard, SupportsBasicAuth
         }
 
         if (isset($this->events)) {
-            $this->events->dispatch(new Events\Logout($user));
+            $this->events->dispatch(new Events\Logout($this->name, $user));
         }
 
         // Once we have fired the logout event we will clear the users out of memory
@@ -533,6 +533,30 @@ class SessionGuard implements StatefulGuard, SupportsBasicAuth
         $this->provider->updateRememberToken($user, $token);
     }
 
+    /**
+     * Invalidate other sessions for the current user.
+     *
+     * The application must be using the AuthenticateSession middleware.
+     *
+     * @param  string  $password
+     * @param  string  $attribute
+     * @return bool|null
+     */
+    public function logoutOtherDevices($password, $attribute = 'password')
+    {
+        if (! $this->user()) {
+            return;
+        }
+
+        $result = tap($this->user()->forceFill([
+            $attribute => Hash::make($password),
+        ]))->save();
+
+        $this->queueRecallerCookie($this->user());
+
+        return $result;
+    }
+
     /**
      * Register an authentication attempt event listener.
      *
@@ -557,7 +581,7 @@ class SessionGuard implements StatefulGuard, SupportsBasicAuth
     {
         if (isset($this->events)) {
             $this->events->dispatch(new Events\Attempting(
-                $credentials, $remember
+                $this->name, $credentials, $remember
             ));
         }
     }
@@ -572,7 +596,9 @@ class SessionGuard implements StatefulGuard, SupportsBasicAuth
     protected function fireLoginEvent($user, $remember = false)
     {
         if (isset($this->events)) {
-            $this->events->dispatch(new Events\Login($user, $remember));
+            $this->events->dispatch(new Events\Login(
+                $this->name, $user, $remember
+            ));
         }
     }
 
@@ -585,7 +611,9 @@ class SessionGuard implements StatefulGuard, SupportsBasicAuth
     protected function fireAuthenticatedEvent($user)
     {
         if (isset($this->events)) {
-            $this->events->dispatch(new Events\Authenticated($user));
+            $this->events->dispatch(new Events\Authenticated(
+                $this->name, $user
+            ));
         }
     }
 
@@ -599,7 +627,9 @@ class SessionGuard implements StatefulGuard, SupportsBasicAuth
     protected function fireFailedEvent($user, array $credentials)
     {
         if (isset($this->events)) {
-            $this->events->dispatch(new Events\Failed($user, $credentials));
+            $this->events->dispatch(new Events\Failed(
+                $this->name, $user, $credentials
+            ));
         }
     }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/TokenGuard.php b/vendor/laravel/framework/src/Illuminate/Auth/TokenGuard.php
index dec39f43..56ac19b1 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/TokenGuard.php
+++ b/vendor/laravel/framework/src/Illuminate/Auth/TokenGuard.php
@@ -36,14 +36,16 @@ class TokenGuard implements Guard
      *
      * @param  \Illuminate\Contracts\Auth\UserProvider  $provider
      * @param  \Illuminate\Http\Request  $request
+     * @param  string  $inputKey
+     * @param  string  $storageKey
      * @return void
      */
-    public function __construct(UserProvider $provider, Request $request)
+    public function __construct(UserProvider $provider, Request $request, $inputKey = 'api_token', $storageKey = 'api_token')
     {
         $this->request = $request;
         $this->provider = $provider;
-        $this->inputKey = 'api_token';
-        $this->storageKey = 'api_token';
+        $this->inputKey = $inputKey;
+        $this->storageKey = $storageKey;
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Auth/composer.json b/vendor/laravel/framework/src/Illuminate/Auth/composer.json
index f3a41d95..ae98c7dc 100644
--- a/vendor/laravel/framework/src/Illuminate/Auth/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Auth/composer.json
@@ -14,11 +14,11 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/http": "5.5.*",
-        "illuminate/queue": "5.5.*",
-        "illuminate/support": "5.5.*"
+        "php": "^7.1.3",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/http": "5.7.*",
+        "illuminate/queue": "5.7.*",
+        "illuminate/support": "5.7.*"
     },
     "autoload": {
         "psr-4": {
@@ -27,13 +27,13 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "suggest": {
-        "illuminate/console": "Required to use the auth:clear-resets command (5.5.*).",
-        "illuminate/queue": "Required to fire login / logout events (5.5.*).",
-        "illuminate/session": "Required to use the session based guard (5.5.*)."
+        "illuminate/console": "Required to use the auth:clear-resets command (5.7.*).",
+        "illuminate/queue": "Required to fire login / logout events (5.7.*).",
+        "illuminate/session": "Required to use the session based guard (5.7.*)."
     },
     "config": {
         "sort-packages": true
diff --git a/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastManager.php b/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastManager.php
index 1b4f6101..864b3201 100644
--- a/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastManager.php
+++ b/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastManager.php
@@ -65,7 +65,10 @@ class BroadcastManager implements FactoryContract
         $attributes = $attributes ?: ['middleware' => ['web']];
 
         $this->app['router']->group($attributes, function ($router) {
-            $router->post('/broadcasting/auth', '\\'.BroadcastController::class.'@authenticate');
+            $router->match(
+                ['get', 'post'], '/broadcasting/auth',
+                '\\'.BroadcastController::class.'@authenticate'
+            );
         });
     }
 
@@ -140,7 +143,7 @@ class BroadcastManager implements FactoryContract
     /**
      * Get a driver instance.
      *
-     * @param  string  $name
+     * @param  string|null  $name
      * @return mixed
      */
     public function driver($name = null)
@@ -209,10 +212,16 @@ class BroadcastManager implements FactoryContract
      */
     protected function createPusherDriver(array $config)
     {
-        return new PusherBroadcaster(
-            new Pusher($config['key'], $config['secret'],
-            $config['app_id'], $config['options'] ?? [])
+        $pusher = new Pusher(
+            $config['key'], $config['secret'],
+            $config['app_id'], $config['options'] ?? []
         );
+
+        if ($config['log'] ?? false) {
+            $pusher->setLogger($this->app->make(LoggerInterface::class));
+        }
+
+        return new PusherBroadcaster($pusher);
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/Broadcaster.php b/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/Broadcaster.php
index e5fd8fd9..9a458ea9 100644
--- a/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/Broadcaster.php
+++ b/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/Broadcaster.php
@@ -2,6 +2,8 @@
 
 namespace Illuminate\Broadcasting\Broadcasters;
 
+use Exception;
+use ReflectionClass;
 use ReflectionFunction;
 use Illuminate\Support\Str;
 use Illuminate\Container\Container;
@@ -22,7 +24,7 @@ abstract class Broadcaster implements BroadcasterContract
     /**
      * The binding registrar instance.
      *
-     * @var BindingRegistrar
+     * @var \Illuminate\Contracts\Routing\BindingRegistrar
      */
     protected $bindingRegistrar;
 
@@ -30,10 +32,10 @@ abstract class Broadcaster implements BroadcasterContract
      * Register a channel authenticator.
      *
      * @param  string  $channel
-     * @param  callable  $callback
+     * @param  callable|string  $callback
      * @return $this
      */
-    public function channel($channel, callable $callback)
+    public function channel($channel, $callback)
     {
         $this->channels[$channel] = $callback;
 
@@ -46,6 +48,7 @@ abstract class Broadcaster implements BroadcasterContract
      * @param  \Illuminate\Http\Request  $request
      * @param  string  $channel
      * @return mixed
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
      */
     protected function verifyUserCanAccessChannel($request, $channel)
@@ -57,7 +60,9 @@ abstract class Broadcaster implements BroadcasterContract
 
             $parameters = $this->extractAuthParameters($pattern, $channel, $callback);
 
-            if ($result = $callback($request->user(), ...$parameters)) {
+            $handler = $this->normalizeChannelHandlerToCallable($callback);
+
+            if ($result = $handler($request->user(), ...$parameters)) {
                 return $this->validAuthenticationResponse($request, $result);
             }
         }
@@ -70,12 +75,12 @@ abstract class Broadcaster implements BroadcasterContract
      *
      * @param  string  $pattern
      * @param  string  $channel
-     * @param  callable  $callback
+     * @param  callable|string  $callback
      * @return array
      */
     protected function extractAuthParameters($pattern, $channel, $callback)
     {
-        $callbackParameters = (new ReflectionFunction($callback))->getParameters();
+        $callbackParameters = $this->extractParameters($callback);
 
         return collect($this->extractChannelKeys($pattern, $channel))->reject(function ($value, $key) {
             return is_numeric($key);
@@ -84,6 +89,44 @@ abstract class Broadcaster implements BroadcasterContract
         })->values()->all();
     }
 
+    /**
+     * Extracts the parameters out of what the user passed to handle the channel authentication.
+     *
+     * @param  callable|string  $callback
+     * @return \ReflectionParameter[]
+     *
+     * @throws \Exception
+     */
+    protected function extractParameters($callback)
+    {
+        if (is_callable($callback)) {
+            return (new ReflectionFunction($callback))->getParameters();
+        } elseif (is_string($callback)) {
+            return $this->extractParametersFromClass($callback);
+        }
+
+        throw new Exception('Given channel handler is an unknown type.');
+    }
+
+    /**
+     * Extracts the parameters out of a class channel's "join" method.
+     *
+     * @param  string  $callback
+     * @return \ReflectionParameter[]
+     *
+     * @throws \Exception
+     */
+    protected function extractParametersFromClass($callback)
+    {
+        $reflection = new ReflectionClass($callback);
+
+        if (! $reflection->hasMethod('join')) {
+            throw new Exception('Class based channel must define a "join" method.');
+        }
+
+        return $reflection->getMethod('join')->getParameters();
+    }
+
     /**
      * Extract the channel keys from the incoming channel name.
      *
@@ -140,6 +183,7 @@ abstract class Broadcaster implements BroadcasterContract
      * @param  mixed  $value
      * @param  array  $callbackParameters
      * @return mixed
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
      */
     protected function resolveImplicitBindingIfPossible($key, $value, $callbackParameters)
@@ -201,4 +245,19 @@ abstract class Broadcaster implements BroadcasterContract
 
         return $this->bindingRegistrar;
     }
+
+    /**
+     * Normalize the given callback into a callable.
+     *
+     * @param  mixed  $callback
+     * @return callable|\Closure
+     */
+    protected function normalizeChannelHandlerToCallable($callback)
+    {
+        return is_callable($callback) ? $callback : function (...$args) use ($callback) {
+            return Container::getInstance()
+                ->make($callback)
+                ->join(...$args);
+        };
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php b/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php
index 856024f3..3b6ca541 100644
--- a/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php
+++ b/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php
@@ -33,6 +33,7 @@ class PusherBroadcaster extends Broadcaster
      *
      * @param  \Illuminate\Http\Request  $request
      * @return mixed
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
      */
     public function auth($request)
@@ -62,25 +63,34 @@ class PusherBroadcaster extends Broadcaster
     {
         if (Str::startsWith($request->channel_name, 'private')) {
             return $this->decodePusherResponse(
-                $this->pusher->socket_auth($request->channel_name, $request->socket_id)
+                $request, $this->pusher->socket_auth($request->channel_name, $request->socket_id)
             );
         }
 
         return $this->decodePusherResponse(
+            $request,
             $this->pusher->presence_auth(
-                $request->channel_name, $request->socket_id, $request->user()->getAuthIdentifier(), $result)
+                $request->channel_name, $request->socket_id,
+                $request->user()->getAuthIdentifier(), $result
+            )
         );
     }
 
     /**
      * Decode the given Pusher response.
      *
+     * @param  \Illuminate\Http\Request  $request
      * @param  mixed  $response
      * @return array
      */
-    protected function decodePusherResponse($response)
+    protected function decodePusherResponse($request, $response)
     {
-        return json_decode($response, true);
+        if (! $request->input('callback', false)) {
+            return json_decode($response, true);
+        }
+
+        return response()->json(json_decode($response, true))
+                    ->withCallback($request->callback);
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php b/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php
index 1a89bebf..2351e49e 100644
--- a/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php
+++ b/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php
@@ -27,7 +27,7 @@ class RedisBroadcaster extends Broadcaster
      * Create a new broadcaster instance.
      *
      * @param  \Illuminate\Contracts\Redis\Factory  $redis
-     * @param  string  $connection
+     * @param  string|null  $connection
      * @return void
      */
     public function __construct(Redis $redis, $connection = null)
@@ -41,6 +41,7 @@ class RedisBroadcaster extends Broadcaster
      *
      * @param  \Illuminate\Http\Request  $request
      * @return mixed
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
      */
     public function auth($request)
diff --git a/vendor/laravel/framework/src/Illuminate/Broadcasting/composer.json b/vendor/laravel/framework/src/Illuminate/Broadcasting/composer.json
index 2f4b18ef..5e7e5a28 100644
--- a/vendor/laravel/framework/src/Illuminate/Broadcasting/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Broadcasting/composer.json
@@ -14,12 +14,12 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "psr/log": "~1.0",
-        "illuminate/bus": "5.5.*",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/queue": "5.5.*",
-        "illuminate/support": "5.5.*"
+        "php": "^7.1.3",
+        "psr/log": "^1.0",
+        "illuminate/bus": "5.7.*",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/queue": "5.7.*",
+        "illuminate/support": "5.7.*"
     },
     "autoload": {
         "psr-4": {
@@ -28,11 +28,11 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "suggest": {
-        "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~3.0)."
+        "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^3.0)."
     },
     "config": {
         "sort-packages": true
diff --git a/vendor/laravel/framework/src/Illuminate/Bus/composer.json b/vendor/laravel/framework/src/Illuminate/Bus/composer.json
index 3836cee9..da911fda 100644
--- a/vendor/laravel/framework/src/Illuminate/Bus/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Bus/composer.json
@@ -14,10 +14,10 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/pipeline": "5.5.*",
-        "illuminate/support": "5.5.*"
+        "php": "^7.1.3",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/pipeline": "5.7.*",
+        "illuminate/support": "5.7.*"
     },
     "autoload": {
         "psr-4": {
@@ -26,7 +26,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "config": {
diff --git a/vendor/laravel/framework/src/Illuminate/Cache/ArrayStore.php b/vendor/laravel/framework/src/Illuminate/Cache/ArrayStore.php
index 8901a489..806f9711 100644
--- a/vendor/laravel/framework/src/Illuminate/Cache/ArrayStore.php
+++ b/vendor/laravel/framework/src/Illuminate/Cache/ArrayStore.php
@@ -23,9 +23,7 @@ class ArrayStore extends TaggableStore implements Store
      */
     public function get($key)
     {
-        if (array_key_exists($key, $this->storage)) {
-            return $this->storage[$key];
-        }
+        return $this->storage[$key] ?? null;
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Cache/CacheManager.php b/vendor/laravel/framework/src/Illuminate/Cache/CacheManager.php
index f52053c9..550249e5 100755
--- a/vendor/laravel/framework/src/Illuminate/Cache/CacheManager.php
+++ b/vendor/laravel/framework/src/Illuminate/Cache/CacheManager.php
@@ -61,7 +61,7 @@ class CacheManager implements FactoryContract
     /**
      * Get a cache driver instance.
      *
-     * @param  string  $driver
+     * @param  string|null  $driver
      * @return mixed
      */
     public function driver($driver = null)
diff --git a/vendor/laravel/framework/src/Illuminate/Cache/Console/ClearCommand.php b/vendor/laravel/framework/src/Illuminate/Cache/Console/ClearCommand.php
index 0c3e6ddd..c70f459a 100755
--- a/vendor/laravel/framework/src/Illuminate/Cache/Console/ClearCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Cache/Console/ClearCommand.php
@@ -64,15 +64,19 @@ class ClearCommand extends Command
             'cache:clearing', [$this->argument('store'), $this->tags()]
         );
 
-        $this->cache()->flush();
+        $successful = $this->cache()->flush();
 
         $this->flushFacades();
 
+        if (! $successful) {
+            return $this->error('Failed to clear cache. Make sure you have the appropriate permissions.');
+        }
+
         $this->laravel['events']->fire(
             'cache:cleared', [$this->argument('store'), $this->tags()]
         );
 
-        $this->info('Cache cleared successfully.');
+        $this->info('Application cache cleared!');
     }
 
     /**
@@ -82,7 +86,11 @@ class ClearCommand extends Command
      */
     public function flushFacades()
     {
-        foreach ($this->files->files(storage_path('framework/cache')) as $file) {
+        if (! $this->files->exists($storagePath = storage_path('framework/cache'))) {
+            return;
+        }
+
+        foreach ($this->files->files($storagePath) as $file) {
             if (preg_match('/facade-.*\.php$/', $file)) {
                 $this->files->delete($file);
             }
@@ -119,7 +127,7 @@ class ClearCommand extends Command
     protected function getArguments()
     {
         return [
-            ['store', InputArgument::OPTIONAL, 'The name of the store you would like to clear.'],
+            ['store', InputArgument::OPTIONAL, 'The name of the store you would like to clear'],
         ];
     }
 
@@ -131,7 +139,7 @@ class ClearCommand extends Command
     protected function getOptions()
     {
         return [
-            ['tags', null, InputOption::VALUE_OPTIONAL, 'The cache tags you would like to clear.', null],
+            ['tags', null, InputOption::VALUE_OPTIONAL, 'The cache tags you would like to clear', null],
         ];
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Cache/DatabaseStore.php b/vendor/laravel/framework/src/Illuminate/Cache/DatabaseStore.php
index 2306fb06..8a68c507 100755
--- a/vendor/laravel/framework/src/Illuminate/Cache/DatabaseStore.php
+++ b/vendor/laravel/framework/src/Illuminate/Cache/DatabaseStore.php
@@ -4,8 +4,10 @@ namespace Illuminate\Cache;
 
 use Closure;
 use Exception;
+use Illuminate\Support\Str;
 use Illuminate\Contracts\Cache\Store;
 use Illuminate\Support\InteractsWithTime;
+use Illuminate\Database\PostgresConnection;
 use Illuminate\Database\ConnectionInterface;
 
 class DatabaseStore implements Store
@@ -78,7 +80,7 @@ class DatabaseStore implements Store
             return;
         }
 
-        return unserialize($cache->value);
+        return $this->unserialize($cache->value);
     }
 
     /**
@@ -93,7 +95,7 @@ class DatabaseStore implements Store
     {
         $key = $this->prefix.$key;
 
-        $value = serialize($value);
+        $value = $this->serialize($value);
 
         $expiration = $this->getTime() + (int) ($minutes * 60);
 
@@ -157,7 +159,7 @@ class DatabaseStore implements Store
 
             $cache = is_array($cache) ? (object) $cache : $cache;
 
-            $current = unserialize($cache->value);
+            $current = $this->unserialize($cache->value);
 
             // Here we'll call this callback function that was given to the function which
             // is used to either increment or decrement the function. We use a callback
@@ -172,7 +174,7 @@ class DatabaseStore implements Store
             // since database cache values are encrypted by default with secure storage
             // that can't be easily read. We will return the new value after storing.
             $this->table()->where('key', $prefixed)->update([
-                'value' => serialize($new),
+                'value' => $this->serialize($new),
             ]);
 
             return $new;
@@ -221,7 +223,9 @@ class DatabaseStore implements Store
      */
     public function flush()
     {
-        return (bool) $this->table()->delete();
+        $this->table()->delete();
+
+        return true;
     }
 
     /**
@@ -253,4 +257,36 @@ class DatabaseStore implements Store
     {
         return $this->prefix;
     }
+
+    /**
+     * Serialize the given value.
+     *
+     * @param  mixed  $value
+     * @return string
+     */
+    protected function serialize($value)
+    {
+        $result = serialize($value);
+
+        if ($this->connection instanceof PostgresConnection && Str::contains($result, "\0")) {
+            $result = base64_encode($result);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Unserialize the given value.
+     *
+     * @param  string  $value
+     * @return mixed
+     */
+    protected function unserialize($value)
+    {
+        if ($this->connection instanceof PostgresConnection && ! Str::contains($value, [':', ';'])) {
+            $value = base64_decode($value);
+        }
+
+        return unserialize($value);
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Cache/FileStore.php b/vendor/laravel/framework/src/Illuminate/Cache/FileStore.php
index 4cf97da3..cead4ac8 100755
--- a/vendor/laravel/framework/src/Illuminate/Cache/FileStore.php
+++ b/vendor/laravel/framework/src/Illuminate/Cache/FileStore.php
@@ -91,7 +91,7 @@ class FileStore implements Store
         $raw = $this->getPayload($key);
 
         return tap(((int) $raw['data']) + $value, function ($newValue) use ($key, $raw) {
-            $this->put($key, $newValue, $raw['time']);
+            $this->put($key, $newValue, $raw['time'] ?? 0);
         });
     }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Cache/Lock.php b/vendor/laravel/framework/src/Illuminate/Cache/Lock.php
index e81bee6e..f117246c 100644
--- a/vendor/laravel/framework/src/Illuminate/Cache/Lock.php
+++ b/vendor/laravel/framework/src/Illuminate/Cache/Lock.php
@@ -3,9 +3,10 @@
 namespace Illuminate\Cache;
 
 use Illuminate\Support\InteractsWithTime;
+use Illuminate\Contracts\Cache\Lock as LockContract;
 use Illuminate\Contracts\Cache\LockTimeoutException;
 
-abstract class Lock
+abstract class Lock implements LockContract
 {
     use InteractsWithTime;
 
@@ -43,6 +44,13 @@ abstract class Lock
      */
     abstract public function acquire();
 
+    /**
+     * Release the lock.
+     *
+     * @return void
+     */
+    abstract public function release();
+
     /**
      * Attempt to acquire the lock.
      *
@@ -68,6 +76,7 @@ abstract class Lock
      * @param  int  $seconds
      * @param  callable|null  $callback
      * @return bool
+     *
      * @throws \Illuminate\Contracts\Cache\LockTimeoutException
      */
     public function block($seconds, $callback = null)
diff --git a/vendor/laravel/framework/src/Illuminate/Cache/MemcachedConnector.php b/vendor/laravel/framework/src/Illuminate/Cache/MemcachedConnector.php
index ebfb28c7..224d9409 100755
--- a/vendor/laravel/framework/src/Illuminate/Cache/MemcachedConnector.php
+++ b/vendor/laravel/framework/src/Illuminate/Cache/MemcachedConnector.php
@@ -47,7 +47,7 @@ class MemcachedConnector
     {
         $memcached = $this->createMemcachedInstance($connectionId);
 
-        if (count($credentials) == 2) {
+        if (count($credentials) === 2) {
             $this->setCredentials($memcached, $credentials);
         }
 
@@ -78,7 +78,7 @@ class MemcachedConnector
      */
     protected function setCredentials($memcached, $credentials)
     {
-        list($username, $password) = $credentials;
+        [$username, $password] = $credentials;
 
         $memcached->setOption(Memcached::OPT_BINARY_PROTOCOL, true);
 
diff --git a/vendor/laravel/framework/src/Illuminate/Cache/MemcachedLock.php b/vendor/laravel/framework/src/Illuminate/Cache/MemcachedLock.php
index 1b0627cc..c0db841d 100644
--- a/vendor/laravel/framework/src/Illuminate/Cache/MemcachedLock.php
+++ b/vendor/laravel/framework/src/Illuminate/Cache/MemcachedLock.php
@@ -2,9 +2,7 @@
 
 namespace Illuminate\Cache;
 
-use Illuminate\Contracts\Cache\Lock as LockContract;
-
-class MemcachedLock extends Lock implements LockContract
+class MemcachedLock extends Lock
 {
     /**
      * The Memcached instance.
diff --git a/vendor/laravel/framework/src/Illuminate/Cache/MemcachedStore.php b/vendor/laravel/framework/src/Illuminate/Cache/MemcachedStore.php
index 00ba8b7c..0d2d8c0f 100755
--- a/vendor/laravel/framework/src/Illuminate/Cache/MemcachedStore.php
+++ b/vendor/laravel/framework/src/Illuminate/Cache/MemcachedStore.php
@@ -12,6 +12,13 @@ class MemcachedStore extends TaggableStore implements LockProvider, Store
 {
     use InteractsWithTime;
 
+    /**
+     * The maximum value that can be specified as an expiration delta.
+     *
+     * @var int
+     */
+    const REALTIME_MAXDELTA_IN_MINUTES = 43200;
+
     /**
      * The Memcached instance.
      *
@@ -103,7 +110,9 @@ class MemcachedStore extends TaggableStore implements LockProvider, Store
      */
     public function put($key, $value, $minutes)
     {
-        $this->memcached->set($this->prefix.$key, $value, $this->toTimestamp($minutes));
+        $this->memcached->set(
+            $this->prefix.$key, $value, $this->calculateExpiration($minutes)
+        );
     }
 
     /**
@@ -121,7 +130,9 @@ class MemcachedStore extends TaggableStore implements LockProvider, Store
             $prefixedValues[$this->prefix.$key] = $value;
         }
 
-        $this->memcached->setMulti($prefixedValues, $this->toTimestamp($minutes));
+        $this->memcached->setMulti(
+            $prefixedValues, $this->calculateExpiration($minutes)
+        );
     }
 
     /**
@@ -134,7 +145,9 @@ class MemcachedStore extends TaggableStore implements LockProvider, Store
      */
     public function add($key, $value, $minutes)
     {
-        return $this->memcached->add($this->prefix.$key, $value, $this->toTimestamp($minutes));
+        return $this->memcached->add(
+            $this->prefix.$key, $value, $this->calculateExpiration($minutes)
+        );
     }
 
     /**
@@ -206,6 +219,17 @@ class MemcachedStore extends TaggableStore implements LockProvider, Store
         return $this->memcached->flush();
     }
 
+    /**
+     * Get the expiration time of the key.
+     *
+     * @param  int  $minutes
+     * @return int
+     */
+    protected function calculateExpiration($minutes)
+    {
+        return $this->toTimestamp($minutes);
+    }
+
     /**
      * Get the UNIX timestamp for the given number of minutes.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Cache/RateLimiter.php b/vendor/laravel/framework/src/Illuminate/Cache/RateLimiter.php
index 5bd79fda..1de6ac81 100644
--- a/vendor/laravel/framework/src/Illuminate/Cache/RateLimiter.php
+++ b/vendor/laravel/framework/src/Illuminate/Cache/RateLimiter.php
@@ -32,10 +32,9 @@ class RateLimiter
      *
      * @param  string  $key
      * @param  int  $maxAttempts
-     * @param  float|int  $decayMinutes
      * @return bool
      */
-    public function tooManyAttempts($key, $maxAttempts, $decayMinutes = 1)
+    public function tooManyAttempts($key, $maxAttempts)
     {
         if ($this->attempts($key) >= $maxAttempts) {
             if ($this->cache->has($key.':timer')) {
diff --git a/vendor/laravel/framework/src/Illuminate/Cache/RedisLock.php b/vendor/laravel/framework/src/Illuminate/Cache/RedisLock.php
index c15569fe..6ce5afe5 100644
--- a/vendor/laravel/framework/src/Illuminate/Cache/RedisLock.php
+++ b/vendor/laravel/framework/src/Illuminate/Cache/RedisLock.php
@@ -2,9 +2,7 @@
 
 namespace Illuminate\Cache;
 
-use Illuminate\Contracts\Cache\Lock as LockContract;
-
-class RedisLock extends Lock implements LockContract
+class RedisLock extends Lock
 {
     /**
      * The Redis factory implementation.
diff --git a/vendor/laravel/framework/src/Illuminate/Cache/RedisTaggedCache.php b/vendor/laravel/framework/src/Illuminate/Cache/RedisTaggedCache.php
index d2325a00..7a28d82d 100644
--- a/vendor/laravel/framework/src/Illuminate/Cache/RedisTaggedCache.php
+++ b/vendor/laravel/framework/src/Illuminate/Cache/RedisTaggedCache.php
@@ -22,7 +22,7 @@ class RedisTaggedCache extends TaggedCache
      *
      * @param  string  $key
      * @param  mixed   $value
-     * @param  \DateTime|float|int  $minutes
+     * @param  \DateTime|float|int|null  $minutes
      * @return void
      */
     public function put($key, $value, $minutes = null)
@@ -32,6 +32,34 @@ class RedisTaggedCache extends TaggedCache
         parent::put($key, $value, $minutes);
     }
 
+    /**
+     * Increment the value of an item in the cache.
+     *
+     * @param  string  $key
+     * @param  mixed   $value
+     * @return void
+     */
+    public function increment($key, $value = 1)
+    {
+        $this->pushStandardKeys($this->tags->getNamespace(), $key);
+
+        parent::increment($key, $value);
+    }
+
+    /**
+     * Decrement the value of an item in the cache.
+     *
+     * @param  string  $key
+     * @param  mixed   $value
+     * @return void
+     */
+    public function decrement($key, $value = 1)
+    {
+        $this->pushStandardKeys($this->tags->getNamespace(), $key);
+
+        parent::decrement($key, $value);
+    }
+
     /**
      * Store an item in the cache indefinitely.
      *
@@ -49,14 +77,14 @@ class RedisTaggedCache extends TaggedCache
     /**
      * Remove all items from the cache.
      *
-     * @return void
+     * @return bool
      */
     public function flush()
     {
         $this->deleteForeverKeys();
         $this->deleteStandardKeys();
 
-        parent::flush();
+        return parent::flush();
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Cache/Repository.php b/vendor/laravel/framework/src/Illuminate/Cache/Repository.php
index f5dfd7cc..83fdbcab 100755
--- a/vendor/laravel/framework/src/Illuminate/Cache/Repository.php
+++ b/vendor/laravel/framework/src/Illuminate/Cache/Repository.php
@@ -172,7 +172,7 @@ class Repository implements CacheContract, ArrayAccess
      */
     public function pull($key, $default = null)
     {
-        return tap($this->get($key, $default), function ($value) use ($key) {
+        return tap($this->get($key, $default), function () use ($key) {
             $this->forget($key);
         });
     }
@@ -182,13 +182,15 @@ class Repository implements CacheContract, ArrayAccess
      *
      * @param  string  $key
      * @param  mixed   $value
-     * @param  \DateTimeInterface|\DateInterval|float|int  $minutes
+     * @param  \DateTimeInterface|\DateInterval|float|int|null  $minutes
      * @return void
      */
     public function put($key, $value, $minutes = null)
     {
         if (is_array($key)) {
-            return $this->putMany($key, $value);
+            $this->putMany($key, $value);
+
+            return;
         }
 
         if (! is_null($minutes = $this->getMinutes($minutes))) {
@@ -419,7 +421,7 @@ class Repository implements CacheContract, ArrayAccess
             throw new BadMethodCallException('This cache store does not support tagging.');
         }
 
-        $cache = $this->store->tags($names);
+        $cache = $this->store->tags(is_array($names) ? $names : func_get_args());
 
         if (! is_null($this->events)) {
             $cache->setEventDispatcher($this->events);
diff --git a/vendor/laravel/framework/src/Illuminate/Cache/TaggedCache.php b/vendor/laravel/framework/src/Illuminate/Cache/TaggedCache.php
index 095f296a..88f1f8e3 100644
--- a/vendor/laravel/framework/src/Illuminate/Cache/TaggedCache.php
+++ b/vendor/laravel/framework/src/Illuminate/Cache/TaggedCache.php
@@ -42,7 +42,7 @@ class TaggedCache extends Repository
     }
 
     /**
-     * Increment the value of an item in the cache.
+     * Decrement the value of an item in the cache.
      *
      * @param  string  $key
      * @param  mixed   $value
@@ -56,11 +56,13 @@ class TaggedCache extends Repository
     /**
      * Remove all items from the cache.
      *
-     * @return void
+     * @return bool
      */
     public function flush()
     {
         $this->tags->reset();
+
+        return true;
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Cache/composer.json b/vendor/laravel/framework/src/Illuminate/Cache/composer.json
index f81a218c..a461242c 100755
--- a/vendor/laravel/framework/src/Illuminate/Cache/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Cache/composer.json
@@ -14,9 +14,9 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/support": "5.5.*"
+        "php": "^7.1.3",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/support": "5.7.*"
     },
     "autoload": {
         "psr-4": {
@@ -25,13 +25,13 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "suggest": {
-        "illuminate/database": "Required to use the database cache driver (5.5.*).",
-        "illuminate/filesystem": "Required to use the file cache driver (5.5.*).",
-        "illuminate/redis": "Required to use the redis cache driver (5.5.*)."
+        "illuminate/database": "Required to use the database cache driver (5.7.*).",
+        "illuminate/filesystem": "Required to use the file cache driver (5.7.*).",
+        "illuminate/redis": "Required to use the redis cache driver (5.7.*)."
     },
     "config": {
         "sort-packages": true
diff --git a/vendor/laravel/framework/src/Illuminate/Config/Repository.php b/vendor/laravel/framework/src/Illuminate/Config/Repository.php
index 56644eba..cadcd64c 100644
--- a/vendor/laravel/framework/src/Illuminate/Config/Repository.php
+++ b/vendor/laravel/framework/src/Illuminate/Config/Repository.php
@@ -65,7 +65,7 @@ class Repository implements ArrayAccess, ConfigContract
 
         foreach ($keys as $key => $default) {
             if (is_numeric($key)) {
-                list($key, $default) = [$default, null];
+                [$key, $default] = [$default, null];
             }
 
             $config[$key] = Arr::get($this->items, $key, $default);
diff --git a/vendor/laravel/framework/src/Illuminate/Config/composer.json b/vendor/laravel/framework/src/Illuminate/Config/composer.json
index 55d6f0a0..1dbdd4be 100755
--- a/vendor/laravel/framework/src/Illuminate/Config/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Config/composer.json
@@ -14,9 +14,9 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/support": "5.5.*"
+        "php": "^7.1.3",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/support": "5.7.*"
     },
     "autoload": {
         "psr-4": {
@@ -25,7 +25,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "config": {
diff --git a/vendor/laravel/framework/src/Illuminate/Console/Application.php b/vendor/laravel/framework/src/Illuminate/Console/Application.php
index c53221bf..d5723658 100755
--- a/vendor/laravel/framework/src/Illuminate/Console/Application.php
+++ b/vendor/laravel/framework/src/Illuminate/Console/Application.php
@@ -16,6 +16,7 @@ use Symfony\Component\Console\Output\BufferedOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Application as SymfonyApplication;
 use Symfony\Component\Console\Command\Command as SymfonyCommand;
+use Symfony\Component\Console\Exception\CommandNotFoundException;
 use Illuminate\Contracts\Console\Application as ApplicationContract;
 
 class Application extends SymfonyApplication implements ApplicationContract
@@ -163,18 +164,28 @@ class Application extends SymfonyApplication implements ApplicationContract
      *
      * @param  string  $command
      * @param  array  $parameters
-     * @param  \Symfony\Component\Console\Output\OutputInterface  $outputBuffer
+     * @param  \Symfony\Component\Console\Output\OutputInterface|null  $outputBuffer
      * @return int
+     *
+     * @throws \Symfony\Component\Console\Exception\CommandNotFoundException
      */
     public function call($command, array $parameters = [], $outputBuffer = null)
     {
-        $parameters = collect($parameters)->prepend($command);
+        if (is_subclass_of($command, SymfonyCommand::class)) {
+            $command = $this->laravel->make($command)->getName();
+        }
+
+        if (! $this->has($command)) {
+            throw new CommandNotFoundException(sprintf('The command "%s" does not exist.', $command));
+        }
+
+        array_unshift($parameters, $command);
 
         $this->lastOutput = $outputBuffer ?: new BufferedOutput;
 
         $this->setCatchExceptions(false);
 
-        $result = $this->run(new ArrayInput($parameters->toArray()), $this->lastOutput);
+        $result = $this->run(new ArrayInput($parameters), $this->lastOutput);
 
         $this->setCatchExceptions(true);
 
@@ -188,7 +199,9 @@ class Application extends SymfonyApplication implements ApplicationContract
      */
     public function output()
     {
-        return $this->lastOutput ? $this->lastOutput->fetch() : '';
+        return $this->lastOutput && method_exists($this->lastOutput, 'fetch')
+                        ? $this->lastOutput->fetch()
+                        : '';
     }
 
     /**
@@ -246,7 +259,7 @@ class Application extends SymfonyApplication implements ApplicationContract
     }
 
     /**
-     * Get the default input definitions for the applications.
+     * Get the default input definition for the application.
      *
      * This is used to add the --env option to every available command.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Console/Command.php b/vendor/laravel/framework/src/Illuminate/Console/Command.php
index b79a354d..92288a30 100755
--- a/vendor/laravel/framework/src/Illuminate/Console/Command.php
+++ b/vendor/laravel/framework/src/Illuminate/Console/Command.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Console;
 
+use Illuminate\Support\Str;
 use Illuminate\Support\Traits\Macroable;
 use Illuminate\Contracts\Support\Arrayable;
 use Symfony\Component\Console\Helper\Table;
@@ -108,7 +109,7 @@ class Command extends SymfonyCommand
         // the command we'll set the arguments and the options on this command.
         $this->setDescription($this->description);
 
-        $this->setHidden($this->hidden);
+        $this->setHidden($this->isHidden());
 
         if (! isset($this->signature)) {
             $this->specifyParameters();
@@ -122,20 +123,15 @@ class Command extends SymfonyCommand
      */
     protected function configureUsingFluentDefinition()
     {
-        list($name, $arguments, $options) = Parser::parse($this->signature);
+        [$name, $arguments, $options] = Parser::parse($this->signature);
 
         parent::__construct($this->name = $name);
 
         // After parsing the signature we will spin through the arguments and options
         // and set them on this command. These will already be changed into proper
         // instances of these "InputArgument" and "InputOption" Symfony classes.
-        foreach ($arguments as $argument) {
-            $this->getDefinition()->addArgument($argument);
-        }
-
-        foreach ($options as $option) {
-            $this->getDefinition()->addOption($option);
-        }
+        $this->getDefinition()->addArguments($arguments);
+        $this->getDefinition()->addOptions($options);
     }
 
     /**
@@ -166,8 +162,12 @@ class Command extends SymfonyCommand
      */
     public function run(InputInterface $input, OutputInterface $output)
     {
+        $this->output = $this->laravel->make(
+            OutputStyle::class, ['input' => $input, 'output' => $output]
+        );
+
         return parent::run(
-            $this->input = $input, $this->output = new OutputStyle($input, $output)
+            $this->input = $input, $this->output
         );
     }
 
@@ -245,7 +245,7 @@ class Command extends SymfonyCommand
      * Get the value of a command argument.
      *
      * @param  string|null  $key
-     * @return string|array
+     * @return string|array|null
      */
     public function argument($key = null)
     {
@@ -280,8 +280,8 @@ class Command extends SymfonyCommand
     /**
      * Get the value of a command option.
      *
-     * @param  string  $key
-     * @return string|array
+     * @param  string|null  $key
+     * @return string|array|null
      */
     public function option($key = null)
     {
@@ -318,8 +318,8 @@ class Command extends SymfonyCommand
      * Prompt the user for input.
      *
      * @param  string  $question
-     * @param  string  $default
-     * @return string
+     * @param  string|null  $default
+     * @return mixed
      */
     public function ask($question, $default = null)
     {
@@ -331,8 +331,8 @@ class Command extends SymfonyCommand
      *
      * @param  string  $question
      * @param  array   $choices
-     * @param  string  $default
-     * @return string
+     * @param  string|null  $default
+     * @return mixed
      */
     public function anticipate($question, array $choices, $default = null)
     {
@@ -344,8 +344,8 @@ class Command extends SymfonyCommand
      *
      * @param  string  $question
      * @param  array   $choices
-     * @param  string  $default
-     * @return string
+     * @param  string|null  $default
+     * @return mixed
      */
     public function askWithCompletion($question, array $choices, $default = null)
     {
@@ -361,7 +361,7 @@ class Command extends SymfonyCommand
      *
      * @param  string  $question
      * @param  bool    $fallback
-     * @return string
+     * @return mixed
      */
     public function secret($question, $fallback = true)
     {
@@ -377,9 +377,9 @@ class Command extends SymfonyCommand
      *
      * @param  string  $question
      * @param  array   $choices
-     * @param  string  $default
-     * @param  mixed   $attempts
-     * @param  bool    $multiple
+     * @param  string|null  $default
+     * @param  mixed|null   $attempts
+     * @param  bool|null    $multiple
      * @return string
      */
     public function choice($question, array $choices, $default = null, $attempts = null, $multiple = null)
@@ -421,7 +421,7 @@ class Command extends SymfonyCommand
      * Write a string as information output.
      *
      * @param  string  $string
-     * @param  null|int|string  $verbosity
+     * @param  int|string|null  $verbosity
      * @return void
      */
     public function info($string, $verbosity = null)
@@ -434,7 +434,7 @@ class Command extends SymfonyCommand
      *
      * @param  string  $string
      * @param  string  $style
-     * @param  null|int|string  $verbosity
+     * @param  int|string|null  $verbosity
      * @return void
      */
     public function line($string, $style = null, $verbosity = null)
@@ -448,7 +448,7 @@ class Command extends SymfonyCommand
      * Write a string as comment output.
      *
      * @param  string  $string
-     * @param  null|int|string  $verbosity
+     * @param  int|string|null  $verbosity
      * @return void
      */
     public function comment($string, $verbosity = null)
@@ -460,7 +460,7 @@ class Command extends SymfonyCommand
      * Write a string as question output.
      *
      * @param  string  $string
-     * @param  null|int|string  $verbosity
+     * @param  int|string|null  $verbosity
      * @return void
      */
     public function question($string, $verbosity = null)
@@ -472,7 +472,7 @@ class Command extends SymfonyCommand
      * Write a string as error output.
      *
      * @param  string  $string
-     * @param  null|int|string  $verbosity
+     * @param  int|string|null  $verbosity
      * @return void
      */
     public function error($string, $verbosity = null)
@@ -484,7 +484,7 @@ class Command extends SymfonyCommand
      * Write a string as warning output.
      *
      * @param  string  $string
-     * @param  null|int|string  $verbosity
+     * @param  int|string|null  $verbosity
      * @return void
      */
     public function warn($string, $verbosity = null)
@@ -506,9 +506,11 @@ class Command extends SymfonyCommand
      */
     public function alert($string)
     {
-        $this->comment(str_repeat('*', strlen($string) + 12));
+        $length = Str::length(strip_tags($string)) + 12;
+
+        $this->comment(str_repeat('*', $length));
         $this->comment('*     '.$string.'     *');
-        $this->comment(str_repeat('*', strlen($string) + 12));
+        $this->comment(str_repeat('*', $length));
 
         $this->output->newLine();
     }
@@ -527,7 +529,7 @@ class Command extends SymfonyCommand
     /**
      * Get the verbosity level in terms of Symfony's OutputInterface level.
      *
-     * @param  string|int  $level
+     * @param  string|int|null  $level
      * @return int
      */
     protected function parseVerbosity($level = null)
@@ -564,7 +566,7 @@ class Command extends SymfonyCommand
     /**
      * Get the output implementation.
      *
-     * @return \Symfony\Component\Console\Output\OutputInterface
+     * @return \Illuminate\Console\OutputStyle
      */
     public function getOutput()
     {
diff --git a/vendor/laravel/framework/src/Illuminate/Console/GeneratorCommand.php b/vendor/laravel/framework/src/Illuminate/Console/GeneratorCommand.php
index 92f97876..c54cca0e 100644
--- a/vendor/laravel/framework/src/Illuminate/Console/GeneratorCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Console/GeneratorCommand.php
@@ -56,7 +56,9 @@ abstract class GeneratorCommand extends Command
         // First we will check to see if the class already exists. If it does, we don't want
         // to create the class and overwrite the user's code. So, we will bail out so the
         // code is untouched. Otherwise, we will continue generating this class' files.
-        if ((! $this->hasOption('force') || ! $this->option('force')) && $this->alreadyExists($this->getNameInput())) {
+        if ((! $this->hasOption('force') ||
+             ! $this->option('force')) &&
+             $this->alreadyExists($this->getNameInput())) {
             $this->error($this->type.' already exists!');
 
             return false;
@@ -169,7 +171,7 @@ abstract class GeneratorCommand extends Command
     {
         $stub = str_replace(
             ['DummyNamespace', 'DummyRootNamespace', 'NamespacedDummyUserModel'],
-            [$this->getNamespace($name), $this->rootNamespace(), config('auth.providers.users.model')],
+            [$this->getNamespace($name), $this->rootNamespace(), $this->userProviderModel()],
             $stub
         );
 
@@ -221,6 +223,20 @@ abstract class GeneratorCommand extends Command
         return $this->laravel->getNamespace();
     }
 
+    /**
+     * Get the model for the default guard's user provider.
+     *
+     * @return string|null
+     */
+    protected function userProviderModel()
+    {
+        $guard = config('auth.defaults.guard');
+
+        $provider = config("auth.guards.{$guard}.provider");
+
+        return config("auth.providers.{$provider}.model");
+    }
+
     /**
      * Get the console command arguments.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Console/Parser.php b/vendor/laravel/framework/src/Illuminate/Console/Parser.php
index 92753119..77643101 100644
--- a/vendor/laravel/framework/src/Illuminate/Console/Parser.php
+++ b/vendor/laravel/framework/src/Illuminate/Console/Parser.php
@@ -35,6 +35,8 @@ class Parser
      *
      * @param  string  $expression
      * @return string
+     *
+     * @throws \InvalidArgumentException
      */
     protected static function name($expression)
     {
@@ -80,7 +82,7 @@ class Parser
      */
     protected static function parseArgument($token)
     {
-        list($token, $description) = static::extractDescription($token);
+        [$token, $description] = static::extractDescription($token);
 
         switch (true) {
             case Str::endsWith($token, '?*'):
@@ -106,7 +108,7 @@ class Parser
      */
     protected static function parseOption($token)
     {
-        list($token, $description) = static::extractDescription($token);
+        [$token, $description] = static::extractDescription($token);
 
         $matches = preg_split('/\s*\|\s*/', $token, 2);
 
diff --git a/vendor/laravel/framework/src/Illuminate/Console/Scheduling/CacheEventMutex.php b/vendor/laravel/framework/src/Illuminate/Console/Scheduling/CacheEventMutex.php
new file mode 100644
index 00000000..4eaaf052
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Console/Scheduling/CacheEventMutex.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Illuminate\Console\Scheduling;
+
+use Illuminate\Contracts\Cache\Factory as Cache;
+
+class CacheEventMutex implements EventMutex
+{
+    /**
+     * The cache repository implementation.
+     *
+     * @var \Illuminate\Contracts\Cache\Factory
+     */
+    public $cache;
+
+    /**
+     * The cache store that should be used.
+     *
+     * @var string|null
+     */
+    public $store;
+
+    /**
+     * Create a new overlapping strategy.
+     *
+     * @param  \Illuminate\Contracts\Cache\Factory  $cache
+     * @return void
+     */
+    public function __construct(Cache $cache)
+    {
+        $this->cache = $cache;
+    }
+
+    /**
+     * Attempt to obtain an event mutex for the given event.
+     *
+     * @param  \Illuminate\Console\Scheduling\Event  $event
+     * @return bool
+     */
+    public function create(Event $event)
+    {
+        return $this->cache->store($this->store)->add(
+            $event->mutexName(), true, $event->expiresAt
+        );
+    }
+
+    /**
+     * Determine if an event mutex exists for the given event.
+     *
+     * @param  \Illuminate\Console\Scheduling\Event  $event
+     * @return bool
+     */
+    public function exists(Event $event)
+    {
+        return $this->cache->store($this->store)->has($event->mutexName());
+    }
+
+    /**
+     * Clear the event mutex for the given event.
+     *
+     * @param  \Illuminate\Console\Scheduling\Event  $event
+     * @return void
+     */
+    public function forget(Event $event)
+    {
+        $this->cache->store($this->store)->forget($event->mutexName());
+    }
+
+    /**
+     * Specify the cache store that should be used.
+     *
+     * @param  string  $store
+     * @return $this
+     */
+    public function useStore($store)
+    {
+        $this->store = $store;
+
+        return $this;
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Console/Scheduling/CacheMutex.php b/vendor/laravel/framework/src/Illuminate/Console/Scheduling/CacheMutex.php
deleted file mode 100644
index f698ff2c..00000000
--- a/vendor/laravel/framework/src/Illuminate/Console/Scheduling/CacheMutex.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Illuminate\Console\Scheduling;
-
-use Illuminate\Contracts\Cache\Repository as Cache;
-
-class CacheMutex implements Mutex
-{
-    /**
-     * The cache repository implementation.
-     *
-     * @var \Illuminate\Contracts\Cache\Repository
-     */
-    public $cache;
-
-    /**
-     * Create a new overlapping strategy.
-     *
-     * @param  \Illuminate\Contracts\Cache\Repository  $cache
-     * @return void
-     */
-    public function __construct(Cache $cache)
-    {
-        $this->cache = $cache;
-    }
-
-    /**
-     * Attempt to obtain a mutex for the given event.
-     *
-     * @param  \Illuminate\Console\Scheduling\Event  $event
-     * @return bool
-     */
-    public function create(Event $event)
-    {
-        return $this->cache->add(
-            $event->mutexName(), true, $event->expiresAt
-        );
-    }
-
-    /**
-     * Determine if a mutex exists for the given event.
-     *
-     * @param  \Illuminate\Console\Scheduling\Event  $event
-     * @return bool
-     */
-    public function exists(Event $event)
-    {
-        return $this->cache->has($event->mutexName());
-    }
-
-    /**
-     * Clear the mutex for the given event.
-     *
-     * @param  \Illuminate\Console\Scheduling\Event  $event
-     * @return void
-     */
-    public function forget(Event $event)
-    {
-        $this->cache->forget($event->mutexName());
-    }
-}
diff --git a/vendor/laravel/framework/src/Illuminate/Console/Scheduling/CacheSchedulingMutex.php b/vendor/laravel/framework/src/Illuminate/Console/Scheduling/CacheSchedulingMutex.php
new file mode 100644
index 00000000..dfa20348
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Console/Scheduling/CacheSchedulingMutex.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Illuminate\Console\Scheduling;
+
+use DateTimeInterface;
+use Illuminate\Contracts\Cache\Factory as Cache;
+
+class CacheSchedulingMutex implements SchedulingMutex
+{
+    /**
+     * The cache factory implementation.
+     *
+     * @var \Illuminate\Contracts\Cache\Factory
+     */
+    public $cache;
+
+    /**
+     * The cache store that should be used.
+     *
+     * @var string|null
+     */
+    public $store;
+
+    /**
+     * Create a new scheduling strategy.
+     *
+     * @param  \Illuminate\Contracts\Cache\Factory  $cache
+     * @return void
+     */
+    public function __construct(Cache $cache)
+    {
+        $this->cache = $cache;
+    }
+
+    /**
+     * Attempt to obtain a scheduling mutex for the given event.
+     *
+     * @param  \Illuminate\Console\Scheduling\Event  $event
+     * @param  \DateTimeInterface  $time
+     * @return bool
+     */
+    public function create(Event $event, DateTimeInterface $time)
+    {
+        return $this->cache->store($this->store)->add(
+            $event->mutexName().$time->format('Hi'), true, 60
+        );
+    }
+
+    /**
+     * Determine if a scheduling mutex exists for the given event.
+     *
+     * @param  \Illuminate\Console\Scheduling\Event  $event
+     * @param  \DateTimeInterface  $time
+     * @return bool
+     */
+    public function exists(Event $event, DateTimeInterface $time)
+    {
+        return $this->cache->store($this->store)->has(
+            $event->mutexName().$time->format('Hi')
+        );
+    }
+
+    /**
+     * Specify the cache store that should be used.
+     *
+     * @param  string  $store
+     * @return $this
+     */
+    public function useStore($store)
+    {
+        $this->store = $store;
+
+        return $this;
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Console/Scheduling/CallbackEvent.php b/vendor/laravel/framework/src/Illuminate/Console/Scheduling/CallbackEvent.php
index 8bbc6b56..ba6395b5 100644
--- a/vendor/laravel/framework/src/Illuminate/Console/Scheduling/CallbackEvent.php
+++ b/vendor/laravel/framework/src/Illuminate/Console/Scheduling/CallbackEvent.php
@@ -25,14 +25,14 @@ class CallbackEvent extends Event
     /**
      * Create a new event instance.
      *
-     * @param  \Illuminate\Console\Scheduling\Mutex  $mutex
+     * @param  \Illuminate\Console\Scheduling\EventMutex  $mutex
      * @param  string  $callback
      * @param  array  $parameters
      * @return void
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct(Mutex $mutex, $callback, array $parameters = [])
+    public function __construct(EventMutex $mutex, $callback, array $parameters = [])
     {
         if (! is_string($callback) && ! is_callable($callback)) {
             throw new InvalidArgumentException(
@@ -71,7 +71,9 @@ class CallbackEvent extends Event
         parent::callBeforeCallbacks($container);
 
         try {
-            $response = $container->call($this->callback, $this->parameters);
+            $response = is_object($this->callback)
+                        ? $container->call([$this->callback, '__invoke'], $this->parameters)
+                        : $container->call($this->callback, $this->parameters);
         } finally {
             $this->removeMutex();
 
@@ -98,6 +100,8 @@ class CallbackEvent extends Event
      *
      * @param  int  $expiresAt
      * @return $this
+     *
+     * @throws \LogicException
      */
     public function withoutOverlapping($expiresAt = 1440)
     {
@@ -116,6 +120,26 @@ class CallbackEvent extends Event
         });
     }
 
+    /**
+     * Allow the event to only run on one server for each cron expression.
+     *
+     * @return $this
+     *
+     * @throws \LogicException
+     */
+    public function onOneServer()
+    {
+        if (! isset($this->description)) {
+            throw new LogicException(
+                "A scheduled event name is required to only run on one server. Use the 'name' method before 'onOneServer'."
+            );
+        }
+
+        $this->onOneServer = true;
+
+        return $this;
+    }
+
     /**
      * Get the mutex name for the scheduled command.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Console/Scheduling/Event.php b/vendor/laravel/framework/src/Illuminate/Console/Scheduling/Event.php
index 2b4ec97c..afa62e69 100644
--- a/vendor/laravel/framework/src/Illuminate/Console/Scheduling/Event.php
+++ b/vendor/laravel/framework/src/Illuminate/Console/Scheduling/Event.php
@@ -4,6 +4,7 @@ namespace Illuminate\Console\Scheduling;
 
 use Closure;
 use Cron\CronExpression;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Carbon;
 use GuzzleHttp\Client as HttpClient;
 use Illuminate\Contracts\Mail\Mailer;
@@ -27,7 +28,7 @@ class Event
      *
      * @var string
      */
-    public $expression = '* * * * * *';
+    public $expression = '* * * * *';
 
     /**
      * The timezone the date should be evaluated on.
@@ -64,6 +65,13 @@ class Event
      */
     public $withoutOverlapping = false;
 
+    /**
+     * Indicates if the command should only be allowed to run on one server for each cron expression.
+     *
+     * @var bool
+     */
+    public $onOneServer = false;
+
     /**
      * The amount of time the mutex should be valid.
      *
@@ -128,20 +136,20 @@ class Event
     public $description;
 
     /**
-     * The mutex implementation.
+     * The event mutex implementation.
      *
-     * @var \Illuminate\Console\Scheduling\Mutex
+     * @var \Illuminate\Console\Scheduling\EventMutex
      */
     public $mutex;
 
     /**
      * Create a new event instance.
      *
-     * @param  \Illuminate\Console\Scheduling\Mutex  $mutex
+     * @param  \Illuminate\Console\Scheduling\EventMutex  $mutex
      * @param  string  $command
      * @return void
      */
-    public function __construct(Mutex $mutex, $command)
+    public function __construct(EventMutex $mutex, $command)
     {
         $this->mutex = $mutex;
         $this->command = $command;
@@ -330,6 +338,18 @@ class Event
         return true;
     }
 
+    /**
+     * Ensure that the output is stored on disk in a log file.
+     *
+     * @return $this
+     */
+    public function storeOutput()
+    {
+        $this->ensureOutputIsBeingCaptured();
+
+        return $this;
+    }
+
     /**
      * Send the output of the command to a given location.
      *
@@ -370,7 +390,7 @@ class Event
     {
         $this->ensureOutputIsBeingCapturedForEmail();
 
-        $addresses = is_array($addresses) ? $addresses : [$addresses];
+        $addresses = Arr::wrap($addresses);
 
         return $this->then(function (Mailer $mailer) use ($addresses, $onlyIfOutputExists) {
             $this->emailOutput($mailer, $addresses, $onlyIfOutputExists);
@@ -394,8 +414,20 @@ class Event
      * Ensure that output is being captured for email.
      *
      * @return void
+     *
+     * @deprecated See ensureOutputIsBeingCaptured.
      */
     protected function ensureOutputIsBeingCapturedForEmail()
+    {
+        $this->ensureOutputIsBeingCaptured();
+    }
+
+    /**
+     * Ensure that the command output is being captured.
+     *
+     * @return void
+     */
+    protected function ensureOutputIsBeingCaptured()
     {
         if (is_null($this->output) || $this->output == $this->getDefaultOutput()) {
             $this->sendOutputTo(storage_path('logs/schedule-'.sha1($this->mutexName()).'.log'));
@@ -450,6 +482,18 @@ class Event
         });
     }
 
+    /**
+     * Register a callback to ping a given URL before the job runs if the given condition is true.
+     *
+     * @param  bool  $value
+     * @param  string  $url
+     * @return $this
+     */
+    public function pingBeforeIf($value, $url)
+    {
+        return $value ? $this->pingBefore($url) : $this;
+    }
+
     /**
      * Register a callback to ping a given URL after the job runs.
      *
@@ -463,6 +507,18 @@ class Event
         });
     }
 
+    /**
+     * Register a callback to ping a given URL after the job runs if the given condition is true.
+     *
+     * @param  bool  $value
+     * @param  string  $url
+     * @return $this
+     */
+    public function thenPingIf($value, $url)
+    {
+        return $value ? $this->thenPing($url) : $this;
+    }
+
     /**
      * State that the command should run in background.
      *
@@ -532,6 +588,18 @@ class Event
         });
     }
 
+    /**
+     * Allow the event to only run on one server for each cron expression.
+     *
+     * @return $this
+     */
+    public function onOneServer()
+    {
+        $this->onOneServer = true;
+
+        return $this;
+    }
+
     /**
      * Register a callback to further filter the schedule.
      *
@@ -649,7 +717,7 @@ class Event
     {
         return Carbon::instance(CronExpression::factory(
             $this->getExpression()
-        )->getNextRunDate($currentTime, $nth, $allowCurrentDate));
+        )->getNextRunDate($currentTime, $nth, $allowCurrentDate, $this->timezone));
     }
 
     /**
@@ -663,12 +731,12 @@ class Event
     }
 
     /**
-     * Set the mutex implementation to be used.
+     * Set the event mutex implementation to be used.
      *
-     * @param  \Illuminate\Console\Scheduling\Mutex  $mutex
+     * @param  \Illuminate\Console\Scheduling\EventMutex  $mutex
      * @return $this
      */
-    public function preventOverlapsUsing(Mutex $mutex)
+    public function preventOverlapsUsing(EventMutex $mutex)
     {
         $this->mutex = $mutex;
 
diff --git a/vendor/laravel/framework/src/Illuminate/Console/Scheduling/Mutex.php b/vendor/laravel/framework/src/Illuminate/Console/Scheduling/EventMutex.php
similarity index 71%
rename from vendor/laravel/framework/src/Illuminate/Console/Scheduling/Mutex.php
rename to vendor/laravel/framework/src/Illuminate/Console/Scheduling/EventMutex.php
index 47ca939e..1840e242 100644
--- a/vendor/laravel/framework/src/Illuminate/Console/Scheduling/Mutex.php
+++ b/vendor/laravel/framework/src/Illuminate/Console/Scheduling/EventMutex.php
@@ -2,10 +2,10 @@
 
 namespace Illuminate\Console\Scheduling;
 
-interface Mutex
+interface EventMutex
 {
     /**
-     * Attempt to obtain a mutex for the given event.
+     * Attempt to obtain an event mutex for the given event.
      *
      * @param  \Illuminate\Console\Scheduling\Event  $event
      * @return bool
@@ -13,7 +13,7 @@ interface Mutex
     public function create(Event $event);
 
     /**
-     * Determine if a mutex exists for the given event.
+     * Determine if an event mutex exists for the given event.
      *
      * @param  \Illuminate\Console\Scheduling\Event  $event
      * @return bool
@@ -21,7 +21,7 @@ interface Mutex
     public function exists(Event $event);
 
     /**
-     * Clear the mutex for the given event.
+     * Clear the event mutex for the given event.
      *
      * @param  \Illuminate\Console\Scheduling\Event  $event
      * @return void
diff --git a/vendor/laravel/framework/src/Illuminate/Console/Scheduling/Schedule.php b/vendor/laravel/framework/src/Illuminate/Console/Scheduling/Schedule.php
index c3b602ca..3855f177 100644
--- a/vendor/laravel/framework/src/Illuminate/Console/Scheduling/Schedule.php
+++ b/vendor/laravel/framework/src/Illuminate/Console/Scheduling/Schedule.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Console\Scheduling;
 
+use DateTimeInterface;
 use Illuminate\Console\Application;
 use Illuminate\Container\Container;
 use Illuminate\Support\ProcessUtils;
@@ -17,11 +18,18 @@ class Schedule
     protected $events = [];
 
     /**
-     * The mutex implementation.
+     * The event mutex implementation.
      *
-     * @var \Illuminate\Console\Scheduling\Mutex
+     * @var \Illuminate\Console\Scheduling\EventMutex
      */
-    protected $mutex;
+    protected $eventMutex;
+
+    /**
+     * The scheduling mutex implementation.
+     *
+     * @var \Illuminate\Console\Scheduling\SchedulingMutex
+     */
+    protected $schedulingMutex;
 
     /**
      * Create a new schedule instance.
@@ -32,22 +40,26 @@ class Schedule
     {
         $container = Container::getInstance();
 
-        $this->mutex = $container->bound(Mutex::class)
-                                ? $container->make(Mutex::class)
-                                : $container->make(CacheMutex::class);
+        $this->eventMutex = $container->bound(EventMutex::class)
+                                ? $container->make(EventMutex::class)
+                                : $container->make(CacheEventMutex::class);
+
+        $this->schedulingMutex = $container->bound(SchedulingMutex::class)
+                                ? $container->make(SchedulingMutex::class)
+                                : $container->make(CacheSchedulingMutex::class);
     }
 
     /**
      * Add a new callback event to the schedule.
      *
      * @param  string|callable  $callback
-     * @param  array   $parameters
+     * @param  array  $parameters
      * @return \Illuminate\Console\Scheduling\CallbackEvent
      */
     public function call($callback, array $parameters = [])
     {
         $this->events[] = $event = new CallbackEvent(
-            $this->mutex, $callback, $parameters
+            $this->eventMutex, $callback, $parameters
         );
 
         return $event;
@@ -76,15 +88,18 @@ class Schedule
      *
      * @param  object|string  $job
      * @param  string|null  $queue
+     * @param  string|null  $connection
      * @return \Illuminate\Console\Scheduling\CallbackEvent
      */
-    public function job($job, $queue = null)
+    public function job($job, $queue = null, $connection = null)
     {
-        return $this->call(function () use ($job, $queue) {
+        return $this->call(function () use ($job, $queue, $connection) {
             $job = is_string($job) ? resolve($job) : $job;
 
             if ($job instanceof ShouldQueue) {
-                dispatch($job)->onQueue($queue);
+                dispatch($job)
+                    ->onConnection($connection ?? $job->connection)
+                    ->onQueue($queue ?? $job->queue);
             } else {
                 dispatch_now($job);
             }
@@ -104,7 +119,7 @@ class Schedule
             $command .= ' '.$this->compileParameters($parameters);
         }
 
-        $this->events[] = $event = new Event($this->mutex, $command);
+        $this->events[] = $event = new Event($this->eventMutex, $command);
 
         return $event;
     }
@@ -130,6 +145,18 @@ class Schedule
         })->implode(' ');
     }
 
+    /**
+     * Determine if the server is allowed to run this event.
+     *
+     * @param  \Illuminate\Console\Scheduling\Event  $event
+     * @param  \DateTimeInterface  $time
+     * @return bool
+     */
+    public function serverShouldRun(Event $event, DateTimeInterface $time)
+    {
+        return $this->schedulingMutex->create($event, $time);
+    }
+
     /**
      * Get all of the events on the schedule that are due.
      *
@@ -150,4 +177,23 @@ class Schedule
     {
         return $this->events;
     }
+
+    /**
+     * Specify the cache store that should be used to store mutexes.
+     *
+     * @param  string  $store
+     * @return $this
+     */
+    public function useCache($store)
+    {
+        if ($this->eventMutex instanceof CacheEventMutex) {
+            $this->eventMutex->useStore($store);
+        }
+
+        if ($this->schedulingMutex instanceof CacheSchedulingMutex) {
+            $this->schedulingMutex->useStore($store);
+        }
+
+        return $this;
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Console/Scheduling/ScheduleRunCommand.php b/vendor/laravel/framework/src/Illuminate/Console/Scheduling/ScheduleRunCommand.php
index a07a9a4c..21695438 100644
--- a/vendor/laravel/framework/src/Illuminate/Console/Scheduling/ScheduleRunCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Console/Scheduling/ScheduleRunCommand.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Console\Scheduling;
 
+use Illuminate\Support\Carbon;
 use Illuminate\Console\Command;
 
 class ScheduleRunCommand extends Command
@@ -27,6 +28,20 @@ class ScheduleRunCommand extends Command
      */
     protected $schedule;
 
+    /**
+     * The 24 hour timestamp this scheduler command started running.
+     *
+     * @var \Illuminate\Support\Carbon;
+     */
+    protected $startedAt;
+
+    /**
+     * Check if any events ran.
+     *
+     * @var bool
+     */
+    protected $eventsRan = false;
+
     /**
      * Create a new command instance.
      *
@@ -37,6 +52,8 @@ class ScheduleRunCommand extends Command
     {
         $this->schedule = $schedule;
 
+        $this->startedAt = Carbon::now();
+
         parent::__construct();
     }
 
@@ -47,22 +64,52 @@ class ScheduleRunCommand extends Command
      */
     public function handle()
     {
-        $eventsRan = false;
-
         foreach ($this->schedule->dueEvents($this->laravel) as $event) {
             if (! $event->filtersPass($this->laravel)) {
                 continue;
             }
 
-            $this->line('<info>Running scheduled command:</info> '.$event->getSummaryForDisplay());
-
-            $event->run($this->laravel);
+            if ($event->onOneServer) {
+                $this->runSingleServerEvent($event);
+            } else {
+                $this->runEvent($event);
+            }
 
-            $eventsRan = true;
+            $this->eventsRan = true;
         }
 
-        if (! $eventsRan) {
+        if (! $this->eventsRan) {
             $this->info('No scheduled commands are ready to run.');
         }
     }
+
+    /**
+     * Run the given single server event.
+     *
+     * @param  \Illuminate\Console\Scheduling\Event  $event
+     * @return void
+     */
+    protected function runSingleServerEvent($event)
+    {
+        if ($this->schedule->serverShouldRun($event, $this->startedAt)) {
+            $this->runEvent($event);
+        } else {
+            $this->line('<info>Skipping command (has already run on another server):</info> '.$event->getSummaryForDisplay());
+        }
+    }
+
+    /**
+     * Run the given event.
+     *
+     * @param  \Illuminate\Console\Scheduling\Event  $event
+     * @return void
+     */
+    protected function runEvent($event)
+    {
+        $this->line('<info>Running scheduled command:</info> '.$event->getSummaryForDisplay());
+
+        $event->run($this->laravel);
+
+        $this->eventsRan = true;
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Console/Scheduling/SchedulingMutex.php b/vendor/laravel/framework/src/Illuminate/Console/Scheduling/SchedulingMutex.php
new file mode 100644
index 00000000..ab4e87da
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Console/Scheduling/SchedulingMutex.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Illuminate\Console\Scheduling;
+
+use DateTimeInterface;
+
+interface SchedulingMutex
+{
+    /**
+     * Attempt to obtain a scheduling mutex for the given event.
+     *
+     * @param  \Illuminate\Console\Scheduling\Event  $event
+     * @param  \DateTimeInterface  $time
+     * @return bool
+     */
+    public function create(Event $event, DateTimeInterface $time);
+
+    /**
+     * Determine if a scheduling mutex exists for the given event.
+     *
+     * @param  \Illuminate\Console\Scheduling\Event  $event
+     * @param  \DateTimeInterface  $time
+     * @return bool
+     */
+    public function exists(Event $event, DateTimeInterface $time);
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Console/composer.json b/vendor/laravel/framework/src/Illuminate/Console/composer.json
index 6e432e03..91ce9743 100755
--- a/vendor/laravel/framework/src/Illuminate/Console/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Console/composer.json
@@ -14,10 +14,10 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/support": "5.5.*",
-        "symfony/console": "~3.3"
+        "php": "^7.1.3",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/support": "5.7.*",
+        "symfony/console": "^4.1"
     },
     "autoload": {
         "psr-4": {
@@ -26,13 +26,13 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "suggest": {
-        "guzzlehttp/guzzle": "Required to use the ping methods on schedules (~6.0).",
-        "mtdowling/cron-expression": "Required to use scheduling component (~1.0).",
-        "symfony/process": "Required to use scheduling component (~3.3)."
+        "dragonmantank/cron-expression": "Required to use scheduling component (^2.0).",
+        "guzzlehttp/guzzle": "Required to use the ping methods on schedules (^6.0).",
+        "symfony/process": "Required to use scheduling component (^4.1)."
     },
     "config": {
         "sort-packages": true
diff --git a/vendor/laravel/framework/src/Illuminate/Container/BoundMethod.php b/vendor/laravel/framework/src/Illuminate/Container/BoundMethod.php
index 0dfd6fdc..543eea3c 100644
--- a/vendor/laravel/framework/src/Illuminate/Container/BoundMethod.php
+++ b/vendor/laravel/framework/src/Illuminate/Container/BoundMethod.php
@@ -122,8 +122,10 @@ class BoundMethod
     /**
      * Get the proper reflection instance for the given callback.
      *
-     * @param  callable|string  $callback
+     * @param  callable|string $callback
      * @return \ReflectionFunctionAbstract
+     *
+     * @throws \ReflectionException
      */
     protected static function getCallReflector($callback)
     {
@@ -152,6 +154,10 @@ class BoundMethod
             $dependencies[] = $parameters[$parameter->name];
 
             unset($parameters[$parameter->name]);
+        } elseif ($parameter->getClass() && array_key_exists($parameter->getClass()->name, $parameters)) {
+            $dependencies[] = $parameters[$parameter->getClass()->name];
+
+            unset($parameters[$parameter->getClass()->name]);
         } elseif ($parameter->getClass()) {
             $dependencies[] = $container->make($parameter->getClass()->name);
         } elseif ($parameter->isDefaultValueAvailable()) {
diff --git a/vendor/laravel/framework/src/Illuminate/Container/Container.php b/vendor/laravel/framework/src/Illuminate/Container/Container.php
index 61c2b5ef..9538b993 100755
--- a/vendor/laravel/framework/src/Illuminate/Container/Container.php
+++ b/vendor/laravel/framework/src/Illuminate/Container/Container.php
@@ -3,10 +3,12 @@
 namespace Illuminate\Container;
 
 use Closure;
+use Exception;
 use ArrayAccess;
 use LogicException;
 use ReflectionClass;
 use ReflectionParameter;
+use Illuminate\Support\Arr;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Contracts\Container\Container as ContainerContract;
 
@@ -134,12 +136,18 @@ class Container implements ArrayAccess, ContainerContract
     /**
      * Define a contextual binding.
      *
-     * @param  string  $concrete
+     * @param  array|string  $concrete
      * @return \Illuminate\Contracts\Container\ContextualBindingBuilder
      */
     public function when($concrete)
     {
-        return new ContextualBindingBuilder($this, $this->getAlias($concrete));
+        $aliases = [];
+
+        foreach (Arr::wrap($concrete) as $c) {
+            $aliases[] = $this->getAlias($c);
+        }
+
+        return new ContextualBindingBuilder($this, $aliases);
     }
 
     /**
@@ -271,13 +279,28 @@ class Container implements ArrayAccess, ContainerContract
     /**
      * Bind a callback to resolve with Container::call.
      *
-     * @param  string  $method
+     * @param  array|string  $method
      * @param  \Closure  $callback
      * @return void
      */
     public function bindMethod($method, $callback)
     {
-        $this->methodBindings[$method] = $callback;
+        $this->methodBindings[$this->parseBindMethod($method)] = $callback;
+    }
+
+    /**
+     * Get the method to be bound in class@method format.
+     *
+     * @param  array|string $method
+     * @return string
+     */
+    protected function parseBindMethod($method)
+    {
+        if (is_array($method)) {
+            return $method[0].'@'.$method[1];
+        }
+
+        return $method;
     }
 
     /**
@@ -591,11 +614,15 @@ class Container implements ArrayAccess, ContainerContract
      */
     public function get($id)
     {
-        if ($this->has($id)) {
+        try {
             return $this->resolve($id);
-        }
+        } catch (Exception $e) {
+            if ($this->has($id)) {
+                throw $e;
+            }
 
-        throw new EntryNotFoundException;
+            throw new EntryNotFoundException;
+        }
     }
 
     /**
@@ -1166,7 +1193,7 @@ class Container implements ArrayAccess, ContainerContract
      * Set the shared instance of the container.
      *
      * @param  \Illuminate\Contracts\Container\Container|null  $container
-     * @return static
+     * @return \Illuminate\Contracts\Container\Container|static
      */
     public static function setInstance(ContainerContract $container = null)
     {
diff --git a/vendor/laravel/framework/src/Illuminate/Container/ContextualBindingBuilder.php b/vendor/laravel/framework/src/Illuminate/Container/ContextualBindingBuilder.php
index 58b70cee..2bd4b5ad 100644
--- a/vendor/laravel/framework/src/Illuminate/Container/ContextualBindingBuilder.php
+++ b/vendor/laravel/framework/src/Illuminate/Container/ContextualBindingBuilder.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Container;
 
+use Illuminate\Support\Arr;
 use Illuminate\Contracts\Container\ContextualBindingBuilder as ContextualBindingBuilderContract;
 
 class ContextualBindingBuilder implements ContextualBindingBuilderContract
@@ -31,7 +32,7 @@ class ContextualBindingBuilder implements ContextualBindingBuilderContract
      * Create a new contextual binding builder.
      *
      * @param  \Illuminate\Container\Container  $container
-     * @param  string  $concrete
+     * @param  string|array  $concrete
      * @return void
      */
     public function __construct(Container $container, $concrete)
@@ -61,8 +62,8 @@ class ContextualBindingBuilder implements ContextualBindingBuilderContract
      */
     public function give($implementation)
     {
-        $this->container->addContextualBinding(
-            $this->concrete, $this->needs, $implementation
-        );
+        foreach (Arr::wrap($this->concrete) as $concrete) {
+            $this->container->addContextualBinding($concrete, $this->needs, $implementation);
+        }
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Container/composer.json b/vendor/laravel/framework/src/Illuminate/Container/composer.json
index 7347da14..593f2fb6 100755
--- a/vendor/laravel/framework/src/Illuminate/Container/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Container/composer.json
@@ -14,9 +14,10 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/contracts": "5.5.*",
-        "psr/container": "~1.0"
+        "php": "^7.1.3",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/support": "5.7.*",
+        "psr/container": "^1.0"
     },
     "autoload": {
         "psr-4": {
@@ -25,7 +26,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "config": {
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Access/Gate.php b/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Access/Gate.php
index 2021b573..779ad46d 100644
--- a/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Access/Gate.php
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Access/Gate.php
@@ -93,6 +93,15 @@ interface Gate
      */
     public function authorize($ability, $arguments = []);
 
+    /**
+     * Get the raw result from the authorization callback.
+     *
+     * @param  string  $ability
+     * @param  array|mixed  $arguments
+     * @return mixed
+     */
+    public function raw($ability, $arguments = []);
+
     /**
      * Get a policy instance for a given class.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Auth/MustVerifyEmail.php b/vendor/laravel/framework/src/Illuminate/Contracts/Auth/MustVerifyEmail.php
new file mode 100644
index 00000000..81698066
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Auth/MustVerifyEmail.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Illuminate\Contracts\Auth;
+
+interface MustVerifyEmail
+{
+    /**
+     * Determine if the user has verified their email address.
+     *
+     * @return bool
+     */
+    public function hasVerifiedEmail();
+
+    /**
+     * Mark the given user's email as verified.
+     *
+     * @return bool
+     */
+    public function markEmailAsVerified();
+
+    /**
+     * Send the email verification notification.
+     *
+     * @return void
+     */
+    public function sendEmailVerificationNotification();
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Broadcasting/Factory.php b/vendor/laravel/framework/src/Illuminate/Contracts/Broadcasting/Factory.php
index 1d3a7374..384c2d02 100644
--- a/vendor/laravel/framework/src/Illuminate/Contracts/Broadcasting/Factory.php
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Broadcasting/Factory.php
@@ -7,7 +7,7 @@ interface Factory
     /**
      * Get a broadcaster implementation by name.
      *
-     * @param  string  $name
+     * @param  string|null  $name
      * @return void
      */
     public function connection($name = null);
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Broadcasting/ShouldBroadcast.php b/vendor/laravel/framework/src/Illuminate/Contracts/Broadcasting/ShouldBroadcast.php
index b051e3be..a4802fe4 100644
--- a/vendor/laravel/framework/src/Illuminate/Contracts/Broadcasting/ShouldBroadcast.php
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Broadcasting/ShouldBroadcast.php
@@ -2,14 +2,12 @@
 
 namespace Illuminate\Contracts\Broadcasting;
 
-use Illuminate\Broadcasting\Channel;
-
 interface ShouldBroadcast
 {
     /**
      * Get the channels the event should broadcast on.
      *
-     * @return Channel|Channel[]
+     * @return \Illuminate\Broadcasting\Channel|\Illuminate\Broadcasting\Channel[]
      */
     public function broadcastOn();
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Bus/Dispatcher.php b/vendor/laravel/framework/src/Illuminate/Contracts/Bus/Dispatcher.php
index 3370ad3d..12ed2226 100644
--- a/vendor/laravel/framework/src/Illuminate/Contracts/Bus/Dispatcher.php
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Bus/Dispatcher.php
@@ -21,6 +21,22 @@ interface Dispatcher
      */
     public function dispatchNow($command, $handler = null);
 
+    /**
+     * Determine if the given command has a handler.
+     *
+     * @param  mixed  $command
+     * @return bool
+     */
+    public function hasCommandHandler($command);
+
+    /**
+     * Retrieve the handler for a command.
+     *
+     * @param  mixed  $command
+     * @return bool|mixed
+     */
+    public function getCommandHandler($command);
+
     /**
      * Set the pipes commands should be piped through before dispatching.
      *
@@ -28,4 +44,12 @@ interface Dispatcher
      * @return $this
      */
     public function pipeThrough(array $pipes);
+
+    /**
+     * Map a command to a handler.
+     *
+     * @param  array  $map
+     * @return $this
+     */
+    public function map(array $map);
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Console/Application.php b/vendor/laravel/framework/src/Illuminate/Contracts/Console/Application.php
index a59e4312..ba628c9f 100644
--- a/vendor/laravel/framework/src/Illuminate/Contracts/Console/Application.php
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Console/Application.php
@@ -5,13 +5,14 @@ namespace Illuminate\Contracts\Console;
 interface Application
 {
     /**
-     * Call a console application command.
+     * Run an Artisan console command by name.
      *
      * @param  string  $command
      * @param  array  $parameters
+     * @param  \Symfony\Component\Console\Output\OutputInterface|null  $outputBuffer
      * @return int
      */
-    public function call($command, array $parameters = []);
+    public function call($command, array $parameters = [], $outputBuffer = null);
 
     /**
      * Get the output from the last command.
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Console/Kernel.php b/vendor/laravel/framework/src/Illuminate/Contracts/Console/Kernel.php
index 4cf79869..79889e6f 100644
--- a/vendor/laravel/framework/src/Illuminate/Contracts/Console/Kernel.php
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Console/Kernel.php
@@ -8,7 +8,7 @@ interface Kernel
      * Handle an incoming console command.
      *
      * @param  \Symfony\Component\Console\Input\InputInterface  $input
-     * @param  \Symfony\Component\Console\Output\OutputInterface  $output
+     * @param  \Symfony\Component\Console\Output\OutputInterface|null  $output
      * @return int
      */
     public function handle($input, $output = null);
@@ -18,9 +18,10 @@ interface Kernel
      *
      * @param  string  $command
      * @param  array  $parameters
+     * @param  \Symfony\Component\Console\Output\OutputInterface|null  $outputBuffer
      * @return int
      */
-    public function call($command, array $parameters = []);
+    public function call($command, array $parameters = [], $outputBuffer = null);
 
     /**
      * Queue an Artisan console command by name.
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Container/Container.php b/vendor/laravel/framework/src/Illuminate/Contracts/Container/Container.php
index c68c645f..c2079080 100644
--- a/vendor/laravel/framework/src/Illuminate/Contracts/Container/Container.php
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Container/Container.php
@@ -93,7 +93,7 @@ interface Container extends ContainerInterface
     /**
      * Define a contextual binding.
      *
-     * @param  string  $concrete
+     * @param  string|array  $concrete
      * @return \Illuminate\Contracts\Container\ContextualBindingBuilder
      */
     public function when($concrete);
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Cookie/Factory.php b/vendor/laravel/framework/src/Illuminate/Contracts/Cookie/Factory.php
index 61243976..1cdd71bf 100644
--- a/vendor/laravel/framework/src/Illuminate/Contracts/Cookie/Factory.php
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Cookie/Factory.php
@@ -12,11 +12,13 @@ interface Factory
      * @param  int     $minutes
      * @param  string  $path
      * @param  string  $domain
-     * @param  bool    $secure
+     * @param  bool|null    $secure
      * @param  bool    $httpOnly
+     * @param  bool         $raw
+     * @param  string|null  $sameSite
      * @return \Symfony\Component\HttpFoundation\Cookie
      */
-    public function make($name, $value, $minutes = 0, $path = null, $domain = null, $secure = false, $httpOnly = true);
+    public function make($name, $value, $minutes = 0, $path = null, $domain = null, $secure = null, $httpOnly = true, $raw = false, $sameSite = null);
 
     /**
      * Create a cookie that lasts "forever" (five years).
@@ -25,11 +27,13 @@ interface Factory
      * @param  string  $value
      * @param  string  $path
      * @param  string  $domain
-     * @param  bool    $secure
+     * @param  bool|null    $secure
      * @param  bool    $httpOnly
+     * @param  bool         $raw
+     * @param  string|null  $sameSite
      * @return \Symfony\Component\HttpFoundation\Cookie
      */
-    public function forever($name, $value, $path = null, $domain = null, $secure = false, $httpOnly = true);
+    public function forever($name, $value, $path = null, $domain = null, $secure = null, $httpOnly = true, $raw = false, $sameSite = null);
 
     /**
      * Expire the given cookie.
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Database/ModelIdentifier.php b/vendor/laravel/framework/src/Illuminate/Contracts/Database/ModelIdentifier.php
index 587044a8..9893d280 100644
--- a/vendor/laravel/framework/src/Illuminate/Contracts/Database/ModelIdentifier.php
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Database/ModelIdentifier.php
@@ -20,6 +20,13 @@ class ModelIdentifier
      */
     public $id;
 
+    /**
+     * The relationships loaded on the model.
+     *
+     * @var array
+     */
+    public $relations;
+
     /**
      * The connection name of the model.
      *
@@ -32,13 +39,15 @@ class ModelIdentifier
      *
      * @param  string  $class
      * @param  mixed  $id
+     * @param  array  $relations
      * @param  mixed  $connection
      * @return void
      */
-    public function __construct($class, $id, $connection)
+    public function __construct($class, $id, array $relations, $connection)
     {
         $this->id = $id;
         $this->class = $class;
+        $this->relations = $relations;
         $this->connection = $connection;
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Filesystem/FileExistsException.php b/vendor/laravel/framework/src/Illuminate/Contracts/Filesystem/FileExistsException.php
new file mode 100644
index 00000000..9027892f
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Filesystem/FileExistsException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Illuminate\Contracts\Filesystem;
+
+use Exception;
+
+class FileExistsException extends Exception
+{
+    //
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Filesystem/Filesystem.php b/vendor/laravel/framework/src/Illuminate/Contracts/Filesystem/Filesystem.php
index 69a189c1..df5679bb 100644
--- a/vendor/laravel/framework/src/Illuminate/Contracts/Filesystem/Filesystem.php
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Filesystem/Filesystem.php
@@ -36,6 +36,16 @@ interface Filesystem
      */
     public function get($path);
 
+    /**
+     * Get a resource to read the file.
+     *
+     * @param  string  $path
+     * @return resource|null The path resource or null on failure.
+     *
+     * @throws FileNotFoundException
+     */
+    public function readStream($path);
+
     /**
      * Write the contents of a file.
      *
@@ -46,6 +56,19 @@ interface Filesystem
      */
     public function put($path, $contents, $options = []);
 
+    /**
+     * Write a new file using a stream.
+     *
+     * @param  string  $path
+     * @param  resource $resource
+     * @param  mixed  $options
+     * @return bool
+     *
+     * @throws \InvalidArgumentException If $resource is not a file handle.
+     * @throws FileExistsException
+     */
+    public function writeStream($path, $resource, array $options = []);
+
     /**
      * Get the visibility for the given path.
      *
@@ -59,7 +82,7 @@ interface Filesystem
      *
      * @param  string  $path
      * @param  string  $visibility
-     * @return void
+     * @return bool
      */
     public function setVisibility($path, $visibility);
 
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Foundation/Application.php b/vendor/laravel/framework/src/Illuminate/Contracts/Foundation/Application.php
index a7d643b1..e2e03cf6 100644
--- a/vendor/laravel/framework/src/Illuminate/Contracts/Foundation/Application.php
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Foundation/Application.php
@@ -28,12 +28,19 @@ interface Application extends Container
     public function environment();
 
     /**
-     * Determine if we are running in the console.
+     * Determine if the application is running in the console.
      *
      * @return bool
      */
     public function runningInConsole();
 
+    /**
+     * Determine if the application is running unit tests.
+     *
+     * @return bool
+     */
+    public function runningUnitTests();
+
     /**
      * Determine if the application is currently down for maintenance.
      *
@@ -52,11 +59,10 @@ interface Application extends Container
      * Register a service provider with the application.
      *
      * @param  \Illuminate\Support\ServiceProvider|string  $provider
-     * @param  array  $options
      * @param  bool   $force
      * @return \Illuminate\Support\ServiceProvider
      */
-    public function register($provider, $options = [], $force = false);
+    public function register($provider, $force = false);
 
     /**
      * Register a deferred provider and service.
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Hashing/Hasher.php b/vendor/laravel/framework/src/Illuminate/Contracts/Hashing/Hasher.php
index 3310136e..8771c7c6 100644
--- a/vendor/laravel/framework/src/Illuminate/Contracts/Hashing/Hasher.php
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Hashing/Hasher.php
@@ -4,6 +4,14 @@ namespace Illuminate\Contracts\Hashing;
 
 interface Hasher
 {
+    /**
+     * Get information about the given hashed value.
+     *
+     * @param  string  $hashedValue
+     * @return array
+     */
+    public function info($hashedValue);
+
     /**
      * Hash the given value.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Logging/Log.php b/vendor/laravel/framework/src/Illuminate/Contracts/Logging/Log.php
deleted file mode 100644
index 5ecb9f8b..00000000
--- a/vendor/laravel/framework/src/Illuminate/Contracts/Logging/Log.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-namespace Illuminate\Contracts\Logging;
-
-interface Log
-{
-    /**
-     * Log an alert message to the logs.
-     *
-     * @param  string  $message
-     * @param  array  $context
-     * @return void
-     */
-    public function alert($message, array $context = []);
-
-    /**
-     * Log a critical message to the logs.
-     *
-     * @param  string  $message
-     * @param  array  $context
-     * @return void
-     */
-    public function critical($message, array $context = []);
-
-    /**
-     * Log an error message to the logs.
-     *
-     * @param  string  $message
-     * @param  array  $context
-     * @return void
-     */
-    public function error($message, array $context = []);
-
-    /**
-     * Log a warning message to the logs.
-     *
-     * @param  string  $message
-     * @param  array  $context
-     * @return void
-     */
-    public function warning($message, array $context = []);
-
-    /**
-     * Log a notice to the logs.
-     *
-     * @param  string  $message
-     * @param  array  $context
-     * @return void
-     */
-    public function notice($message, array $context = []);
-
-    /**
-     * Log an informational message to the logs.
-     *
-     * @param  string  $message
-     * @param  array  $context
-     * @return void
-     */
-    public function info($message, array $context = []);
-
-    /**
-     * Log a debug message to the logs.
-     *
-     * @param  string  $message
-     * @param  array  $context
-     * @return void
-     */
-    public function debug($message, array $context = []);
-
-    /**
-     * Log a message to the logs.
-     *
-     * @param  string  $level
-     * @param  string  $message
-     * @param  array  $context
-     * @return void
-     */
-    public function log($level, $message, array $context = []);
-
-    /**
-     * Register a file log handler.
-     *
-     * @param  string  $path
-     * @param  string  $level
-     * @return void
-     */
-    public function useFiles($path, $level = 'debug');
-
-    /**
-     * Register a daily file log handler.
-     *
-     * @param  string  $path
-     * @param  int     $days
-     * @param  string  $level
-     * @return void
-     */
-    public function useDailyFiles($path, $days = 0, $level = 'debug');
-}
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Mail/MailQueue.php b/vendor/laravel/framework/src/Illuminate/Contracts/Mail/MailQueue.php
index 1019b05d..c523c284 100644
--- a/vendor/laravel/framework/src/Illuminate/Contracts/Mail/MailQueue.php
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Mail/MailQueue.php
@@ -7,7 +7,7 @@ interface MailQueue
     /**
      * Queue a new e-mail message for sending.
      *
-     * @param  string|array|MailableContract  $view
+     * @param  string|array|\Illuminate\Contracts\Mail\Mailable  $view
      * @param  string  $queue
      * @return mixed
      */
@@ -17,7 +17,7 @@ interface MailQueue
      * Queue a new e-mail message for sending after (n) seconds.
      *
      * @param  \DateTimeInterface|\DateInterval|int  $delay
-     * @param  string|array|MailableContract  $view
+     * @param  string|array|\Illuminate\Contracts\Mail\Mailable  $view
      * @param  string  $queue
      * @return mixed
      */
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Mail/Mailer.php b/vendor/laravel/framework/src/Illuminate/Contracts/Mail/Mailer.php
index 559adfcf..5e68c32b 100644
--- a/vendor/laravel/framework/src/Illuminate/Contracts/Mail/Mailer.php
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Mail/Mailer.php
@@ -32,7 +32,7 @@ interface Mailer
     /**
      * Send a new message using a view.
      *
-     * @param  string|array|MailableContract  $view
+     * @param  string|array|\Illuminate\Contracts\Mail\Mailable  $view
      * @param  array  $data
      * @param  \Closure|string  $callback
      * @return void
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Queue/Job.php b/vendor/laravel/framework/src/Illuminate/Contracts/Queue/Job.php
index 8a907987..972cc1fe 100644
--- a/vendor/laravel/framework/src/Illuminate/Contracts/Queue/Job.php
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Queue/Job.php
@@ -4,6 +4,20 @@ namespace Illuminate\Contracts\Queue;
 
 interface Job
 {
+    /**
+     * Get the job identifier.
+     *
+     * @return string
+     */
+    public function getJobId();
+
+    /**
+     * Get the decoded body of the job.
+     *
+     * @return array
+     */
+    public function payload();
+
     /**
      * Fire the job.
      *
@@ -15,7 +29,7 @@ interface Job
      * Release the job back into the queue.
      *
      * @param  int   $delay
-     * @return mixed
+     * @return void
      */
     public function release($delay = 0);
 
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Queue/QueueableCollection.php b/vendor/laravel/framework/src/Illuminate/Contracts/Queue/QueueableCollection.php
index 0331b814..7f1ea19c 100644
--- a/vendor/laravel/framework/src/Illuminate/Contracts/Queue/QueueableCollection.php
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Queue/QueueableCollection.php
@@ -18,6 +18,13 @@ interface QueueableCollection
      */
     public function getQueueableIds();
 
+    /**
+     * Get the relationships of the entities being queued.
+     *
+     * @return array
+     */
+    public function getQueueableRelations();
+
     /**
      * Get the connection of the entities being queued.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Queue/QueueableEntity.php b/vendor/laravel/framework/src/Illuminate/Contracts/Queue/QueueableEntity.php
index 00e28f8a..366f0c84 100644
--- a/vendor/laravel/framework/src/Illuminate/Contracts/Queue/QueueableEntity.php
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Queue/QueueableEntity.php
@@ -11,6 +11,13 @@ interface QueueableEntity
      */
     public function getQueueableId();
 
+    /**
+     * Get the relationships for the entity.
+     *
+     * @return array
+     */
+    public function getQueueableRelations();
+
     /**
      * Get the connection of the entity.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Redis/Connection.php b/vendor/laravel/framework/src/Illuminate/Contracts/Redis/Connection.php
new file mode 100644
index 00000000..74a88329
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Redis/Connection.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Illuminate\Contracts\Redis;
+
+use Closure;
+
+interface Connection
+{
+    /**
+     * Subscribe to a set of given channels for messages.
+     *
+     * @param  array|string  $channels
+     * @param  \Closure  $callback
+     * @return void
+     */
+    public function subscribe($channels, Closure $callback);
+
+    /**
+     * Subscribe to a set of given channels with wildcards.
+     *
+     * @param  array|string  $channels
+     * @param  \Closure  $callback
+     * @return void
+     */
+    public function psubscribe($channels, Closure $callback);
+
+    /**
+     * Run a command against the Redis database.
+     *
+     * @param  string  $method
+     * @param  array  $parameters
+     * @return mixed
+     */
+    public function command($method, array $parameters = []);
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Routing/ResponseFactory.php b/vendor/laravel/framework/src/Illuminate/Contracts/Routing/ResponseFactory.php
index 5dd4ee08..9079ace1 100644
--- a/vendor/laravel/framework/src/Illuminate/Contracts/Routing/ResponseFactory.php
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Routing/ResponseFactory.php
@@ -5,7 +5,7 @@ namespace Illuminate\Contracts\Routing;
 interface ResponseFactory
 {
     /**
-     * Return a new response from the application.
+     * Create a new response instance.
      *
      * @param  string  $content
      * @param  int  $status
@@ -15,7 +15,16 @@ interface ResponseFactory
     public function make($content = '', $status = 200, array $headers = []);
 
     /**
-     * Return a new view response from the application.
+     * Create a new "no content" response.
+     *
+     * @param  int  $status
+     * @param  array  $headers
+     * @return \Illuminate\Http\Response
+     */
+    public function noContent($status = 204, array $headers = []);
+
+    /**
+     * Create a new response for a given view.
      *
      * @param  string  $view
      * @param  array  $data
@@ -26,7 +35,7 @@ interface ResponseFactory
     public function view($view, $data = [], $status = 200, array $headers = []);
 
     /**
-     * Return a new JSON response from the application.
+     * Create a new JSON response instance.
      *
      * @param  string|array  $data
      * @param  int  $status
@@ -37,7 +46,7 @@ interface ResponseFactory
     public function json($data = [], $status = 200, array $headers = [], $options = 0);
 
     /**
-     * Return a new JSONP response from the application.
+     * Create a new JSONP response instance.
      *
      * @param  string  $callback
      * @param  string|array  $data
@@ -49,7 +58,7 @@ interface ResponseFactory
     public function jsonp($callback, $data = [], $status = 200, array $headers = [], $options = 0);
 
     /**
-     * Return a new streamed response from the application.
+     * Create a new streamed response instance.
      *
      * @param  \Closure  $callback
      * @param  int  $status
@@ -58,11 +67,22 @@ interface ResponseFactory
      */
     public function stream($callback, $status = 200, array $headers = []);
 
+    /**
+     * Create a new streamed response instance as a file download.
+     *
+     * @param  \Closure  $callback
+     * @param  string|null  $name
+     * @param  array  $headers
+     * @param  string|null  $disposition
+     * @return \Symfony\Component\HttpFoundation\StreamedResponse
+     */
+    public function streamDownload($callback, $name = null, array $headers = [], $disposition = 'attachment');
+
     /**
      * Create a new file download response.
      *
      * @param  \SplFileInfo|string  $file
-     * @param  string  $name
+     * @param  string|null  $name
      * @param  array  $headers
      * @param  string|null  $disposition
      * @return \Symfony\Component\HttpFoundation\BinaryFileResponse
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Routing/UrlGenerator.php b/vendor/laravel/framework/src/Illuminate/Contracts/Routing/UrlGenerator.php
index d77b3af9..53044ccc 100644
--- a/vendor/laravel/framework/src/Illuminate/Contracts/Routing/UrlGenerator.php
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Routing/UrlGenerator.php
@@ -54,7 +54,7 @@ interface UrlGenerator
     /**
      * Get the URL to a controller action.
      *
-     * @param  string  $action
+     * @param  string|array  $action
      * @param  mixed $parameters
      * @param  bool $absolute
      * @return string
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Translation/HasLocalePreference.php b/vendor/laravel/framework/src/Illuminate/Contracts/Translation/HasLocalePreference.php
new file mode 100644
index 00000000..1b1f16d6
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Translation/HasLocalePreference.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Illuminate\Contracts\Translation;
+
+interface HasLocalePreference
+{
+    /**
+     * Get the preferred locale of the entity.
+     *
+     * @return string|null
+     */
+    public function preferredLocale();
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Validation/ValidatesWhenResolved.php b/vendor/laravel/framework/src/Illuminate/Contracts/Validation/ValidatesWhenResolved.php
index 4c33629a..4e6b7577 100644
--- a/vendor/laravel/framework/src/Illuminate/Contracts/Validation/ValidatesWhenResolved.php
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Validation/ValidatesWhenResolved.php
@@ -9,5 +9,5 @@ interface ValidatesWhenResolved
      *
      * @return void
      */
-    public function validate();
+    public function validateResolved();
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Validation/Validator.php b/vendor/laravel/framework/src/Illuminate/Contracts/Validation/Validator.php
index 3404df2a..b69942b5 100644
--- a/vendor/laravel/framework/src/Illuminate/Contracts/Validation/Validator.php
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/Validation/Validator.php
@@ -6,6 +6,13 @@ use Illuminate\Contracts\Support\MessageProvider;
 
 interface Validator extends MessageProvider
 {
+    /**
+     * Run the validator's rules against its data.
+     *
+     * @return array
+     */
+    public function validate();
+
     /**
      * Determine if the data fails the validation rules.
      *
@@ -23,7 +30,7 @@ interface Validator extends MessageProvider
     /**
      * Add conditions to a given field based on a Closure.
      *
-     * @param  string  $attribute
+     * @param  string|array  $attribute
      * @param  string|array  $rules
      * @param  callable  $callback
      * @return $this
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/View/Factory.php b/vendor/laravel/framework/src/Illuminate/Contracts/View/Factory.php
index dc9b19a2..562ee799 100644
--- a/vendor/laravel/framework/src/Illuminate/Contracts/View/Factory.php
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/View/Factory.php
@@ -16,7 +16,7 @@ interface Factory
      * Get the evaluated view contents for the given path.
      *
      * @param  string  $path
-     * @param  array  $data
+     * @param  \Illuminate\Contracts\Support\Arrayable|array  $data
      * @param  array  $mergeData
      * @return \Illuminate\Contracts\View\View
      */
@@ -26,7 +26,7 @@ interface Factory
      * Get the evaluated view contents for the given view.
      *
      * @param  string  $view
-     * @param  array  $data
+     * @param  \Illuminate\Contracts\Support\Arrayable|array  $data
      * @param  array  $mergeData
      * @return \Illuminate\Contracts\View\View
      */
diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/composer.json b/vendor/laravel/framework/src/Illuminate/Contracts/composer.json
index c97fc256..62c351eb 100644
--- a/vendor/laravel/framework/src/Illuminate/Contracts/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Contracts/composer.json
@@ -14,9 +14,9 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "psr/container": "~1.0",
-        "psr/simple-cache": "~1.0"
+        "php": "^7.1.3",
+        "psr/container": "^1.0",
+        "psr/simple-cache": "^1.0"
     },
     "autoload": {
         "psr-4": {
@@ -25,7 +25,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "config": {
diff --git a/vendor/laravel/framework/src/Illuminate/Cookie/CookieJar.php b/vendor/laravel/framework/src/Illuminate/Cookie/CookieJar.php
index b4c65df5..abf23fd8 100755
--- a/vendor/laravel/framework/src/Illuminate/Cookie/CookieJar.php
+++ b/vendor/laravel/framework/src/Illuminate/Cookie/CookieJar.php
@@ -54,15 +54,15 @@ class CookieJar implements JarContract
      * @param  int          $minutes
      * @param  string       $path
      * @param  string       $domain
-     * @param  bool         $secure
+     * @param  bool|null    $secure
      * @param  bool         $httpOnly
      * @param  bool         $raw
      * @param  string|null  $sameSite
      * @return \Symfony\Component\HttpFoundation\Cookie
      */
-    public function make($name, $value, $minutes = 0, $path = null, $domain = null, $secure = false, $httpOnly = true, $raw = false, $sameSite = null)
+    public function make($name, $value, $minutes = 0, $path = null, $domain = null, $secure = null, $httpOnly = true, $raw = false, $sameSite = null)
     {
-        list($path, $domain, $secure, $sameSite) = $this->getPathAndDomain($path, $domain, $secure, $sameSite);
+        [$path, $domain, $secure, $sameSite] = $this->getPathAndDomain($path, $domain, $secure, $sameSite);
 
         $time = ($minutes == 0) ? 0 : $this->availableAt($minutes * 60);
 
@@ -76,13 +76,13 @@ class CookieJar implements JarContract
      * @param  string       $value
      * @param  string       $path
      * @param  string       $domain
-     * @param  bool         $secure
+     * @param  bool|null    $secure
      * @param  bool         $httpOnly
      * @param  bool         $raw
      * @param  string|null  $sameSite
      * @return \Symfony\Component\HttpFoundation\Cookie
      */
-    public function forever($name, $value, $path = null, $domain = null, $secure = false, $httpOnly = true, $raw = false, $sameSite = null)
+    public function forever($name, $value, $path = null, $domain = null, $secure = null, $httpOnly = true, $raw = false, $sameSite = null)
     {
         return $this->make($name, $value, 2628000, $path, $domain, $secure, $httpOnly, $raw, $sameSite);
     }
@@ -154,15 +154,15 @@ class CookieJar implements JarContract
     /**
      * Get the path and domain, or the default values.
      *
-     * @param  string  $path
-     * @param  string  $domain
-     * @param  bool    $secure
-     * @param  string  $sameSite
+     * @param  string    $path
+     * @param  string    $domain
+     * @param  bool|null $secure
+     * @param  string    $sameSite
      * @return array
      */
-    protected function getPathAndDomain($path, $domain, $secure = false, $sameSite = null)
+    protected function getPathAndDomain($path, $domain, $secure = null, $sameSite = null)
     {
-        return [$path ?: $this->path, $domain ?: $this->domain, $secure ?: $this->secure, $sameSite ?: $this->sameSite];
+        return [$path ?: $this->path, $domain ?: $this->domain, is_bool($secure) ? $secure : $this->secure, $sameSite ?: $this->sameSite];
     }
 
     /**
@@ -176,7 +176,7 @@ class CookieJar implements JarContract
      */
     public function setDefaultPathAndDomain($path, $domain, $secure = false, $sameSite = null)
     {
-        list($this->path, $this->domain, $this->secure, $this->sameSite) = [$path, $domain, $secure, $sameSite];
+        [$this->path, $this->domain, $this->secure, $this->sameSite] = [$path, $domain, $secure, $sameSite];
 
         return $this;
     }
diff --git a/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/EncryptCookies.php b/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/EncryptCookies.php
index f7dfac67..1036a082 100644
--- a/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/EncryptCookies.php
+++ b/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/EncryptCookies.php
@@ -25,6 +25,13 @@ class EncryptCookies
      */
     protected $except = [];
 
+    /**
+     * Indicates if cookies should be serialized.
+     *
+     * @var bool
+     */
+    protected static $serialize = false;
+
     /**
      * Create a new CookieGuard instance.
      *
@@ -39,12 +46,12 @@ class EncryptCookies
     /**
      * Disable encryption for the given cookie name(s).
      *
-     * @param  string|array  $cookieName
+     * @param  string|array  $name
      * @return void
      */
-    public function disableFor($cookieName)
+    public function disableFor($name)
     {
-        $this->except = array_merge($this->except, (array) $cookieName);
+        $this->except = array_merge($this->except, (array) $name);
     }
 
     /**
@@ -52,7 +59,7 @@ class EncryptCookies
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Closure  $next
-     * @return mixed
+     * @return \Symfony\Component\HttpFoundation\Response
      */
     public function handle($request, Closure $next)
     {
@@ -67,13 +74,13 @@ class EncryptCookies
      */
     protected function decrypt(Request $request)
     {
-        foreach ($request->cookies as $key => $c) {
+        foreach ($request->cookies as $key => $cookie) {
             if ($this->isDisabled($key)) {
                 continue;
             }
 
             try {
-                $request->cookies->set($key, $this->decryptCookie($c));
+                $request->cookies->set($key, $this->decryptCookie($key, $cookie));
             } catch (DecryptException $e) {
                 $request->cookies->set($key, null);
             }
@@ -85,14 +92,15 @@ class EncryptCookies
     /**
      * Decrypt the given cookie and return the value.
      *
+     * @param  string  $name
      * @param  string|array  $cookie
      * @return string|array
      */
-    protected function decryptCookie($cookie)
+    protected function decryptCookie($name, $cookie)
     {
         return is_array($cookie)
                         ? $this->decryptArray($cookie)
-                        : $this->encrypter->decrypt($cookie);
+                        : $this->encrypter->decrypt($cookie, static::serialized($name));
     }
 
     /**
@@ -107,7 +115,7 @@ class EncryptCookies
 
         foreach ($cookie as $key => $value) {
             if (is_string($value)) {
-                $decrypted[$key] = $this->encrypter->decrypt($value);
+                $decrypted[$key] = $this->encrypter->decrypt($value, static::serialized($key));
             }
         }
 
@@ -128,7 +136,7 @@ class EncryptCookies
             }
 
             $response->headers->setCookie($this->duplicate(
-                $cookie, $this->encrypter->encrypt($cookie->getValue())
+                $cookie, $this->encrypter->encrypt($cookie->getValue(), static::serialized($cookie->getName()))
             ));
         }
 
@@ -138,16 +146,16 @@ class EncryptCookies
     /**
      * Duplicate a cookie with a new value.
      *
-     * @param  \Symfony\Component\HttpFoundation\Cookie  $c
+     * @param  \Symfony\Component\HttpFoundation\Cookie  $cookie
      * @param  mixed  $value
      * @return \Symfony\Component\HttpFoundation\Cookie
      */
-    protected function duplicate(Cookie $c, $value)
+    protected function duplicate(Cookie $cookie, $value)
     {
         return new Cookie(
-            $c->getName(), $value, $c->getExpiresTime(), $c->getPath(),
-            $c->getDomain(), $c->isSecure(), $c->isHttpOnly(), $c->isRaw(),
-            $c->getSameSite()
+            $cookie->getName(), $value, $cookie->getExpiresTime(),
+            $cookie->getPath(), $cookie->getDomain(), $cookie->isSecure(),
+            $cookie->isHttpOnly(), $cookie->isRaw(), $cookie->getSameSite()
         );
     }
 
@@ -161,4 +169,15 @@ class EncryptCookies
     {
         return in_array($name, $this->except);
     }
+
+    /**
+     * Determine if the cookie contents should be serialized.
+     *
+     * @param  string  $name
+     * @return bool
+     */
+    public static function serialized($name)
+    {
+        return static::$serialize;
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Cookie/composer.json b/vendor/laravel/framework/src/Illuminate/Cookie/composer.json
index e9a85cd6..014b7d21 100755
--- a/vendor/laravel/framework/src/Illuminate/Cookie/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Cookie/composer.json
@@ -14,11 +14,11 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/support": "5.5.*",
-        "symfony/http-foundation": "~3.3",
-        "symfony/http-kernel": "~3.3"
+        "php": "^7.1.3",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/support": "5.7.*",
+        "symfony/http-foundation": "^4.1",
+        "symfony/http-kernel": "^4.1"
     },
     "autoload": {
         "psr-4": {
@@ -27,7 +27,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "config": {
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Concerns/BuildsQueries.php b/vendor/laravel/framework/src/Illuminate/Database/Concerns/BuildsQueries.php
index 1051f2c9..c712bbef 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Concerns/BuildsQueries.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Concerns/BuildsQueries.php
@@ -83,7 +83,7 @@ trait BuildsQueries
      * @param  mixed  $value
      * @param  callable  $callback
      * @param  callable  $default
-     * @return mixed
+     * @return mixed|$this
      */
     public function when($value, $callback, $default = null)
     {
@@ -113,7 +113,7 @@ trait BuildsQueries
      * @param  mixed  $value
      * @param  callable  $callback
      * @param  callable  $default
-     * @return mixed
+     * @return mixed|$this
      */
     public function unless($value, $callback, $default = null)
     {
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Concerns/ManagesTransactions.php b/vendor/laravel/framework/src/Illuminate/Database/Concerns/ManagesTransactions.php
index ec979f4e..f8a3d661 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Concerns/ManagesTransactions.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Concerns/ManagesTransactions.php
@@ -26,7 +26,7 @@ trait ManagesTransactions
             // catch any exception we can rollback this transaction so that none of this
             // gets actually persisted to a database or stored in a permanent fashion.
             try {
-                return tap($callback($this), function ($result) {
+                return tap($callback($this), function () {
                     $this->commit();
                 });
             }
@@ -85,6 +85,7 @@ trait ManagesTransactions
      * Start a new database transaction.
      *
      * @return void
+     *
      * @throws \Exception
      */
     public function beginTransaction()
@@ -129,7 +130,7 @@ trait ManagesTransactions
     /**
      * Handle an exception from a transaction beginning.
      *
-     * @param  \Exception  $e
+     * @param  \Throwable  $e
      * @return void
      *
      * @throws \Exception
@@ -166,6 +167,8 @@ trait ManagesTransactions
      *
      * @param  int|null  $toLevel
      * @return void
+     *
+     * @throws \Exception
      */
     public function rollBack($toLevel = null)
     {
@@ -183,7 +186,11 @@ trait ManagesTransactions
         // Next, we will actually perform this rollback within this database and fire the
         // rollback event. We will also set the current transaction level to the given
         // level that was passed into this method so it will be right from here out.
-        $this->performRollBack($toLevel);
+        try {
+            $this->performRollBack($toLevel);
+        } catch (Exception $e) {
+            $this->handleRollBackException($e);
+        }
 
         $this->transactions = $toLevel;
 
@@ -207,6 +214,22 @@ trait ManagesTransactions
         }
     }
 
+    /**
+     * Handle an exception from a rollback.
+     *
+     * @param \Exception  $e
+     *
+     * @throws \Exception
+     */
+    protected function handleRollBackException($e)
+    {
+        if ($this->causedByLostConnection($e)) {
+            $this->transactions = 0;
+        }
+
+        throw $e;
+    }
+
     /**
      * Get the number of active transactions.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Connection.php b/vendor/laravel/framework/src/Illuminate/Database/Connection.php
index a55776c6..1f511860 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Connection.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Connection.php
@@ -504,7 +504,7 @@ class Connection implements ConnectionInterface
             }
 
             $this->recordsHaveBeenModified(
-                $change = ($this->getPdo()->exec($query) === false ? false : true)
+                $change = $this->getPdo()->exec($query) !== false
             );
 
             return $change;
@@ -552,7 +552,7 @@ class Connection implements ConnectionInterface
 
         // Now we'll execute this callback and capture the result. Once it has been
         // executed we will restore the value of query logging and give back the
-        // value of hte callback so the original callers can have the results.
+        // value of the callback so the original callers can have the results.
         $result = $callback();
 
         $this->loggingQueries = $loggingQueries;
@@ -705,6 +705,7 @@ class Connection implements ConnectionInterface
      * @param  array  $bindings
      * @param  \Closure  $callback
      * @return mixed
+     *
      * @throws \Exception
      */
     protected function handleQueryException($e, $query, $bindings, Closure $callback)
@@ -929,7 +930,7 @@ class Connection implements ConnectionInterface
             return $this->getPdo();
         }
 
-        if ($this->getConfig('sticky') && $this->recordsModified) {
+        if ($this->recordsModified && $this->getConfig('sticky')) {
             return $this->getPdo();
         }
 
@@ -958,7 +959,7 @@ class Connection implements ConnectionInterface
     /**
      * Set the PDO connection used for reading.
      *
-     * @param  \PDO||\Closure|null  $pdo
+     * @param  \PDO|\Closure|null  $pdo
      * @return $this
      */
     public function setReadPdo($pdo)
@@ -1026,11 +1027,13 @@ class Connection implements ConnectionInterface
      * Set the query grammar used by the connection.
      *
      * @param  \Illuminate\Database\Query\Grammars\Grammar  $grammar
-     * @return void
+     * @return $this
      */
     public function setQueryGrammar(Query\Grammars\Grammar $grammar)
     {
         $this->queryGrammar = $grammar;
+
+        return $this;
     }
 
     /**
@@ -1047,11 +1050,13 @@ class Connection implements ConnectionInterface
      * Set the schema grammar used by the connection.
      *
      * @param  \Illuminate\Database\Schema\Grammars\Grammar  $grammar
-     * @return void
+     * @return $this
      */
     public function setSchemaGrammar(Schema\Grammars\Grammar $grammar)
     {
         $this->schemaGrammar = $grammar;
+
+        return $this;
     }
 
     /**
@@ -1068,11 +1073,13 @@ class Connection implements ConnectionInterface
      * Set the query post processor used by the connection.
      *
      * @param  \Illuminate\Database\Query\Processors\Processor  $processor
-     * @return void
+     * @return $this
      */
     public function setPostProcessor(Processor $processor)
     {
         $this->postProcessor = $processor;
+
+        return $this;
     }
 
     /**
@@ -1089,11 +1096,23 @@ class Connection implements ConnectionInterface
      * Set the event dispatcher instance on the connection.
      *
      * @param  \Illuminate\Contracts\Events\Dispatcher  $events
-     * @return void
+     * @return $this
      */
     public function setEventDispatcher(Dispatcher $events)
     {
         $this->events = $events;
+
+        return $this;
+    }
+
+    /**
+     * Unset the event dispatcher for this connection.
+     *
+     * @return void
+     */
+    public function unsetEventDispatcher()
+    {
+        $this->events = null;
     }
 
     /**
@@ -1170,11 +1189,13 @@ class Connection implements ConnectionInterface
      * Set the name of the connected database.
      *
      * @param  string  $database
-     * @return string
+     * @return $this
      */
     public function setDatabaseName($database)
     {
         $this->database = $database;
+
+        return $this;
     }
 
     /**
@@ -1191,13 +1212,15 @@ class Connection implements ConnectionInterface
      * Set the table prefix in use by the connection.
      *
      * @param  string  $prefix
-     * @return void
+     * @return $this
      */
     public function setTablePrefix($prefix)
     {
         $this->tablePrefix = $prefix;
 
         $this->getQueryGrammar()->setTablePrefix($prefix);
+
+        return $this;
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Database/ConnectionInterface.php b/vendor/laravel/framework/src/Illuminate/Database/ConnectionInterface.php
index 9262d6fd..56127e1c 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/ConnectionInterface.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/ConnectionInterface.php
@@ -27,18 +27,30 @@ interface ConnectionInterface
      *
      * @param  string  $query
      * @param  array   $bindings
+     * @param  bool  $useReadPdo
      * @return mixed
      */
-    public function selectOne($query, $bindings = []);
+    public function selectOne($query, $bindings = [], $useReadPdo = true);
 
     /**
      * Run a select statement against the database.
      *
      * @param  string  $query
      * @param  array   $bindings
+     * @param  bool  $useReadPdo
      * @return array
      */
-    public function select($query, $bindings = []);
+    public function select($query, $bindings = [], $useReadPdo = true);
+
+    /**
+     * Run a select statement against the database and returns a generator.
+     *
+     * @param  string  $query
+     * @param  array  $bindings
+     * @param  bool  $useReadPdo
+     * @return \Generator
+     */
+    public function cursor($query, $bindings = [], $useReadPdo = true);
 
     /**
      * Run an insert statement against the database.
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Connectors/ConnectionFactory.php b/vendor/laravel/framework/src/Illuminate/Database/Connectors/ConnectionFactory.php
index 0462c7b6..d998a418 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Connectors/ConnectionFactory.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Connectors/ConnectionFactory.php
@@ -11,7 +11,6 @@ use Illuminate\Database\SQLiteConnection;
 use Illuminate\Database\PostgresConnection;
 use Illuminate\Database\SqlServerConnection;
 use Illuminate\Contracts\Container\Container;
-use Illuminate\Contracts\Debug\ExceptionHandler;
 
 class ConnectionFactory
 {
@@ -182,9 +181,7 @@ class ConnectionFactory
                 try {
                     return $this->createConnector($config)->connect($config);
                 } catch (PDOException $e) {
-                    if (count($hosts) - 1 === $key && $this->container->bound(ExceptionHandler::class)) {
-                        $this->container->make(ExceptionHandler::class)->report($e);
-                    }
+                    continue;
                 }
             }
 
@@ -283,6 +280,6 @@ class ConnectionFactory
                 return new SqlServerConnection($connection, $database, $prefix, $config);
         }
 
-        throw new InvalidArgumentException("Unsupported driver [$driver]");
+        throw new InvalidArgumentException("Unsupported driver [{$driver}]");
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Connectors/Connector.php b/vendor/laravel/framework/src/Illuminate/Database/Connectors/Connector.php
index b772f521..ab0903d9 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Connectors/Connector.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Connectors/Connector.php
@@ -4,6 +4,7 @@ namespace Illuminate\Database\Connectors;
 
 use PDO;
 use Exception;
+use Throwable;
 use Doctrine\DBAL\Driver\PDOConnection;
 use Illuminate\Database\DetectsLostConnections;
 
@@ -31,10 +32,12 @@ class Connector
      * @param  array   $config
      * @param  array   $options
      * @return \PDO
+     *
+     * @throws \Exception
      */
     public function createConnection($dsn, array $config, array $options)
     {
-        list($username, $password) = [
+        [$username, $password] = [
             $config['username'] ?? null, $config['password'] ?? null,
         ];
 
@@ -82,7 +85,7 @@ class Connector
     /**
      * Handle an exception that occurred during connect execution.
      *
-     * @param  \Exception  $e
+     * @param  \Throwable  $e
      * @param  string  $dsn
      * @param  string  $username
      * @param  string  $password
@@ -91,7 +94,7 @@ class Connector
      *
      * @throws \Exception
      */
-    protected function tryAgainIfCausedByLostConnection(Exception $e, $dsn, $username, $password, $options)
+    protected function tryAgainIfCausedByLostConnection(Throwable $e, $dsn, $username, $password, $options)
     {
         if ($this->causedByLostConnection($e)) {
             return $this->createPdoConnection($dsn, $username, $password, $options);
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Connectors/MySqlConnector.php b/vendor/laravel/framework/src/Illuminate/Database/Connectors/MySqlConnector.php
index 3b12b300..9665172e 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Connectors/MySqlConnector.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Connectors/MySqlConnector.php
@@ -147,7 +147,7 @@ class MySqlConnector extends Connector implements ConnectorInterface
             $this->setCustomModes($connection, $config);
         } elseif (isset($config['strict'])) {
             if ($config['strict']) {
-                $connection->prepare($this->strictMode())->execute();
+                $connection->prepare($this->strictMode($connection))->execute();
             } else {
                 $connection->prepare("set session sql_mode='NO_ENGINE_SUBSTITUTION'")->execute();
             }
@@ -171,10 +171,15 @@ class MySqlConnector extends Connector implements ConnectorInterface
     /**
      * Get the query to enable strict mode.
      *
+     * @param  \PDO  $connection
      * @return string
      */
-    protected function strictMode()
+    protected function strictMode(PDO $connection)
     {
+        if (version_compare($connection->getAttribute(PDO::ATTR_SERVER_VERSION), '8.0.11') >= 0) {
+            return "set session sql_mode='ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION'";
+        }
+
         return "set session sql_mode='ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'";
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Connectors/SQLiteConnector.php b/vendor/laravel/framework/src/Illuminate/Database/Connectors/SQLiteConnector.php
index 28f90915..ae8e4e76 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Connectors/SQLiteConnector.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Connectors/SQLiteConnector.php
@@ -31,7 +31,7 @@ class SQLiteConnector extends Connector implements ConnectorInterface
         // as the developer probably wants to know if the database exists and this
         // SQLite driver will not throw any exception if it does not by default.
         if ($path === false) {
-            throw new InvalidArgumentException("Database (${config['database']}) does not exist.");
+            throw new InvalidArgumentException("Database ({$config['database']}) does not exist.");
         }
 
         return $this->createConnection("sqlite:{$path}", $config, $options);
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Connectors/SqlServerConnector.php b/vendor/laravel/framework/src/Illuminate/Database/Connectors/SqlServerConnector.php
index 87525d12..6cfc33fb 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Connectors/SqlServerConnector.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Connectors/SqlServerConnector.php
@@ -43,13 +43,15 @@ class SqlServerConnector extends Connector implements ConnectorInterface
         // First we will create the basic DSN setup as well as the port if it is in
         // in the configuration options. This will give us the basic DSN we will
         // need to establish the PDO connections and return them back for use.
-        if (in_array('dblib', $this->getAvailableDrivers())) {
-            return $this->getDblibDsn($config);
-        } elseif ($this->prefersOdbc($config)) {
+        if ($this->prefersOdbc($config)) {
             return $this->getOdbcDsn($config);
         }
 
-        return $this->getSqlSrvDsn($config);
+        if (in_array('sqlsrv', $this->getAvailableDrivers())) {
+            return $this->getSqlSrvDsn($config);
+        } else {
+            return $this->getDblibDsn($config);
+        }
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/BaseCommand.php b/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/BaseCommand.php
index 81ca3cc7..6c4f2550 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/BaseCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/BaseCommand.php
@@ -18,15 +18,27 @@ class BaseCommand extends Command
         // migrations may be run for any customized path from within the application.
         if ($this->input->hasOption('path') && $this->option('path')) {
             return collect($this->option('path'))->map(function ($path) {
-                return $this->laravel->basePath().'/'.$path;
+                return ! $this->usingRealPath()
+                                ? $this->laravel->basePath().'/'.$path
+                                : $path;
             })->all();
         }
 
         return array_merge(
-            [$this->getMigrationPath()], $this->migrator->paths()
+            $this->migrator->paths(), [$this->getMigrationPath()]
         );
     }
 
+    /**
+     * Determine if the given path(s) are pre-resolved "real" paths.
+     *
+     * @return bool
+     */
+    protected function usingRealPath()
+    {
+        return $this->input->hasOption('realpath') && $this->option('realpath');
+    }
+
     /**
      * Get the path to the migration directory.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/FreshCommand.php b/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/FreshCommand.php
index a9779a79..83b63068 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/FreshCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/FreshCommand.php
@@ -35,16 +35,24 @@ class FreshCommand extends Command
             return;
         }
 
-        $this->dropAllTables(
-            $database = $this->input->getOption('database')
-        );
+        $database = $this->input->getOption('database');
+
+        if ($this->option('drop-views')) {
+            $this->dropAllViews($database);
+
+            $this->info('Dropped all views successfully.');
+        }
+
+        $this->dropAllTables($database);
 
         $this->info('Dropped all tables successfully.');
 
         $this->call('migrate', [
             '--database' => $database,
             '--path' => $this->input->getOption('path'),
+            '--realpath' => $this->input->getOption('realpath'),
             '--force' => true,
+            '--step' => $this->option('step'),
         ]);
 
         if ($this->needsSeeding()) {
@@ -65,6 +73,19 @@ class FreshCommand extends Command
                     ->dropAllTables();
     }
 
+    /**
+     * Drop all of the database views.
+     *
+     * @param  string  $database
+     * @return void
+     */
+    protected function dropAllViews($database)
+    {
+        $this->laravel['db']->connection($database)
+                    ->getSchemaBuilder()
+                    ->dropAllViews();
+    }
+
     /**
      * Determine if the developer has requested database seeding.
      *
@@ -98,15 +119,21 @@ class FreshCommand extends Command
     protected function getOptions()
     {
         return [
-            ['database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use.'],
+            ['database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use'],
+
+            ['drop-views', null, InputOption::VALUE_NONE, 'Drop all tables and views'],
+
+            ['force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production'],
+
+            ['path', null, InputOption::VALUE_OPTIONAL, 'The path to the migrations files to be executed'],
 
-            ['force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production.'],
+            ['realpath', null, InputOption::VALUE_NONE, 'Indicate any provided migration file paths are pre-resolved absolute paths'],
 
-            ['path', null, InputOption::VALUE_OPTIONAL, 'The path of migrations files to be executed.'],
+            ['seed', null, InputOption::VALUE_NONE, 'Indicates if the seed task should be re-run'],
 
-            ['seed', null, InputOption::VALUE_NONE, 'Indicates if the seed task should be re-run.'],
+            ['seeder', null, InputOption::VALUE_OPTIONAL, 'The class name of the root seeder'],
 
-            ['seeder', null, InputOption::VALUE_OPTIONAL, 'The class name of the root seeder.'],
+            ['step', null, InputOption::VALUE_NONE, 'Force the migrations to be run so they can be rolled back individually'],
         ];
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/InstallCommand.php b/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/InstallCommand.php
index d9200240..354d7a1c 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/InstallCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/InstallCommand.php
@@ -64,7 +64,7 @@ class InstallCommand extends Command
     protected function getOptions()
     {
         return [
-            ['database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use.'],
+            ['database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use'],
         ];
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/MigrateCommand.php b/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/MigrateCommand.php
index 12fe90af..79d48146 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/MigrateCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/MigrateCommand.php
@@ -14,12 +14,13 @@ class MigrateCommand extends BaseCommand
      *
      * @var string
      */
-    protected $signature = 'migrate {--database= : The database connection to use.}
-                {--force : Force the operation to run when in production.}
-                {--path= : The path of migrations files to be executed.}
-                {--pretend : Dump the SQL queries that would be run.}
-                {--seed : Indicates if the seed task should be re-run.}
-                {--step : Force the migrations to be run so they can be rolled back individually.}';
+    protected $signature = 'migrate {--database= : The database connection to use}
+                {--force : Force the operation to run when in production}
+                {--path= : The path to the migrations files to be executed}
+                {--realpath : Indicate any provided migration file paths are pre-resolved absolute paths}
+                {--pretend : Dump the SQL queries that would be run}
+                {--seed : Indicates if the seed task should be re-run}
+                {--step : Force the migrations to be run so they can be rolled back individually}';
 
     /**
      * The console command description.
@@ -64,17 +65,11 @@ class MigrateCommand extends BaseCommand
         // Next, we will check to see if a path option has been defined. If it has
         // we will use the path relative to the root of this installation folder
         // so that migrations may be run for any path within the applications.
-        $this->migrator->run($this->getMigrationPaths(), [
-            'pretend' => $this->option('pretend'),
-            'step' => $this->option('step'),
-        ]);
-
-        // Once the migrator has run we will grab the note output and send it out to
-        // the console screen, since the migrator itself functions without having
-        // any instances of the OutputInterface contract passed into the class.
-        foreach ($this->migrator->getNotes() as $note) {
-            $this->output->writeln($note);
-        }
+        $this->migrator->setOutput($this->output)
+                ->run($this->getMigrationPaths(), [
+                    'pretend' => $this->option('pretend'),
+                    'step' => $this->option('step'),
+                ]);
 
         // Finally, if the "seed" option has been given, we will re-run the database
         // seed task to re-populate the database, which is convenient when adding
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/MigrateMakeCommand.php b/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/MigrateMakeCommand.php
index 03995de9..1cce57b2 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/MigrateMakeCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/MigrateMakeCommand.php
@@ -13,10 +13,11 @@ class MigrateMakeCommand extends BaseCommand
      *
      * @var string
      */
-    protected $signature = 'make:migration {name : The name of the migration.}
-        {--create= : The table to be created.}
-        {--table= : The table to migrate.}
-        {--path= : The location where the migration file should be created.}';
+    protected $signature = 'make:migration {name : The name of the migration}
+        {--create= : The table to be created}
+        {--table= : The table to migrate}
+        {--path= : The location where the migration file should be created}
+        {--realpath : Indicate any provided migration file paths are pre-resolved absolute paths}';
 
     /**
      * The console command description.
@@ -83,11 +84,7 @@ class MigrateMakeCommand extends BaseCommand
         // "create" in the name. This will allow us to provide a convenient way
         // of creating migrations that create new tables for the application.
         if (! $table) {
-            if (preg_match('/^create_(\w+)_table$/', $name, $matches)) {
-                $table = $matches[1];
-
-                $create = true;
-            }
+            [$table, $create] = TableGuesser::guess($name);
         }
 
         // Now we are ready to write the migration out to disk. Once we've written
@@ -123,9 +120,21 @@ class MigrateMakeCommand extends BaseCommand
     protected function getMigrationPath()
     {
         if (! is_null($targetPath = $this->input->getOption('path'))) {
-            return $this->laravel->basePath().'/'.$targetPath;
+            return ! $this->usingRealPath()
+                            ? $this->laravel->basePath().'/'.$targetPath
+                            : $targetPath;
         }
 
         return parent::getMigrationPath();
     }
+
+    /**
+     * Determine if the given path(s) are pre-resolved "real" paths.
+     *
+     * @return bool
+     */
+    protected function usingRealPath()
+    {
+        return $this->input->hasOption('realpath') && $this->option('realpath');
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/RefreshCommand.php b/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/RefreshCommand.php
index dc89091c..0a03e5b2 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/RefreshCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/RefreshCommand.php
@@ -61,6 +61,7 @@ class RefreshCommand extends Command
         $this->call('migrate', [
             '--database' => $database,
             '--path' => $path,
+            '--realpath' => $this->input->getOption('realpath'),
             '--force' => $force,
         ]);
 
@@ -83,6 +84,7 @@ class RefreshCommand extends Command
         $this->call('migrate:rollback', [
             '--database' => $database,
             '--path' => $path,
+            '--realpath' => $this->input->getOption('realpath'),
             '--step' => $step,
             '--force' => $force,
         ]);
@@ -101,6 +103,7 @@ class RefreshCommand extends Command
         $this->call('migrate:reset', [
             '--database' => $database,
             '--path' => $path,
+            '--realpath' => $this->input->getOption('realpath'),
             '--force' => $force,
         ]);
     }
@@ -138,17 +141,19 @@ class RefreshCommand extends Command
     protected function getOptions()
     {
         return [
-            ['database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use.'],
+            ['database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use'],
 
-            ['force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production.'],
+            ['force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production'],
 
-            ['path', null, InputOption::VALUE_OPTIONAL, 'The path of migrations files to be executed.'],
+            ['path', null, InputOption::VALUE_OPTIONAL, 'The path to the migrations files to be executed'],
 
-            ['seed', null, InputOption::VALUE_NONE, 'Indicates if the seed task should be re-run.'],
+            ['realpath', null, InputOption::VALUE_NONE, 'Indicate any provided migration file paths are pre-resolved absolute paths'],
 
-            ['seeder', null, InputOption::VALUE_OPTIONAL, 'The class name of the root seeder.'],
+            ['seed', null, InputOption::VALUE_NONE, 'Indicates if the seed task should be re-run'],
 
-            ['step', null, InputOption::VALUE_OPTIONAL, 'The number of migrations to be reverted & re-run.'],
+            ['seeder', null, InputOption::VALUE_OPTIONAL, 'The class name of the root seeder'],
+
+            ['step', null, InputOption::VALUE_OPTIONAL, 'The number of migrations to be reverted & re-run'],
         ];
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/ResetCommand.php b/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/ResetCommand.php
index c2efdfa6..28803806 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/ResetCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/ResetCommand.php
@@ -64,16 +64,9 @@ class ResetCommand extends BaseCommand
             return $this->comment('Migration table not found.');
         }
 
-        $this->migrator->reset(
+        $this->migrator->setOutput($this->output)->reset(
             $this->getMigrationPaths(), $this->option('pretend')
         );
-
-        // Once the migrator has run we will grab the note output and send it out to
-        // the console screen, since the migrator itself functions without having
-        // any instances of the OutputInterface contract passed into the class.
-        foreach ($this->migrator->getNotes() as $note) {
-            $this->output->writeln($note);
-        }
     }
 
     /**
@@ -84,13 +77,15 @@ class ResetCommand extends BaseCommand
     protected function getOptions()
     {
         return [
-            ['database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use.'],
+            ['database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use'],
+
+            ['force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production'],
 
-            ['force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production.'],
+            ['path', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY, 'The path(s) to the migrations files to be executed'],
 
-            ['path', null, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY, 'The path(s) of migrations files to be executed.'],
+            ['realpath', null, InputOption::VALUE_NONE, 'Indicate any provided migration file paths are pre-resolved absolute paths'],
 
-            ['pretend', null, InputOption::VALUE_NONE, 'Dump the SQL queries that would be run.'],
+            ['pretend', null, InputOption::VALUE_NONE, 'Dump the SQL queries that would be run'],
         ];
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/RollbackCommand.php b/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/RollbackCommand.php
index 3315d643..457bcb1d 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/RollbackCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/RollbackCommand.php
@@ -57,19 +57,12 @@ class RollbackCommand extends BaseCommand
 
         $this->migrator->setConnection($this->option('database'));
 
-        $this->migrator->rollback(
+        $this->migrator->setOutput($this->output)->rollback(
             $this->getMigrationPaths(), [
                 'pretend' => $this->option('pretend'),
                 'step' => (int) $this->option('step'),
             ]
         );
-
-        // Once the migrator has run we will grab the note output and send it out to
-        // the console screen, since the migrator itself functions without having
-        // any instances of the OutputInterface contract passed into the class.
-        foreach ($this->migrator->getNotes() as $note) {
-            $this->output->writeln($note);
-        }
     }
 
     /**
@@ -80,15 +73,17 @@ class RollbackCommand extends BaseCommand
     protected function getOptions()
     {
         return [
-            ['database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use.'],
+            ['database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use'],
+
+            ['force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production'],
 
-            ['force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production.'],
+            ['path', null, InputOption::VALUE_OPTIONAL, 'The path to the migrations files to be executed'],
 
-            ['path', null, InputOption::VALUE_OPTIONAL, 'The path of migrations files to be executed.'],
+            ['realpath', null, InputOption::VALUE_NONE, 'Indicate any provided migration file paths are pre-resolved absolute paths'],
 
-            ['pretend', null, InputOption::VALUE_NONE, 'Dump the SQL queries that would be run.'],
+            ['pretend', null, InputOption::VALUE_NONE, 'Dump the SQL queries that would be run'],
 
-            ['step', null, InputOption::VALUE_OPTIONAL, 'The number of migrations to be reverted.'],
+            ['step', null, InputOption::VALUE_OPTIONAL, 'The number of migrations to be reverted'],
         ];
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/StatusCommand.php b/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/StatusCommand.php
index df065423..520f6c7f 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/StatusCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/StatusCommand.php
@@ -57,8 +57,10 @@ class StatusCommand extends BaseCommand
 
         $ran = $this->migrator->getRepository()->getRan();
 
-        if (count($migrations = $this->getStatusFor($ran)) > 0) {
-            $this->table(['Ran?', 'Migration'], $migrations);
+        $batches = $this->migrator->getRepository()->getMigrationBatches();
+
+        if (count($migrations = $this->getStatusFor($ran, $batches)) > 0) {
+            $this->table(['Ran?', 'Migration', 'Batch'], $migrations);
         } else {
             $this->error('No migrations found');
         }
@@ -68,17 +70,18 @@ class StatusCommand extends BaseCommand
      * Get the status for the given ran migrations.
      *
      * @param  array  $ran
+     * @param  array  $batches
      * @return \Illuminate\Support\Collection
      */
-    protected function getStatusFor(array $ran)
+    protected function getStatusFor(array $ran, array $batches)
     {
         return Collection::make($this->getAllMigrationFiles())
-                    ->map(function ($migration) use ($ran) {
+                    ->map(function ($migration) use ($ran, $batches) {
                         $migrationName = $this->migrator->getMigrationName($migration);
 
                         return in_array($migrationName, $ran)
-                                ? ['<info>Y</info>', $migrationName]
-                                : ['<fg=red>N</fg=red>', $migrationName];
+                                ? ['<info>Yes</info>', $migrationName, $batches[$migrationName]]
+                                : ['<fg=red>No</fg=red>', $migrationName];
                     });
     }
 
@@ -100,9 +103,11 @@ class StatusCommand extends BaseCommand
     protected function getOptions()
     {
         return [
-            ['database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use.'],
+            ['database', null, InputOption::VALUE_OPTIONAL, 'The database connection to use'],
+
+            ['path', null, InputOption::VALUE_OPTIONAL, 'The path to the migrations files to use'],
 
-            ['path', null, InputOption::VALUE_OPTIONAL, 'The path of migrations files to use.'],
+            ['realpath', null, InputOption::VALUE_NONE, 'Indicate any provided migration file paths are pre-resolved absolute paths'],
         ];
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/TableGuesser.php b/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/TableGuesser.php
new file mode 100644
index 00000000..edcd706f
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/TableGuesser.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Illuminate\Database\Console\Migrations;
+
+class TableGuesser
+{
+    /**
+     * Attempt to guess the table name and "creation" status of the given migration.
+     *
+     * @param  string  $migration
+     * @return array
+     */
+    public static function guess($migration)
+    {
+        if (preg_match('/^create_(\w+)_table$/', $migration, $matches)) {
+            return [$matches[1], $create = true];
+        }
+
+        if (preg_match('/_(to|from|in)_(\w+)_table$/', $migration, $matches)) {
+            return [$matches[2], $create = false];
+        }
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Console/Seeds/SeedCommand.php b/vendor/laravel/framework/src/Illuminate/Database/Console/Seeds/SeedCommand.php
index 24898732..06a13e0c 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Console/Seeds/SeedCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Console/Seeds/SeedCommand.php
@@ -62,6 +62,8 @@ class SeedCommand extends Command
         Model::unguarded(function () {
             $this->getSeeder()->__invoke();
         });
+
+        $this->info('Database seeding completed successfully.');
     }
 
     /**
@@ -100,7 +102,7 @@ class SeedCommand extends Command
 
             ['database', null, InputOption::VALUE_OPTIONAL, 'The database connection to seed'],
 
-            ['force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production.'],
+            ['force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production'],
         ];
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Database/DatabaseManager.php b/vendor/laravel/framework/src/Illuminate/Database/DatabaseManager.php
index 11af5a53..9f775e6d 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/DatabaseManager.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/DatabaseManager.php
@@ -62,7 +62,7 @@ class DatabaseManager implements ConnectionResolverInterface
      */
     public function connection($name = null)
     {
-        list($database, $type) = $this->parseConnectionName($name);
+        [$database, $type] = $this->parseConnectionName($name);
 
         $name = $name ?: $database;
 
@@ -137,7 +137,7 @@ class DatabaseManager implements ConnectionResolverInterface
         $connections = $this->app['config']['database.connections'];
 
         if (is_null($config = Arr::get($connections, $name))) {
-            throw new InvalidArgumentException("Database [$name] not configured.");
+            throw new InvalidArgumentException("Database [{$name}] not configured.");
         }
 
         return $config;
diff --git a/vendor/laravel/framework/src/Illuminate/Database/DetectsLostConnections.php b/vendor/laravel/framework/src/Illuminate/Database/DetectsLostConnections.php
index d2e1878f..f929dc63 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/DetectsLostConnections.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/DetectsLostConnections.php
@@ -2,7 +2,7 @@
 
 namespace Illuminate\Database;
 
-use Exception;
+use Throwable;
 use Illuminate\Support\Str;
 
 trait DetectsLostConnections
@@ -10,10 +10,10 @@ trait DetectsLostConnections
     /**
      * Determine if the given exception was caused by a lost connection.
      *
-     * @param  \Exception  $e
+     * @param  \Throwable  $e
      * @return bool
      */
-    protected function causedByLostConnection(Exception $e)
+    protected function causedByLostConnection(Throwable $e)
     {
         $message = $e->getMessage();
 
@@ -32,6 +32,9 @@ trait DetectsLostConnections
             'child connection forced to terminate due to client_idle_limit',
             'query_wait_timeout',
             'reset by peer',
+            'Physical connection is not usable',
+            'TCP Provider: Error code 0x68',
+            'Name or service not known',
         ]);
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php
index 60e21e14..271e62cc 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php
@@ -8,6 +8,7 @@ use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Traits\ForwardsCalls;
 use Illuminate\Database\Concerns\BuildsQueries;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Database\Query\Builder as QueryBuilder;
@@ -17,7 +18,7 @@ use Illuminate\Database\Query\Builder as QueryBuilder;
  */
 class Builder
 {
-    use BuildsQueries, Concerns\QueriesRelationships;
+    use BuildsQueries, Concerns\QueriesRelationships, ForwardsCalls;
 
     /**
      * The base query builder instance.
@@ -68,7 +69,7 @@ class Builder
      */
     protected $passthru = [
         'insert', 'insertGetId', 'getBindings', 'toSql',
-        'exists', 'doesntExist', 'count', 'min', 'max', 'avg', 'sum', 'getConnection',
+        'exists', 'doesntExist', 'count', 'min', 'max', 'avg', 'average', 'sum', 'getConnection',
     ];
 
     /**
@@ -152,12 +153,12 @@ class Builder
      */
     public function withoutGlobalScopes(array $scopes = null)
     {
-        if (is_array($scopes)) {
-            foreach ($scopes as $scope) {
-                $this->withoutGlobalScope($scope);
-            }
-        } else {
-            $this->scopes = [];
+        if (! is_array($scopes)) {
+            $scopes = array_keys($this->scopes);
+        }
+
+        foreach ($scopes as $scope) {
+            $this->withoutGlobalScope($scope);
         }
 
         return $this;
@@ -211,17 +212,15 @@ class Builder
      * Add a basic where clause to the query.
      *
      * @param  string|array|\Closure  $column
-     * @param  string  $operator
-     * @param  mixed  $value
+     * @param  mixed   $operator
+     * @param  mixed   $value
      * @param  string  $boolean
      * @return $this
      */
     public function where($column, $operator = null, $value = null, $boolean = 'and')
     {
         if ($column instanceof Closure) {
-            $query = $this->model->newQueryWithoutScopes();
-
-            $column($query);
+            $column($query = $this->model->newModelQuery());
 
             $this->query->addNestedWhereQuery($query->getQuery(), $boolean);
         } else {
@@ -235,19 +234,53 @@ class Builder
      * Add an "or where" clause to the query.
      *
      * @param  \Closure|array|string  $column
-     * @param  string  $operator
+     * @param  mixed  $operator
      * @param  mixed  $value
      * @return \Illuminate\Database\Eloquent\Builder|static
      */
     public function orWhere($column, $operator = null, $value = null)
     {
-        list($value, $operator) = $this->query->prepareValueAndOperator(
-            $value, $operator, func_num_args() == 2
+        [$value, $operator] = $this->query->prepareValueAndOperator(
+            $value, $operator, func_num_args() === 2
         );
 
         return $this->where($column, $operator, $value, 'or');
     }
 
+    /**
+     * Add an "order by" clause for a timestamp to the query.
+     *
+     * @param  string  $column
+     * @return $this
+     */
+    public function latest($column = null)
+    {
+        if (is_null($column)) {
+            $column = $this->model->getCreatedAtColumn() ?? 'created_at';
+        }
+
+        $this->query->latest($column);
+
+        return $this;
+    }
+
+    /**
+     * Add an "order by" clause for a timestamp to the query.
+     *
+     * @param  string  $column
+     * @return $this
+     */
+    public function oldest($column = null)
+    {
+        if (is_null($column)) {
+            $column = $this->model->getCreatedAtColumn() ?? 'created_at';
+        }
+
+        $this->query->oldest($column);
+
+        return $this;
+    }
+
     /**
      * Create a collection of models from plain arrays.
      *
@@ -314,7 +347,7 @@ class Builder
      *
      * @param  mixed  $id
      * @param  array  $columns
-     * @return \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Collection
+     * @return \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Collection|static|static[]
      *
      * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
      */
@@ -323,7 +356,7 @@ class Builder
         $result = $this->find($id, $columns);
 
         if (is_array($id)) {
-            if (count($result) == count(array_unique($id))) {
+            if (count($result) === count(array_unique($id))) {
                 return $result;
             }
         } elseif (! is_null($result)) {
@@ -340,7 +373,7 @@ class Builder
      *
      * @param  mixed  $id
      * @param  array  $columns
-     * @return \Illuminate\Database\Eloquent\Model
+     * @return \Illuminate\Database\Eloquent\Model|static
      */
     public function findOrNew($id, $columns = ['*'])
     {
@@ -356,7 +389,7 @@ class Builder
      *
      * @param  array  $attributes
      * @param  array  $values
-     * @return \Illuminate\Database\Eloquent\Model
+     * @return \Illuminate\Database\Eloquent\Model|static
      */
     public function firstOrNew(array $attributes, array $values = [])
     {
@@ -372,7 +405,7 @@ class Builder
      *
      * @param  array  $attributes
      * @param  array  $values
-     * @return \Illuminate\Database\Eloquent\Model
+     * @return \Illuminate\Database\Eloquent\Model|static
      */
     public function firstOrCreate(array $attributes, array $values = [])
     {
@@ -390,7 +423,7 @@ class Builder
      *
      * @param  array  $attributes
      * @param  array  $values
-     * @return \Illuminate\Database\Eloquent\Model
+     * @return \Illuminate\Database\Eloquent\Model|static
      */
     public function updateOrCreate(array $attributes, array $values = [])
     {
@@ -475,7 +508,7 @@ class Builder
      * Get the hydrated models without eager loading.
      *
      * @param  array  $columns
-     * @return \Illuminate\Database\Eloquent\Model[]
+     * @return \Illuminate\Database\Eloquent\Model[]|static[]
      */
     public function getModels($columns = ['*'])
     {
@@ -545,7 +578,7 @@ class Builder
         // and error prone. We don't want constraints because we add eager ones.
         $relation = Relation::noConstraints(function () use ($name) {
             try {
-                return $this->getModel()->{$name}();
+                return $this->getModel()->newInstance()->$name();
             } catch (BadMethodCallException $e) {
                 throw RelationNotFoundException::make($this->getModel(), $name);
             }
@@ -614,7 +647,7 @@ class Builder
      *
      * @param  int  $count
      * @param  callable  $callback
-     * @param  string  $column
+     * @param  string|null  $column
      * @param  string|null  $alias
      * @return bool
      */
@@ -624,7 +657,7 @@ class Builder
 
         $alias = is_null($alias) ? $column : $alias;
 
-        $lastId = 0;
+        $lastId = null;
 
         do {
             $clone = clone $this;
@@ -786,7 +819,7 @@ class Builder
      * Increment a column's value by a given amount.
      *
      * @param  string  $column
-     * @param  int  $amount
+     * @param  float|int  $amount
      * @param  array  $extra
      * @return int
      */
@@ -801,7 +834,7 @@ class Builder
      * Decrement a column's value by a given amount.
      *
      * @param  string  $column
-     * @param  int  $amount
+     * @param  float|int  $amount
      * @param  array  $extra
      * @return int
      */
@@ -882,7 +915,7 @@ class Builder
             // the parameter list is empty, so we will format the scope name and these
             // parameters here. Then, we'll be ready to call the scope on the model.
             if (is_int($scope)) {
-                list($scope, $parameters) = [$parameters, []];
+                [$scope, $parameters] = [$parameters, []];
             }
 
             // Next we'll pass the scope callback to the callScope method which will take
@@ -1061,7 +1094,7 @@ class Builder
      * Create a new instance of the model being queried.
      *
      * @param  array  $attributes
-     * @return \Illuminate\Database\Eloquent\Model
+     * @return \Illuminate\Database\Eloquent\Model|static
      */
     public function newModelInstance($attributes = [])
     {
@@ -1087,7 +1120,7 @@ class Builder
             if (is_numeric($name)) {
                 $name = $constraints;
 
-                list($name, $constraints) = Str::contains($name, ':')
+                [$name, $constraints] = Str::contains($name, ':')
                             ? $this->createSelectWithConstraint($name)
                             : [$name, function () {
                                 //
@@ -1204,7 +1237,7 @@ class Builder
     /**
      * Get the model instance being queried.
      *
-     * @return \Illuminate\Database\Eloquent\Model
+     * @return \Illuminate\Database\Eloquent\Model|static
      */
     public function getModel()
     {
@@ -1285,7 +1318,7 @@ class Builder
             return $this->toBase()->{$method}(...$parameters);
         }
 
-        $this->query->{$method}(...$parameters);
+        $this->forwardCallTo($this->query, $method, $parameters);
 
         return $this;
     }
@@ -1308,7 +1341,7 @@ class Builder
         }
 
         if (! isset(static::$macros[$method])) {
-            throw new BadMethodCallException("Method {$method} does not exist.");
+            static::throwBadMethodCallException($method);
         }
 
         if (static::$macros[$method] instanceof Closure) {
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Collection.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Collection.php
index bb2789a4..79fe4a5b 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Collection.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Collection.php
@@ -4,7 +4,9 @@ namespace Illuminate\Database\Eloquent;
 
 use LogicException;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Database\Eloquent\Relations\Pivot;
 use Illuminate\Contracts\Queue\QueueableCollection;
 use Illuminate\Support\Collection as BaseCollection;
 
@@ -43,7 +45,7 @@ class Collection extends BaseCollection implements QueueableCollection
     /**
      * Load a set of relationships onto the collection.
      *
-     * @param  mixed  $relations
+     * @param  array|string  $relations
      * @return $this
      */
     public function load($relations)
@@ -61,6 +63,100 @@ class Collection extends BaseCollection implements QueueableCollection
         return $this;
     }
 
+    /**
+     * Load a set of relationships onto the collection if they are not already eager loaded.
+     *
+     * @param  array|string  $relations
+     * @return $this
+     */
+    public function loadMissing($relations)
+    {
+        if (is_string($relations)) {
+            $relations = func_get_args();
+        }
+
+        foreach ($relations as $key => $value) {
+            if (is_numeric($key)) {
+                $key = $value;
+            }
+
+            $segments = explode('.', explode(':', $key)[0]);
+
+            if (Str::contains($key, ':')) {
+                $segments[count($segments) - 1] .= ':'.explode(':', $key)[1];
+            }
+
+            $path = array_combine($segments, $segments);
+
+            if (is_callable($value)) {
+                $path[end($segments)] = $value;
+            }
+
+            $this->loadMissingRelation($this, $path);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Load a relationship path if it is not already eager loaded.
+     *
+     * @param  \Illuminate\Database\Eloquent\Collection  $models
+     * @param  array  $path
+     * @return void
+     */
+    protected function loadMissingRelation(Collection $models, array $path)
+    {
+        $relation = array_splice($path, 0, 1);
+
+        $name = explode(':', key($relation))[0];
+
+        if (is_string(reset($relation))) {
+            $relation = reset($relation);
+        }
+
+        $models->filter(function ($model) use ($name) {
+            return ! is_null($model) && ! $model->relationLoaded($name);
+        })->load($relation);
+
+        if (empty($path)) {
+            return;
+        }
+
+        $models = $models->pluck($name);
+
+        if ($models->first() instanceof BaseCollection) {
+            $models = $models->collapse();
+        }
+
+        $this->loadMissingRelation(new static($models), $path);
+    }
+
+    /**
+     * Load a set of relationships onto the mixed relationship collection.
+     *
+     * @param  string  $relation
+     * @param  array  $relations
+     * @return $this
+     */
+    public function loadMorph($relation, $relations)
+    {
+        $this->pluck($relation)
+            ->filter()
+            ->groupBy(function ($model) {
+                return get_class($model);
+            })
+            ->filter(function ($models, $className) use ($relations) {
+                return Arr::has($relations, $className);
+            })
+            ->each(function ($models, $className) use ($relations) {
+                $className::with($relations[$className])
+                    ->eagerLoadRelations($models->all());
+            });
+
+        return $this;
+    }
+
     /**
      * Add an item to the collection.
      *
@@ -265,9 +361,7 @@ class Collection extends BaseCollection implements QueueableCollection
      */
     public function makeHidden($attributes)
     {
-        return $this->each(function ($model) use ($attributes) {
-            $model->addHidden($attributes);
-        });
+        return $this->each->addHidden($attributes);
     }
 
     /**
@@ -278,9 +372,7 @@ class Collection extends BaseCollection implements QueueableCollection
      */
     public function makeVisible($attributes)
     {
-        return $this->each(function ($model) use ($attributes) {
-            $model->makeVisible($attributes);
-        });
+        return $this->each->makeVisible($attributes);
     }
 
     /**
@@ -386,6 +478,7 @@ class Collection extends BaseCollection implements QueueableCollection
      * Get the type of the entities being queued.
      *
      * @return string|null
+     *
      * @throws \LogicException
      */
     public function getQueueableClass()
@@ -412,13 +505,30 @@ class Collection extends BaseCollection implements QueueableCollection
      */
     public function getQueueableIds()
     {
-        return $this->modelKeys();
+        if ($this->isEmpty()) {
+            return [];
+        }
+
+        return $this->first() instanceof Pivot
+                    ? $this->map->getQueueableId()->all()
+                    : $this->modelKeys();
+    }
+
+    /**
+     * Get the relationships of the entities being queued.
+     *
+     * @return array
+     */
+    public function getQueueableRelations()
+    {
+        return $this->isNotEmpty() ? $this->first()->getQueueableRelations() : [];
     }
 
     /**
      * Get the connection of the entities being queued.
      *
      * @return string|null
+     *
      * @throws \LogicException
      */
     public function getQueueableConnection()
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php
index 2893495c..c446957c 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php
@@ -189,6 +189,10 @@ trait HasAttributes
                 ($value === 'date' || $value === 'datetime')) {
                 $attributes[$key] = $this->serializeDate($attributes[$key]);
             }
+
+            if ($attributes[$key] && $this->isCustomDateTimeCast($value)) {
+                $attributes[$key] = $attributes[$key]->format(explode(':', $value, 2)[1]);
+            }
         }
 
         return $attributes;
@@ -407,7 +411,9 @@ trait HasAttributes
         $relation = $this->$method();
 
         if (! $relation instanceof Relation) {
-            throw new LogicException(get_class($this).'::'.$method.' must return a relationship instance.');
+            throw new LogicException(sprintf(
+                '%s::%s must return a relationship instance.', static::class, $method
+            ));
         }
 
         return tap($relation->getResults(), function ($results) use ($method) {
@@ -472,7 +478,7 @@ trait HasAttributes
             case 'real':
             case 'float':
             case 'double':
-                return (float) $value;
+                return $this->fromFloat($value);
             case 'string':
                 return (string) $value;
             case 'bool':
@@ -488,6 +494,7 @@ trait HasAttributes
             case 'date':
                 return $this->asDate($value);
             case 'datetime':
+            case 'custom_datetime':
                 return $this->asDateTime($value);
             case 'timestamp':
                 return $this->asTimestamp($value);
@@ -504,15 +511,31 @@ trait HasAttributes
      */
     protected function getCastType($key)
     {
+        if ($this->isCustomDateTimeCast($this->getCasts()[$key])) {
+            return 'custom_datetime';
+        }
+
         return trim(strtolower($this->getCasts()[$key]));
     }
 
+    /**
+     * Determine if the cast type is a custom date time cast.
+     *
+     * @param  string  $cast
+     * @return bool
+     */
+    protected function isCustomDateTimeCast($cast)
+    {
+        return strncmp($cast, 'date:', 5) === 0 ||
+               strncmp($cast, 'datetime:', 9) === 0;
+    }
+
     /**
      * Set a given attribute on the model.
      *
      * @param  string  $key
      * @param  mixed  $value
-     * @return $this
+     * @return mixed
      */
     public function setAttribute($key, $value)
     {
@@ -520,9 +543,7 @@ trait HasAttributes
         // which simply lets the developers tweak the attribute as it is set on
         // the model, such as "json_encoding" an listing of data for storage.
         if ($this->hasSetMutator($key)) {
-            $method = 'set'.Str::studly($key).'Attribute';
-
-            return $this->{$method}($value);
+            return $this->setMutatedAttributeValue($key, $value);
         }
 
         // If an attribute is listed as a "date", we'll convert it from a DateTime
@@ -559,6 +580,18 @@ trait HasAttributes
         return method_exists($this, 'set'.Str::studly($key).'Attribute');
     }
 
+    /**
+     * Set the value of an attribute using its mutator.
+     *
+     * @param  string  $key
+     * @param  mixed  $value
+     * @return mixed
+     */
+    protected function setMutatedAttributeValue($key, $value)
+    {
+        return $this->{'set'.Str::studly($key).'Attribute'}($value);
+    }
+
     /**
      * Determine if the given attribute is a date or date castable.
      *
@@ -580,7 +613,7 @@ trait HasAttributes
      */
     public function fillJsonAttribute($key, $value)
     {
-        list($key, $path) = explode('->', $key, 2);
+        [$key, $path] = explode('->', $key, 2);
 
         $this->attributes[$key] = $this->asJson($this->getArrayAttributeWithValue(
             $path, $key, $value
@@ -647,6 +680,26 @@ trait HasAttributes
         return json_encode($value);
     }
 
+    /**
+     * Decode the given float.
+     *
+     * @param  mixed  $value
+     * @return mixed
+     */
+    public function fromFloat($value)
+    {
+        switch ((string) $value) {
+            case 'Infinity':
+                return INF;
+            case '-Infinity':
+                return -INF;
+            case 'NaN':
+                return NAN;
+            default:
+                return (float) $value;
+        }
+    }
+
     /**
      * Decode the given JSON back into an array or object.
      *
@@ -781,7 +834,7 @@ trait HasAttributes
      *
      * @return string
      */
-    protected function getDateFormat()
+    public function getDateFormat()
     {
         return $this->dateFormat ?: $this->getConnection()->getQueryGrammar()->getDateFormat();
     }
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/HasEvents.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/HasEvents.php
index 0972bd6f..720266d0 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/HasEvents.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/HasEvents.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Database\Eloquent\Concerns;
 
+use Illuminate\Support\Arr;
 use Illuminate\Contracts\Events\Dispatcher;
 
 trait HasEvents
@@ -25,21 +26,34 @@ trait HasEvents
     protected $observables = [];
 
     /**
-     * Register an observer with the Model.
+     * Register observers with the model.
      *
-     * @param  object|string  $class
+     * @param  object|array|string  $classes
      * @return void
      */
-    public static function observe($class)
+    public static function observe($classes)
     {
         $instance = new static;
 
+        foreach (Arr::wrap($classes) as $class) {
+            $instance->registerObserver($class);
+        }
+    }
+
+    /**
+     * Register a single observer with the model.
+     *
+     * @param  object|string $class
+     * @return void
+     */
+    protected function registerObserver($class)
+    {
         $className = is_string($class) ? $class : get_class($class);
 
         // When registering a model observer, we will spin through the possible events
         // and determine if this observer has that method. If it does, we will hook
         // it into the model's event system, making it convenient to watch these.
-        foreach ($instance->getObservableEvents() as $event) {
+        foreach ($this->getObservableEvents() as $event) {
             if (method_exists($class, $event)) {
                 static::registerModelEvent($event, $className.'@'.$event);
             }
@@ -55,9 +69,9 @@ trait HasEvents
     {
         return array_merge(
             [
-                'retrieved', 'creating', 'created', 'updating',
-                'updated', 'deleting', 'deleted', 'saving',
-                'saved', 'restoring', 'restored',
+                'retrieved', 'creating', 'created', 'updating', 'updated',
+                'saving', 'saved', 'restoring', 'restored',
+                'deleting', 'deleted', 'forceDeleted',
             ],
             $this->observables
         );
@@ -134,7 +148,7 @@ trait HasEvents
         // First, we will get the proper method to call on the event dispatcher, and then we
         // will attempt to fire a custom, object based event for the given event. If that
         // returns a result we can return that result, or we'll call the string events.
-        $method = $halt ? 'until' : 'fire';
+        $method = $halt ? 'until' : 'dispatch';
 
         $result = $this->filterModelEventResults(
             $this->fireCustomModelEvent($event, $method)
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php
index c6affcd3..019fc19c 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php
@@ -91,7 +91,7 @@ trait HasRelationships
     {
         $instance = $this->newRelatedInstance($related);
 
-        list($type, $id) = $this->getMorphs($name, $type, $id);
+        [$type, $id] = $this->getMorphs($name, $type, $id);
 
         $table = $instance->getTable();
 
@@ -173,16 +173,17 @@ trait HasRelationships
      * @param  string  $name
      * @param  string  $type
      * @param  string  $id
+     * @param  string  $ownerKey
      * @return \Illuminate\Database\Eloquent\Relations\MorphTo
      */
-    public function morphTo($name = null, $type = null, $id = null)
+    public function morphTo($name = null, $type = null, $id = null, $ownerKey = null)
     {
         // If no name is provided, we will use the backtrace to get the function name
         // since that is most likely the name of the polymorphic interface. We can
         // use that to get both the class and foreign key that will be utilized.
         $name = $name ?: $this->guessBelongsToRelation();
 
-        list($type, $id) = $this->getMorphs(
+        [$type, $id] = $this->getMorphs(
             Str::snake($name), $type, $id
         );
 
@@ -190,8 +191,8 @@ trait HasRelationships
         // the relationship. In this case we'll just pass in a dummy query where we
         // need to remove any eager loads that may already be defined on a model.
         return empty($class = $this->{$type})
-                    ? $this->morphEagerTo($name, $type, $id)
-                    : $this->morphInstanceTo($class, $name, $type, $id);
+                    ? $this->morphEagerTo($name, $type, $id, $ownerKey)
+                    : $this->morphInstanceTo($class, $name, $type, $id, $ownerKey);
     }
 
     /**
@@ -200,12 +201,13 @@ trait HasRelationships
      * @param  string  $name
      * @param  string  $type
      * @param  string  $id
+     * @param  string  $ownerKey
      * @return \Illuminate\Database\Eloquent\Relations\MorphTo
      */
-    protected function morphEagerTo($name, $type, $id)
+    protected function morphEagerTo($name, $type, $id, $ownerKey)
     {
         return $this->newMorphTo(
-            $this->newQuery()->setEagerLoads([]), $this, $id, null, $type, $name
+            $this->newQuery()->setEagerLoads([]), $this, $id, $ownerKey, $type, $name
         );
     }
 
@@ -216,16 +218,17 @@ trait HasRelationships
      * @param  string  $name
      * @param  string  $type
      * @param  string  $id
+     * @param  string  $ownerKey
      * @return \Illuminate\Database\Eloquent\Relations\MorphTo
      */
-    protected function morphInstanceTo($target, $name, $type, $id)
+    protected function morphInstanceTo($target, $name, $type, $id, $ownerKey)
     {
         $instance = $this->newRelatedInstance(
             static::getActualClassNameForMorph($target)
         );
 
         return $this->newMorphTo(
-            $instance->newQuery(), $this, $id, $instance->getKeyName(), $type, $name
+            $instance->newQuery(), $this, $id, $ownerKey ?? $instance->getKeyName(), $type, $name
         );
     }
 
@@ -263,7 +266,7 @@ trait HasRelationships
      */
     protected function guessBelongsToRelation()
     {
-        list($one, $two, $caller) = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3);
+        [$one, $two, $caller] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3);
 
         return $caller['function'];
     }
@@ -363,7 +366,7 @@ trait HasRelationships
         // Here we will gather up the morph type and ID for the relationship so that we
         // can properly query the intermediate table of a relation. Finally, we will
         // get the table and create the relationship instances for the developers.
-        list($type, $id) = $this->getMorphs($name, $type, $id);
+        [$type, $id] = $this->getMorphs($name, $type, $id);
 
         $table = $instance->getTable();
 
@@ -422,7 +425,7 @@ trait HasRelationships
         // models using underscores in alphabetical order. The two model names
         // are transformed to snake case from their default CamelCase also.
         if (is_null($table)) {
-            $table = $this->joiningTable($related);
+            $table = $this->joiningTable($related, $instance);
         }
 
         return $this->newBelongsToMany(
@@ -492,7 +495,7 @@ trait HasRelationships
     }
 
     /**
-     * Instantiate a new HasManyThrough relationship.
+     * Instantiate a new MorphToMany relationship.
      *
      * @param  \Illuminate\Database\Eloquent\Builder  $query
      * @param  \Illuminate\Database\Eloquent\Model  $parent
@@ -560,24 +563,36 @@ trait HasRelationships
      * Get the joining table name for a many-to-many relation.
      *
      * @param  string  $related
+     * @param  \Illuminate\Database\Eloquent\Model|null  $instance
      * @return string
      */
-    public function joiningTable($related)
+    public function joiningTable($related, $instance = null)
     {
         // The joining table name, by convention, is simply the snake cased models
         // sorted alphabetically and concatenated with an underscore, so we can
         // just sort the models and join them together to get the table name.
-        $models = [
-            Str::snake(class_basename($related)),
-            Str::snake(class_basename($this)),
+        $segments = [
+            $instance ? $instance->joiningTableSegment()
+                      : Str::snake(class_basename($related)),
+            $this->joiningTableSegment(),
         ];
 
         // Now that we have the model names in an array we can just sort them and
         // use the implode function to join them together with an underscores,
         // which is typically used by convention within the database system.
-        sort($models);
+        sort($segments);
+
+        return strtolower(implode('_', $segments));
+    }
 
-        return strtolower(implode('_', $models));
+    /**
+     * Get this model's half of the intermediate table name for belongsToMany relationships.
+     *
+     * @return string
+     */
+    public function joiningTableSegment()
+    {
+        return Str::snake(class_basename($this));
     }
 
     /**
@@ -690,7 +705,7 @@ trait HasRelationships
     }
 
     /**
-     * Set the specific relationship in the model.
+     * Set the given relationship on the model.
      *
      * @param  string  $relation
      * @param  mixed  $value
@@ -703,6 +718,19 @@ trait HasRelationships
         return $this;
     }
 
+    /**
+     * Unset a loaded relationship.
+     *
+     * @param  string  $relation
+     * @return $this
+     */
+    public function unsetRelation($relation)
+    {
+        unset($this->relations[$relation]);
+
+        return $this;
+    }
+
     /**
      * Set the entire relations array on the model.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/HasTimestamps.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/HasTimestamps.php
index ce3e0801..8e3d488e 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/HasTimestamps.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/HasTimestamps.php
@@ -42,7 +42,8 @@ trait HasTimestamps
             $this->setUpdatedAt($time);
         }
 
-        if (! $this->exists && ! $this->isDirty(static::CREATED_AT)) {
+        if (! $this->exists && ! is_null(static::CREATED_AT) &&
+            ! $this->isDirty(static::CREATED_AT)) {
             $this->setCreatedAt($time);
         }
     }
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php
index 28977037..57fdad8d 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php
@@ -3,9 +3,11 @@
 namespace Illuminate\Database\Eloquent\Concerns;
 
 use Closure;
+use RuntimeException;
 use Illuminate\Support\Str;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\Expression;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Database\Query\Builder as QueryBuilder;
 
@@ -29,6 +31,10 @@ trait QueriesRelationships
 
         $relation = $this->getRelationWithoutConstraints($relation);
 
+        if ($relation instanceof MorphTo) {
+            throw new RuntimeException('has() and whereHas() do not support MorphTo relationships.');
+        }
+
         // If we only need to check for the existence of the relation, then we can optimize
         // the subquery to only run a "where exists" clause instead of this full "count"
         // clause. This will make these queries run much faster compared with a count.
@@ -196,7 +202,7 @@ trait QueriesRelationships
             unset($alias);
 
             if (count($segments) == 3 && Str::lower($segments[1]) == 'as') {
-                list($name, $alias) = [$segments[0], $segments[2]];
+                [$name, $alias] = [$segments[0], $segments[2]];
             }
 
             $relation = $this->getRelationWithoutConstraints($name);
@@ -210,14 +216,18 @@ trait QueriesRelationships
 
             $query->callScope($constraints);
 
-            $query->mergeConstraintsFrom($relation->getQuery());
+            $query = $query->mergeConstraintsFrom($relation->getQuery())->toBase();
+
+            if (count($query->columns) > 1) {
+                $query->columns = [$query->columns[0]];
+            }
 
             // Finally we will add the proper result column alias to the query and run the subselect
             // statement against the query builder. Then we will return the builder instance back
             // to the developer for further constraint chaining that needs to take place on it.
             $column = $alias ?? Str::snake($name.'_count');
 
-            $this->selectSub($query->toBase(), $column);
+            $this->selectSub($query, $column);
         }
 
         return $this;
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Factory.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Factory.php
index 8b6104c3..82917ae3 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Factory.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Factory.php
@@ -22,6 +22,20 @@ class Factory implements ArrayAccess
      */
     protected $states = [];
 
+    /**
+     * The registered after making callbacks.
+     *
+     * @var array
+     */
+    protected $afterMaking = [];
+
+    /**
+     * The registered after creating callbacks.
+     *
+     * @var array
+     */
+    protected $afterCreating = [];
+
     /**
      * The Faker instance for the builder.
      *
@@ -97,6 +111,62 @@ class Factory implements ArrayAccess
         return $this;
     }
 
+    /**
+     * Define a callback to run after making a model.
+     *
+     * @param  string  $class
+     * @param  callable  $callback
+     * @param  string  $name
+     * @return $this
+     */
+    public function afterMaking($class, callable $callback, $name = 'default')
+    {
+        $this->afterMaking[$class][$name][] = $callback;
+
+        return $this;
+    }
+
+    /**
+     * Define a callback to run after making a model with given state.
+     *
+     * @param  string  $class
+     * @param  string  $state
+     * @param  callable  $callback
+     * @return $this
+     */
+    public function afterMakingState($class, $state, callable $callback)
+    {
+        return $this->afterMaking($class, $callback, $state);
+    }
+
+    /**
+     * Define a callback to run after creating a model.
+     *
+     * @param  string  $class
+     * @param  callable  $callback
+     * @param  string $name
+     * @return $this
+     */
+    public function afterCreating($class, callable $callback, $name = 'default')
+    {
+        $this->afterCreating[$class][$name][] = $callback;
+
+        return $this;
+    }
+
+    /**
+     * Define a callback to run after creating a model with given state.
+     *
+     * @param  string  $class
+     * @param  string  $state
+     * @param  callable  $callback
+     * @return $this
+     */
+    public function afterCreatingState($class, $state, callable $callback)
+    {
+        return $this->afterCreating($class, $callback, $state);
+    }
+
     /**
      * Create an instance of the given model and persist it to the database.
      *
@@ -184,7 +254,10 @@ class Factory implements ArrayAccess
      */
     public function of($class, $name = 'default')
     {
-        return new FactoryBuilder($class, $name, $this->definitions, $this->states, $this->faker);
+        return new FactoryBuilder(
+            $class, $name, $this->definitions, $this->states,
+            $this->afterMaking, $this->afterCreating, $this->faker
+        );
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/FactoryBuilder.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/FactoryBuilder.php
index 7a3b0230..150f2ef3 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/FactoryBuilder.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/FactoryBuilder.php
@@ -45,6 +45,20 @@ class FactoryBuilder
      */
     protected $states;
 
+    /**
+     * The model after making callbacks.
+     *
+     * @var array
+     */
+    protected $afterMaking = [];
+
+    /**
+     * The model after creating callbacks.
+     *
+     * @var array
+     */
+    protected $afterCreating = [];
+
     /**
      * The states to apply.
      *
@@ -73,16 +87,21 @@ class FactoryBuilder
      * @param  string  $name
      * @param  array  $definitions
      * @param  array  $states
+     * @param  array  $afterMaking
+     * @param  array  $afterCreating
      * @param  \Faker\Generator  $faker
      * @return void
      */
-    public function __construct($class, $name, array $definitions, array $states, Faker $faker)
+    public function __construct($class, $name, array $definitions, array $states,
+                                array $afterMaking, array $afterCreating, Faker $faker)
     {
         $this->name = $name;
         $this->class = $class;
         $this->faker = $faker;
         $this->states = $states;
         $this->definitions = $definitions;
+        $this->afterMaking = $afterMaking;
+        $this->afterCreating = $afterCreating;
     }
 
     /**
@@ -98,6 +117,17 @@ class FactoryBuilder
         return $this;
     }
 
+    /**
+     * Set the state to be applied to the model.
+     *
+     * @param  string  $state
+     * @return $this
+     */
+    public function state($state)
+    {
+        return $this->states([$state]);
+    }
+
     /**
      * Set the states to be applied to the model.
      *
@@ -149,8 +179,12 @@ class FactoryBuilder
 
         if ($results instanceof Model) {
             $this->store(collect([$results]));
+
+            $this->callAfterCreating(collect([$results]));
         } else {
             $this->store($results);
+
+            $this->callAfterCreating($results);
         }
 
         return $results;
@@ -182,16 +216,22 @@ class FactoryBuilder
     public function make(array $attributes = [])
     {
         if ($this->amount === null) {
-            return $this->makeInstance($attributes);
+            return tap($this->makeInstance($attributes), function ($instance) {
+                $this->callAfterMaking(collect([$instance]));
+            });
         }
 
         if ($this->amount < 1) {
             return (new $this->class)->newCollection();
         }
 
-        return (new $this->class)->newCollection(array_map(function () use ($attributes) {
+        $instances = (new $this->class)->newCollection(array_map(function () use ($attributes) {
             return $this->makeInstance($attributes);
         }, range(1, $this->amount)));
+
+        $this->callAfterMaking($instances);
+
+        return $instances;
     }
 
     /**
@@ -220,9 +260,15 @@ class FactoryBuilder
      *
      * @param  array  $attributes
      * @return mixed
+     *
+     * @throws \InvalidArgumentException
      */
     protected function getRawAttributes(array $attributes = [])
     {
+        if (! isset($this->definitions[$this->class][$this->name])) {
+            throw new InvalidArgumentException("Unable to locate factory with name [{$this->name}] [{$this->class}].");
+        }
+
         $definition = call_user_func(
             $this->definitions[$this->class][$this->name],
             $this->faker, $attributes
@@ -238,16 +284,10 @@ class FactoryBuilder
      *
      * @param  array  $attributes
      * @return \Illuminate\Database\Eloquent\Model
-     *
-     * @throws \InvalidArgumentException
      */
     protected function makeInstance(array $attributes = [])
     {
         return Model::unguarded(function () use ($attributes) {
-            if (! isset($this->definitions[$this->class][$this->name])) {
-                throw new InvalidArgumentException("Unable to locate factory with name [{$this->name}] [{$this->class}].");
-            }
-
             $instance = new $this->class(
                 $this->getRawAttributes($attributes)
             );
@@ -271,6 +311,10 @@ class FactoryBuilder
     {
         foreach ($this->activeStates as $state) {
             if (! isset($this->states[$this->class][$state])) {
+                if ($this->stateHasAfterCallback($state)) {
+                    continue;
+                }
+
                 throw new InvalidArgumentException("Unable to locate [{$state}] state for [{$this->class}].");
             }
 
@@ -313,7 +357,7 @@ class FactoryBuilder
     protected function expandAttributes(array $attributes)
     {
         foreach ($attributes as &$attribute) {
-            if (is_callable($attribute) && ! is_string($attribute)) {
+            if (is_callable($attribute) && ! is_string($attribute) && ! is_array($attribute)) {
                 $attribute = $attribute($attributes);
             }
 
@@ -328,4 +372,75 @@ class FactoryBuilder
 
         return $attributes;
     }
+
+    /**
+     * Run after making callbacks on a collection of models.
+     *
+     * @param  \Illuminate\Support\Collection  $models
+     * @return void
+     */
+    public function callAfterMaking($models)
+    {
+        $this->callAfter($this->afterMaking, $models);
+    }
+
+    /**
+     * Run after creating callbacks on a collection of models.
+     *
+     * @param  \Illuminate\Support\Collection  $models
+     * @return void
+     */
+    public function callAfterCreating($models)
+    {
+        $this->callAfter($this->afterCreating, $models);
+    }
+
+    /**
+     * Call after callbacks for each model and state.
+     *
+     * @param  array  $afterCallbacks
+     * @param  \Illuminate\Support\Collection  $models
+     * @return void
+     */
+    protected function callAfter(array $afterCallbacks, $models)
+    {
+        $states = array_merge([$this->name], $this->activeStates);
+
+        $models->each(function ($model) use ($states, $afterCallbacks) {
+            foreach ($states as $state) {
+                $this->callAfterCallbacks($afterCallbacks, $model, $state);
+            }
+        });
+    }
+
+    /**
+     * Call after callbacks for each model and state.
+     *
+     * @param  array  $afterCallbacks
+     * @param  \Illuminate\Database\Eloquent\Model  $model
+     * @param  string  $state
+     * @return void
+     */
+    protected function callAfterCallbacks(array $afterCallbacks, $model, $state)
+    {
+        if (! isset($afterCallbacks[$this->class][$state])) {
+            return;
+        }
+
+        foreach ($afterCallbacks[$this->class][$state] as $callback) {
+            $callback($model, $this->faker);
+        }
+    }
+
+    /**
+     * Determine if the given state has an "after" callback.
+     *
+     * @param  string  $state
+     * @return bool
+     */
+    protected function stateHasAfterCallback($state)
+    {
+        return isset($this->afterMaking[$this->class][$state]) ||
+               isset($this->afterCreating[$this->class][$state]);
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Model.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Model.php
index cbb3ee64..a6016542 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Model.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Model.php
@@ -9,9 +9,12 @@ use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Contracts\Support\Jsonable;
 use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Traits\ForwardsCalls;
 use Illuminate\Contracts\Routing\UrlRoutable;
 use Illuminate\Contracts\Queue\QueueableEntity;
 use Illuminate\Database\Eloquent\Relations\Pivot;
+use Illuminate\Contracts\Queue\QueueableCollection;
+use Illuminate\Support\Collection as BaseCollection;
 use Illuminate\Database\Query\Builder as QueryBuilder;
 use Illuminate\Database\ConnectionResolverInterface as Resolver;
 
@@ -23,7 +26,8 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
         Concerns\HasRelationships,
         Concerns\HasTimestamps,
         Concerns\HidesAttributes,
-        Concerns\GuardsAttributes;
+        Concerns\GuardsAttributes,
+        ForwardsCalls;
 
     /**
      * The connection name for the model.
@@ -116,6 +120,13 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
      */
     protected static $booted = [];
 
+    /**
+     * The array of trait initializers that will be called on each new instance.
+     *
+     * @var array
+     */
+    protected static $traitInitializers = [];
+
     /**
      * The array of global scopes on the model.
      *
@@ -123,6 +134,13 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
      */
     protected static $globalScopes = [];
 
+    /**
+     * The list of models classes that should not be affected with touch.
+     *
+     * @var array
+     */
+    protected static $ignoreOnTouch = [];
+
     /**
      * The name of the "created at" column.
      *
@@ -147,6 +165,8 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
     {
         $this->bootIfNotBooted();
 
+        $this->initializeTraits();
+
         $this->syncOriginal();
 
         $this->fill($attributes);
@@ -189,13 +209,41 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
     {
         $class = static::class;
 
+        $booted = [];
+
+        static::$traitInitializers[$class] = [];
+
         foreach (class_uses_recursive($class) as $trait) {
-            if (method_exists($class, $method = 'boot'.class_basename($trait))) {
+            $method = 'boot'.class_basename($trait);
+
+            if (method_exists($class, $method) && ! in_array($method, $booted)) {
                 forward_static_call([$class, $method]);
+
+                $booted[] = $method;
+            }
+
+            if (method_exists($class, $method = 'initialize'.class_basename($trait))) {
+                static::$traitInitializers[$class][] = $method;
+
+                static::$traitInitializers[$class] = array_unique(
+                    static::$traitInitializers[$class]
+                );
             }
         }
     }
 
+    /**
+     * Initialize any initializable traits on the model.
+     *
+     * @return void
+     */
+    protected function initializeTraits()
+    {
+        foreach (static::$traitInitializers[static::class] as $method) {
+            $this->{$method}();
+        }
+    }
+
     /**
      * Clear the list of booted models so they will be re-booted.
      *
@@ -208,6 +256,54 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
         static::$globalScopes = [];
     }
 
+    /**
+     * Disables relationship model touching for the current class during given callback scope.
+     *
+     * @param  callable  $callback
+     * @return void
+     */
+    public static function withoutTouching(callable $callback)
+    {
+        static::withoutTouchingOn([static::class], $callback);
+    }
+
+    /**
+     * Disables relationship model touching for the given model classes during given callback scope.
+     *
+     * @param  array  $models
+     * @param  callable  $callback
+     * @return void
+     */
+    public static function withoutTouchingOn(array $models, callable $callback)
+    {
+        static::$ignoreOnTouch = array_values(array_merge(static::$ignoreOnTouch, $models));
+
+        try {
+            call_user_func($callback);
+        } finally {
+            static::$ignoreOnTouch = array_values(array_diff(static::$ignoreOnTouch, $models));
+        }
+    }
+
+    /**
+     * Determine if the given model is ignoring touches.
+     *
+     * @param  string|null  $class
+     * @return bool
+     */
+    public static function isIgnoringTouch($class = null)
+    {
+        $class = $class ?: static::class;
+
+        foreach (static::$ignoreOnTouch as $ignoredClass) {
+            if ($class === $ignoredClass || is_subclass_of($class, $ignoredClass)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Fill the model with an array of attributes.
      *
@@ -229,7 +325,10 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
             if ($this->isFillable($key)) {
                 $this->setAttribute($key, $value);
             } elseif ($totallyGuarded) {
-                throw new MassAssignmentException($key);
+                throw new MassAssignmentException(sprintf(
+                    'Add [%s] to fillable property to allow mass assignment on [%s].',
+                    $key, get_class($this)
+                ));
             }
         }
 
@@ -401,16 +500,16 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
     {
         $relations = is_string($relations) ? func_get_args() : $relations;
 
-        return $this->load(array_filter($relations, function ($relation) {
-            return ! $this->relationLoaded($relation);
-        }));
+        $this->newCollection([$this])->loadMissing($relations);
+
+        return $this;
     }
 
     /**
      * Increment a column's value by a given amount.
      *
      * @param  string  $column
-     * @param  int  $amount
+     * @param  float|int  $amount
      * @param  array  $extra
      * @return int
      */
@@ -423,7 +522,7 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
      * Decrement a column's value by a given amount.
      *
      * @param  string  $column
-     * @param  int  $amount
+     * @param  float|int  $amount
      * @param  array  $extra
      * @return int
      */
@@ -436,7 +535,7 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
      * Run the increment or decrement method on the model.
      *
      * @param  string  $column
-     * @param  int  $amount
+     * @param  float|int  $amount
      * @param  array  $extra
      * @param  string  $method
      * @return int
@@ -460,7 +559,7 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
      * Increment the underlying attribute value and sync with original.
      *
      * @param  string  $column
-     * @param  int  $amount
+     * @param  float|int  $amount
      * @param  array  $extra
      * @param  string  $method
      * @return void
@@ -526,7 +625,7 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
      */
     public function save(array $options = [])
     {
-        $query = $this->newQueryWithoutScopes();
+        $query = $this->newModelQuery();
 
         // If the "saving" event returns false we'll bail out of the save and return
         // false, indicating that the save failed. This provides a chance for any
@@ -627,9 +726,9 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
         if (count($dirty) > 0) {
             $this->setKeysForSaveQuery($query)->update($dirty);
 
-            $this->fireModelEvent('updated', false);
-
             $this->syncChanges();
+
+            $this->fireModelEvent('updated', false);
         }
 
         return true;
@@ -681,7 +780,7 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
         // If the model has an incrementing key, we can use the "insertGetId" method on
         // the query builder, which will give us back the final inserted ID for this
         // table from the database. Not all tables have to be incrementing though.
-        $attributes = $this->attributes;
+        $attributes = $this->getAttributes();
 
         if ($this->getIncrementing()) {
             $this->insertAndSetId($query, $attributes);
@@ -727,7 +826,7 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
     /**
      * Destroy the models for the given IDs.
      *
-     * @param  array|int  $ids
+     * @param  \Illuminate\Support\Collection|array|int  $ids
      * @return int
      */
     public static function destroy($ids)
@@ -737,6 +836,10 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
         // type value or get this total count of records deleted for logging, etc.
         $count = 0;
 
+        if ($ids instanceof BaseCollection) {
+            $ids = $ids->all();
+        }
+
         $ids = is_array($ids) ? $ids : func_get_args();
 
         // We will actually pull the models from the database table and call delete on
@@ -811,7 +914,7 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
      */
     protected function performDeleteOnModel()
     {
-        $this->setKeysForSaveQuery($this->newQueryWithoutScopes())->delete();
+        $this->setKeysForSaveQuery($this->newModelQuery())->delete();
 
         $this->exists = false;
     }
@@ -836,6 +939,18 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
         return $this->registerGlobalScopes($this->newQueryWithoutScopes());
     }
 
+    /**
+     * Get a new query builder that doesn't have any global scopes or eager loading.
+     *
+     * @return \Illuminate\Database\Eloquent\Builder|static
+     */
+    public function newModelQuery()
+    {
+        return $this->newEloquentBuilder(
+            $this->newBaseQueryBuilder()
+        )->setModel($this);
+    }
+
     /**
      * Get a new query builder with no relationships loaded.
      *
@@ -870,12 +985,7 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
      */
     public function newQueryWithoutScopes()
     {
-        $builder = $this->newEloquentBuilder($this->newBaseQueryBuilder());
-
-        // Once we have the query builders, we will set the model instances so the
-        // builder can easily access any information it may need from the model
-        // while it is constructing and executing various queries against it.
-        return $builder->setModel($this)
+        return $this->newModelQuery()
                     ->with($this->with)
                     ->withCount($this->withCount);
     }
@@ -888,9 +998,7 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
      */
     public function newQueryWithoutScope($scope)
     {
-        $builder = $this->newQuery();
-
-        return $builder->withoutGlobalScope($scope);
+        return $this->newQuery()->withoutGlobalScope($scope);
     }
 
     /**
@@ -901,11 +1009,9 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
      */
     public function newQueryForRestoration($ids)
     {
-        if (is_array($ids)) {
-            return $this->newQueryWithoutScopes()->whereIn($this->getQualifiedKeyName(), $ids);
-        }
-
-        return $this->newQueryWithoutScopes()->whereKey($ids);
+        return is_array($ids)
+                ? $this->newQueryWithoutScopes()->whereIn($this->getQualifiedKeyName(), $ids)
+                : $this->newQueryWithoutScopes()->whereKey($ids);
     }
 
     /**
@@ -1034,6 +1140,8 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
 
         $this->load(collect($this->relations)->except('pivot')->keys()->toArray());
 
+        $this->syncOriginal();
+
         return $this;
     }
 
@@ -1041,7 +1149,7 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
      * Clone the model into a new, non-existing instance.
      *
      * @param  array|null  $except
-     * @return \Illuminate\Database\Eloquent\Model
+     * @return static
      */
     public function replicate(array $except = null)
     {
@@ -1290,6 +1398,36 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
         return $this->getKey();
     }
 
+    /**
+     * Get the queueable relationships for the entity.
+     *
+     * @return array
+     */
+    public function getQueueableRelations()
+    {
+        $relations = [];
+
+        foreach ($this->getRelations() as $key => $relation) {
+            if (method_exists($this, $key)) {
+                $relations[] = $key;
+            }
+
+            if ($relation instanceof QueueableCollection) {
+                foreach ($relation->getQueueableRelations() as $collectionValue) {
+                    $relations[] = $key.'.'.$collectionValue;
+                }
+            }
+
+            if ($relation instanceof QueueableEntity) {
+                foreach ($relation->getQueueableRelations() as $entityKey => $entityValue) {
+                    $relations[] = $key.'.'.$entityValue;
+                }
+            }
+        }
+
+        return array_unique($relations);
+    }
+
     /**
      * Get the queueable connection for the entity.
      *
@@ -1338,7 +1476,7 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
      */
     public function getForeignKey()
     {
-        return Str::snake(class_basename($this)).'_'.$this->primaryKey;
+        return Str::snake(class_basename($this)).'_'.$this->getKeyName();
     }
 
     /**
@@ -1467,7 +1605,7 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
             return $this->$method(...$parameters);
         }
 
-        return $this->newQuery()->$method(...$parameters);
+        return $this->forwardCallTo($this->newQuery(), $method, $parameters);
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php
index 7ba395bb..3259bdcd 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php
@@ -274,7 +274,7 @@ class BelongsTo extends Relation
         $query->getModel()->setTable($hash);
 
         return $query->whereColumn(
-            $hash.'.'.$query->getModel()->getKeyName(), '=', $this->getQualifiedForeignKey()
+            $hash.'.'.$this->ownerKey, '=', $this->getQualifiedForeignKey()
         );
     }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
index dd2863d2..955e008e 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
@@ -3,6 +3,7 @@
 namespace Illuminate\Database\Eloquent\Relations;
 
 use Illuminate\Support\Str;
+use InvalidArgumentException;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
@@ -75,6 +76,13 @@ class BelongsToMany extends Relation
      */
     protected $pivotWhereIns = [];
 
+    /**
+     * The default values for the pivot columns.
+     *
+     * @var array
+     */
+    protected $pivotValues = [];
+
     /**
      * Indicates if timestamps are available on the pivot table.
      *
@@ -266,11 +274,21 @@ class BelongsToMany extends Relation
         return $dictionary;
     }
 
+    /**
+     * Get the class being used for pivot models.
+     *
+     * @return string
+     */
+    public function getPivotClass()
+    {
+        return $this->using ?? Pivot::class;
+    }
+
     /**
      * Specify the custom pivot model to use for the relationship.
      *
      * @param  string  $class
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return $this
      */
     public function using($class)
     {
@@ -283,7 +301,7 @@ class BelongsToMany extends Relation
      * Specify the custom pivot accessor to use for the relationship.
      *
      * @param  string  $accessor
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return $this
      */
     public function as($accessor)
     {
@@ -299,7 +317,7 @@ class BelongsToMany extends Relation
      * @param  string  $operator
      * @param  mixed   $value
      * @param  string  $boolean
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return $this
      */
     public function wherePivot($column, $operator = null, $value = null, $boolean = 'and')
     {
@@ -315,7 +333,7 @@ class BelongsToMany extends Relation
      * @param  mixed   $values
      * @param  string  $boolean
      * @param  bool    $not
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return $this
      */
     public function wherePivotIn($column, $values, $boolean = 'and', $not = false)
     {
@@ -330,19 +348,47 @@ class BelongsToMany extends Relation
      * @param  string  $column
      * @param  string  $operator
      * @param  mixed   $value
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return $this
      */
     public function orWherePivot($column, $operator = null, $value = null)
     {
         return $this->wherePivot($column, $operator, $value, 'or');
     }
 
+    /**
+     * Set a where clause for a pivot table column.
+     *
+     * In addition, new pivot records will receive this value.
+     *
+     * @param  string  $column
+     * @param  mixed  $value
+     * @return $this
+     */
+    public function withPivotValue($column, $value = null)
+    {
+        if (is_array($column)) {
+            foreach ($column as $name => $value) {
+                $this->withPivotValue($name, $value);
+            }
+
+            return $this;
+        }
+
+        if (is_null($value)) {
+            throw new InvalidArgumentException('The provided value may not be null.');
+        }
+
+        $this->pivotValues[] = compact('column', 'value');
+
+        return $this->wherePivot($column, '=', $value);
+    }
+
     /**
      * Set an "or where in" clause for a pivot table column.
      *
      * @param  string  $column
      * @param  mixed   $values
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return $this
      */
     public function orWherePivotIn($column, $values)
     {
@@ -461,7 +507,7 @@ class BelongsToMany extends Relation
         $result = $this->find($id, $columns);
 
         if (is_array($id)) {
-            if (count($result) == count(array_unique($id))) {
+            if (count($result) === count(array_unique($id))) {
                 return $result;
             }
         } elseif (! is_null($result)) {
@@ -522,10 +568,10 @@ class BelongsToMany extends Relation
         // First we'll add the proper select columns onto the query so it is run with
         // the proper columns. Then, we will get the results and hydrate out pivot
         // models with the result of those columns as a separate model relation.
-        $columns = $this->query->getQuery()->columns ? [] : $columns;
-
         $builder = $this->query->applyScopes();
 
+        $columns = $builder->getQuery()->columns ? [] : $columns;
+
         $models = $builder->addSelect(
             $this->shouldSelect($columns)
         )->getModels();
@@ -546,7 +592,7 @@ class BelongsToMany extends Relation
      * Get the select columns for the relation query.
      *
      * @param  array  $columns
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return array
      */
     protected function shouldSelect(array $columns = ['*'])
     {
@@ -627,6 +673,24 @@ class BelongsToMany extends Relation
         });
     }
 
+    /**
+     * Execute a callback over each item while chunking.
+     *
+     * @param  callable  $callback
+     * @param  int  $count
+     * @return bool
+     */
+    public function each(callable $callback, $count = 1000)
+    {
+        return $this->chunk($count, function ($results) use ($callback) {
+            foreach ($results as $key => $value) {
+                if ($callback($value, $key) === false) {
+                    return false;
+                }
+            }
+        });
+    }
+
     /**
      * Hydrate the pivot table relationship on the models.
      *
@@ -750,7 +814,7 @@ class BelongsToMany extends Relation
     {
         $model->save(['touch' => false]);
 
-        $this->attach($model->getKey(), $pivotAttributes, $touch);
+        $this->attach($model, $pivotAttributes, $touch);
 
         return $model;
     }
@@ -790,7 +854,7 @@ class BelongsToMany extends Relation
         // accomplish this which will insert the record and any more attributes.
         $instance->save(['touch' => false]);
 
-        $this->attach($instance->getKey(), $joining, $touch);
+        $this->attach($instance, $joining, $touch);
 
         return $instance;
     }
@@ -880,7 +944,7 @@ class BelongsToMany extends Relation
      *
      * @param  mixed  $createdAt
      * @param  mixed  $updatedAt
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return $this
      */
     public function withTimestamps($createdAt = null, $updatedAt = null)
     {
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Concerns/AsPivot.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Concerns/AsPivot.php
new file mode 100644
index 00000000..a41baaf0
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Concerns/AsPivot.php
@@ -0,0 +1,295 @@
+<?php
+
+namespace Illuminate\Database\Eloquent\Relations\Concerns;
+
+use Illuminate\Support\Str;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Builder;
+
+trait AsPivot
+{
+    /**
+     * The parent model of the relationship.
+     *
+     * @var \Illuminate\Database\Eloquent\Model
+     */
+    public $pivotParent;
+
+    /**
+     * The name of the foreign key column.
+     *
+     * @var string
+     */
+    protected $foreignKey;
+
+    /**
+     * The name of the "other key" column.
+     *
+     * @var string
+     */
+    protected $relatedKey;
+
+    /**
+     * Create a new pivot model instance.
+     *
+     * @param  \Illuminate\Database\Eloquent\Model  $parent
+     * @param  array   $attributes
+     * @param  string  $table
+     * @param  bool    $exists
+     * @return static
+     */
+    public static function fromAttributes(Model $parent, $attributes, $table, $exists = false)
+    {
+        $instance = new static;
+
+        // The pivot model is a "dynamic" model since we will set the tables dynamically
+        // for the instance. This allows it work for any intermediate tables for the
+        // many to many relationship that are defined by this developer's classes.
+        $instance->setConnection($parent->getConnectionName())
+            ->setTable($table)
+            ->forceFill($attributes)
+            ->syncOriginal();
+
+        // We store off the parent instance so we will access the timestamp column names
+        // for the model, since the pivot model timestamps aren't easily configurable
+        // from the developer's point of view. We can use the parents to get these.
+        $instance->pivotParent = $parent;
+
+        $instance->exists = $exists;
+
+        $instance->timestamps = $instance->hasTimestampAttributes();
+
+        return $instance;
+    }
+
+    /**
+     * Create a new pivot model from raw values returned from a query.
+     *
+     * @param  \Illuminate\Database\Eloquent\Model  $parent
+     * @param  array   $attributes
+     * @param  string  $table
+     * @param  bool    $exists
+     * @return static
+     */
+    public static function fromRawAttributes(Model $parent, $attributes, $table, $exists = false)
+    {
+        $instance = static::fromAttributes($parent, [], $table, $exists);
+
+        $instance->setRawAttributes($attributes, true);
+
+        $instance->timestamps = $instance->hasTimestampAttributes();
+
+        return $instance;
+    }
+
+    /**
+     * Set the keys for a save update query.
+     *
+     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    protected function setKeysForSaveQuery(Builder $query)
+    {
+        if (isset($this->attributes[$this->getKeyName()])) {
+            return parent::setKeysForSaveQuery($query);
+        }
+
+        $query->where($this->foreignKey, $this->getOriginal(
+            $this->foreignKey, $this->getAttribute($this->foreignKey)
+        ));
+
+        return $query->where($this->relatedKey, $this->getOriginal(
+            $this->relatedKey, $this->getAttribute($this->relatedKey)
+        ));
+    }
+
+    /**
+     * Delete the pivot model record from the database.
+     *
+     * @return int
+     */
+    public function delete()
+    {
+        if (isset($this->attributes[$this->getKeyName()])) {
+            return parent::delete();
+        }
+
+        return $this->getDeleteQuery()->delete();
+    }
+
+    /**
+     * Get the query builder for a delete operation on the pivot.
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    protected function getDeleteQuery()
+    {
+        return $this->newQuery()->where([
+            $this->foreignKey => $this->getOriginal($this->foreignKey, $this->getAttribute($this->foreignKey)),
+            $this->relatedKey => $this->getOriginal($this->relatedKey, $this->getAttribute($this->relatedKey)),
+        ]);
+    }
+
+    /**
+     * Get the table associated with the model.
+     *
+     * @return string
+     */
+    public function getTable()
+    {
+        if (! isset($this->table)) {
+            $this->setTable(str_replace(
+                '\\', '', Str::snake(Str::singular(class_basename($this)))
+            ));
+        }
+
+        return $this->table;
+    }
+
+    /**
+     * Get the foreign key column name.
+     *
+     * @return string
+     */
+    public function getForeignKey()
+    {
+        return $this->foreignKey;
+    }
+
+    /**
+     * Get the "related key" column name.
+     *
+     * @return string
+     */
+    public function getRelatedKey()
+    {
+        return $this->relatedKey;
+    }
+
+    /**
+     * Get the "related key" column name.
+     *
+     * @return string
+     */
+    public function getOtherKey()
+    {
+        return $this->getRelatedKey();
+    }
+
+    /**
+     * Set the key names for the pivot model instance.
+     *
+     * @param  string  $foreignKey
+     * @param  string  $relatedKey
+     * @return $this
+     */
+    public function setPivotKeys($foreignKey, $relatedKey)
+    {
+        $this->foreignKey = $foreignKey;
+
+        $this->relatedKey = $relatedKey;
+
+        return $this;
+    }
+
+    /**
+     * Determine if the pivot model has timestamp attributes.
+     *
+     * @return bool
+     */
+    public function hasTimestampAttributes()
+    {
+        return array_key_exists($this->getCreatedAtColumn(), $this->attributes);
+    }
+
+    /**
+     * Get the name of the "created at" column.
+     *
+     * @return string
+     */
+    public function getCreatedAtColumn()
+    {
+        return $this->pivotParent
+            ? $this->pivotParent->getCreatedAtColumn()
+            : parent::getCreatedAtColumn();
+    }
+
+    /**
+     * Get the name of the "updated at" column.
+     *
+     * @return string
+     */
+    public function getUpdatedAtColumn()
+    {
+        return $this->pivotParent
+            ? $this->pivotParent->getUpdatedAtColumn()
+            : parent::getUpdatedAtColumn();
+    }
+
+    /**
+     * Get the queueable identity for the entity.
+     *
+     * @return mixed
+     */
+    public function getQueueableId()
+    {
+        if (isset($this->attributes[$this->getKeyName()])) {
+            return $this->getKey();
+        }
+
+        return sprintf(
+            '%s:%s:%s:%s',
+            $this->foreignKey, $this->getAttribute($this->foreignKey),
+            $this->relatedKey, $this->getAttribute($this->relatedKey)
+        );
+    }
+
+    /**
+     * Get a new query to restore one or more models by their queueable IDs.
+     *
+     * @param  array|int  $ids
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function newQueryForRestoration($ids)
+    {
+        if (is_array($ids)) {
+            return $this->newQueryForCollectionRestoration($ids);
+        }
+
+        if (! Str::contains($ids, ':')) {
+            return parent::newQueryForRestoration($ids);
+        }
+
+        $segments = explode(':', $ids);
+
+        return $this->newQueryWithoutScopes()
+            ->where($segments[0], $segments[1])
+            ->where($segments[2], $segments[3]);
+    }
+
+    /**
+     * Get a new query to restore multiple models by their queueable IDs.
+     *
+     * @param  array|int  $ids
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    protected function newQueryForCollectionRestoration(array $ids)
+    {
+        if (! Str::contains($ids[0], ':')) {
+            return parent::newQueryForRestoration($ids);
+        }
+
+        $query = $this->newQueryWithoutScopes();
+
+        foreach ($ids as $id) {
+            $segments = explode(':', $id);
+
+            $query->orWhere(function ($query) use ($segments) {
+                return $query->where($segments[0], $segments[1])
+                    ->where($segments[2], $segments[3]);
+            });
+        }
+
+        return $query;
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Concerns/InteractsWithPivotTable.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Concerns/InteractsWithPivotTable.php
index 83da64e8..61392452 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Concerns/InteractsWithPivotTable.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Concerns/InteractsWithPivotTable.php
@@ -133,7 +133,7 @@ trait InteractsWithPivotTable
     {
         return collect($records)->mapWithKeys(function ($attributes, $id) {
             if (! is_array($attributes)) {
-                list($id, $attributes) = [$attributes, []];
+                [$id, $attributes] = [$attributes, []];
             }
 
             return [$id => $attributes];
@@ -188,7 +188,7 @@ trait InteractsWithPivotTable
             $attributes = $this->addTimestampsToAttachment($attributes, true);
         }
 
-        $updated = $this->newPivotStatementForId($id)->update(
+        $updated = $this->newPivotStatementForId($this->parseId($id))->update(
             $this->castAttributes($attributes)
         );
 
@@ -258,7 +258,7 @@ trait InteractsWithPivotTable
      */
     protected function formatAttachRecord($key, $value, $attributes, $hasTimestamps)
     {
-        list($id, $attributes) = $this->extractAttachIdAndAttributes($key, $value, $attributes);
+        [$id, $attributes] = $this->extractAttachIdAndAttributes($key, $value, $attributes);
 
         return array_merge(
             $this->baseAttachRecord($id, $hasTimestamps), $this->castAttributes($attributes)
@@ -300,6 +300,10 @@ trait InteractsWithPivotTable
             $record = $this->addTimestampsToAttachment($record);
         }
 
+        foreach ($this->pivotValues as $value) {
+            $record[$value['column']] = $value['value'];
+        }
+
         return $record;
     }
 
@@ -314,6 +318,12 @@ trait InteractsWithPivotTable
     {
         $fresh = $this->parent->freshTimestamp();
 
+        if ($this->using) {
+            $pivotModel = new $this->using;
+
+            $fresh = $fresh->format($pivotModel->getDateFormat());
+        }
+
         if (! $exists && $this->hasPivotColumn($this->createdAt())) {
             $record[$this->createdAt()] = $fresh;
         }
@@ -464,11 +474,11 @@ trait InteractsWithPivotTable
     protected function parseIds($value)
     {
         if ($value instanceof Model) {
-            return [$value->getKey()];
+            return [$value->{$this->relatedKey}];
         }
 
         if ($value instanceof Collection) {
-            return $value->modelKeys();
+            return $value->pluck($this->relatedKey)->all();
         }
 
         if ($value instanceof BaseCollection) {
@@ -478,6 +488,17 @@ trait InteractsWithPivotTable
         return (array) $value;
     }
 
+    /**
+     * Get the ID from the given mixed value.
+     *
+     * @param  mixed  $value
+     * @return mixed
+     */
+    protected function parseId($value)
+    {
+        return $value instanceof Model ? $value->{$this->relatedKey} : $value;
+    }
+
     /**
      * Cast the given keys to integers if they are numeric and string otherwise.
      *
@@ -492,14 +513,17 @@ trait InteractsWithPivotTable
     }
 
     /**
-     * Cast the given key to an integer if it is numeric.
+     * Cast the given key to convert to primary key type.
      *
      * @param  mixed  $key
      * @return mixed
      */
     protected function castKey($key)
     {
-        return is_numeric($key) ? (int) $key : (string) $key;
+        return $this->getTypeSwapValue(
+            $this->related->getKeyType(),
+            $key
+        );
     }
 
     /**
@@ -514,4 +538,28 @@ trait InteractsWithPivotTable
                     ? $this->newPivot()->fill($attributes)->getAttributes()
                     : $attributes;
     }
+
+    /**
+     * Converts a given value to a given type value.
+     *
+     * @param  string $type
+     * @param  mixed  $value
+     * @return mixed
+     */
+    protected function getTypeSwapValue($type, $value)
+    {
+        switch (strtolower($type)) {
+            case 'int':
+            case 'integer':
+                return (int) $value;
+            case 'real':
+            case 'float':
+            case 'double':
+                return (float) $value;
+            case 'string':
+                return (string) $value;
+            default:
+                return $value;
+        }
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Concerns/SupportsDefaultModels.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Concerns/SupportsDefaultModels.php
index 00efd507..74e758f5 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Concerns/SupportsDefaultModels.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Concerns/SupportsDefaultModels.php
@@ -51,7 +51,7 @@ trait SupportsDefaultModels
         $instance = $this->newRelatedInstanceFor($parent);
 
         if (is_callable($this->withDefault)) {
-            return call_user_func($this->withDefault, $instance) ?: $instance;
+            return call_user_func($this->withDefault, $instance, $parent) ?: $instance;
         }
 
         if (is_array($this->withDefault)) {
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php
index 408e42fc..e1ecb120 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php
@@ -135,9 +135,7 @@ class HasManyThrough extends Relation
      */
     public function throughParentSoftDeletes()
     {
-        return in_array(SoftDeletes::class, class_uses_recursive(
-            get_class($this->throughParent)
-        ));
+        return in_array(SoftDeletes::class, class_uses_recursive($this->throughParent));
     }
 
     /**
@@ -326,7 +324,7 @@ class HasManyThrough extends Relation
         $result = $this->find($id, $columns);
 
         if (is_array($id)) {
-            if (count($result) == count(array_unique($id))) {
+            if (count($result) === count(array_unique($id))) {
                 return $result;
             }
         } elseif (! is_null($result)) {
@@ -354,16 +352,9 @@ class HasManyThrough extends Relation
      */
     public function get($columns = ['*'])
     {
-        // First we'll add the proper select columns onto the query so it is run with
-        // the proper columns. Then, we will get the results and hydrate out pivot
-        // models with the result of those columns as a separate model relation.
-        $columns = $this->query->getQuery()->columns ? [] : $columns;
+        $builder = $this->prepareQueryBuilder($columns);
 
-        $builder = $this->query->applyScopes();
-
-        $models = $builder->addSelect(
-            $this->shouldSelect($columns)
-        )->getModels();
+        $models = $builder->getModels();
 
         // If we actually found models we will also eager load any relationships that
         // have been specified as needing to be eager loaded. This will solve the
@@ -422,6 +413,61 @@ class HasManyThrough extends Relation
         return array_merge($columns, [$this->getQualifiedFirstKeyName()]);
     }
 
+    /**
+     * Chunk the results of the query.
+     *
+     * @param  int  $count
+     * @param  callable  $callback
+     * @return bool
+     */
+    public function chunk($count, callable $callback)
+    {
+        return $this->prepareQueryBuilder()->chunk($count, $callback);
+    }
+
+    /**
+     * Get a generator for the given query.
+     *
+     * @return \Generator
+     */
+    public function cursor()
+    {
+        return $this->prepareQueryBuilder()->cursor();
+    }
+
+    /**
+     * Execute a callback over each item while chunking.
+     *
+     * @param  callable  $callback
+     * @param  int  $count
+     * @return bool
+     */
+    public function each(callable $callback, $count = 1000)
+    {
+        return $this->chunk($count, function ($results) use ($callback) {
+            foreach ($results as $key => $value) {
+                if ($callback($value, $key) === false) {
+                    return false;
+                }
+            }
+        });
+    }
+
+    /**
+     * Prepare the query builder for query execution.
+     *
+     * @param  array  $columns
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    protected function prepareQueryBuilder($columns = ['*'])
+    {
+        $builder = $this->query->applyScopes();
+
+        return $builder->addSelect(
+            $this->shouldSelect($builder->getQuery()->columns ? [] : $columns)
+        );
+    }
+
     /**
      * Add the constraints for a relationship query.
      *
@@ -464,7 +510,7 @@ class HasManyThrough extends Relation
         $query->getModel()->setTable($hash);
 
         return $query->select($columns)->whereColumn(
-            $parentQuery->getQuery()->from.'.'.$query->getModel()->getKeyName(), '=', $this->getQualifiedFirstKeyName()
+            $parentQuery->getQuery()->from.'.'.$this->localKey, '=', $this->getQualifiedFirstKeyName()
         );
     }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php
index 54850fa3..20b2b4f7 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php
@@ -316,7 +316,7 @@ abstract class HasOneOrMany extends Relation
      */
     public function update(array $attributes)
     {
-        if ($this->related->usesTimestamps()) {
+        if ($this->related->usesTimestamps() && ! is_null($this->relatedUpdatedAt())) {
             $attributes[$this->relatedUpdatedAt()] = $this->related->freshTimestampString();
         }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphOneOrMany.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphOneOrMany.php
index 7e300543..58de31c2 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphOneOrMany.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphOneOrMany.php
@@ -67,19 +67,6 @@ abstract class MorphOneOrMany extends HasOneOrMany
         $this->query->where($this->morphType, $this->morphClass);
     }
 
-    /**
-     * Attach a model instance to the parent model.
-     *
-     * @param  \Illuminate\Database\Eloquent\Model  $model
-     * @return \Illuminate\Database\Eloquent\Model
-     */
-    public function save(Model $model)
-    {
-        $model->setAttribute($this->getMorphType(), $this->morphClass);
-
-        return parent::save($model);
-    }
-
     /**
      * Set the foreign ID and type for creating a related model.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphPivot.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphPivot.php
index b7a2f341..a8a9210f 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphPivot.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphPivot.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Database\Eloquent\Relations;
 
+use Illuminate\Support\Str;
 use Illuminate\Database\Eloquent\Builder;
 
 class MorphPivot extends Pivot
@@ -76,4 +77,74 @@ class MorphPivot extends Pivot
 
         return $this;
     }
+
+    /**
+     * Get the queueable identity for the entity.
+     *
+     * @return mixed
+     */
+    public function getQueueableId()
+    {
+        if (isset($this->attributes[$this->getKeyName()])) {
+            return $this->getKey();
+        }
+
+        return sprintf(
+            '%s:%s:%s:%s:%s:%s',
+            $this->foreignKey, $this->getAttribute($this->foreignKey),
+            $this->relatedKey, $this->getAttribute($this->relatedKey),
+            $this->morphType, $this->morphClass
+        );
+    }
+
+    /**
+     * Get a new query to restore one or more models by their queueable IDs.
+     *
+     * @param  array|int  $ids
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function newQueryForRestoration($ids)
+    {
+        if (is_array($ids)) {
+            return $this->newQueryForCollectionRestoration($ids);
+        }
+
+        if (! Str::contains($ids, ':')) {
+            return parent::newQueryForRestoration($ids);
+        }
+
+        $segments = explode(':', $ids);
+
+        return $this->newQueryWithoutScopes()
+                        ->where($segments[0], $segments[1])
+                        ->where($segments[2], $segments[3])
+                        ->where($segments[4], $segments[5]);
+    }
+
+    /**
+     * Get a new query to restore multiple models by their queueable IDs.
+     *
+     * @param  array|int  $ids
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    protected function newQueryForCollectionRestoration(array $ids)
+    {
+        if (! Str::contains($ids[0], ':')) {
+            return parent::newQueryForRestoration($ids);
+        }
+
+        $query = $this->newQueryWithoutScopes();
+
+        foreach ($ids as $id) {
+            $segments = explode(':', $id);
+
+            $query->orWhere(function ($query) use ($segments) {
+                return $query->where($segments[0], $segments[1])
+                             ->where($segments[2], $segments[3])
+                             ->where($segments[4], $segments[5]);
+            });
+        }
+
+        return $query;
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphTo.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphTo.php
index 0b5375b3..ac28ad3f 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphTo.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphTo.php
@@ -91,7 +91,7 @@ class MorphTo extends BelongsTo
      */
     public function getResults()
     {
-        return $this->ownerKey ? $this->query->first() : null;
+        return $this->ownerKey ? parent::getResults() : null;
     }
 
     /**
@@ -120,12 +120,14 @@ class MorphTo extends BelongsTo
     {
         $instance = $this->createModelByType($type);
 
+        $ownerKey = $this->ownerKey ?? $instance->getKeyName();
+
         $query = $this->replayMacros($instance->newQuery())
                             ->mergeConstraintsFrom($this->getQuery())
                             ->with($this->getQuery()->getEagerLoads());
 
         return $query->whereIn(
-            $instance->getTable().'.'.$instance->getKeyName(), $this->gatherKeysByType($type)
+            $instance->getTable().'.'.$ownerKey, $this->gatherKeysByType($type)
         )->get();
     }
 
@@ -178,8 +180,10 @@ class MorphTo extends BelongsTo
     protected function matchToMorphParents($type, Collection $results)
     {
         foreach ($results as $result) {
-            if (isset($this->dictionary[$type][$result->getKey()])) {
-                foreach ($this->dictionary[$type][$result->getKey()] as $model) {
+            $ownerKey = ! is_null($this->ownerKey) ? $result->{$this->ownerKey} : $result->getKey();
+
+            if (isset($this->dictionary[$type][$ownerKey])) {
+                foreach ($this->dictionary[$type][$ownerKey] as $model) {
                     $model->setRelation($this->relation, $result);
                 }
             }
@@ -219,6 +223,18 @@ class MorphTo extends BelongsTo
         return $this->parent->setRelation($this->relation, null);
     }
 
+    /**
+     * Touch all of the related models for the relationship.
+     *
+     * @return void
+     */
+    public function touch()
+    {
+        if (! is_null($this->ownerKey)) {
+            parent::touch();
+        }
+    }
+
     /**
      * Get the foreign key "type" name.
      *
@@ -264,7 +280,13 @@ class MorphTo extends BelongsTo
     public function __call($method, $parameters)
     {
         try {
-            return parent::__call($method, $parameters);
+            $result = parent::__call($method, $parameters);
+
+            if (in_array($method, ['select', 'selectRaw', 'selectSub', 'addSelect', 'withoutGlobalScopes'])) {
+                $this->macroBuffer[] = compact('method', 'parameters');
+            }
+
+            return $result;
         }
 
         // If we tried to call a method that does not exist on the parent Builder instance,
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphToMany.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphToMany.php
index 15f5cfd0..f97c465d 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphToMany.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphToMany.php
@@ -146,6 +146,22 @@ class MorphToMany extends BelongsToMany
         return $pivot;
     }
 
+    /**
+     * Get the pivot columns for the relation.
+     *
+     * "pivot_" is prefixed at each column for easy removal later.
+     *
+     * @return array
+     */
+    protected function aliasedPivotColumns()
+    {
+        $defaults = [$this->foreignPivotKey, $this->relatedPivotKey, $this->morphType];
+
+        return collect(array_merge($defaults, $this->pivotColumns))->map(function ($column) {
+            return $this->table.'.'.$column.' as pivot_'.$column;
+        })->unique()->all();
+    }
+
     /**
      * Get the foreign key "type" name.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Pivot.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Pivot.php
index 5f7323ce..2ec82351 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Pivot.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Pivot.php
@@ -2,32 +2,12 @@
 
 namespace Illuminate\Database\Eloquent\Relations;
 
-use Illuminate\Support\Str;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\Concerns\AsPivot;
 
 class Pivot extends Model
 {
-    /**
-     * The parent model of the relationship.
-     *
-     * @var \Illuminate\Database\Eloquent\Model
-     */
-    public $pivotParent;
-
-    /**
-     * The name of the foreign key column.
-     *
-     * @var string
-     */
-    protected $foreignKey;
-
-    /**
-     * The name of the "other key" column.
-     *
-     * @var string
-     */
-    protected $relatedKey;
+    use AsPivot;
 
     /**
      * The attributes that aren't mass assignable.
@@ -35,195 +15,4 @@ class Pivot extends Model
      * @var array
      */
     protected $guarded = [];
-
-    /**
-     * Create a new pivot model instance.
-     *
-     * @param  \Illuminate\Database\Eloquent\Model  $parent
-     * @param  array   $attributes
-     * @param  string  $table
-     * @param  bool    $exists
-     * @return static
-     */
-    public static function fromAttributes(Model $parent, $attributes, $table, $exists = false)
-    {
-        $instance = new static;
-
-        // The pivot model is a "dynamic" model since we will set the tables dynamically
-        // for the instance. This allows it work for any intermediate tables for the
-        // many to many relationship that are defined by this developer's classes.
-        $instance->setConnection($parent->getConnectionName())
-                ->setTable($table)
-                ->forceFill($attributes)
-                ->syncOriginal();
-
-        // We store off the parent instance so we will access the timestamp column names
-        // for the model, since the pivot model timestamps aren't easily configurable
-        // from the developer's point of view. We can use the parents to get these.
-        $instance->pivotParent = $parent;
-
-        $instance->exists = $exists;
-
-        $instance->timestamps = $instance->hasTimestampAttributes();
-
-        return $instance;
-    }
-
-    /**
-     * Create a new pivot model from raw values returned from a query.
-     *
-     * @param  \Illuminate\Database\Eloquent\Model  $parent
-     * @param  array   $attributes
-     * @param  string  $table
-     * @param  bool    $exists
-     * @return static
-     */
-    public static function fromRawAttributes(Model $parent, $attributes, $table, $exists = false)
-    {
-        $instance = static::fromAttributes($parent, [], $table, $exists);
-
-        $instance->setRawAttributes($attributes, true);
-
-        return $instance;
-    }
-
-    /**
-     * Set the keys for a save update query.
-     *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
-     * @return \Illuminate\Database\Eloquent\Builder
-     */
-    protected function setKeysForSaveQuery(Builder $query)
-    {
-        if (isset($this->attributes[$this->getKeyName()])) {
-            return parent::setKeysForSaveQuery($query);
-        }
-
-        $query->where($this->foreignKey, $this->getOriginal(
-            $this->foreignKey, $this->getAttribute($this->foreignKey)
-        ));
-
-        return $query->where($this->relatedKey, $this->getOriginal(
-            $this->relatedKey, $this->getAttribute($this->relatedKey)
-        ));
-    }
-
-    /**
-     * Delete the pivot model record from the database.
-     *
-     * @return int
-     */
-    public function delete()
-    {
-        if (isset($this->attributes[$this->getKeyName()])) {
-            return parent::delete();
-        }
-
-        return $this->getDeleteQuery()->delete();
-    }
-
-    /**
-     * Get the query builder for a delete operation on the pivot.
-     *
-     * @return \Illuminate\Database\Eloquent\Builder
-     */
-    protected function getDeleteQuery()
-    {
-        return $this->newQuery()->where([
-            $this->foreignKey => $this->getOriginal($this->foreignKey, $this->getAttribute($this->foreignKey)),
-            $this->relatedKey => $this->getOriginal($this->relatedKey, $this->getAttribute($this->relatedKey)),
-        ]);
-    }
-
-    /**
-     * Get the table associated with the model.
-     *
-     * @return string
-     */
-    public function getTable()
-    {
-        if (! isset($this->table)) {
-            $this->setTable(str_replace(
-                '\\', '', Str::snake(Str::singular(class_basename($this)))
-            ));
-        }
-
-        return $this->table;
-    }
-
-    /**
-     * Get the foreign key column name.
-     *
-     * @return string
-     */
-    public function getForeignKey()
-    {
-        return $this->foreignKey;
-    }
-
-    /**
-     * Get the "related key" column name.
-     *
-     * @return string
-     */
-    public function getRelatedKey()
-    {
-        return $this->relatedKey;
-    }
-
-    /**
-     * Get the "related key" column name.
-     *
-     * @return string
-     */
-    public function getOtherKey()
-    {
-        return $this->getRelatedKey();
-    }
-
-    /**
-     * Set the key names for the pivot model instance.
-     *
-     * @param  string  $foreignKey
-     * @param  string  $relatedKey
-     * @return $this
-     */
-    public function setPivotKeys($foreignKey, $relatedKey)
-    {
-        $this->foreignKey = $foreignKey;
-
-        $this->relatedKey = $relatedKey;
-
-        return $this;
-    }
-
-    /**
-     * Determine if the pivot model has timestamp attributes.
-     *
-     * @return bool
-     */
-    public function hasTimestampAttributes()
-    {
-        return array_key_exists($this->getCreatedAtColumn(), $this->attributes);
-    }
-
-    /**
-     * Get the name of the "created at" column.
-     *
-     * @return string
-     */
-    public function getCreatedAtColumn()
-    {
-        return $this->pivotParent->getCreatedAtColumn();
-    }
-
-    /**
-     * Get the name of the "updated at" column.
-     *
-     * @return string
-     */
-    public function getUpdatedAtColumn()
-    {
-        return $this->pivotParent->getUpdatedAtColumn();
-    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Relation.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Relation.php
index c46dc358..7c563c80 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Relation.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Relation.php
@@ -9,13 +9,14 @@ use Illuminate\Support\Traits\Macroable;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\Expression;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Traits\ForwardsCalls;
 
 /**
  * @mixin \Illuminate\Database\Eloquent\Builder
  */
 abstract class Relation
 {
-    use Macroable {
+    use ForwardsCalls, Macroable {
         __call as macroCall;
     }
 
@@ -161,9 +162,13 @@ abstract class Relation
      */
     public function touch()
     {
-        $column = $this->getRelated()->getUpdatedAtColumn();
+        $model = $this->getRelated();
 
-        $this->rawUpdate([$column => $this->getRelated()->freshTimestampString()]);
+        if (! $model::isIgnoringTouch()) {
+            $this->rawUpdate([
+                $model->getUpdatedAtColumn() => $model->freshTimestampString(),
+            ]);
+        }
     }
 
     /**
@@ -219,7 +224,7 @@ abstract class Relation
     {
         return collect($models)->map(function ($value) use ($key) {
             return $key ? $value->getAttribute($key) : $value->getKey();
-        })->values()->unique()->sort()->all();
+        })->values()->unique(null, true)->sort()->all();
     }
 
     /**
@@ -346,9 +351,7 @@ abstract class Relation
      */
     public static function getMorphedModel($alias)
     {
-        return array_key_exists($alias, self::$morphMap)
-                        ? self::$morphMap[$alias]
-                        : null;
+        return self::$morphMap[$alias] ?? null;
     }
 
     /**
@@ -364,7 +367,7 @@ abstract class Relation
             return $this->macroCall($method, $parameters);
         }
 
-        $result = $this->query->{$method}(...$parameters);
+        $result = $this->forwardCallTo($this->query, $method, $parameters);
 
         if ($result === $this->query) {
             return $this;
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/SoftDeletes.php b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/SoftDeletes.php
index 74ba0622..d8b73630 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Eloquent/SoftDeletes.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Eloquent/SoftDeletes.php
@@ -30,11 +30,13 @@ trait SoftDeletes
     {
         $this->forceDeleting = true;
 
-        $deleted = $this->delete();
+        return tap($this->delete(), function ($deleted) {
+            $this->forceDeleting = false;
 
-        $this->forceDeleting = false;
-
-        return $deleted;
+            if ($deleted) {
+                $this->fireModelEvent('forceDeleted', false);
+            }
+        });
     }
 
     /**
@@ -47,7 +49,7 @@ trait SoftDeletes
         if ($this->forceDeleting) {
             $this->exists = false;
 
-            return $this->newQueryWithoutScopes()->where($this->getKeyName(), $this->getKey())->forceDelete();
+            return $this->newModelQuery()->where($this->getKeyName(), $this->getKey())->forceDelete();
         }
 
         return $this->runSoftDelete();
@@ -60,7 +62,7 @@ trait SoftDeletes
      */
     protected function runSoftDelete()
     {
-        $query = $this->newQueryWithoutScopes()->where($this->getKeyName(), $this->getKey());
+        $query = $this->newModelQuery()->where($this->getKeyName(), $this->getKey());
 
         $time = $this->freshTimestamp();
 
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Grammar.php b/vendor/laravel/framework/src/Illuminate/Database/Grammar.php
index 243f07c3..38525653 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Grammar.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Grammar.php
@@ -2,10 +2,13 @@
 
 namespace Illuminate\Database;
 
+use Illuminate\Support\Traits\Macroable;
 use Illuminate\Database\Query\Expression;
 
 abstract class Grammar
 {
+    use Macroable;
+
     /**
      * The grammar table prefix.
      *
@@ -53,9 +56,9 @@ abstract class Grammar
         }
 
         // If the value being wrapped has a column alias we will need to separate out
-        // the pieces so we can wrap each of the segments of the expression on it
-        // own, and then joins them both back together with the "as" connector.
-        if (strpos(strtolower($value), ' as ') !== false) {
+        // the pieces so we can wrap each of the segments of the expression on its
+        // own, and then join these both back together using the "as" connector.
+        if (stripos($value, ' as ') !== false) {
             return $this->wrapAliasedValue($value, $prefixAlias);
         }
 
@@ -148,6 +151,21 @@ abstract class Grammar
         return $this->isExpression($value) ? $this->getValue($value) : '?';
     }
 
+    /**
+     * Quote the given string literal.
+     *
+     * @param  string|array  $value
+     * @return string
+     */
+    public function quoteString($value)
+    {
+        if (is_array($value)) {
+            return implode(', ', array_map([$this, __FUNCTION__], $value));
+        }
+
+        return "'$value'";
+    }
+
     /**
      * Determine if the given value is a raw expression.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Migrations/DatabaseMigrationRepository.php b/vendor/laravel/framework/src/Illuminate/Database/Migrations/DatabaseMigrationRepository.php
index b1685ffa..1ace1a6f 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Migrations/DatabaseMigrationRepository.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Migrations/DatabaseMigrationRepository.php
@@ -41,7 +41,7 @@ class DatabaseMigrationRepository implements MigrationRepositoryInterface
     }
 
     /**
-     * Get the ran migrations.
+     * Get the completed migrations.
      *
      * @return array
      */
@@ -80,11 +80,24 @@ class DatabaseMigrationRepository implements MigrationRepositoryInterface
         return $query->orderBy('migration', 'desc')->get()->all();
     }
 
+    /**
+     * Get the completed migrations with their batch numbers.
+     *
+     * @return array
+     */
+    public function getMigrationBatches()
+    {
+        return $this->table()
+                ->orderBy('batch', 'asc')
+                ->orderBy('migration', 'asc')
+                ->pluck('batch', 'migration')->all();
+    }
+
     /**
      * Log that a migration was run.
      *
      * @param  string  $file
-     * @param  int     $batch
+     * @param  int  $batch
      * @return void
      */
     public function log($file, $batch)
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Migrations/MigrationCreator.php b/vendor/laravel/framework/src/Illuminate/Database/Migrations/MigrationCreator.php
index 719fbf10..88ab4035 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Migrations/MigrationCreator.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Migrations/MigrationCreator.php
@@ -42,6 +42,7 @@ class MigrationCreator
      * @param  string  $table
      * @param  bool    $create
      * @return string
+     *
      * @throws \Exception
      */
     public function create($name, $path, $table = null, $create = false)
@@ -61,7 +62,7 @@ class MigrationCreator
         // Next, we will fire any hooks that are supposed to fire after a migration is
         // created. Once that is done we'll be ready to return the full path to the
         // migration file so it can be used however it's needed by the developer.
-        $this->firePostCreateHooks();
+        $this->firePostCreateHooks($table);
 
         return $path;
     }
@@ -150,12 +151,13 @@ class MigrationCreator
     /**
      * Fire the registered post create hooks.
      *
+     * @param  string  $table
      * @return void
      */
-    protected function firePostCreateHooks()
+    protected function firePostCreateHooks($table)
     {
         foreach ($this->postCreate as $callback) {
-            call_user_func($callback);
+            call_user_func($callback, $table);
         }
     }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Migrations/MigrationRepositoryInterface.php b/vendor/laravel/framework/src/Illuminate/Database/Migrations/MigrationRepositoryInterface.php
index 60bc921f..410326a9 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Migrations/MigrationRepositoryInterface.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Migrations/MigrationRepositoryInterface.php
@@ -5,7 +5,7 @@ namespace Illuminate\Database\Migrations;
 interface MigrationRepositoryInterface
 {
     /**
-     * Get the ran migrations for a given package.
+     * Get the completed migrations.
      *
      * @return array
      */
@@ -26,11 +26,18 @@ interface MigrationRepositoryInterface
      */
     public function getLast();
 
+    /**
+     * Get the completed migrations with their batch numbers.
+     *
+     * @return array
+     */
+    public function getMigrationBatches();
+
     /**
      * Log that a migration was run.
      *
      * @param  string  $file
-     * @param  int     $batch
+     * @param  int  $batch
      * @return void
      */
     public function log($file, $batch);
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Migrations/Migrator.php b/vendor/laravel/framework/src/Illuminate/Database/Migrations/Migrator.php
index d55046da..66cda449 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Migrations/Migrator.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Migrations/Migrator.php
@@ -5,6 +5,7 @@ namespace Illuminate\Database\Migrations;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Support\Collection;
+use Illuminate\Console\OutputStyle;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Database\ConnectionResolverInterface as Resolver;
 
@@ -39,18 +40,18 @@ class Migrator
     protected $connection;
 
     /**
-     * The notes for the current operation.
+     * The paths to all of the migration files.
      *
      * @var array
      */
-    protected $notes = [];
+    protected $paths = [];
 
     /**
-     * The paths to all of the migration files.
+     * The output interface implementation.
      *
-     * @var array
+     * @var \Illuminate\Console\OutputStyle
      */
-    protected $paths = [];
+    protected $output;
 
     /**
      * Create a new migrator instance.
@@ -124,7 +125,7 @@ class Migrator
         // First we will just make sure that there are any migrations to run. If there
         // aren't, we will just make a note of it to the developer so they're aware
         // that all of the migrations have been run against this database system.
-        if (count($migrations) == 0) {
+        if (count($migrations) === 0) {
             $this->note('<info>Nothing to migrate.</info>');
 
             return;
@@ -219,9 +220,9 @@ class Migrator
     {
         if (($steps = $options['step'] ?? 0) > 0) {
             return $this->repository->getMigrations($steps);
-        } else {
-            return $this->repository->getLast();
         }
+
+        return $this->repository->getLast();
     }
 
     /**
@@ -480,6 +481,16 @@ class Migrator
         return $this->paths;
     }
 
+    /**
+     * Get the default connection name.
+     *
+     * @return string
+     */
+    public function getConnection()
+    {
+        return $this->connection;
+    }
+
     /**
      * Set the default connection name.
      *
@@ -556,23 +567,28 @@ class Migrator
     }
 
     /**
-     * Raise a note event for the migrator.
+     * Set the output implementation that should be used by the console.
      *
-     * @param  string  $message
-     * @return void
+     * @param  \Illuminate\Console\OutputStyle  $output
+     * @return $this
      */
-    protected function note($message)
+    public function setOutput(OutputStyle $output)
     {
-        $this->notes[] = $message;
+        $this->output = $output;
+
+        return $this;
     }
 
     /**
-     * Get the notes for the last operation.
+     * Write a note to the conosle's output.
      *
-     * @return array
+     * @param  string  $message
+     * @return void
      */
-    public function getNotes()
+    protected function note($message)
     {
-        return $this->notes;
+        if ($this->output) {
+            $this->output->writeln($message);
+        }
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php b/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php
index 82f351b1..46536636 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php
@@ -4,7 +4,7 @@ namespace Illuminate\Database\Query;
 
 use Closure;
 use RuntimeException;
-use BadMethodCallException;
+use DateTimeInterface;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use InvalidArgumentException;
@@ -13,6 +13,7 @@ use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Traits\Macroable;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Database\ConnectionInterface;
+use Illuminate\Support\Traits\ForwardsCalls;
 use Illuminate\Database\Concerns\BuildsQueries;
 use Illuminate\Database\Query\Grammars\Grammar;
 use Illuminate\Database\Query\Processors\Processor;
@@ -20,7 +21,7 @@ use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 
 class Builder
 {
-    use BuildsQueries, Macroable {
+    use BuildsQueries, ForwardsCalls, Macroable {
         __call as macroCall;
     }
 
@@ -52,6 +53,7 @@ class Builder
      */
     public $bindings = [
         'select' => [],
+        'from'   => [],
         'join'   => [],
         'where'  => [],
         'having' => [],
@@ -222,6 +224,24 @@ class Builder
         return $this;
     }
 
+    /**
+     * Add a subselect expression to the query.
+     *
+     * @param  \Closure|\Illuminate\Database\Query\Builder|string $query
+     * @param  string  $as
+     * @return \Illuminate\Database\Query\Builder|static
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function selectSub($query, $as)
+    {
+        [$query, $bindings] = $this->createSub($query);
+
+        return $this->selectRaw(
+            '('.$query.') as '.$this->grammar->wrap($as), $bindings
+        );
+    }
+
     /**
      * Add a new "raw" select expression to the query.
      *
@@ -241,7 +261,7 @@ class Builder
     }
 
     /**
-     * Add a subselect expression to the query.
+     * Makes "from" fetch from a subquery.
      *
      * @param  \Closure|\Illuminate\Database\Query\Builder|string $query
      * @param  string  $as
@@ -249,7 +269,36 @@ class Builder
      *
      * @throws \InvalidArgumentException
      */
-    public function selectSub($query, $as)
+    public function fromSub($query, $as)
+    {
+        [$query, $bindings] = $this->createSub($query);
+
+        return $this->fromRaw('('.$query.') as '.$this->grammar->wrap($as), $bindings);
+    }
+
+    /**
+     * Add a raw from clause to the query.
+     *
+     * @param  string  $expression
+     * @param  mixed   $bindings
+     * @return \Illuminate\Database\Query\Builder|static
+     */
+    public function fromRaw($expression, $bindings = [])
+    {
+        $this->from = new Expression($expression);
+
+        $this->addBinding($bindings, 'from');
+
+        return $this;
+    }
+
+    /**
+     * Creates a subquery and parse it.
+     *
+     * @param  \Closure|\Illuminate\Database\Query\Builder|string $query
+     * @return array
+     */
+    protected function createSub($query)
     {
         // If the given query is a Closure, we will execute it while passing in a new
         // query instance to the Closure. This will give the developer a chance to
@@ -260,27 +309,18 @@ class Builder
             $callback($query = $this->forSubQuery());
         }
 
-        // Here, we will parse this query into an SQL string and an array of bindings
-        // so we can add it to the query builder using the selectRaw method so the
-        // query is included in the real SQL generated by this builder instance.
-        list($query, $bindings) = $this->parseSubSelect($query);
-
-        return $this->selectRaw(
-            '('.$query.') as '.$this->grammar->wrap($as), $bindings
-        );
+        return $this->parseSub($query);
     }
 
     /**
-     * Parse the sub-select query into SQL and bindings.
+     * Parse the subquery into SQL and bindings.
      *
      * @param  mixed  $query
      * @return array
      */
-    protected function parseSubSelect($query)
+    protected function parseSub($query)
     {
-        if ($query instanceof self) {
-            $query->columns = [$query->columns[0]];
-
+        if ($query instanceof self || $query instanceof EloquentBuilder) {
             return [$query->toSql(), $query->getBindings()];
         } elseif (is_string($query)) {
             return [$query, []];
@@ -333,7 +373,7 @@ class Builder
      * Add a join clause to the query.
      *
      * @param  string  $table
-     * @param  string  $first
+     * @param  \Closure|string  $first
      * @param  string|null  $operator
      * @param  string|null  $second
      * @param  string  $type
@@ -373,7 +413,7 @@ class Builder
      * Add a "join where" clause to the query.
      *
      * @param  string  $table
-     * @param  string  $first
+     * @param  \Closure|string  $first
      * @param  string  $operator
      * @param  string  $second
      * @param  string  $type
@@ -384,11 +424,36 @@ class Builder
         return $this->join($table, $first, $operator, $second, $type, true);
     }
 
+    /**
+     * Add a subquery join clause to the query.
+     *
+     * @param  \Closure|\Illuminate\Database\Query\Builder|string $query
+     * @param  string  $as
+     * @param  \Closure|string  $first
+     * @param  string|null  $operator
+     * @param  string|null  $second
+     * @param  string  $type
+     * @param  bool    $where
+     * @return \Illuminate\Database\Query\Builder|static
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function joinSub($query, $as, $first, $operator = null, $second = null, $type = 'inner', $where = false)
+    {
+        [$query, $bindings] = $this->createSub($query);
+
+        $expression = '('.$query.') as '.$this->grammar->wrap($as);
+
+        $this->addBinding($bindings, 'join');
+
+        return $this->join(new Expression($expression), $first, $operator, $second, $type, $where);
+    }
+
     /**
      * Add a left join to the query.
      *
      * @param  string  $table
-     * @param  string  $first
+     * @param  \Closure|string  $first
      * @param  string|null  $operator
      * @param  string|null  $second
      * @return \Illuminate\Database\Query\Builder|static
@@ -412,11 +477,26 @@ class Builder
         return $this->joinWhere($table, $first, $operator, $second, 'left');
     }
 
+    /**
+     * Add a subquery left join to the query.
+     *
+     * @param  \Closure|\Illuminate\Database\Query\Builder|string $query
+     * @param  string  $as
+     * @param  string  $first
+     * @param  string|null  $operator
+     * @param  string|null  $second
+     * @return \Illuminate\Database\Query\Builder|static
+     */
+    public function leftJoinSub($query, $as, $first, $operator = null, $second = null)
+    {
+        return $this->joinSub($query, $as, $first, $operator, $second, 'left');
+    }
+
     /**
      * Add a right join to the query.
      *
      * @param  string  $table
-     * @param  string  $first
+     * @param  \Closure|string  $first
      * @param  string|null  $operator
      * @param  string|null  $second
      * @return \Illuminate\Database\Query\Builder|static
@@ -440,11 +520,26 @@ class Builder
         return $this->joinWhere($table, $first, $operator, $second, 'right');
     }
 
+    /**
+     * Add a subquery right join to the query.
+     *
+     * @param  \Closure|\Illuminate\Database\Query\Builder|string $query
+     * @param  string  $as
+     * @param  string  $first
+     * @param  string|null  $operator
+     * @param  string|null  $second
+     * @return \Illuminate\Database\Query\Builder|static
+     */
+    public function rightJoinSub($query, $as, $first, $operator = null, $second = null)
+    {
+        return $this->joinSub($query, $as, $first, $operator, $second, 'right');
+    }
+
     /**
      * Add a "cross join" clause to the query.
      *
      * @param  string  $table
-     * @param  string|null  $first
+     * @param  \Closure|string|null  $first
      * @param  string|null  $operator
      * @param  string|null  $second
      * @return \Illuminate\Database\Query\Builder|static
@@ -497,8 +592,8 @@ class Builder
         // Here we will make some assumptions about the operator. If only 2 values are
         // passed to the method, we will assume that the operator is an equals sign
         // and keep going. Otherwise, we'll require the operator to be passed in.
-        list($value, $operator) = $this->prepareValueAndOperator(
-            $value, $operator, func_num_args() == 2
+        [$value, $operator] = $this->prepareValueAndOperator(
+            $value, $operator, func_num_args() === 2
         );
 
         // If the columns is actually a Closure instance, we will assume the developer
@@ -512,7 +607,7 @@ class Builder
         // assume that the developer is just short-cutting the '=' operators and
         // we will set the operators to '=' and set the values appropriately.
         if ($this->invalidOperator($operator)) {
-            list($value, $operator) = [$operator, '='];
+            [$value, $operator] = [$operator, '='];
         }
 
         // If the value is a Closure, it means the developer is performing an entire
@@ -625,14 +720,14 @@ class Builder
      * Add an "or where" clause to the query.
      *
      * @param  string|array|\Closure  $column
-     * @param  string|null  $operator
-     * @param  mixed   $value
+     * @param  mixed  $operator
+     * @param  mixed  $value
      * @return \Illuminate\Database\Query\Builder|static
      */
     public function orWhere($column, $operator = null, $value = null)
     {
-        list($value, $operator) = $this->prepareValueAndOperator(
-            $value, $operator, func_num_args() == 2
+        [$value, $operator] = $this->prepareValueAndOperator(
+            $value, $operator, func_num_args() === 2
         );
 
         return $this->where($column, $operator, $value, 'or');
@@ -660,7 +755,7 @@ class Builder
         // assume that the developer is just short-cutting the '=' operators and
         // we will set the operators to '=' and set the values appropriately.
         if ($this->invalidOperator($operator)) {
-            list($second, $operator) = [$operator, '='];
+            [$second, $operator] = [$operator, '='];
         }
 
         // Finally, we will add this where clause into this array of clauses that we
@@ -906,9 +1001,9 @@ class Builder
     {
         $type = 'between';
 
-        $this->wheres[] = compact('column', 'type', 'boolean', 'not');
+        $this->wheres[] = compact('type', 'column', 'values', 'boolean', 'not');
 
-        $this->addBinding($values, 'where');
+        $this->addBinding($this->cleanBindings($values), 'where');
 
         return $this;
     }
@@ -966,16 +1061,20 @@ class Builder
      *
      * @param  string  $column
      * @param  string  $operator
-     * @param  mixed  $value
+     * @param  \DateTimeInterface|string  $value
      * @param  string  $boolean
      * @return \Illuminate\Database\Query\Builder|static
      */
     public function whereDate($column, $operator, $value = null, $boolean = 'and')
     {
-        list($value, $operator) = $this->prepareValueAndOperator(
-            $value, $operator, func_num_args() == 2
+        [$value, $operator] = $this->prepareValueAndOperator(
+            $value, $operator, func_num_args() === 2
         );
 
+        if ($value instanceof DateTimeInterface) {
+            $value = $value->format('Y-m-d');
+        }
+
         return $this->addDateBasedWhere('Date', $column, $operator, $value, $boolean);
     }
 
@@ -984,13 +1083,13 @@ class Builder
      *
      * @param  string  $column
      * @param  string  $operator
-     * @param  string  $value
+     * @param  \DateTimeInterface|string  $value
      * @return \Illuminate\Database\Query\Builder|static
      */
-    public function orWhereDate($column, $operator, $value)
+    public function orWhereDate($column, $operator, $value = null)
     {
-        list($value, $operator) = $this->prepareValueAndOperator(
-            $value, $operator, func_num_args() == 2
+        [$value, $operator] = $this->prepareValueAndOperator(
+            $value, $operator, func_num_args() === 2
         );
 
         return $this->whereDate($column, $operator, $value, 'or');
@@ -1001,12 +1100,20 @@ class Builder
      *
      * @param  string  $column
      * @param  string   $operator
-     * @param  int   $value
+     * @param  \DateTimeInterface|string  $value
      * @param  string   $boolean
      * @return \Illuminate\Database\Query\Builder|static
      */
-    public function whereTime($column, $operator, $value, $boolean = 'and')
+    public function whereTime($column, $operator, $value = null, $boolean = 'and')
     {
+        [$value, $operator] = $this->prepareValueAndOperator(
+            $value, $operator, func_num_args() === 2
+        );
+
+        if ($value instanceof DateTimeInterface) {
+            $value = $value->format('H:i:s');
+        }
+
         return $this->addDateBasedWhere('Time', $column, $operator, $value, $boolean);
     }
 
@@ -1015,13 +1122,13 @@ class Builder
      *
      * @param  string  $column
      * @param  string   $operator
-     * @param  int   $value
+     * @param  \DateTimeInterface|string  $value
      * @return \Illuminate\Database\Query\Builder|static
      */
-    public function orWhereTime($column, $operator, $value)
+    public function orWhereTime($column, $operator, $value = null)
     {
-        list($value, $operator) = $this->prepareValueAndOperator(
-            $value, $operator, func_num_args() == 2
+        [$value, $operator] = $this->prepareValueAndOperator(
+            $value, $operator, func_num_args() === 2
         );
 
         return $this->whereTime($column, $operator, $value, 'or');
@@ -1032,62 +1139,125 @@ class Builder
      *
      * @param  string  $column
      * @param  string  $operator
-     * @param  mixed  $value
+     * @param  \DateTimeInterface|string  $value
      * @param  string  $boolean
      * @return \Illuminate\Database\Query\Builder|static
      */
     public function whereDay($column, $operator, $value = null, $boolean = 'and')
     {
-        list($value, $operator) = $this->prepareValueAndOperator(
-            $value, $operator, func_num_args() == 2
+        [$value, $operator] = $this->prepareValueAndOperator(
+            $value, $operator, func_num_args() === 2
         );
 
+        if ($value instanceof DateTimeInterface) {
+            $value = $value->format('d');
+        }
+
         return $this->addDateBasedWhere('Day', $column, $operator, $value, $boolean);
     }
 
+    /**
+     * Add an "or where day" statement to the query.
+     *
+     * @param  string  $column
+     * @param  string  $operator
+     * @param  \DateTimeInterface|string  $value
+     * @return \Illuminate\Database\Query\Builder|static
+     */
+    public function orWhereDay($column, $operator, $value = null)
+    {
+        [$value, $operator] = $this->prepareValueAndOperator(
+            $value, $operator, func_num_args() === 2
+        );
+
+        return $this->addDateBasedWhere('Day', $column, $operator, $value, 'or');
+    }
+
     /**
      * Add a "where month" statement to the query.
      *
      * @param  string  $column
      * @param  string  $operator
-     * @param  mixed  $value
+     * @param  \DateTimeInterface|string  $value
      * @param  string  $boolean
      * @return \Illuminate\Database\Query\Builder|static
      */
     public function whereMonth($column, $operator, $value = null, $boolean = 'and')
     {
-        list($value, $operator) = $this->prepareValueAndOperator(
-            $value, $operator, func_num_args() == 2
+        [$value, $operator] = $this->prepareValueAndOperator(
+            $value, $operator, func_num_args() === 2
         );
 
+        if ($value instanceof DateTimeInterface) {
+            $value = $value->format('m');
+        }
+
         return $this->addDateBasedWhere('Month', $column, $operator, $value, $boolean);
     }
 
+    /**
+     * Add an "or where month" statement to the query.
+     *
+     * @param  string  $column
+     * @param  string  $operator
+     * @param  \DateTimeInterface|string  $value
+     * @return \Illuminate\Database\Query\Builder|static
+     */
+    public function orWhereMonth($column, $operator, $value = null)
+    {
+        [$value, $operator] = $this->prepareValueAndOperator(
+            $value, $operator, func_num_args() === 2
+        );
+
+        return $this->addDateBasedWhere('Month', $column, $operator, $value, 'or');
+    }
+
     /**
      * Add a "where year" statement to the query.
      *
      * @param  string  $column
      * @param  string  $operator
-     * @param  mixed  $value
+     * @param  \DateTimeInterface|string|int  $value
      * @param  string  $boolean
      * @return \Illuminate\Database\Query\Builder|static
      */
     public function whereYear($column, $operator, $value = null, $boolean = 'and')
     {
-        list($value, $operator) = $this->prepareValueAndOperator(
-            $value, $operator, func_num_args() == 2
+        [$value, $operator] = $this->prepareValueAndOperator(
+            $value, $operator, func_num_args() === 2
         );
 
+        if ($value instanceof DateTimeInterface) {
+            $value = $value->format('Y');
+        }
+
         return $this->addDateBasedWhere('Year', $column, $operator, $value, $boolean);
     }
 
+    /**
+     * Add an "or where year" statement to the query.
+     *
+     * @param  string  $column
+     * @param  string  $operator
+     * @param  \DateTimeInterface|string|int  $value
+     * @return \Illuminate\Database\Query\Builder|static
+     */
+    public function orWhereYear($column, $operator, $value = null)
+    {
+        [$value, $operator] = $this->prepareValueAndOperator(
+            $value, $operator, func_num_args() === 2
+        );
+
+        return $this->addDateBasedWhere('Year', $column, $operator, $value, 'or');
+    }
+
     /**
      * Add a date based (year, month, day, time) statement to the query.
      *
      * @param  string  $type
      * @param  string  $column
      * @param  string  $operator
-     * @param  int  $value
+     * @param  mixed  $value
      * @param  string  $boolean
      * @return $this
      */
@@ -1140,7 +1310,7 @@ class Builder
 
             $this->wheres[] = compact('type', 'query', 'boolean');
 
-            $this->addBinding($query->getBindings(), 'where');
+            $this->addBinding($query->getRawBindings()['where'], 'where');
         }
 
         return $this;
@@ -1240,13 +1410,152 @@ class Builder
     {
         $type = $not ? 'NotExists' : 'Exists';
 
-        $this->wheres[] = compact('type', 'operator', 'query', 'boolean');
+        $this->wheres[] = compact('type', 'query', 'boolean');
 
         $this->addBinding($query->getBindings(), 'where');
 
         return $this;
     }
 
+    /**
+     * Adds a where condition using row values.
+     *
+     * @param  array   $columns
+     * @param  string  $operator
+     * @param  array   $values
+     * @param  string  $boolean
+     * @return $this
+     */
+    public function whereRowValues($columns, $operator, $values, $boolean = 'and')
+    {
+        if (count($columns) !== count($values)) {
+            throw new InvalidArgumentException('The number of columns must match the number of values');
+        }
+
+        $type = 'RowValues';
+
+        $this->wheres[] = compact('type', 'columns', 'operator', 'values', 'boolean');
+
+        $this->addBinding($this->cleanBindings($values));
+
+        return $this;
+    }
+
+    /**
+     * Adds a or where condition using row values.
+     *
+     * @param  array   $columns
+     * @param  string  $operator
+     * @param  array   $values
+     * @return $this
+     */
+    public function orWhereRowValues($columns, $operator, $values)
+    {
+        return $this->whereRowValues($columns, $operator, $values, 'or');
+    }
+
+    /**
+     * Add a "where JSON contains" clause to the query.
+     *
+     * @param  string  $column
+     * @param  mixed  $value
+     * @param  string  $boolean
+     * @param  bool  $not
+     * @return $this
+     */
+    public function whereJsonContains($column, $value, $boolean = 'and', $not = false)
+    {
+        $type = 'JsonContains';
+
+        $this->wheres[] = compact('type', 'column', 'value', 'boolean', 'not');
+
+        if (! $value instanceof Expression) {
+            $this->addBinding($this->grammar->prepareBindingForJsonContains($value));
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add a "or where JSON contains" clause to the query.
+     *
+     * @param  string  $column
+     * @param  mixed  $value
+     * @return $this
+     */
+    public function orWhereJsonContains($column, $value)
+    {
+        return $this->whereJsonContains($column, $value, 'or');
+    }
+
+    /**
+     * Add a "where JSON not contains" clause to the query.
+     *
+     * @param  string  $column
+     * @param  mixed  $value
+     * @param  string  $boolean
+     * @return $this
+     */
+    public function whereJsonDoesntContain($column, $value, $boolean = 'and')
+    {
+        return $this->whereJsonContains($column, $value, $boolean, true);
+    }
+
+    /**
+     * Add a "or where JSON not contains" clause to the query.
+     *
+     * @param  string  $column
+     * @param  mixed  $value
+     * @return $this
+     */
+    public function orWhereJsonDoesntContain($column, $value)
+    {
+        return $this->whereJsonDoesntContain($column, $value, 'or');
+    }
+
+    /**
+     * Add a "where JSON length" clause to the query.
+     *
+     * @param  string  $column
+     * @param  mixed  $operator
+     * @param  mixed  $value
+     * @param  string  $boolean
+     * @return $this
+     */
+    public function whereJsonLength($column, $operator, $value = null, $boolean = 'and')
+    {
+        $type = 'JsonLength';
+
+        [$value, $operator] = $this->prepareValueAndOperator(
+            $value, $operator, func_num_args() === 2
+        );
+
+        $this->wheres[] = compact('type', 'column', 'operator', 'value', 'boolean');
+
+        if (! $value instanceof Expression) {
+            $this->addBinding($value);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add a "or where JSON length" clause to the query.
+     *
+     * @param  string  $column
+     * @param  mixed  $operator
+     * @param  mixed  $value
+     * @return $this
+     */
+    public function orWhereJsonLength($column, $operator, $value = null)
+    {
+        [$value, $operator] = $this->prepareValueAndOperator(
+            $value, $operator, func_num_args() === 2
+        );
+
+        return $this->whereJsonLength($column, $operator, $value, 'or');
+    }
+
     /**
      * Handles dynamic "where" clauses to the query.
      *
@@ -1343,15 +1652,15 @@ class Builder
         // Here we will make some assumptions about the operator. If only 2 values are
         // passed to the method, we will assume that the operator is an equals sign
         // and keep going. Otherwise, we'll require the operator to be passed in.
-        list($value, $operator) = $this->prepareValueAndOperator(
-            $value, $operator, func_num_args() == 2
+        [$value, $operator] = $this->prepareValueAndOperator(
+            $value, $operator, func_num_args() === 2
         );
 
         // If the given operator is not found in the list of valid operators we will
         // assume that the developer is just short-cutting the '=' operators and
         // we will set the operators to '=' and set the values appropriately.
         if ($this->invalidOperator($operator)) {
-            list($value, $operator) = [$operator, '='];
+            [$value, $operator] = [$operator, '='];
         }
 
         $this->havings[] = compact('type', 'column', 'operator', 'value', 'boolean');
@@ -1373,6 +1682,10 @@ class Builder
      */
     public function orHaving($column, $operator = null, $value = null)
     {
+        [$value, $operator] = $this->prepareValueAndOperator(
+            $value, $operator, func_num_args() === 2
+        );
+
         return $this->having($column, $operator, $value, 'or');
     }
 
@@ -1556,7 +1869,7 @@ class Builder
      * Constrain the query to the next "page" of results after a given ID.
      *
      * @param  int  $perPage
-     * @param  int  $lastId
+     * @param  int|null  $lastId
      * @param  string  $column
      * @return \Illuminate\Database\Query\Builder|static
      */
@@ -1564,8 +1877,11 @@ class Builder
     {
         $this->orders = $this->removeExistingOrdersFor($column);
 
-        return $this->where($column, '>', $lastId)
-                    ->orderBy($column, 'asc')
+        if (! is_null($lastId)) {
+            $this->where($column, '>', $lastId);
+        }
+
+        return $this->orderBy($column, 'asc')
                     ->take($perPage);
     }
 
@@ -1695,17 +2011,9 @@ class Builder
      */
     public function get($columns = ['*'])
     {
-        $original = $this->columns;
-
-        if (is_null($original)) {
-            $this->columns = $columns;
-        }
-
-        $results = $this->processor->processSelect($this, $this->runSelect());
-
-        $this->columns = $original;
-
-        return collect($results);
+        return collect($this->onceWithColumns($columns, function () {
+            return $this->processor->processSelect($this, $this->runSelect());
+        }));
     }
 
     /**
@@ -1813,7 +2121,7 @@ class Builder
     protected function withoutSelectAliases(array $columns)
     {
         return array_map(function ($column) {
-            return is_string($column) && ($aliasPosition = strpos(strtolower($column), ' as ')) !== false
+            return is_string($column) && ($aliasPosition = stripos($column, ' as ')) !== false
                     ? substr($column, 0, $aliasPosition) : $column;
         }, $columns);
     }
@@ -1840,14 +2148,14 @@ class Builder
      * @param  int  $count
      * @param  callable  $callback
      * @param  string  $column
-     * @param  string  $alias
+     * @param  string|null  $alias
      * @return bool
      */
     public function chunkById($count, callable $callback, $column = 'id', $alias = null)
     {
         $alias = $alias ?: $column;
 
-        $lastId = 0;
+        $lastId = null;
 
         do {
             $clone = clone $this;
@@ -1901,15 +2209,32 @@ class Builder
      */
     public function pluck($column, $key = null)
     {
-        $results = $this->get(is_null($key) ? [$column] : [$column, $key]);
+        // First, we will need to select the results of the query accounting for the
+        // given columns / key. Once we have the results, we will be able to take
+        // the results and get the exact data that was requested for the query.
+        $queryResult = $this->onceWithColumns(
+            is_null($key) ? [$column] : [$column, $key],
+            function () {
+                return $this->processor->processSelect(
+                    $this, $this->runSelect()
+                );
+            }
+        );
+
+        if (empty($queryResult)) {
+            return collect();
+        }
 
         // If the columns are qualified with a table or have an alias, we cannot use
         // those directly in the "pluck" operations since the results from the DB
         // are only keyed by the column itself. We'll strip the table out here.
-        return $results->pluck(
-            $this->stripTableForPluck($column),
-            $this->stripTableForPluck($key)
-        );
+        $column = $this->stripTableForPluck($column);
+
+        $key = $this->stripTableForPluck($key);
+
+        return is_array($queryResult[0])
+                    ? $this->pluckFromArrayColumn($queryResult, $column, $key)
+                    : $this->pluckFromObjectColumn($queryResult, $column, $key);
     }
 
     /**
@@ -1923,6 +2248,56 @@ class Builder
         return is_null($column) ? $column : last(preg_split('~\.| ~', $column));
     }
 
+    /**
+     * Retrieve column values from rows represented as objects.
+     *
+     * @param  array  $queryResult
+     * @param  string $column
+     * @param  string $key
+     * @return \Illuminate\Support\Collection
+     */
+    protected function pluckFromObjectColumn($queryResult, $column, $key)
+    {
+        $results = [];
+
+        if (is_null($key)) {
+            foreach ($queryResult as $row) {
+                $results[] = $row->$column;
+            }
+        } else {
+            foreach ($queryResult as $row) {
+                $results[$row->$key] = $row->$column;
+            }
+        }
+
+        return collect($results);
+    }
+
+    /**
+     * Retrieve column values from rows represented as arrays.
+     *
+     * @param  array  $queryResult
+     * @param  string $column
+     * @param  string $key
+     * @return \Illuminate\Support\Collection
+     */
+    protected function pluckFromArrayColumn($queryResult, $column, $key)
+    {
+        $results = [];
+
+        if (is_null($key)) {
+            foreach ($queryResult as $row) {
+                $results[] = $row[$column];
+            }
+        } else {
+            foreach ($queryResult as $row) {
+                $results[$row[$key]] = $row[$column];
+            }
+        }
+
+        return collect($results);
+    }
+
     /**
      * Concatenate values of a given column as a string.
      *
@@ -2104,6 +2479,30 @@ class Builder
         return $this;
     }
 
+    /**
+     * Execute the given callback while selecting the given columns.
+     *
+     * After running the callback, the columns are reset to the original value.
+     *
+     * @param  array  $columns
+     * @param  callable  $callback
+     * @return mixed
+     */
+    protected function onceWithColumns($columns, $callback)
+    {
+        $original = $this->columns;
+
+        if (is_null($original)) {
+            $this->columns = $columns;
+        }
+
+        $result = $callback();
+
+        $this->columns = $original;
+
+        return $result;
+    }
+
     /**
      * Insert a new record into the database.
      *
@@ -2194,7 +2593,7 @@ class Builder
      * Increment a column's value by a given amount.
      *
      * @param  string  $column
-     * @param  int     $amount
+     * @param  float|int  $amount
      * @param  array   $extra
      * @return int
      */
@@ -2215,7 +2614,7 @@ class Builder
      * Decrement a column's value by a given amount.
      *
      * @param  string  $column
-     * @param  int     $amount
+     * @param  float|int  $amount
      * @param  array   $extra
      * @return int
      */
@@ -2478,8 +2877,6 @@ class Builder
             return $this->dynamicWhere($method, $parameters);
         }
 
-        $className = static::class;
-
-        throw new BadMethodCallException("Call to undefined method {$className}::{$method}()");
+        static::throwBadMethodCallException($method);
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/Grammar.php b/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/Grammar.php
index 63770ce8..29b08be0 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/Grammar.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/Grammar.php
@@ -2,7 +2,9 @@
 
 namespace Illuminate\Database\Query\Grammars;
 
+use RuntimeException;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Illuminate\Database\Query\Builder;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Database\Grammar as BaseGrammar;
@@ -79,7 +81,7 @@ class Grammar extends BaseGrammar
             // To compile the query, we'll spin through each component of the query and
             // see if that component exists. If it does we'll just call the compiler
             // function for the component which is responsible for making the SQL.
-            if (! is_null($query->$component)) {
+            if (isset($query->$component) && ! is_null($query->$component)) {
                 $method = 'compile'.ucfirst($component);
 
                 $sql[$component] = $this->$method($query, $query->$component);
@@ -152,10 +154,12 @@ class Grammar extends BaseGrammar
      */
     protected function compileJoins(Builder $query, $joins)
     {
-        return collect($joins)->map(function ($join) {
+        return collect($joins)->map(function ($join) use ($query) {
             $table = $this->wrapTable($join->table);
 
-            return trim("{$join->type} join {$table} {$this->compileWheres($join)}");
+            $nestedJoins = is_null($join->joins) ? '' : ' '.$this->compileJoins($query, $join->joins);
+
+            return trim("{$join->type} join {$table}{$nestedJoins} {$this->compileWheres($join)}");
         })->implode(' ');
     }
 
@@ -328,7 +332,11 @@ class Grammar extends BaseGrammar
     {
         $between = $where['not'] ? 'not between' : 'between';
 
-        return $this->wrap($where['column']).' '.$between.' ? and ?';
+        $min = $this->parameter(reset($where['values']));
+
+        $max = $this->parameter(end($where['values']));
+
+        return $this->wrap($where['column']).' '.$between.' '.$min.' and '.$max;
     }
 
     /**
@@ -473,6 +481,92 @@ class Grammar extends BaseGrammar
         return 'not exists ('.$this->compileSelect($where['query']).')';
     }
 
+    /**
+     * Compile a where row values condition.
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query
+     * @param  array  $where
+     * @return string
+     */
+    protected function whereRowValues(Builder $query, $where)
+    {
+        $columns = $this->columnize($where['columns']);
+
+        $values = $this->parameterize($where['values']);
+
+        return '('.$columns.') '.$where['operator'].' ('.$values.')';
+    }
+
+    /**
+     * Compile a "where JSON contains" clause.
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query
+     * @param  array  $where
+     * @return string
+     */
+    protected function whereJsonContains(Builder $query, $where)
+    {
+        $not = $where['not'] ? 'not ' : '';
+
+        return $not.$this->compileJsonContains(
+            $where['column'], $this->parameter($where['value'])
+        );
+    }
+
+    /**
+     * Compile a "JSON contains" statement into SQL.
+     *
+     * @param  string  $column
+     * @param  string  $value
+     * @return string
+     *
+     * @throws \RuntimeException
+     */
+    protected function compileJsonContains($column, $value)
+    {
+        throw new RuntimeException('This database engine does not support JSON contains operations.');
+    }
+
+    /**
+     * Prepare the binding for a "JSON contains" statement.
+     *
+     * @param  mixed  $binding
+     * @return string
+     */
+    public function prepareBindingForJsonContains($binding)
+    {
+        return json_encode($binding);
+    }
+
+    /**
+     * Compile a "where JSON length" clause.
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query
+     * @param  array  $where
+     * @return string
+     */
+    protected function whereJsonLength(Builder $query, $where)
+    {
+        return $this->compileJsonLength(
+            $where['column'], $where['operator'], $this->parameter($where['value'])
+        );
+    }
+
+    /**
+     * Compile a "JSON length" statement into SQL.
+     *
+     * @param  string  $column
+     * @param  string  $operator
+     * @param  string  $value
+     * @return string
+     *
+     * @throws \RuntimeException
+     */
+    protected function compileJsonLength($column, $operator, $value)
+    {
+        throw new RuntimeException('This database engine does not support JSON length operations.');
+    }
+
     /**
      * Compile the "group by" portions of the query.
      *
@@ -636,9 +730,9 @@ class Grammar extends BaseGrammar
      */
     protected function compileUnion(array $union)
     {
-        $conjuction = $union['all'] ? ' union all ' : ' union ';
+        $conjunction = $union['all'] ? ' union all ' : ' union ';
 
-        return $conjuction.$union['query']->toSql();
+        return $conjunction.$union['query']->toSql();
     }
 
     /**
@@ -827,6 +921,86 @@ class Grammar extends BaseGrammar
         return 'ROLLBACK TO SAVEPOINT '.$name;
     }
 
+    /**
+     * Wrap a value in keyword identifiers.
+     *
+     * @param  \Illuminate\Database\Query\Expression|string  $value
+     * @param  bool    $prefixAlias
+     * @return string
+     */
+    public function wrap($value, $prefixAlias = false)
+    {
+        if ($this->isExpression($value)) {
+            return $this->getValue($value);
+        }
+
+        // If the value being wrapped has a column alias we will need to separate out
+        // the pieces so we can wrap each of the segments of the expression on its
+        // own, and then join these both back together using the "as" connector.
+        if (stripos($value, ' as ') !== false) {
+            return $this->wrapAliasedValue($value, $prefixAlias);
+        }
+
+        // If the given value is a JSON selector we will wrap it differently than a
+        // traditional value. We will need to split this path and wrap each part
+        // wrapped, etc. Otherwise, we will simply wrap the value as a string.
+        if ($this->isJsonSelector($value)) {
+            return $this->wrapJsonSelector($value);
+        }
+
+        return $this->wrapSegments(explode('.', $value));
+    }
+
+    /**
+     * Wrap the given JSON selector.
+     *
+     * @param  string  $value
+     * @return string
+     */
+    protected function wrapJsonSelector($value)
+    {
+        throw new RuntimeException('This database engine does not support JSON operations.');
+    }
+
+    /**
+     * Split the given JSON selector into the field and the optional path and wrap them separately.
+     *
+     * @param  string  $column
+     * @return array
+     */
+    protected function wrapJsonFieldAndPath($column)
+    {
+        $parts = explode('->', $column, 2);
+
+        $field = $this->wrap($parts[0]);
+
+        $path = count($parts) > 1 ? ', '.$this->wrapJsonPath($parts[1]) : '';
+
+        return [$field, $path];
+    }
+
+    /**
+     * Wrap the given JSON path.
+     *
+     * @param  string  $value
+     * @return string
+     */
+    protected function wrapJsonPath($value)
+    {
+        return '\'$."'.str_replace('->', '"."', $value).'"\'';
+    }
+
+    /**
+     * Determine if the given string is a JSON selector.
+     *
+     * @param  string  $value
+     * @return bool
+     */
+    protected function isJsonSelector($value)
+    {
+        return Str::contains($value, '->');
+    }
+
     /**
      * Concatenate an array of segments, removing empties.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/MySqlGrammar.php b/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/MySqlGrammar.php
index 8dff604a..9bc33286 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/MySqlGrammar.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/MySqlGrammar.php
@@ -9,6 +9,13 @@ use Illuminate\Database\Query\JsonExpression;
 
 class MySqlGrammar extends Grammar
 {
+    /**
+     * The grammar specific operators.
+     *
+     * @var array
+     */
+    protected $operators = ['sounds like'];
+
     /**
      * The components that make up a select clause.
      *
@@ -45,6 +52,33 @@ class MySqlGrammar extends Grammar
         return $sql;
     }
 
+    /**
+     * Compile a "JSON contains" statement into SQL.
+     *
+     * @param  string  $column
+     * @param  string  $value
+     * @return string
+     */
+    protected function compileJsonContains($column, $value)
+    {
+        return 'json_contains('.$this->wrap($column).', '.$value.')';
+    }
+
+    /**
+     * Compile a "JSON length" statement into SQL.
+     *
+     * @param  string  $column
+     * @param  string  $operator
+     * @param  string  $value
+     * @return string
+     */
+    protected function compileJsonLength($column, $operator, $value)
+    {
+        [$field, $path] = $this->wrapJsonFieldAndPath($column);
+
+        return 'json_length('.$field.$path.') '.$operator.' '.$value;
+    }
+
     /**
      * Compile a single union statement.
      *
@@ -53,9 +87,9 @@ class MySqlGrammar extends Grammar
      */
     protected function compileUnion(array $union)
     {
-        $conjuction = $union['all'] ? ' union all ' : ' union ';
+        $conjunction = $union['all'] ? ' union all ' : ' union ';
 
-        return $conjuction.'('.$union['query']->toSql().')';
+        return $conjunction.'('.$union['query']->toSql().')';
     }
 
     /**
@@ -160,13 +194,9 @@ class MySqlGrammar extends Grammar
      */
     protected function compileJsonUpdateColumn($key, JsonExpression $value)
     {
-        $path = explode('->', $key);
-
-        $field = $this->wrapValue(array_shift($path));
+        [$field, $path] = $this->wrapJsonFieldAndPath($key);
 
-        $accessor = "'$.\"".implode('"."', $path)."\"'";
-
-        return "{$field} = json_set({$field}, {$accessor}, {$value->getValue()})";
+        return "{$field} = json_set({$field}{$path}, {$value->getValue()})";
     }
 
     /**
@@ -181,8 +211,7 @@ class MySqlGrammar extends Grammar
     public function prepareBindingsForUpdate(array $bindings, array $values)
     {
         $values = collect($values)->reject(function ($value, $column) {
-            return $this->isJsonSelector($column) &&
-                in_array(gettype($value), ['boolean', 'integer', 'double']);
+            return $this->isJsonSelector($column) && is_bool($value);
         })->all();
 
         return parent::prepareBindingsForUpdate($bindings, $values);
@@ -258,7 +287,7 @@ class MySqlGrammar extends Grammar
     {
         $joins = ' '.$this->compileJoins($query, $query->joins);
 
-        $alias = strpos(strtolower($table), ' as ') !== false
+        $alias = stripos($table, ' as ') !== false
                 ? explode(' as ', $table)[1] : $table;
 
         return trim("delete {$alias} from {$table}{$joins} {$where}");
@@ -272,18 +301,7 @@ class MySqlGrammar extends Grammar
      */
     protected function wrapValue($value)
     {
-        if ($value === '*') {
-            return $value;
-        }
-
-        // If the given value is a JSON selector we will wrap it differently than a
-        // traditional value. We will need to split this path and wrap each part
-        // wrapped, etc. Otherwise, we will simply wrap the value as a string.
-        if ($this->isJsonSelector($value)) {
-            return $this->wrapJsonSelector($value);
-        }
-
-        return '`'.str_replace('`', '``', $value).'`';
+        return $value === '*' ? $value : '`'.str_replace('`', '``', $value).'`';
     }
 
     /**
@@ -294,23 +312,16 @@ class MySqlGrammar extends Grammar
      */
     protected function wrapJsonSelector($value)
     {
-        $path = explode('->', $value);
+        $delimiter = Str::contains($value, '->>')
+            ? '->>'
+            : '->';
+
+        $path = explode($delimiter, $value);
 
-        $field = $this->wrapValue(array_shift($path));
+        $field = $this->wrapSegments(explode('.', array_shift($path)));
 
-        return sprintf('%s->\'$.%s\'', $field, collect($path)->map(function ($part) {
+        return sprintf('%s'.$delimiter.'\'$.%s\'', $field, collect($path)->map(function ($part) {
             return '"'.$part.'"';
         })->implode('.'));
     }
-
-    /**
-     * Determine if the given string is a JSON selector.
-     *
-     * @param  string  $value
-     * @return bool
-     */
-    protected function isJsonSelector($value)
-    {
-        return Str::contains($value, '->');
-    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/PostgresGrammar.php b/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/PostgresGrammar.php
index 37e91dd4..d9350ef7 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/PostgresGrammar.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/PostgresGrammar.php
@@ -15,11 +15,33 @@ class PostgresGrammar extends Grammar
      */
     protected $operators = [
         '=', '<', '>', '<=', '>=', '<>', '!=',
-        'like', 'not like', 'ilike',
-        '&', '|', '#', '<<', '>>', '>>=', '=<<',
+        'like', 'not like', 'between', 'ilike', 'not ilike',
+        '~', '&', '|', '#', '<<', '>>', '<<=', '>>=',
         '&&', '@>', '<@', '?', '?|', '?&', '||', '-', '-', '#-',
+        'is distinct from', 'is not distinct from',
     ];
 
+    /**
+     * {@inheritdoc}
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query
+     * @param  array  $where
+     * @return string
+     */
+    protected function whereBasic(Builder $query, $where)
+    {
+        if (Str::contains(strtolower($where['operator']), 'like')) {
+            return sprintf(
+                '%s::text %s %s',
+                $this->wrap($where['column']),
+                $where['operator'],
+                $this->parameter($where['value'])
+            );
+        }
+
+        return parent::whereBasic($query, $where);
+    }
+
     /**
      * Compile a "where date" clause.
      *
@@ -63,6 +85,35 @@ class PostgresGrammar extends Grammar
         return 'extract('.$type.' from '.$this->wrap($where['column']).') '.$where['operator'].' '.$value;
     }
 
+    /**
+     * Compile a "JSON contains" statement into SQL.
+     *
+     * @param  string  $column
+     * @param  string  $value
+     * @return string
+     */
+    protected function compileJsonContains($column, $value)
+    {
+        $column = str_replace('->>', '->', $this->wrap($column));
+
+        return '('.$column.')::jsonb @> '.$value;
+    }
+
+    /**
+     * Compile a "JSON length" statement into SQL.
+     *
+     * @param  string  $column
+     * @param  string  $operator
+     * @param  string  $value
+     * @return string
+     */
+    protected function compileJsonLength($column, $operator, $value)
+    {
+        $column = str_replace('->>', '->', $this->wrap($column));
+
+        return 'json_array_length(('.$column.')::json) '.$operator.' '.$value;
+    }
+
     /**
      * Compile the lock into SQL.
      *
@@ -143,10 +194,32 @@ class PostgresGrammar extends Grammar
         // columns and convert it to a parameter value. Then we will concatenate a
         // list of the columns that can be added into this update query clauses.
         return collect($values)->map(function ($value, $key) {
+            if ($this->isJsonSelector($key)) {
+                return $this->compileJsonUpdateColumn($key, $value);
+            }
+
             return $this->wrap($key).' = '.$this->parameter($value);
         })->implode(', ');
     }
 
+    /**
+     * Prepares a JSON column being updated using the JSONB_SET function.
+     *
+     * @param  string  $key
+     * @param  mixed  $value
+     * @return string
+     */
+    protected function compileJsonUpdateColumn($key, $value)
+    {
+        $parts = explode('->', $key);
+
+        $field = $this->wrap(array_shift($parts));
+
+        $path = '\'{"'.implode('","', $parts).'"}\'';
+
+        return "{$field} = jsonb_set({$field}::jsonb, {$path}, {$this->parameter($value)})";
+    }
+
     /**
      * Compile the "from" clause for an update with a join.
      *
@@ -230,6 +303,12 @@ class PostgresGrammar extends Grammar
      */
     public function prepareBindingsForUpdate(array $bindings, array $values)
     {
+        $values = collect($values)->map(function ($value, $column) {
+            return $this->isJsonSelector($column) && ! $this->isExpression($value)
+                ? json_encode($value)
+                : $value;
+        })->all();
+
         // Update statements with "joins" in Postgres use an interesting syntax. We need to
         // take all of the bindings and put them on the end of this array since they are
         // added to the end of the "where" clause statements as typical where clauses.
@@ -260,7 +339,6 @@ class PostgresGrammar extends Grammar
      *
      * @param  \Illuminate\Database\Query\Builder  $query
      * @param  string  $table
-     * @param  array  $where
      * @return string
      */
     protected function compileDeleteWithJoins($query, $table)
@@ -285,28 +363,6 @@ class PostgresGrammar extends Grammar
         return ['truncate '.$this->wrapTable($query->from).' restart identity' => []];
     }
 
-    /**
-     * Wrap a single string in keyword identifiers.
-     *
-     * @param  string  $value
-     * @return string
-     */
-    protected function wrapValue($value)
-    {
-        if ($value === '*') {
-            return $value;
-        }
-
-        // If the given value is a JSON selector we will wrap it differently than a
-        // traditional value. We will need to split this path and wrap each part
-        // wrapped, etc. Otherwise, we will simply wrap the value as a string.
-        if (Str::contains($value, '->')) {
-            return $this->wrapJsonSelector($value);
-        }
-
-        return '"'.str_replace('"', '""', $value).'"';
-    }
-
     /**
      * Wrap the given JSON selector.
      *
@@ -317,7 +373,7 @@ class PostgresGrammar extends Grammar
     {
         $path = explode('->', $value);
 
-        $field = $this->wrapValue(array_shift($path));
+        $field = $this->wrapSegments(explode('.', array_shift($path)));
 
         $wrappedPath = $this->wrapJsonPathAttributes($path);
 
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php b/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php
index cd57081d..a5f38ffa 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php
@@ -2,6 +2,8 @@
 
 namespace Illuminate\Database\Query\Grammars;
 
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Illuminate\Database\Query\Builder;
 
 class SQLiteGrammar extends Grammar
@@ -61,9 +63,9 @@ class SQLiteGrammar extends Grammar
      */
     protected function compileUnion(array $union)
     {
-        $conjuction = $union['all'] ? ' union all ' : ' union ';
+        $conjunction = $union['all'] ? ' union all ' : ' union ';
 
-        return $conjuction.'select * from ('.$union['query']->toSql().')';
+        return $conjunction.'select * from ('.$union['query']->toSql().')';
     }
 
     /**
@@ -136,11 +138,24 @@ class SQLiteGrammar extends Grammar
      */
     protected function dateBasedWhere($type, Builder $query, $where)
     {
-        $value = str_pad($where['value'], 2, '0', STR_PAD_LEFT);
+        $value = $this->parameter($where['value']);
 
-        $value = $this->parameter($value);
+        return "strftime('{$type}', {$this->wrap($where['column'])}) {$where['operator']} cast({$value} as text)";
+    }
+
+    /**
+     * Compile a "JSON length" statement into SQL.
+     *
+     * @param  string  $column
+     * @param  string  $operator
+     * @param  string  $value
+     * @return string
+     */
+    protected function compileJsonLength($column, $operator, $value)
+    {
+        [$field, $path] = $this->wrapJsonFieldAndPath($column);
 
-        return "strftime('{$type}', {$this->wrap($where['column'])}) {$where['operator']} {$value}";
+        return 'json_array_length('.$field.$path.') '.$operator.' '.$value;
     }
 
     /**
@@ -164,7 +179,7 @@ class SQLiteGrammar extends Grammar
         // If there is only one record being inserted, we will just use the usual query
         // grammar insert builder because no special syntax is needed for the single
         // row inserts in SQLite. However, if there are multiples, we'll continue.
-        if (count($values) == 1) {
+        if (count($values) === 1) {
             return empty(reset($values))
                     ? "insert into $table default values"
                     : parent::compileInsert($query, reset($values));
@@ -186,6 +201,80 @@ class SQLiteGrammar extends Grammar
         return "insert into $table ($names) select ".implode(' union all select ', $columns);
     }
 
+    /**
+     * Compile an update statement into SQL.
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query
+     * @param  array  $values
+     * @return string
+     */
+    public function compileUpdate(Builder $query, $values)
+    {
+        $table = $this->wrapTable($query->from);
+
+        $columns = collect($values)->map(function ($value, $key) use ($query) {
+            return $this->wrap(Str::after($key, $query->from.'.')).' = '.$this->parameter($value);
+        })->implode(', ');
+
+        if (isset($query->joins) || isset($query->limit)) {
+            $selectSql = parent::compileSelect($query->select("{$query->from}.rowid"));
+
+            return "update {$table} set $columns where {$this->wrap('rowid')} in ({$selectSql})";
+        }
+
+        return trim("update {$table} set {$columns} {$this->compileWheres($query)}");
+    }
+
+    /**
+     * Prepare the bindings for an update statement.
+     *
+     * @param  array  $bindings
+     * @param  array  $values
+     * @return array
+     */
+    public function prepareBindingsForUpdate(array $bindings, array $values)
+    {
+        $cleanBindings = Arr::except($bindings, ['select', 'join']);
+
+        return array_values(
+            array_merge($values, $bindings['join'], Arr::flatten($cleanBindings))
+        );
+    }
+
+    /**
+     * Compile a delete statement into SQL.
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query
+     * @return string
+     */
+    public function compileDelete(Builder $query)
+    {
+        if (isset($query->joins) || isset($query->limit)) {
+            $selectSql = parent::compileSelect($query->select("{$query->from}.rowid"));
+
+            return "delete from {$this->wrapTable($query->from)} where {$this->wrap('rowid')} in ({$selectSql})";
+        }
+
+        $wheres = is_array($query->wheres) ? $this->compileWheres($query) : '';
+
+        return trim("delete from {$this->wrapTable($query->from)} $wheres");
+    }
+
+    /**
+     * Prepare the bindings for a delete statement.
+     *
+     * @param  array  $bindings
+     * @return array
+     */
+    public function prepareBindingsForDelete(array $bindings)
+    {
+        $cleanBindings = Arr::except($bindings, ['select', 'join']);
+
+        return array_values(
+            array_merge($bindings['join'], Arr::flatten($cleanBindings))
+        );
+    }
+
     /**
      * Compile a truncate table statement into SQL.
      *
@@ -199,4 +288,23 @@ class SQLiteGrammar extends Grammar
             'delete from '.$this->wrapTable($query->from) => [],
         ];
     }
+
+    /**
+     * Wrap the given JSON selector.
+     *
+     * @param  string  $value
+     * @return string
+     */
+    protected function wrapJsonSelector($value)
+    {
+        $parts = explode('->', $value, 2);
+
+        $field = $this->wrap($parts[0]);
+
+        $path = count($parts) > 1 ? ', '.$this->wrapJsonPath($parts[1]) : '';
+
+        $selector = 'json_extract('.$field.$path.')';
+
+        return $selector;
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php b/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php
index dfefda3a..b2aff7b1 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php
@@ -103,6 +103,60 @@ class SqlServerGrammar extends Grammar
         return 'cast('.$this->wrap($where['column']).' as date) '.$where['operator'].' '.$value;
     }
 
+    /**
+     * Compile a "where time" clause.
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query
+     * @param  array  $where
+     * @return string
+     */
+    protected function whereTime(Builder $query, $where)
+    {
+        $value = $this->parameter($where['value']);
+
+        return 'cast('.$this->wrap($where['column']).' as time) '.$where['operator'].' '.$value;
+    }
+
+    /**
+     * Compile a "JSON contains" statement into SQL.
+     *
+     * @param  string  $column
+     * @param  string  $value
+     * @return string
+     */
+    protected function compileJsonContains($column, $value)
+    {
+        [$field, $path] = $this->wrapJsonFieldAndPath($column);
+
+        return $value.' in (select [value] from openjson('.$field.$path.'))';
+    }
+
+    /**
+     * Prepare the binding for a "JSON contains" statement.
+     *
+     * @param  mixed  $binding
+     * @return string
+     */
+    public function prepareBindingForJsonContains($binding)
+    {
+        return is_bool($binding) ? json_encode($binding) : $binding;
+    }
+
+    /**
+     * Compile a "JSON length" statement into SQL.
+     *
+     * @param  string  $column
+     * @param  string  $operator
+     * @param  string  $value
+     * @return string
+     */
+    protected function compileJsonLength($column, $operator, $value)
+    {
+        [$field, $path] = $this->wrapJsonFieldAndPath($column);
+
+        return '(select count(*) from openjson('.$field.$path.')) '.$operator.' '.$value;
+    }
+
     /**
      * Create a full ANSI offset clause for the query.
      *
@@ -156,7 +210,7 @@ class SqlServerGrammar extends Grammar
     {
         $constraint = $this->compileRowConstraint($query);
 
-        return "select * from ({$sql}) as temp_table where row_num {$constraint}";
+        return "select * from ({$sql}) as temp_table where row_num {$constraint} order by row_num";
     }
 
     /**
@@ -269,7 +323,7 @@ class SqlServerGrammar extends Grammar
     {
         $joins = ' '.$this->compileJoins($query, $query->joins);
 
-        $alias = strpos(strtolower($table), ' as ') !== false
+        $alias = stripos($table, ' as ') !== false
                 ? explode(' as ', $table)[1] : $table;
 
         return trim("delete {$alias} from {$table}{$joins} {$where}");
@@ -295,7 +349,7 @@ class SqlServerGrammar extends Grammar
      */
     public function compileUpdate(Builder $query, $values)
     {
-        list($table, $alias) = $this->parseUpdateTable($query->from);
+        [$table, $alias] = $this->parseUpdateTable($query->from);
 
         // Each one of the columns in the update statements needs to be wrapped in the
         // keyword identifiers, also a place-holder needs to be created for each of
@@ -335,7 +389,7 @@ class SqlServerGrammar extends Grammar
     {
         $table = $alias = $this->wrapTable($table);
 
-        if (strpos(strtolower($table), '] as [') !== false) {
+        if (stripos($table, '] as [') !== false) {
             $alias = '['.explode('] as [', $table)[1];
         }
 
@@ -414,6 +468,21 @@ class SqlServerGrammar extends Grammar
         return $value === '*' ? $value : '['.str_replace(']', ']]', $value).']';
     }
 
+    /**
+     * Wrap the given JSON selector.
+     *
+     * @param  string  $value
+     * @return string
+     */
+    protected function wrapJsonSelector($value)
+    {
+        $parts = explode('->', $value, 2);
+
+        $field = $this->wrapSegments(explode('.', array_shift($parts)));
+
+        return 'json_value('.$field.', '.$this->wrapJsonPath($parts[0]).')';
+    }
+
     /**
      * Wrap a table in keyword identifiers.
      *
@@ -422,7 +491,11 @@ class SqlServerGrammar extends Grammar
      */
     public function wrapTable($table)
     {
-        return $this->wrapTableValuedFunction(parent::wrapTable($table));
+        if (! $this->isExpression($table)) {
+            return $this->wrapTableValuedFunction(parent::wrapTable($table));
+        }
+
+        return $this->getValue($table);
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Query/JsonExpression.php b/vendor/laravel/framework/src/Illuminate/Database/Query/JsonExpression.php
index 12635ffc..3718a7c2 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Query/JsonExpression.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Query/JsonExpression.php
@@ -27,12 +27,16 @@ class JsonExpression extends Expression
      */
     protected function getJsonBindingParameter($value)
     {
+        if ($value instanceof Expression) {
+            return $value->getValue();
+        }
+
         switch ($type = gettype($value)) {
             case 'boolean':
                 return $value ? 'true' : 'false';
+            case 'NULL':
             case 'integer':
             case 'double':
-                return $value;
             case 'string':
                 return '?';
             case 'object':
@@ -40,6 +44,6 @@ class JsonExpression extends Expression
                 return '?';
         }
 
-        throw new InvalidArgumentException('JSON value is of illegal type: '.$type);
+        throw new InvalidArgumentException("JSON value is of illegal type: {$type}");
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/SqlServerProcessor.php b/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/SqlServerProcessor.php
index 65140c49..4912d9d9 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/SqlServerProcessor.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Query/Processors/SqlServerProcessor.php
@@ -37,6 +37,7 @@ class SqlServerProcessor extends Processor
      *
      * @param  \Illuminate\Database\Connection  $connection
      * @return int
+     *
      * @throws \Exception
      */
     protected function processInsertGetIdForOdbc(Connection $connection)
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Schema/Blueprint.php b/vendor/laravel/framework/src/Illuminate/Database/Schema/Blueprint.php
index 2342cec2..97eaaf07 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Schema/Blueprint.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Schema/Blueprint.php
@@ -3,9 +3,11 @@
 namespace Illuminate\Database\Schema;
 
 use Closure;
+use BadMethodCallException;
 use Illuminate\Support\Fluent;
 use Illuminate\Database\Connection;
 use Illuminate\Support\Traits\Macroable;
+use Illuminate\Database\SQLiteConnection;
 use Illuminate\Database\Schema\Grammars\Grammar;
 
 class Blueprint
@@ -19,10 +21,17 @@ class Blueprint
      */
     protected $table;
 
+    /**
+     * The prefix of the table.
+     *
+     * @var string
+     */
+    protected $prefix;
+
     /**
      * The columns that should be added to the table.
      *
-     * @var \Illuminate\Support\Fluent[]
+     * @var \Illuminate\Database\Schema\ColumnDefinition[]
      */
     protected $columns = [];
 
@@ -62,11 +71,13 @@ class Blueprint
      *
      * @param  string  $table
      * @param  \Closure|null  $callback
+     * @param  string  $prefix
      * @return void
      */
-    public function __construct($table, Closure $callback = null)
+    public function __construct($table, Closure $callback = null, $prefix = '')
     {
         $this->table = $table;
+        $this->prefix = $prefix;
 
         if (! is_null($callback)) {
             $callback($this);
@@ -96,13 +107,15 @@ class Blueprint
      */
     public function toSql(Connection $connection, Grammar $grammar)
     {
-        $this->addImpliedCommands();
+        $this->addImpliedCommands($grammar);
 
         $statements = [];
 
         // Each type of command has a corresponding compiler function on the schema
         // grammar which is used to build the necessary SQL statements to build
         // the blueprint element, so we'll just call that compilers function.
+        $this->ensureCommandsAreValid($connection);
+
         foreach ($this->commands as $command) {
             $method = 'compile'.ucfirst($command->name);
 
@@ -116,12 +129,49 @@ class Blueprint
         return $statements;
     }
 
+    /**
+     * Ensure the commands on the blueprint are valid for the connection type.
+     *
+     * @param  \Illuminate\Database\Connection  $connection
+     * @return void
+     */
+    protected function ensureCommandsAreValid(Connection $connection)
+    {
+        if ($connection instanceof SQLiteConnection) {
+            if ($this->commandsNamed(['dropColumn', 'renameColumn'])->count() > 1) {
+                throw new BadMethodCallException(
+                    "SQLite doesn't support multiple calls to dropColumn / renameColumn in a single modification."
+                );
+            }
+
+            if ($this->commandsNamed(['dropForeign'])->count() > 0) {
+                throw new BadMethodCallException(
+                    "SQLite doesn't support dropping foreign keys (you would need to re-create the table)."
+                );
+            }
+        }
+    }
+
+    /**
+     * Get all of the commands matching the given names.
+     *
+     * @param  array  $names
+     * @return \Illuminate\Support\Collection
+     */
+    protected function commandsNamed(array $names)
+    {
+        return collect($this->commands)->filter(function ($command) use ($names) {
+            return in_array($command->name, $names);
+        });
+    }
+
     /**
      * Add the commands that are implied by the blueprint's state.
      *
+     * @param  \Illuminate\Database\Schema\Grammars\Grammar  $grammar
      * @return void
      */
-    protected function addImpliedCommands()
+    protected function addImpliedCommands(Grammar $grammar)
     {
         if (count($this->getAddedColumns()) > 0 && ! $this->creating()) {
             array_unshift($this->commands, $this->createCommand('add'));
@@ -132,6 +182,8 @@ class Blueprint
         }
 
         $this->addFluentIndexes();
+
+        $this->addFluentCommands($grammar);
     }
 
     /**
@@ -164,6 +216,31 @@ class Blueprint
         }
     }
 
+    /**
+     * Add the fluent commands specified on any columns.
+     *
+     * @param  \Illuminate\Database\Schema\Grammars\Grammar  $grammar
+     * @return void
+     */
+    public function addFluentCommands(Grammar $grammar)
+    {
+        foreach ($this->columns as $column) {
+            foreach ($grammar->getFluentCommands() as $commandName) {
+                $attributeName = lcfirst($commandName);
+
+                if (! isset($column->{$attributeName})) {
+                    continue;
+                }
+
+                $value = $column->{$attributeName};
+
+                $this->addCommand(
+                    $commandName, compact('value', 'column')
+                );
+            }
+        }
+    }
+
     /**
      * Determine if the blueprint has a create command.
      *
@@ -296,6 +373,18 @@ class Blueprint
         return $this->dropIndexCommand('dropForeign', 'foreign', $index);
     }
 
+    /**
+     * Indicate that the given indexes should be renamed.
+     *
+     * @param  string  $from
+     * @param  string  $to
+     * @return \Illuminate\Support\Fluent
+     */
+    public function renameIndex($from, $to)
+    {
+        return $this->addCommand('renameIndex', compact('from', 'to'));
+    }
+
     /**
      * Indicate that the timestamp columns should be dropped.
      *
@@ -319,21 +408,23 @@ class Blueprint
     /**
      * Indicate that the soft delete column should be dropped.
      *
+     * @param  string  $column
      * @return void
      */
-    public function dropSoftDeletes()
+    public function dropSoftDeletes($column = 'deleted_at')
     {
-        $this->dropColumn('deleted_at');
+        $this->dropColumn($column);
     }
 
     /**
      * Indicate that the soft delete column should be dropped.
      *
+     * @param  string  $column
      * @return void
      */
-    public function dropSoftDeletesTz()
+    public function dropSoftDeletesTz($column = 'deleted_at')
     {
-        $this->dropSoftDeletes();
+        $this->dropSoftDeletes($column);
     }
 
     /**
@@ -346,6 +437,20 @@ class Blueprint
         $this->dropColumn('remember_token');
     }
 
+    /**
+     * Indicate that the polymorphic columns should be dropped.
+     *
+     * @param  string  $name
+     * @param  string|null  $indexName
+     * @return void
+     */
+    public function dropMorphs($name, $indexName = null)
+    {
+        $this->dropIndex($indexName ?: $this->createIndexName('index', ["{$name}_type", "{$name}_id"]));
+
+        $this->dropColumn("{$name}_type", "{$name}_id");
+    }
+
     /**
      * Rename the table to a given name.
      *
@@ -424,7 +529,7 @@ class Blueprint
      * Create a new auto-incrementing integer (4-byte) column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function increments($column)
     {
@@ -435,7 +540,7 @@ class Blueprint
      * Create a new auto-incrementing tiny integer (1-byte) column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function tinyIncrements($column)
     {
@@ -446,7 +551,7 @@ class Blueprint
      * Create a new auto-incrementing small integer (2-byte) column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function smallIncrements($column)
     {
@@ -457,7 +562,7 @@ class Blueprint
      * Create a new auto-incrementing medium integer (3-byte) column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function mediumIncrements($column)
     {
@@ -468,7 +573,7 @@ class Blueprint
      * Create a new auto-incrementing big integer (8-byte) column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function bigIncrements($column)
     {
@@ -480,7 +585,7 @@ class Blueprint
      *
      * @param  string  $column
      * @param  int  $length
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function char($column, $length = null)
     {
@@ -494,7 +599,7 @@ class Blueprint
      *
      * @param  string  $column
      * @param  int  $length
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function string($column, $length = null)
     {
@@ -507,7 +612,7 @@ class Blueprint
      * Create a new text column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function text($column)
     {
@@ -518,7 +623,7 @@ class Blueprint
      * Create a new medium text column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function mediumText($column)
     {
@@ -529,7 +634,7 @@ class Blueprint
      * Create a new long text column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function longText($column)
     {
@@ -542,7 +647,7 @@ class Blueprint
      * @param  string  $column
      * @param  bool  $autoIncrement
      * @param  bool  $unsigned
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function integer($column, $autoIncrement = false, $unsigned = false)
     {
@@ -555,7 +660,7 @@ class Blueprint
      * @param  string  $column
      * @param  bool  $autoIncrement
      * @param  bool  $unsigned
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function tinyInteger($column, $autoIncrement = false, $unsigned = false)
     {
@@ -568,7 +673,7 @@ class Blueprint
      * @param  string  $column
      * @param  bool  $autoIncrement
      * @param  bool  $unsigned
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function smallInteger($column, $autoIncrement = false, $unsigned = false)
     {
@@ -581,7 +686,7 @@ class Blueprint
      * @param  string  $column
      * @param  bool  $autoIncrement
      * @param  bool  $unsigned
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function mediumInteger($column, $autoIncrement = false, $unsigned = false)
     {
@@ -594,7 +699,7 @@ class Blueprint
      * @param  string  $column
      * @param  bool  $autoIncrement
      * @param  bool  $unsigned
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function bigInteger($column, $autoIncrement = false, $unsigned = false)
     {
@@ -606,7 +711,7 @@ class Blueprint
      *
      * @param  string  $column
      * @param  bool  $autoIncrement
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function unsignedInteger($column, $autoIncrement = false)
     {
@@ -618,7 +723,7 @@ class Blueprint
      *
      * @param  string  $column
      * @param  bool  $autoIncrement
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function unsignedTinyInteger($column, $autoIncrement = false)
     {
@@ -630,7 +735,7 @@ class Blueprint
      *
      * @param  string  $column
      * @param  bool  $autoIncrement
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function unsignedSmallInteger($column, $autoIncrement = false)
     {
@@ -642,7 +747,7 @@ class Blueprint
      *
      * @param  string  $column
      * @param  bool  $autoIncrement
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function unsignedMediumInteger($column, $autoIncrement = false)
     {
@@ -654,7 +759,7 @@ class Blueprint
      *
      * @param  string  $column
      * @param  bool  $autoIncrement
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function unsignedBigInteger($column, $autoIncrement = false)
     {
@@ -667,7 +772,7 @@ class Blueprint
      * @param  string  $column
      * @param  int  $total
      * @param  int  $places
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function float($column, $total = 8, $places = 2)
     {
@@ -680,7 +785,7 @@ class Blueprint
      * @param  string  $column
      * @param  int|null  $total
      * @param  int|null  $places
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function double($column, $total = null, $places = null)
     {
@@ -693,7 +798,7 @@ class Blueprint
      * @param  string  $column
      * @param  int  $total
      * @param  int  $places
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function decimal($column, $total = 8, $places = 2)
     {
@@ -706,7 +811,7 @@ class Blueprint
      * @param  string  $column
      * @param  int  $total
      * @param  int  $places
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function unsignedDecimal($column, $total = 8, $places = 2)
     {
@@ -719,7 +824,7 @@ class Blueprint
      * Create a new boolean column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function boolean($column)
     {
@@ -731,7 +836,7 @@ class Blueprint
      *
      * @param  string  $column
      * @param  array  $allowed
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function enum($column, array $allowed)
     {
@@ -742,7 +847,7 @@ class Blueprint
      * Create a new json column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function json($column)
     {
@@ -753,7 +858,7 @@ class Blueprint
      * Create a new jsonb column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function jsonb($column)
     {
@@ -764,7 +869,7 @@ class Blueprint
      * Create a new date column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function date($column)
     {
@@ -776,7 +881,7 @@ class Blueprint
      *
      * @param  string  $column
      * @param  int  $precision
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function dateTime($column, $precision = 0)
     {
@@ -788,7 +893,7 @@ class Blueprint
      *
      * @param  string  $column
      * @param  int  $precision
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function dateTimeTz($column, $precision = 0)
     {
@@ -800,7 +905,7 @@ class Blueprint
      *
      * @param  string  $column
      * @param  int  $precision
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function time($column, $precision = 0)
     {
@@ -812,7 +917,7 @@ class Blueprint
      *
      * @param  string  $column
      * @param  int  $precision
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function timeTz($column, $precision = 0)
     {
@@ -824,7 +929,7 @@ class Blueprint
      *
      * @param  string  $column
      * @param  int  $precision
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function timestamp($column, $precision = 0)
     {
@@ -836,7 +941,7 @@ class Blueprint
      *
      * @param  string  $column
      * @param  int  $precision
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function timestampTz($column, $precision = 0)
     {
@@ -887,7 +992,7 @@ class Blueprint
      *
      * @param  string  $column
      * @param  int  $precision
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function softDeletes($column = 'deleted_at', $precision = 0)
     {
@@ -897,19 +1002,20 @@ class Blueprint
     /**
      * Add a "deleted at" timestampTz for the table.
      *
+     * @param  string  $column
      * @param  int  $precision
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
-    public function softDeletesTz($precision = 0)
+    public function softDeletesTz($column = 'deleted_at', $precision = 0)
     {
-        return $this->timestampTz('deleted_at', $precision)->nullable();
+        return $this->timestampTz($column, $precision)->nullable();
     }
 
     /**
      * Create a new year column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function year($column)
     {
@@ -920,7 +1026,7 @@ class Blueprint
      * Create a new binary column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function binary($column)
     {
@@ -931,7 +1037,7 @@ class Blueprint
      * Create a new uuid column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function uuid($column)
     {
@@ -942,7 +1048,7 @@ class Blueprint
      * Create a new IP address column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function ipAddress($column)
     {
@@ -953,7 +1059,7 @@ class Blueprint
      * Create a new MAC address column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function macAddress($column)
     {
@@ -964,7 +1070,7 @@ class Blueprint
      * Create a new geometry column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function geometry($column)
     {
@@ -975,18 +1081,19 @@ class Blueprint
      * Create a new point column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @param  int|null  $srid
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
-    public function point($column)
+    public function point($column, $srid = null)
     {
-        return $this->addColumn('point', $column);
+        return $this->addColumn('point', $column, compact('srid'));
     }
 
     /**
      * Create a new linestring column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function lineString($column)
     {
@@ -997,7 +1104,7 @@ class Blueprint
      * Create a new polygon column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function polygon($column)
     {
@@ -1008,7 +1115,7 @@ class Blueprint
      * Create a new geometrycollection column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function geometryCollection($column)
     {
@@ -1019,7 +1126,7 @@ class Blueprint
      * Create a new multipoint column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function multiPoint($column)
     {
@@ -1030,7 +1137,7 @@ class Blueprint
      * Create a new multilinestring column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function multiLineString($column)
     {
@@ -1041,7 +1148,7 @@ class Blueprint
      * Create a new multipolygon column on the table.
      *
      * @param  string  $column
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function multiPolygon($column)
     {
@@ -1057,11 +1164,11 @@ class Blueprint
      */
     public function morphs($name, $indexName = null)
     {
-        $this->unsignedInteger("{$name}_id");
-
         $this->string("{$name}_type");
 
-        $this->index(["{$name}_id", "{$name}_type"], $indexName);
+        $this->unsignedBigInteger("{$name}_id");
+
+        $this->index(["{$name}_type", "{$name}_id"], $indexName);
     }
 
     /**
@@ -1073,17 +1180,17 @@ class Blueprint
      */
     public function nullableMorphs($name, $indexName = null)
     {
-        $this->unsignedInteger("{$name}_id")->nullable();
-
         $this->string("{$name}_type")->nullable();
 
-        $this->index(["{$name}_id", "{$name}_type"], $indexName);
+        $this->unsignedBigInteger("{$name}_id")->nullable();
+
+        $this->index(["{$name}_type", "{$name}_id"], $indexName);
     }
 
     /**
      * Adds the `remember_token` column to the table.
      *
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function rememberToken()
     {
@@ -1144,7 +1251,7 @@ class Blueprint
      */
     protected function createIndexName($type, array $columns)
     {
-        $index = strtolower($this->table.'_'.implode('_', $columns).'_'.$type);
+        $index = strtolower($this->prefix.$this->table.'_'.implode('_', $columns).'_'.$type);
 
         return str_replace(['-', '.'], '_', $index);
     }
@@ -1155,11 +1262,11 @@ class Blueprint
      * @param  string  $type
      * @param  string  $name
      * @param  array  $parameters
-     * @return \Illuminate\Support\Fluent
+     * @return \Illuminate\Database\Schema\ColumnDefinition
      */
     public function addColumn($type, $name, array $parameters = [])
     {
-        $this->columns[] = $column = new Fluent(
+        $this->columns[] = $column = new ColumnDefinition(
             array_merge(compact('type', 'name'), $parameters)
         );
 
@@ -1220,7 +1327,7 @@ class Blueprint
     /**
      * Get the columns on the blueprint.
      *
-     * @return \Illuminate\Support\Fluent[]
+     * @return \Illuminate\Database\Schema\ColumnDefinition[]
      */
     public function getColumns()
     {
@@ -1240,7 +1347,7 @@ class Blueprint
     /**
      * Get the columns on the blueprint that should be added.
      *
-     * @return \Illuminate\Support\Fluent[]
+     * @return \Illuminate\Database\Schema\ColumnDefinition[]
      */
     public function getAddedColumns()
     {
@@ -1252,7 +1359,7 @@ class Blueprint
     /**
      * Get the columns on the blueprint that should be changed.
      *
-     * @return \Illuminate\Support\Fluent[]
+     * @return \Illuminate\Database\Schema\ColumnDefinition[]
      */
     public function getChangedColumns()
     {
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Schema/Builder.php b/vendor/laravel/framework/src/Illuminate/Database/Schema/Builder.php
index 82201153..2e25cf0c 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Schema/Builder.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Schema/Builder.php
@@ -69,7 +69,7 @@ class Builder
     {
         $table = $this->connection->getTablePrefix().$table;
 
-        return count($this->connection->select(
+        return count($this->connection->selectFromWriteConnection(
             $this->grammar->compileTableExists(), [$table]
         )) > 0;
     }
@@ -130,7 +130,7 @@ class Builder
      */
     public function getColumnListing($table)
     {
-        $results = $this->connection->select($this->grammar->compileColumnListing(
+        $results = $this->connection->selectFromWriteConnection($this->grammar->compileColumnListing(
             $this->connection->getTablePrefix().$table
         ));
 
@@ -203,6 +203,18 @@ class Builder
         throw new LogicException('This database driver does not support dropping all tables.');
     }
 
+    /**
+     * Drop all views from the database.
+     *
+     * @return void
+     *
+     * @throws \LogicException
+     */
+    public function dropAllViews()
+    {
+        throw new LogicException('This database driver does not support dropping all views.');
+    }
+
     /**
      * Rename a table on the schema.
      *
@@ -261,11 +273,15 @@ class Builder
      */
     protected function createBlueprint($table, Closure $callback = null)
     {
+        $prefix = $this->connection->getConfig('prefix_indexes')
+                    ? $this->connection->getConfig('prefix')
+                    : '';
+
         if (isset($this->resolver)) {
-            return call_user_func($this->resolver, $table, $callback);
+            return call_user_func($this->resolver, $table, $callback, $prefix);
         }
 
-        return new Blueprint($table, $callback);
+        return new Blueprint($table, $callback, $prefix);
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Schema/ColumnDefinition.php b/vendor/laravel/framework/src/Illuminate/Database/Schema/ColumnDefinition.php
new file mode 100644
index 00000000..9b6db32c
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Database/Schema/ColumnDefinition.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Illuminate\Database\Schema;
+
+use Illuminate\Support\Fluent;
+
+/**
+ * Class ColumnDefinition.
+ * @method ColumnDefinition after(string $column) Place the column "after" another column (MySQL)
+ * @method ColumnDefinition autoIncrement() Set INTEGER columns as auto-increment (primary key)
+ * @method ColumnDefinition charset(string $charset) Specify a character set for the column (MySQL)
+ * @method ColumnDefinition collation(string $collation) Specify a collation for the column (MySQL/SQL Server)
+ * @method ColumnDefinition comment(string $comment) Add a comment to the column (MySQL)
+ * @method ColumnDefinition default(string $value) Specify a "default" value for the column
+ * @method ColumnDefinition first(string $column) Place the column "first" in the table (MySQL)
+ * @method ColumnDefinition nullable($value = true) Allow NULL values to be inserted into the column
+ * @method ColumnDefinition storedAs($expression) Create a stored generated column (MySQL)
+ * @method ColumnDefinition unique() Add a unique index
+ * @method ColumnDefinition unsigned() Set the INTEGER column as UNSIGNED (MySQL)
+ * @method ColumnDefinition useCurrent() Set the TIMESTAMP column to use CURRENT_TIMESTAMP as default value
+ * @method ColumnDefinition virtualAs(string $expression) Create a virtual generated column (MySQL)
+ */
+class ColumnDefinition extends Fluent
+{
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/ChangeColumn.php b/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/ChangeColumn.php
index 4751ecbe..45a217f2 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/ChangeColumn.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/ChangeColumn.php
@@ -118,6 +118,12 @@ class ChangeColumn
             $options['length'] = static::calculateDoctrineTextLength($fluent['type']);
         }
 
+        if ($fluent['type'] == 'json') {
+            $options['customSchemaOptions'] = [
+                'collation' => '',
+            ];
+        }
+
         return $options;
     }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/Grammar.php b/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/Grammar.php
index ddd38385..1ea4dabc 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/Grammar.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/Grammar.php
@@ -19,6 +19,13 @@ abstract class Grammar extends BaseGrammar
      */
     protected $transactions = false;
 
+    /**
+     * The commands to be executed outside of create or alter command.
+     *
+     * @var array
+     */
+    protected $fluentCommands = [];
+
     /**
      * Compile a rename column command.
      *
@@ -243,6 +250,16 @@ abstract class Grammar extends BaseGrammar
         });
     }
 
+    /**
+     * Get the fluent commands for the grammar.
+     *
+     * @return array
+     */
+    public function getFluentCommands()
+    {
+        return $this->fluentCommands;
+    }
+
     /**
      * Check if this Grammar supports schema changes wrapped in a transaction.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php b/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php
index 149f300a..2e5ec247 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php
@@ -15,7 +15,7 @@ class MySqlGrammar extends Grammar
      */
     protected $modifiers = [
         'Unsigned', 'VirtualAs', 'StoredAs', 'Charset', 'Collate', 'Nullable',
-        'Default', 'Increment', 'Comment', 'After', 'First',
+        'Default', 'Increment', 'Comment', 'After', 'First', 'Srid',
     ];
 
     /**
@@ -114,9 +114,9 @@ class MySqlGrammar extends Grammar
         // added to either this create table blueprint or the configuration for this
         // connection that the query is targeting. We'll add it to this SQL query.
         if (isset($blueprint->collation)) {
-            $sql .= ' collate '.$blueprint->collation;
+            $sql .= " collate '{$blueprint->collation}'";
         } elseif (! is_null($collation = $connection->getConfig('collation'))) {
-            $sql .= ' collate '.$collation;
+            $sql .= " collate '{$collation}'";
         }
 
         return $sql;
@@ -342,6 +342,22 @@ class MySqlGrammar extends Grammar
         return "rename table {$from} to ".$this->wrapTable($command->to);
     }
 
+    /**
+     * Compile a rename index command.
+     *
+     * @param  \Illuminate\Database\Schema\Blueprint $blueprint
+     * @param  \Illuminate\Support\Fluent $command
+     * @return string
+     */
+    public function compileRenameIndex(Blueprint $blueprint, Fluent $command)
+    {
+        return sprintf('alter table %s rename index %s to %s',
+            $this->wrapTable($blueprint),
+            $this->wrap($command->from),
+            $this->wrap($command->to)
+        );
+    }
+
     /**
      * Compile the SQL needed to drop all tables.
      *
@@ -353,6 +369,17 @@ class MySqlGrammar extends Grammar
         return 'drop table '.implode(',', $this->wrapArray($tables));
     }
 
+    /**
+     * Compile the SQL needed to drop all views.
+     *
+     * @param  array  $views
+     * @return string
+     */
+    public function compileDropAllViews($views)
+    {
+        return 'drop view '.implode(',', $this->wrapArray($views));
+    }
+
     /**
      * Compile the SQL needed to retrieve all table names.
      *
@@ -363,6 +390,16 @@ class MySqlGrammar extends Grammar
         return 'SHOW FULL TABLES WHERE table_type = \'BASE TABLE\'';
     }
 
+    /**
+     * Compile the SQL needed to retrieve all view names.
+     *
+     * @return string
+     */
+    public function compileGetAllViews()
+    {
+        return 'SHOW FULL TABLES WHERE table_type = \'VIEW\'';
+    }
+
     /**
      * Compile the command to enable foreign key constraints.
      *
@@ -542,14 +579,14 @@ class MySqlGrammar extends Grammar
     }
 
     /**
-     * Create the column definition for an enum type.
+     * Create the column definition for an enumeration type.
      *
      * @param  \Illuminate\Support\Fluent  $column
      * @return string
      */
     protected function typeEnum(Fluent $column)
     {
-        return "enum('".implode("', '", $column->allowed)."')";
+        return sprintf('enum(%s)', $this->quoteString($column->allowed));
     }
 
     /**
@@ -862,7 +899,7 @@ class MySqlGrammar extends Grammar
     protected function modifyCollate(Blueprint $blueprint, Fluent $column)
     {
         if (! is_null($column->collation)) {
-            return ' collate '.$column->collation;
+            return " collate '{$column->collation}'";
         }
     }
 
@@ -950,6 +987,20 @@ class MySqlGrammar extends Grammar
         }
     }
 
+    /**
+     * Get the SQL for a SRID column modifier.
+     *
+     * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
+     * @param  \Illuminate\Support\Fluent  $column
+     * @return string|null
+     */
+    protected function modifySrid(Blueprint $blueprint, Fluent $column)
+    {
+        if (! is_null($column->srid) && is_int($column->srid) && $column->srid > 0) {
+            return ' srid '.$column->srid;
+        }
+    }
+
     /**
      * Wrap a single string in keyword identifiers.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php b/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php
index 5eed79cd..49902a62 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php
@@ -2,7 +2,6 @@
 
 namespace Illuminate\Database\Schema\Grammars;
 
-use RuntimeException;
 use Illuminate\Support\Fluent;
 use Illuminate\Database\Schema\Blueprint;
 
@@ -29,6 +28,13 @@ class PostgresGrammar extends Grammar
      */
     protected $serials = ['bigInteger', 'integer', 'mediumInteger', 'smallInteger', 'tinyInteger'];
 
+    /**
+     * The commands to be executed outside of create or alter command.
+     *
+     * @var array
+     */
+    protected $fluentCommands = ['Comment'];
+
     /**
      * Compile the query to determine if a table exists.
      *
@@ -198,6 +204,17 @@ class PostgresGrammar extends Grammar
         return 'drop table "'.implode('","', $tables).'" cascade';
     }
 
+    /**
+     * Compile the SQL needed to drop all views.
+     *
+     * @param  string  $views
+     * @return string
+     */
+    public function compileDropAllViews($views)
+    {
+        return 'drop view "'.implode('","', $views).'" cascade';
+    }
+
     /**
      * Compile the SQL needed to retrieve all table names.
      *
@@ -209,6 +226,17 @@ class PostgresGrammar extends Grammar
         return "select tablename from pg_catalog.pg_tables where schemaname = '{$schema}'";
     }
 
+    /**
+     * Compile the SQL needed to retrieve all view names.
+     *
+     * @param  string  $schema
+     * @return string
+     */
+    public function compileGetAllViews($schema)
+    {
+        return "select viewname from pg_catalog.pg_views where schemaname = '{$schema}'";
+    }
+
     /**
      * Compile a drop column command.
      *
@@ -303,6 +331,21 @@ class PostgresGrammar extends Grammar
         return "alter table {$from} rename to ".$this->wrapTable($command->to);
     }
 
+    /**
+     * Compile a rename index command.
+     *
+     * @param  \Illuminate\Database\Schema\Blueprint $blueprint
+     * @param  \Illuminate\Support\Fluent $command
+     * @return string
+     */
+    public function compileRenameIndex(Blueprint $blueprint, Fluent $command)
+    {
+        return sprintf('alter index %s rename to %s',
+            $this->wrap($command->from),
+            $this->wrap($command->to)
+        );
+    }
+
     /**
      * Compile the command to enable foreign key constraints.
      *
@@ -323,6 +366,22 @@ class PostgresGrammar extends Grammar
         return 'SET CONSTRAINTS ALL DEFERRED;';
     }
 
+    /**
+     * Compile a comment command.
+     *
+     * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
+     * @param  \Illuminate\Support\Fluent  $command
+     * @return string
+     */
+    public function compileComment(Blueprint $blueprint, Fluent $command)
+    {
+        return sprintf('comment on column %s.%s is %s',
+            $this->wrapTable($blueprint),
+            $this->wrap($command->column->name),
+            "'".str_replace("'", "''", $command->value)."'"
+        );
+    }
+
     /**
      * Create the column definition for a char type.
      *
@@ -489,18 +548,18 @@ class PostgresGrammar extends Grammar
     }
 
     /**
-     * Create the column definition for an enum type.
+     * Create the column definition for an enumeration type.
      *
      * @param  \Illuminate\Support\Fluent  $column
      * @return string
      */
     protected function typeEnum(Fluent $column)
     {
-        $allowed = array_map(function ($a) {
-            return "'{$a}'";
-        }, $column->allowed);
-
-        return "varchar(255) check (\"{$column->name}\" in (".implode(', ', $allowed).'))';
+        return sprintf(
+            'varchar(255) check ("%s" in (%s))',
+            $column->name,
+            $this->quoteString($column->allowed)
+        );
     }
 
     /**
@@ -665,11 +724,11 @@ class PostgresGrammar extends Grammar
      * Create the column definition for a spatial Geometry type.
      *
      * @param  \Illuminate\Support\Fluent  $column
-     * @throws \RuntimeException
+     * @return string
      */
     protected function typeGeometry(Fluent $column)
     {
-        throw new RuntimeException('The database driver in use does not support the Geometry spatial column type.');
+        return $this->formatPostGisType('geometry');
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/SQLiteGrammar.php b/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/SQLiteGrammar.php
index 27e372d5..d6ef59db 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/SQLiteGrammar.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/SQLiteGrammar.php
@@ -3,7 +3,9 @@
 namespace Illuminate\Database\Schema\Grammars;
 
 use RuntimeException;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Fluent;
+use Doctrine\DBAL\Schema\Index;
 use Illuminate\Database\Connection;
 use Illuminate\Database\Schema\Blueprint;
 
@@ -84,7 +86,7 @@ class SQLiteGrammar extends Grammar
 
             // If this foreign key specifies the action to be taken on update we will add
             // that to the statement here. We'll append it to this SQL and then return
-            // the SQL so we can keep adding any other foreign consraints onto this.
+            // the SQL so we can keep adding any other foreign constraints onto this.
             if (! is_null($foreign->onUpdate)) {
                 $sql .= " on update {$foreign->onUpdate}";
             }
@@ -177,6 +179,7 @@ class SQLiteGrammar extends Grammar
      *
      * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
      * @param  \Illuminate\Support\Fluent  $command
+     *
      * @throws \RuntimeException
      */
     public function compileSpatialIndex(Blueprint $blueprint, Fluent $command)
@@ -230,6 +233,26 @@ class SQLiteGrammar extends Grammar
         return "delete from sqlite_master where type in ('table', 'index', 'trigger')";
     }
 
+    /**
+     * Compile the SQL needed to drop all views.
+     *
+     * @return string
+     */
+    public function compileDropAllViews()
+    {
+        return "delete from sqlite_master where type in ('view')";
+    }
+
+    /**
+     * Compile the SQL needed to rebuild the database.
+     *
+     * @return string
+     */
+    public function compileRebuild()
+    {
+        return 'vacuum';
+    }
+
     /**
      * Compile a drop column command.
      *
@@ -286,6 +309,7 @@ class SQLiteGrammar extends Grammar
      *
      * @param  \Illuminate\Database\Schema\Blueprint  $blueprint
      * @param  \Illuminate\Support\Fluent  $command
+     *
      * @throws \RuntimeException
      */
     public function compileDropSpatialIndex(Blueprint $blueprint, Fluent $command)
@@ -307,6 +331,39 @@ class SQLiteGrammar extends Grammar
         return "alter table {$from} rename to ".$this->wrapTable($command->to);
     }
 
+    /**
+     * Compile a rename index command.
+     *
+     * @param  \Illuminate\Database\Schema\Blueprint $blueprint
+     * @param  \Illuminate\Support\Fluent $command
+     * @param  \Illuminate\Database\Connection $connection
+     * @return array
+     */
+    public function compileRenameIndex(Blueprint $blueprint, Fluent $command, Connection $connection)
+    {
+        $schemaManager = $connection->getDoctrineSchemaManager();
+
+        $indexes = $schemaManager->listTableIndexes($this->getTablePrefix().$blueprint->getTable());
+
+        $index = Arr::get($indexes, $command->from);
+
+        if (! $index) {
+            throw new RuntimeException("Index [{$command->from}] does not exist.");
+        }
+
+        $newIndex = new Index(
+            $command->to, $index->getColumns(), $index->isUnique(),
+            $index->isPrimary(), $index->getFlags(), $index->getOptions()
+        );
+
+        $platform = $schemaManager->getDatabasePlatform();
+
+        return [
+            $platform->getDropIndexSQL($command->from, $this->getTablePrefix().$blueprint->getTable()),
+            $platform->getCreateIndexSQL($newIndex, $this->getTablePrefix().$blueprint->getTable()),
+        ];
+    }
+
     /**
      * Compile the command to enable foreign key constraints.
      *
@@ -502,14 +559,18 @@ class SQLiteGrammar extends Grammar
     }
 
     /**
-     * Create the column definition for an enum type.
+     * Create the column definition for an enumeration type.
      *
      * @param  \Illuminate\Support\Fluent  $column
      * @return string
      */
     protected function typeEnum(Fluent $column)
     {
-        return 'varchar';
+        return sprintf(
+            'varchar check ("%s" in (%s))',
+            $column->name,
+            $this->quoteString($column->allowed)
+        );
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php b/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php
index 40a21c1d..38f55fcf 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php
@@ -277,6 +277,21 @@ class SqlServerGrammar extends Grammar
         return "sp_rename {$from}, ".$this->wrapTable($command->to);
     }
 
+    /**
+     * Compile a rename index command.
+     *
+     * @param  \Illuminate\Database\Schema\Blueprint $blueprint
+     * @param  \Illuminate\Support\Fluent $command
+     * @return string
+     */
+    public function compileRenameIndex(Blueprint $blueprint, Fluent $command)
+    {
+        return sprintf("sp_rename N'%s', %s, N'INDEX'",
+            $this->wrap($blueprint->getTable().'.'.$command->from),
+            $this->wrap($command->to)
+        );
+    }
+
     /**
      * Compile the command to enable foreign key constraints.
      *
@@ -452,14 +467,18 @@ class SqlServerGrammar extends Grammar
     }
 
     /**
-     * Create the column definition for an enum type.
+     * Create the column definition for an enumeration type.
      *
      * @param  \Illuminate\Support\Fluent  $column
      * @return string
      */
     protected function typeEnum(Fluent $column)
     {
-        return 'nvarchar(255)';
+        return sprintf(
+            'nvarchar(255) check ("%s" in (%s))',
+            $column->name,
+            $this->quoteString($column->allowed)
+        );
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Schema/MySqlBuilder.php b/vendor/laravel/framework/src/Illuminate/Database/Schema/MySqlBuilder.php
index 7e4c6d2b..85f3e92c 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Schema/MySqlBuilder.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Schema/MySqlBuilder.php
@@ -64,6 +64,30 @@ class MySqlBuilder extends Builder
         $this->enableForeignKeyConstraints();
     }
 
+    /**
+     * Drop all views from the database.
+     *
+     * @return void
+     */
+    public function dropAllViews()
+    {
+        $views = [];
+
+        foreach ($this->getAllViews() as $row) {
+            $row = (array) $row;
+
+            $views[] = reset($row);
+        }
+
+        if (empty($views)) {
+            return;
+        }
+
+        $this->connection->statement(
+            $this->grammar->compileDropAllViews($views)
+        );
+    }
+
     /**
      * Get all of the table names for the database.
      *
@@ -75,4 +99,16 @@ class MySqlBuilder extends Builder
             $this->grammar->compileGetAllTables()
         );
     }
+
+    /**
+     * Get all of the view names for the database.
+     *
+     * @return array
+     */
+    protected function getAllViews()
+    {
+        return $this->connection->select(
+            $this->grammar->compileGetAllViews()
+        );
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Schema/PostgresBuilder.php b/vendor/laravel/framework/src/Illuminate/Database/Schema/PostgresBuilder.php
index 8fa0a2c1..bdeb972a 100755
--- a/vendor/laravel/framework/src/Illuminate/Database/Schema/PostgresBuilder.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Schema/PostgresBuilder.php
@@ -12,7 +12,7 @@ class PostgresBuilder extends Builder
      */
     public function hasTable($table)
     {
-        list($schema, $table) = $this->parseSchemaAndTable($table);
+        [$schema, $table] = $this->parseSchemaAndTable($table);
 
         $table = $this->connection->getTablePrefix().$table;
 
@@ -51,6 +51,30 @@ class PostgresBuilder extends Builder
         );
     }
 
+    /**
+     * Drop all views from the database.
+     *
+     * @return void
+     */
+    public function dropAllViews()
+    {
+        $views = [];
+
+        foreach ($this->getAllViews() as $row) {
+            $row = (array) $row;
+
+            $views[] = reset($row);
+        }
+
+        if (empty($views)) {
+            return;
+        }
+
+        $this->connection->statement(
+            $this->grammar->compileDropAllViews($views)
+        );
+    }
+
     /**
      * Get all of the table names for the database.
      *
@@ -63,6 +87,18 @@ class PostgresBuilder extends Builder
         );
     }
 
+    /**
+     * Get all of the view names for the database.
+     *
+     * @return array
+     */
+    protected function getAllViews()
+    {
+        return $this->connection->select(
+            $this->grammar->compileGetAllViews($this->connection->getConfig('schema'))
+        );
+    }
+
     /**
      * Get the column listing for a given table.
      *
@@ -71,7 +107,7 @@ class PostgresBuilder extends Builder
      */
     public function getColumnListing($table)
     {
-        list($schema, $table) = $this->parseSchemaAndTable($table);
+        [$schema, $table] = $this->parseSchemaAndTable($table);
 
         $table = $this->connection->getTablePrefix().$table;
 
diff --git a/vendor/laravel/framework/src/Illuminate/Database/Schema/SQLiteBuilder.php b/vendor/laravel/framework/src/Illuminate/Database/Schema/SQLiteBuilder.php
index 8cfacc11..78b6b9c7 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/Schema/SQLiteBuilder.php
+++ b/vendor/laravel/framework/src/Illuminate/Database/Schema/SQLiteBuilder.php
@@ -20,6 +20,24 @@ class SQLiteBuilder extends Builder
         $this->connection->select($this->grammar->compileDropAllTables());
 
         $this->connection->select($this->grammar->compileDisableWriteableSchema());
+
+        $this->connection->select($this->grammar->compileRebuild());
+    }
+
+    /**
+     * Drop all views from the database.
+     *
+     * @return void
+     */
+    public function dropAllViews()
+    {
+        $this->connection->select($this->grammar->compileEnableWriteableSchema());
+
+        $this->connection->select($this->grammar->compileDropAllViews());
+
+        $this->connection->select($this->grammar->compileDisableWriteableSchema());
+
+        $this->connection->select($this->grammar->compileRebuild());
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Database/composer.json b/vendor/laravel/framework/src/Illuminate/Database/composer.json
index 153abad6..81ef3b47 100644
--- a/vendor/laravel/framework/src/Illuminate/Database/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Database/composer.json
@@ -15,10 +15,10 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/container": "5.5.*",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/support": "5.5.*"
+        "php": "^7.1.3",
+        "illuminate/container": "5.7.*",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/support": "5.7.*"
     },
     "autoload": {
         "psr-4": {
@@ -27,16 +27,16 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "suggest": {
-        "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.5).",
-        "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).",
-        "illuminate/console": "Required to use the database commands (5.5.*).",
-        "illuminate/events": "Required to use the observers with Eloquent (5.5.*).",
-        "illuminate/filesystem": "Required to use the migrations (5.5.*).",
-        "illuminate/pagination": "Required to paginate the result set (5.5.*)."
+        "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).",
+        "fzaninotto/faker": "Required to use the eloquent factory builder (^1.4).",
+        "illuminate/console": "Required to use the database commands (5.7.*).",
+        "illuminate/events": "Required to use the observers with Eloquent (5.7.*).",
+        "illuminate/filesystem": "Required to use the migrations (5.7.*).",
+        "illuminate/pagination": "Required to paginate the result set (5.7.*)."
     },
     "config": {
         "sort-packages": true
diff --git a/vendor/laravel/framework/src/Illuminate/Encryption/Encrypter.php b/vendor/laravel/framework/src/Illuminate/Encryption/Encrypter.php
index df89e48f..5f80599a 100755
--- a/vendor/laravel/framework/src/Illuminate/Encryption/Encrypter.php
+++ b/vendor/laravel/framework/src/Illuminate/Encryption/Encrypter.php
@@ -125,7 +125,7 @@ class Encrypter implements EncrypterContract
      *
      * @param  mixed  $payload
      * @param  bool  $unserialize
-     * @return string
+     * @return mixed
      *
      * @throws \Illuminate\Contracts\Encryption\DecryptException
      */
diff --git a/vendor/laravel/framework/src/Illuminate/Encryption/EncryptionServiceProvider.php b/vendor/laravel/framework/src/Illuminate/Encryption/EncryptionServiceProvider.php
index d75d95a7..ad7b93d4 100755
--- a/vendor/laravel/framework/src/Illuminate/Encryption/EncryptionServiceProvider.php
+++ b/vendor/laravel/framework/src/Illuminate/Encryption/EncryptionServiceProvider.php
@@ -34,6 +34,8 @@ class EncryptionServiceProvider extends ServiceProvider
      *
      * @param  array  $config
      * @return string
+     *
+     * @throws \RuntimeException
      */
     protected function key(array $config)
     {
diff --git a/vendor/laravel/framework/src/Illuminate/Encryption/composer.json b/vendor/laravel/framework/src/Illuminate/Encryption/composer.json
index 0887e6fa..09eb4c74 100644
--- a/vendor/laravel/framework/src/Illuminate/Encryption/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Encryption/composer.json
@@ -14,11 +14,11 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
+        "php": "^7.1.3",
         "ext-mbstring": "*",
         "ext-openssl": "*",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/support": "5.5.*"
+        "illuminate/contracts": "5.7.*",
+        "illuminate/support": "5.7.*"
     },
     "autoload": {
         "psr-4": {
@@ -27,7 +27,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "config": {
diff --git a/vendor/laravel/framework/src/Illuminate/Events/CallQueuedListener.php b/vendor/laravel/framework/src/Illuminate/Events/CallQueuedListener.php
index a66b4f99..be0fee3a 100644
--- a/vendor/laravel/framework/src/Illuminate/Events/CallQueuedListener.php
+++ b/vendor/laravel/framework/src/Illuminate/Events/CallQueuedListener.php
@@ -96,7 +96,7 @@ class CallQueuedListener implements ShouldQueue
      */
     protected function setJobInstanceIfNecessary(Job $job, $instance)
     {
-        if (in_array(InteractsWithQueue::class, class_uses_recursive(get_class($instance)))) {
+        if (in_array(InteractsWithQueue::class, class_uses_recursive($instance))) {
             $instance->setJob($job);
         }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Events/Dispatcher.php b/vendor/laravel/framework/src/Illuminate/Events/Dispatcher.php
index d99031cf..8fb73bac 100755
--- a/vendor/laravel/framework/src/Illuminate/Events/Dispatcher.php
+++ b/vendor/laravel/framework/src/Illuminate/Events/Dispatcher.php
@@ -36,6 +36,13 @@ class Dispatcher implements DispatcherContract
      */
     protected $wildcards = [];
 
+    /**
+     * The cached wildcard listeners.
+     *
+     * @var array
+     */
+    protected $wildcardsCache = [];
+
     /**
      * The queue resolver instance.
      *
@@ -82,6 +89,8 @@ class Dispatcher implements DispatcherContract
     protected function setupWildcardListen($event, $listener)
     {
         $this->wildcards[$event][] = $this->makeListener($listener, true);
+
+        $this->wildcardsCache = [];
     }
 
     /**
@@ -186,7 +195,7 @@ class Dispatcher implements DispatcherContract
         // When the given "event" is actually an object we will assume it is an event
         // object and use the class as the event name and this event itself as the
         // payload to the handler, which makes object based events quite simple.
-        list($event, $payload) = $this->parseEventAndPayload(
+        [$event, $payload] = $this->parseEventAndPayload(
             $event, $payload
         );
 
@@ -229,7 +238,7 @@ class Dispatcher implements DispatcherContract
     protected function parseEventAndPayload($event, $payload)
     {
         if (is_object($event)) {
-            list($payload, $event) = [[$event], get_class($event)];
+            [$payload, $event] = [[$event], get_class($event)];
         }
 
         return [$event, Arr::wrap($payload)];
@@ -282,7 +291,8 @@ class Dispatcher implements DispatcherContract
         $listeners = $this->listeners[$eventName] ?? [];
 
         $listeners = array_merge(
-            $listeners, $this->getWildcardListeners($eventName)
+            $listeners,
+            $this->wildcardsCache[$eventName] ?? $this->getWildcardListeners($eventName)
         );
 
         return class_exists($eventName, false)
@@ -306,7 +316,7 @@ class Dispatcher implements DispatcherContract
             }
         }
 
-        return $wildcards;
+        return $this->wildcardsCache[$eventName] = $wildcards;
     }
 
     /**
@@ -379,7 +389,7 @@ class Dispatcher implements DispatcherContract
      */
     protected function createClassCallable($listener)
     {
-        list($class, $method) = $this->parseClassCallable($listener);
+        [$class, $method] = $this->parseClassCallable($listener);
 
         if ($this->handlerShouldBeQueued($class)) {
             return $this->createQueuedHandlerCallable($class, $method);
@@ -462,7 +472,7 @@ class Dispatcher implements DispatcherContract
      */
     protected function queueHandler($class, $method, $arguments)
     {
-        list($listener, $job) = $this->createListenerAndJob($class, $method, $arguments);
+        [$listener, $job] = $this->createListenerAndJob($class, $method, $arguments);
 
         $connection = $this->resolveQueue()->connection(
             $listener->connection ?? null
diff --git a/vendor/laravel/framework/src/Illuminate/Events/composer.json b/vendor/laravel/framework/src/Illuminate/Events/composer.json
index 772cab00..cba2e0fe 100755
--- a/vendor/laravel/framework/src/Illuminate/Events/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Events/composer.json
@@ -14,10 +14,10 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/container": "5.5.*",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/support": "5.5.*"
+        "php": "^7.1.3",
+        "illuminate/container": "5.7.*",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/support": "5.7.*"
     },
     "autoload": {
         "psr-4": {
@@ -26,7 +26,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "config": {
diff --git a/vendor/laravel/framework/src/Illuminate/Filesystem/Filesystem.php b/vendor/laravel/framework/src/Illuminate/Filesystem/Filesystem.php
index 75ce9d08..b458500e 100644
--- a/vendor/laravel/framework/src/Illuminate/Filesystem/Filesystem.php
+++ b/vendor/laravel/framework/src/Illuminate/Filesystem/Filesystem.php
@@ -387,7 +387,7 @@ class Filesystem
     public function files($directory, $hidden = false)
     {
         return iterator_to_array(
-            Finder::create()->files()->ignoreDotFiles(! $hidden)->in($directory)->depth(0),
+            Finder::create()->files()->ignoreDotFiles(! $hidden)->in($directory)->depth(0)->sortByName(),
             false
         );
     }
@@ -402,7 +402,7 @@ class Filesystem
     public function allFiles($directory, $hidden = false)
     {
         return iterator_to_array(
-            Finder::create()->files()->ignoreDotFiles(! $hidden)->in($directory),
+            Finder::create()->files()->ignoreDotFiles(! $hidden)->in($directory)->sortByName(),
             false
         );
     }
@@ -417,7 +417,7 @@ class Filesystem
     {
         $directories = [];
 
-        foreach (Finder::create()->in($directory)->directories()->depth(0) as $dir) {
+        foreach (Finder::create()->in($directory)->directories()->depth(0)->sortByName() as $dir) {
             $directories[] = $dir->getPathname();
         }
 
@@ -452,10 +452,8 @@ class Filesystem
      */
     public function moveDirectory($from, $to, $overwrite = false)
     {
-        if ($overwrite && $this->isDirectory($to)) {
-            if (! $this->deleteDirectory($to)) {
-                return false;
-            }
+        if ($overwrite && $this->isDirectory($to) && ! $this->deleteDirectory($to)) {
+            return false;
         }
 
         return @rename($from, $to) === true;
@@ -553,6 +551,27 @@ class Filesystem
         return true;
     }
 
+    /**
+     * Remove all of the directories within a given directory.
+     *
+     * @param  string  $directory
+     * @return bool
+     */
+    public function deleteDirectories($directory)
+    {
+        $allDirectories = $this->directories($directory);
+
+        if (! empty($allDirectories)) {
+            foreach ($allDirectories as $directoryName) {
+                $this->deleteDirectory($directoryName);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Empty the specified directory of all files and folders.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemAdapter.php b/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemAdapter.php
index 81653450..64f45b5c 100644
--- a/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemAdapter.php
+++ b/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemAdapter.php
@@ -11,6 +11,7 @@ use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Collection;
 use League\Flysystem\AdapterInterface;
 use PHPUnit\Framework\Assert as PHPUnit;
+use League\Flysystem\FileExistsException;
 use League\Flysystem\FilesystemInterface;
 use League\Flysystem\AwsS3v3\AwsS3Adapter;
 use League\Flysystem\Cached\CachedAdapter;
@@ -20,6 +21,7 @@ use League\Flysystem\Adapter\Local as LocalAdapter;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use Illuminate\Contracts\Filesystem\Cloud as CloudFilesystemContract;
 use Illuminate\Contracts\Filesystem\Filesystem as FilesystemContract;
+use Illuminate\Contracts\Filesystem\FileExistsException as ContractFileExistsException;
 use Illuminate\Contracts\Filesystem\FileNotFoundException as ContractFileNotFoundException;
 
 /**
@@ -132,7 +134,7 @@ class FilesystemAdapter implements FilesystemContract, CloudFilesystemContract
         ]);
 
         $response->setCallback(function () use ($path) {
-            $stream = $this->driver->readStream($path);
+            $stream = $this->readStream($path);
             fpassthru($stream);
             fclose($stream);
         });
@@ -204,7 +206,7 @@ class FilesystemAdapter implements FilesystemContract, CloudFilesystemContract
      */
     public function putFileAs($path, $file, $name, $options = [])
     {
-        $stream = fopen($file->getRealPath(), 'r+');
+        $stream = fopen($file->getRealPath(), 'r');
 
         // Next, we will format the path of the file and store the file using a stream since
         // they provide better performance than alternatives. Once we write the file this
@@ -240,7 +242,7 @@ class FilesystemAdapter implements FilesystemContract, CloudFilesystemContract
      *
      * @param  string  $path
      * @param  string  $visibility
-     * @return void
+     * @return bool
      */
     public function setVisibility($path, $visibility)
     {
@@ -253,7 +255,7 @@ class FilesystemAdapter implements FilesystemContract, CloudFilesystemContract
      * @param  string  $path
      * @param  string  $data
      * @param  string  $separator
-     * @return int
+     * @return bool
      */
     public function prepend($path, $data, $separator = PHP_EOL)
     {
@@ -270,7 +272,7 @@ class FilesystemAdapter implements FilesystemContract, CloudFilesystemContract
      * @param  string  $path
      * @param  string  $data
      * @param  string  $separator
-     * @return int
+     * @return bool
      */
     public function append($path, $data, $separator = PHP_EOL)
     {
@@ -368,6 +370,8 @@ class FilesystemAdapter implements FilesystemContract, CloudFilesystemContract
      *
      * @param  string  $path
      * @return string
+     *
+     * @throws \RuntimeException
      */
     public function url($path)
     {
@@ -379,6 +383,8 @@ class FilesystemAdapter implements FilesystemContract, CloudFilesystemContract
 
         if (method_exists($adapter, 'getUrl')) {
             return $adapter->getUrl($path);
+        } elseif (method_exists($this->driver, 'getUrl')) {
+            return $this->driver->getUrl($path);
         } elseif ($adapter instanceof AwsS3Adapter) {
             return $this->getAwsUrl($adapter, $path);
         } elseif ($adapter instanceof RackspaceAdapter) {
@@ -390,6 +396,32 @@ class FilesystemAdapter implements FilesystemContract, CloudFilesystemContract
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function readStream($path)
+    {
+        try {
+            $resource = $this->driver->readStream($path);
+
+            return $resource ? $resource : null;
+        } catch (FileNotFoundException $e) {
+            throw new ContractFileNotFoundException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function writeStream($path, $resource, array $options = [])
+    {
+        try {
+            return $this->driver->writeStream($path, $resource, $options);
+        } catch (FileExistsException $e) {
+            throw new ContractFileExistsException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
     /**
      * Get the URL for the file at the given path.
      *
@@ -459,6 +491,8 @@ class FilesystemAdapter implements FilesystemContract, CloudFilesystemContract
      * @param  \DateTimeInterface  $expiration
      * @param  array  $options
      * @return string
+     *
+     * @throws \RuntimeException
      */
     public function temporaryUrl($path, $expiration, array $options = [])
     {
@@ -665,7 +699,7 @@ class FilesystemAdapter implements FilesystemContract, CloudFilesystemContract
                 return AdapterInterface::VISIBILITY_PRIVATE;
         }
 
-        throw new InvalidArgumentException('Unknown visibility: '.$visibility);
+        throw new InvalidArgumentException("Unknown visibility: {$visibility}");
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemManager.php b/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemManager.php
index 04c1bac5..7897352c 100644
--- a/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemManager.php
+++ b/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemManager.php
@@ -8,6 +8,7 @@ use OpenCloud\Rackspace;
 use Illuminate\Support\Arr;
 use InvalidArgumentException;
 use League\Flysystem\AdapterInterface;
+use League\Flysystem\Sftp\SftpAdapter;
 use League\Flysystem\FilesystemInterface;
 use League\Flysystem\Cached\CachedAdapter;
 use League\Flysystem\Filesystem as Flysystem;
@@ -176,6 +177,19 @@ class FilesystemManager implements FactoryContract
         ));
     }
 
+    /**
+     * Create an instance of the sftp driver.
+     *
+     * @param  array  $config
+     * @return \Illuminate\Contracts\Filesystem\Filesystem
+     */
+    public function createSftpDriver(array $config)
+    {
+        return $this->adapt($this->createFlysystem(
+            new SftpAdapter($config), $config
+        ));
+    }
+
     /**
      * Create an instance of the Amazon S3 driver.
      *
@@ -206,7 +220,7 @@ class FilesystemManager implements FactoryContract
         $config += ['version' => 'latest'];
 
         if ($config['key'] && $config['secret']) {
-            $config['credentials'] = Arr::only($config, ['key', 'secret']);
+            $config['credentials'] = Arr::only($config, ['key', 'secret', 'token']);
         }
 
         return $config;
@@ -222,7 +236,7 @@ class FilesystemManager implements FactoryContract
     {
         $client = new Rackspace($config['endpoint'], [
             'username' => $config['username'], 'apiKey' => $config['key'],
-        ]);
+        ], $config['options'] ?? []);
 
         $root = $config['root'] ?? null;
 
@@ -304,11 +318,13 @@ class FilesystemManager implements FactoryContract
      *
      * @param  string  $name
      * @param  mixed  $disk
-     * @return void
+     * @return $this
      */
     public function set($name, $disk)
     {
         $this->disks[$name] = $disk;
+
+        return $this;
     }
 
     /**
@@ -342,6 +358,21 @@ class FilesystemManager implements FactoryContract
         return $this->app['config']['filesystems.cloud'];
     }
 
+    /**
+     * Unset the given disk instances.
+     *
+     * @param  array|string  $disk
+     * @return $this
+     */
+    public function forgetDisk($disk)
+    {
+        foreach ((array) $disk as $diskName) {
+            unset($this->disks[$diskName]);
+        }
+
+        return $this;
+    }
+
     /**
      * Register a custom driver creator Closure.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Filesystem/composer.json b/vendor/laravel/framework/src/Illuminate/Filesystem/composer.json
index 3f091942..4157c814 100644
--- a/vendor/laravel/framework/src/Illuminate/Filesystem/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Filesystem/composer.json
@@ -14,10 +14,10 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/support": "5.5.*",
-        "symfony/finder": "~3.3"
+        "php": "^7.1.3",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/support": "5.7.*",
+        "symfony/finder": "^4.1"
     },
     "autoload": {
         "psr-4": {
@@ -26,13 +26,15 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "suggest": {
-        "league/flysystem": "Required to use the Flysystem local and FTP drivers (~1.0).",
-        "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).",
-        "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0)."
+        "league/flysystem": "Required to use the Flysystem local and FTP drivers (^1.0).",
+        "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).",
+        "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).",
+        "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (^1.0).",
+        "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0)."
     },
     "config": {
         "sort-packages": true
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Application.php b/vendor/laravel/framework/src/Illuminate/Foundation/Application.php
index bed842c5..1338e8b9 100755
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Application.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Application.php
@@ -29,7 +29,7 @@ class Application extends Container implements ApplicationContract, HttpKernelIn
      *
      * @var string
      */
-    const VERSION = '5.5.40';
+    const VERSION = '5.7.9';
 
     /**
      * The base path for the Laravel installation.
@@ -94,13 +94,6 @@ class Application extends Container implements ApplicationContract, HttpKernelIn
      */
     protected $deferredServices = [];
 
-    /**
-     * A custom callback used to configure Monolog.
-     *
-     * @var callable|null
-     */
-    protected $monologConfigurator;
-
     /**
      * The custom database path defined by the developer.
      *
@@ -475,7 +468,7 @@ class Application extends Container implements ApplicationContract, HttpKernelIn
      */
     public function environmentFilePath()
     {
-        return $this->environmentPath().'/'.$this->environmentFile();
+        return $this->environmentPath().DIRECTORY_SEPARATOR.$this->environmentFile();
     }
 
     /**
@@ -488,13 +481,7 @@ class Application extends Container implements ApplicationContract, HttpKernelIn
         if (func_num_args() > 0) {
             $patterns = is_array(func_get_arg(0)) ? func_get_arg(0) : func_get_args();
 
-            foreach ($patterns as $pattern) {
-                if (Str::is($pattern, $this['env'])) {
-                    return true;
-                }
-            }
-
-            return false;
+            return Str::is($patterns, $this['env']);
         }
 
         return $this['env'];
@@ -524,23 +511,23 @@ class Application extends Container implements ApplicationContract, HttpKernelIn
     }
 
     /**
-     * Determine if we are running in the console.
+     * Determine if the application is running in the console.
      *
      * @return bool
      */
     public function runningInConsole()
     {
-        return php_sapi_name() == 'cli' || php_sapi_name() == 'phpdbg';
+        return php_sapi_name() === 'cli' || php_sapi_name() === 'phpdbg';
     }
 
     /**
-     * Determine if we are running unit tests.
+     * Determine if the application is running unit tests.
      *
      * @return bool
      */
     public function runningUnitTests()
     {
-        return $this['env'] == 'testing';
+        return $this['env'] === 'testing';
     }
 
     /**
@@ -565,11 +552,10 @@ class Application extends Container implements ApplicationContract, HttpKernelIn
      * Register a service provider with the application.
      *
      * @param  \Illuminate\Support\ServiceProvider|string  $provider
-     * @param  array  $options
      * @param  bool   $force
      * @return \Illuminate\Support\ServiceProvider
      */
-    public function register($provider, $options = [], $force = false)
+    public function register($provider, $force = false)
     {
         if (($registered = $this->getProvider($provider)) && ! $force) {
             return $registered;
@@ -586,6 +572,21 @@ class Application extends Container implements ApplicationContract, HttpKernelIn
             $provider->register();
         }
 
+        // If there are bindings / singletons set as properties on the provider we
+        // will spin through them and register them with the application, which
+        // serves as a convenience layer while registering a lot of bindings.
+        if (property_exists($provider, 'bindings')) {
+            foreach ($provider->bindings as $key => $value) {
+                $this->bind($key, $value);
+            }
+        }
+
+        if (property_exists($provider, 'singletons')) {
+            foreach ($provider->singletons as $key => $value) {
+                $this->singleton($key, $value);
+            }
+        }
+
         $this->markAsRegistered($provider);
 
         // If the application has already booted, we will call this boot method on
@@ -1029,39 +1030,6 @@ class Application extends Container implements ApplicationContract, HttpKernelIn
         AliasLoader::setFacadeNamespace($namespace);
     }
 
-    /**
-     * Define a callback to be used to configure Monolog.
-     *
-     * @param  callable  $callback
-     * @return $this
-     */
-    public function configureMonologUsing(callable $callback)
-    {
-        $this->monologConfigurator = $callback;
-
-        return $this;
-    }
-
-    /**
-     * Determine if the application has a custom Monolog configurator.
-     *
-     * @return bool
-     */
-    public function hasMonologConfigurator()
-    {
-        return ! is_null($this->monologConfigurator);
-    }
-
-    /**
-     * Get the custom Monolog configurator for the application.
-     *
-     * @return callable
-     */
-    public function getMonologConfigurator()
-    {
-        return $this->monologConfigurator;
-    }
-
     /**
      * Get the current application locale.
      *
@@ -1122,9 +1090,10 @@ class Application extends Container implements ApplicationContract, HttpKernelIn
             'filesystem'           => [\Illuminate\Filesystem\FilesystemManager::class, \Illuminate\Contracts\Filesystem\Factory::class],
             'filesystem.disk'      => [\Illuminate\Contracts\Filesystem\Filesystem::class],
             'filesystem.cloud'     => [\Illuminate\Contracts\Filesystem\Cloud::class],
-            'hash'                 => [\Illuminate\Contracts\Hashing\Hasher::class],
+            'hash'                 => [\Illuminate\Hashing\HashManager::class],
+            'hash.driver'          => [\Illuminate\Contracts\Hashing\Hasher::class],
             'translator'           => [\Illuminate\Translation\Translator::class, \Illuminate\Contracts\Translation\Translator::class],
-            'log'                  => [\Illuminate\Log\Writer::class, \Illuminate\Contracts\Logging\Log::class, \Psr\Log\LoggerInterface::class],
+            'log'                  => [\Illuminate\Log\LogManager::class, \Psr\Log\LoggerInterface::class],
             'mailer'               => [\Illuminate\Mail\Mailer::class, \Illuminate\Contracts\Mail\Mailer::class, \Illuminate\Contracts\Mail\MailQueue::class],
             'auth.password'        => [\Illuminate\Auth\Passwords\PasswordBrokerManager::class, \Illuminate\Contracts\Auth\PasswordBrokerFactory::class],
             'auth.password.broker' => [\Illuminate\Auth\Passwords\PasswordBroker::class, \Illuminate\Contracts\Auth\PasswordBroker::class],
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Auth/Access/AuthorizesRequests.php b/vendor/laravel/framework/src/Illuminate/Foundation/Auth/Access/AuthorizesRequests.php
index ece53587..9930d905 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Auth/Access/AuthorizesRequests.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Auth/Access/AuthorizesRequests.php
@@ -18,7 +18,7 @@ trait AuthorizesRequests
      */
     public function authorize($ability, $arguments = [])
     {
-        list($ability, $arguments) = $this->parseAbilityAndArguments($ability, $arguments);
+        [$ability, $arguments] = $this->parseAbilityAndArguments($ability, $arguments);
 
         return app(Gate::class)->authorize($ability, $arguments);
     }
@@ -35,7 +35,7 @@ trait AuthorizesRequests
      */
     public function authorizeForUser($user, $ability, $arguments = [])
     {
-        list($ability, $arguments) = $this->parseAbilityAndArguments($ability, $arguments);
+        [$ability, $arguments] = $this->parseAbilityAndArguments($ability, $arguments);
 
         return app(Gate::class)->forUser($user)->authorize($ability, $arguments);
     }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php b/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php
index 00712c13..5e4e43de 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php
@@ -25,6 +25,8 @@ trait AuthenticatesUsers
      *
      * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response|\Illuminate\Http\JsonResponse
+     *
+     * @throws \Illuminate\Validation\ValidationException
      */
     public function login(Request $request)
     {
@@ -123,7 +125,7 @@ trait AuthenticatesUsers
      * @param  \Illuminate\Http\Request  $request
      * @return \Symfony\Component\HttpFoundation\Response
      *
-     * @throws ValidationException
+     * @throws \Illuminate\Validation\ValidationException
      */
     protected function sendFailedLoginResponse(Request $request)
     {
@@ -154,7 +156,18 @@ trait AuthenticatesUsers
 
         $request->session()->invalidate();
 
-        return redirect('/');
+        return $this->loggedOut($request) ?: redirect('/');
+    }
+
+    /**
+     * The user has logged out of the application.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return mixed
+     */
+    protected function loggedOut(Request $request)
+    {
+        //
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Auth/ResetsPasswords.php b/vendor/laravel/framework/src/Illuminate/Foundation/Auth/ResetsPasswords.php
index d8bea843..a8a8a1e9 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Auth/ResetsPasswords.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Auth/ResetsPasswords.php
@@ -52,7 +52,7 @@ trait ResetsPasswords
         // the application's home authenticated view. If there is an error we can
         // redirect them back to where they came from with their error message.
         return $response == Password::PASSWORD_RESET
-                    ? $this->sendResetResponse($response)
+                    ? $this->sendResetResponse($request, $response)
                     : $this->sendResetFailedResponse($request, $response);
     }
 
@@ -116,10 +116,11 @@ trait ResetsPasswords
     /**
      * Get the response for a successful password reset.
      *
+     * @param  \Illuminate\Http\Request  $request
      * @param  string  $response
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
      */
-    protected function sendResetResponse($response)
+    protected function sendResetResponse(Request $request, $response)
     {
         return redirect($this->redirectPath())
                             ->with('status', trans($response));
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Auth/SendsPasswordResetEmails.php b/vendor/laravel/framework/src/Illuminate/Foundation/Auth/SendsPasswordResetEmails.php
index edab2112..02378c15 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Auth/SendsPasswordResetEmails.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Auth/SendsPasswordResetEmails.php
@@ -35,7 +35,7 @@ trait SendsPasswordResetEmails
         );
 
         return $response == Password::RESET_LINK_SENT
-                    ? $this->sendResetLinkResponse($response)
+                    ? $this->sendResetLinkResponse($request, $response)
                     : $this->sendResetLinkFailedResponse($request, $response);
     }
 
@@ -53,10 +53,11 @@ trait SendsPasswordResetEmails
     /**
      * Get the response for a successful password reset link.
      *
+     * @param  \Illuminate\Http\Request  $request
      * @param  string  $response
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
      */
-    protected function sendResetLinkResponse($response)
+    protected function sendResetLinkResponse(Request $request, $response)
     {
         return back()->with('status', trans($response));
     }
@@ -70,9 +71,9 @@ trait SendsPasswordResetEmails
      */
     protected function sendResetLinkFailedResponse(Request $request, $response)
     {
-        return back()->withErrors(
-            ['email' => trans($response)]
-        );
+        return back()
+                ->withInput($request->only('email'))
+                ->withErrors(['email' => trans($response)]);
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Auth/ThrottlesLogins.php b/vendor/laravel/framework/src/Illuminate/Foundation/Auth/ThrottlesLogins.php
index 8ba6e289..1dca25cf 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Auth/ThrottlesLogins.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Auth/ThrottlesLogins.php
@@ -20,7 +20,7 @@ trait ThrottlesLogins
     protected function hasTooManyLoginAttempts(Request $request)
     {
         return $this->limiter()->tooManyAttempts(
-            $this->throttleKey($request), $this->maxAttempts(), $this->decayMinutes()
+            $this->throttleKey($request), $this->maxAttempts()
         );
     }
 
@@ -42,6 +42,7 @@ trait ThrottlesLogins
      *
      * @param  \Illuminate\Http\Request  $request
      * @return void
+     *
      * @throws \Illuminate\Validation\ValidationException
      */
     protected function sendLockoutResponse(Request $request)
@@ -52,7 +53,7 @@ trait ThrottlesLogins
 
         throw ValidationException::withMessages([
             $this->username() => [Lang::get('auth.throttle', ['seconds' => $seconds])],
-        ])->status(423);
+        ])->status(429);
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Auth/User.php b/vendor/laravel/framework/src/Illuminate/Foundation/Auth/User.php
index 5c847785..c816436f 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Auth/User.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Auth/User.php
@@ -3,6 +3,7 @@
 namespace Illuminate\Foundation\Auth;
 
 use Illuminate\Auth\Authenticatable;
+use Illuminate\Auth\MustVerifyEmail;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Auth\Passwords\CanResetPassword;
 use Illuminate\Foundation\Auth\Access\Authorizable;
@@ -15,5 +16,5 @@ class User extends Model implements
     AuthorizableContract,
     CanResetPasswordContract
 {
-    use Authenticatable, Authorizable, CanResetPassword;
+    use Authenticatable, Authorizable, CanResetPassword, MustVerifyEmail;
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Auth/VerifiesEmails.php b/vendor/laravel/framework/src/Illuminate/Foundation/Auth/VerifiesEmails.php
new file mode 100644
index 00000000..25c642b3
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Auth/VerifiesEmails.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Illuminate\Foundation\Auth;
+
+use Illuminate\Http\Request;
+use Illuminate\Auth\Events\Verified;
+
+trait VerifiesEmails
+{
+    use RedirectsUsers;
+
+    /**
+     * Show the email verification notice.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Request $request)
+    {
+        return $request->user()->hasVerifiedEmail()
+                        ? redirect($this->redirectPath())
+                        : view('auth.verify');
+    }
+
+    /**
+     * Mark the authenticated user's email address as verified.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function verify(Request $request)
+    {
+        if ($request->route('id') == $request->user()->getKey() &&
+            $request->user()->markEmailAsVerified()) {
+            event(new Verified($request->user()));
+        }
+
+        return redirect($this->redirectPath())->with('verified', true);
+    }
+
+    /**
+     * Resend the email verification notification.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function resend(Request $request)
+    {
+        if ($request->user()->hasVerifiedEmail()) {
+            return redirect($this->redirectPath());
+        }
+
+        $request->user()->sendEmailVerificationNotification();
+
+        return back()->with('resent', true);
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php b/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php
index 859b1229..8f4653de 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php
@@ -57,6 +57,7 @@ class LoadConfiguration
      * @param  \Illuminate\Contracts\Foundation\Application  $app
      * @param  \Illuminate\Contracts\Config\Repository  $repository
      * @return void
+     *
      * @throws \Exception
      */
     protected function loadConfigurationFiles(Application $app, RepositoryContract $repository)
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/LoadEnvironmentVariables.php b/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/LoadEnvironmentVariables.php
index cc9196dc..6eeb7350 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/LoadEnvironmentVariables.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Bootstrap/LoadEnvironmentVariables.php
@@ -3,6 +3,7 @@
 namespace Illuminate\Foundation\Bootstrap;
 
 use Dotenv\Dotenv;
+use Dotenv\Exception\InvalidFileException;
 use Dotenv\Exception\InvalidPathException;
 use Symfony\Component\Console\Input\ArgvInput;
 use Illuminate\Contracts\Foundation\Application;
@@ -27,6 +28,9 @@ class LoadEnvironmentVariables
             (new Dotenv($app->environmentPath(), $app->environmentFile()))->load();
         } catch (InvalidPathException $e) {
             //
+        } catch (InvalidFileException $e) {
+            echo 'The environment file is invalid: '.$e->getMessage();
+            die(1);
         }
     }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Bus/Dispatchable.php b/vendor/laravel/framework/src/Illuminate/Foundation/Bus/Dispatchable.php
index 62c465fe..bd509a96 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Bus/Dispatchable.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Bus/Dispatchable.php
@@ -2,6 +2,8 @@
 
 namespace Illuminate\Foundation\Bus;
 
+use Illuminate\Contracts\Bus\Dispatcher;
+
 trait Dispatchable
 {
     /**
@@ -14,6 +16,16 @@ trait Dispatchable
         return new PendingDispatch(new static(...func_get_args()));
     }
 
+    /**
+     * Dispatch a command to its appropriate handler in the current process.
+     *
+     * @return mixed
+     */
+    public static function dispatchNow()
+    {
+        return app(Dispatcher::class)->dispatchNow(new static(...func_get_args()));
+    }
+
     /**
      * Set the jobs that should run if this job is successful.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/AppNameCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/AppNameCommand.php
index e92b7a8f..1c0d359f 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/AppNameCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/AppNameCommand.php
@@ -79,7 +79,7 @@ class AppNameCommand extends Command
 
         $this->composer->dumpAutoloads();
 
-        $this->call('clear-compiled');
+        $this->call('optimize:clear');
     }
 
     /**
@@ -290,7 +290,7 @@ class AppNameCommand extends Command
     protected function getArguments()
     {
         return [
-            ['name', InputArgument::REQUIRED, 'The desired namespace.'],
+            ['name', InputArgument::REQUIRED, 'The desired namespace'],
         ];
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/ChannelMakeCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ChannelMakeCommand.php
new file mode 100644
index 00000000..202d81cf
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ChannelMakeCommand.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Illuminate\Foundation\Console;
+
+use Illuminate\Console\GeneratorCommand;
+
+class ChannelMakeCommand extends GeneratorCommand
+{
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'make:channel';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Create a new channel class';
+
+    /**
+     * The type of class being generated.
+     *
+     * @var string
+     */
+    protected $type = 'Channel';
+
+    /**
+     * Build the class with the given name.
+     *
+     * @param  string  $name
+     * @return string
+     */
+    protected function buildClass($name)
+    {
+        return str_replace(
+            'DummyUser',
+            class_basename($this->userProviderModel()),
+            parent::buildClass($name)
+        );
+    }
+
+    /**
+     * Get the stub file for the generator.
+     *
+     * @return string
+     */
+    protected function getStub()
+    {
+        return __DIR__.'/stubs/channel.stub';
+    }
+
+    /**
+     * Get the default namespace for the class.
+     *
+     * @param  string  $rootNamespace
+     * @return string
+     */
+    protected function getDefaultNamespace($rootNamespace)
+    {
+        return $rootNamespace.'\Broadcasting';
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/ClearCompiledCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ClearCompiledCommand.php
index 3aff6d26..399a44dc 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/ClearCompiledCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ClearCompiledCommand.php
@@ -35,6 +35,6 @@ class ClearCompiledCommand extends Command
             @unlink($packagesPath);
         }
 
-        $this->info('The compiled services & packages files have been removed.');
+        $this->info('Compiled services and packages files removed!');
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/ConfigCacheCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ConfigCacheCommand.php
index edd85ee5..275b672d 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/ConfigCacheCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ConfigCacheCommand.php
@@ -2,6 +2,8 @@
 
 namespace Illuminate\Foundation\Console;
 
+use Throwable;
+use LogicException;
 use Illuminate\Console\Command;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Contracts\Console\Kernel as ConsoleKernelContract;
@@ -52,11 +54,20 @@ class ConfigCacheCommand extends Command
         $this->call('config:clear');
 
         $config = $this->getFreshConfiguration();
+        $configPath = $this->laravel->getCachedConfigPath();
 
         $this->files->put(
-            $this->laravel->getCachedConfigPath(), '<?php return '.var_export($config, true).';'.PHP_EOL
+            $configPath, '<?php return '.var_export($config, true).';'.PHP_EOL
         );
 
+        try {
+            require $configPath;
+        } catch (Throwable $e) {
+            $this->files->delete($configPath);
+
+            throw new LogicException('Your configuration files are not serializable.', 0, $e);
+        }
+
         $this->info('Configuration cached successfully!');
     }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/ConsoleMakeCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ConsoleMakeCommand.php
index a9b164b9..54183e90 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/ConsoleMakeCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ConsoleMakeCommand.php
@@ -72,7 +72,7 @@ class ConsoleMakeCommand extends GeneratorCommand
     protected function getArguments()
     {
         return [
-            ['name', InputArgument::REQUIRED, 'The name of the command.'],
+            ['name', InputArgument::REQUIRED, 'The name of the command'],
         ];
     }
 
@@ -84,7 +84,7 @@ class ConsoleMakeCommand extends GeneratorCommand
     protected function getOptions()
     {
         return [
-            ['command', null, InputOption::VALUE_OPTIONAL, 'The terminal command that should be assigned.', 'command:name'],
+            ['command', null, InputOption::VALUE_OPTIONAL, 'The terminal command that should be assigned', 'command:name'],
         ];
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/DownCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/DownCommand.php
index 0cd685e5..ff1e5943 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/DownCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/DownCommand.php
@@ -14,8 +14,9 @@ class DownCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'down {--message= : The message for the maintenance mode. }
-                                 {--retry= : The number of seconds after which the request may be retried.}';
+    protected $signature = 'down {--message= : The message for the maintenance mode}
+                                 {--retry= : The number of seconds after which the request may be retried}
+                                 {--allow=* : IP or networks allowed to access the application while in maintenance mode}';
 
     /**
      * The console command description.
@@ -50,6 +51,7 @@ class DownCommand extends Command
             'time' => $this->currentTime(),
             'message' => $this->option('message'),
             'retry' => $this->getRetryTime(),
+            'allowed' => $this->option('allow'),
         ];
     }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/ExceptionMakeCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ExceptionMakeCommand.php
index d81476db..2bc0e6c3 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/ExceptionMakeCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ExceptionMakeCommand.php
@@ -76,9 +76,9 @@ class ExceptionMakeCommand extends GeneratorCommand
     protected function getOptions()
     {
         return [
-            ['render', null, InputOption::VALUE_NONE, 'Create the exception with an empty render method.'],
+            ['render', null, InputOption::VALUE_NONE, 'Create the exception with an empty render method'],
 
-            ['report', null, InputOption::VALUE_NONE, 'Create the exception with an empty report method.'],
+            ['report', null, InputOption::VALUE_NONE, 'Create the exception with an empty report method'],
         ];
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/JobMakeCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/JobMakeCommand.php
index af006720..60d942eb 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/JobMakeCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/JobMakeCommand.php
@@ -59,7 +59,7 @@ class JobMakeCommand extends GeneratorCommand
     protected function getOptions()
     {
         return [
-            ['sync', null, InputOption::VALUE_NONE, 'Indicates that job should be synchronous.'],
+            ['sync', null, InputOption::VALUE_NONE, 'Indicates that job should be synchronous'],
         ];
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Kernel.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Kernel.php
index fd392537..4d933a28 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Kernel.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Kernel.php
@@ -6,6 +6,7 @@ use Closure;
 use Exception;
 use Throwable;
 use ReflectionClass;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Console\Command;
 use Symfony\Component\Finder\Finder;
@@ -195,7 +196,7 @@ class Kernel implements KernelContract
      */
     protected function load($paths)
     {
-        $paths = array_unique(is_array($paths) ? $paths : (array) $paths);
+        $paths = array_unique(Arr::wrap($paths));
 
         $paths = array_filter($paths, function ($path) {
             return is_dir($path);
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/KeyGenerateCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/KeyGenerateCommand.php
index 52ac6ea0..99492f07 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/KeyGenerateCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/KeyGenerateCommand.php
@@ -48,7 +48,7 @@ class KeyGenerateCommand extends Command
 
         $this->laravel['config']['app.key'] = $key;
 
-        $this->info("Application key [$key] set successfully.");
+        $this->info('Application key set successfully.');
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/ListenerMakeCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ListenerMakeCommand.php
index ce3e25ef..c13bfbb9 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/ListenerMakeCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ListenerMakeCommand.php
@@ -104,9 +104,9 @@ class ListenerMakeCommand extends GeneratorCommand
     protected function getOptions()
     {
         return [
-            ['event', 'e', InputOption::VALUE_OPTIONAL, 'The event class being listened for.'],
+            ['event', 'e', InputOption::VALUE_OPTIONAL, 'The event class being listened for'],
 
-            ['queued', null, InputOption::VALUE_NONE, 'Indicates the event listener should be queued.'],
+            ['queued', null, InputOption::VALUE_NONE, 'Indicates the event listener should be queued'],
         ];
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/MailMakeCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/MailMakeCommand.php
index 6b97fa98..d401a9ec 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/MailMakeCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/MailMakeCommand.php
@@ -108,9 +108,9 @@ class MailMakeCommand extends GeneratorCommand
     protected function getOptions()
     {
         return [
-            ['force', 'f', InputOption::VALUE_NONE, 'Create the class even if the mailable already exists.'],
+            ['force', 'f', InputOption::VALUE_NONE, 'Create the class even if the mailable already exists'],
 
-            ['markdown', 'm', InputOption::VALUE_OPTIONAL, 'Create a new Markdown template for the mailable.'],
+            ['markdown', 'm', InputOption::VALUE_OPTIONAL, 'Create a new Markdown template for the mailable'],
         ];
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/ModelMakeCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ModelMakeCommand.php
index 96427b81..05366746 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/ModelMakeCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ModelMakeCommand.php
@@ -67,8 +67,10 @@ class ModelMakeCommand extends GeneratorCommand
      */
     protected function createFactory()
     {
+        $factory = Str::studly(class_basename($this->argument('name')));
+
         $this->call('make:factory', [
-            'name' => $this->argument('name').'Factory',
+            'name' => "{$factory}Factory",
             '--model' => $this->argument('name'),
         ]);
     }
@@ -82,6 +84,10 @@ class ModelMakeCommand extends GeneratorCommand
     {
         $table = Str::plural(Str::snake(class_basename($this->argument('name'))));
 
+        if ($this->option('pivot')) {
+            $table = Str::singular($table);
+        }
+
         $this->call('make:migration', [
             'name' => "create_{$table}_table",
             '--create' => $table,
@@ -144,13 +150,13 @@ class ModelMakeCommand extends GeneratorCommand
 
             ['factory', 'f', InputOption::VALUE_NONE, 'Create a new factory for the model'],
 
-            ['force', null, InputOption::VALUE_NONE, 'Create the class even if the model already exists.'],
+            ['force', null, InputOption::VALUE_NONE, 'Create the class even if the model already exists'],
 
-            ['migration', 'm', InputOption::VALUE_NONE, 'Create a new migration file for the model.'],
+            ['migration', 'm', InputOption::VALUE_NONE, 'Create a new migration file for the model'],
 
-            ['pivot', 'p', InputOption::VALUE_NONE, 'Indicates if the generated model should be a custom intermediate table model.'],
+            ['pivot', 'p', InputOption::VALUE_NONE, 'Indicates if the generated model should be a custom intermediate table model'],
 
-            ['resource', 'r', InputOption::VALUE_NONE, 'Indicates if the generated controller should be a resource controller.'],
+            ['resource', 'r', InputOption::VALUE_NONE, 'Indicates if the generated controller should be a resource controller'],
         ];
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/NotificationMakeCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/NotificationMakeCommand.php
index 43c62678..40e9d849 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/NotificationMakeCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/NotificationMakeCommand.php
@@ -108,9 +108,9 @@ class NotificationMakeCommand extends GeneratorCommand
     protected function getOptions()
     {
         return [
-            ['force', 'f', InputOption::VALUE_NONE, 'Create the class even if the notification already exists.'],
+            ['force', 'f', InputOption::VALUE_NONE, 'Create the class even if the notification already exists'],
 
-            ['markdown', 'm', InputOption::VALUE_OPTIONAL, 'Create a new Markdown template for the notification.'],
+            ['markdown', 'm', InputOption::VALUE_OPTIONAL, 'Create a new Markdown template for the notification'],
         ];
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/ObserverMakeCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ObserverMakeCommand.php
new file mode 100644
index 00000000..77a81626
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ObserverMakeCommand.php
@@ -0,0 +1,113 @@
+<?php
+
+namespace Illuminate\Foundation\Console;
+
+use Illuminate\Support\Str;
+use Illuminate\Console\GeneratorCommand;
+use Symfony\Component\Console\Input\InputOption;
+
+class ObserverMakeCommand extends GeneratorCommand
+{
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'make:observer';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Create a new observer class';
+
+    /**
+     * The type of class being generated.
+     *
+     * @var string
+     */
+    protected $type = 'Observer';
+
+    /**
+     * Build the class with the given name.
+     *
+     * @param  string  $name
+     * @return string
+     */
+    protected function buildClass($name)
+    {
+        $stub = parent::buildClass($name);
+
+        $model = $this->option('model');
+
+        return $model ? $this->replaceModel($stub, $model) : $stub;
+    }
+
+    /**
+     * Get the stub file for the generator.
+     *
+     * @return string
+     */
+    protected function getStub()
+    {
+        return $this->option('model')
+                    ? __DIR__.'/stubs/observer.stub'
+                    : __DIR__.'/stubs/observer.plain.stub';
+    }
+
+    /**
+     * Replace the model for the given stub.
+     *
+     * @param  string  $stub
+     * @param  string  $model
+     * @return string
+     */
+    protected function replaceModel($stub, $model)
+    {
+        $model = str_replace('/', '\\', $model);
+
+        $namespaceModel = $this->laravel->getNamespace().$model;
+
+        if (Str::startsWith($model, '\\')) {
+            $stub = str_replace('NamespacedDummyModel', trim($model, '\\'), $stub);
+        } else {
+            $stub = str_replace('NamespacedDummyModel', $namespaceModel, $stub);
+        }
+
+        $stub = str_replace(
+            "use {$namespaceModel};\nuse {$namespaceModel};", "use {$namespaceModel};", $stub
+        );
+
+        $model = class_basename(trim($model, '\\'));
+
+        $stub = str_replace('DocDummyModel', Str::snake($model, ' '), $stub);
+
+        $stub = str_replace('DummyModel', $model, $stub);
+
+        return str_replace('dummyModel', Str::camel($model), $stub);
+    }
+
+    /**
+     * Get the default namespace for the class.
+     *
+     * @param  string  $rootNamespace
+     * @return string
+     */
+    protected function getDefaultNamespace($rootNamespace)
+    {
+        return $rootNamespace.'\Observers';
+    }
+
+    /**
+     * Get the console command arguments.
+     *
+     * @return array
+     */
+    protected function getOptions()
+    {
+        return [
+            ['model', 'm', InputOption::VALUE_OPTIONAL, 'The model that the observer applies to.'],
+        ];
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/OptimizeClearCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/OptimizeClearCommand.php
new file mode 100644
index 00000000..0bd92dfe
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/OptimizeClearCommand.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Illuminate\Foundation\Console;
+
+use Illuminate\Console\Command;
+
+class OptimizeClearCommand extends Command
+{
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'optimize:clear';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Remove the cached bootstrap files';
+
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $this->call('view:clear');
+        $this->call('cache:clear');
+        $this->call('route:clear');
+        $this->call('config:clear');
+        $this->call('clear-compiled');
+
+        $this->info('Caches cleared successfully!');
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/OptimizeCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/OptimizeCommand.php
index 1694d583..af5d731e 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/OptimizeCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/OptimizeCommand.php
@@ -3,7 +3,6 @@
 namespace Illuminate\Foundation\Console;
 
 use Illuminate\Console\Command;
-use Symfony\Component\Console\Input\InputOption;
 
 class OptimizeCommand extends Command
 {
@@ -19,7 +18,7 @@ class OptimizeCommand extends Command
      *
      * @var string
      */
-    protected $description = 'Optimize the framework for better performance (deprecated)';
+    protected $description = 'Cache the framework bootstrap files';
 
     /**
      * Execute the console command.
@@ -28,20 +27,9 @@ class OptimizeCommand extends Command
      */
     public function handle()
     {
-        //
-    }
-
-    /**
-     * Get the console command options.
-     *
-     * @return array
-     */
-    protected function getOptions()
-    {
-        return [
-            ['force', null, InputOption::VALUE_NONE, 'Force the compiled class file to be written (deprecated).'],
+        $this->call('config:cache');
+        $this->call('route:cache');
 
-            ['psr', null, InputOption::VALUE_NONE, 'Do not optimize Composer dump-autoload.'],
-        ];
+        $this->info('Files cached successfully!');
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/PackageDiscoverCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/PackageDiscoverCommand.php
index 74eb87d3..3ef8f01f 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/PackageDiscoverCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/PackageDiscoverCommand.php
@@ -32,7 +32,7 @@ class PackageDiscoverCommand extends Command
         $manifest->build();
 
         foreach (array_keys($manifest->manifest) as $package) {
-            $this->line("<info>Discovered Package:</info> {$package}");
+            $this->line("Discovered Package: <info>{$package}</info>");
         }
 
         $this->info('Package manifest generated successfully.');
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/PolicyMakeCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/PolicyMakeCommand.php
index 3f31ab4c..fba1e0cc 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/PolicyMakeCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/PolicyMakeCommand.php
@@ -54,13 +54,15 @@ class PolicyMakeCommand extends GeneratorCommand
      */
     protected function replaceUserNamespace($stub)
     {
-        if (! config('auth.providers.users.model')) {
+        $model = $this->userProviderModel();
+
+        if (! $model) {
             return $stub;
         }
 
         return str_replace(
             $this->rootNamespace().'User',
-            config('auth.providers.users.model'),
+            $model,
             $stub
         );
     }
@@ -90,17 +92,19 @@ class PolicyMakeCommand extends GeneratorCommand
 
         $model = class_basename(trim($model, '\\'));
 
-        $dummyUser = class_basename(config('auth.providers.users.model'));
+        $dummyUser = class_basename($this->userProviderModel());
+
+        $dummyModel = Str::camel($model) === 'user' ? 'model' : $model;
 
-        $dummyModel = Str::camel($model) === 'user' ? 'model' : Str::camel($model);
+        $stub = str_replace('DocDummyModel', Str::snake($dummyModel, ' '), $stub);
 
         $stub = str_replace('DummyModel', $model, $stub);
 
-        $stub = str_replace('dummyModel', $dummyModel, $stub);
+        $stub = str_replace('dummyModel', Str::camel($dummyModel), $stub);
 
         $stub = str_replace('DummyUser', $dummyUser, $stub);
 
-        return str_replace('dummyPluralModel', Str::plural($dummyModel), $stub);
+        return str_replace('DocDummyPluralModel', Str::snake(Str::plural($dummyModel), ' '), $stub);
     }
 
     /**
@@ -134,7 +138,7 @@ class PolicyMakeCommand extends GeneratorCommand
     protected function getOptions()
     {
         return [
-            ['model', 'm', InputOption::VALUE_OPTIONAL, 'The model that the policy applies to.'],
+            ['model', 'm', InputOption::VALUE_OPTIONAL, 'The model that the policy applies to'],
         ];
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/PresetCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/PresetCommand.php
index e43abe34..a63082ea 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/PresetCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/PresetCommand.php
@@ -12,7 +12,9 @@ class PresetCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'preset { type : The preset type (none, bootstrap, vue, react) }';
+    protected $signature = 'preset
+                            { type : The preset type (none, bootstrap, vue, react) }
+                            { --option=* : Pass an option to the preset command }';
 
     /**
      * The console command description.
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/Bootstrap.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/Bootstrap.php
index 36004f0d..248e2f29 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/Bootstrap.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/Bootstrap.php
@@ -25,8 +25,9 @@ class Bootstrap extends Preset
     protected static function updatePackageArray(array $packages)
     {
         return [
-            'bootstrap-sass' => '^3.3.7',
-            'jquery' => '^3.1.1',
+            'bootstrap' => '^4.0.0',
+            'jquery' => '^3.2',
+            'popper.js' => '^1.12',
         ] + $packages;
     }
 
@@ -37,7 +38,7 @@ class Bootstrap extends Preset
      */
     protected static function updateSass()
     {
-        copy(__DIR__.'/bootstrap-stubs/_variables.scss', resource_path('assets/sass/_variables.scss'));
-        copy(__DIR__.'/bootstrap-stubs/app.scss', resource_path('assets/sass/app.scss'));
+        copy(__DIR__.'/bootstrap-stubs/_variables.scss', resource_path('sass/_variables.scss'));
+        copy(__DIR__.'/bootstrap-stubs/app.scss', resource_path('sass/app.scss'));
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/None.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/None.php
index 750c3b45..901471aa 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/None.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/None.php
@@ -17,8 +17,8 @@ class None extends Preset
         static::updateBootstrapping();
 
         tap(new Filesystem, function ($filesystem) {
-            $filesystem->deleteDirectory(resource_path('assets/js/components'));
-            $filesystem->delete(resource_path('assets/sass/_variables.scss'));
+            $filesystem->deleteDirectory(resource_path('js/components'));
+            $filesystem->delete(resource_path('sass/_variables.scss'));
             $filesystem->deleteDirectory(base_path('node_modules'));
             $filesystem->deleteDirectory(public_path('css'));
             $filesystem->deleteDirectory(public_path('js'));
@@ -34,8 +34,9 @@ class None extends Preset
     protected static function updatePackageArray(array $packages)
     {
         unset(
-            $packages['bootstrap-sass'],
+            $packages['bootstrap'],
             $packages['jquery'],
+            $packages['popper.js'],
             $packages['vue'],
             $packages['babel-preset-react'],
             $packages['react'],
@@ -52,7 +53,7 @@ class None extends Preset
      */
     protected static function updateBootstrapping()
     {
-        file_put_contents(resource_path('assets/sass/app.scss'), ''.PHP_EOL);
-        copy(__DIR__.'/none-stubs/app.js', resource_path('assets/js/app.js'));
+        file_put_contents(resource_path('sass/app.scss'), ''.PHP_EOL);
+        copy(__DIR__.'/none-stubs/app.js', resource_path('js/app.js'));
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/Preset.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/Preset.php
index acea75c2..efa08175 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/Preset.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/Preset.php
@@ -15,7 +15,7 @@ class Preset
     {
         $filesystem = new Filesystem;
 
-        if (! $filesystem->isDirectory($directory = resource_path('assets/js/components'))) {
+        if (! $filesystem->isDirectory($directory = resource_path('js/components'))) {
             $filesystem->makeDirectory($directory, 0755, true);
         }
     }
@@ -23,21 +23,25 @@ class Preset
     /**
      * Update the "package.json" file.
      *
+     * @param  bool  $dev
      * @return void
      */
-    protected static function updatePackages()
+    protected static function updatePackages($dev = true)
     {
         if (! file_exists(base_path('package.json'))) {
             return;
         }
 
+        $configurationKey = $dev ? 'devDependencies' : 'dependencies';
+
         $packages = json_decode(file_get_contents(base_path('package.json')), true);
 
-        $packages['devDependencies'] = static::updatePackageArray(
-            $packages['devDependencies']
+        $packages[$configurationKey] = static::updatePackageArray(
+            array_key_exists($configurationKey, $packages) ? $packages[$configurationKey] : [],
+            $configurationKey
         );
 
-        ksort($packages['devDependencies']);
+        ksort($packages[$configurationKey]);
 
         file_put_contents(
             base_path('package.json'),
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/React.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/React.php
index 8ecdeead..e7f3b3b6 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/React.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/React.php
@@ -32,8 +32,8 @@ class React extends Preset
     {
         return [
             'babel-preset-react' => '^6.23.0',
-            'react' => '^15.4.2',
-            'react-dom' => '^15.4.2',
+            'react' => '^16.2.0',
+            'react-dom' => '^16.2.0',
         ] + Arr::except($packages, ['vue']);
     }
 
@@ -55,12 +55,12 @@ class React extends Preset
     protected static function updateComponent()
     {
         (new Filesystem)->delete(
-            resource_path('assets/js/components/ExampleComponent.vue')
+            resource_path('js/components/ExampleComponent.vue')
         );
 
         copy(
             __DIR__.'/react-stubs/Example.js',
-            resource_path('assets/js/components/Example.js')
+            resource_path('js/components/Example.js')
         );
     }
 
@@ -71,6 +71,6 @@ class React extends Preset
      */
     protected static function updateBootstrapping()
     {
-        copy(__DIR__.'/react-stubs/app.js', resource_path('assets/js/app.js'));
+        copy(__DIR__.'/react-stubs/app.js', resource_path('js/app.js'));
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/Vue.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/Vue.php
index 5a85dafd..2b3aaf61 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/Vue.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/Vue.php
@@ -55,12 +55,12 @@ class Vue extends Preset
     protected static function updateComponent()
     {
         (new Filesystem)->delete(
-            resource_path('assets/js/components/Example.js')
+            resource_path('js/components/Example.js')
         );
 
         copy(
             __DIR__.'/vue-stubs/ExampleComponent.vue',
-            resource_path('assets/js/components/ExampleComponent.vue')
+            resource_path('js/components/ExampleComponent.vue')
         );
     }
 
@@ -71,6 +71,6 @@ class Vue extends Preset
      */
     protected static function updateBootstrapping()
     {
-        copy(__DIR__.'/vue-stubs/app.js', resource_path('assets/js/app.js'));
+        copy(__DIR__.'/vue-stubs/app.js', resource_path('js/app.js'));
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/bootstrap-stubs/_variables.scss b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/bootstrap-stubs/_variables.scss
index 53202ac1..6799fc45 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/bootstrap-stubs/_variables.scss
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/bootstrap-stubs/_variables.scss
@@ -1,38 +1,20 @@
 
 // Body
-$body-bg: #f5f8fa;
-
-// Borders
-$laravel-border-color: darken($body-bg, 10%);
-$list-group-border: $laravel-border-color;
-$navbar-default-border: $laravel-border-color;
-$panel-default-border: $laravel-border-color;
-$panel-inner-border: $laravel-border-color;
-
-// Brands
-$brand-primary: #3097D1;
-$brand-info: #8eb4cb;
-$brand-success: #2ab27b;
-$brand-warning: #cbb956;
-$brand-danger: #bf5329;
+$body-bg: #f8fafc;
 
 // Typography
-$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
-$font-family-sans-serif: "Raleway", sans-serif;
-$font-size-base: 14px;
+$font-family-sans-serif: "Nunito", sans-serif;
+$font-size-base: 0.9rem;
 $line-height-base: 1.6;
-$text-color: #636b6f;
-
-// Navbar
-$navbar-default-bg: #fff;
-
-// Buttons
-$btn-default-color: $text-color;
-
-// Inputs
-$input-border: lighten($text-color, 40%);
-$input-border-focus: lighten($brand-primary, 25%);
-$input-color-placeholder: lighten($text-color, 30%);
 
-// Panels
-$panel-default-heading-bg: #fff;
+// Colors
+$blue: #3490dc;
+$indigo: #6574cd;
+$purple: #9561e2;
+$pink: #f66D9b;
+$red: #e3342f;
+$orange: #f6993f;
+$yellow: #ffed4a;
+$green: #38c172;
+$teal: #4dc0b5;
+$cyan: #6cb2eb;
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/bootstrap-stubs/app.scss b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/bootstrap-stubs/app.scss
index 1bbc5508..f42e7986 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/bootstrap-stubs/app.scss
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/bootstrap-stubs/app.scss
@@ -1,9 +1,14 @@
 
 // Fonts
-@import url("https://fonts.googleapis.com/css?family=Raleway:300,400,600");
+@import url('https://fonts.googleapis.com/css?family=Nunito');
 
 // Variables
-@import "variables";
+@import 'variables';
 
 // Bootstrap
-@import "~bootstrap-sass/assets/stylesheets/bootstrap";
+@import '~bootstrap/scss/bootstrap';
+
+.navbar-laravel {
+  background-color: #fff;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/react-stubs/Example.js b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/react-stubs/Example.js
index 21f77f24..937bb985 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/react-stubs/Example.js
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/react-stubs/Example.js
@@ -5,12 +5,12 @@ export default class Example extends Component {
     render() {
         return (
             <div className="container">
-                <div className="row">
-                    <div className="col-md-8 col-md-offset-2">
-                        <div className="panel panel-default">
-                            <div className="panel-heading">Example Component</div>
+                <div className="row justify-content-center">
+                    <div className="col-md-8">
+                        <div className="card">
+                            <div className="card-header">Example Component</div>
 
-                            <div className="panel-body">
+                            <div className="card-body">
                                 I'm an example component!
                             </div>
                         </div>
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/react-stubs/webpack.mix.js b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/react-stubs/webpack.mix.js
index 291598ad..4e045882 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/react-stubs/webpack.mix.js
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/react-stubs/webpack.mix.js
@@ -11,5 +11,5 @@ let mix = require('laravel-mix');
  |
  */
 
-mix.react('resources/assets/js/app.js', 'public/js')
-   .sass('resources/assets/sass/app.scss', 'public/css');
+mix.react('resources/js/app.js', 'public/js')
+   .sass('resources/sass/app.scss', 'public/css');
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/vue-stubs/ExampleComponent.vue b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/vue-stubs/ExampleComponent.vue
index 601e61cf..3fb9f9aa 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/vue-stubs/ExampleComponent.vue
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/vue-stubs/ExampleComponent.vue
@@ -1,12 +1,12 @@
 <template>
     <div class="container">
-        <div class="row">
-            <div class="col-md-8 col-md-offset-2">
-                <div class="panel panel-default">
-                    <div class="panel-heading">Example Component</div>
+        <div class="row justify-content-center">
+            <div class="col-md-8">
+                <div class="card">
+                    <div class="card-header">Example Component</div>
 
-                    <div class="panel-body">
-                        I'm an example component!
+                    <div class="card-body">
+                        I'm an example component.
                     </div>
                 </div>
             </div>
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/vue-stubs/webpack.mix.js b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/vue-stubs/webpack.mix.js
index 72fdbb16..20141cdb 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/vue-stubs/webpack.mix.js
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/Presets/vue-stubs/webpack.mix.js
@@ -11,5 +11,5 @@ let mix = require('laravel-mix');
  |
  */
 
-mix.js('resources/assets/js/app.js', 'public/js')
-   .sass('resources/assets/sass/app.scss', 'public/css');
+mix.js('resources/js/app.js', 'public/js')
+   .sass('resources/sass/app.scss', 'public/css');
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/ResourceMakeCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ResourceMakeCommand.php
index fd74a8ec..85800e53 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/ResourceMakeCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ResourceMakeCommand.php
@@ -32,7 +32,7 @@ class ResourceMakeCommand extends GeneratorCommand
     /**
      * Execute the console command.
      *
-     * @return bool|null
+     * @return void
      */
     public function handle()
     {
@@ -85,7 +85,7 @@ class ResourceMakeCommand extends GeneratorCommand
     protected function getOptions()
     {
         return [
-            ['collection', 'c', InputOption::VALUE_NONE, 'Create a resource collection.'],
+            ['collection', 'c', InputOption::VALUE_NONE, 'Create a resource collection'],
         ];
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/RouteCacheCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/RouteCacheCommand.php
index 84c11b53..3c85b877 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/RouteCacheCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/RouteCacheCommand.php
@@ -54,7 +54,7 @@ class RouteCacheCommand extends Command
 
         $routes = $this->getFreshApplicationRoutes();
 
-        if (count($routes) == 0) {
+        if (count($routes) === 0) {
             return $this->error("Your application doesn't have any routes.");
         }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/RouteListCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/RouteListCommand.php
index b5cbb335..12af805e 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/RouteListCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/RouteListCommand.php
@@ -68,7 +68,7 @@ class RouteListCommand extends Command
      */
     public function handle()
     {
-        if (count($this->routes) == 0) {
+        if (count($this->routes) === 0) {
             return $this->error("Your application doesn't have any routes.");
         }
 
@@ -110,7 +110,7 @@ class RouteListCommand extends Command
             'method' => implode('|', $route->methods()),
             'uri'    => $route->uri(),
             'name'   => $route->getName(),
-            'action' => $route->getActionName(),
+            'action' => ltrim($route->getActionName(), '\\'),
             'middleware' => $this->getMiddleware($route),
         ]);
     }
@@ -178,15 +178,15 @@ class RouteListCommand extends Command
     protected function getOptions()
     {
         return [
-            ['method', null, InputOption::VALUE_OPTIONAL, 'Filter the routes by method.'],
+            ['method', null, InputOption::VALUE_OPTIONAL, 'Filter the routes by method'],
 
-            ['name', null, InputOption::VALUE_OPTIONAL, 'Filter the routes by name.'],
+            ['name', null, InputOption::VALUE_OPTIONAL, 'Filter the routes by name'],
 
-            ['path', null, InputOption::VALUE_OPTIONAL, 'Filter the routes by path.'],
+            ['path', null, InputOption::VALUE_OPTIONAL, 'Filter the routes by path'],
 
-            ['reverse', 'r', InputOption::VALUE_NONE, 'Reverse the ordering of the routes.'],
+            ['reverse', 'r', InputOption::VALUE_NONE, 'Reverse the ordering of the routes'],
 
-            ['sort', null, InputOption::VALUE_OPTIONAL, 'The column (host, method, uri, name, action, middleware) to sort by.', 'uri'],
+            ['sort', null, InputOption::VALUE_OPTIONAL, 'The column (host, method, uri, name, action, middleware) to sort by', 'uri'],
         ];
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/ServeCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ServeCommand.php
index a923ca43..376f53b2 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/ServeCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ServeCommand.php
@@ -26,7 +26,7 @@ class ServeCommand extends Command
     /**
      * Execute the console command.
      *
-     * @return void
+     * @return int
      *
      * @throws \Exception
      */
@@ -36,7 +36,9 @@ class ServeCommand extends Command
 
         $this->line("<info>Laravel development server started:</info> <http://{$this->host()}:{$this->port()}>");
 
-        passthru($this->serverCommand());
+        passthru($this->serverCommand(), $status);
+
+        return $status;
     }
 
     /**
@@ -46,11 +48,11 @@ class ServeCommand extends Command
      */
     protected function serverCommand()
     {
-        return sprintf('%s -S %s:%s %s/server.php',
+        return sprintf('%s -S %s:%s %s',
             ProcessUtils::escapeArgument((new PhpExecutableFinder)->find(false)),
             $this->host(),
             $this->port(),
-            ProcessUtils::escapeArgument(base_path())
+            ProcessUtils::escapeArgument(base_path('server.php'))
         );
     }
 
@@ -82,9 +84,9 @@ class ServeCommand extends Command
     protected function getOptions()
     {
         return [
-            ['host', null, InputOption::VALUE_OPTIONAL, 'The host address to serve the application on.', '127.0.0.1'],
+            ['host', null, InputOption::VALUE_OPTIONAL, 'The host address to serve the application on', '127.0.0.1'],
 
-            ['port', null, InputOption::VALUE_OPTIONAL, 'The port to serve the application on.', 8000],
+            ['port', null, InputOption::VALUE_OPTIONAL, 'The port to serve the application on', 8000],
         ];
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/VendorPublishCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/VendorPublishCommand.php
index 686f26b7..08d9b9c9 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/VendorPublishCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/VendorPublishCommand.php
@@ -38,10 +38,10 @@ class VendorPublishCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'vendor:publish {--force : Overwrite any existing files.}
-                    {--all : Publish assets for all service providers without prompt.}
-                    {--provider= : The service provider that has assets you want to publish.}
-                    {--tag=* : One or many tags that have assets you want to publish.}';
+    protected $signature = 'vendor:publish {--force : Overwrite any existing files}
+                    {--all : Publish assets for all service providers without prompt}
+                    {--provider= : The service provider that has assets you want to publish}
+                    {--tag=* : One or many tags that have assets you want to publish}';
 
     /**
      * The console command description.
@@ -90,7 +90,7 @@ class VendorPublishCommand extends Command
             return;
         }
 
-        list($this->provider, $this->tags) = [
+        [$this->provider, $this->tags] = [
             $this->option('provider'), (array) $this->option('tag'),
         ];
 
@@ -140,7 +140,7 @@ class VendorPublishCommand extends Command
      */
     protected function parseChoice($choice)
     {
-        list($type, $value) = explode(': ', strip_tags($choice));
+        [$type, $value] = explode(': ', strip_tags($choice));
 
         if ($type == 'Provider') {
             $this->provider = $value;
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/ViewCacheCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ViewCacheCommand.php
new file mode 100644
index 00000000..408d9591
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ViewCacheCommand.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace Illuminate\Foundation\Console;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Collection;
+use Symfony\Component\Finder\Finder;
+use Symfony\Component\Finder\SplFileInfo;
+
+class ViewCacheCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'view:cache';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = "Compile all of the application's Blade templates";
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $this->paths()->each(function ($path) {
+            $this->compileViews($this->bladeFilesIn([$path]));
+        });
+
+        $this->info('Blade templates cached successfully!');
+    }
+
+    /**
+     * Compile the given view files.
+     *
+     * @param  \Illuminate\Support\Collection  $views
+     * @return void
+     */
+    protected function compileViews(Collection $views)
+    {
+        $compiler = $this->laravel['view']->getEngineResolver()->resolve('blade')->getCompiler();
+
+        $views->map(function (SplFileInfo $file) use ($compiler) {
+            $compiler->compile($file->getRealPath());
+        });
+    }
+
+    /**
+     * Get the Blade files in the given path.
+     *
+     * @param  array  $paths
+     * @return \Illuminate\Support\Collection
+     */
+    protected function bladeFilesIn(array $paths)
+    {
+        return collect(
+            Finder::create()
+                ->in($paths)
+                ->exclude('vendor')
+                ->name('*.blade.php')
+                ->files()
+        );
+    }
+
+    /**
+     * Get all of the possible view paths.
+     *
+     * @return \Illuminate\Support\Collection
+     */
+    protected function paths()
+    {
+        $finder = $this->laravel['view']->getFinder();
+
+        return collect($finder->getPaths())->merge(
+            collect($finder->getHints())->flatten()
+        );
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/ViewClearCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ViewClearCommand.php
index 6f3e23ff..251e3937 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/ViewClearCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/ViewClearCommand.php
@@ -46,6 +46,8 @@ class ViewClearCommand extends Command
      * Execute the console command.
      *
      * @return void
+     *
+     * @throws \RuntimeException
      */
     public function handle()
     {
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/channel.stub b/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/channel.stub
new file mode 100644
index 00000000..bf261ccf
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/channel.stub
@@ -0,0 +1,29 @@
+<?php
+
+namespace DummyNamespace;
+
+use NamespacedDummyUserModel;
+
+class DummyClass
+{
+    /**
+     * Create a new channel instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Authenticate the user's access to the channel.
+     *
+     * @param  \NamespacedDummyUserModel  $user
+     * @return array|bool
+     */
+    public function join(DummyUser $user)
+    {
+        //
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/observer.plain.stub b/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/observer.plain.stub
new file mode 100644
index 00000000..daae325c
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/observer.plain.stub
@@ -0,0 +1,8 @@
+<?php
+
+namespace DummyNamespace;
+
+class DummyClass
+{
+    //
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/observer.stub b/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/observer.stub
new file mode 100644
index 00000000..84355ba5
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/observer.stub
@@ -0,0 +1,63 @@
+<?php
+
+namespace DummyNamespace;
+
+use NamespacedDummyModel;
+
+class DummyClass
+{
+    /**
+     * Handle the DocDummyModel "created" event.
+     *
+     * @param  \NamespacedDummyModel  $dummyModel
+     * @return void
+     */
+    public function created(DummyModel $dummyModel)
+    {
+        //
+    }
+
+    /**
+     * Handle the DocDummyModel "updated" event.
+     *
+     * @param  \NamespacedDummyModel  $dummyModel
+     * @return void
+     */
+    public function updated(DummyModel $dummyModel)
+    {
+        //
+    }
+
+    /**
+     * Handle the DocDummyModel "deleted" event.
+     *
+     * @param  \NamespacedDummyModel  $dummyModel
+     * @return void
+     */
+    public function deleted(DummyModel $dummyModel)
+    {
+        //
+    }
+
+    /**
+     * Handle the DocDummyModel "restored" event.
+     *
+     * @param  \NamespacedDummyModel  $dummyModel
+     * @return void
+     */
+    public function restored(DummyModel $dummyModel)
+    {
+        //
+    }
+
+    /**
+     * Handle the DocDummyModel "force deleted" event.
+     *
+     * @param  \NamespacedDummyModel  $dummyModel
+     * @return void
+     */
+    public function forceDeleted(DummyModel $dummyModel)
+    {
+        //
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/policy.stub b/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/policy.stub
index f70e5dc2..300d0ac6 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/policy.stub
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/policy.stub
@@ -11,7 +11,7 @@ class DummyClass
     use HandlesAuthorization;
 
     /**
-     * Determine whether the user can view the dummyModel.
+     * Determine whether the user can view the DocDummyModel.
      *
      * @param  \NamespacedDummyUserModel  $user
      * @param  \NamespacedDummyModel  $dummyModel
@@ -23,7 +23,7 @@ class DummyClass
     }
 
     /**
-     * Determine whether the user can create dummyPluralModel.
+     * Determine whether the user can create DocDummyPluralModel.
      *
      * @param  \NamespacedDummyUserModel  $user
      * @return mixed
@@ -34,7 +34,7 @@ class DummyClass
     }
 
     /**
-     * Determine whether the user can update the dummyModel.
+     * Determine whether the user can update the DocDummyModel.
      *
      * @param  \NamespacedDummyUserModel  $user
      * @param  \NamespacedDummyModel  $dummyModel
@@ -46,7 +46,7 @@ class DummyClass
     }
 
     /**
-     * Determine whether the user can delete the dummyModel.
+     * Determine whether the user can delete the DocDummyModel.
      *
      * @param  \NamespacedDummyUserModel  $user
      * @param  \NamespacedDummyModel  $dummyModel
@@ -56,4 +56,28 @@ class DummyClass
     {
         //
     }
+
+    /**
+     * Determine whether the user can restore the DocDummyModel.
+     *
+     * @param  \NamespacedDummyUserModel  $user
+     * @param  \NamespacedDummyModel  $dummyModel
+     * @return mixed
+     */
+    public function restore(DummyUser $user, DummyModel $dummyModel)
+    {
+        //
+    }
+
+    /**
+     * Determine whether the user can permanently delete the DocDummyModel.
+     *
+     * @param  \NamespacedDummyUserModel  $user
+     * @param  \NamespacedDummyModel  $dummyModel
+     * @return mixed
+     */
+    public function forceDelete(DummyUser $user, DummyModel $dummyModel)
+    {
+        //
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/provider.stub b/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/provider.stub
index 4303cf7b..23b237c9 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/provider.stub
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/provider.stub
@@ -7,7 +7,7 @@ use Illuminate\Support\ServiceProvider;
 class DummyClass extends ServiceProvider
 {
     /**
-     * Bootstrap the application services.
+     * Bootstrap services.
      *
      * @return void
      */
@@ -17,7 +17,7 @@ class DummyClass extends ServiceProvider
     }
 
     /**
-     * Register the application services.
+     * Register services.
      *
      * @return void
      */
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/resource.stub b/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/resource.stub
index ac8d2058..99703653 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/resource.stub
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Console/stubs/resource.stub
@@ -2,9 +2,9 @@
 
 namespace DummyNamespace;
 
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class DummyClass extends Resource
+class DummyClass extends JsonResource
 {
     /**
      * Transform the resource into an array.
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/Handler.php b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/Handler.php
index f3813825..4a2d2853 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/Handler.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/Handler.php
@@ -11,9 +11,9 @@ use Illuminate\Http\Response;
 use Illuminate\Routing\Router;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Filesystem\Filesystem;
+use Illuminate\Support\Facades\View;
+use Illuminate\Support\ViewErrorBag;
 use Illuminate\Http\RedirectResponse;
-use Whoops\Handler\PrettyPageHandler;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Contracts\Support\Responsable;
@@ -27,6 +27,7 @@ use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\Console\Application as ConsoleApplication;
 use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\Debug\ExceptionHandler as SymfonyExceptionHandler;
 use Illuminate\Contracts\Debug\ExceptionHandler as ExceptionHandlerContract;
@@ -105,7 +106,7 @@ class Handler implements ExceptionHandlerContract
         try {
             $logger = $this->container->make(LoggerInterface::class);
         } catch (Exception $ex) {
-            throw $e; // throw the original exception
+            throw $e;
         }
 
         $logger->error(
@@ -162,7 +163,7 @@ class Handler implements ExceptionHandlerContract
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Exception  $e
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @return \Illuminate\Http\Response|\Symfony\Component\HttpFoundation\Response
      */
     public function render($request, Exception $e)
     {
@@ -217,7 +218,7 @@ class Handler implements ExceptionHandlerContract
     {
         return $request->expectsJson()
                     ? response()->json(['message' => $exception->getMessage()], 401)
-                    : redirect()->guest(route('login'));
+                    : redirect()->guest($exception->redirectTo() ?? route('login'));
     }
 
     /**
@@ -247,14 +248,9 @@ class Handler implements ExceptionHandlerContract
      */
     protected function invalid($request, ValidationException $exception)
     {
-        $url = $exception->redirectTo ?? url()->previous();
-
-        return redirect($url)
-                ->withInput($request->except($this->dontFlash))
-                ->withErrors(
-                    $exception->errors(),
-                    $exception->errorBag
-                );
+        return redirect($exception->redirectTo ?? url()->previous())
+                    ->withInput($request->except($this->dontFlash))
+                    ->withErrors($exception->errors(), $exception->errorBag);
     }
 
     /**
@@ -282,9 +278,7 @@ class Handler implements ExceptionHandlerContract
     protected function prepareResponse($request, Exception $e)
     {
         if (! $this->isHttpException($e) && config('app.debug')) {
-            return $this->toIlluminateResponse(
-                $this->convertExceptionToResponse($e), $e
-            );
+            return $this->toIlluminateResponse($this->convertExceptionToResponse($e), $e);
         }
 
         if (! $this->isHttpException($e)) {
@@ -304,21 +298,28 @@ class Handler implements ExceptionHandlerContract
      */
     protected function convertExceptionToResponse(Exception $e)
     {
-        $headers = $this->isHttpException($e) ? $e->getHeaders() : [];
-
-        $statusCode = $this->isHttpException($e) ? $e->getStatusCode() : 500;
+        return SymfonyResponse::create(
+            $this->renderExceptionContent($e),
+            $this->isHttpException($e) ? $e->getStatusCode() : 500,
+            $this->isHttpException($e) ? $e->getHeaders() : []
+        );
+    }
 
+    /**
+     * Get the response content for the given exception.
+     *
+     * @param  \Exception  $e
+     * @return string
+     */
+    protected function renderExceptionContent(Exception $e)
+    {
         try {
-            $content = config('app.debug') && class_exists(Whoops::class)
-                    ? $this->renderExceptionWithWhoops($e)
-                    : $this->renderExceptionWithSymfony($e, config('app.debug'));
+            return config('app.debug') && class_exists(Whoops::class)
+                        ? $this->renderExceptionWithWhoops($e)
+                        : $this->renderExceptionWithSymfony($e, config('app.debug'));
         } catch (Exception $e) {
-            $content = $content ?? $this->renderExceptionWithSymfony($e, config('app.debug'));
+            return $this->renderExceptionWithSymfony($e, config('app.debug'));
         }
-
-        return SymfonyResponse::create(
-            $content, $statusCode, $headers
-        );
     }
 
     /**
@@ -335,8 +336,17 @@ class Handler implements ExceptionHandlerContract
             $whoops->writeToOutput(false);
 
             $whoops->allowQuit(false);
-        }
-        )->handleException($e);
+        })->handleException($e);
+    }
+
+    /**
+     * Get the Whoops handler for the application.
+     *
+     * @return \Whoops\Handler\Handler
+     */
+    protected function whoopsHandler()
+    {
+        return (new WhoopsHandler)->forDebug();
     }
 
     /**
@@ -354,56 +364,37 @@ class Handler implements ExceptionHandlerContract
     }
 
     /**
-     * Get the Whoops handler for the application.
+     * Render the given HttpException.
      *
-     * @return \Whoops\Handler\Handler
+     * @param  \Symfony\Component\HttpKernel\Exception\HttpException  $e
+     * @return \Symfony\Component\HttpFoundation\Response
      */
-    protected function whoopsHandler()
+    protected function renderHttpException(HttpException $e)
     {
-        return tap(new PrettyPageHandler, function ($handler) {
-            $files = new Filesystem;
-
-            $handler->handleUnconditionally(true);
-
-            foreach (config('app.debug_blacklist', []) as $key => $secrets) {
-                foreach ($secrets as $secret) {
-                    $handler->blacklist($key, $secret);
-                }
-            }
+        $this->registerErrorViewPaths();
 
-            if (config('app.editor', false)) {
-                $handler->setEditor(config('app.editor'));
-            }
+        if (view()->exists($view = "errors::{$e->getStatusCode()}")) {
+            return response()->view($view, [
+                'errors' => new ViewErrorBag,
+                'exception' => $e,
+            ], $e->getStatusCode(), $e->getHeaders());
+        }
 
-            $handler->setApplicationPaths(
-                array_flip(Arr::except(
-                    array_flip($files->directories(base_path())), [base_path('vendor')]
-                ))
-            );
-        });
+        return $this->convertExceptionToResponse($e);
     }
 
     /**
-     * Render the given HttpException.
+     * Register the error template hint paths.
      *
-     * @param  \Symfony\Component\HttpKernel\Exception\HttpException  $e
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @return void
      */
-    protected function renderHttpException(HttpException $e)
+    protected function registerErrorViewPaths()
     {
-        $status = $e->getStatusCode();
-
         $paths = collect(config('view.paths'));
 
-        view()->replaceNamespace('errors', $paths->map(function ($path) {
+        View::replaceNamespace('errors', $paths->map(function ($path) {
             return "{$path}/errors";
         })->push(__DIR__.'/views')->all());
-
-        if (view()->exists($view = "errors::{$status}")) {
-            return response()->view($view, ['exception' => $e], $status, $e->getHeaders());
-        }
-
-        return $this->convertExceptionToResponse($e);
     }
 
     /**
@@ -437,12 +428,10 @@ class Handler implements ExceptionHandlerContract
      */
     protected function prepareJsonResponse($request, Exception $e)
     {
-        $status = $this->isHttpException($e) ? $e->getStatusCode() : 500;
-
-        $headers = $this->isHttpException($e) ? $e->getHeaders() : [];
-
         return new JsonResponse(
-            $this->convertExceptionToArray($e), $status, $headers,
+            $this->convertExceptionToArray($e),
+            $this->isHttpException($e) ? $e->getStatusCode() : 500,
+            $this->isHttpException($e) ? $e->getHeaders() : [],
             JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES
         );
     }
@@ -488,6 +477,6 @@ class Handler implements ExceptionHandlerContract
      */
     protected function isHttpException(Exception $e)
     {
-        return $e instanceof HttpException;
+        return $e instanceof HttpExceptionInterface;
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/WhoopsHandler.php b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/WhoopsHandler.php
new file mode 100644
index 00000000..b94a7acc
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/WhoopsHandler.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Illuminate\Foundation\Exceptions;
+
+use Illuminate\Support\Arr;
+use Illuminate\Filesystem\Filesystem;
+use Whoops\Handler\PrettyPageHandler;
+
+class WhoopsHandler
+{
+    /**
+     * Create a new Whoops handler for debug mode.
+     *
+     * @return \Whoops\Handler\PrettyPageHandler
+     */
+    public function forDebug()
+    {
+        return tap(new PrettyPageHandler, function ($handler) {
+            $handler->handleUnconditionally(true);
+
+            $this->registerApplicationPaths($handler)
+                 ->registerBlacklist($handler)
+                 ->registerEditor($handler);
+        });
+    }
+
+    /**
+     * Register the application paths with the handler.
+     *
+     * @param  \Whoops\Handler\PrettyPageHandler $handler
+     * @return $this
+     */
+    protected function registerApplicationPaths($handler)
+    {
+        $handler->setApplicationPaths(
+            array_flip($this->directoriesExceptVendor())
+        );
+
+        return $this;
+    }
+
+    /**
+     * Get the application paths except for the "vendor" directory.
+     *
+     * @return array
+     */
+    protected function directoriesExceptVendor()
+    {
+        return Arr::except(
+            array_flip((new Filesystem)->directories(base_path())),
+            [base_path('vendor')]
+        );
+    }
+
+    /**
+     * Register the blacklist with the handler.
+     *
+     * @param  \Whoops\Handler\PrettyPageHandler $handler
+     * @return $this
+     */
+    protected function registerBlacklist($handler)
+    {
+        foreach (config('app.debug_blacklist', []) as $key => $secrets) {
+            foreach ($secrets as $secret) {
+                $handler->blacklist($key, $secret);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Register the editor with the handler.
+     *
+     * @param  \Whoops\Handler\PrettyPageHandler $handler
+     * @return $this
+     */
+    protected function registerEditor($handler)
+    {
+        if (config('app.editor', false)) {
+            $handler->setEditor(config('app.editor'));
+        }
+
+        return $this;
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/401.blade.php b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/401.blade.php
new file mode 100644
index 00000000..6da90621
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/401.blade.php
@@ -0,0 +1,11 @@
+@extends('errors::illustrated-layout')
+
+@section('code', '401')
+@section('title', __('Unauthorized'))
+
+@section('image')
+<div style="background-image: url('/svg/403.svg');" class="absolute pin bg-cover bg-no-repeat md:bg-left lg:bg-center">
+</div>
+@endsection
+
+@section('message', __('Sorry, you are not authorized to access this page.'))
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/403.blade.php b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/403.blade.php
new file mode 100644
index 00000000..0c8124f3
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/403.blade.php
@@ -0,0 +1,11 @@
+@extends('errors::illustrated-layout')
+
+@section('code', '403')
+@section('title', __('Forbidden'))
+
+@section('image')
+<div style="background-image: url('/svg/403.svg');" class="absolute pin bg-cover bg-no-repeat md:bg-left lg:bg-center">
+</div>
+@endsection
+
+@section('message', __('Sorry, you are forbidden to access this page.'))
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/404.blade.php b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/404.blade.php
index ff4eb30f..0398a98e 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/404.blade.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/404.blade.php
@@ -1,5 +1,11 @@
-@extends('errors::layout')
+@extends('errors::illustrated-layout')
 
-@section('title', 'Page Not Found')
+@section('code', '404')
+@section('title', __('Page Not Found'))
 
-@section('message', 'Sorry, the page you are looking for could not be found.')
+@section('image')
+<div style="background-image: url('/svg/404.svg');" class="absolute pin bg-cover bg-no-repeat md:bg-left lg:bg-center">
+</div>
+@endsection
+
+@section('message', __('Sorry, the page you are looking for could not be found.'))
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/419.blade.php b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/419.blade.php
index 84258cc9..1671bffb 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/419.blade.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/419.blade.php
@@ -1,9 +1,11 @@
-@extends('errors::layout')
+@extends('errors::illustrated-layout')
 
-@section('title', 'Page Expired')
+@section('code', '419')
+@section('title', __('Page Expired'))
 
-@section('message')
-    The page has expired due to inactivity.
-    <br/><br/>
-    Please refresh and try again.
-@stop
+@section('image')
+<div style="background-image: url('/svg/403.svg');" class="absolute pin bg-cover bg-no-repeat md:bg-left lg:bg-center">
+</div>
+@endsection
+
+@section('message', __('Sorry, your session has expired. Please refresh and try again.'))
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/429.blade.php b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/429.blade.php
index fc1930fd..a9f3caa5 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/429.blade.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/429.blade.php
@@ -1,5 +1,11 @@
-@extends('errors::layout')
+@extends('errors::illustrated-layout')
 
-@section('title', 'Error')
+@section('code', '429')
+@section('title', __('Too Many Requests'))
 
-@section('message', 'Too many requests.')
+@section('image')
+<div style="background-image: url('/svg/403.svg');" class="absolute pin bg-cover bg-no-repeat md:bg-left lg:bg-center">
+</div>
+@endsection
+
+@section('message', __('Sorry, you are making too many requests to our servers.'))
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/500.blade.php b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/500.blade.php
index 333e9880..8c5e2d5d 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/500.blade.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/500.blade.php
@@ -1,5 +1,11 @@
-@extends('errors::layout')
+@extends('errors::illustrated-layout')
 
-@section('title', 'Error')
+@section('code', '500')
+@section('title', __('Error'))
 
-@section('message', 'Whoops, looks like something went wrong.')
+@section('image')
+<div style="background-image: url('/svg/500.svg');" class="absolute pin bg-cover bg-no-repeat md:bg-left lg:bg-center">
+</div>
+@endsection
+
+@section('message', __('Whoops, something went wrong on our servers.'))
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/503.blade.php b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/503.blade.php
index 7d7d211f..8272e0e9 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/503.blade.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/503.blade.php
@@ -1,5 +1,11 @@
-@extends('errors::layout')
+@extends('errors::illustrated-layout')
 
-@section('title', 'Service Unavailable')
+@section('code', '503')
+@section('title', __('Service Unavailable'))
 
-@section('message', 'Be right back.')
+@section('image')
+<div style="background-image: url('/svg/503.svg');" class="absolute pin bg-cover bg-no-repeat md:bg-left lg:bg-center">
+</div>
+@endsection
+
+@section('message', __($exception->getMessage() ?: 'Sorry, we are doing some maintenance. Please check back soon.'))
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/illustrated-layout.blade.php b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/illustrated-layout.blade.php
new file mode 100644
index 00000000..49d45bf4
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/illustrated-layout.blade.php
@@ -0,0 +1,485 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <title>@yield('title')</title>
+
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
+        <!-- Fonts -->
+        <link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet" type="text/css">
+
+        <!-- Styles -->
+        <style>
+        html {
+            line-height: 1.15;
+                -ms-text-size-adjust: 100%;
+            -webkit-text-size-adjust: 100%;
+        }
+
+        body {
+            margin: 0;
+        }
+
+        header,
+        nav,
+        section {
+            display: block;
+        }
+
+        figcaption,
+        main {
+            display: block;
+        }
+
+        a {
+            background-color: transparent;
+            -webkit-text-decoration-skip: objects;
+        }
+
+        strong {
+            font-weight: inherit;
+        }
+
+        strong {
+            font-weight: bolder;
+        }
+
+        code {
+            font-family: monospace, monospace;
+            font-size: 1em;
+        }
+
+        dfn {
+            font-style: italic;
+        }
+
+        svg:not(:root) {
+            overflow: hidden;
+        }
+
+        button,
+        input {
+            font-family: sans-serif;
+            font-size: 100%;
+            line-height: 1.15;
+            margin: 0;
+        }
+
+        button,
+        input {
+            overflow: visible;
+        }
+
+        button {
+            text-transform: none;
+        }
+
+        button,
+        html [type="button"],
+        [type="reset"],
+        [type="submit"] {
+            -webkit-appearance: button;
+        }
+
+        button::-moz-focus-inner,
+        [type="button"]::-moz-focus-inner,
+        [type="reset"]::-moz-focus-inner,
+        [type="submit"]::-moz-focus-inner {
+            border-style: none;
+            padding: 0;
+        }
+
+        button:-moz-focusring,
+        [type="button"]:-moz-focusring,
+        [type="reset"]:-moz-focusring,
+        [type="submit"]:-moz-focusring {
+            outline: 1px dotted ButtonText;
+        }
+
+        legend {
+            -webkit-box-sizing: border-box;
+                    box-sizing: border-box;
+            color: inherit;
+            display: table;
+            max-width: 100%;
+            padding: 0;
+            white-space: normal;
+        }
+
+        [type="checkbox"],
+        [type="radio"] {
+            -webkit-box-sizing: border-box;
+                    box-sizing: border-box;
+            padding: 0;
+        }
+
+        [type="number"]::-webkit-inner-spin-button,
+        [type="number"]::-webkit-outer-spin-button {
+            height: auto;
+        }
+
+        [type="search"] {
+            -webkit-appearance: textfield;
+            outline-offset: -2px;
+        }
+
+        [type="search"]::-webkit-search-cancel-button,
+        [type="search"]::-webkit-search-decoration {
+            -webkit-appearance: none;
+        }
+
+        ::-webkit-file-upload-button {
+            -webkit-appearance: button;
+            font: inherit;
+        }
+
+        menu {
+            display: block;
+        }
+
+        canvas {
+            display: inline-block;
+        }
+
+        template {
+            display: none;
+        }
+
+        [hidden] {
+            display: none;
+        }
+
+        html {
+            -webkit-box-sizing: border-box;
+                    box-sizing: border-box;
+            font-family: sans-serif;
+        }
+
+        *,
+        *::before,
+        *::after {
+            -webkit-box-sizing: inherit;
+                    box-sizing: inherit;
+        }
+
+        p {
+            margin: 0;
+        }
+
+        button {
+            background: transparent;
+            padding: 0;
+        }
+
+        button:focus {
+            outline: 1px dotted;
+            outline: 5px auto -webkit-focus-ring-color;
+        }
+
+        *,
+        *::before,
+        *::after {
+            border-width: 0;
+            border-style: solid;
+            border-color: #dae1e7;
+        }
+
+        button,
+        [type="button"],
+        [type="reset"],
+        [type="submit"] {
+            border-radius: 0;
+        }
+
+        button,
+        input {
+            font-family: inherit;
+        }
+
+        input::-webkit-input-placeholder {
+            color: inherit;
+            opacity: .5;
+        }
+
+        input:-ms-input-placeholder {
+            color: inherit;
+            opacity: .5;
+        }
+
+        input::-ms-input-placeholder {
+            color: inherit;
+            opacity: .5;
+        }
+
+        input::placeholder {
+            color: inherit;
+            opacity: .5;
+        }
+
+        button,
+        [role=button] {
+            cursor: pointer;
+        }
+
+        .bg-transparent {
+            background-color: transparent;
+        }
+
+        .bg-white {
+            background-color: #fff;
+        }
+
+        .bg-teal-light {
+            background-color: #64d5ca;
+        }
+
+        .bg-blue-dark {
+            background-color: #2779bd;
+        }
+
+        .bg-indigo-light {
+            background-color: #7886d7;
+        }
+
+        .bg-purple-light {
+            background-color: #a779e9;
+        }
+
+        .bg-no-repeat {
+            background-repeat: no-repeat;
+        }
+
+        .bg-cover {
+            background-size: cover;
+        }
+
+        .border-grey-light {
+            border-color: #dae1e7;
+        }
+
+        .hover\:border-grey:hover {
+            border-color: #b8c2cc;
+        }
+
+        .rounded-lg {
+            border-radius: .5rem;
+        }
+
+        .border-2 {
+            border-width: 2px;
+        }
+
+        .hidden {
+            display: none;
+        }
+
+        .flex {
+            display: -webkit-box;
+            display: -ms-flexbox;
+            display: flex;
+        }
+
+        .items-center {
+            -webkit-box-align: center;
+                -ms-flex-align: center;
+                    align-items: center;
+        }
+
+        .justify-center {
+            -webkit-box-pack: center;
+                -ms-flex-pack: center;
+                    justify-content: center;
+        }
+
+        .font-sans {
+            font-family: Nunito, sans-serif;
+        }
+
+        .font-light {
+            font-weight: 300;
+        }
+
+        .font-bold {
+            font-weight: 700;
+        }
+
+        .font-black {
+            font-weight: 900;
+        }
+
+        .h-1 {
+            height: .25rem;
+        }
+
+        .leading-normal {
+            line-height: 1.5;
+        }
+
+        .m-8 {
+            margin: 2rem;
+        }
+
+        .my-3 {
+            margin-top: .75rem;
+            margin-bottom: .75rem;
+        }
+
+        .mb-8 {
+            margin-bottom: 2rem;
+        }
+
+        .max-w-sm {
+            max-width: 30rem;
+        }
+
+        .min-h-screen {
+            min-height: 100vh;
+        }
+
+        .py-3 {
+            padding-top: .75rem;
+            padding-bottom: .75rem;
+        }
+
+        .px-6 {
+            padding-left: 1.5rem;
+            padding-right: 1.5rem;
+        }
+
+        .pb-full {
+            padding-bottom: 100%;
+        }
+
+        .absolute {
+            position: absolute;
+        }
+
+        .relative {
+            position: relative;
+        }
+
+        .pin {
+            top: 0;
+            right: 0;
+            bottom: 0;
+            left: 0;
+        }
+
+        .text-black {
+            color: #22292f;
+        }
+
+        .text-grey-darkest {
+            color: #3d4852;
+        }
+
+        .text-grey-darker {
+            color: #606f7b;
+        }
+
+        .text-2xl {
+            font-size: 1.5rem;
+        }
+
+        .text-5xl {
+            font-size: 3rem;
+        }
+
+        .uppercase {
+            text-transform: uppercase;
+        }
+
+        .antialiased {
+            -webkit-font-smoothing: antialiased;
+            -moz-osx-font-smoothing: grayscale;
+        }
+
+        .tracking-wide {
+            letter-spacing: .05em;
+        }
+
+        .w-16 {
+            width: 4rem;
+        }
+
+        .w-full {
+            width: 100%;
+        }
+
+        @media (min-width: 768px) {
+            .md\:bg-left {
+                background-position: left;
+            }
+
+            .md\:bg-right {
+                background-position: right;
+            }
+
+            .md\:flex {
+                display: -webkit-box;
+                display: -ms-flexbox;
+                display: flex;
+            }
+
+            .md\:my-6 {
+                margin-top: 1.5rem;
+                margin-bottom: 1.5rem;
+            }
+
+            .md\:min-h-screen {
+                min-height: 100vh;
+            }
+
+            .md\:pb-0 {
+                padding-bottom: 0;
+            }
+
+            .md\:text-3xl {
+                font-size: 1.875rem;
+            }
+
+            .md\:text-15xl {
+                font-size: 9rem;
+            }
+
+            .md\:w-1\/2 {
+                width: 50%;
+            }
+        }
+
+        @media (min-width: 992px) {
+            .lg\:bg-center {
+                background-position: center;
+            }
+        }
+        </style>
+    </head>
+    <body class="antialiased font-sans">
+        <div class="md:flex min-h-screen">
+            <div class="w-full md:w-1/2 bg-white flex items-center justify-center">
+                <div class="max-w-sm m-8">
+                    <div class="text-black text-5xl md:text-15xl font-black">
+                        @yield('code', __('Oh no'))
+                    </div>
+
+                    <div class="w-16 h-1 bg-purple-light my-3 md:my-6"></div>
+
+                    <p class="text-grey-darker text-2xl md:text-3xl font-light mb-8 leading-normal">
+                        @yield('message')
+                    </p>
+
+                    <a href="{{ url('/') }}">
+                        <button class="bg-transparent text-grey-darkest font-bold uppercase tracking-wide py-3 px-6 border-2 border-grey-light hover:border-grey rounded-lg">
+                            {{ __('Go Home') }}
+                        </button>
+                    </a>
+                </div>
+            </div>
+
+            <div class="relative pb-full md:flex md:pb-0 md:min-h-screen w-full md:w-1/2">
+                @yield('image')
+            </div>
+        </div>
+    </body>
+</html>
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/layout.blade.php b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/layout.blade.php
index 27513d0b..90d4ad24 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/layout.blade.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/layout.blade.php
@@ -2,20 +2,19 @@
 <html lang="en">
     <head>
         <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
         <title>@yield('title')</title>
 
         <!-- Fonts -->
-        <link href="https://fonts.googleapis.com/css?family=Raleway:100,600" rel="stylesheet" type="text/css">
+        <link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet" type="text/css">
 
         <!-- Styles -->
         <style>
             html, body {
                 background-color: #fff;
                 color: #636b6f;
-                font-family: 'Raleway', sans-serif;
+                font-family: 'Nunito', sans-serif;
                 font-weight: 100;
                 height: 100vh;
                 margin: 0;
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Http/FormRequest.php b/vendor/laravel/framework/src/Illuminate/Foundation/Http/FormRequest.php
index 3f57a2a8..53a4ec83 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Http/FormRequest.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Http/FormRequest.php
@@ -150,7 +150,7 @@ class FormRequest extends Request implements ValidatesWhenResolved
             return $this->container->call([$this, 'authorize']);
         }
 
-        return false;
+        return true;
     }
 
     /**
@@ -172,11 +172,7 @@ class FormRequest extends Request implements ValidatesWhenResolved
      */
     public function validated()
     {
-        $rules = $this->container->call([$this, 'rules']);
-
-        return $this->only(collect($rules)->keys()->map(function ($rule) {
-            return str_contains($rule, '.') ? explode('.', $rule)[0] : $rule;
-        })->unique()->toArray());
+        return $this->getValidatorInstance()->validate();
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php b/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php
index 04f0e4a0..f8460a55 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php
@@ -210,7 +210,7 @@ class Kernel implements KernelContract
                 continue;
             }
 
-            list($name) = $this->parseMiddleware($middleware);
+            [$name] = $this->parseMiddleware($middleware);
 
             $instance = $this->app->make($name);
 
@@ -243,7 +243,7 @@ class Kernel implements KernelContract
      */
     protected function parseMiddleware($middleware)
     {
-        list($name, $parameters) = array_pad(explode(':', $middleware, 2), 2, []);
+        [$name, $parameters] = array_pad(explode(':', $middleware, 2), 2, []);
 
         if (is_string($parameters)) {
             $parameters = explode(',', $parameters);
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/CheckForMaintenanceMode.php b/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/CheckForMaintenanceMode.php
index 6de75096..037e5a47 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/CheckForMaintenanceMode.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/CheckForMaintenanceMode.php
@@ -3,6 +3,7 @@
 namespace Illuminate\Foundation\Http\Middleware;
 
 use Closure;
+use Symfony\Component\HttpFoundation\IpUtils;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Foundation\Http\Exceptions\MaintenanceModeException;
 
@@ -15,6 +16,13 @@ class CheckForMaintenanceMode
      */
     protected $app;
 
+    /**
+     * The URIs that should be accessible while maintenance mode is enabled.
+     *
+     * @var array
+     */
+    protected $except = [];
+
     /**
      * Create a new middleware instance.
      *
@@ -40,9 +48,38 @@ class CheckForMaintenanceMode
         if ($this->app->isDownForMaintenance()) {
             $data = json_decode(file_get_contents($this->app->storagePath().'/framework/down'), true);
 
+            if (isset($data['allowed']) && IpUtils::checkIp($request->ip(), (array) $data['allowed'])) {
+                return $next($request);
+            }
+
+            if ($this->inExceptArray($request)) {
+                return $next($request);
+            }
+
             throw new MaintenanceModeException($data['time'], $data['retry'], $data['message']);
         }
 
         return $next($request);
     }
+
+    /**
+     * Determine if the request has a URI that should be accessible in maintenance mode.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return bool
+     */
+    protected function inExceptArray($request)
+    {
+        foreach ($this->except as $except) {
+            if ($except !== '/') {
+                $except = trim($except, '/');
+            }
+
+            if ($request->fullUrlIs($except) || $request->is($except)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/TransformsRequest.php b/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/TransformsRequest.php
index 0d3c6c13..4c1c4920 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/TransformsRequest.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/TransformsRequest.php
@@ -19,6 +19,7 @@ class TransformsRequest
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Closure  $next
+     * @param  array  ...$attributes
      * @return mixed
      */
     public function handle($request, Closure $next, ...$attributes)
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php b/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php
index a33e2095..2c21bcfb 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php
@@ -8,6 +8,7 @@ use Illuminate\Support\InteractsWithTime;
 use Symfony\Component\HttpFoundation\Cookie;
 use Illuminate\Contracts\Encryption\Encrypter;
 use Illuminate\Session\TokenMismatchException;
+use Illuminate\Cookie\Middleware\EncryptCookies;
 
 class VerifyCsrfToken
 {
@@ -34,6 +35,13 @@ class VerifyCsrfToken
      */
     protected $except = [];
 
+    /**
+     * Indicates whether the XSRF-TOKEN cookie should be set on the response.
+     *
+     * @var bool
+     */
+    protected $addHttpCookie = true;
+
     /**
      * Create a new middleware instance.
      *
@@ -64,7 +72,11 @@ class VerifyCsrfToken
             $this->inExceptArray($request) ||
             $this->tokensMatch($request)
         ) {
-            return $this->addCookieToResponse($request, $next($request));
+            return tap($next($request), function ($response) use ($request) {
+                if ($this->shouldAddXsrfTokenCookie()) {
+                    $this->addCookieToResponse($request, $response);
+                }
+            });
         }
 
         throw new TokenMismatchException;
@@ -138,12 +150,22 @@ class VerifyCsrfToken
         $token = $request->input('_token') ?: $request->header('X-CSRF-TOKEN');
 
         if (! $token && $header = $request->header('X-XSRF-TOKEN')) {
-            $token = $this->encrypter->decrypt($header);
+            $token = $this->encrypter->decrypt($header, static::serialized());
         }
 
         return $token;
     }
 
+    /**
+     * Determine if the cookie should be added to the response.
+     *
+     * @return bool
+     */
+    public function shouldAddXsrfTokenCookie()
+    {
+        return $this->addHttpCookie;
+    }
+
     /**
      * Add the CSRF token to the response cookies.
      *
@@ -164,4 +186,14 @@ class VerifyCsrfToken
 
         return $response;
     }
+
+    /**
+     * Determine if the cookie contents should be serialized.
+     *
+     * @return bool
+     */
+    public static function serialized()
+    {
+        return EncryptCookies::serialized('XSRF-TOKEN');
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Inspiring.php b/vendor/laravel/framework/src/Illuminate/Foundation/Inspiring.php
index 5216088a..61258cb4 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Inspiring.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Inspiring.php
@@ -13,6 +13,8 @@ class Inspiring
      *
      * May McGinnis always control the board. #LaraconUS2015
      *
+     * RIP Charlie - Feb 6, 2018
+     *
      * @return string
      */
     public static function quote()
@@ -29,6 +31,8 @@ class Inspiring
             'It is quality rather than quantity that matters. - Lucius Annaeus Seneca',
             'Genius is one percent inspiration and ninety-nine percent perspiration. - Thomas Edison',
             'Computer science is no more about computers than astronomy is about telescopes. - Edsger Dijkstra',
+            'It always seems impossible until it is done. - Nelson Mandela',
+            'Act only according to that maxim whereby you can, at the same time, will that it should become a universal law. - Immanuel Kant',
         ])->random();
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/PackageManifest.php b/vendor/laravel/framework/src/Illuminate/Foundation/PackageManifest.php
index 0c488011..5a86e592 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/PackageManifest.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/PackageManifest.php
@@ -97,6 +97,8 @@ class PackageManifest
             $this->build();
         }
 
+        $this->files->get($this->manifestPath, true);
+
         return $this->manifest = file_exists($this->manifestPath) ?
             $this->files->getRequire($this->manifestPath) : [];
     }
@@ -157,6 +159,7 @@ class PackageManifest
      *
      * @param  array  $manifest
      * @return void
+     *
      * @throws \Exception
      */
     protected function write(array $manifest)
@@ -166,7 +169,8 @@ class PackageManifest
         }
 
         $this->files->put(
-            $this->manifestPath, '<?php return '.var_export($manifest, true).';'
+            $this->manifestPath, '<?php return '.var_export($manifest, true).';',
+            true
         );
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ArtisanServiceProvider.php b/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ArtisanServiceProvider.php
index d7174081..f5fe7609 100755
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ArtisanServiceProvider.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Providers/ArtisanServiceProvider.php
@@ -22,12 +22,14 @@ use Illuminate\Foundation\Console\TestMakeCommand;
 use Illuminate\Foundation\Console\EventMakeCommand;
 use Illuminate\Foundation\Console\ModelMakeCommand;
 use Illuminate\Foundation\Console\RouteListCommand;
+use Illuminate\Foundation\Console\ViewCacheCommand;
 use Illuminate\Foundation\Console\ViewClearCommand;
 use Illuminate\Session\Console\SessionTableCommand;
 use Illuminate\Foundation\Console\PolicyMakeCommand;
 use Illuminate\Foundation\Console\RouteCacheCommand;
 use Illuminate\Foundation\Console\RouteClearCommand;
 use Illuminate\Console\Scheduling\ScheduleRunCommand;
+use Illuminate\Foundation\Console\ChannelMakeCommand;
 use Illuminate\Foundation\Console\ConfigCacheCommand;
 use Illuminate\Foundation\Console\ConfigClearCommand;
 use Illuminate\Foundation\Console\ConsoleMakeCommand;
@@ -38,11 +40,13 @@ use Illuminate\Foundation\Console\StorageLinkCommand;
 use Illuminate\Routing\Console\ControllerMakeCommand;
 use Illuminate\Routing\Console\MiddlewareMakeCommand;
 use Illuminate\Foundation\Console\ListenerMakeCommand;
+use Illuminate\Foundation\Console\ObserverMakeCommand;
 use Illuminate\Foundation\Console\ProviderMakeCommand;
 use Illuminate\Foundation\Console\ResourceMakeCommand;
 use Illuminate\Foundation\Console\ClearCompiledCommand;
 use Illuminate\Foundation\Console\EventGenerateCommand;
 use Illuminate\Foundation\Console\ExceptionMakeCommand;
+use Illuminate\Foundation\Console\OptimizeClearCommand;
 use Illuminate\Foundation\Console\VendorPublishCommand;
 use Illuminate\Console\Scheduling\ScheduleFinishCommand;
 use Illuminate\Database\Console\Seeds\SeederMakeCommand;
@@ -100,6 +104,7 @@ class ArtisanServiceProvider extends ServiceProvider
         'MigrateRollback' => 'command.migrate.rollback',
         'MigrateStatus' => 'command.migrate.status',
         'Optimize' => 'command.optimize',
+        'OptimizeClear' => 'command.optimize.clear',
         'PackageDiscover' => 'command.package.discover',
         'Preset' => 'command.preset',
         'QueueFailed' => 'command.queue.failed',
@@ -117,6 +122,7 @@ class ArtisanServiceProvider extends ServiceProvider
         'ScheduleRun' => ScheduleRunCommand::class,
         'StorageLink' => 'command.storage.link',
         'Up' => 'command.up',
+        'ViewCache' => 'command.view.cache',
         'ViewClear' => 'command.view.clear',
     ];
 
@@ -129,6 +135,7 @@ class ArtisanServiceProvider extends ServiceProvider
         'AppName' => 'command.app.name',
         'AuthMake' => 'command.auth.make',
         'CacheTable' => 'command.cache.table',
+        'ChannelMake' => 'command.channel.make',
         'ConsoleMake' => 'command.console.make',
         'ControllerMake' => 'command.controller.make',
         'EventGenerate' => 'command.event.generate',
@@ -143,6 +150,7 @@ class ArtisanServiceProvider extends ServiceProvider
         'ModelMake' => 'command.model.make',
         'NotificationMake' => 'command.notification.make',
         'NotificationTable' => 'command.notification.table',
+        'ObserverMake' => 'command.observer.make',
         'PolicyMake' => 'command.policy.make',
         'ProviderMake' => 'command.provider.make',
         'QueueFailedTable' => 'command.queue.failed-table',
@@ -203,7 +211,7 @@ class ArtisanServiceProvider extends ServiceProvider
      */
     protected function registerAuthMakeCommand()
     {
-        $this->app->singleton('command.auth.make', function ($app) {
+        $this->app->singleton('command.auth.make', function () {
             return new AuthMakeCommand;
         });
     }
@@ -244,6 +252,18 @@ class ArtisanServiceProvider extends ServiceProvider
         });
     }
 
+    /**
+     * Register the command.
+     *
+     * @return void
+     */
+    protected function registerChannelMakeCommand()
+    {
+        $this->app->singleton('command.channel.make', function ($app) {
+            return new ChannelMakeCommand($app['files']);
+        });
+    }
+
     /**
      * Register the command.
      *
@@ -575,6 +595,18 @@ class ArtisanServiceProvider extends ServiceProvider
         });
     }
 
+    /**
+     * Register the command.
+     *
+     * @return void
+     */
+    protected function registerNotificationTableCommand()
+    {
+        $this->app->singleton('command.notification.table', function ($app) {
+            return new NotificationTableCommand($app['files'], $app['composer']);
+        });
+    }
+
     /**
      * Register the command.
      *
@@ -583,7 +615,31 @@ class ArtisanServiceProvider extends ServiceProvider
     protected function registerOptimizeCommand()
     {
         $this->app->singleton('command.optimize', function ($app) {
-            return new OptimizeCommand($app['composer']);
+            return new OptimizeCommand;
+        });
+    }
+
+    /**
+     * Register the command.
+     *
+     * @return void
+     */
+    protected function registerObserverMakeCommand()
+    {
+        $this->app->singleton('command.observer.make', function ($app) {
+            return new ObserverMakeCommand($app['files']);
+        });
+    }
+
+    /**
+     * Register the command.
+     *
+     * @return void
+     */
+    protected function registerOptimizeClearCommand()
+    {
+        $this->app->singleton('command.optimize.clear', function ($app) {
+            return new OptimizeClearCommand;
         });
     }
 
@@ -594,11 +650,23 @@ class ArtisanServiceProvider extends ServiceProvider
      */
     protected function registerPackageDiscoverCommand()
     {
-        $this->app->singleton('command.package.discover', function ($app) {
+        $this->app->singleton('command.package.discover', function () {
             return new PackageDiscoverCommand;
         });
     }
 
+    /**
+     * Register the command.
+     *
+     * @return void
+     */
+    protected function registerPolicyMakeCommand()
+    {
+        $this->app->singleton('command.policy.make', function ($app) {
+            return new PolicyMakeCommand($app['files']);
+        });
+    }
+
     /**
      * Register the command.
      *
@@ -924,22 +992,10 @@ class ArtisanServiceProvider extends ServiceProvider
      *
      * @return void
      */
-    protected function registerViewClearCommand()
-    {
-        $this->app->singleton('command.view.clear', function ($app) {
-            return new ViewClearCommand($app['files']);
-        });
-    }
-
-    /**
-     * Register the command.
-     *
-     * @return void
-     */
-    protected function registerPolicyMakeCommand()
+    protected function registerViewCacheCommand()
     {
-        $this->app->singleton('command.policy.make', function ($app) {
-            return new PolicyMakeCommand($app['files']);
+        $this->app->singleton('command.view.cache', function () {
+            return new ViewCacheCommand;
         });
     }
 
@@ -948,10 +1004,10 @@ class ArtisanServiceProvider extends ServiceProvider
      *
      * @return void
      */
-    protected function registerNotificationTableCommand()
+    protected function registerViewClearCommand()
     {
-        $this->app->singleton('command.notification.table', function ($app) {
-            return new NotificationTableCommand($app['files'], $app['composer']);
+        $this->app->singleton('command.view.clear', function ($app) {
+            return new ViewClearCommand($app['files']);
         });
     }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Providers/FormRequestServiceProvider.php b/vendor/laravel/framework/src/Illuminate/Foundation/Providers/FormRequestServiceProvider.php
index 9e413f10..7028d333 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Providers/FormRequestServiceProvider.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Providers/FormRequestServiceProvider.php
@@ -5,7 +5,6 @@ namespace Illuminate\Foundation\Providers;
 use Illuminate\Routing\Redirector;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Foundation\Http\FormRequest;
-use Symfony\Component\HttpFoundation\Request;
 use Illuminate\Contracts\Validation\ValidatesWhenResolved;
 
 class FormRequestServiceProvider extends ServiceProvider
@@ -28,42 +27,13 @@ class FormRequestServiceProvider extends ServiceProvider
     public function boot()
     {
         $this->app->afterResolving(ValidatesWhenResolved::class, function ($resolved) {
-            $resolved->validate();
+            $resolved->validateResolved();
         });
 
         $this->app->resolving(FormRequest::class, function ($request, $app) {
-            $this->initializeRequest($request, $app['request']);
+            $request = FormRequest::createFrom($app['request'], $request);
 
             $request->setContainer($app)->setRedirector($app->make(Redirector::class));
         });
     }
-
-    /**
-     * Initialize the form request with data from the given request.
-     *
-     * @param  \Illuminate\Foundation\Http\FormRequest  $form
-     * @param  \Symfony\Component\HttpFoundation\Request  $current
-     * @return void
-     */
-    protected function initializeRequest(FormRequest $form, Request $current)
-    {
-        $files = $current->files->all();
-
-        $files = is_array($files) ? array_filter($files) : $files;
-
-        $form->initialize(
-            $current->query->all(), $current->request->all(), $current->attributes->all(),
-            $current->cookies->all(), $files, $current->server->all(), $current->getContent()
-        );
-
-        $form->setJson($current->json());
-
-        if ($session = $current->getSession()) {
-            $form->setLaravelSession($session);
-        }
-
-        $form->setUserResolver($current->getUserResolver());
-
-        $form->setRouteResolver($current->getRouteResolver());
-    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Providers/FoundationServiceProvider.php b/vendor/laravel/framework/src/Illuminate/Foundation/Providers/FoundationServiceProvider.php
index 9b5c6799..b12c1799 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Providers/FoundationServiceProvider.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Providers/FoundationServiceProvider.php
@@ -3,6 +3,7 @@
 namespace Illuminate\Foundation\Providers;
 
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\URL;
 use Illuminate\Support\AggregateServiceProvider;
 
 class FoundationServiceProvider extends AggregateServiceProvider
@@ -25,7 +26,8 @@ class FoundationServiceProvider extends AggregateServiceProvider
     {
         parent::register();
 
-        $this->registerRequestValidate();
+        $this->registerRequestValidation();
+        $this->registerRequestSignatureValidation();
     }
 
     /**
@@ -33,14 +35,22 @@ class FoundationServiceProvider extends AggregateServiceProvider
      *
      * @return void
      */
-    public function registerRequestValidate()
+    public function registerRequestValidation()
     {
         Request::macro('validate', function (array $rules, ...$params) {
-            validator()->validate($this->all(), $rules, ...$params);
+            return validator()->validate($this->all(), $rules, ...$params);
+        });
+    }
 
-            return $this->only(collect($rules)->keys()->map(function ($rule) {
-                return str_contains($rule, '.') ? explode('.', $rule)[0] : $rule;
-            })->unique()->toArray());
+    /**
+     * Register the "hasValidSignature" macro on the request.
+     *
+     * @return void
+     */
+    public function registerRequestSignatureValidation()
+    {
+        Request::macro('hasValidSignature', function () {
+            return URL::hasValidSignature($this);
         });
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/AuthServiceProvider.php b/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/AuthServiceProvider.php
index 880370a9..4fc90b7d 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/AuthServiceProvider.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/AuthServiceProvider.php
@@ -33,4 +33,14 @@ class AuthServiceProvider extends ServiceProvider
     {
         //
     }
+
+    /**
+     * Get the policies defined on the provider.
+     *
+     * @return array
+     */
+    public function policies()
+    {
+        return $this->policies;
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/RouteServiceProvider.php b/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/RouteServiceProvider.php
index c753447b..50348694 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/RouteServiceProvider.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Support/Providers/RouteServiceProvider.php
@@ -4,6 +4,7 @@ namespace Illuminate\Foundation\Support\Providers;
 
 use Illuminate\Routing\Router;
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Traits\ForwardsCalls;
 use Illuminate\Contracts\Routing\UrlGenerator;
 
 /**
@@ -11,6 +12,8 @@ use Illuminate\Contracts\Routing\UrlGenerator;
  */
 class RouteServiceProvider extends ServiceProvider
 {
+    use ForwardsCalls;
+
     /**
      * The controller namespace for the application.
      *
@@ -94,8 +97,8 @@ class RouteServiceProvider extends ServiceProvider
      */
     public function __call($method, $parameters)
     {
-        return call_user_func_array(
-            [$this->app->make(Router::class), $method], $parameters
+        return $this->forwardCallTo(
+            $this->app->make(Router::class), $method, $parameters
         );
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/InteractsWithAuthentication.php b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/InteractsWithAuthentication.php
index 94f477e4..404a8bfb 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/InteractsWithAuthentication.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/InteractsWithAuthentication.php
@@ -15,9 +15,7 @@ trait InteractsWithAuthentication
      */
     public function actingAs(UserContract $user, $driver = null)
     {
-        $this->be($user, $driver);
-
-        return $this;
+        return $this->be($user, $driver);
     }
 
     /**
@@ -25,13 +23,19 @@ trait InteractsWithAuthentication
      *
      * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
      * @param  string|null  $driver
-     * @return void
+     * @return $this
      */
     public function be(UserContract $user, $driver = null)
     {
+        if (isset($user->wasRecentlyCreated) && $user->wasRecentlyCreated) {
+            $user->wasRecentlyCreated = false;
+        }
+
         $this->app['auth']->guard($driver)->setUser($user);
 
         $this->app['auth']->shouldUse($driver);
+
+        return $this;
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/InteractsWithConsole.php b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/InteractsWithConsole.php
index ba078b31..382f2927 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/InteractsWithConsole.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/InteractsWithConsole.php
@@ -2,19 +2,70 @@
 
 namespace Illuminate\Foundation\Testing\Concerns;
 
+use Illuminate\Console\OutputStyle;
 use Illuminate\Contracts\Console\Kernel;
+use Illuminate\Foundation\Testing\PendingCommand;
 
 trait InteractsWithConsole
 {
+    /**
+     * Indicates if the console output should be mocked.
+     *
+     * @var bool
+     */
+    public $mockConsoleOutput = true;
+
+    /**
+     * All of the expected output lines.
+     *
+     * @var array
+     */
+    public $expectedOutput = [];
+
+    /**
+     * All of the expected questions.
+     *
+     * @var array
+     */
+    public $expectedQuestions = [];
+
     /**
      * Call artisan command and return code.
      *
      * @param  string  $command
      * @param  array  $parameters
-     * @return int
+     * @return \Illuminate\Foundation\Testing\PendingCommand|int
      */
     public function artisan($command, $parameters = [])
     {
-        return $this->app[Kernel::class]->call($command, $parameters);
+        if (! $this->mockConsoleOutput) {
+            return $this->app[Kernel::class]->call($command, $parameters);
+        }
+
+        $this->beforeApplicationDestroyed(function () {
+            if (count($this->expectedQuestions)) {
+                $this->fail('Question "'.array_first($this->expectedQuestions)[0].'" was not asked.');
+            }
+
+            if (count($this->expectedOutput)) {
+                $this->fail('Output "'.array_first($this->expectedOutput).'" was not printed.');
+            }
+        });
+
+        return new PendingCommand($this, $this->app, $command, $parameters);
+    }
+
+    /**
+     * Disable mocking the console output.
+     *
+     * @return $this
+     */
+    protected function withoutMockingConsoleOutput()
+    {
+        $this->mockConsoleOutput = false;
+
+        $this->app->offsetUnset(OutputStyle::class);
+
+        return $this;
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/InteractsWithDatabase.php b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/InteractsWithDatabase.php
index 7c30907e..b12e960e 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/InteractsWithDatabase.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/InteractsWithDatabase.php
@@ -84,7 +84,7 @@ trait InteractsWithDatabase
      */
     public function seed($class = 'DatabaseSeeder')
     {
-        $this->artisan('db:seed', ['--class' => $class]);
+        $this->artisan('db:seed', ['--class' => $class, '--no-interaction' => true]);
 
         return $this;
     }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/InteractsWithExceptionHandling.php b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/InteractsWithExceptionHandling.php
index 6967a58c..efa13f3f 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/InteractsWithExceptionHandling.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/InteractsWithExceptionHandling.php
@@ -13,7 +13,7 @@ trait InteractsWithExceptionHandling
     /**
      * The original exception handler.
      *
-     * @var ExceptionHandler|null
+     * @var \Illuminate\Contracts\Debug\ExceptionHandler|null
      */
     protected $originalExceptionHandler;
 
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/InteractsWithRedis.php b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/InteractsWithRedis.php
index 4a18aec2..30fab687 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/InteractsWithRedis.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/InteractsWithRedis.php
@@ -2,7 +2,9 @@
 
 namespace Illuminate\Foundation\Testing\Concerns;
 
+use Exception;
 use Illuminate\Redis\RedisManager;
+use Illuminate\Foundation\Application;
 
 trait InteractsWithRedis
 {
@@ -27,6 +29,7 @@ trait InteractsWithRedis
      */
     public function setUpRedis()
     {
+        $app = $this->app ?? new Application;
         $host = getenv('REDIS_HOST') ?: '127.0.0.1';
         $port = getenv('REDIS_PORT') ?: 6379;
 
@@ -37,7 +40,7 @@ trait InteractsWithRedis
         }
 
         foreach ($this->redisDriverProvider() as $driver) {
-            $this->redis[$driver[0]] = new RedisManager($driver[0], [
+            $this->redis[$driver[0]] = new RedisManager($app, $driver[0], [
                 'cluster' => false,
                 'default' => [
                     'host' => $host,
@@ -50,7 +53,7 @@ trait InteractsWithRedis
 
         try {
             $this->redis['predis']->connection()->flushdb();
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             if ($host === '127.0.0.1' && $port === 6379 && getenv('REDIS_HOST') === false) {
                 $this->markTestSkipped('Trying default host/port failed, please set environment variable REDIS_HOST & REDIS_PORT to enable '.__CLASS__);
                 static::$connectionFailedOnceWithDefaultsSkip = true;
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php
index 084337ae..0afbdac4 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php
@@ -396,7 +396,7 @@ trait MakesHttpRequests
      */
     protected function formatServerHeaderKey($name)
     {
-        if (! Str::startsWith($name, 'HTTP_') && $name != 'CONTENT_TYPE' && $name != 'REMOTE_ADDR') {
+        if (! Str::startsWith($name, 'HTTP_') && $name !== 'CONTENT_TYPE' && $name !== 'REMOTE_ADDR') {
             return 'HTTP_'.$name;
         }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/MocksApplicationServices.php b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/MocksApplicationServices.php
index e0c48029..1ad4be4d 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/MocksApplicationServices.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Concerns/MocksApplicationServices.php
@@ -98,7 +98,7 @@ trait MocksApplicationServices
     {
         $mock = Mockery::mock(EventsDispatcherContract::class)->shouldIgnoreMissing();
 
-        $mock->shouldReceive('fire', 'dispatch')->andReturnUsing(function ($called) {
+        $mock->shouldReceive('dispatch')->andReturnUsing(function ($called) {
             $this->firedEvents[] = $called;
         });
 
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Constraints/HasInDatabase.php b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Constraints/HasInDatabase.php
index 413ccad8..b88f3422 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Constraints/HasInDatabase.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Constraints/HasInDatabase.php
@@ -48,7 +48,7 @@ class HasInDatabase extends Constraint
      * @param  string  $table
      * @return bool
      */
-    public function matches($table)
+    public function matches($table): bool
     {
         return $this->database->table($table)->where($this->data)->count() > 0;
     }
@@ -59,7 +59,7 @@ class HasInDatabase extends Constraint
      * @param  string  $table
      * @return string
      */
-    public function failureDescription($table)
+    public function failureDescription($table): string
     {
         return sprintf(
             "a row in the table [%s] matches the attributes %s.\n\n%s",
@@ -96,7 +96,7 @@ class HasInDatabase extends Constraint
      * @param  int  $options
      * @return string
      */
-    public function toString($options = 0)
+    public function toString($options = 0): string
     {
         return json_encode($this->data, $options);
     }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Constraints/SeeInOrder.php b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Constraints/SeeInOrder.php
new file mode 100644
index 00000000..8c0cb189
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Constraints/SeeInOrder.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace Illuminate\Foundation\Testing\Constraints;
+
+use ReflectionClass;
+use PHPUnit\Framework\Constraint\Constraint;
+
+class SeeInOrder extends Constraint
+{
+    /**
+     * The string under validation.
+     *
+     * @var string
+     */
+    protected $content;
+
+    /**
+     * The last value that failed to pass validation.
+     *
+     * @var string
+     */
+    protected $failedValue;
+
+    /**
+     * Create a new constraint instance.
+     *
+     * @param  string  $content
+     * @return void
+     */
+    public function __construct($content)
+    {
+        $this->content = $content;
+    }
+
+    /**
+     * Determine if the rule passes validation.
+     *
+     * @param  array  $values
+     * @return bool
+     */
+    public function matches($values) : bool
+    {
+        $position = 0;
+
+        foreach ($values as $value) {
+            if (empty($value)) {
+                continue;
+            }
+
+            $valuePosition = mb_strpos($this->content, $value, $position);
+
+            if ($valuePosition === false || $valuePosition < $position) {
+                $this->failedValue = $value;
+
+                return false;
+            }
+
+            $position = $valuePosition + mb_strlen($value);
+        }
+
+        return true;
+    }
+
+    /**
+     * Get the description of the failure.
+     *
+     * @param  array  $values
+     * @return string
+     */
+    public function failureDescription($values) : string
+    {
+        return sprintf(
+            'Failed asserting that \'%s\' contains "%s" in specified order.',
+            $this->content,
+            $this->failedValue
+        );
+    }
+
+    /**
+     * Get a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString() : string
+    {
+        return (new ReflectionClass($this))->name;
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Constraints/SoftDeletedInDatabase.php b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Constraints/SoftDeletedInDatabase.php
index 7d44997a..abab48cc 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Constraints/SoftDeletedInDatabase.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/Constraints/SoftDeletedInDatabase.php
@@ -48,7 +48,7 @@ class SoftDeletedInDatabase extends Constraint
      * @param  string  $table
      * @return bool
      */
-    public function matches($table)
+    public function matches($table): bool
     {
         return $this->database->table($table)
                 ->where($this->data)->whereNotNull('deleted_at')->count() > 0;
@@ -60,7 +60,7 @@ class SoftDeletedInDatabase extends Constraint
      * @param  string  $table
      * @return string
      */
-    public function failureDescription($table)
+    public function failureDescription($table): string
     {
         return sprintf(
             "any soft deleted row in the table [%s] matches the attributes %s.\n\n%s",
@@ -96,7 +96,7 @@ class SoftDeletedInDatabase extends Constraint
      *
      * @return string
      */
-    public function toString()
+    public function toString(): string
     {
         return json_encode($this->data);
     }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/PendingCommand.php b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/PendingCommand.php
new file mode 100644
index 00000000..efdd5e97
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/PendingCommand.php
@@ -0,0 +1,220 @@
+<?php
+
+namespace Illuminate\Foundation\Testing;
+
+use Mockery;
+use Illuminate\Console\OutputStyle;
+use Illuminate\Contracts\Console\Kernel;
+use Symfony\Component\Console\Input\ArrayInput;
+use PHPUnit\Framework\TestCase as PHPUnitTestCase;
+use Symfony\Component\Console\Output\BufferedOutput;
+use Mockery\Exception\NoMatchingExpectationException;
+
+class PendingCommand
+{
+    /**
+     * The test being run.
+     *
+     * @var \Illuminate\Foundation\Testing\TestCase
+     */
+    public $test;
+
+    /**
+     * The application instance.
+     *
+     * @var \Illuminate\Foundation\Application
+     */
+    protected $app;
+
+    /**
+     * The command to run.
+     *
+     * @var string
+     */
+    protected $command;
+
+    /**
+     * The parameters to pass to the command.
+     *
+     * @var array
+     */
+    protected $parameters;
+
+    /**
+     * The expected exit code.
+     *
+     * @var int
+     */
+    protected $expectedExitCode;
+
+    /**
+     * Determine if command has executed.
+     *
+     * @var bool
+     */
+    protected $hasExecuted = false;
+
+    /**
+     * Create a new pending console command run.
+     *
+     * @param  \PHPUnit\Framework\TestCase  $test
+     * @param  \Illuminate\Foundation\Application  $app
+     * @param  string  $command
+     * @param  array  $parameters
+     * @return void
+     */
+    public function __construct(PHPUnitTestCase $test, $app, $command, $parameters)
+    {
+        $this->app = $app;
+        $this->test = $test;
+        $this->command = $command;
+        $this->parameters = $parameters;
+    }
+
+    /**
+     * Specify a question that should be asked when the command runs.
+     *
+     * @param  string  $question
+     * @param  string  $answer
+     * @return $this
+     */
+    public function expectsQuestion($question, $answer)
+    {
+        $this->test->expectedQuestions[] = [$question, $answer];
+
+        return $this;
+    }
+
+    /**
+     * Specify output that should be printed when the command runs.
+     *
+     * @param  string  $output
+     * @return $this
+     */
+    public function expectsOutput($output)
+    {
+        $this->test->expectedOutput[] = $output;
+
+        return $this;
+    }
+
+    /**
+     * Assert that the command has the given exit code.
+     *
+     * @param  int  $exitCode
+     * @return $this
+     */
+    public function assertExitCode($exitCode)
+    {
+        $this->expectedExitCode = $exitCode;
+
+        return $this;
+    }
+
+    /**
+     * Execute the command.
+     *
+     * @return int
+     */
+    public function execute()
+    {
+        return $this->run();
+    }
+
+    /**
+     * Execute the command.
+     *
+     * @return int
+     */
+    public function run()
+    {
+        $this->hasExecuted = true;
+
+        $this->mockConsoleOutput();
+
+        try {
+            $exitCode = $this->app[Kernel::class]->call($this->command, $this->parameters);
+        } catch (NoMatchingExpectationException $e) {
+            if ($e->getMethodName() == 'askQuestion') {
+                $this->test->fail('Unexpected question "'.$e->getActualArguments()[0]->getQuestion().'" was asked.');
+            }
+        }
+
+        if ($this->expectedExitCode !== null) {
+            $this->test->assertEquals(
+                $this->expectedExitCode, $exitCode,
+                "Expected status code {$this->expectedExitCode} but received {$exitCode}."
+            );
+        }
+
+        return $exitCode;
+    }
+
+    /**
+     * Mock the application's console output.
+     *
+     * @return void
+     */
+    protected function mockConsoleOutput()
+    {
+        $mock = Mockery::mock(OutputStyle::class.'[askQuestion]', [
+            (new ArrayInput($this->parameters)), $this->createABufferedOutputMock(),
+        ]);
+
+        foreach ($this->test->expectedQuestions as $i => $question) {
+            $mock->shouldReceive('askQuestion')
+                ->once()
+                ->ordered()
+                ->with(Mockery::on(function ($argument) use ($question) {
+                    return $argument->getQuestion() == $question[0];
+                }))
+                ->andReturnUsing(function () use ($question, $i) {
+                    unset($this->test->expectedQuestions[$i]);
+
+                    return $question[1];
+                });
+        }
+
+        $this->app->bind(OutputStyle::class, function () use ($mock) {
+            return $mock;
+        });
+    }
+
+    /**
+     * Create a mock for the buffered output.
+     *
+     * @return \Mockery\MockInterface
+     */
+    private function createABufferedOutputMock()
+    {
+        $mock = Mockery::mock(BufferedOutput::class.'[doWrite]')
+                ->shouldAllowMockingProtectedMethods()
+                ->shouldIgnoreMissing();
+
+        foreach ($this->test->expectedOutput as $i => $output) {
+            $mock->shouldReceive('doWrite')
+                ->once()
+                ->ordered()
+                ->with($output, Mockery::any())
+                ->andReturnUsing(function () use ($i) {
+                    unset($this->test->expectedOutput[$i]);
+                });
+        }
+
+        return $mock;
+    }
+
+    /**
+     * Handle the object's destruction.
+     *
+     * @return void
+     */
+    public function __destruct()
+    {
+        if ($this->hasExecuted) {
+            return;
+        }
+
+        $this->run();
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/RefreshDatabase.php b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/RefreshDatabase.php
index 5bac0a86..29265399 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/RefreshDatabase.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/RefreshDatabase.php
@@ -50,7 +50,9 @@ trait RefreshDatabase
     protected function refreshTestDatabase()
     {
         if (! RefreshDatabaseState::$migrated) {
-            $this->artisan('migrate:fresh');
+            $this->artisan('migrate:fresh', $this->shouldDropViews() ? [
+                '--drop-views' => true,
+            ] : []);
 
             $this->app[Kernel::class]->setArtisan(null);
 
@@ -70,14 +72,22 @@ trait RefreshDatabase
         $database = $this->app->make('db');
 
         foreach ($this->connectionsToTransact() as $name) {
-            $database->connection($name)->beginTransaction();
+            $connection = $database->connection($name);
+            $dispatcher = $connection->getEventDispatcher();
+
+            $connection->unsetEventDispatcher();
+            $connection->beginTransaction();
+            $connection->setEventDispatcher($dispatcher);
         }
 
         $this->beforeApplicationDestroyed(function () use ($database) {
             foreach ($this->connectionsToTransact() as $name) {
                 $connection = $database->connection($name);
+                $dispatcher = $connection->getEventDispatcher();
 
-                $connection->rollBack();
+                $connection->unsetEventDispatcher();
+                $connection->rollback();
+                $connection->setEventDispatcher($dispatcher);
                 $connection->disconnect();
             }
         });
@@ -93,4 +103,15 @@ trait RefreshDatabase
         return property_exists($this, 'connectionsToTransact')
                             ? $this->connectionsToTransact : [null];
     }
+
+    /**
+     * Determine if views should be dropped when refreshing the database.
+     *
+     * @return bool
+     */
+    protected function shouldDropViews()
+    {
+        return property_exists($this, 'dropViews')
+                            ? $this->dropViews : false;
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/TestResponse.php b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/TestResponse.php
index 0b7206ad..a2f61948 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Testing/TestResponse.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Testing/TestResponse.php
@@ -7,8 +7,11 @@ use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Support\Carbon;
 use Illuminate\Contracts\View\View;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Traits\Macroable;
 use PHPUnit\Framework\Assert as PHPUnit;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Illuminate\Foundation\Testing\Constraints\SeeInOrder;
 
 /**
  * @mixin \Illuminate\Http\Response
@@ -26,6 +29,13 @@ class TestResponse
      */
     public $baseResponse;
 
+    /**
+     * The streamed content of the response.
+     *
+     * @var string
+     */
+    protected $streamedContent;
+
     /**
      * Create a new test response instance.
      *
@@ -63,6 +73,51 @@ class TestResponse
         return $this;
     }
 
+    /**
+     * Assert that the response has a 200 status code.
+     *
+     * @return $this
+     */
+    public function assertOk()
+    {
+        PHPUnit::assertTrue(
+            $this->isOk(),
+            'Response status code ['.$this->getStatusCode().'] does not match expected 200 status code.'
+        );
+
+        return $this;
+    }
+
+    /**
+     * Assert that the response has a not found status code.
+     *
+     * @return $this
+     */
+    public function assertNotFound()
+    {
+        PHPUnit::assertTrue(
+            $this->isNotFound(),
+            'Response status code ['.$this->getStatusCode().'] is not a not found status code.'
+        );
+
+        return $this;
+    }
+
+    /**
+     * Assert that the response has a forbidden status code.
+     *
+     * @return $this
+     */
+    public function assertForbidden()
+    {
+        PHPUnit::assertTrue(
+            $this->isForbidden(),
+            'Response status code ['.$this->getStatusCode().'] is not a forbidden status code.'
+        );
+
+        return $this;
+    }
+
     /**
      * Assert that the response has the given status code.
      *
@@ -94,7 +149,7 @@ class TestResponse
         );
 
         if (! is_null($uri)) {
-            PHPUnit::assertEquals(app('url')->to($uri), $this->headers->get('Location'));
+            $this->assertLocation($uri);
         }
 
         return $this;
@@ -140,6 +195,21 @@ class TestResponse
         return $this;
     }
 
+    /**
+     * Assert that the current location header matches the given URI.
+     *
+     * @param  string  $uri
+     * @return $this
+     */
+    public function assertLocation($uri)
+    {
+        PHPUnit::assertEquals(
+            app('url')->to($uri), app('url')->to($this->headers->get('Location'))
+        );
+
+        return $this;
+    }
+
     /**
      * Asserts that the response contains the given cookie and equals the optional value.
      *
@@ -160,9 +230,10 @@ class TestResponse
      * @param  string  $cookieName
      * @param  mixed  $value
      * @param  bool  $encrypted
+     * @param  bool  $unserialize
      * @return $this
      */
-    public function assertCookie($cookieName, $value = null, $encrypted = true)
+    public function assertCookie($cookieName, $value = null, $encrypted = true, $unserialize = false)
     {
         PHPUnit::assertNotNull(
             $cookie = $this->getCookie($cookieName),
@@ -176,7 +247,7 @@ class TestResponse
         $cookieValue = $cookie->getValue();
 
         $actual = $encrypted
-            ? app('encrypter')->decrypt($cookieValue) : $cookieValue;
+            ? app('encrypter')->decrypt($cookieValue, $unserialize) : $cookieValue;
 
         PHPUnit::assertEquals(
             $value, $actual,
@@ -209,6 +280,29 @@ class TestResponse
         return $this;
     }
 
+    /**
+     * Asserts that the response contains the given cookie and is not expired.
+     *
+     * @param  string  $cookieName
+     * @return $this
+     */
+    public function assertCookieNotExpired($cookieName)
+    {
+        PHPUnit::assertNotNull(
+            $cookie = $this->getCookie($cookieName),
+            "Cookie [{$cookieName}] not present on response."
+        );
+
+        $expiresAt = Carbon::createFromTimestamp($cookie->getExpiresTime());
+
+        PHPUnit::assertTrue(
+            $expiresAt->greaterThan(Carbon::now()),
+            "Cookie [{$cookieName}] is expired, it expired at [{$expiresAt}]."
+        );
+
+        return $this;
+    }
+
     /**
      * Asserts that the response does not contains the given cookie.
      *
@@ -248,7 +342,20 @@ class TestResponse
      */
     public function assertSee($value)
     {
-        PHPUnit::assertContains($value, $this->getContent());
+        PHPUnit::assertContains((string) $value, $this->getContent());
+
+        return $this;
+    }
+
+    /**
+     * Assert that the given strings are contained in order within the response.
+     *
+     * @param  array  $values
+     * @return $this
+     */
+    public function assertSeeInOrder(array $values)
+    {
+        PHPUnit::assertThat($values, new SeeInOrder($this->getContent()));
 
         return $this;
     }
@@ -261,7 +368,20 @@ class TestResponse
      */
     public function assertSeeText($value)
     {
-        PHPUnit::assertContains($value, strip_tags($this->getContent()));
+        PHPUnit::assertContains((string) $value, strip_tags($this->getContent()));
+
+        return $this;
+    }
+
+    /**
+     * Assert that the given strings are contained in order within the response text.
+     *
+     * @param  array  $values
+     * @return $this
+     */
+    public function assertSeeTextInOrder(array $values)
+    {
+        PHPUnit::assertThat($values, new SeeInOrder(strip_tags($this->getContent())));
 
         return $this;
     }
@@ -274,7 +394,7 @@ class TestResponse
      */
     public function assertDontSee($value)
     {
-        PHPUnit::assertNotContains($value, $this->getContent());
+        PHPUnit::assertNotContains((string) $value, $this->getContent());
 
         return $this;
     }
@@ -287,7 +407,7 @@ class TestResponse
      */
     public function assertDontSeeText($value)
     {
-        PHPUnit::assertNotContains($value, strip_tags($this->getContent()));
+        PHPUnit::assertNotContains((string) $value, strip_tags($this->getContent()));
 
         return $this;
     }
@@ -356,12 +476,12 @@ class TestResponse
         ));
 
         foreach (Arr::sortRecursive($data) as $key => $value) {
-            $expected = substr(json_encode([$key => $value]), 1, -1);
+            $expected = $this->jsonSearchStrings($key, $value);
 
             PHPUnit::assertTrue(
                 Str::contains($actual, $expected),
                 'Unable to find JSON fragment: '.PHP_EOL.PHP_EOL.
-                "[{$expected}]".PHP_EOL.PHP_EOL.
+                '['.json_encode([$key => $value]).']'.PHP_EOL.PHP_EOL.
                 'within'.PHP_EOL.PHP_EOL.
                 "[{$actual}]."
             );
@@ -388,12 +508,12 @@ class TestResponse
         ));
 
         foreach (Arr::sortRecursive($data) as $key => $value) {
-            $unexpected = substr(json_encode([$key => $value]), 1, -1);
+            $unexpected = $this->jsonSearchStrings($key, $value);
 
             PHPUnit::assertFalse(
                 Str::contains($actual, $unexpected),
                 'Found unexpected JSON fragment: '.PHP_EOL.PHP_EOL.
-                "[{$unexpected}]".PHP_EOL.PHP_EOL.
+                '['.json_encode([$key => $value]).']'.PHP_EOL.PHP_EOL.
                 'within'.PHP_EOL.PHP_EOL.
                 "[{$actual}]."
             );
@@ -415,7 +535,7 @@ class TestResponse
         ));
 
         foreach (Arr::sortRecursive($data) as $key => $value) {
-            $unexpected = substr(json_encode([$key => $value]), 1, -1);
+            $unexpected = $this->jsonSearchStrings($key, $value);
 
             if (! Str::contains($actual, $unexpected)) {
                 return $this;
@@ -430,6 +550,24 @@ class TestResponse
         );
     }
 
+    /**
+     * Get the strings we need to search for when examining the JSON.
+     *
+     * @param  string  $key
+     * @param  string  $value
+     * @return array
+     */
+    protected function jsonSearchStrings($key, $value)
+    {
+        $needle = substr(json_encode([$key => $value]), 1, -1);
+
+        return [
+            $needle.']',
+            $needle.'}',
+            $needle.',',
+        ];
+    }
+
     /**
      * Assert that the response has a given JSON structure.
      *
@@ -440,7 +578,7 @@ class TestResponse
     public function assertJsonStructure(array $structure = null, $responseData = null)
     {
         if (is_null($structure)) {
-            return $this->assertJson($this->json());
+            return $this->assertExactJson($this->json());
         }
 
         if (is_null($responseData)) {
@@ -512,12 +650,41 @@ class TestResponse
         return $this;
     }
 
+    /**
+     * Assert that the response has no JSON validation errors for the given keys.
+     *
+     * @param  string|array  $keys
+     * @return $this
+     */
+    public function assertJsonMissingValidationErrors($keys)
+    {
+        $json = $this->json();
+
+        if (! array_key_exists('errors', $json)) {
+            PHPUnit::assertArrayNotHasKey('errors', $json);
+
+            return $this;
+        }
+
+        $errors = $json['errors'];
+
+        foreach (Arr::wrap($keys) as $key) {
+            PHPUnit::assertFalse(
+                isset($errors[$key]),
+                "Found unexpected validation error for key: '{$key}'"
+            );
+        }
+
+        return $this;
+    }
+
     /**
      * Validate and return the decoded response JSON.
      *
-     * @return array
+     * @param  string|null  $key
+     * @return mixed
      */
-    public function decodeResponseJson()
+    public function decodeResponseJson($key = null)
     {
         $decodedResponse = json_decode($this->getContent(), true);
 
@@ -529,17 +696,18 @@ class TestResponse
             }
         }
 
-        return $decodedResponse;
+        return data_get($decodedResponse, $key);
     }
 
     /**
      * Validate and return the decoded response JSON.
      *
-     * @return array
+     * @param  string|null  $key
+     * @return mixed
      */
-    public function json()
+    public function json($key = null)
     {
-        return $this->decodeResponseJson();
+        return $this->decodeResponseJson($key);
     }
 
     /**
@@ -576,6 +744,8 @@ class TestResponse
             PHPUnit::assertArrayHasKey($key, $this->original->getData());
         } elseif ($value instanceof Closure) {
             PHPUnit::assertTrue($value($this->original->$key));
+        } elseif ($value instanceof Model) {
+            PHPUnit::assertTrue($value->is($this->original->$key));
         } else {
             PHPUnit::assertEquals($value, $this->original->$key);
         }
@@ -602,6 +772,19 @@ class TestResponse
         return $this;
     }
 
+    /**
+     * Get a piece of data from the original view.
+     *
+     * @param  string  $key
+     * @return mixed
+     */
+    public function viewData($key)
+    {
+        $this->ensureResponseHasView();
+
+        return $this->original->$key;
+    }
+
     /**
      * Assert that the response view is missing a piece of bound data.
      *
@@ -650,7 +833,7 @@ class TestResponse
                 "Session is missing expected key [{$key}]."
             );
         } else {
-            PHPUnit::assertEquals($value, app('session.store')->get($key));
+            PHPUnit::assertEquals($value, $this->session()->get($key));
         }
 
         return $this;
@@ -689,7 +872,7 @@ class TestResponse
 
         $keys = (array) $keys;
 
-        $errors = app('session.store')->get('errors')->getBag($errorBag);
+        $errors = $this->session()->get('errors')->getBag($errorBag);
 
         foreach ($keys as $key => $value) {
             if (is_int($key)) {
@@ -702,6 +885,45 @@ class TestResponse
         return $this;
     }
 
+    /**
+     * Assert that the session is missing the given errors.
+     *
+     * @param  string|array  $keys
+     * @param  string  $format
+     * @param  string  $errorBag
+     * @return $this
+     */
+    public function assertSessionDoesntHaveErrors($keys = [], $format = null, $errorBag = 'default')
+    {
+        $keys = (array) $keys;
+
+        if (empty($keys)) {
+            return $this->assertSessionMissing('errors');
+        }
+
+        $errors = $this->session()->get('errors')->getBag($errorBag);
+
+        foreach ($keys as $key => $value) {
+            if (is_int($key)) {
+                PHPUnit::assertFalse($errors->has($value), "Session has unexpected error: $value");
+            } else {
+                PHPUnit::assertNotContains($value, $errors->get($key, $format));
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Assert that the session has no errors.
+     *
+     * @return $this
+     */
+    public function assertSessionHasNoErrors()
+    {
+        return $this->assertSessionMissing('errors');
+    }
+
     /**
      * Assert that the session has the given errors.
      *
@@ -765,6 +987,28 @@ class TestResponse
         dd($content);
     }
 
+    /**
+     * Get the streamed content from the response.
+     *
+     * @return string
+     */
+    public function streamedContent()
+    {
+        if (! is_null($this->streamedContent)) {
+            return $this->streamedContent;
+        }
+
+        if (! $this->baseResponse instanceof StreamedResponse) {
+            PHPUnit::fail('The response is not a streamed response.');
+        }
+
+        ob_start();
+
+        $this->sendContent();
+
+        return $this->streamedContent = ob_get_clean();
+    }
+
     /**
      * Dynamically access base response parameters.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php b/vendor/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php
index 1463f68a..89ab3d12 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php
@@ -2,7 +2,6 @@
 
 namespace Illuminate\Foundation\Validation;
 
-use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use Illuminate\Contracts\Validation\Factory;
 use Illuminate\Validation\ValidationException;
@@ -15,6 +14,8 @@ trait ValidatesRequests
      * @param  \Illuminate\Contracts\Validation\Validator|array  $validator
      * @param  \Illuminate\Http\Request|null  $request
      * @return array
+     *
+     * @throws \Illuminate\Validation\ValidationException
      */
     public function validateWith($validator, Request $request = null)
     {
@@ -24,9 +25,7 @@ trait ValidatesRequests
             $validator = $this->getValidationFactory()->make($request->all(), $validator);
         }
 
-        $validator->validate();
-
-        return $this->extractInputFromRules($request, $validator->getRules());
+        return $validator->validate();
     }
 
     /**
@@ -37,29 +36,15 @@ trait ValidatesRequests
      * @param  array  $messages
      * @param  array  $customAttributes
      * @return array
+     *
+     * @throws \Illuminate\Validation\ValidationException
      */
     public function validate(Request $request, array $rules,
                              array $messages = [], array $customAttributes = [])
     {
-        $this->getValidationFactory()
-             ->make($request->all(), $rules, $messages, $customAttributes)
-             ->validate();
-
-        return $this->extractInputFromRules($request, $rules);
-    }
-
-    /**
-     * Get the request input based on the given validation rules.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  array  $rules
-     * @return array
-     */
-    protected function extractInputFromRules(Request $request, array $rules)
-    {
-        return $request->only(collect($rules)->keys()->map(function ($rule) {
-            return Str::contains($rule, '.') ? explode('.', $rule)[0] : $rule;
-        })->unique()->toArray());
+        return $this->getValidationFactory()->make(
+            $request->all(), $rules, $messages, $customAttributes
+        )->validate();
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/helpers.php b/vendor/laravel/framework/src/Illuminate/Foundation/helpers.php
index bccba0e7..1b200624 100644
--- a/vendor/laravel/framework/src/Illuminate/Foundation/helpers.php
+++ b/vendor/laravel/framework/src/Illuminate/Foundation/helpers.php
@@ -4,14 +4,19 @@ use Illuminate\Support\Str;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\HtmlString;
 use Illuminate\Container\Container;
+use Illuminate\Queue\CallQueuedClosure;
 use Illuminate\Contracts\Bus\Dispatcher;
+use Illuminate\Queue\SerializableClosure;
 use Illuminate\Contracts\Auth\Access\Gate;
+use Illuminate\Contracts\Support\Responsable;
 use Illuminate\Contracts\Routing\UrlGenerator;
 use Illuminate\Foundation\Bus\PendingDispatch;
+use Symfony\Component\HttpFoundation\Response;
 use Illuminate\Contracts\Debug\ExceptionHandler;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Illuminate\Contracts\Auth\Factory as AuthFactory;
 use Illuminate\Contracts\View\Factory as ViewFactory;
+use Illuminate\Http\Exceptions\HttpResponseException;
 use Illuminate\Contracts\Cookie\Factory as CookieFactory;
 use Symfony\Component\Debug\Exception\FatalThrowableError;
 use Illuminate\Database\Eloquent\Factory as EloquentFactory;
@@ -22,7 +27,7 @@ if (! function_exists('abort')) {
     /**
      * Throw an HttpException with the given data.
      *
-     * @param  int     $code
+     * @param  \Symfony\Component\HttpFoundation\Response|\Illuminate\Contracts\Support\Responsable|int     $code
      * @param  string  $message
      * @param  array   $headers
      * @return void
@@ -32,6 +37,12 @@ if (! function_exists('abort')) {
      */
     function abort($code, $message = '', array $headers = [])
     {
+        if ($code instanceof Response) {
+            throw new HttpResponseException($code);
+        } elseif ($code instanceof Responsable) {
+            throw new HttpResponseException($code->toResponse(request()));
+        }
+
         app()->abort($code, $message, $headers);
     }
 }
@@ -82,8 +93,8 @@ if (! function_exists('action')) {
     /**
      * Generate the URL to a controller action.
      *
-     * @param  string  $name
-     * @param  array   $parameters
+     * @param  string|array  $name
+     * @param  mixed   $parameters
      * @param  bool    $absolute
      * @return string
      */
@@ -185,15 +196,15 @@ if (! function_exists('base_path')) {
 
 if (! function_exists('bcrypt')) {
     /**
-     * Hash the given value.
+     * Hash the given value against the bcrypt algorithm.
      *
      * @param  string  $value
-     * @param  array   $options
+     * @param  array  $options
      * @return string
      */
     function bcrypt($value, $options = [])
     {
-        return app('hash')->make($value, $options);
+        return app('hash')->driver('bcrypt')->make($value, $options);
     }
 }
 
@@ -230,7 +241,7 @@ if (! function_exists('cache')) {
         }
 
         if (is_string($arguments[0])) {
-            return app('cache')->get($arguments[0], $arguments[1] ?? null);
+            return app('cache')->get(...$arguments);
         }
 
         if (! is_array($arguments[0])) {
@@ -363,11 +374,12 @@ if (! function_exists('decrypt')) {
      * Decrypt the given value.
      *
      * @param  string  $value
-     * @return string
+     * @param  bool   $unserialize
+     * @return mixed
      */
-    function decrypt($value)
+    function decrypt($value, $unserialize = true)
     {
-        return app('encrypter')->decrypt($value);
+        return app('encrypter')->decrypt($value, $unserialize);
     }
 }
 
@@ -380,6 +392,10 @@ if (! function_exists('dispatch')) {
      */
     function dispatch($job)
     {
+        if ($job instanceof Closure) {
+            $job = new CallQueuedClosure(new SerializableClosure($job));
+        }
+
         return new PendingDispatch($job);
     }
 }
@@ -443,11 +459,12 @@ if (! function_exists('encrypt')) {
      * Encrypt the given value.
      *
      * @param  mixed  $value
+     * @param  bool   $serialize
      * @return string
      */
-    function encrypt($value)
+    function encrypt($value, $serialize = true)
     {
-        return app('encrypter')->encrypt($value);
+        return app('encrypter')->encrypt($value, $serialize);
     }
 }
 
@@ -509,7 +526,7 @@ if (! function_exists('logger')) {
      *
      * @param  string  $message
      * @param  array  $context
-     * @return \Illuminate\Contracts\Logging\Log|null
+     * @return \Illuminate\Log\LogManager|null
      */
     function logger($message = null, array $context = [])
     {
@@ -521,6 +538,19 @@ if (! function_exists('logger')) {
     }
 }
 
+if (! function_exists('logs')) {
+    /**
+     * Get a log driver instance.
+     *
+     * @param  string  $driver
+     * @return \Illuminate\Log\LogManager|\Psr\Log\LoggerInterface
+     */
+    function logs($driver = null)
+    {
+        return $driver ? app('log')->driver($driver) : app('log');
+    }
+}
+
 if (! function_exists('method_field')) {
     /**
      * Generate a form field to spoof the HTTP verb used by forms.
@@ -540,7 +570,7 @@ if (! function_exists('mix')) {
      *
      * @param  string  $path
      * @param  string  $manifestDirectory
-     * @return \Illuminate\Support\HtmlString
+     * @return \Illuminate\Support\HtmlString|string
      *
      * @throws \Exception
      */
@@ -557,7 +587,7 @@ if (! function_exists('mix')) {
         }
 
         if (file_exists(public_path($manifestDirectory.'/hot'))) {
-            $url = file_get_contents(public_path($manifestDirectory.'/hot'));
+            $url = rtrim(file_get_contents(public_path($manifestDirectory.'/hot')));
 
             if (Str::startsWith($url, ['http://', 'https://'])) {
                 return new HtmlString(Str::after($url, ':').$path);
@@ -757,10 +787,10 @@ if (! function_exists('response')) {
     /**
      * Return a new response from the application.
      *
-     * @param  string  $content
+     * @param  \Illuminate\View\View|string|array|null  $content
      * @param  int     $status
      * @param  array   $headers
-     * @return \Symfony\Component\HttpFoundation\Response|\Illuminate\Contracts\Routing\ResponseFactory
+     * @return \Illuminate\Http\Response|\Illuminate\Contracts\Routing\ResponseFactory
      */
     function response($content = '', $status = 200, array $headers = [])
     {
@@ -779,7 +809,7 @@ if (! function_exists('route')) {
      * Generate the URL to a named route.
      *
      * @param  array|string  $name
-     * @param  array  $parameters
+     * @param  mixed  $parameters
      * @param  bool  $absolute
      * @return string
      */
@@ -943,7 +973,7 @@ if (! function_exists('validator')) {
      * @param  array  $rules
      * @param  array  $messages
      * @param  array  $customAttributes
-     * @return \Illuminate\Contracts\Validation\Validator
+     * @return \Illuminate\Contracts\Validation\Validator|\Illuminate\Contracts\Validation\Factory
      */
     function validator(array $data = [], array $rules = [], array $messages = [], array $customAttributes = [])
     {
diff --git a/vendor/laravel/framework/src/Illuminate/Hashing/AbstractHasher.php b/vendor/laravel/framework/src/Illuminate/Hashing/AbstractHasher.php
new file mode 100644
index 00000000..01321b9b
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Hashing/AbstractHasher.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Illuminate\Hashing;
+
+abstract class AbstractHasher
+{
+    /**
+     * Get information about the given hashed value.
+     *
+     * @param  string $hashedValue
+     * @return array
+     */
+    public function info($hashedValue)
+    {
+        return password_get_info($hashedValue);
+    }
+
+    /**
+     * Check the given plain value against a hash.
+     *
+     * @param  string  $value
+     * @param  string  $hashedValue
+     * @param  array  $options
+     * @return bool
+     */
+    public function check($value, $hashedValue, array $options = [])
+    {
+        if (strlen($hashedValue) === 0) {
+            return false;
+        }
+
+        return password_verify($value, $hashedValue);
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Hashing/Argon2IdHasher.php b/vendor/laravel/framework/src/Illuminate/Hashing/Argon2IdHasher.php
new file mode 100644
index 00000000..64345fb2
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Hashing/Argon2IdHasher.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Illuminate\Hashing;
+
+use RuntimeException;
+
+class Argon2IdHasher extends ArgonHasher
+{
+    /**
+     * Check the given plain value against a hash.
+     *
+     * @param  string  $value
+     * @param  string  $hashedValue
+     * @param  array  $options
+     * @return bool
+     */
+    public function check($value, $hashedValue, array $options = [])
+    {
+        if ($this->verifyAlgorithm && $this->info($hashedValue)['algoName'] !== 'argon2id') {
+            throw new RuntimeException('This password does not use the Argon2id algorithm.');
+        }
+
+        if (strlen($hashedValue) === 0) {
+            return false;
+        }
+
+        return password_verify($value, $hashedValue);
+    }
+
+    /**
+     * Get the algorithm that should be used for hashing.
+     *
+     * @return int
+     */
+    protected function algorithm()
+    {
+        return PASSWORD_ARGON2ID;
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Hashing/ArgonHasher.php b/vendor/laravel/framework/src/Illuminate/Hashing/ArgonHasher.php
new file mode 100644
index 00000000..66b39300
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Hashing/ArgonHasher.php
@@ -0,0 +1,190 @@
+<?php
+
+namespace Illuminate\Hashing;
+
+use RuntimeException;
+use Illuminate\Contracts\Hashing\Hasher as HasherContract;
+
+class ArgonHasher extends AbstractHasher implements HasherContract
+{
+    /**
+     * The default memory cost factor.
+     *
+     * @var int
+     */
+    protected $memory = 1024;
+
+    /**
+     * The default time cost factor.
+     *
+     * @var int
+     */
+    protected $time = 2;
+
+    /**
+     * The default threads factor.
+     *
+     * @var int
+     */
+    protected $threads = 2;
+
+    /**
+     * Indicates whether to perform an algorithm check.
+     *
+     * @var bool
+     */
+    protected $verifyAlgorithm = false;
+
+    /**
+     * Create a new hasher instance.
+     *
+     * @param  array  $options
+     * @return void
+     */
+    public function __construct(array $options = [])
+    {
+        $this->time = $options['time'] ?? $this->time;
+        $this->memory = $options['memory'] ?? $this->memory;
+        $this->threads = $options['threads'] ?? $this->threads;
+        $this->verifyAlgorithm = $options['verify'] ?? $this->verifyAlgorithm;
+    }
+
+    /**
+     * Hash the given value.
+     *
+     * @param  string  $value
+     * @param  array  $options
+     * @return string
+     *
+     * @throws \RuntimeException
+     */
+    public function make($value, array $options = [])
+    {
+        $hash = password_hash($value, $this->algorithm(), [
+            'memory_cost' => $this->memory($options),
+            'time_cost' => $this->time($options),
+            'threads' => $this->threads($options),
+        ]);
+
+        if ($hash === false) {
+            throw new RuntimeException('Argon2 hashing not supported.');
+        }
+
+        return $hash;
+    }
+
+    /**
+     * Get the algorithm that should be used for hashing.
+     *
+     * @return int
+     */
+    protected function algorithm()
+    {
+        return PASSWORD_ARGON2I;
+    }
+
+    /**
+     * Check the given plain value against a hash.
+     *
+     * @param  string  $value
+     * @param  string  $hashedValue
+     * @param  array  $options
+     * @return bool
+     */
+    public function check($value, $hashedValue, array $options = [])
+    {
+        if ($this->verifyAlgorithm && $this->info($hashedValue)['algoName'] !== 'argon2i') {
+            throw new RuntimeException('This password does not use the Argon2i algorithm.');
+        }
+
+        return parent::check($value, $hashedValue, $options);
+    }
+
+    /**
+     * Check if the given hash has been hashed using the given options.
+     *
+     * @param  string  $hashedValue
+     * @param  array  $options
+     * @return bool
+     */
+    public function needsRehash($hashedValue, array $options = [])
+    {
+        return password_needs_rehash($hashedValue, $this->algorithm(), [
+            'memory_cost' => $this->memory($options),
+            'time_cost' => $this->time($options),
+            'threads' => $this->threads($options),
+        ]);
+    }
+
+    /**
+     * Set the default password memory factor.
+     *
+     * @param  int  $memory
+     * @return $this
+     */
+    public function setMemory(int $memory)
+    {
+        $this->memory = $memory;
+
+        return $this;
+    }
+
+    /**
+     * Set the default password timing factor.
+     *
+     * @param  int  $time
+     * @return $this
+     */
+    public function setTime(int $time)
+    {
+        $this->time = $time;
+
+        return $this;
+    }
+
+    /**
+     * Set the default password threads factor.
+     *
+     * @param  int  $threads
+     * @return $this
+     */
+    public function setThreads(int $threads)
+    {
+        $this->threads = $threads;
+
+        return $this;
+    }
+
+    /**
+     * Extract the memory cost value from the options array.
+     *
+     * @param  array  $options
+     * @return int
+     */
+    protected function memory(array $options)
+    {
+        return $options['memory'] ?? $this->memory;
+    }
+
+    /**
+     * Extract the time cost value from the options array.
+     *
+     * @param  array  $options
+     * @return int
+     */
+    protected function time(array $options)
+    {
+        return $options['time'] ?? $this->time;
+    }
+
+    /**
+     * Extract the threads value from the options array.
+     *
+     * @param  array  $options
+     * @return int
+     */
+    protected function threads(array $options)
+    {
+        return $options['threads'] ?? $this->threads;
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php b/vendor/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php
index 333d8bf0..c853915c 100755
--- a/vendor/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php
+++ b/vendor/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php
@@ -5,15 +5,34 @@ namespace Illuminate\Hashing;
 use RuntimeException;
 use Illuminate\Contracts\Hashing\Hasher as HasherContract;
 
-class BcryptHasher implements HasherContract
+class BcryptHasher extends AbstractHasher implements HasherContract
 {
     /**
-     * Default crypt cost factor.
+     * The default cost factor.
      *
      * @var int
      */
     protected $rounds = 10;
 
+    /**
+     * Indicates whether to perform an algorithm check.
+     *
+     * @var bool
+     */
+    protected $verifyAlgorithm = false;
+
+    /**
+     * Create a new hasher instance.
+     *
+     * @param  array  $options
+     * @return void
+     */
+    public function __construct(array $options = [])
+    {
+        $this->rounds = $options['rounds'] ?? $this->rounds;
+        $this->verifyAlgorithm = $options['verify'] ?? $this->verifyAlgorithm;
+    }
+
     /**
      * Hash the given value.
      *
@@ -41,16 +60,18 @@ class BcryptHasher implements HasherContract
      *
      * @param  string  $value
      * @param  string  $hashedValue
-     * @param  array   $options
+     * @param  array  $options
      * @return bool
+     *
+     * @throws \RuntimeException
      */
     public function check($value, $hashedValue, array $options = [])
     {
-        if (strlen($hashedValue) === 0) {
-            return false;
+        if ($this->verifyAlgorithm && $this->info($hashedValue)['algoName'] !== 'bcrypt') {
+            throw new RuntimeException('This password does not use the Bcrypt algorithm.');
         }
 
-        return password_verify($value, $hashedValue);
+        return parent::check($value, $hashedValue, $options);
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Hashing/HashManager.php b/vendor/laravel/framework/src/Illuminate/Hashing/HashManager.php
new file mode 100644
index 00000000..4dbae34c
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Hashing/HashManager.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Illuminate\Hashing;
+
+use Illuminate\Support\Manager;
+use Illuminate\Contracts\Hashing\Hasher;
+
+class HashManager extends Manager implements Hasher
+{
+    /**
+     * Create an instance of the Bcrypt hash Driver.
+     *
+     * @return \Illuminate\Hashing\BcryptHasher
+     */
+    public function createBcryptDriver()
+    {
+        return new BcryptHasher($this->app['config']['hashing.bcrypt'] ?? []);
+    }
+
+    /**
+     * Create an instance of the Argon2i hash Driver.
+     *
+     * @return \Illuminate\Hashing\ArgonHasher
+     */
+    public function createArgonDriver()
+    {
+        return new ArgonHasher($this->app['config']['hashing.argon'] ?? []);
+    }
+
+    /**
+     * Create an instance of the Argon2id hash Driver.
+     *
+     * @return \Illuminate\Hashing\Argon2IdHasher
+     */
+    public function createArgon2idDriver()
+    {
+        return new Argon2IdHasher($this->app['config']['hashing.argon'] ?? []);
+    }
+
+    /**
+     * Get information about the given hashed value.
+     *
+     * @param  string  $hashedValue
+     * @return array
+     */
+    public function info($hashedValue)
+    {
+        return $this->driver()->info($hashedValue);
+    }
+
+    /**
+     * Hash the given value.
+     *
+     * @param  string  $value
+     * @param  array   $options
+     * @return string
+     */
+    public function make($value, array $options = [])
+    {
+        return $this->driver()->make($value, $options);
+    }
+
+    /**
+     * Check the given plain value against a hash.
+     *
+     * @param  string  $value
+     * @param  string  $hashedValue
+     * @param  array   $options
+     * @return bool
+     */
+    public function check($value, $hashedValue, array $options = [])
+    {
+        return $this->driver()->check($value, $hashedValue, $options);
+    }
+
+    /**
+     * Check if the given hash has been hashed using the given options.
+     *
+     * @param  string  $hashedValue
+     * @param  array   $options
+     * @return bool
+     */
+    public function needsRehash($hashedValue, array $options = [])
+    {
+        return $this->driver()->needsRehash($hashedValue, $options);
+    }
+
+    /**
+     * Get the default driver name.
+     *
+     * @return string
+     */
+    public function getDefaultDriver()
+    {
+        return $this->app['config']['hashing.driver'] ?? 'bcrypt';
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Hashing/HashServiceProvider.php b/vendor/laravel/framework/src/Illuminate/Hashing/HashServiceProvider.php
index 85581f40..435e54b0 100755
--- a/vendor/laravel/framework/src/Illuminate/Hashing/HashServiceProvider.php
+++ b/vendor/laravel/framework/src/Illuminate/Hashing/HashServiceProvider.php
@@ -20,8 +20,12 @@ class HashServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->app->singleton('hash', function () {
-            return new BcryptHasher;
+        $this->app->singleton('hash', function ($app) {
+            return new HashManager($app);
+        });
+
+        $this->app->singleton('hash.driver', function ($app) {
+            return $app['hash']->driver();
         });
     }
 
@@ -32,6 +36,6 @@ class HashServiceProvider extends ServiceProvider
      */
     public function provides()
     {
-        return ['hash'];
+        return ['hash', 'hash.driver'];
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Hashing/composer.json b/vendor/laravel/framework/src/Illuminate/Hashing/composer.json
index d727f86c..ed9e20e8 100755
--- a/vendor/laravel/framework/src/Illuminate/Hashing/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Hashing/composer.json
@@ -14,9 +14,9 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/support": "5.5.*"
+        "php": "^7.1.3",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/support": "5.7.*"
     },
     "autoload": {
         "psr-4": {
@@ -25,7 +25,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "config": {
diff --git a/vendor/laravel/framework/src/Illuminate/Http/Concerns/InteractsWithContentTypes.php b/vendor/laravel/framework/src/Illuminate/Http/Concerns/InteractsWithContentTypes.php
index 492c131b..be760a26 100644
--- a/vendor/laravel/framework/src/Illuminate/Http/Concerns/InteractsWithContentTypes.php
+++ b/vendor/laravel/framework/src/Illuminate/Http/Concerns/InteractsWithContentTypes.php
@@ -41,11 +41,11 @@ trait InteractsWithContentTypes
      */
     public function expectsJson()
     {
-        return ($this->ajax() && ! $this->pjax()) || $this->wantsJson();
+        return ($this->ajax() && ! $this->pjax() && $this->acceptsAnyContentType()) || $this->wantsJson();
     }
 
     /**
-     * Determine if the current request is asking for JSON in return.
+     * Determine if the current request is asking for JSON.
      *
      * @return bool
      */
@@ -118,6 +118,20 @@ trait InteractsWithContentTypes
         }
     }
 
+    /**
+     * Determine if the current request accepts any content type.
+     *
+     * @return bool
+     */
+    public function acceptsAnyContentType()
+    {
+        $acceptable = $this->getAcceptableContentTypes();
+
+        return count($acceptable) === 0 || (
+            isset($acceptable[0]) && ($acceptable[0] === '*/*' || $acceptable[0] === '*')
+        );
+    }
+
     /**
      * Determines whether a request accepts JSON.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Http/Concerns/InteractsWithInput.php b/vendor/laravel/framework/src/Illuminate/Http/Concerns/InteractsWithInput.php
index c66c49e7..101ca9d1 100644
--- a/vendor/laravel/framework/src/Illuminate/Http/Concerns/InteractsWithInput.php
+++ b/vendor/laravel/framework/src/Illuminate/Http/Concerns/InteractsWithInput.php
@@ -15,7 +15,7 @@ trait InteractsWithInput
      *
      * @param  string  $key
      * @param  string|array|null  $default
-     * @return string|array
+     * @return string|array|null
      */
     public function server($key = null, $default = null)
     {
@@ -38,7 +38,7 @@ trait InteractsWithInput
      *
      * @param  string  $key
      * @param  string|array|null  $default
-     * @return string|array
+     * @return string|array|null
      */
     public function header($key = null, $default = null)
     {
@@ -94,11 +94,13 @@ trait InteractsWithInput
     /**
      * Determine if the request contains any of the given inputs.
      *
-     * @param  dynamic  $key
+     * @param  string|array  $keys
      * @return bool
      */
-    public function hasAny(...$keys)
+    public function hasAny($keys)
     {
+        $keys = is_array($keys) ? $keys : func_get_args();
+
         $input = $this->all();
 
         foreach ($keys as $key) {
@@ -129,6 +131,25 @@ trait InteractsWithInput
         return true;
     }
 
+    /**
+     * Determine if the request contains a non-empty value for any of the given inputs.
+     *
+     * @param  string|array  $keys
+     * @return bool
+     */
+    public function anyFilled($keys)
+    {
+        $keys = is_array($keys) ? $keys : func_get_args();
+
+        foreach ($keys as $key) {
+            if ($this->filled($key)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Determine if the given input key is an empty string for "has".
      *
@@ -178,9 +199,9 @@ trait InteractsWithInput
     /**
      * Retrieve an input item from the request.
      *
-     * @param  string  $key
+     * @param  string|null  $key
      * @param  string|array|null  $default
-     * @return string|array
+     * @return string|array|null
      */
     public function input($key = null, $default = null)
     {
@@ -236,7 +257,7 @@ trait InteractsWithInput
      *
      * @param  string  $key
      * @param  string|array|null  $default
-     * @return string|array
+     * @return string|array|null
      */
     public function query($key = null, $default = null)
     {
@@ -249,7 +270,7 @@ trait InteractsWithInput
      * @param  string  $key
      * @param  string|array|null  $default
      *
-     * @return string|array
+     * @return string|array|null
      */
     public function post($key = null, $default = null)
     {
@@ -272,7 +293,7 @@ trait InteractsWithInput
      *
      * @param  string  $key
      * @param  string|array|null  $default
-     * @return string|array
+     * @return string|array|null
      */
     public function cookie($key = null, $default = null)
     {
@@ -362,7 +383,7 @@ trait InteractsWithInput
      * @param  string  $source
      * @param  string  $key
      * @param  string|array|null  $default
-     * @return string|array
+     * @return string|array|null
      */
     protected function retrieveItem($source, $key, $default)
     {
diff --git a/vendor/laravel/framework/src/Illuminate/Http/Exceptions/ThrottleRequestsException.php b/vendor/laravel/framework/src/Illuminate/Http/Exceptions/ThrottleRequestsException.php
new file mode 100644
index 00000000..4f8d6087
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Http/Exceptions/ThrottleRequestsException.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Illuminate\Http\Exceptions;
+
+use Exception;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+
+class ThrottleRequestsException extends HttpException
+{
+    /**
+     * Create a new exception instance.
+     *
+     * @param  string|null  $message
+     * @param  \Exception|null  $previous
+     * @param  array  $headers
+     * @param  int  $code
+     * @return void
+     */
+    public function __construct($message = null, Exception $previous = null, array $headers = [], $code = 0)
+    {
+        parent::__construct(429, $message, $previous, $headers, $code);
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Http/JsonResponse.php b/vendor/laravel/framework/src/Illuminate/Http/JsonResponse.php
index 3e065d86..9baf417b 100755
--- a/vendor/laravel/framework/src/Illuminate/Http/JsonResponse.php
+++ b/vendor/laravel/framework/src/Illuminate/Http/JsonResponse.php
@@ -86,9 +86,16 @@ class JsonResponse extends BaseJsonResponse
      */
     protected function hasValidJson($jsonError)
     {
-        return $jsonError === JSON_ERROR_NONE ||
-                ($jsonError === JSON_ERROR_UNSUPPORTED_TYPE &&
-                $this->hasEncodingOption(JSON_PARTIAL_OUTPUT_ON_ERROR));
+        if ($jsonError === JSON_ERROR_NONE) {
+            return true;
+        }
+
+        return $this->hasEncodingOption(JSON_PARTIAL_OUTPUT_ON_ERROR) &&
+                    in_array($jsonError, [
+                        JSON_ERROR_RECURSION,
+                        JSON_ERROR_INF_OR_NAN,
+                        JSON_ERROR_UNSUPPORTED_TYPE,
+                    ]);
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Http/Middleware/SetCacheHeaders.php b/vendor/laravel/framework/src/Illuminate/Http/Middleware/SetCacheHeaders.php
new file mode 100644
index 00000000..fe04fe6c
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Http/Middleware/SetCacheHeaders.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Illuminate\Http\Middleware;
+
+use Closure;
+
+class SetCacheHeaders
+{
+    /**
+     * Add cache related HTTP headers.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @param  string|array  $options
+     * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function handle($request, Closure $next, $options = [])
+    {
+        $response = $next($request);
+
+        if (! $request->isMethodCacheable() || ! $response->getContent()) {
+            return $response;
+        }
+
+        if (is_string($options)) {
+            $options = $this->parseOptions($options);
+        }
+
+        if (isset($options['etag']) && $options['etag'] === true) {
+            $options['etag'] = md5($response->getContent());
+        }
+
+        $response->setCache($options);
+        $response->isNotModified($request);
+
+        return $response;
+    }
+
+    /**
+     * Parse the given header options.
+     *
+     * @param  string  $options
+     * @return array
+     */
+    protected function parseOptions($options)
+    {
+        return collect(explode(';', $options))->mapWithKeys(function ($option) {
+            $data = explode('=', $option, 2);
+
+            return [$data[0] => $data[1] ?? true];
+        })->all();
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Http/RedirectResponse.php b/vendor/laravel/framework/src/Illuminate/Http/RedirectResponse.php
index 0a462ffd..1fcfe947 100755
--- a/vendor/laravel/framework/src/Illuminate/Http/RedirectResponse.php
+++ b/vendor/laravel/framework/src/Illuminate/Http/RedirectResponse.php
@@ -2,11 +2,11 @@
 
 namespace Illuminate\Http;
 
-use BadMethodCallException;
 use Illuminate\Support\Str;
 use Illuminate\Support\MessageBag;
 use Illuminate\Support\ViewErrorBag;
 use Illuminate\Support\Traits\Macroable;
+use Illuminate\Support\Traits\ForwardsCalls;
 use Illuminate\Session\Store as SessionStore;
 use Illuminate\Contracts\Support\MessageProvider;
 use Symfony\Component\HttpFoundation\File\UploadedFile as SymfonyUploadedFile;
@@ -14,7 +14,7 @@ use Symfony\Component\HttpFoundation\RedirectResponse as BaseRedirectResponse;
 
 class RedirectResponse extends BaseRedirectResponse
 {
-    use ResponseTrait, Macroable {
+    use ForwardsCalls, ResponseTrait, Macroable {
         Macroable::__call as macroCall;
     }
 
@@ -26,7 +26,7 @@ class RedirectResponse extends BaseRedirectResponse
     protected $request;
 
     /**
-     * The session store implementation.
+     * The session store instance.
      *
      * @var \Illuminate\Session\Store
      */
@@ -192,7 +192,7 @@ class RedirectResponse extends BaseRedirectResponse
     }
 
     /**
-     * Get the session store implementation.
+     * Get the session store instance.
      *
      * @return \Illuminate\Session\Store|null
      */
@@ -202,7 +202,7 @@ class RedirectResponse extends BaseRedirectResponse
     }
 
     /**
-     * Set the session store implementation.
+     * Set the session store instance.
      *
      * @param  \Illuminate\Session\Store  $session
      * @return void
@@ -231,8 +231,6 @@ class RedirectResponse extends BaseRedirectResponse
             return $this->with(Str::snake(substr($method, 4)), $parameters[0]);
         }
 
-        throw new BadMethodCallException(
-            "Method [$method] does not exist on Redirect."
-        );
+        static::throwBadMethodCallException($method);
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Http/Request.php b/vendor/laravel/framework/src/Illuminate/Http/Request.php
index 6916063e..eb8c457e 100644
--- a/vendor/laravel/framework/src/Illuminate/Http/Request.php
+++ b/vendor/laravel/framework/src/Illuminate/Http/Request.php
@@ -124,8 +124,8 @@ class Request extends SymfonyRequest implements Arrayable, ArrayAccess
         $question = $this->getBaseUrl().$this->getPathInfo() == '/' ? '/?' : '?';
 
         return count($this->query()) > 0
-            ? $this->url().$question.http_build_query(array_merge($this->query(), $query))
-            : $this->fullUrl().$question.http_build_query($query);
+            ? $this->url().$question.Arr::query(array_merge($this->query(), $query))
+            : $this->fullUrl().$question.Arr::query($query);
     }
 
     /**
@@ -309,6 +309,20 @@ class Request extends SymfonyRequest implements Arrayable, ArrayAccess
         return $this;
     }
 
+    /**
+     * This method belongs to Symfony HttpFoundation and is not usually needed when using Laravel.
+     *
+     * Instead, you may use the "input" method.
+     *
+     * @param  string  $key
+     * @param  mixed  $default
+     * @return mixed
+     */
+    public function get($key, $default = null)
+    {
+        return parent::get($key, $default);
+    }
+
     /**
      * Get the JSON payload for the request.
      *
@@ -340,7 +354,45 @@ class Request extends SymfonyRequest implements Arrayable, ArrayAccess
             return $this->json();
         }
 
-        return $this->getRealMethod() == 'GET' ? $this->query : $this->request;
+        return in_array($this->getRealMethod(), ['GET', 'HEAD']) ? $this->query : $this->request;
+    }
+
+    /**
+     * Create a new request instance from the given Laravel request.
+     *
+     * @param  \Illuminate\Http\Request  $from
+     * @param  \Illuminate\Http\Request|null  $to
+     * @return static
+     */
+    public static function createFrom(self $from, $to = null)
+    {
+        $request = $to ?: new static;
+
+        $files = $from->files->all();
+
+        $files = is_array($files) ? array_filter($files) : $files;
+
+        $request->initialize(
+            $from->query->all(),
+            $from->request->all(),
+            $from->attributes->all(),
+            $from->cookies->all(),
+            $files,
+            $from->server->all(),
+            $from->getContent()
+        );
+
+        $request->setJson($from->json());
+
+        if ($session = $from->getSession()) {
+            $request->setLaravelSession($session);
+        }
+
+        $request->setUserResolver($from->getUserResolver());
+
+        $request->setRouteResolver($from->getRouteResolver());
+
+        return $request;
     }
 
     /**
@@ -415,7 +467,17 @@ class Request extends SymfonyRequest implements Arrayable, ArrayAccess
             throw new RuntimeException('Session store not set on request.');
         }
 
-        return $this->getSession();
+        return $this->session;
+    }
+
+    /**
+     * Get the session associated with the request.
+     *
+     * @return \Illuminate\Session\Store|null
+     */
+    public function getSession()
+    {
+        return $this->session;
     }
 
     /**
@@ -444,10 +506,10 @@ class Request extends SymfonyRequest implements Arrayable, ArrayAccess
      * Get the route handling the request.
      *
      * @param  string|null  $param
-     *
+     * @param  mixed   $default
      * @return \Illuminate\Routing\Route|object|string
      */
-    public function route($param = null)
+    public function route($param = null, $default = null)
     {
         $route = call_user_func($this->getRouteResolver());
 
@@ -455,7 +517,7 @@ class Request extends SymfonyRequest implements Arrayable, ArrayAccess
             return $route;
         }
 
-        return $route->parameter($param);
+        return $route->parameter($param, $default);
     }
 
     /**
@@ -472,7 +534,8 @@ class Request extends SymfonyRequest implements Arrayable, ArrayAccess
         }
 
         return sha1(implode('|', array_merge(
-            $route->methods(), [$route->getDomain(), $route->uri(), $this->ip()]
+            $route->methods(),
+            [$route->getDomain(), $route->uri(), $this->ip()]
         )));
     }
 
@@ -557,8 +620,9 @@ class Request extends SymfonyRequest implements Arrayable, ArrayAccess
      */
     public function offsetExists($offset)
     {
-        return array_key_exists(
-            $offset, $this->all() + $this->route()->parameters()
+        return Arr::has(
+            $this->all() + $this->route()->parameters(),
+            $offset
         );
     }
 
@@ -615,10 +679,8 @@ class Request extends SymfonyRequest implements Arrayable, ArrayAccess
      */
     public function __get($key)
     {
-        if (array_key_exists($key, $this->all())) {
-            return data_get($this->all(), $key);
-        }
-
-        return $this->route($key);
+        return Arr::get($this->all(), $key, function () use ($key) {
+            return $this->route($key);
+        });
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Http/Resources/ConditionallyLoadsAttributes.php b/vendor/laravel/framework/src/Illuminate/Http/Resources/ConditionallyLoadsAttributes.php
index 30030556..4315fad0 100644
--- a/vendor/laravel/framework/src/Illuminate/Http/Resources/ConditionallyLoadsAttributes.php
+++ b/vendor/laravel/framework/src/Illuminate/Http/Resources/ConditionallyLoadsAttributes.php
@@ -16,6 +16,8 @@ trait ConditionallyLoadsAttributes
     {
         $index = -1;
 
+        $numericKeys = array_values($data) === $data;
+
         foreach ($data as $key => $value) {
             $index++;
 
@@ -26,16 +28,7 @@ trait ConditionallyLoadsAttributes
             }
 
             if (is_numeric($key) && $value instanceof MergeValue) {
-                return $this->merge($data, $index, $this->filter($value->data));
-            }
-
-            if (($value instanceof PotentiallyMissing && $value->isMissing()) ||
-                ($value instanceof self &&
-                $value->resource instanceof PotentiallyMissing &&
-                $value->isMissing())) {
-                unset($data[$key]);
-
-                $index--;
+                return $this->mergeData($data, $index, $this->filter($value->data), $numericKeys);
             }
 
             if ($value instanceof self && is_null($value->resource)) {
@@ -43,7 +36,7 @@ trait ConditionallyLoadsAttributes
             }
         }
 
-        return $data;
+        return $this->removeMissingValues($data, $numericKeys);
     }
 
     /**
@@ -52,20 +45,43 @@ trait ConditionallyLoadsAttributes
      * @param  array  $data
      * @param  int  $index
      * @param  array  $merge
+     * @param  bool  $numericKeys
      * @return array
      */
-    protected function merge($data, $index, $merge)
+    protected function mergeData($data, $index, $merge, $numericKeys)
     {
-        if (array_values($data) === $data) {
-            return array_merge(
+        if ($numericKeys) {
+            return $this->removeMissingValues(array_merge(
                 array_merge(array_slice($data, 0, $index, true), $merge),
-                $this->filter(array_slice($data, $index + 1, null, true))
-            );
+                $this->filter(array_values(array_slice($data, $index + 1, null, true)))
+            ), $numericKeys);
         }
 
-        return array_slice($data, 0, $index, true) +
+        return $this->removeMissingValues(array_slice($data, 0, $index, true) +
                 $merge +
-                $this->filter(array_slice($data, $index + 1, null, true));
+                $this->filter(array_slice($data, $index + 1, null, true)));
+    }
+
+    /**
+     * Remove the missing values from the filtered data.
+     *
+     * @param  array  $data
+     * @param  bool  $numericKeys
+     * @return array
+     */
+    protected function removeMissingValues($data, $numericKeys = false)
+    {
+        foreach ($data as $key => $value) {
+            if (($value instanceof PotentiallyMissing && $value->isMissing()) ||
+                ($value instanceof self &&
+                $value->resource instanceof PotentiallyMissing &&
+                $value->isMissing())) {
+                unset($data[$key]);
+            }
+        }
+
+        return ! empty($data) && is_numeric(array_keys($data)[0])
+                        ? array_values($data) : $data;
     }
 
     /**
@@ -85,12 +101,23 @@ trait ConditionallyLoadsAttributes
         return func_num_args() === 3 ? value($default) : new MissingValue;
     }
 
+    /**
+     * Merge a value into the array.
+     *
+     * @param  mixed  $value
+     * @return \Illuminate\Http\Resources\MergeValue|mixed
+     */
+    protected function merge($value)
+    {
+        return $this->mergeWhen(true, $value);
+    }
+
     /**
      * Merge a value based on a given condition.
      *
      * @param  bool  $condition
      * @param  mixed  $value
-     * @return \Illuminate\Http\Resources\MissingValue|mixed
+     * @return \Illuminate\Http\Resources\MergeValue|mixed
      */
     protected function mergeWhen($condition, $value)
     {
@@ -125,7 +152,7 @@ trait ConditionallyLoadsAttributes
         }
 
         if (! $this->resource->relationLoaded($relationship)) {
-            return $default;
+            return value($default);
         }
 
         if (func_num_args() === 1) {
@@ -149,14 +176,28 @@ trait ConditionallyLoadsAttributes
      */
     protected function whenPivotLoaded($table, $value, $default = null)
     {
-        if (func_num_args() === 2) {
+        return $this->whenPivotLoadedAs('pivot', ...func_get_args());
+    }
+
+    /**
+     * Execute a callback if the given pivot table with a custom accessor has been loaded.
+     *
+     * @param  string  $accessor
+     * @param  string  $table
+     * @param  mixed  $value
+     * @param  mixed  $default
+     * @return \Illuminate\Http\Resources\MissingValue|mixed
+     */
+    protected function whenPivotLoadedAs($accessor, $table, $value, $default = null)
+    {
+        if (func_num_args() === 3) {
             $default = new MissingValue;
         }
 
         return $this->when(
-            $this->resource->pivot &&
-            ($this->resource->pivot instanceof $table ||
-             $this->resource->pivot->getTable() === $table),
+            $this->resource->$accessor &&
+            ($this->resource->$accessor instanceof $table ||
+            $this->resource->$accessor->getTable() === $table),
             ...[$value, $default]
         );
     }
diff --git a/vendor/laravel/framework/src/Illuminate/Http/Resources/DelegatesToResource.php b/vendor/laravel/framework/src/Illuminate/Http/Resources/DelegatesToResource.php
index 6f642c49..04fd4372 100644
--- a/vendor/laravel/framework/src/Illuminate/Http/Resources/DelegatesToResource.php
+++ b/vendor/laravel/framework/src/Illuminate/Http/Resources/DelegatesToResource.php
@@ -3,9 +3,12 @@
 namespace Illuminate\Http\Resources;
 
 use Exception;
+use Illuminate\Support\Traits\ForwardsCalls;
 
 trait DelegatesToResource
 {
+    use ForwardsCalls;
+
     /**
      * Get the value of the resource's route key.
      *
@@ -31,6 +34,7 @@ trait DelegatesToResource
      *
      * @param  mixed  $value
      * @return void
+     *
      * @throws \Exception
      */
     public function resolveRouteBinding($value)
@@ -125,6 +129,6 @@ trait DelegatesToResource
      */
     public function __call($method, $parameters)
     {
-        return $this->resource->{$method}(...$parameters);
+        return $this->forwardCallTo($this->resource, $method, $parameters);
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Http/Resources/Json/JsonResource.php b/vendor/laravel/framework/src/Illuminate/Http/Resources/Json/JsonResource.php
new file mode 100644
index 00000000..c81e81c0
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Http/Resources/Json/JsonResource.php
@@ -0,0 +1,212 @@
+<?php
+
+namespace Illuminate\Http\Resources\Json;
+
+use ArrayAccess;
+use JsonSerializable;
+use Illuminate\Support\Collection;
+use Illuminate\Container\Container;
+use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Contracts\Routing\UrlRoutable;
+use Illuminate\Contracts\Support\Responsable;
+use Illuminate\Http\Resources\DelegatesToResource;
+use Illuminate\Http\Resources\ConditionallyLoadsAttributes;
+
+class JsonResource implements ArrayAccess, JsonSerializable, Responsable, UrlRoutable
+{
+    use ConditionallyLoadsAttributes, DelegatesToResource;
+
+    /**
+     * The resource instance.
+     *
+     * @var mixed
+     */
+    public $resource;
+
+    /**
+     * The additional data that should be added to the top-level resource array.
+     *
+     * @var array
+     */
+    public $with = [];
+
+    /**
+     * The additional meta data that should be added to the resource response.
+     *
+     * Added during response construction by the developer.
+     *
+     * @var array
+     */
+    public $additional = [];
+
+    /**
+     * The "data" wrapper that should be applied.
+     *
+     * @var string
+     */
+    public static $wrap = 'data';
+
+    /**
+     * Create a new resource instance.
+     *
+     * @param  mixed  $resource
+     * @return void
+     */
+    public function __construct($resource)
+    {
+        $this->resource = $resource;
+    }
+
+    /**
+     * Create a new resource instance.
+     *
+     * @param  mixed  $parameters
+     * @return static
+     */
+    public static function make(...$parameters)
+    {
+        return new static(...$parameters);
+    }
+
+    /**
+     * Create new anonymous resource collection.
+     *
+     * @param  mixed  $resource
+     * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
+     */
+    public static function collection($resource)
+    {
+        return new AnonymousResourceCollection($resource, get_called_class());
+    }
+
+    /**
+     * Resolve the resource to an array.
+     *
+     * @param  \Illuminate\Http\Request|null  $request
+     * @return array
+     */
+    public function resolve($request = null)
+    {
+        $data = $this->toArray(
+            $request = $request ?: Container::getInstance()->make('request')
+        );
+
+        if (is_array($data)) {
+            $data = $data;
+        } elseif ($data instanceof Arrayable || $data instanceof Collection) {
+            $data = $data->toArray();
+        } elseif ($data instanceof JsonSerializable) {
+            $data = $data->jsonSerialize();
+        }
+
+        return $this->filter((array) $data);
+    }
+
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        if (is_null($this->resource)) {
+            return [];
+        }
+
+        return is_array($this->resource)
+            ? $this->resource
+            : $this->resource->toArray();
+    }
+
+    /**
+     * Get any additional data that should be returned with the resource array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function with($request)
+    {
+        return $this->with;
+    }
+
+    /**
+     * Add additional meta data to the resource response.
+     *
+     * @param  array  $data
+     * @return $this
+     */
+    public function additional(array $data)
+    {
+        $this->additional = $data;
+
+        return $this;
+    }
+
+    /**
+     * Customize the response for a request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Http\JsonResponse  $response
+     * @return void
+     */
+    public function withResponse($request, $response)
+    {
+        //
+    }
+
+    /**
+     * Set the string that should wrap the outer-most resource array.
+     *
+     * @param  string  $value
+     * @return void
+     */
+    public static function wrap($value)
+    {
+        static::$wrap = $value;
+    }
+
+    /**
+     * Disable wrapping of the outer-most resource array.
+     *
+     * @return void
+     */
+    public static function withoutWrapping()
+    {
+        static::$wrap = null;
+    }
+
+    /**
+     * Transform the resource into an HTTP response.
+     *
+     * @param  \Illuminate\Http\Request|null  $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function response($request = null)
+    {
+        return $this->toResponse(
+            $request ?: Container::getInstance()->make('request')
+        );
+    }
+
+    /**
+     * Create an HTTP response that represents the object.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function toResponse($request)
+    {
+        return (new ResourceResponse($this))->toResponse($request);
+    }
+
+    /**
+     * Prepare the resource for JSON serialization.
+     *
+     * @return array
+     */
+    public function jsonSerialize()
+    {
+        return $this->resolve(Container::getInstance()->make('request'));
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Http/Resources/Json/PaginatedResourceResponse.php b/vendor/laravel/framework/src/Illuminate/Http/Resources/Json/PaginatedResourceResponse.php
index f42bd248..596a4cb0 100644
--- a/vendor/laravel/framework/src/Illuminate/Http/Resources/Json/PaginatedResourceResponse.php
+++ b/vendor/laravel/framework/src/Illuminate/Http/Resources/Json/PaginatedResourceResponse.php
@@ -25,6 +25,8 @@ class PaginatedResourceResponse extends ResourceResponse
             ),
             $this->calculateStatus()
         ), function ($response) use ($request) {
+            $response->original = $this->resource->resource->pluck('resource');
+
             $this->resource->withResponse($request, $response);
         });
     }
diff --git a/vendor/laravel/framework/src/Illuminate/Http/Resources/Json/Resource.php b/vendor/laravel/framework/src/Illuminate/Http/Resources/Json/Resource.php
index 685f5697..49f67441 100644
--- a/vendor/laravel/framework/src/Illuminate/Http/Resources/Json/Resource.php
+++ b/vendor/laravel/framework/src/Illuminate/Http/Resources/Json/Resource.php
@@ -2,205 +2,7 @@
 
 namespace Illuminate\Http\Resources\Json;
 
-use ArrayAccess;
-use JsonSerializable;
-use Illuminate\Support\Collection;
-use Illuminate\Container\Container;
-use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Contracts\Routing\UrlRoutable;
-use Illuminate\Contracts\Support\Responsable;
-use Illuminate\Http\Resources\DelegatesToResource;
-use Illuminate\Http\Resources\ConditionallyLoadsAttributes;
-
-class Resource implements ArrayAccess, JsonSerializable, Responsable, UrlRoutable
+class Resource extends JsonResource
 {
-    use ConditionallyLoadsAttributes, DelegatesToResource;
-
-    /**
-     * The resource instance.
-     *
-     * @var mixed
-     */
-    public $resource;
-
-    /**
-     * The additional data that should be added to the top-level resource array.
-     *
-     * @var array
-     */
-    public $with = [];
-
-    /**
-     * The additional meta data that should be added to the resource response.
-     *
-     * Added during response construction by the developer.
-     *
-     * @var array
-     */
-    public $additional = [];
-
-    /**
-     * The "data" wrapper that should be applied.
-     *
-     * @var string
-     */
-    public static $wrap = 'data';
-
-    /**
-     * Create a new resource instance.
-     *
-     * @param  mixed  $resource
-     * @return void
-     */
-    public function __construct($resource)
-    {
-        $this->resource = $resource;
-    }
-
-    /**
-     * Create a new resource instance.
-     *
-     * @param  dynamic  $parameters
-     * @return static
-     */
-    public static function make(...$parameters)
-    {
-        return new static(...$parameters);
-    }
-
-    /**
-     * Create new anonymous resource collection.
-     *
-     * @param  mixed  $resource
-     * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
-     */
-    public static function collection($resource)
-    {
-        return new AnonymousResourceCollection($resource, get_called_class());
-    }
-
-    /**
-     * Resolve the resource to an array.
-     *
-     * @param  \Illuminate\Http\Request|null  $request
-     * @return array
-     */
-    public function resolve($request = null)
-    {
-        $data = $this->toArray(
-            $request = $request ?: Container::getInstance()->make('request')
-        );
-
-        if (is_array($data)) {
-            $data = $data;
-        } elseif ($data instanceof Arrayable || $data instanceof Collection) {
-            $data = $data->toArray();
-        } elseif ($data instanceof JsonSerializable) {
-            $data = $data->jsonSerialize();
-        }
-
-        return $this->filter((array) $data);
-    }
-
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return $this->resource->toArray();
-    }
-
-    /**
-     * Get any additional data that should be returned with the resource array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function with($request)
-    {
-        return $this->with;
-    }
-
-    /**
-     * Add additional meta data to the resource response.
-     *
-     * @param  array  $data
-     * @return $this
-     */
-    public function additional(array $data)
-    {
-        $this->additional = $data;
-
-        return $this;
-    }
-
-    /**
-     * Customize the response for a request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Illuminate\Http\JsonResponse  $response
-     * @return void
-     */
-    public function withResponse($request, $response)
-    {
-        //
-    }
-
-    /**
-     * Set the string that should wrap the outer-most resource array.
-     *
-     * @param  string  $value
-     * @return void
-     */
-    public static function wrap($value)
-    {
-        static::$wrap = $value;
-    }
-
-    /**
-     * Disable wrapping of the outer-most resource array.
-     *
-     * @return void
-     */
-    public static function withoutWrapping()
-    {
-        static::$wrap = null;
-    }
-
-    /**
-     * Transform the resource into an HTTP response.
-     *
-     * @param  \Illuminate\Http\Request|null  $request
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function response($request = null)
-    {
-        return $this->toResponse(
-            $request ?: Container::getInstance()->make('request')
-        );
-    }
-
-    /**
-     * Create an HTTP response that represents the object.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function toResponse($request)
-    {
-        return (new ResourceResponse($this))->toResponse($request);
-    }
-
-    /**
-     * Prepare the resource for JSON serialization.
-     *
-     * @return array
-     */
-    public function jsonSerialize()
-    {
-        return $this->resolve(Container::getInstance()->make('request'));
-    }
+    //
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Http/Resources/Json/ResourceCollection.php b/vendor/laravel/framework/src/Illuminate/Http/Resources/Json/ResourceCollection.php
index 2858244e..d7a91700 100644
--- a/vendor/laravel/framework/src/Illuminate/Http/Resources/Json/ResourceCollection.php
+++ b/vendor/laravel/framework/src/Illuminate/Http/Resources/Json/ResourceCollection.php
@@ -6,7 +6,7 @@ use IteratorAggregate;
 use Illuminate\Pagination\AbstractPaginator;
 use Illuminate\Http\Resources\CollectsResources;
 
-class ResourceCollection extends Resource implements IteratorAggregate
+class ResourceCollection extends JsonResource implements IteratorAggregate
 {
     use CollectsResources;
 
diff --git a/vendor/laravel/framework/src/Illuminate/Http/Resources/Json/ResourceResponse.php b/vendor/laravel/framework/src/Illuminate/Http/Resources/Json/ResourceResponse.php
index b9b4edb9..d3acb4ec 100644
--- a/vendor/laravel/framework/src/Illuminate/Http/Resources/Json/ResourceResponse.php
+++ b/vendor/laravel/framework/src/Illuminate/Http/Resources/Json/ResourceResponse.php
@@ -42,6 +42,8 @@ class ResourceResponse implements Responsable
             ),
             $this->calculateStatus()
         ), function ($response) use ($request) {
+            $response->original = $this->resource->resource;
+
             $this->resource->withResponse($request, $response);
         });
     }
diff --git a/vendor/laravel/framework/src/Illuminate/Http/Testing/FileFactory.php b/vendor/laravel/framework/src/Illuminate/Http/Testing/FileFactory.php
index 0a677d7d..c79617eb 100644
--- a/vendor/laravel/framework/src/Illuminate/Http/Testing/FileFactory.php
+++ b/vendor/laravel/framework/src/Illuminate/Http/Testing/FileFactory.php
@@ -2,6 +2,8 @@
 
 namespace Illuminate\Http\Testing;
 
+use Illuminate\Support\Str;
+
 class FileFactory
 {
     /**
@@ -28,7 +30,9 @@ class FileFactory
      */
     public function image($name, $width = 10, $height = 10)
     {
-        return new File($name, $this->generateImage($width, $height));
+        return new File($name, $this->generateImage(
+            $width, $height, Str::endsWith(Str::lower($name), ['.jpg', '.jpeg']) ? 'jpeg' : 'png'
+        ));
     }
 
     /**
@@ -36,14 +40,24 @@ class FileFactory
      *
      * @param  int  $width
      * @param  int  $height
+     * @param  string  $type
      * @return resource
      */
-    protected function generateImage($width, $height)
+    protected function generateImage($width, $height, $type)
     {
-        return tap(tmpfile(), function ($temp) use ($width, $height) {
+        return tap(tmpfile(), function ($temp) use ($width, $height, $type) {
             ob_start();
 
-            imagepng(imagecreatetruecolor($width, $height));
+            $image = imagecreatetruecolor($width, $height);
+
+            switch ($type) {
+                case 'jpeg':
+                    imagejpeg($image);
+                    break;
+                case 'png':
+                    imagepng($image);
+                    break;
+            }
 
             fwrite($temp, ob_get_clean());
         });
diff --git a/vendor/laravel/framework/src/Illuminate/Http/UploadedFile.php b/vendor/laravel/framework/src/Illuminate/Http/UploadedFile.php
index 8ed7e7f9..61b7c125 100644
--- a/vendor/laravel/framework/src/Illuminate/Http/UploadedFile.php
+++ b/vendor/laravel/framework/src/Illuminate/Http/UploadedFile.php
@@ -5,6 +5,7 @@ namespace Illuminate\Http;
 use Illuminate\Support\Arr;
 use Illuminate\Container\Container;
 use Illuminate\Support\Traits\Macroable;
+use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Illuminate\Contracts\Filesystem\Factory as FilesystemFactory;
 use Symfony\Component\HttpFoundation\File\UploadedFile as SymfonyUploadedFile;
 
@@ -86,6 +87,22 @@ class UploadedFile extends SymfonyUploadedFile
         );
     }
 
+    /**
+     * Get the contents of the uploaded file.
+     *
+     * @return bool|string
+     *
+     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
+     */
+    public function get()
+    {
+        if (! $this->isValid()) {
+            throw new FileNotFoundException("File does not exist at path {$this->getPathname()}");
+        }
+
+        return file_get_contents($this->getPathname());
+    }
+
     /**
      * Create a new file instance from a base instance.
      *
@@ -99,7 +116,6 @@ class UploadedFile extends SymfonyUploadedFile
             $file->getPathname(),
             $file->getClientOriginalName(),
             $file->getClientMimeType(),
-            $file->getClientSize(),
             $file->getError(),
             $test
         );
diff --git a/vendor/laravel/framework/src/Illuminate/Http/composer.json b/vendor/laravel/framework/src/Illuminate/Http/composer.json
index a634cd28..69eb1556 100755
--- a/vendor/laravel/framework/src/Illuminate/Http/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Http/composer.json
@@ -14,11 +14,11 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/session": "5.5.*",
-        "illuminate/support": "5.5.*",
-        "symfony/http-foundation": "~3.3",
-        "symfony/http-kernel": "~3.3"
+        "php": "^7.1.3",
+        "illuminate/session": "5.7.*",
+        "illuminate/support": "5.7.*",
+        "symfony/http-foundation": "^4.1",
+        "symfony/http-kernel": "^4.1"
     },
     "autoload": {
         "psr-4": {
@@ -27,7 +27,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "config": {
diff --git a/vendor/laravel/framework/src/Illuminate/Log/LogManager.php b/vendor/laravel/framework/src/Illuminate/Log/LogManager.php
new file mode 100644
index 00000000..ac5942b2
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Log/LogManager.php
@@ -0,0 +1,573 @@
+<?php
+
+namespace Illuminate\Log;
+
+use Closure;
+use Throwable;
+use Illuminate\Support\Str;
+use Psr\Log\LoggerInterface;
+use InvalidArgumentException;
+use Monolog\Logger as Monolog;
+use Monolog\Handler\StreamHandler;
+use Monolog\Handler\SyslogHandler;
+use Monolog\Formatter\LineFormatter;
+use Monolog\Handler\ErrorLogHandler;
+use Monolog\Handler\HandlerInterface;
+use Monolog\Handler\RotatingFileHandler;
+use Monolog\Handler\SlackWebhookHandler;
+
+class LogManager implements LoggerInterface
+{
+    use ParsesLogConfiguration;
+
+    /**
+     * The application instance.
+     *
+     * @var \Illuminate\Foundation\Application
+     */
+    protected $app;
+
+    /**
+     * The array of resolved channels.
+     *
+     * @var array
+     */
+    protected $channels = [];
+
+    /**
+     * The registered custom driver creators.
+     *
+     * @var array
+     */
+    protected $customCreators = [];
+
+    /**
+     * Create a new Log manager instance.
+     *
+     * @param  \Illuminate\Foundation\Application  $app
+     * @return void
+     */
+    public function __construct($app)
+    {
+        $this->app = $app;
+    }
+
+    /**
+     * Create a new, on-demand aggregate logger instance.
+     *
+     * @param  array  $channels
+     * @param  string|null  $channel
+     * @return \Psr\Log\LoggerInterface
+     */
+    public function stack(array $channels, $channel = null)
+    {
+        return new Logger(
+            $this->createStackDriver(compact('channels', 'channel')),
+            $this->app['events']
+        );
+    }
+
+    /**
+     * Get a log channel instance.
+     *
+     * @param  string|null  $channel
+     * @return mixed
+     */
+    public function channel($channel = null)
+    {
+        return $this->driver($channel);
+    }
+
+    /**
+     * Get a log driver instance.
+     *
+     * @param  string|null  $driver
+     * @return mixed
+     */
+    public function driver($driver = null)
+    {
+        return $this->get($driver ?? $this->getDefaultDriver());
+    }
+
+    /**
+     * Attempt to get the log from the local cache.
+     *
+     * @param  string  $name
+     * @return \Psr\Log\LoggerInterface
+     */
+    protected function get($name)
+    {
+        try {
+            return $this->channels[$name] ?? with($this->resolve($name), function ($logger) use ($name) {
+                return $this->channels[$name] = $this->tap($name, new Logger($logger, $this->app['events']));
+            });
+        } catch (Throwable $e) {
+            return tap($this->createEmergencyLogger(), function ($logger) use ($e) {
+                $logger->emergency('Unable to create configured logger. Using emergency logger.', [
+                    'exception' => $e,
+                ]);
+            });
+        }
+    }
+
+    /**
+     * Apply the configured taps for the logger.
+     *
+     * @param  string  $name
+     * @param  \Illuminate\Log\Logger  $logger
+     * @return \Illuminate\Log\Logger
+     */
+    protected function tap($name, Logger $logger)
+    {
+        foreach ($this->configurationFor($name)['tap'] ?? [] as $tap) {
+            [$class, $arguments] = $this->parseTap($tap);
+
+            $this->app->make($class)->__invoke($logger, ...explode(',', $arguments));
+        }
+
+        return $logger;
+    }
+
+    /**
+     * Parse the given tap class string into a class name and arguments string.
+     *
+     * @param  string  $tap
+     * @return array
+     */
+    protected function parseTap($tap)
+    {
+        return Str::contains($tap, ':') ? explode(':', $tap, 2) : [$tap, ''];
+    }
+
+    /**
+     * Create an emergency log handler to avoid white screens of death.
+     *
+     * @return \Psr\Log\LoggerInterface
+     */
+    protected function createEmergencyLogger()
+    {
+        return new Logger(new Monolog('laravel', $this->prepareHandlers([new StreamHandler(
+                $this->app->storagePath().'/logs/laravel.log', $this->level(['level' => 'debug'])
+        )])), $this->app['events']);
+    }
+
+    /**
+     * Resolve the given log instance by name.
+     *
+     * @param  string  $name
+     * @return \Psr\Log\LoggerInterface
+     *
+     * @throws \InvalidArgumentException
+     */
+    protected function resolve($name)
+    {
+        $config = $this->configurationFor($name);
+
+        if (is_null($config)) {
+            throw new InvalidArgumentException("Log [{$name}] is not defined.");
+        }
+
+        if (isset($this->customCreators[$config['driver']])) {
+            return $this->callCustomCreator($config);
+        }
+
+        $driverMethod = 'create'.ucfirst($config['driver']).'Driver';
+
+        if (method_exists($this, $driverMethod)) {
+            return $this->{$driverMethod}($config);
+        }
+
+        throw new InvalidArgumentException("Driver [{$config['driver']}] is not supported.");
+    }
+
+    /**
+     * Call a custom driver creator.
+     *
+     * @param  array  $config
+     * @return mixed
+     */
+    protected function callCustomCreator(array $config)
+    {
+        return $this->customCreators[$config['driver']]($this->app, $config);
+    }
+
+    /**
+     * Create a custom log driver instance.
+     *
+     * @param  array  $config
+     * @return \Psr\Log\LoggerInterface
+     */
+    protected function createCustomDriver(array $config)
+    {
+        $factory = is_callable($via = $config['via']) ? $via : $this->app->make($via);
+
+        return $factory($config);
+    }
+
+    /**
+     * Create an aggregate log driver instance.
+     *
+     * @param  array  $config
+     * @return \Psr\Log\LoggerInterface
+     */
+    protected function createStackDriver(array $config)
+    {
+        $handlers = collect($config['channels'])->flatMap(function ($channel) {
+            return $this->channel($channel)->getHandlers();
+        })->all();
+
+        return new Monolog($this->parseChannel($config), $handlers);
+    }
+
+    /**
+     * Create an instance of the single file log driver.
+     *
+     * @param  array  $config
+     * @return \Psr\Log\LoggerInterface
+     */
+    protected function createSingleDriver(array $config)
+    {
+        return new Monolog($this->parseChannel($config), [
+            $this->prepareHandler(
+                new StreamHandler(
+                    $config['path'], $this->level($config),
+                    $config['bubble'] ?? true, $config['permission'] ?? null, $config['locking'] ?? false
+                )
+            ),
+        ]);
+    }
+
+    /**
+     * Create an instance of the daily file log driver.
+     *
+     * @param  array  $config
+     * @return \Psr\Log\LoggerInterface
+     */
+    protected function createDailyDriver(array $config)
+    {
+        return new Monolog($this->parseChannel($config), [
+            $this->prepareHandler(new RotatingFileHandler(
+                $config['path'], $config['days'] ?? 7, $this->level($config),
+                $config['bubble'] ?? true, $config['permission'] ?? null, $config['locking'] ?? false
+            )),
+        ]);
+    }
+
+    /**
+     * Create an instance of the Slack log driver.
+     *
+     * @param  array  $config
+     * @return \Psr\Log\LoggerInterface
+     */
+    protected function createSlackDriver(array $config)
+    {
+        return new Monolog($this->parseChannel($config), [
+            $this->prepareHandler(new SlackWebhookHandler(
+                $config['url'],
+                $config['channel'] ?? null,
+                $config['username'] ?? 'Laravel',
+                $config['attachment'] ?? true,
+                $config['emoji'] ?? ':boom:',
+                $config['short'] ?? false,
+                $config['context'] ?? true,
+                $this->level($config)
+            )),
+        ]);
+    }
+
+    /**
+     * Create an instance of the syslog log driver.
+     *
+     * @param  array  $config
+     * @return \Psr\Log\LoggerInterface
+     */
+    protected function createSyslogDriver(array $config)
+    {
+        return new Monolog($this->parseChannel($config), [
+            $this->prepareHandler(new SyslogHandler(
+                $this->app['config']['app.name'], $config['facility'] ?? LOG_USER, $this->level($config))
+            ),
+        ]);
+    }
+
+    /**
+     * Create an instance of the "error log" log driver.
+     *
+     * @param  array  $config
+     * @return \Psr\Log\LoggerInterface
+     */
+    protected function createErrorlogDriver(array $config)
+    {
+        return new Monolog($this->parseChannel($config), [
+            $this->prepareHandler(new ErrorLogHandler(
+                $config['type'] ?? ErrorLogHandler::OPERATING_SYSTEM, $this->level($config))
+            ),
+        ]);
+    }
+
+    /**
+     * Create an instance of any handler available in Monolog.
+     *
+     * @param  array  $config
+     * @return \Psr\Log\LoggerInterface
+     *
+     * @throws \InvalidArgumentException
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    protected function createMonologDriver(array $config)
+    {
+        if (! is_a($config['handler'], HandlerInterface::class, true)) {
+            throw new InvalidArgumentException(
+                $config['handler'].' must be an instance of '.HandlerInterface::class
+            );
+        }
+
+        $with = array_merge($config['with'] ?? [], $config['handler_with'] ?? []);
+
+        return new Monolog($this->parseChannel($config), [$this->prepareHandler(
+            $this->app->make($config['handler'], $with), $config
+        )]);
+    }
+
+    /**
+     * Prepare the handlers for usage by Monolog.
+     *
+     * @param  array  $handlers
+     * @return array
+     */
+    protected function prepareHandlers(array $handlers)
+    {
+        foreach ($handlers as $key => $handler) {
+            $handlers[$key] = $this->prepareHandler($handler);
+        }
+
+        return $handlers;
+    }
+
+    /**
+     * Prepare the handler for usage by Monolog.
+     *
+     * @param  \Monolog\Handler\HandlerInterface  $handler
+     * @param  array  $config
+     * @return \Monolog\Handler\HandlerInterface
+     */
+    protected function prepareHandler(HandlerInterface $handler, array $config = [])
+    {
+        if (! isset($config['formatter'])) {
+            $handler->setFormatter($this->formatter());
+        } elseif ($config['formatter'] !== 'default') {
+            $handler->setFormatter($this->app->make($config['formatter'], $config['formatter_with'] ?? []));
+        }
+
+        return $handler;
+    }
+
+    /**
+     * Get a Monolog formatter instance.
+     *
+     * @return \Monolog\Formatter\FormatterInterface
+     */
+    protected function formatter()
+    {
+        return tap(new LineFormatter(null, null, true, true), function ($formatter) {
+            $formatter->includeStacktraces();
+        });
+    }
+
+    /**
+     * Get fallback log channel name.
+     *
+     * @return string
+     */
+    protected function getFallbackChannelName()
+    {
+        return $this->app->bound('env') ? $this->app->environment() : 'production';
+    }
+
+    /**
+     * Get the log connection configuration.
+     *
+     * @param  string  $name
+     * @return array
+     */
+    protected function configurationFor($name)
+    {
+        return $this->app['config']["logging.channels.{$name}"];
+    }
+
+    /**
+     * Get the default log driver name.
+     *
+     * @return string
+     */
+    public function getDefaultDriver()
+    {
+        return $this->app['config']['logging.default'];
+    }
+
+    /**
+     * Set the default log driver name.
+     *
+     * @param  string  $name
+     * @return void
+     */
+    public function setDefaultDriver($name)
+    {
+        $this->app['config']['logging.default'] = $name;
+    }
+
+    /**
+     * Register a custom driver creator Closure.
+     *
+     * @param  string    $driver
+     * @param  \Closure  $callback
+     * @return $this
+     */
+    public function extend($driver, Closure $callback)
+    {
+        $this->customCreators[$driver] = $callback->bindTo($this, $this);
+
+        return $this;
+    }
+
+    /**
+     * System is unusable.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function emergency($message, array $context = [])
+    {
+        $this->driver()->emergency($message, $context);
+    }
+
+    /**
+     * Action must be taken immediately.
+     *
+     * Example: Entire website down, database unavailable, etc. This should
+     * trigger the SMS alerts and wake you up.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function alert($message, array $context = [])
+    {
+        $this->driver()->alert($message, $context);
+    }
+
+    /**
+     * Critical conditions.
+     *
+     * Example: Application component unavailable, unexpected exception.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function critical($message, array $context = [])
+    {
+        $this->driver()->critical($message, $context);
+    }
+
+    /**
+     * Runtime errors that do not require immediate action but should typically
+     * be logged and monitored.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function error($message, array $context = [])
+    {
+        $this->driver()->error($message, $context);
+    }
+
+    /**
+     * Exceptional occurrences that are not errors.
+     *
+     * Example: Use of deprecated APIs, poor use of an API, undesirable things
+     * that are not necessarily wrong.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function warning($message, array $context = [])
+    {
+        $this->driver()->warning($message, $context);
+    }
+
+    /**
+     * Normal but significant events.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function notice($message, array $context = [])
+    {
+        $this->driver()->notice($message, $context);
+    }
+
+    /**
+     * Interesting events.
+     *
+     * Example: User logs in, SQL logs.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function info($message, array $context = [])
+    {
+        $this->driver()->info($message, $context);
+    }
+
+    /**
+     * Detailed debug information.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function debug($message, array $context = [])
+    {
+        $this->driver()->debug($message, $context);
+    }
+
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed  $level
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function log($level, $message, array $context = [])
+    {
+        $this->driver()->log($level, $message, $context);
+    }
+
+    /**
+     * Dynamically call the default driver instance.
+     *
+     * @param  string  $method
+     * @param  array   $parameters
+     * @return mixed
+     */
+    public function __call($method, $parameters)
+    {
+        return $this->driver()->$method(...$parameters);
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Log/LogServiceProvider.php b/vendor/laravel/framework/src/Illuminate/Log/LogServiceProvider.php
index 700bb6e1..cd073921 100644
--- a/vendor/laravel/framework/src/Illuminate/Log/LogServiceProvider.php
+++ b/vendor/laravel/framework/src/Illuminate/Log/LogServiceProvider.php
@@ -2,7 +2,6 @@
 
 namespace Illuminate\Log;
 
-use Monolog\Logger as Monolog;
 use Illuminate\Support\ServiceProvider;
 
 class LogServiceProvider extends ServiceProvider
@@ -15,145 +14,7 @@ class LogServiceProvider extends ServiceProvider
     public function register()
     {
         $this->app->singleton('log', function () {
-            return $this->createLogger();
+            return new LogManager($this->app);
         });
     }
-
-    /**
-     * Create the logger.
-     *
-     * @return \Illuminate\Log\Writer
-     */
-    public function createLogger()
-    {
-        $log = new Writer(
-            new Monolog($this->channel()), $this->app['events']
-        );
-
-        if ($this->app->hasMonologConfigurator()) {
-            call_user_func($this->app->getMonologConfigurator(), $log->getMonolog());
-        } else {
-            $this->configureHandler($log);
-        }
-
-        return $log;
-    }
-
-    /**
-     * Get the name of the log "channel".
-     *
-     * @return string
-     */
-    protected function channel()
-    {
-        if ($this->app->bound('config') &&
-            $channel = $this->app->make('config')->get('app.log_channel')) {
-            return $channel;
-        }
-
-        return $this->app->bound('env') ? $this->app->environment() : 'production';
-    }
-
-    /**
-     * Configure the Monolog handlers for the application.
-     *
-     * @param  \Illuminate\Log\Writer  $log
-     * @return void
-     */
-    protected function configureHandler(Writer $log)
-    {
-        $this->{'configure'.ucfirst($this->handler()).'Handler'}($log);
-    }
-
-    /**
-     * Configure the Monolog handlers for the application.
-     *
-     * @param  \Illuminate\Log\Writer  $log
-     * @return void
-     */
-    protected function configureSingleHandler(Writer $log)
-    {
-        $log->useFiles(
-            $this->app->storagePath().'/logs/laravel.log',
-            $this->logLevel()
-        );
-    }
-
-    /**
-     * Configure the Monolog handlers for the application.
-     *
-     * @param  \Illuminate\Log\Writer  $log
-     * @return void
-     */
-    protected function configureDailyHandler(Writer $log)
-    {
-        $log->useDailyFiles(
-            $this->app->storagePath().'/logs/laravel.log', $this->maxFiles(),
-            $this->logLevel()
-        );
-    }
-
-    /**
-     * Configure the Monolog handlers for the application.
-     *
-     * @param  \Illuminate\Log\Writer  $log
-     * @return void
-     */
-    protected function configureSyslogHandler(Writer $log)
-    {
-        $log->useSyslog('laravel', $this->logLevel());
-    }
-
-    /**
-     * Configure the Monolog handlers for the application.
-     *
-     * @param  \Illuminate\Log\Writer  $log
-     * @return void
-     */
-    protected function configureErrorlogHandler(Writer $log)
-    {
-        $log->useErrorLog($this->logLevel());
-    }
-
-    /**
-     * Get the default log handler.
-     *
-     * @return string
-     */
-    protected function handler()
-    {
-        if ($this->app->bound('config')) {
-            return $this->app->make('config')->get('app.log', 'single');
-        }
-
-        return 'single';
-    }
-
-    /**
-     * Get the log level for the application.
-     *
-     * @return string
-     */
-    protected function logLevel()
-    {
-        if ($this->app->bound('config')) {
-            return $this->app->make('config')->get('app.log_level', 'debug');
-        }
-
-        return 'debug';
-    }
-
-    /**
-     * Get the maximum number of log files for the application.
-     *
-     * @return int
-     */
-    protected function maxFiles()
-    {
-        if ($this->app->bound('config')) {
-            return $this->app->make('config')->get('app.log_max_files', 5);
-        }
-
-        return 0;
-    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Log/Writer.php b/vendor/laravel/framework/src/Illuminate/Log/Logger.php
similarity index 61%
rename from vendor/laravel/framework/src/Illuminate/Log/Writer.php
rename to vendor/laravel/framework/src/Illuminate/Log/Logger.php
index acf77b2d..6d5fdca2 100755
--- a/vendor/laravel/framework/src/Illuminate/Log/Writer.php
+++ b/vendor/laravel/framework/src/Illuminate/Log/Logger.php
@@ -4,66 +4,39 @@ namespace Illuminate\Log;
 
 use Closure;
 use RuntimeException;
-use InvalidArgumentException;
-use Monolog\Handler\StreamHandler;
-use Monolog\Handler\SyslogHandler;
-use Monolog\Formatter\LineFormatter;
-use Monolog\Handler\ErrorLogHandler;
-use Monolog\Logger as MonologLogger;
+use Psr\Log\LoggerInterface;
 use Illuminate\Log\Events\MessageLogged;
-use Monolog\Handler\RotatingFileHandler;
 use Illuminate\Contracts\Support\Jsonable;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Contracts\Support\Arrayable;
-use Psr\Log\LoggerInterface as PsrLoggerInterface;
-use Illuminate\Contracts\Logging\Log as LogContract;
 
-class Writer implements LogContract, PsrLoggerInterface
+class Logger implements LoggerInterface
 {
     /**
-     * The Monolog logger instance.
+     * The underlying logger implementation.
      *
-     * @var \Monolog\Logger
+     * @var \Psr\Log\LoggerInterface
      */
-    protected $monolog;
+    protected $logger;
 
     /**
      * The event dispatcher instance.
      *
-     * @var \Illuminate\Contracts\Events\Dispatcher
+     * @var \Illuminate\Contracts\Events\Dispatcher|null
      */
     protected $dispatcher;
 
-    /**
-     * The Log levels.
-     *
-     * @var array
-     */
-    protected $levels = [
-        'debug'     => MonologLogger::DEBUG,
-        'info'      => MonologLogger::INFO,
-        'notice'    => MonologLogger::NOTICE,
-        'warning'   => MonologLogger::WARNING,
-        'error'     => MonologLogger::ERROR,
-        'critical'  => MonologLogger::CRITICAL,
-        'alert'     => MonologLogger::ALERT,
-        'emergency' => MonologLogger::EMERGENCY,
-    ];
-
     /**
      * Create a new log writer instance.
      *
-     * @param  \Monolog\Logger  $monolog
+     * @param  \Psr\Log\LoggerInterface  $logger
      * @param  \Illuminate\Contracts\Events\Dispatcher|null  $dispatcher
      * @return void
      */
-    public function __construct(MonologLogger $monolog, Dispatcher $dispatcher = null)
+    public function __construct(LoggerInterface $logger, Dispatcher $dispatcher = null)
     {
-        $this->monolog = $monolog;
-
-        if (isset($dispatcher)) {
-            $this->dispatcher = $dispatcher;
-        }
+        $this->logger = $logger;
+        $this->dispatcher = $dispatcher;
     }
 
     /**
@@ -189,7 +162,7 @@ class Writer implements LogContract, PsrLoggerInterface
     }
 
     /**
-     * Write a message to Monolog.
+     * Write a message to the log.
      *
      * @param  string  $level
      * @param  string  $message
@@ -200,65 +173,7 @@ class Writer implements LogContract, PsrLoggerInterface
     {
         $this->fireLogEvent($level, $message = $this->formatMessage($message), $context);
 
-        $this->monolog->{$level}($message, $context);
-    }
-
-    /**
-     * Register a file log handler.
-     *
-     * @param  string  $path
-     * @param  string  $level
-     * @return void
-     */
-    public function useFiles($path, $level = 'debug')
-    {
-        $this->monolog->pushHandler($handler = new StreamHandler($path, $this->parseLevel($level)));
-
-        $handler->setFormatter($this->getDefaultFormatter());
-    }
-
-    /**
-     * Register a daily file log handler.
-     *
-     * @param  string  $path
-     * @param  int     $days
-     * @param  string  $level
-     * @return void
-     */
-    public function useDailyFiles($path, $days = 0, $level = 'debug')
-    {
-        $this->monolog->pushHandler(
-            $handler = new RotatingFileHandler($path, $days, $this->parseLevel($level))
-        );
-
-        $handler->setFormatter($this->getDefaultFormatter());
-    }
-
-    /**
-     * Register a Syslog handler.
-     *
-     * @param  string  $name
-     * @param  string  $level
-     * @param  mixed  $facility
-     * @return \Psr\Log\LoggerInterface
-     */
-    public function useSyslog($name = 'laravel', $level = 'debug', $facility = LOG_USER)
-    {
-        return $this->monolog->pushHandler(new SyslogHandler($name, $facility, $level));
-    }
-
-    /**
-     * Register an error_log handler.
-     *
-     * @param  string  $level
-     * @param  int  $messageType
-     * @return void
-     */
-    public function useErrorLog($level = 'debug', $messageType = ErrorLogHandler::OPERATING_SYSTEM)
-    {
-        $this->monolog->pushHandler(
-            new ErrorLogHandler($messageType, $this->parseLevel($level))
-        );
+        $this->logger->{$level}($message, $context);
     }
 
     /**
@@ -316,42 +231,13 @@ class Writer implements LogContract, PsrLoggerInterface
     }
 
     /**
-     * Parse the string level into a Monolog constant.
-     *
-     * @param  string  $level
-     * @return int
-     *
-     * @throws \InvalidArgumentException
-     */
-    protected function parseLevel($level)
-    {
-        if (isset($this->levels[$level])) {
-            return $this->levels[$level];
-        }
-
-        throw new InvalidArgumentException('Invalid log level.');
-    }
-
-    /**
-     * Get the underlying Monolog instance.
-     *
-     * @return \Monolog\Logger
-     */
-    public function getMonolog()
-    {
-        return $this->monolog;
-    }
-
-    /**
-     * Get a default Monolog formatter instance.
+     * Get the underlying logger implementation.
      *
-     * @return \Monolog\Formatter\LineFormatter
+     * @return \Psr\Log\LoggerInterface
      */
-    protected function getDefaultFormatter()
+    public function getLogger()
     {
-        return tap(new LineFormatter(null, null, true, true), function ($formatter) {
-            $formatter->includeStacktraces();
-        });
+        return $this->logger;
     }
 
     /**
@@ -374,4 +260,16 @@ class Writer implements LogContract, PsrLoggerInterface
     {
         $this->dispatcher = $dispatcher;
     }
+
+    /**
+     * Dynamically proxy method calls to the underlying logger.
+     *
+     * @param  string  $method
+     * @param  array  $parameters
+     * @return mixed
+     */
+    public function __call($method, $parameters)
+    {
+        return $this->logger->{$method}(...$parameters);
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Log/ParsesLogConfiguration.php b/vendor/laravel/framework/src/Illuminate/Log/ParsesLogConfiguration.php
new file mode 100644
index 00000000..ebcb21d0
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Log/ParsesLogConfiguration.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Illuminate\Log;
+
+use InvalidArgumentException;
+use Monolog\Logger as Monolog;
+
+trait ParsesLogConfiguration
+{
+    /**
+     * The Log levels.
+     *
+     * @var array
+     */
+    protected $levels = [
+        'debug' => Monolog::DEBUG,
+        'info' => Monolog::INFO,
+        'notice' => Monolog::NOTICE,
+        'warning' => Monolog::WARNING,
+        'error' => Monolog::ERROR,
+        'critical' => Monolog::CRITICAL,
+        'alert' => Monolog::ALERT,
+        'emergency' => Monolog::EMERGENCY,
+    ];
+
+    /**
+     * Get fallback log channel name.
+     *
+     * @return string
+     */
+    abstract protected function getFallbackChannelName();
+
+    /**
+     * Parse the string level into a Monolog constant.
+     *
+     * @param  array  $config
+     * @return int
+     *
+     * @throws \InvalidArgumentException
+     */
+    protected function level(array $config)
+    {
+        $level = $config['level'] ?? 'debug';
+
+        if (isset($this->levels[$level])) {
+            return $this->levels[$level];
+        }
+
+        throw new InvalidArgumentException('Invalid log level.');
+    }
+
+    /**
+     * Extract the log channel from the given configuration.
+     *
+     * @param  array  $config
+     * @return string
+     */
+    protected function parseChannel(array $config)
+    {
+        if (! isset($config['name'])) {
+            return $this->getFallbackChannelName();
+        }
+
+        return $config['name'];
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Log/composer.json b/vendor/laravel/framework/src/Illuminate/Log/composer.json
index 5fe13643..f0af69bd 100755
--- a/vendor/laravel/framework/src/Illuminate/Log/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Log/composer.json
@@ -14,10 +14,10 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/support": "5.5.*",
-        "monolog/monolog": "~1.11"
+        "php": "^7.1.3",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/support": "5.7.*",
+        "monolog/monolog": "^1.11"
     },
     "autoload": {
         "psr-4": {
@@ -26,7 +26,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "config": {
diff --git a/vendor/laravel/framework/src/Illuminate/Mail/Events/MessageSending.php b/vendor/laravel/framework/src/Illuminate/Mail/Events/MessageSending.php
index 17bc2573..cff45213 100644
--- a/vendor/laravel/framework/src/Illuminate/Mail/Events/MessageSending.php
+++ b/vendor/laravel/framework/src/Illuminate/Mail/Events/MessageSending.php
@@ -11,14 +11,23 @@ class MessageSending
      */
     public $message;
 
+    /**
+     * The message data.
+     *
+     * @var array
+     */
+    public $data;
+
     /**
      * Create a new event instance.
      *
-     * @param  \Swift_Message  $message
+     * @param  \Swift_Message $message
+     * @param  array  $data
      * @return void
      */
-    public function __construct($message)
+    public function __construct($message, $data = [])
     {
+        $this->data = $data;
         $this->message = $message;
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Mail/Events/MessageSent.php b/vendor/laravel/framework/src/Illuminate/Mail/Events/MessageSent.php
index 8af4a0e9..9dee09c2 100644
--- a/vendor/laravel/framework/src/Illuminate/Mail/Events/MessageSent.php
+++ b/vendor/laravel/framework/src/Illuminate/Mail/Events/MessageSent.php
@@ -11,14 +11,23 @@ class MessageSent
      */
     public $message;
 
+    /**
+     * The message data.
+     *
+     * @var array
+     */
+    public $data;
+
     /**
      * Create a new event instance.
      *
      * @param  \Swift_Message  $message
+     * @param  array  $data
      * @return void
      */
-    public function __construct($message)
+    public function __construct($message, $data = [])
     {
+        $this->data = $data;
         $this->message = $message;
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Mail/MailServiceProvider.php b/vendor/laravel/framework/src/Illuminate/Mail/MailServiceProvider.php
index e185c379..4be6bfd5 100755
--- a/vendor/laravel/framework/src/Illuminate/Mail/MailServiceProvider.php
+++ b/vendor/laravel/framework/src/Illuminate/Mail/MailServiceProvider.php
@@ -5,6 +5,7 @@ namespace Illuminate\Mail;
 use Swift_Mailer;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
+use Swift_DependencyContainer;
 use Illuminate\Support\ServiceProvider;
 
 class MailServiceProvider extends ServiceProvider
@@ -92,6 +93,12 @@ class MailServiceProvider extends ServiceProvider
         // mailer instance, passing in the transport instances, which allows us to
         // override this transporter instances during app start-up if necessary.
         $this->app->singleton('swift.mailer', function ($app) {
+            if ($domain = $app->make('config')->get('mail.domain')) {
+                Swift_DependencyContainer::getInstance()
+                                ->register('mime.idgenerator.idright')
+                                ->asValue($domain);
+            }
+
             return new Swift_Mailer($app['swift.transport']->driver());
         });
     }
diff --git a/vendor/laravel/framework/src/Illuminate/Mail/Mailable.php b/vendor/laravel/framework/src/Illuminate/Mail/Mailable.php
index 86ea7a7e..34ede80b 100644
--- a/vendor/laravel/framework/src/Illuminate/Mail/Mailable.php
+++ b/vendor/laravel/framework/src/Illuminate/Mail/Mailable.php
@@ -4,17 +4,29 @@ namespace Illuminate\Mail;
 
 use ReflectionClass;
 use ReflectionProperty;
-use BadMethodCallException;
 use Illuminate\Support\Str;
 use Illuminate\Support\Collection;
+use Illuminate\Support\HtmlString;
 use Illuminate\Container\Container;
+use Illuminate\Support\Traits\Localizable;
 use Illuminate\Contracts\Support\Renderable;
+use Illuminate\Support\Traits\ForwardsCalls;
 use Illuminate\Contracts\Queue\Factory as Queue;
 use Illuminate\Contracts\Mail\Mailer as MailerContract;
 use Illuminate\Contracts\Mail\Mailable as MailableContract;
+use Illuminate\Contracts\Filesystem\Factory as FilesystemFactory;
 
 class Mailable implements MailableContract, Renderable
 {
+    use ForwardsCalls, Localizable;
+
+    /**
+     * The locale of the message.
+     *
+     * @var string
+     */
+    public $locale;
+
     /**
      * The person the message is from.
      *
@@ -64,6 +76,13 @@ class Mailable implements MailableContract, Renderable
      */
     protected $markdown;
 
+    /**
+     * The HTML to use for the message.
+     *
+     * @var string
+     */
+    protected $html;
+
     /**
      * The view to use for the message.
      *
@@ -99,6 +118,13 @@ class Mailable implements MailableContract, Renderable
      */
     public $rawAttachments = [];
 
+    /**
+     * The attachments from a storage disk.
+     *
+     * @var array
+     */
+    public $diskAttachments = [];
+
     /**
      * The callbacks for the message.
      *
@@ -106,6 +132,13 @@ class Mailable implements MailableContract, Renderable
      */
     public $callbacks = [];
 
+    /**
+     * The callback that should be invoked while building the view data.
+     *
+     * @var callable
+     */
+    public static $viewDataCallback;
+
     /**
      * Send the message using the given mailer.
      *
@@ -114,14 +147,16 @@ class Mailable implements MailableContract, Renderable
      */
     public function send(MailerContract $mailer)
     {
-        Container::getInstance()->call([$this, 'build']);
+        $this->withLocale($this->locale, function () use ($mailer) {
+            Container::getInstance()->call([$this, 'build']);
 
-        $mailer->send($this->buildView(), $this->buildViewData(), function ($message) {
-            $this->buildFrom($message)
-                 ->buildRecipients($message)
-                 ->buildSubject($message)
-                 ->buildAttachments($message)
-                 ->runCallbacks($message);
+            $mailer->send($this->buildView(), $this->buildViewData(), function ($message) {
+                $this->buildFrom($message)
+                     ->buildRecipients($message)
+                     ->buildSubject($message)
+                     ->runCallbacks($message)
+                     ->buildAttachments($message);
+            });
         });
     }
 
@@ -133,7 +168,7 @@ class Mailable implements MailableContract, Renderable
      */
     public function queue(Queue $queue)
     {
-        if (property_exists($this, 'delay')) {
+        if (isset($this->delay)) {
             return $this->later($this->delay, $queue);
         }
 
@@ -168,23 +203,36 @@ class Mailable implements MailableContract, Renderable
      * Render the mailable into a view.
      *
      * @return \Illuminate\View\View
+     *
+     * @throws \ReflectionException
      */
     public function render()
     {
-        Container::getInstance()->call([$this, 'build']);
+        return $this->withLocale($this->locale, function () {
+            Container::getInstance()->call([$this, 'build']);
 
-        return Container::getInstance()->make('mailer')->render(
-            $this->buildView(), $this->buildViewData()
-        );
+            return Container::getInstance()->make('mailer')->render(
+                $this->buildView(), $this->buildViewData()
+            );
+        });
     }
 
     /**
      * Build the view for the message.
      *
      * @return array|string
+     *
+     * @throws \ReflectionException
      */
     protected function buildView()
     {
+        if (isset($this->html)) {
+            return array_filter([
+                'html' => new HtmlString($this->html),
+                'text' => $this->textView ?? null,
+            ]);
+        }
+
         if (isset($this->markdown)) {
             return $this->buildMarkdownView();
         }
@@ -202,6 +250,8 @@ class Mailable implements MailableContract, Renderable
      * Build the Markdown view for the message.
      *
      * @return array
+     *
+     * @throws \ReflectionException
      */
     protected function buildMarkdownView()
     {
@@ -223,13 +273,19 @@ class Mailable implements MailableContract, Renderable
      * Build the view data for the message.
      *
      * @return array
+     *
+     * @throws \ReflectionException
      */
     public function buildViewData()
     {
         $data = $this->viewData;
 
+        if (static::$viewDataCallback) {
+            $data = array_merge($data, call_user_func(static::$viewDataCallback, $this));
+        }
+
         foreach ((new ReflectionClass($this))->getProperties(ReflectionProperty::IS_PUBLIC) as $property) {
-            if ($property->getDeclaringClass()->getName() != self::class) {
+            if ($property->getDeclaringClass()->getName() !== self::class) {
                 $data[$property->getName()] = $property->getValue($this);
             }
         }
@@ -317,9 +373,32 @@ class Mailable implements MailableContract, Renderable
             );
         }
 
+        $this->buildDiskAttachments($message);
+
         return $this;
     }
 
+    /**
+     * Add all of the disk attachments to the message.
+     *
+     * @param  \Illuminate\Mail\Message  $message
+     * @return void
+     */
+    protected function buildDiskAttachments($message)
+    {
+        foreach ($this->diskAttachments as $attachment) {
+            $storage = Container::getInstance()->make(
+                FilesystemFactory::class
+            )->disk($attachment['disk']);
+
+            $message->attachData(
+                $storage->get($attachment['path']),
+                $attachment['name'] ?? basename($attachment['path']),
+                array_merge(['mime' => $storage->mimeType($attachment['path'])], $attachment['options'])
+            );
+        }
+    }
+
     /**
      * Run the callbacks for the message.
      *
@@ -335,6 +414,19 @@ class Mailable implements MailableContract, Renderable
         return $this;
     }
 
+    /**
+     * Set the locale of the message.
+     *
+     * @param  string  $locale
+     * @return $this
+     */
+    public function locale($locale)
+    {
+        $this->locale = $locale;
+
+        return $this;
+    }
+
     /**
      * Set the priority of this message.
      *
@@ -600,6 +692,19 @@ class Mailable implements MailableContract, Renderable
         return $this;
     }
 
+    /**
+     * Set the rendered HTML content for the message.
+     *
+     * @param  string  $html
+     * @return $this
+     */
+    public function html($html)
+    {
+        $this->html = $html;
+
+        return $this;
+    }
+
     /**
      * Set the plain text view for the message.
      *
@@ -647,6 +752,40 @@ class Mailable implements MailableContract, Renderable
         return $this;
     }
 
+    /**
+     * Attach a file to the message from storage.
+     *
+     * @param  string  $path
+     * @param  string  $name
+     * @param  array  $options
+     * @return $this
+     */
+    public function attachFromStorage($path, $name = null, array $options = [])
+    {
+        return $this->attachFromStorageDisk(null, $path, $name, $options);
+    }
+
+    /**
+     * Attach a file to the message from storage.
+     *
+     * @param  string  $disk
+     * @param  string  $path
+     * @param  string  $name
+     * @param  array  $options
+     * @return $this
+     */
+    public function attachFromStorageDisk($disk, $path, $name = null, array $options = [])
+    {
+        $this->diskAttachments[] = [
+            'disk' => $disk,
+            'path' => $path,
+            'name' => $name ?? basename($path),
+            'options' => $options,
+        ];
+
+        return $this;
+    }
+
     /**
      * Attach in-memory data as an attachment.
      *
@@ -675,6 +814,17 @@ class Mailable implements MailableContract, Renderable
         return $this;
     }
 
+    /**
+     * Register a callback to be called while building the view data.
+     *
+     * @param  callable  $callback
+     * @return void
+     */
+    public static function buildViewDataUsing(callable $callback)
+    {
+        static::$viewDataCallback = $callback;
+    }
+
     /**
      * Dynamically bind parameters to the message.
      *
@@ -687,9 +837,9 @@ class Mailable implements MailableContract, Renderable
     public function __call($method, $parameters)
     {
         if (Str::startsWith($method, 'with')) {
-            return $this->with(Str::snake(substr($method, 4)), $parameters[0]);
+            return $this->with(Str::camel(substr($method, 4)), $parameters[0]);
         }
 
-        throw new BadMethodCallException("Method [$method] does not exist on mailable.");
+        static::throwBadMethodCallException($method);
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Mail/Mailer.php b/vendor/laravel/framework/src/Illuminate/Mail/Mailer.php
index 039e6415..bc2f2980 100755
--- a/vendor/laravel/framework/src/Illuminate/Mail/Mailer.php
+++ b/vendor/laravel/framework/src/Illuminate/Mail/Mailer.php
@@ -4,6 +4,7 @@ namespace Illuminate\Mail;
 
 use Swift_Mailer;
 use InvalidArgumentException;
+use Illuminate\Support\HtmlString;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Support\Traits\Macroable;
 use Illuminate\Contracts\Support\Htmlable;
@@ -136,6 +137,17 @@ class Mailer implements MailerContract, MailQueueContract
         return (new PendingMail($this))->to($users);
     }
 
+    /**
+     * Begin the process of mailing a mailable class instance.
+     *
+     * @param  mixed  $users
+     * @return \Illuminate\Mail\PendingMail
+     */
+    public function cc($users)
+    {
+        return (new PendingMail($this))->cc($users);
+    }
+
     /**
      * Begin the process of mailing a mailable class instance.
      *
@@ -147,6 +159,18 @@ class Mailer implements MailerContract, MailQueueContract
         return (new PendingMail($this))->bcc($users);
     }
 
+    /**
+     * Send a new message with only an HTML part.
+     *
+     * @param  string  $html
+     * @param  mixed  $callback
+     * @return void
+     */
+    public function html($html, $callback)
+    {
+        return $this->send(['html' => new HtmlString($html)], [], $callback);
+    }
+
     /**
      * Send a new message when only a raw text part.
      *
@@ -184,17 +208,17 @@ class Mailer implements MailerContract, MailQueueContract
         // First we need to parse the view, which could either be a string or an array
         // containing both an HTML and plain text versions of the view which should
         // be used when sending an e-mail. We will extract both of them out here.
-        list($view, $plain, $raw) = $this->parseView($view);
+        [$view, $plain, $raw] = $this->parseView($view);
 
         $data['message'] = $this->createMessage();
 
-        return $this->renderView($view, $data);
+        return $this->renderView($view ?: $plain, $data);
     }
 
     /**
      * Send a new message using a view.
      *
-     * @param  string|array|MailableContract  $view
+     * @param  string|array|\Illuminate\Contracts\Mail\Mailable  $view
      * @param  array  $data
      * @param  \Closure|string  $callback
      * @return void
@@ -208,22 +232,22 @@ class Mailer implements MailerContract, MailQueueContract
         // First we need to parse the view, which could either be a string or an array
         // containing both an HTML and plain text versions of the view which should
         // be used when sending an e-mail. We will extract both of them out here.
-        list($view, $plain, $raw) = $this->parseView($view);
+        [$view, $plain, $raw] = $this->parseView($view);
 
         $data['message'] = $message = $this->createMessage();
 
         // Once we have retrieved the view content for the e-mail we will set the body
         // of this message using the HTML type, which will provide a simple wrapper
         // to creating view based emails that are able to receive arrays of data.
-        $this->addContent($message, $view, $plain, $raw, $data);
-
         call_user_func($callback, $message);
 
+        $this->addContent($message, $view, $plain, $raw, $data);
+
         // If a global "to" address has been set, we will set that address on the mail
         // message. This is primarily useful during local development in which each
         // message should be delivered into a single mail address for inspection.
         if (isset($this->to['address'])) {
-            $this->setGlobalTo($message);
+            $this->setGlobalToAndRemoveCcAndBcc($message);
         }
 
         // Next we will determine if the message should be sent. We give the developer
@@ -231,10 +255,10 @@ class Mailer implements MailerContract, MailQueueContract
         // its recipients. We will then fire the sent event for the sent message.
         $swiftMessage = $message->getSwiftMessage();
 
-        if ($this->shouldSendMessage($swiftMessage)) {
+        if ($this->shouldSendMessage($swiftMessage, $data)) {
             $this->sendSwiftMessage($swiftMessage);
 
-            $this->dispatchSentEvent($message);
+            $this->dispatchSentEvent($message, $data);
         }
     }
 
@@ -334,7 +358,7 @@ class Mailer implements MailerContract, MailQueueContract
      * @param  \Illuminate\Mail\Message  $message
      * @return void
      */
-    protected function setGlobalTo($message)
+    protected function setGlobalToAndRemoveCcAndBcc($message)
     {
         $message->to($this->to['address'], $this->to['name'], true);
         $message->cc(null, null, true);
@@ -344,9 +368,11 @@ class Mailer implements MailerContract, MailQueueContract
     /**
      * Queue a new e-mail message for sending.
      *
-     * @param  string|array|MailableContract  $view
+     * @param  string|array|\Illuminate\Contracts\Mail\Mailable  $view
      * @param  string|null  $queue
      * @return mixed
+     *
+     * @throws \InvalidArgumentException
      */
     public function queue($view, $queue = null)
     {
@@ -387,9 +413,11 @@ class Mailer implements MailerContract, MailQueueContract
      * Queue a new e-mail message for sending after (n) seconds.
      *
      * @param  \DateTimeInterface|\DateInterval|int  $delay
-     * @param  string|array|MailableContract  $view
+     * @param  string|array|\Illuminate\Contracts\Mail\Mailable  $view
      * @param  string|null  $queue
      * @return mixed
+     *
+     * @throws \InvalidArgumentException
      */
     public function later($delay, $view, $queue = null)
     {
@@ -458,16 +486,17 @@ class Mailer implements MailerContract, MailQueueContract
      * Determines if the message can be sent.
      *
      * @param  \Swift_Message  $message
+     * @param  array  $data
      * @return bool
      */
-    protected function shouldSendMessage($message)
+    protected function shouldSendMessage($message, $data = [])
     {
         if (! $this->events) {
             return true;
         }
 
         return $this->events->until(
-            new Events\MessageSending($message)
+            new Events\MessageSending($message, $data)
         ) !== false;
     }
 
@@ -475,13 +504,14 @@ class Mailer implements MailerContract, MailQueueContract
      * Dispatch the message sent event.
      *
      * @param  \Illuminate\Mail\Message  $message
+     * @param  array  $data
      * @return void
      */
-    protected function dispatchSentEvent($message)
+    protected function dispatchSentEvent($message, $data = [])
     {
         if ($this->events) {
             $this->events->dispatch(
-                new Events\MessageSent($message->getSwiftMessage())
+                new Events\MessageSent($message->getSwiftMessage(), $data)
             );
         }
     }
diff --git a/vendor/laravel/framework/src/Illuminate/Mail/Message.php b/vendor/laravel/framework/src/Illuminate/Mail/Message.php
index 69324fc8..94c9dce2 100755
--- a/vendor/laravel/framework/src/Illuminate/Mail/Message.php
+++ b/vendor/laravel/framework/src/Illuminate/Mail/Message.php
@@ -4,12 +4,15 @@ namespace Illuminate\Mail;
 
 use Swift_Image;
 use Swift_Attachment;
+use Illuminate\Support\Traits\ForwardsCalls;
 
 /**
  * @mixin \Swift_Message
  */
 class Message
 {
+    use ForwardsCalls;
+
     /**
      * The Swift Message instance.
      *
@@ -321,8 +324,6 @@ class Message
      */
     public function __call($method, $parameters)
     {
-        $callable = [$this->swift, $method];
-
-        return call_user_func_array($callable, $parameters);
+        return $this->forwardCallTo($this->swift, $method, $parameters);
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Mail/PendingMail.php b/vendor/laravel/framework/src/Illuminate/Mail/PendingMail.php
index e3af961a..512eaafc 100644
--- a/vendor/laravel/framework/src/Illuminate/Mail/PendingMail.php
+++ b/vendor/laravel/framework/src/Illuminate/Mail/PendingMail.php
@@ -3,6 +3,7 @@
 namespace Illuminate\Mail;
 
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Contracts\Translation\HasLocalePreference;
 
 class PendingMail
 {
@@ -13,6 +14,13 @@ class PendingMail
      */
     protected $mailer;
 
+    /**
+     * The locale of the message.
+     *
+     * @var string
+     */
+    protected $locale;
+
     /**
      * The "to" recipients of the message.
      *
@@ -45,6 +53,19 @@ class PendingMail
         $this->mailer = $mailer;
     }
 
+    /**
+     * Set the locale of the message.
+     *
+     * @param  string  $locale
+     * @return $this
+     */
+    public function locale($locale)
+    {
+        $this->locale = $locale;
+
+        return $this;
+    }
+
     /**
      * Set the recipients of the message.
      *
@@ -55,6 +76,10 @@ class PendingMail
     {
         $this->to = $users;
 
+        if (! $this->locale && $users instanceof HasLocalePreference) {
+            $this->locale($users->preferredLocale());
+        }
+
         return $this;
     }
 
@@ -149,6 +174,7 @@ class PendingMail
     {
         return $mailable->to($this->to)
                         ->cc($this->cc)
-                        ->bcc($this->bcc);
+                        ->bcc($this->bcc)
+                        ->locale($this->locale);
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Mail/SendQueuedMailable.php b/vendor/laravel/framework/src/Illuminate/Mail/SendQueuedMailable.php
index 0ed9bdeb..e9e256d1 100644
--- a/vendor/laravel/framework/src/Illuminate/Mail/SendQueuedMailable.php
+++ b/vendor/laravel/framework/src/Illuminate/Mail/SendQueuedMailable.php
@@ -10,7 +10,7 @@ class SendQueuedMailable
     /**
      * The mailable message instance.
      *
-     * @var Mailable
+     * @var \Illuminate\Mail\Mailable
      */
     public $mailable;
 
diff --git a/vendor/laravel/framework/src/Illuminate/Mail/Transport/MailgunTransport.php b/vendor/laravel/framework/src/Illuminate/Mail/Transport/MailgunTransport.php
index bac82932..73dfb562 100644
--- a/vendor/laravel/framework/src/Illuminate/Mail/Transport/MailgunTransport.php
+++ b/vendor/laravel/framework/src/Illuminate/Mail/Transport/MailgunTransport.php
@@ -22,7 +22,7 @@ class MailgunTransport extends Transport
     protected $key;
 
     /**
-     * The Mailgun domain.
+     * The Mailgun email domain.
      *
      * @var string
      */
@@ -33,7 +33,7 @@ class MailgunTransport extends Transport
      *
      * @var string
      */
-    protected $url;
+    protected $endpoint;
 
     /**
      * Create a new Mailgun transport instance.
@@ -41,12 +41,15 @@ class MailgunTransport extends Transport
      * @param  \GuzzleHttp\ClientInterface  $client
      * @param  string  $key
      * @param  string  $domain
+     * @param  string|null  $endpoint
      * @return void
      */
-    public function __construct(ClientInterface $client, $key, $domain)
+    public function __construct(ClientInterface $client, $key, $domain, $endpoint = null)
     {
         $this->key = $key;
         $this->client = $client;
+        $this->endpoint = $endpoint ?? 'api.mailgun.net';
+
         $this->setDomain($domain);
     }
 
@@ -61,7 +64,11 @@ class MailgunTransport extends Transport
 
         $message->setBcc([]);
 
-        $this->client->post($this->url, $this->payload($message, $to));
+        $this->client->request(
+            'POST',
+            "https://{$this->endpoint}/v3/{$this->domain}/messages.mime",
+            $this->payload($message, $to)
+        );
 
         $this->sendPerformed($message);
 
@@ -161,8 +168,6 @@ class MailgunTransport extends Transport
      */
     public function setDomain($domain)
     {
-        $this->url = 'https://api.mailgun.net/v3/'.$domain.'/messages.mime';
-
         return $this->domain = $domain;
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Mail/Transport/MandrillTransport.php b/vendor/laravel/framework/src/Illuminate/Mail/Transport/MandrillTransport.php
index 685b0275..e8e6ae16 100644
--- a/vendor/laravel/framework/src/Illuminate/Mail/Transport/MandrillTransport.php
+++ b/vendor/laravel/framework/src/Illuminate/Mail/Transport/MandrillTransport.php
@@ -41,7 +41,7 @@ class MandrillTransport extends Transport
     {
         $this->beforeSendPerformed($message);
 
-        $this->client->post('https://mandrillapp.com/api/1.0/messages/send-raw.json', [
+        $this->client->request('POST', 'https://mandrillapp.com/api/1.0/messages/send-raw.json', [
             'form_params' => [
                 'key' => $this->key,
                 'to' => $this->getTo($message),
diff --git a/vendor/laravel/framework/src/Illuminate/Mail/Transport/SesTransport.php b/vendor/laravel/framework/src/Illuminate/Mail/Transport/SesTransport.php
index c3afe3f5..00e92bc5 100644
--- a/vendor/laravel/framework/src/Illuminate/Mail/Transport/SesTransport.php
+++ b/vendor/laravel/framework/src/Illuminate/Mail/Transport/SesTransport.php
@@ -14,15 +14,24 @@ class SesTransport extends Transport
      */
     protected $ses;
 
+    /**
+     * The Amazon SES transmission options.
+     *
+     * @var array
+     */
+    protected $options = [];
+
     /**
      * Create a new SES transport instance.
      *
      * @param  \Aws\Ses\SesClient  $ses
+     * @param  array  $options
      * @return void
      */
-    public function __construct(SesClient $ses)
+    public function __construct(SesClient $ses, $options = [])
     {
         $this->ses = $ses;
+        $this->options = $options;
     }
 
     /**
@@ -32,17 +41,42 @@ class SesTransport extends Transport
     {
         $this->beforeSendPerformed($message);
 
-        $headers = $message->getHeaders();
+        $result = $this->ses->sendRawEmail(
+            array_merge(
+                $this->options, [
+                    'Source' => key($message->getSender() ?: $message->getFrom()),
+                    'RawMessage' => [
+                        'Data' => $message->toString(),
+                    ],
+                ]
+            )
+        );
 
-        $headers->addTextHeader('X-SES-Message-ID', $this->ses->sendRawEmail([
-            'Source' => key($message->getSender() ?: $message->getFrom()),
-            'RawMessage' => [
-                'Data' => $message->toString(),
-            ],
-        ])->get('MessageId'));
+        $message->getHeaders()->addTextHeader('X-SES-Message-ID', $result->get('MessageId'));
 
         $this->sendPerformed($message);
 
         return $this->numberOfRecipients($message);
     }
+
+    /**
+     * Get the transmission options being used by the transport.
+     *
+     * @return array
+     */
+    public function getOptions()
+    {
+        return $this->options;
+    }
+
+    /**
+     * Set the transmission options being used by the transport.
+     *
+     * @param  array  $options
+     * @return array
+     */
+    public function setOptions(array $options)
+    {
+        return $this->options = $options;
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Mail/Transport/SparkPostTransport.php b/vendor/laravel/framework/src/Illuminate/Mail/Transport/SparkPostTransport.php
index cc58eac6..a2358f1d 100644
--- a/vendor/laravel/framework/src/Illuminate/Mail/Transport/SparkPostTransport.php
+++ b/vendor/laravel/framework/src/Illuminate/Mail/Transport/SparkPostTransport.php
@@ -22,7 +22,7 @@ class SparkPostTransport extends Transport
     protected $key;
 
     /**
-     * Transmission options.
+     * The SparkPost transmission options.
      *
      * @var array
      */
@@ -54,7 +54,7 @@ class SparkPostTransport extends Transport
 
         $message->setBcc([]);
 
-        $response = $this->client->post('https://api.sparkpost.com/api/v1/transmissions', [
+        $response = $this->client->request('POST', $this->getEndpoint(), [
             'headers' => [
                 'Authorization' => $this->key,
             ],
@@ -136,6 +136,16 @@ class SparkPostTransport extends Transport
         return $this->key = $key;
     }
 
+    /**
+     * Get the SparkPost API endpoint.
+     *
+     * @return string
+     */
+    public function getEndpoint()
+    {
+        return $this->getOptions()['endpoint'] ?? 'https://api.sparkpost.com/api/v1/transmissions';
+    }
+
     /**
      * Get the transmission options being used by the transport.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Mail/TransportManager.php b/vendor/laravel/framework/src/Illuminate/Mail/TransportManager.php
index 782d2d39..bc1f8938 100644
--- a/vendor/laravel/framework/src/Illuminate/Mail/TransportManager.php
+++ b/vendor/laravel/framework/src/Illuminate/Mail/TransportManager.php
@@ -69,7 +69,7 @@ class TransportManager extends Manager
     /**
      * Create an instance of the Amazon SES Swift Transport driver.
      *
-     * @return \Swift_SendmailTransport
+     * @return \Illuminate\Mail\Transport\SesTransport
      */
     protected function createSesDriver()
     {
@@ -77,9 +77,10 @@ class TransportManager extends Manager
             'version' => 'latest', 'service' => 'email',
         ]);
 
-        return new SesTransport(new SesClient(
-            $this->addSesCredentials($config)
-        ));
+        return new SesTransport(
+            new SesClient($this->addSesCredentials($config)),
+            $config['options'] ?? []
+        );
     }
 
     /**
@@ -91,7 +92,7 @@ class TransportManager extends Manager
     protected function addSesCredentials(array $config)
     {
         if ($config['key'] && $config['secret']) {
-            $config['credentials'] = Arr::only($config, ['key', 'secret']);
+            $config['credentials'] = Arr::only($config, ['key', 'secret', 'token']);
         }
 
         return $config;
@@ -118,7 +119,9 @@ class TransportManager extends Manager
 
         return new MailgunTransport(
             $this->guzzle($config),
-            $config['secret'], $config['domain']
+            $config['secret'],
+            $config['domain'],
+            $config['endpoint'] ?? null
         );
     }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Mail/composer.json b/vendor/laravel/framework/src/Illuminate/Mail/composer.json
index ee0f150d..d07f5135 100755
--- a/vendor/laravel/framework/src/Illuminate/Mail/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Mail/composer.json
@@ -14,14 +14,14 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "erusev/parsedown": "~1.7",
-        "illuminate/container": "5.5.*",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/support": "5.5.*",
-        "psr/log": "~1.0",
-        "swiftmailer/swiftmailer": "~6.0",
-        "tijsverkoyen/css-to-inline-styles": "~2.2"
+        "php": "^7.1.3",
+        "erusev/parsedown": "^1.7",
+        "illuminate/container": "5.7.*",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/support": "5.7.*",
+        "psr/log": "^1.0",
+        "swiftmailer/swiftmailer": "^6.0",
+        "tijsverkoyen/css-to-inline-styles": "^2.2.1"
     },
     "autoload": {
         "psr-4": {
@@ -30,12 +30,12 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "suggest": {
-        "aws/aws-sdk-php": "Required to use the SES mail driver (~3.0).",
-        "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers (~6.0)."
+        "aws/aws-sdk-php": "Required to use the SES mail driver (^3.0).",
+        "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers (^6.0)."
     },
     "config": {
         "sort-packages": true
diff --git a/vendor/laravel/framework/src/Illuminate/Mail/resources/views/html/button.blade.php b/vendor/laravel/framework/src/Illuminate/Mail/resources/views/html/button.blade.php
index c7aae1b8..9d14d9b1 100644
--- a/vendor/laravel/framework/src/Illuminate/Mail/resources/views/html/button.blade.php
+++ b/vendor/laravel/framework/src/Illuminate/Mail/resources/views/html/button.blade.php
@@ -7,7 +7,7 @@
                         <table border="0" cellpadding="0" cellspacing="0">
                             <tr>
                                 <td>
-                                    <a href="{{ $url }}" class="button button-{{ $color or 'blue' }}" target="_blank">{{ $slot }}</a>
+                                    <a href="{{ $url }}" class="button button-{{ $color ?? 'primary' }}" target="_blank">{{ $slot }}</a>
                                 </td>
                             </tr>
                         </table>
diff --git a/vendor/laravel/framework/src/Illuminate/Mail/resources/views/html/layout.blade.php b/vendor/laravel/framework/src/Illuminate/Mail/resources/views/html/layout.blade.php
index 991ae52a..859900a3 100644
--- a/vendor/laravel/framework/src/Illuminate/Mail/resources/views/html/layout.blade.php
+++ b/vendor/laravel/framework/src/Illuminate/Mail/resources/views/html/layout.blade.php
@@ -27,7 +27,7 @@
         <tr>
             <td align="center">
                 <table class="content" width="100%" cellpadding="0" cellspacing="0">
-                    {{ $header or '' }}
+                    {{ $header ?? '' }}
 
                     <!-- Email Body -->
                     <tr>
@@ -38,14 +38,14 @@
                                     <td class="content-cell">
                                         {{ Illuminate\Mail\Markdown::parse($slot) }}
 
-                                        {{ $subcopy or '' }}
+                                        {{ $subcopy ?? '' }}
                                     </td>
                                 </tr>
                             </table>
                         </td>
                     </tr>
 
-                    {{ $footer or '' }}
+                    {{ $footer ?? '' }}
                 </table>
             </td>
         </tr>
diff --git a/vendor/laravel/framework/src/Illuminate/Mail/resources/views/html/message.blade.php b/vendor/laravel/framework/src/Illuminate/Mail/resources/views/html/message.blade.php
index 2ad23a66..1ae9ed8f 100644
--- a/vendor/laravel/framework/src/Illuminate/Mail/resources/views/html/message.blade.php
+++ b/vendor/laravel/framework/src/Illuminate/Mail/resources/views/html/message.blade.php
@@ -21,7 +21,7 @@
     {{-- Footer --}}
     @slot('footer')
         @component('mail::footer')
-            &copy; {{ date('Y') }} {{ config('app.name') }}. All rights reserved.
+            © {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
         @endcomponent
     @endslot
 @endcomponent
diff --git a/vendor/laravel/framework/src/Illuminate/Mail/resources/views/html/themes/default.css b/vendor/laravel/framework/src/Illuminate/Mail/resources/views/html/themes/default.css
index b78b27da..aa4afb26 100644
--- a/vendor/laravel/framework/src/Illuminate/Mail/resources/views/html/themes/default.css
+++ b/vendor/laravel/framework/src/Illuminate/Mail/resources/views/html/themes/default.css
@@ -218,7 +218,8 @@ img {
     -webkit-text-size-adjust: none;
 }
 
-.button-blue {
+.button-blue,
+.button-primary {
     background-color: #3097D1;
     border-top: 10px solid #3097D1;
     border-right: 18px solid #3097D1;
@@ -226,7 +227,8 @@ img {
     border-left: 18px solid #3097D1;
 }
 
-.button-green {
+.button-green,
+.button-success {
     background-color: #2ab27b;
     border-top: 10px solid #2ab27b;
     border-right: 18px solid #2ab27b;
@@ -234,7 +236,8 @@ img {
     border-left: 18px solid #2ab27b;
 }
 
-.button-red {
+.button-red,
+.button-error {
     background-color: #bf5329;
     border-top: 10px solid #bf5329;
     border-right: 18px solid #bf5329;
diff --git a/vendor/laravel/framework/src/Illuminate/Mail/resources/views/markdown/message.blade.php b/vendor/laravel/framework/src/Illuminate/Mail/resources/views/markdown/message.blade.php
index b409c71c..1ae9ed8f 100644
--- a/vendor/laravel/framework/src/Illuminate/Mail/resources/views/markdown/message.blade.php
+++ b/vendor/laravel/framework/src/Illuminate/Mail/resources/views/markdown/message.blade.php
@@ -21,7 +21,7 @@
     {{-- Footer --}}
     @slot('footer')
         @component('mail::footer')
-            © {{ date('Y') }} {{ config('app.name') }}. All rights reserved.
+            © {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
         @endcomponent
     @endslot
 @endcomponent
diff --git a/vendor/laravel/framework/src/Illuminate/Notifications/ChannelManager.php b/vendor/laravel/framework/src/Illuminate/Notifications/ChannelManager.php
index eb8c4f29..97d10c41 100644
--- a/vendor/laravel/framework/src/Illuminate/Notifications/ChannelManager.php
+++ b/vendor/laravel/framework/src/Illuminate/Notifications/ChannelManager.php
@@ -21,6 +21,13 @@ class ChannelManager extends Manager implements DispatcherContract, FactoryContr
      */
     protected $defaultChannel = 'mail';
 
+    /**
+     * The locale used when sending notifications.
+     *
+     * @var string|null
+     */
+    protected $locale;
+
     /**
      * Send the given notification to the given notifiable entities.
      *
@@ -31,7 +38,7 @@ class ChannelManager extends Manager implements DispatcherContract, FactoryContr
     public function send($notifiables, $notification)
     {
         return (new NotificationSender(
-            $this, $this->app->make(Bus::class), $this->app->make(Dispatcher::class))
+            $this, $this->app->make(Bus::class), $this->app->make(Dispatcher::class), $this->locale)
         )->send($notifiables, $notification);
     }
 
@@ -46,7 +53,7 @@ class ChannelManager extends Manager implements DispatcherContract, FactoryContr
     public function sendNow($notifiables, $notification, array $channels = null)
     {
         return (new NotificationSender(
-            $this, $this->app->make(Bus::class), $this->app->make(Dispatcher::class))
+            $this, $this->app->make(Bus::class), $this->app->make(Dispatcher::class), $this->locale)
         )->sendNow($notifiables, $notification, $channels);
     }
 
@@ -168,4 +175,17 @@ class ChannelManager extends Manager implements DispatcherContract, FactoryContr
     {
         $this->defaultChannel = $channel;
     }
+
+    /**
+     * Set the locale of notifications.
+     *
+     * @param  string  $locale
+     * @return $this
+     */
+    public function locale($locale)
+    {
+        $this->locale = $locale;
+
+        return $this;
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Notifications/Channels/BroadcastChannel.php b/vendor/laravel/framework/src/Illuminate/Notifications/Channels/BroadcastChannel.php
index 63f85ce7..d3f58616 100644
--- a/vendor/laravel/framework/src/Illuminate/Notifications/Channels/BroadcastChannel.php
+++ b/vendor/laravel/framework/src/Illuminate/Notifications/Channels/BroadcastChannel.php
@@ -70,8 +70,6 @@ class BroadcastChannel
             return $notification->toArray($notifiable);
         }
 
-        throw new RuntimeException(
-            'Notification is missing toArray method.'
-        );
+        throw new RuntimeException('Notification is missing toArray method.');
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Notifications/Channels/DatabaseChannel.php b/vendor/laravel/framework/src/Illuminate/Notifications/Channels/DatabaseChannel.php
index 41767c3e..1019e5a4 100644
--- a/vendor/laravel/framework/src/Illuminate/Notifications/Channels/DatabaseChannel.php
+++ b/vendor/laravel/framework/src/Illuminate/Notifications/Channels/DatabaseChannel.php
@@ -16,12 +16,9 @@ class DatabaseChannel
      */
     public function send($notifiable, Notification $notification)
     {
-        return $notifiable->routeNotificationFor('database')->create([
-            'id' => $notification->id,
-            'type' => get_class($notification),
-            'data' => $this->getData($notifiable, $notification),
-            'read_at' => null,
-        ]);
+        return $notifiable->routeNotificationFor('database', $notification)->create(
+            $this->buildPayload($notifiable, $notification)
+        );
     }
 
     /**
@@ -44,8 +41,23 @@ class DatabaseChannel
             return $notification->toArray($notifiable);
         }
 
-        throw new RuntimeException(
-            'Notification is missing toDatabase / toArray method.'
-        );
+        throw new RuntimeException('Notification is missing toDatabase / toArray method.');
+    }
+
+    /**
+     * Build an array payload for the DatabaseNotification Model.
+     *
+     * @param  mixed  $notifiable
+     * @param  \Illuminate\Notifications\Notification  $notification
+     * @return array
+     */
+    protected function buildPayload($notifiable, Notification $notification)
+    {
+        return [
+            'id' => $notification->id,
+            'type' => get_class($notification),
+            'data' => $this->getData($notifiable, $notification),
+            'read_at' => null,
+        ];
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Notifications/Channels/MailChannel.php b/vendor/laravel/framework/src/Illuminate/Notifications/Channels/MailChannel.php
index a584e393..f26319dd 100644
--- a/vendor/laravel/framework/src/Illuminate/Notifications/Channels/MailChannel.php
+++ b/vendor/laravel/framework/src/Illuminate/Notifications/Channels/MailChannel.php
@@ -8,6 +8,7 @@ use Illuminate\Mail\Markdown;
 use Illuminate\Contracts\Mail\Mailer;
 use Illuminate\Contracts\Mail\Mailable;
 use Illuminate\Notifications\Notification;
+use Illuminate\Contracts\Queue\ShouldQueue;
 
 class MailChannel
 {
@@ -49,7 +50,7 @@ class MailChannel
     {
         $message = $notification->toMail($notifiable);
 
-        if (! $notifiable->routeNotificationFor('mail') &&
+        if (! $notifiable->routeNotificationFor('mail', $notification) &&
             ! $message instanceof Mailable) {
             return;
         }
@@ -60,7 +61,7 @@ class MailChannel
 
         $this->mailer->send(
             $this->buildView($message),
-            $message->data(),
+            array_merge($message->data(), $this->additionalMessageData($notification)),
             $this->messageBuilder($notifiable, $notification, $message)
         );
     }
@@ -98,6 +99,22 @@ class MailChannel
         ];
     }
 
+    /**
+     * Get additional meta-data to pass along with the view data.
+     *
+     * @param  \Illuminate\Notifications\Notification  $notification
+     * @return array
+     */
+    protected function additionalMessageData($notification)
+    {
+        return [
+            '__laravel_notification' => get_class($notification),
+            '__laravel_notification_queued' => in_array(
+                ShouldQueue::class, class_implements($notification)
+            ),
+        ];
+    }
+
     /**
      * Build the mail message.
      *
@@ -109,7 +126,7 @@ class MailChannel
      */
     protected function buildMessage($mailMessage, $notifiable, $notification, $message)
     {
-        $this->addressMessage($mailMessage, $notifiable, $message);
+        $this->addressMessage($mailMessage, $notifiable, $notification, $message);
 
         $mailMessage->subject($message->subject ?: Str::title(
             Str::snake(class_basename($notification), ' ')
@@ -127,21 +144,26 @@ class MailChannel
      *
      * @param  \Illuminate\Mail\Message  $mailMessage
      * @param  mixed  $notifiable
+     * @param  \Illuminate\Notifications\Notification  $notification
      * @param  \Illuminate\Notifications\Messages\MailMessage  $message
      * @return void
      */
-    protected function addressMessage($mailMessage, $notifiable, $message)
+    protected function addressMessage($mailMessage, $notifiable, $notification, $message)
     {
         $this->addSender($mailMessage, $message);
 
-        $mailMessage->to($this->getRecipients($notifiable, $message));
+        $mailMessage->to($this->getRecipients($notifiable, $notification, $message));
 
-        if ($message->cc) {
-            $mailMessage->cc($message->cc[0], Arr::get($message->cc, 1));
+        if (! empty($message->cc)) {
+            foreach ($message->cc as $cc) {
+                $mailMessage->cc($cc[0], Arr::get($cc, 1));
+            }
         }
 
-        if ($message->bcc) {
-            $mailMessage->bcc($message->bcc[0], Arr::get($message->bcc, 1));
+        if (! empty($message->bcc)) {
+            foreach ($message->bcc as $bcc) {
+                $mailMessage->bcc($bcc[0], Arr::get($bcc, 1));
+            }
         }
     }
 
@@ -159,7 +181,9 @@ class MailChannel
         }
 
         if (! empty($message->replyTo)) {
-            $mailMessage->replyTo($message->replyTo[0], Arr::get($message->replyTo, 1));
+            foreach ($message->replyTo as $replyTo) {
+                $mailMessage->replyTo($replyTo[0], Arr::get($replyTo, 1));
+            }
         }
     }
 
@@ -167,17 +191,20 @@ class MailChannel
      * Get the recipients of the given message.
      *
      * @param  mixed  $notifiable
+     * @param  \Illuminate\Notifications\Notification  $notification
      * @param  \Illuminate\Notifications\Messages\MailMessage  $message
      * @return mixed
      */
-    protected function getRecipients($notifiable, $message)
+    protected function getRecipients($notifiable, $notification, $message)
     {
-        if (is_string($recipients = $notifiable->routeNotificationFor('mail'))) {
+        if (is_string($recipients = $notifiable->routeNotificationFor('mail', $notification))) {
             $recipients = [$recipients];
         }
 
-        return collect($recipients)->map(function ($recipient) {
-            return is_string($recipient) ? $recipient : $recipient->email;
+        return collect($recipients)->mapWithKeys(function ($recipient, $email) {
+            return is_numeric($email)
+                    ? [$email => (is_string($recipient) ? $recipient : $recipient->email)]
+                    : [$email => $recipient];
         })->all();
     }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Notifications/Channels/NexmoSmsChannel.php b/vendor/laravel/framework/src/Illuminate/Notifications/Channels/NexmoSmsChannel.php
index 61933242..fecbedde 100644
--- a/vendor/laravel/framework/src/Illuminate/Notifications/Channels/NexmoSmsChannel.php
+++ b/vendor/laravel/framework/src/Illuminate/Notifications/Channels/NexmoSmsChannel.php
@@ -44,7 +44,7 @@ class NexmoSmsChannel
      */
     public function send($notifiable, Notification $notification)
     {
-        if (! $to = $notifiable->routeNotificationFor('nexmo')) {
+        if (! $to = $notifiable->routeNotificationFor('nexmo', $notification)) {
             return;
         }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Notifications/Channels/SlackWebhookChannel.php b/vendor/laravel/framework/src/Illuminate/Notifications/Channels/SlackWebhookChannel.php
index afe370f7..9854ad47 100644
--- a/vendor/laravel/framework/src/Illuminate/Notifications/Channels/SlackWebhookChannel.php
+++ b/vendor/laravel/framework/src/Illuminate/Notifications/Channels/SlackWebhookChannel.php
@@ -33,11 +33,11 @@ class SlackWebhookChannel
      *
      * @param  mixed  $notifiable
      * @param  \Illuminate\Notifications\Notification  $notification
-     * @return \Psr\Http\Message\ResponseInterface
+     * @return void
      */
     public function send($notifiable, Notification $notification)
     {
-        if (! $url = $notifiable->routeNotificationFor('slack')) {
+        if (! $url = $notifiable->routeNotificationFor('slack', $notification)) {
             return;
         }
 
@@ -92,6 +92,7 @@ class SlackWebhookChannel
                 'footer_icon' => $attachment->footerIcon,
                 'image_url' => $attachment->imageUrl,
                 'mrkdwn_in' => $attachment->markdown,
+                'pretext' => $attachment->pretext,
                 'text' => $attachment->content,
                 'thumb_url' => $attachment->thumbUrl,
                 'title' => $attachment->title,
diff --git a/vendor/laravel/framework/src/Illuminate/Notifications/Events/BroadcastNotificationCreated.php b/vendor/laravel/framework/src/Illuminate/Notifications/Events/BroadcastNotificationCreated.php
index c93fe5c5..d58ae779 100644
--- a/vendor/laravel/framework/src/Illuminate/Notifications/Events/BroadcastNotificationCreated.php
+++ b/vendor/laravel/framework/src/Illuminate/Notifications/Events/BroadcastNotificationCreated.php
@@ -63,6 +63,22 @@ class BroadcastNotificationCreated implements ShouldBroadcast
         return [new PrivateChannel($this->channelName())];
     }
 
+    /**
+     * Get the broadcast channel name for the event.
+     *
+     * @return string
+     */
+    protected function channelName()
+    {
+        if (method_exists($this->notifiable, 'receivesBroadcastNotificationsOn')) {
+            return $this->notifiable->receivesBroadcastNotificationsOn($this->notification);
+        }
+
+        $class = str_replace('\\', '.', get_class($this->notifiable));
+
+        return $class.'.'.$this->notifiable->getKey();
+    }
+
     /**
      * Get the data that should be sent with the broadcasted event.
      *
@@ -72,23 +88,19 @@ class BroadcastNotificationCreated implements ShouldBroadcast
     {
         return array_merge($this->data, [
             'id' => $this->notification->id,
-            'type' => get_class($this->notification),
+            'type' => $this->broadcastType(),
         ]);
     }
 
     /**
-     * Get the broadcast channel name for the event.
+     * Get the type of the notification being broadcast.
      *
      * @return string
      */
-    protected function channelName()
+    public function broadcastType()
     {
-        if (method_exists($this->notifiable, 'receivesBroadcastNotificationsOn')) {
-            return $this->notifiable->receivesBroadcastNotificationsOn($this->notification);
-        }
-
-        $class = str_replace('\\', '.', get_class($this->notifiable));
-
-        return $class.'.'.$this->notifiable->getKey();
+        return method_exists($this->notification, 'broadcastType')
+                    ? $this->notification->broadcastType()
+                    : get_class($this->notification);
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Notifications/Events/NotificationFailed.php b/vendor/laravel/framework/src/Illuminate/Notifications/Events/NotificationFailed.php
index 1ddd9653..b69e1c54 100644
--- a/vendor/laravel/framework/src/Illuminate/Notifications/Events/NotificationFailed.php
+++ b/vendor/laravel/framework/src/Illuminate/Notifications/Events/NotificationFailed.php
@@ -2,8 +2,13 @@
 
 namespace Illuminate\Notifications\Events;
 
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+
 class NotificationFailed
 {
+    use Queueable, SerializesModels;
+
     /**
      * The notifiable entity who received the notification.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Notifications/Events/NotificationSending.php b/vendor/laravel/framework/src/Illuminate/Notifications/Events/NotificationSending.php
index 81a218ec..6efd1d06 100644
--- a/vendor/laravel/framework/src/Illuminate/Notifications/Events/NotificationSending.php
+++ b/vendor/laravel/framework/src/Illuminate/Notifications/Events/NotificationSending.php
@@ -2,8 +2,13 @@
 
 namespace Illuminate\Notifications\Events;
 
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+
 class NotificationSending
 {
+    use Queueable, SerializesModels;
+
     /**
      * The notifiable entity who received the notification.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Notifications/Events/NotificationSent.php b/vendor/laravel/framework/src/Illuminate/Notifications/Events/NotificationSent.php
index 725d880f..4f090691 100644
--- a/vendor/laravel/framework/src/Illuminate/Notifications/Events/NotificationSent.php
+++ b/vendor/laravel/framework/src/Illuminate/Notifications/Events/NotificationSent.php
@@ -2,8 +2,13 @@
 
 namespace Illuminate\Notifications\Events;
 
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+
 class NotificationSent
 {
+    use Queueable, SerializesModels;
+
     /**
      * The notifiable entity who received the notification.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Notifications/HasDatabaseNotifications.php b/vendor/laravel/framework/src/Illuminate/Notifications/HasDatabaseNotifications.php
index 0b938b01..981d8e55 100644
--- a/vendor/laravel/framework/src/Illuminate/Notifications/HasDatabaseNotifications.php
+++ b/vendor/laravel/framework/src/Illuminate/Notifications/HasDatabaseNotifications.php
@@ -6,28 +6,31 @@ trait HasDatabaseNotifications
 {
     /**
      * Get the entity's notifications.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
      */
     public function notifications()
     {
-        return $this->morphMany(DatabaseNotification::class, 'notifiable')
-                            ->orderBy('created_at', 'desc');
+        return $this->morphMany(DatabaseNotification::class, 'notifiable')->orderBy('created_at', 'desc');
     }
 
     /**
      * Get the entity's read notifications.
+     *
+     * @return \Illuminate\Database\Query\Builder
      */
     public function readNotifications()
     {
-        return $this->notifications()
-                            ->whereNotNull('read_at');
+        return $this->notifications()->whereNotNull('read_at');
     }
 
     /**
      * Get the entity's unread notifications.
+     *
+     * @return \Illuminate\Database\Query\Builder
      */
     public function unreadNotifications()
     {
-        return $this->notifications()
-                            ->whereNull('read_at');
+        return $this->notifications()->whereNull('read_at');
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Notifications/Messages/MailMessage.php b/vendor/laravel/framework/src/Illuminate/Notifications/Messages/MailMessage.php
index 4a0f7afc..c13f4ef2 100644
--- a/vendor/laravel/framework/src/Illuminate/Notifications/Messages/MailMessage.php
+++ b/vendor/laravel/framework/src/Illuminate/Notifications/Messages/MailMessage.php
@@ -2,6 +2,9 @@
 
 namespace Illuminate\Notifications\Messages;
 
+use Traversable;
+use Illuminate\Contracts\Support\Arrayable;
+
 class MailMessage extends SimpleMessage
 {
     /**
@@ -144,7 +147,11 @@ class MailMessage extends SimpleMessage
      */
     public function replyTo($address, $name = null)
     {
-        $this->replyTo = [$address, $name];
+        if ($this->arrayOfAddresses($address)) {
+            $this->replyTo += $this->parseAddresses($address);
+        } else {
+            $this->replyTo[] = [$address, $name];
+        }
 
         return $this;
     }
@@ -152,13 +159,17 @@ class MailMessage extends SimpleMessage
     /**
      * Set the cc address for the mail message.
      *
-     * @param  string  $address
+     * @param  array|string  $address
      * @param  string|null  $name
      * @return $this
      */
     public function cc($address, $name = null)
     {
-        $this->cc = [$address, $name];
+        if ($this->arrayOfAddresses($address)) {
+            $this->cc += $this->parseAddresses($address);
+        } else {
+            $this->cc[] = [$address, $name];
+        }
 
         return $this;
     }
@@ -166,13 +177,17 @@ class MailMessage extends SimpleMessage
     /**
      * Set the bcc address for the mail message.
      *
-     * @param  string  $address
+     * @param  array|string  $address
      * @param  string|null  $name
      * @return $this
      */
     public function bcc($address, $name = null)
     {
-        $this->bcc = [$address, $name];
+        if ($this->arrayOfAddresses($address)) {
+            $this->bcc += $this->parseAddresses($address);
+        } else {
+            $this->bcc[] = [$address, $name];
+        }
 
         return $this;
     }
@@ -230,4 +245,30 @@ class MailMessage extends SimpleMessage
     {
         return array_merge($this->toArray(), $this->viewData);
     }
+
+    /**
+     * Parse the multi-address array into the necessary format.
+     *
+     * @param  array  $value
+     * @return array
+     */
+    protected function parseAddresses($value)
+    {
+        return collect($value)->map(function ($address, $name) {
+            return [$address, is_numeric($name) ? null : $name];
+        })->values()->all();
+    }
+
+    /**
+     * Determine if the given "address" is actually an array of addresses.
+     *
+     * @param  mixed  $address
+     * @return bool
+     */
+    protected function arrayOfAddresses($address)
+    {
+        return is_array($address) ||
+               $address instanceof Arrayable ||
+               $address instanceof Traversable;
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Notifications/Messages/SlackAttachment.php b/vendor/laravel/framework/src/Illuminate/Notifications/Messages/SlackAttachment.php
index c949a5e0..caa903c0 100644
--- a/vendor/laravel/framework/src/Illuminate/Notifications/Messages/SlackAttachment.php
+++ b/vendor/laravel/framework/src/Illuminate/Notifications/Messages/SlackAttachment.php
@@ -22,6 +22,13 @@ class SlackAttachment
      */
     public $url;
 
+    /**
+     * The attachment's pretext.
+     *
+     * @var string
+     */
+    public $pretext;
+
     /**
      * The attachment's text content.
      *
@@ -128,6 +135,19 @@ class SlackAttachment
         return $this;
     }
 
+    /**
+     * Set the pretext of the attachment.
+     *
+     * @param  string  $pretext
+     * @return $this
+     */
+    public function pretext($pretext)
+    {
+        $this->pretext = $pretext;
+
+        return $this;
+    }
+
     /**
      * Set the content (text) of the attachment.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Notifications/Messages/SlackMessage.php b/vendor/laravel/framework/src/Illuminate/Notifications/Messages/SlackMessage.php
index 039fa725..5f9feaff 100644
--- a/vendor/laravel/framework/src/Illuminate/Notifications/Messages/SlackMessage.php
+++ b/vendor/laravel/framework/src/Illuminate/Notifications/Messages/SlackMessage.php
@@ -83,6 +83,18 @@ class SlackMessage
      */
     public $http = [];
 
+    /**
+     * Indicate that the notification gives information about an operation.
+     *
+     * @return $this
+     */
+    public function info()
+    {
+        $this->level = 'info';
+
+        return $this;
+    }
+
     /**
      * Indicate that the notification gives information about a successful operation.
      *
@@ -194,7 +206,7 @@ class SlackMessage
     /**
      * Get the color for the message.
      *
-     * @return string
+     * @return string|null
      */
     public function color()
     {
diff --git a/vendor/laravel/framework/src/Illuminate/Notifications/Notification.php b/vendor/laravel/framework/src/Illuminate/Notifications/Notification.php
index 9b258b7d..3af22645 100644
--- a/vendor/laravel/framework/src/Illuminate/Notifications/Notification.php
+++ b/vendor/laravel/framework/src/Illuminate/Notifications/Notification.php
@@ -15,6 +15,13 @@ class Notification
      */
     public $id;
 
+    /**
+     * The locale to be used when sending the notification.
+     *
+     * @var string|null
+     */
+    public $locale;
+
     /**
      * Get the channels the event should broadcast on.
      *
@@ -24,4 +31,17 @@ class Notification
     {
         return [];
     }
+
+    /**
+     * Set the locale to send this notification in.
+     *
+     * @param  string  $locale
+     * @return $this
+     */
+    public function locale($locale)
+    {
+        $this->locale = $locale;
+
+        return $this;
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Notifications/NotificationSender.php b/vendor/laravel/framework/src/Illuminate/Notifications/NotificationSender.php
index 7899f55a..f75c6a88 100644
--- a/vendor/laravel/framework/src/Illuminate/Notifications/NotificationSender.php
+++ b/vendor/laravel/framework/src/Illuminate/Notifications/NotificationSender.php
@@ -2,14 +2,18 @@
 
 namespace Illuminate\Notifications;
 
-use Ramsey\Uuid\Uuid;
+use Illuminate\Support\Str;
 use Illuminate\Support\Collection;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Traits\Localizable;
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Contracts\Translation\HasLocalePreference;
 use Illuminate\Database\Eloquent\Collection as ModelCollection;
 
 class NotificationSender
 {
+    use Localizable;
+
     /**
      * The notification manager instance.
      *
@@ -31,19 +35,28 @@ class NotificationSender
      */
     protected $events;
 
+    /**
+     * The locale to be used when sending notifications.
+     *
+     * @var string|null
+     */
+    protected $locale;
+
     /**
      * Create a new notification sender instance.
      *
      * @param  \Illuminate\Notifications\ChannelManager  $manager
      * @param  \Illuminate\Contracts\Bus\Dispatcher  $bus
      * @param  \Illuminate\Contracts\Events\Dispatcher  $events
+     * @param  string|null  $locale
      * @return void
      */
-    public function __construct($manager, $bus, $events)
+    public function __construct($manager, $bus, $events, $locale = null)
     {
         $this->bus = $bus;
         $this->events = $events;
         $this->manager = $manager;
+        $this->locale = $locale;
     }
 
     /**
@@ -83,14 +96,32 @@ class NotificationSender
                 continue;
             }
 
-            $notificationId = Uuid::uuid4()->toString();
+            $this->withLocale($this->preferredLocale($notifiable, $notification), function () use ($viaChannels, $notifiable, $original) {
+                $notificationId = Str::uuid()->toString();
 
-            foreach ((array) $viaChannels as $channel) {
-                $this->sendToNotifiable($notifiable, $notificationId, clone $original, $channel);
-            }
+                foreach ((array) $viaChannels as $channel) {
+                    $this->sendToNotifiable($notifiable, $notificationId, clone $original, $channel);
+                }
+            });
         }
     }
 
+    /**
+     * Get the notifiable's preferred locale for the notification.
+     *
+     * @param  mixed  $notifiable
+     * @param  mixed  $notification
+     * @return string|null
+     */
+    protected function preferredLocale($notifiable, $notification)
+    {
+        return $notification->locale ?? $this->locale ?? value(function () use ($notifiable) {
+            if ($notifiable instanceof HasLocalePreference) {
+                return $notifiable->preferredLocale();
+            }
+        });
+    }
+
     /**
      * Send the given notification to the given notifiable via a channel.
      *
@@ -146,13 +177,17 @@ class NotificationSender
         $original = clone $notification;
 
         foreach ($notifiables as $notifiable) {
-            $notificationId = Uuid::uuid4()->toString();
+            $notificationId = Str::uuid()->toString();
 
             foreach ($original->via($notifiable) as $channel) {
                 $notification = clone $original;
 
                 $notification->id = $notificationId;
 
+                if (! is_null($this->locale)) {
+                    $notification->locale = $this->locale;
+                }
+
                 $this->bus->dispatch(
                     (new SendQueuedNotifications($notifiable, $notification, [$channel]))
                             ->onConnection($notification->connection)
diff --git a/vendor/laravel/framework/src/Illuminate/Notifications/RoutesNotifications.php b/vendor/laravel/framework/src/Illuminate/Notifications/RoutesNotifications.php
index 779d5b8f..80df2eae 100644
--- a/vendor/laravel/framework/src/Illuminate/Notifications/RoutesNotifications.php
+++ b/vendor/laravel/framework/src/Illuminate/Notifications/RoutesNotifications.php
@@ -34,12 +34,13 @@ trait RoutesNotifications
      * Get the notification routing information for the given driver.
      *
      * @param  string  $driver
+     * @param  \Illuminate\Notifications\Notification|null  $notification
      * @return mixed
      */
-    public function routeNotificationFor($driver)
+    public function routeNotificationFor($driver, $notification = null)
     {
         if (method_exists($this, $method = 'routeNotificationFor'.Str::studly($driver))) {
-            return $this->{$method}();
+            return $this->{$method}($notification);
         }
 
         switch ($driver) {
diff --git a/vendor/laravel/framework/src/Illuminate/Notifications/SendQueuedNotifications.php b/vendor/laravel/framework/src/Illuminate/Notifications/SendQueuedNotifications.php
index 31fdd9b6..c795de44 100644
--- a/vendor/laravel/framework/src/Illuminate/Notifications/SendQueuedNotifications.php
+++ b/vendor/laravel/framework/src/Illuminate/Notifications/SendQueuedNotifications.php
@@ -25,7 +25,7 @@ class SendQueuedNotifications implements ShouldQueue
     public $notification;
 
     /**
-     * All of the channels to send the notification too.
+     * All of the channels to send the notification to.
      *
      * @var array
      */
diff --git a/vendor/laravel/framework/src/Illuminate/Notifications/composer.json b/vendor/laravel/framework/src/Illuminate/Notifications/composer.json
index 3e7264f9..e8932614 100644
--- a/vendor/laravel/framework/src/Illuminate/Notifications/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Notifications/composer.json
@@ -14,16 +14,15 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/broadcasting": "5.5.*",
-        "illuminate/bus": "5.5.*",
-        "illuminate/container": "5.5.*",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/filesystem": "5.5.*",
-        "illuminate/mail": "5.5.*",
-        "illuminate/queue": "5.5.*",
-        "illuminate/support": "5.5.*",
-        "ramsey/uuid": "~3.0"
+        "php": "^7.1.3",
+        "illuminate/broadcasting": "5.7.*",
+        "illuminate/bus": "5.7.*",
+        "illuminate/container": "5.7.*",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/filesystem": "5.7.*",
+        "illuminate/mail": "5.7.*",
+        "illuminate/queue": "5.7.*",
+        "illuminate/support": "5.7.*"
     },
     "autoload": {
         "psr-4": {
@@ -32,13 +31,13 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "suggest": {
-        "guzzlehttp/guzzle": "Required to use the Slack transport (~6.0)",
-        "illuminate/database": "Required to use the database transport (5.5.*).",
-        "nexmo/client": "Required to use the Nexmo transport (~1.0)."
+        "guzzlehttp/guzzle": "Required to use the Slack transport (^6.0)",
+        "illuminate/database": "Required to use the database transport (5.7.*).",
+        "nexmo/client": "Required to use the Nexmo transport (^1.0)."
     },
     "config": {
         "sort-packages": true
diff --git a/vendor/laravel/framework/src/Illuminate/Notifications/resources/views/email.blade.php b/vendor/laravel/framework/src/Illuminate/Notifications/resources/views/email.blade.php
index abfaa88e..4abd9b5f 100644
--- a/vendor/laravel/framework/src/Illuminate/Notifications/resources/views/email.blade.php
+++ b/vendor/laravel/framework/src/Illuminate/Notifications/resources/views/email.blade.php
@@ -4,9 +4,9 @@
 # {{ $greeting }}
 @else
 @if ($level == 'error')
-# Whoops!
+# @lang('Whoops!')
 @else
-# Hello!
+# @lang('Hello!')
 @endif
 @endif
 
@@ -21,13 +21,11 @@
 <?php
     switch ($level) {
         case 'success':
-            $color = 'green';
-            break;
         case 'error':
-            $color = 'red';
+            $color = $level;
             break;
         default:
-            $color = 'blue';
+            $color = 'primary';
     }
 ?>
 @component('mail::button', ['url' => $actionUrl, 'color' => $color])
@@ -45,14 +43,20 @@
 @if (! empty($salutation))
 {{ $salutation }}
 @else
-Regards,<br>{{ config('app.name') }}
+@lang('Regards'),<br>{{ config('app.name') }}
 @endif
 
 {{-- Subcopy --}}
 @isset($actionText)
 @component('mail::subcopy')
-If you’re having trouble clicking the "{{ $actionText }}" button, copy and paste the URL below
-into your web browser: [{{ $actionUrl }}]({{ $actionUrl }})
+@lang(
+    "If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\n".
+    'into your web browser: [:actionURL](:actionURL)',
+    [
+        'actionText' => $actionText,
+        'actionUrl' => $actionUrl
+    ]
+)
 @endcomponent
 @endisset
 @endcomponent
diff --git a/vendor/laravel/framework/src/Illuminate/Pagination/AbstractPaginator.php b/vendor/laravel/framework/src/Illuminate/Pagination/AbstractPaginator.php
index 0917ee87..16510068 100644
--- a/vendor/laravel/framework/src/Illuminate/Pagination/AbstractPaginator.php
+++ b/vendor/laravel/framework/src/Illuminate/Pagination/AbstractPaginator.php
@@ -3,15 +3,19 @@
 namespace Illuminate\Pagination;
 
 use Closure;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Htmlable;
+use Illuminate\Support\Traits\ForwardsCalls;
 
 /**
  * @mixin \Illuminate\Support\Collection
  */
 abstract class AbstractPaginator implements Htmlable
 {
+    use ForwardsCalls;
+
     /**
      * All of the items being paginated.
      *
@@ -61,6 +65,13 @@ abstract class AbstractPaginator implements Htmlable
      */
     protected $pageName = 'page';
 
+    /**
+     * The number of links to display on each side of current page link.
+     *
+     * @var int
+     */
+    public $onEachSide = 3;
+
     /**
      * The current path resolver callback.
      *
@@ -87,14 +98,14 @@ abstract class AbstractPaginator implements Htmlable
      *
      * @var string
      */
-    public static $defaultView = 'pagination::default';
+    public static $defaultView = 'pagination::bootstrap-4';
 
     /**
      * The default "simple" pagination view.
      *
      * @var string
      */
-    public static $defaultSimpleView = 'pagination::simple-default';
+    public static $defaultSimpleView = 'pagination::simple-bootstrap-4';
 
     /**
      * Determine if the given value is a valid page number.
@@ -156,7 +167,7 @@ abstract class AbstractPaginator implements Htmlable
 
         return $this->path
                         .(Str::contains($this->path, '?') ? '&' : '?')
-                        .http_build_query($parameters, '', '&')
+                        .Arr::query($parameters)
                         .$this->buildFragment();
     }
 
@@ -234,6 +245,20 @@ abstract class AbstractPaginator implements Htmlable
         return $this->fragment ? '#'.$this->fragment : '';
     }
 
+    /**
+     * Load a set of relationships onto the mixed relationship collection.
+     *
+     * @param  string $relation
+     * @param  array  $relations
+     * @return $this
+     */
+    public function loadMorph($relation, $relations)
+    {
+        $this->getCollection()->loadMorph($relation, $relations);
+
+        return $this;
+    }
+
     /**
      * Get the slice of items being paginated.
      *
@@ -351,6 +376,19 @@ abstract class AbstractPaginator implements Htmlable
         return $this;
     }
 
+    /**
+     * Set the number of links to display on each side of current page link.
+     *
+     * @param  int  $count
+     * @return $this
+     */
+    public function onEachSide($count)
+    {
+        $this->onEachSide = $count;
+
+        return $this;
+    }
+
     /**
      * Resolve the current request path or return the default value.
      *
@@ -447,6 +485,17 @@ abstract class AbstractPaginator implements Htmlable
         static::$defaultSimpleView = $view;
     }
 
+    /**
+     * Indicate that Bootstrap 3 styling should be used for generated links.
+     *
+     * @return void
+     */
+    public static function useBootstrapThree()
+    {
+        static::defaultView('pagination::default');
+        static::defaultSimpleView('pagination::simple-default');
+    }
+
     /**
      * Get an iterator for the items.
      *
@@ -458,7 +507,7 @@ abstract class AbstractPaginator implements Htmlable
     }
 
     /**
-     * Determine if the list of items is empty or not.
+     * Determine if the list of items is empty.
      *
      * @return bool
      */
@@ -574,7 +623,7 @@ abstract class AbstractPaginator implements Htmlable
      */
     public function __call($method, $parameters)
     {
-        return $this->getCollection()->$method(...$parameters);
+        return $this->forwardCallTo($this->getCollection(), $method, $parameters);
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Pagination/UrlWindow.php b/vendor/laravel/framework/src/Illuminate/Pagination/UrlWindow.php
index 6ec0b0c9..0fd3aa82 100644
--- a/vendor/laravel/framework/src/Illuminate/Pagination/UrlWindow.php
+++ b/vendor/laravel/framework/src/Illuminate/Pagination/UrlWindow.php
@@ -28,22 +28,22 @@ class UrlWindow
      * Create a new URL window instance.
      *
      * @param  \Illuminate\Contracts\Pagination\LengthAwarePaginator  $paginator
-     * @param  int  $onEachSide
      * @return array
      */
-    public static function make(PaginatorContract $paginator, $onEachSide = 3)
+    public static function make(PaginatorContract $paginator)
     {
-        return (new static($paginator))->get($onEachSide);
+        return (new static($paginator))->get();
     }
 
     /**
      * Get the window of URLs to be shown.
      *
-     * @param  int  $onEachSide
      * @return array
      */
-    public function get($onEachSide = 3)
+    public function get()
     {
+        $onEachSide = $this->paginator->onEachSide;
+
         if ($this->paginator->lastPage() < ($onEachSide * 2) + 6) {
             return $this->getSmallSlider();
         }
diff --git a/vendor/laravel/framework/src/Illuminate/Pagination/composer.json b/vendor/laravel/framework/src/Illuminate/Pagination/composer.json
index 48bcc062..9e4d7372 100755
--- a/vendor/laravel/framework/src/Illuminate/Pagination/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Pagination/composer.json
@@ -14,9 +14,9 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/support": "5.5.*"
+        "php": "^7.1.3",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/support": "5.7.*"
     },
     "autoload": {
         "psr-4": {
@@ -25,7 +25,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "config": {
diff --git a/vendor/laravel/framework/src/Illuminate/Pagination/resources/views/bootstrap-4.blade.php b/vendor/laravel/framework/src/Illuminate/Pagination/resources/views/bootstrap-4.blade.php
index 3f984557..044bbaa4 100644
--- a/vendor/laravel/framework/src/Illuminate/Pagination/resources/views/bootstrap-4.blade.php
+++ b/vendor/laravel/framework/src/Illuminate/Pagination/resources/views/bootstrap-4.blade.php
@@ -1,24 +1,28 @@
 @if ($paginator->hasPages())
-    <ul class="pagination">
+    <ul class="pagination" role="navigation">
         {{-- Previous Page Link --}}
         @if ($paginator->onFirstPage())
-            <li class="page-item disabled"><span class="page-link">&laquo;</span></li>
+            <li class="page-item disabled" aria-disabled="true" aria-label="@lang('pagination.previous')">
+                <span class="page-link" aria-hidden="true">&lsaquo;</span>
+            </li>
         @else
-            <li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li>
+            <li class="page-item">
+                <a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev" aria-label="@lang('pagination.previous')">&lsaquo;</a>
+            </li>
         @endif
 
         {{-- Pagination Elements --}}
         @foreach ($elements as $element)
             {{-- "Three Dots" Separator --}}
             @if (is_string($element))
-                <li class="page-item disabled"><span class="page-link">{{ $element }}</span></li>
+                <li class="page-item disabled" aria-disabled="true"><span class="page-link">{{ $element }}</span></li>
             @endif
 
             {{-- Array Of Links --}}
             @if (is_array($element))
                 @foreach ($element as $page => $url)
                     @if ($page == $paginator->currentPage())
-                        <li class="page-item active"><span class="page-link">{{ $page }}</span></li>
+                        <li class="page-item active" aria-current="page"><span class="page-link">{{ $page }}</span></li>
                     @else
                         <li class="page-item"><a class="page-link" href="{{ $url }}">{{ $page }}</a></li>
                     @endif
@@ -28,9 +32,13 @@
 
         {{-- Next Page Link --}}
         @if ($paginator->hasMorePages())
-            <li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li>
+            <li class="page-item">
+                <a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next" aria-label="@lang('pagination.next')">&rsaquo;</a>
+            </li>
         @else
-            <li class="page-item disabled"><span class="page-link">&raquo;</span></li>
+            <li class="page-item disabled" aria-disabled="true" aria-label="@lang('pagination.next')">
+                <span class="page-link" aria-hidden="true">&rsaquo;</span>
+            </li>
         @endif
     </ul>
 @endif
diff --git a/vendor/laravel/framework/src/Illuminate/Pagination/resources/views/default.blade.php b/vendor/laravel/framework/src/Illuminate/Pagination/resources/views/default.blade.php
index 4e795ff4..e59847a3 100644
--- a/vendor/laravel/framework/src/Illuminate/Pagination/resources/views/default.blade.php
+++ b/vendor/laravel/framework/src/Illuminate/Pagination/resources/views/default.blade.php
@@ -1,24 +1,28 @@
 @if ($paginator->hasPages())
-    <ul class="pagination">
+    <ul class="pagination" role="navigation">
         {{-- Previous Page Link --}}
         @if ($paginator->onFirstPage())
-            <li class="disabled"><span>&laquo;</span></li>
+            <li class="disabled" aria-disabled="true" aria-label="@lang('pagination.previous')">
+                <span aria-hidden="true">&lsaquo;</span>
+            </li>
         @else
-            <li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li>
+            <li>
+                <a href="{{ $paginator->previousPageUrl() }}" rel="prev" aria-label="@lang('pagination.previous')">&lsaquo;</a>
+            </li>
         @endif
 
         {{-- Pagination Elements --}}
         @foreach ($elements as $element)
             {{-- "Three Dots" Separator --}}
             @if (is_string($element))
-                <li class="disabled"><span>{{ $element }}</span></li>
+                <li class="disabled" aria-disabled="true"><span>{{ $element }}</span></li>
             @endif
 
             {{-- Array Of Links --}}
             @if (is_array($element))
                 @foreach ($element as $page => $url)
                     @if ($page == $paginator->currentPage())
-                        <li class="active"><span>{{ $page }}</span></li>
+                        <li class="active" aria-current="page"><span>{{ $page }}</span></li>
                     @else
                         <li><a href="{{ $url }}">{{ $page }}</a></li>
                     @endif
@@ -28,9 +32,13 @@
 
         {{-- Next Page Link --}}
         @if ($paginator->hasMorePages())
-            <li><a href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li>
+            <li>
+                <a href="{{ $paginator->nextPageUrl() }}" rel="next" aria-label="@lang('pagination.next')">&rsaquo;</a>
+            </li>
         @else
-            <li class="disabled"><span>&raquo;</span></li>
+            <li class="disabled" aria-disabled="true" aria-label="@lang('pagination.next')">
+                <span aria-hidden="true">&rsaquo;</span>
+            </li>
         @endif
     </ul>
 @endif
diff --git a/vendor/laravel/framework/src/Illuminate/Pagination/resources/views/semantic-ui.blade.php b/vendor/laravel/framework/src/Illuminate/Pagination/resources/views/semantic-ui.blade.php
index c6e0d210..ef0dbb18 100644
--- a/vendor/laravel/framework/src/Illuminate/Pagination/resources/views/semantic-ui.blade.php
+++ b/vendor/laravel/framework/src/Illuminate/Pagination/resources/views/semantic-ui.blade.php
@@ -1,24 +1,24 @@
 @if ($paginator->hasPages())
-    <div class="ui pagination menu">
+    <div class="ui pagination menu" role="navigation">
         {{-- Previous Page Link --}}
         @if ($paginator->onFirstPage())
-            <a class="icon item disabled"> <i class="left chevron icon"></i> </a>
+            <a class="icon item disabled" aria-disabled="true" aria-label="@lang('pagination.previous')"> <i class="left chevron icon"></i> </a>
         @else
-            <a class="icon item" href="{{ $paginator->previousPageUrl() }}" rel="prev"> <i class="left chevron icon"></i> </a>
+            <a class="icon item" href="{{ $paginator->previousPageUrl() }}" rel="prev" aria-label="@lang('pagination.previous')"> <i class="left chevron icon"></i> </a>
         @endif
 
         {{-- Pagination Elements --}}
         @foreach ($elements as $element)
             {{-- "Three Dots" Separator --}}
             @if (is_string($element))
-                <a class="icon item disabled">{{ $element }}</a>
+                <a class="icon item disabled" aria-disabled="true">{{ $element }}</a>
             @endif
 
             {{-- Array Of Links --}}
             @if (is_array($element))
                 @foreach ($element as $page => $url)
                     @if ($page == $paginator->currentPage())
-                        <a class="item active" href="{{ $url }}">{{ $page }}</a>
+                        <a class="item active" href="{{ $url }}" aria-current="page">{{ $page }}</a>
                     @else
                         <a class="item" href="{{ $url }}">{{ $page }}</a>
                     @endif
@@ -28,9 +28,9 @@
 
         {{-- Next Page Link --}}
         @if ($paginator->hasMorePages())
-            <a class="icon item" href="{{ $paginator->nextPageUrl() }}" rel="next"> <i class="right chevron icon"></i> </a>
+            <a class="icon item" href="{{ $paginator->nextPageUrl() }}" rel="next" aria-label="@lang('pagination.next')"> <i class="right chevron icon"></i> </a>
         @else
-            <a class="icon item disabled"> <i class="right chevron icon"></i> </a>
+            <a class="icon item disabled" aria-disabled="true" aria-label="@lang('pagination.next')"> <i class="right chevron icon"></i> </a>
         @endif
     </div>
 @endif
diff --git a/vendor/laravel/framework/src/Illuminate/Pagination/resources/views/simple-bootstrap-4.blade.php b/vendor/laravel/framework/src/Illuminate/Pagination/resources/views/simple-bootstrap-4.blade.php
index a9a18d32..cc30c9b2 100644
--- a/vendor/laravel/framework/src/Illuminate/Pagination/resources/views/simple-bootstrap-4.blade.php
+++ b/vendor/laravel/framework/src/Illuminate/Pagination/resources/views/simple-bootstrap-4.blade.php
@@ -1,17 +1,25 @@
 @if ($paginator->hasPages())
-    <ul class="pagination">
+    <ul class="pagination" role="navigation">
         {{-- Previous Page Link --}}
         @if ($paginator->onFirstPage())
-            <li class="page-item disabled"><span class="page-link">@lang('pagination.previous')</span></li>
+            <li class="page-item disabled" aria-disabled="true">
+                <span class="page-link">@lang('pagination.previous')</span>
+            </li>
         @else
-            <li class="page-item"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">@lang('pagination.previous')</a></li>
+            <li class="page-item">
+                <a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">@lang('pagination.previous')</a>
+            </li>
         @endif
 
         {{-- Next Page Link --}}
         @if ($paginator->hasMorePages())
-            <li class="page-item"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">@lang('pagination.next')</a></li>
+            <li class="page-item">
+                <a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">@lang('pagination.next')</a>
+            </li>
         @else
-            <li class="page-item disabled"><span class="page-link">@lang('pagination.next')</span></li>
+            <li class="page-item disabled" aria-disabled="true">
+                <span class="page-link">@lang('pagination.next')</span>
+            </li>
         @endif
     </ul>
 @endif
diff --git a/vendor/laravel/framework/src/Illuminate/Pagination/resources/views/simple-default.blade.php b/vendor/laravel/framework/src/Illuminate/Pagination/resources/views/simple-default.blade.php
index 18016092..bdf2fe88 100644
--- a/vendor/laravel/framework/src/Illuminate/Pagination/resources/views/simple-default.blade.php
+++ b/vendor/laravel/framework/src/Illuminate/Pagination/resources/views/simple-default.blade.php
@@ -1,8 +1,8 @@
 @if ($paginator->hasPages())
-    <ul class="pagination">
+    <ul class="pagination" role="navigation">
         {{-- Previous Page Link --}}
         @if ($paginator->onFirstPage())
-            <li class="disabled"><span>@lang('pagination.previous')</span></li>
+            <li class="disabled" aria-disabled="true"><span>@lang('pagination.previous')</span></li>
         @else
             <li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">@lang('pagination.previous')</a></li>
         @endif
@@ -11,7 +11,7 @@
         @if ($paginator->hasMorePages())
             <li><a href="{{ $paginator->nextPageUrl() }}" rel="next">@lang('pagination.next')</a></li>
         @else
-            <li class="disabled"><span>@lang('pagination.next')</span></li>
+            <li class="disabled" aria-disabled="true"><span>@lang('pagination.next')</span></li>
         @endif
     </ul>
 @endif
diff --git a/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php b/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php
index e227a583..2949c26e 100644
--- a/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php
+++ b/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php
@@ -4,7 +4,9 @@ namespace Illuminate\Pipeline;
 
 use Closure;
 use RuntimeException;
+use Illuminate\Http\Request;
 use Illuminate\Contracts\Container\Container;
+use Illuminate\Contracts\Support\Responsable;
 use Illuminate\Contracts\Pipeline\Pipeline as PipelineContract;
 
 class Pipeline implements PipelineContract
@@ -130,7 +132,7 @@ class Pipeline implements PipelineContract
                     // the appropriate method and arguments, returning the results back out.
                     return $pipe($passable, $stack);
                 } elseif (! is_object($pipe)) {
-                    list($name, $parameters) = $this->parsePipeString($pipe);
+                    [$name, $parameters] = $this->parsePipeString($pipe);
 
                     // If the pipe is a string we will parse the string and resolve the class out
                     // of the dependency injection container. We can then build a callable and
@@ -145,9 +147,13 @@ class Pipeline implements PipelineContract
                     $parameters = [$passable, $stack];
                 }
 
-                return method_exists($pipe, $this->method)
+                $response = method_exists($pipe, $this->method)
                                 ? $pipe->{$this->method}(...$parameters)
                                 : $pipe(...$parameters);
+
+                return $response instanceof Responsable
+                            ? $response->toResponse($this->container->make(Request::class))
+                            : $response;
             };
         };
     }
@@ -160,7 +166,7 @@ class Pipeline implements PipelineContract
      */
     protected function parsePipeString($pipe)
     {
-        list($name, $parameters) = array_pad(explode(':', $pipe, 2), 2, []);
+        [$name, $parameters] = array_pad(explode(':', $pipe, 2), 2, []);
 
         if (is_string($parameters)) {
             $parameters = explode(',', $parameters);
@@ -173,6 +179,7 @@ class Pipeline implements PipelineContract
      * Get the container instance.
      *
      * @return \Illuminate\Contracts\Container\Container
+     *
      * @throws \RuntimeException
      */
     protected function getContainer()
diff --git a/vendor/laravel/framework/src/Illuminate/Pipeline/composer.json b/vendor/laravel/framework/src/Illuminate/Pipeline/composer.json
index 3b85f815..f3225d4a 100644
--- a/vendor/laravel/framework/src/Illuminate/Pipeline/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Pipeline/composer.json
@@ -14,9 +14,9 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/support": "5.5.*"
+        "php": "^7.1.3",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/support": "5.7.*"
     },
     "autoload": {
         "psr-4": {
@@ -25,7 +25,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "config": {
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/BeanstalkdQueue.php b/vendor/laravel/framework/src/Illuminate/Queue/BeanstalkdQueue.php
index 8f585bb3..28f7f306 100755
--- a/vendor/laravel/framework/src/Illuminate/Queue/BeanstalkdQueue.php
+++ b/vendor/laravel/framework/src/Illuminate/Queue/BeanstalkdQueue.php
@@ -68,7 +68,7 @@ class BeanstalkdQueue extends Queue implements QueueContract
      */
     public function push($job, $data = '', $queue = null)
     {
-        return $this->pushRaw($this->createPayload($job, $data), $queue);
+        return $this->pushRaw($this->createPayload($job, $this->getQueue($queue), $data), $queue);
     }
 
     /**
@@ -100,7 +100,7 @@ class BeanstalkdQueue extends Queue implements QueueContract
         $pheanstalk = $this->pheanstalk->useTube($this->getQueue($queue));
 
         return $pheanstalk->put(
-            $this->createPayload($job, $data),
+            $this->createPayload($job, $this->getQueue($queue), $data),
             Pheanstalk::DEFAULT_PRIORITY,
             $this->secondsUntil($delay),
             $this->timeToRun
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/CallQueuedClosure.php b/vendor/laravel/framework/src/Illuminate/Queue/CallQueuedClosure.php
new file mode 100644
index 00000000..79aaae15
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Queue/CallQueuedClosure.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Illuminate\Queue;
+
+use ReflectionFunction;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Contracts\Container\Container;
+
+class CallQueuedClosure implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * The serializable Closure instance.
+     *
+     * @var \Illuminate\Queue\SerializableClosure
+     */
+    public $closure;
+
+    /**
+     * Indicate if the job should be deleted when models are missing.
+     *
+     * @var bool
+     */
+    public $deleteWhenMissingModels = true;
+
+    /**
+     * Create a new job instance.
+     *
+     * @param  \Illuminate\Queue\SerializableClosure
+     * @return void
+     */
+    public function __construct(SerializableClosure $closure)
+    {
+        $this->closure = $closure;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @param  \Illuminate\Contracts\Container\Container  $container
+     * @return void
+     */
+    public function handle(Container $container)
+    {
+        $container->call($this->closure->getClosure());
+    }
+
+    /**
+     * Get the display name for the queued job.
+     *
+     * @return string
+     */
+    public function displayName()
+    {
+        $reflection = new ReflectionFunction($this->closure->getClosure());
+
+        return 'Closure ('.basename($reflection->getFileName()).':'.$reflection->getStartLine().')';
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/CallQueuedHandler.php b/vendor/laravel/framework/src/Illuminate/Queue/CallQueuedHandler.php
index 15b83862..e8bc19ac 100644
--- a/vendor/laravel/framework/src/Illuminate/Queue/CallQueuedHandler.php
+++ b/vendor/laravel/framework/src/Illuminate/Queue/CallQueuedHandler.php
@@ -85,7 +85,7 @@ class CallQueuedHandler
      */
     protected function setJobInstanceIfNecessary(Job $job, $instance)
     {
-        if (in_array(InteractsWithQueue::class, class_uses_recursive(get_class($instance)))) {
+        if (in_array(InteractsWithQueue::class, class_uses_recursive($instance))) {
             $instance->setJob($job);
         }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/Connectors/RedisConnector.php b/vendor/laravel/framework/src/Illuminate/Queue/Connectors/RedisConnector.php
index ebac5a2b..697fbb6b 100644
--- a/vendor/laravel/framework/src/Illuminate/Queue/Connectors/RedisConnector.php
+++ b/vendor/laravel/framework/src/Illuminate/Queue/Connectors/RedisConnector.php
@@ -45,7 +45,8 @@ class RedisConnector implements ConnectorInterface
         return new RedisQueue(
             $this->redis, $config['queue'],
             $config['connection'] ?? $this->connection,
-            $config['retry_after'] ?? 60
+            $config['retry_after'] ?? 60,
+            $config['block_for'] ?? null
         );
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/Connectors/SqsConnector.php b/vendor/laravel/framework/src/Illuminate/Queue/Connectors/SqsConnector.php
index 9b1ceaad..9072b632 100755
--- a/vendor/laravel/framework/src/Illuminate/Queue/Connectors/SqsConnector.php
+++ b/vendor/laravel/framework/src/Illuminate/Queue/Connectors/SqsConnector.php
@@ -19,7 +19,7 @@ class SqsConnector implements ConnectorInterface
         $config = $this->getDefaultConfiguration($config);
 
         if ($config['key'] && $config['secret']) {
-            $config['credentials'] = Arr::only($config, ['key', 'secret']);
+            $config['credentials'] = Arr::only($config, ['key', 'secret', 'token']);
         }
 
         return new SqsQueue(
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/Console/ForgetFailedCommand.php b/vendor/laravel/framework/src/Illuminate/Queue/Console/ForgetFailedCommand.php
index dc04d948..b8eecb96 100644
--- a/vendor/laravel/framework/src/Illuminate/Queue/Console/ForgetFailedCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Queue/Console/ForgetFailedCommand.php
@@ -11,7 +11,7 @@ class ForgetFailedCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'queue:forget {id : The ID of the failed job.}';
+    protected $signature = 'queue:forget {id : The ID of the failed job}';
 
     /**
      * The console command description.
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/Console/RetryCommand.php b/vendor/laravel/framework/src/Illuminate/Queue/Console/RetryCommand.php
index 5ea49d53..96fb9e38 100644
--- a/vendor/laravel/framework/src/Illuminate/Queue/Console/RetryCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Queue/Console/RetryCommand.php
@@ -12,7 +12,7 @@ class RetryCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'queue:retry {id* : The ID of the failed job or "all" to retry all jobs.}';
+    protected $signature = 'queue:retry {id* : The ID of the failed job or "all" to retry all jobs}';
 
     /**
      * The console command description.
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/Console/WorkCommand.php b/vendor/laravel/framework/src/Illuminate/Queue/Console/WorkCommand.php
index 750d1339..67616151 100644
--- a/vendor/laravel/framework/src/Illuminate/Queue/Console/WorkCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Queue/Console/WorkCommand.php
@@ -23,6 +23,7 @@ class WorkCommand extends Command
                             {--queue= : The names of the queues to work}
                             {--daemon : Run the worker in daemon mode (Deprecated)}
                             {--once : Only process the next job on the queue}
+                            {--stop-when-empty : Stop when the queue is empty}
                             {--delay=0 : The number of seconds to delay failed jobs}
                             {--force : Force the worker to run even in maintenance mode}
                             {--memory=128 : The memory limit in megabytes}
@@ -112,7 +113,8 @@ class WorkCommand extends Command
         return new WorkerOptions(
             $this->option('delay'), $this->option('memory'),
             $this->option('timeout'), $this->option('sleep'),
-            $this->option('tries'), $this->option('force')
+            $this->option('tries'), $this->option('force'),
+            $this->option('stop-when-empty')
         );
     }
 
@@ -168,8 +170,9 @@ class WorkCommand extends Command
     protected function writeStatus(Job $job, $status, $type)
     {
         $this->output->writeln(sprintf(
-            "<{$type}>[%s] %s</{$type}> %s",
+            "<{$type}>[%s][%s] %s</{$type}> %s",
             Carbon::now()->format('Y-m-d H:i:s'),
+            $job->getJobId(),
             str_pad("{$status}:", 11), $job->resolveName()
         ));
     }
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/DatabaseQueue.php b/vendor/laravel/framework/src/Illuminate/Queue/DatabaseQueue.php
index 181fa2d6..41e87e56 100644
--- a/vendor/laravel/framework/src/Illuminate/Queue/DatabaseQueue.php
+++ b/vendor/laravel/framework/src/Illuminate/Queue/DatabaseQueue.php
@@ -2,7 +2,6 @@
 
 namespace Illuminate\Queue;
 
-use Throwable;
 use Illuminate\Support\Carbon;
 use Illuminate\Database\Connection;
 use Illuminate\Queue\Jobs\DatabaseJob;
@@ -79,7 +78,9 @@ class DatabaseQueue extends Queue implements QueueContract
      */
     public function push($job, $data = '', $queue = null)
     {
-        return $this->pushToDatabase($queue, $this->createPayload($job, $data));
+        return $this->pushToDatabase($queue, $this->createPayload(
+            $job, $this->getQueue($queue), $data
+        ));
     }
 
     /**
@@ -106,7 +107,9 @@ class DatabaseQueue extends Queue implements QueueContract
      */
     public function later($delay, $job, $data = '', $queue = null)
     {
-        return $this->pushToDatabase($queue, $this->createPayload($job, $data), $delay);
+        return $this->pushToDatabase($queue, $this->createPayload(
+            $job, $this->getQueue($queue), $data
+        ), $delay);
     }
 
     /**
@@ -125,7 +128,7 @@ class DatabaseQueue extends Queue implements QueueContract
 
         return $this->database->table($this->table)->insert(collect((array) $jobs)->map(
             function ($job) use ($queue, $data, $availableAt) {
-                return $this->buildDatabaseRecord($queue, $this->createPayload($job, $data), $availableAt);
+                return $this->buildDatabaseRecord($queue, $this->createPayload($job, $this->getQueue($queue), $data), $availableAt);
             }
         )->all());
     }
@@ -185,25 +188,20 @@ class DatabaseQueue extends Queue implements QueueContract
      *
      * @param  string  $queue
      * @return \Illuminate\Contracts\Queue\Job|null
+     *
      * @throws \Exception|\Throwable
      */
     public function pop($queue = null)
     {
         $queue = $this->getQueue($queue);
 
-        try {
-            $this->database->beginTransaction();
-
+        return $this->database->transaction(function () use ($queue) {
             if ($job = $this->getNextAvailableJob($queue)) {
                 return $this->marshalJob($queue, $job);
             }
 
-            $this->database->commit();
-        } catch (Throwable $e) {
-            $this->database->rollBack();
-
-            throw $e;
-        }
+            return null;
+        });
     }
 
     /**
@@ -267,8 +265,6 @@ class DatabaseQueue extends Queue implements QueueContract
     {
         $job = $this->markJobAsReserved($job);
 
-        $this->database->commit();
-
         return new DatabaseJob(
             $this->container, $this, $job, $this->connectionName, $queue
         );
@@ -296,6 +292,7 @@ class DatabaseQueue extends Queue implements QueueContract
      * @param  string  $queue
      * @param  string  $id
      * @return void
+     *
      * @throws \Exception|\Throwable
      */
     public function deleteReserved($queue, $id)
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/Events/WorkerStopping.php b/vendor/laravel/framework/src/Illuminate/Queue/Events/WorkerStopping.php
index 6c51209c..6d49bb20 100644
--- a/vendor/laravel/framework/src/Illuminate/Queue/Events/WorkerStopping.php
+++ b/vendor/laravel/framework/src/Illuminate/Queue/Events/WorkerStopping.php
@@ -4,5 +4,21 @@ namespace Illuminate\Queue\Events;
 
 class WorkerStopping
 {
-    //
+    /**
+     * The exit status.
+     *
+     * @var int
+     */
+    public $status;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param  int  $status
+     * @return void
+     */
+    public function __construct($status = 0)
+    {
+        $this->status = $status;
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/Jobs/Job.php b/vendor/laravel/framework/src/Illuminate/Queue/Jobs/Job.php
index 20b48222..2f043c57 100755
--- a/vendor/laravel/framework/src/Illuminate/Queue/Jobs/Job.php
+++ b/vendor/laravel/framework/src/Illuminate/Queue/Jobs/Job.php
@@ -55,6 +55,13 @@ abstract class Job
      */
     protected $queue;
 
+    /**
+     * Get the job identifier.
+     *
+     * @return string
+     */
+    abstract public function getJobId();
+
     /**
      * Get the raw body of the job.
      *
@@ -71,7 +78,7 @@ abstract class Job
     {
         $payload = $this->payload();
 
-        list($class, $method) = JobName::parse($payload['job']);
+        [$class, $method] = JobName::parse($payload['job']);
 
         ($this->instance = $this->resolve($class))->{$method}($this, $payload['data']);
     }
@@ -159,7 +166,7 @@ abstract class Job
 
         $payload = $this->payload();
 
-        list($class, $method) = JobName::parse($payload['job']);
+        [$class, $method] = JobName::parse($payload['job']);
 
         if (method_exists($this->instance = $this->resolve($class), 'failed')) {
             $this->instance->failed($payload['data'], $e);
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/Listener.php b/vendor/laravel/framework/src/Illuminate/Queue/Listener.php
index ccd62df3..f4862ec8 100755
--- a/vendor/laravel/framework/src/Illuminate/Queue/Listener.php
+++ b/vendor/laravel/framework/src/Illuminate/Queue/Listener.php
@@ -96,7 +96,7 @@ class Listener
     {
         return defined('ARTISAN_BINARY')
                         ? ProcessUtils::escapeArgument(ARTISAN_BINARY)
-                        : 'artisan';
+                        : ProcessUtils::escapeArgument('artisan');
     }
 
     /**
@@ -222,7 +222,7 @@ class Listener
      */
     public function memoryExceeded($memoryLimit)
     {
-        return (memory_get_usage() / 1024 / 1024) >= $memoryLimit;
+        return (memory_get_usage(true) / 1024 / 1024) >= $memoryLimit;
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/Queue.php b/vendor/laravel/framework/src/Illuminate/Queue/Queue.php
index b9b8461c..1048573c 100755
--- a/vendor/laravel/framework/src/Illuminate/Queue/Queue.php
+++ b/vendor/laravel/framework/src/Illuminate/Queue/Queue.php
@@ -18,18 +18,18 @@ abstract class Queue
     protected $container;
 
     /**
-     * The encrypter implementation.
+     * The connection name for the queue.
      *
-     * @var \Illuminate\Contracts\Encryption\Encrypter
+     * @var string
      */
-    protected $encrypter;
+    protected $connectionName;
 
     /**
-     * The connection name for the queue.
+     * The create payload callback.
      *
-     * @var string
+     * @var callable|null
      */
-    protected $connectionName;
+    protected static $createPayloadCallback;
 
     /**
      * Push a new job onto the queue.
@@ -77,14 +77,15 @@ abstract class Queue
      * Create a payload string from the given job and data.
      *
      * @param  string  $job
+     * @param  string  $queue
      * @param  mixed   $data
      * @return string
      *
      * @throws \Illuminate\Queue\InvalidPayloadException
      */
-    protected function createPayload($job, $data = '')
+    protected function createPayload($job, $queue, $data = '')
     {
-        $payload = json_encode($this->createPayloadArray($job, $data));
+        $payload = json_encode($this->createPayloadArray($job, $queue, $data));
 
         if (JSON_ERROR_NONE !== json_last_error()) {
             throw new InvalidPayloadException(
@@ -98,36 +99,45 @@ abstract class Queue
     /**
      * Create a payload array from the given job and data.
      *
-     * @param  string  $job
-     * @param  mixed   $data
+     * @param  mixed  $job
+     * @param  string  $queue
+     * @param  mixed  $data
      * @return array
      */
-    protected function createPayloadArray($job, $data = '')
+    protected function createPayloadArray($job, $queue, $data = '')
     {
         return is_object($job)
-                    ? $this->createObjectPayload($job)
-                    : $this->createStringPayload($job, $data);
+                    ? $this->createObjectPayload($job, $queue)
+                    : $this->createStringPayload($job, $queue, $data);
     }
 
     /**
      * Create a payload for an object-based queue handler.
      *
      * @param  mixed  $job
+     * @param  string  $queue
      * @return array
      */
-    protected function createObjectPayload($job)
+    protected function createObjectPayload($job, $queue)
     {
-        return [
+        $payload = $this->withCreatePayloadHooks($queue, [
             'displayName' => $this->getDisplayName($job),
             'job' => 'Illuminate\Queue\CallQueuedHandler@call',
             'maxTries' => $job->tries ?? null,
             'timeout' => $job->timeout ?? null,
             'timeoutAt' => $this->getJobExpiration($job),
+            'data' => [
+                'commandName' => $job,
+                'command' => $job,
+            ],
+        ]);
+
+        return array_merge($payload, [
             'data' => [
                 'commandName' => get_class($job),
                 'command' => serialize(clone $job),
             ],
-        ];
+        ]);
     }
 
     /**
@@ -164,16 +174,48 @@ abstract class Queue
      * Create a typical, string based queue payload array.
      *
      * @param  string  $job
+     * @param  string  $queue
      * @param  mixed  $data
      * @return array
      */
-    protected function createStringPayload($job, $data)
+    protected function createStringPayload($job, $queue, $data)
     {
-        return [
+        return $this->withCreatePayloadHooks($queue, [
             'displayName' => is_string($job) ? explode('@', $job)[0] : null,
-            'job' => $job, 'maxTries' => null,
-            'timeout' => null, 'data' => $data,
-        ];
+            'job' => $job,
+            'maxTries' => null,
+            'timeout' => null,
+            'data' => $data,
+        ]);
+    }
+
+    /**
+     * Register a callback to be executed when creating job payloads.
+     *
+     * @param  callable  $callback
+     * @return void
+     */
+    public static function createPayloadUsing($callback)
+    {
+        static::$createPayloadCallback = $callback;
+    }
+
+    /**
+     * Create the given payload using any registered payload hooks.
+     *
+     * @param  string  $queue
+     * @param  array  $payload
+     * @return array
+     */
+    protected function withCreatePayloadHooks($queue, array $payload)
+    {
+        if (static::$createPayloadCallback) {
+            return array_merge($payload, call_user_func(
+                static::$createPayloadCallback, $this->getConnectionName(), $queue, $payload
+            ));
+        }
+
+        return $payload;
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/QueueServiceProvider.php b/vendor/laravel/framework/src/Illuminate/Queue/QueueServiceProvider.php
index 2ad923ec..8b54e094 100755
--- a/vendor/laravel/framework/src/Illuminate/Queue/QueueServiceProvider.php
+++ b/vendor/laravel/framework/src/Illuminate/Queue/QueueServiceProvider.php
@@ -2,6 +2,8 @@
 
 namespace Illuminate\Queue;
 
+use Illuminate\Support\Str;
+use Opis\Closure\SerializableClosure;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Queue\Connectors\SqsConnector;
 use Illuminate\Queue\Connectors\NullConnector;
@@ -30,14 +32,11 @@ class QueueServiceProvider extends ServiceProvider
     public function register()
     {
         $this->registerManager();
-
         $this->registerConnection();
-
         $this->registerWorker();
-
         $this->registerListener();
-
         $this->registerFailedJobServices();
+        $this->registerOpisSecurityKey();
     }
 
     /**
@@ -215,6 +214,20 @@ class QueueServiceProvider extends ServiceProvider
         );
     }
 
+    /**
+     * Configure Opis Closure signing for security.
+     *
+     * @return void
+     */
+    protected function registerOpisSecurityKey()
+    {
+        if (Str::startsWith($key = $this->app['config']->get('app.key'), 'base64:')) {
+            $key = base64_decode(substr($key, 7));
+        }
+
+        SerializableClosure::setSecretKey($key);
+    }
+
     /**
      * Get the services provided by the provider.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/RedisQueue.php b/vendor/laravel/framework/src/Illuminate/Queue/RedisQueue.php
index b0bb6401..31eac516 100644
--- a/vendor/laravel/framework/src/Illuminate/Queue/RedisQueue.php
+++ b/vendor/laravel/framework/src/Illuminate/Queue/RedisQueue.php
@@ -37,6 +37,13 @@ class RedisQueue extends Queue implements QueueContract
      */
     protected $retryAfter = 60;
 
+    /**
+     * The maximum number of seconds to block for a job.
+     *
+     * @var int|null
+     */
+    protected $blockFor = null;
+
     /**
      * Create a new Redis queue instance.
      *
@@ -44,12 +51,14 @@ class RedisQueue extends Queue implements QueueContract
      * @param  string  $default
      * @param  string  $connection
      * @param  int  $retryAfter
+     * @param  int|null  $blockFor
      * @return void
      */
-    public function __construct(Redis $redis, $default = 'default', $connection = null, $retryAfter = 60)
+    public function __construct(Redis $redis, $default = 'default', $connection = null, $retryAfter = 60, $blockFor = null)
     {
         $this->redis = $redis;
         $this->default = $default;
+        $this->blockFor = $blockFor;
         $this->connection = $connection;
         $this->retryAfter = $retryAfter;
     }
@@ -79,7 +88,7 @@ class RedisQueue extends Queue implements QueueContract
      */
     public function push($job, $data = '', $queue = null)
     {
-        return $this->pushRaw($this->createPayload($job, $data), $queue);
+        return $this->pushRaw($this->createPayload($job, $this->getQueue($queue), $data), $queue);
     }
 
     /**
@@ -108,7 +117,7 @@ class RedisQueue extends Queue implements QueueContract
      */
     public function later($delay, $job, $data = '', $queue = null)
     {
-        return $this->laterRaw($delay, $this->createPayload($job, $data), $queue);
+        return $this->laterRaw($delay, $this->createPayload($job, $this->getQueue($queue), $data), $queue);
     }
 
     /**
@@ -132,12 +141,13 @@ class RedisQueue extends Queue implements QueueContract
      * Create a payload string from the given job and data.
      *
      * @param  string  $job
+     * @param  string   $queue
      * @param  mixed   $data
      * @return string
      */
-    protected function createPayloadArray($job, $data = '')
+    protected function createPayloadArray($job, $queue, $data = '')
     {
-        return array_merge(parent::createPayloadArray($job, $data), [
+        return array_merge(parent::createPayloadArray($job, $queue, $data), [
             'id' => $this->getRandomId(),
             'attempts' => 0,
         ]);
@@ -153,7 +163,11 @@ class RedisQueue extends Queue implements QueueContract
     {
         $this->migrate($prefixed = $this->getQueue($queue));
 
-        list($job, $reserved) = $this->retrieveNextJob($prefixed);
+        if (empty($nextJob = $this->retrieveNextJob($prefixed))) {
+            return;
+        }
+
+        [$job, $reserved] = $nextJob;
 
         if ($reserved) {
             return new RedisJob(
@@ -200,12 +214,43 @@ class RedisQueue extends Queue implements QueueContract
      */
     protected function retrieveNextJob($queue)
     {
+        if (! is_null($this->blockFor)) {
+            return $this->blockingPop($queue);
+        }
+
         return $this->getConnection()->eval(
             LuaScripts::pop(), 2, $queue, $queue.':reserved',
             $this->availableAt($this->retryAfter)
         );
     }
 
+    /**
+     * Retrieve the next job by blocking-pop.
+     *
+     * @param  string  $queue
+     * @return array
+     */
+    protected function blockingPop($queue)
+    {
+        $rawBody = $this->getConnection()->blpop($queue, $this->blockFor);
+
+        if (! empty($rawBody)) {
+            $payload = json_decode($rawBody[1], true);
+
+            $payload['attempts']++;
+
+            $reserved = json_encode($payload);
+
+            $this->getConnection()->zadd($queue.':reserved', [
+                $reserved => $this->availableAt($this->retryAfter),
+            ]);
+
+            return [$rawBody[1], $reserved];
+        }
+
+        return [null, null];
+    }
+
     /**
      * Delete a reserved job from the queue.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/SerializableClosure.php b/vendor/laravel/framework/src/Illuminate/Queue/SerializableClosure.php
new file mode 100644
index 00000000..f8a1cf4b
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Queue/SerializableClosure.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Illuminate\Queue;
+
+use Opis\Closure\SerializableClosure as OpisSerializableClosure;
+
+class SerializableClosure extends OpisSerializableClosure
+{
+    use SerializesAndRestoresModelIdentifiers;
+
+    /**
+     * Transform the use variables before serialization.
+     *
+     * @param  array  $data The Closure's use variables
+     * @return array
+     */
+    protected function transformUseVariables($data)
+    {
+        foreach ($data as $key => $value) {
+            $data[$key] = $this->getSerializedPropertyValue($value);
+        }
+
+        return $data;
+    }
+
+    /**
+     * Resolve the use variables after unserialization.
+     *
+     * @param  array  $data The Closure's transformed use variables
+     * @return array
+     */
+    protected function resolveUseVariables($data)
+    {
+        foreach ($data as $key => $value) {
+            $data[$key] = $this->getRestoredPropertyValue($value);
+        }
+
+        return $data;
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/SerializesAndRestoresModelIdentifiers.php b/vendor/laravel/framework/src/Illuminate/Queue/SerializesAndRestoresModelIdentifiers.php
index d4d06d42..4b9476e4 100644
--- a/vendor/laravel/framework/src/Illuminate/Queue/SerializesAndRestoresModelIdentifiers.php
+++ b/vendor/laravel/framework/src/Illuminate/Queue/SerializesAndRestoresModelIdentifiers.php
@@ -21,6 +21,7 @@ trait SerializesAndRestoresModelIdentifiers
             return new ModelIdentifier(
                 $value->getQueueableClass(),
                 $value->getQueueableIds(),
+                $value->getQueueableRelations(),
                 $value->getQueueableConnection()
             );
         }
@@ -29,6 +30,7 @@ trait SerializesAndRestoresModelIdentifiers
             return new ModelIdentifier(
                 get_class($value),
                 $value->getQueueableId(),
+                $value->getQueueableRelations(),
                 $value->getQueueableConnection()
             );
         }
@@ -50,8 +52,7 @@ trait SerializesAndRestoresModelIdentifiers
 
         return is_array($value->id)
                 ? $this->restoreCollection($value)
-                : $this->getQueryForModelRestoration((new $value->class)->setConnection($value->connection), $value->id)
-                        ->useWritePdo()->firstOrFail();
+                : $this->restoreModel($value);
     }
 
     /**
@@ -72,10 +73,23 @@ trait SerializesAndRestoresModelIdentifiers
     }
 
     /**
-     * Get the query for restoration.
+     * Restore the model from the model identifier instance.
+     *
+     * @param  \Illuminate\Contracts\Database\ModelIdentifier  $value
+     * @return \Illuminate\Database\Eloquent\Model
+     */
+    public function restoreModel($value)
+    {
+        return $this->getQueryForModelRestoration(
+            (new $value->class)->setConnection($value->connection), $value->id
+        )->useWritePdo()->firstOrFail()->load($value->relations ?? []);
+    }
+
+    /**
+     * Get the query for model restoration.
      *
      * @param  \Illuminate\Database\Eloquent\Model  $model
-     * @param  array|int                            $ids
+     * @param  array|int  $ids
      * @return \Illuminate\Database\Eloquent\Builder
      */
     protected function getQueryForModelRestoration($model, $ids)
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/SerializesModels.php b/vendor/laravel/framework/src/Illuminate/Queue/SerializesModels.php
index 62f7e721..e083d6f3 100644
--- a/vendor/laravel/framework/src/Illuminate/Queue/SerializesModels.php
+++ b/vendor/laravel/framework/src/Illuminate/Queue/SerializesModels.php
@@ -24,9 +24,9 @@ trait SerializesModels
             ));
         }
 
-        return array_map(function ($p) {
-            return $p->getName();
-        }, $properties);
+        return array_values(array_filter(array_map(function ($p) {
+            return $p->isStatic() ? null : $p->getName();
+        }, $properties)));
     }
 
     /**
@@ -37,6 +37,10 @@ trait SerializesModels
     public function __wakeup()
     {
         foreach ((new ReflectionClass($this))->getProperties() as $property) {
+            if ($property->isStatic()) {
+                continue;
+            }
+
             $property->setValue($this, $this->getRestoredPropertyValue(
                 $this->getPropertyValue($property)
             ));
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/SqsQueue.php b/vendor/laravel/framework/src/Illuminate/Queue/SqsQueue.php
index c8bd3aec..9a7c2dc6 100755
--- a/vendor/laravel/framework/src/Illuminate/Queue/SqsQueue.php
+++ b/vendor/laravel/framework/src/Illuminate/Queue/SqsQueue.php
@@ -72,7 +72,7 @@ class SqsQueue extends Queue implements QueueContract
      */
     public function push($job, $data = '', $queue = null)
     {
-        return $this->pushRaw($this->createPayload($job, $data), $queue);
+        return $this->pushRaw($this->createPayload($job, $queue ?: $this->default, $data), $queue);
     }
 
     /**
@@ -103,7 +103,7 @@ class SqsQueue extends Queue implements QueueContract
     {
         return $this->sqs->sendMessage([
             'QueueUrl' => $this->getQueue($queue),
-            'MessageBody' => $this->createPayload($job, $data),
+            'MessageBody' => $this->createPayload($job, $queue ?: $this->default, $data),
             'DelaySeconds' => $this->secondsUntil($delay),
         ])->get('MessageId');
     }
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/SyncQueue.php b/vendor/laravel/framework/src/Illuminate/Queue/SyncQueue.php
index bc455391..0652215d 100755
--- a/vendor/laravel/framework/src/Illuminate/Queue/SyncQueue.php
+++ b/vendor/laravel/framework/src/Illuminate/Queue/SyncQueue.php
@@ -34,7 +34,7 @@ class SyncQueue extends Queue implements QueueContract
      */
     public function push($job, $data = '', $queue = null)
     {
-        $queueJob = $this->resolveJob($this->createPayload($job, $data), $queue);
+        $queueJob = $this->resolveJob($this->createPayload($job, $queue, $data), $queue);
 
         try {
             $this->raiseBeforeJobEvent($queueJob);
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/Worker.php b/vendor/laravel/framework/src/Illuminate/Queue/Worker.php
index 68de894d..492fae5a 100644
--- a/vendor/laravel/framework/src/Illuminate/Queue/Worker.php
+++ b/vendor/laravel/framework/src/Illuminate/Queue/Worker.php
@@ -84,7 +84,9 @@ class Worker
      */
     public function daemon($connectionName, $queue, WorkerOptions $options)
     {
-        $this->listenForSignals();
+        if ($this->supportsAsyncSignals()) {
+            $this->listenForSignals();
+        }
 
         $lastRestart = $this->getTimestampOfLastQueueRestart();
 
@@ -105,7 +107,9 @@ class Worker
                 $this->manager->connection($connectionName), $queue
             );
 
-            $this->registerTimeoutHandler($job, $options);
+            if ($this->supportsAsyncSignals()) {
+                $this->registerTimeoutHandler($job, $options);
+            }
 
             // If the daemon should run (not in maintenance mode, etc.), then we can run
             // fire off this job for processing. Otherwise, we will need to sleep the
@@ -119,12 +123,12 @@ class Worker
             // Finally, we will check to see if we have exceeded our memory limits or if
             // the queue should restart based on other indications. If so, we'll stop
             // this worker and let whatever is "monitoring" it restart the process.
-            $this->stopIfNecessary($options, $lastRestart);
+            $this->stopIfNecessary($options, $lastRestart, $job);
         }
     }
 
     /**
-     * Register the worker timeout handler (PHP 7.1+).
+     * Register the worker timeout handler.
      *
      * @param  \Illuminate\Contracts\Queue\Job|null  $job
      * @param  \Illuminate\Queue\WorkerOptions  $options
@@ -132,18 +136,16 @@ class Worker
      */
     protected function registerTimeoutHandler($job, WorkerOptions $options)
     {
-        if ($this->supportsAsyncSignals()) {
-            // We will register a signal handler for the alarm signal so that we can kill this
-            // process if it is running too long because it has frozen. This uses the async
-            // signals supported in recent versions of PHP to accomplish it conveniently.
-            pcntl_signal(SIGALRM, function () {
-                $this->kill(1);
-            });
-
-            pcntl_alarm(
-                max($this->timeoutForJob($job, $options), 0)
-            );
-        }
+        // We will register a signal handler for the alarm signal so that we can kill this
+        // process if it is running too long because it has frozen. This uses the async
+        // signals supported in recent versions of PHP to accomplish it conveniently.
+        pcntl_signal(SIGALRM, function () {
+            $this->kill(1);
+        });
+
+        pcntl_alarm(
+            max($this->timeoutForJob($job, $options), 0)
+        );
     }
 
     /**
@@ -192,17 +194,18 @@ class Worker
      *
      * @param  \Illuminate\Queue\WorkerOptions  $options
      * @param  int  $lastRestart
+     * @param  mixed  $job
      */
-    protected function stopIfNecessary(WorkerOptions $options, $lastRestart)
+    protected function stopIfNecessary(WorkerOptions $options, $lastRestart, $job = null)
     {
         if ($this->shouldQuit) {
-            $this->kill();
-        }
-
-        if ($this->memoryExceeded($options->memory)) {
+            $this->stop();
+        } elseif ($this->memoryExceeded($options->memory)) {
             $this->stop(12);
         } elseif ($this->queueShouldRestart($lastRestart)) {
             $this->stop();
+        } elseif ($options->stopWhenEmpty && is_null($job)) {
+            $this->stop();
         }
     }
 
@@ -249,10 +252,14 @@ class Worker
             $this->exceptions->report($e);
 
             $this->stopWorkerIfLostConnection($e);
+
+            $this->sleep(1);
         } catch (Throwable $e) {
             $this->exceptions->report($e = new FatalThrowableError($e));
 
             $this->stopWorkerIfLostConnection($e);
+
+            $this->sleep(1);
         }
     }
 
@@ -282,7 +289,7 @@ class Worker
     /**
      * Stop the worker if we have lost connection to a database.
      *
-     * @param  \Exception  $e
+     * @param  \Throwable  $e
      * @return void
      */
     protected function stopWorkerIfLostConnection($e)
@@ -476,21 +483,6 @@ class Worker
         ));
     }
 
-    /**
-     * Raise the failed queue job event.
-     *
-     * @param  string  $connectionName
-     * @param  \Illuminate\Contracts\Queue\Job  $job
-     * @param  \Exception  $e
-     * @return void
-     */
-    protected function raiseFailedJobEvent($connectionName, $job, $e)
-    {
-        $this->events->dispatch(new Events\JobFailed(
-            $connectionName, $job, $e
-        ));
-    }
-
     /**
      * Determine if the queue worker should restart.
      *
@@ -521,21 +513,19 @@ class Worker
      */
     protected function listenForSignals()
     {
-        if ($this->supportsAsyncSignals()) {
-            pcntl_async_signals(true);
+        pcntl_async_signals(true);
 
-            pcntl_signal(SIGTERM, function () {
-                $this->shouldQuit = true;
-            });
+        pcntl_signal(SIGTERM, function () {
+            $this->shouldQuit = true;
+        });
 
-            pcntl_signal(SIGUSR2, function () {
-                $this->paused = true;
-            });
+        pcntl_signal(SIGUSR2, function () {
+            $this->paused = true;
+        });
 
-            pcntl_signal(SIGCONT, function () {
-                $this->paused = false;
-            });
-        }
+        pcntl_signal(SIGCONT, function () {
+            $this->paused = false;
+        });
     }
 
     /**
@@ -545,8 +535,7 @@ class Worker
      */
     protected function supportsAsyncSignals()
     {
-        return version_compare(PHP_VERSION, '7.1.0') >= 0 &&
-               extension_loaded('pcntl');
+        return extension_loaded('pcntl');
     }
 
     /**
@@ -557,7 +546,7 @@ class Worker
      */
     public function memoryExceeded($memoryLimit)
     {
-        return (memory_get_usage() / 1024 / 1024) >= $memoryLimit;
+        return (memory_get_usage(true) / 1024 / 1024) >= $memoryLimit;
     }
 
     /**
@@ -568,7 +557,7 @@ class Worker
      */
     public function stop($status = 0)
     {
-        $this->events->dispatch(new Events\WorkerStopping);
+        $this->events->dispatch(new Events\WorkerStopping($status));
 
         exit($status);
     }
@@ -581,7 +570,7 @@ class Worker
      */
     public function kill($status = 0)
     {
-        $this->events->dispatch(new Events\WorkerStopping);
+        $this->events->dispatch(new Events\WorkerStopping($status));
 
         if (extension_loaded('posix')) {
             posix_kill(getmypid(), SIGKILL);
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/WorkerOptions.php b/vendor/laravel/framework/src/Illuminate/Queue/WorkerOptions.php
index 3549f441..8e51c4de 100644
--- a/vendor/laravel/framework/src/Illuminate/Queue/WorkerOptions.php
+++ b/vendor/laravel/framework/src/Illuminate/Queue/WorkerOptions.php
@@ -46,6 +46,13 @@ class WorkerOptions
      */
     public $force;
 
+    /**
+     * Indicates if the worker should stop when queue is empty.
+     *
+     * @var bool
+     */
+    public $stopWhenEmpty;
+
     /**
      * Create a new worker options instance.
      *
@@ -55,9 +62,10 @@ class WorkerOptions
      * @param  int  $sleep
      * @param  int  $maxTries
      * @param  bool  $force
+     * @param  bool  $stopWhenEmpty
      * @return void
      */
-    public function __construct($delay = 0, $memory = 128, $timeout = 60, $sleep = 3, $maxTries = 0, $force = false)
+    public function __construct($delay = 0, $memory = 128, $timeout = 60, $sleep = 3, $maxTries = 0, $force = false, $stopWhenEmpty = false)
     {
         $this->delay = $delay;
         $this->sleep = $sleep;
@@ -65,5 +73,6 @@ class WorkerOptions
         $this->memory = $memory;
         $this->timeout = $timeout;
         $this->maxTries = $maxTries;
+        $this->stopWhenEmpty = $stopWhenEmpty;
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Queue/composer.json b/vendor/laravel/framework/src/Illuminate/Queue/composer.json
index 8d1edc88..8ef7982f 100644
--- a/vendor/laravel/framework/src/Illuminate/Queue/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Queue/composer.json
@@ -14,15 +14,16 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/console": "5.5.*",
-        "illuminate/container": "5.5.*",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/database": "5.5.*",
-        "illuminate/filesystem": "5.5.*",
-        "illuminate/support": "5.5.*",
-        "symfony/debug": "~3.3",
-        "symfony/process": "~3.3"
+        "php": "^7.1.3",
+        "illuminate/console": "5.7.*",
+        "illuminate/container": "5.7.*",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/database": "5.7.*",
+        "illuminate/filesystem": "5.7.*",
+        "illuminate/support": "5.7.*",
+        "opis/closure": "^3.1",
+        "symfony/debug": "^4.1",
+        "symfony/process": "^4.1"
     },
     "autoload": {
         "psr-4": {
@@ -31,15 +32,15 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "suggest": {
         "ext-pcntl": "Required to use all features of the queue worker.",
         "ext-posix": "Required to use all features of the queue worker.",
-        "aws/aws-sdk-php": "Required to use the SQS queue driver (~3.0).",
-        "illuminate/redis": "Required to use the Redis queue driver (5.5.*).",
-        "pda/pheanstalk": "Required to use the Beanstalk queue driver (~3.0)."
+        "aws/aws-sdk-php": "Required to use the SQS queue driver (^3.0).",
+        "illuminate/redis": "Required to use the Redis queue driver (5.7.*).",
+        "pda/pheanstalk": "Required to use the Beanstalk queue driver (^3.0)."
     },
     "config": {
         "sort-packages": true
diff --git a/vendor/laravel/framework/src/Illuminate/Redis/Connections/Connection.php b/vendor/laravel/framework/src/Illuminate/Redis/Connections/Connection.php
index c5b524a0..e09c2033 100644
--- a/vendor/laravel/framework/src/Illuminate/Redis/Connections/Connection.php
+++ b/vendor/laravel/framework/src/Illuminate/Redis/Connections/Connection.php
@@ -3,6 +3,8 @@
 namespace Illuminate\Redis\Connections;
 
 use Closure;
+use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Redis\Events\CommandExecuted;
 use Illuminate\Redis\Limiters\DurationLimiterBuilder;
 use Illuminate\Redis\Limiters\ConcurrencyLimiterBuilder;
 
@@ -18,6 +20,20 @@ abstract class Connection
      */
     protected $client;
 
+    /**
+     * The Redis connection name.
+     *
+     * @var string|null
+     */
+    protected $name;
+
+    /**
+     * The event dispatcher instance.
+     *
+     * @var \Illuminate\Contracts\Events\Dispatcher
+     */
+    protected $events;
+
     /**
      * Subscribe to a set of given channels for messages.
      *
@@ -93,7 +109,97 @@ abstract class Connection
      */
     public function command($method, array $parameters = [])
     {
-        return $this->client->{$method}(...$parameters);
+        $start = microtime(true);
+
+        $result = $this->client->{$method}(...$parameters);
+
+        $time = round((microtime(true) - $start) * 1000, 2);
+
+        if (isset($this->events)) {
+            $this->event(new CommandExecuted($method, $parameters, $time, $this));
+        }
+
+        return $result;
+    }
+
+    /**
+     * Fire the given event if possible.
+     *
+     * @param  mixed  $event
+     * @return void
+     */
+    protected function event($event)
+    {
+        if (isset($this->events)) {
+            $this->events->dispatch($event);
+        }
+    }
+
+    /**
+     * Register a Redis command listener with the connection.
+     *
+     * @param  \Closure  $callback
+     * @return void
+     */
+    public function listen(Closure $callback)
+    {
+        if (isset($this->events)) {
+            $this->events->listen(CommandExecuted::class, $callback);
+        }
+    }
+
+    /**
+     * Get the connection name.
+     *
+     * @return string|null
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Set the connections name.
+     *
+     * @param  string  $name
+     * @return $this
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Get the event dispatcher used by the connection.
+     *
+     * @return \Illuminate\Contracts\Events\Dispatcher
+     */
+    public function getEventDispatcher()
+    {
+        return $this->events;
+    }
+
+    /**
+     * Set the event dispatcher instance on the connection.
+     *
+     * @param  \Illuminate\Contracts\Events\Dispatcher  $events
+     * @return void
+     */
+    public function setEventDispatcher(Dispatcher $events)
+    {
+        $this->events = $events;
+    }
+
+    /**
+     * Unset the event dispatcher instance on the connection.
+     *
+     * @return void
+     */
+    public function unsetEventDispatcher()
+    {
+        $this->events = null;
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Redis/Connections/PhpRedisConnection.php b/vendor/laravel/framework/src/Illuminate/Redis/Connections/PhpRedisConnection.php
index 252532fa..2533769f 100644
--- a/vendor/laravel/framework/src/Illuminate/Redis/Connections/PhpRedisConnection.php
+++ b/vendor/laravel/framework/src/Illuminate/Redis/Connections/PhpRedisConnection.php
@@ -4,11 +4,12 @@ namespace Illuminate\Redis\Connections;
 
 use Redis;
 use Closure;
+use Illuminate\Contracts\Redis\Connection as ConnectionContract;
 
 /**
  * @mixin \Redis
  */
-class PhpRedisConnection extends Connection
+class PhpRedisConnection extends Connection implements ConnectionContract
 {
     /**
      * Create a new PhpRedis connection.
@@ -29,7 +30,7 @@ class PhpRedisConnection extends Connection
      */
     public function get($key)
     {
-        $result = $this->client->get($key);
+        $result = $this->command('get', [$key]);
 
         return $result !== false ? $result : null;
     }
@@ -44,7 +45,7 @@ class PhpRedisConnection extends Connection
     {
         return array_map(function ($value) {
             return $value !== false ? $value : null;
-        }, $this->client->mget($keys));
+        }, $this->command('mget', $keys));
     }
 
     /**
@@ -90,7 +91,7 @@ class PhpRedisConnection extends Connection
      */
     public function setnx($key, $value)
     {
-        return (int) $this->client->setnx($key, $value);
+        return (int) $this->command('setnx', [$key, $value]);
     }
 
     /**
@@ -139,7 +140,7 @@ class PhpRedisConnection extends Connection
      */
     public function hsetnx($hash, $key, $value)
     {
-        return (int) $this->client->hsetnx($hash, $key, $value);
+        return (int) $this->command('hsetnx', [$hash, $key, $value]);
     }
 
     /**
@@ -155,6 +156,32 @@ class PhpRedisConnection extends Connection
         return $this->command('lrem', [$key, $value, $count]);
     }
 
+    /**
+     * Removes and returns the first element of the list stored at key.
+     *
+     * @param  dynamic  $arguments
+     * @return array|null
+     */
+    public function blpop(...$arguments)
+    {
+        $result = $this->command('blpop', $arguments);
+
+        return empty($result) ? null : $result;
+    }
+
+    /**
+     * Removes and returns the last element of the list stored at key.
+     *
+     * @param  dynamic  $arguments
+     * @return array|null
+     */
+    public function brpop(...$arguments)
+    {
+        $result = $this->command('brpop', $arguments);
+
+        return empty($result) ? null : $result;
+    }
+
     /**
      * Removes and returns a random element from the set value at key.
      *
@@ -240,10 +267,10 @@ class PhpRedisConnection extends Connection
      */
     public function zinterstore($output, $keys, $options = [])
     {
-        return $this->zInter($output, $keys,
+        return $this->command('zInter', [$output, $keys,
             $options['weights'] ?? null,
-            $options['aggregate'] ?? 'sum'
-        );
+            $options['aggregate'] ?? 'sum',
+        ]);
     }
 
     /**
@@ -256,10 +283,10 @@ class PhpRedisConnection extends Connection
      */
     public function zunionstore($output, $keys, $options = [])
     {
-        return $this->zUnion($output, $keys,
+        return $this->command('zUnion', [$output, $keys,
             $options['weights'] ?? null,
-            $options['aggregate'] ?? 'sum'
-        );
+            $options['aggregate'] ?? 'sum',
+        ]);
     }
 
     /**
@@ -308,7 +335,7 @@ class PhpRedisConnection extends Connection
     }
 
     /**
-     * Evaluate a script and retunr its result.
+     * Evaluate a script and return its result.
      *
      * @param  string  $script
      * @param  int  $numberOfKeys
@@ -317,7 +344,7 @@ class PhpRedisConnection extends Connection
      */
     public function eval($script, $numberOfKeys, ...$arguments)
     {
-        return $this->client->eval($script, $arguments, $numberOfKeys);
+        return $this->command('eval', [$script, $arguments, $numberOfKeys]);
     }
 
     /**
@@ -404,8 +431,6 @@ class PhpRedisConnection extends Connection
      */
     public function __call($method, $parameters)
     {
-        $method = strtolower($method);
-
-        return parent::__call($method, $parameters);
+        return parent::__call(strtolower($method), $parameters);
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Redis/Connections/PredisConnection.php b/vendor/laravel/framework/src/Illuminate/Redis/Connections/PredisConnection.php
index 0dbc2c58..34051718 100644
--- a/vendor/laravel/framework/src/Illuminate/Redis/Connections/PredisConnection.php
+++ b/vendor/laravel/framework/src/Illuminate/Redis/Connections/PredisConnection.php
@@ -3,11 +3,12 @@
 namespace Illuminate\Redis\Connections;
 
 use Closure;
+use Illuminate\Contracts\Redis\Connection as ConnectionContract;
 
 /**
  * @mixin \Predis\Client
  */
-class PredisConnection extends Connection
+class PredisConnection extends Connection implements ConnectionContract
 {
     /**
      * Create a new Predis connection.
diff --git a/vendor/laravel/framework/src/Illuminate/Redis/Connectors/PhpRedisConnector.php b/vendor/laravel/framework/src/Illuminate/Redis/Connectors/PhpRedisConnector.php
index 78f3e718..a3800b15 100644
--- a/vendor/laravel/framework/src/Illuminate/Redis/Connectors/PhpRedisConnector.php
+++ b/vendor/laravel/framework/src/Illuminate/Redis/Connectors/PhpRedisConnector.php
@@ -11,7 +11,7 @@ use Illuminate\Redis\Connections\PhpRedisClusterConnection;
 class PhpRedisConnector
 {
     /**
-     * Create a new clustered Predis connection.
+     * Create a new clustered PhpRedis connection.
      *
      * @param  array  $config
      * @param  array  $options
@@ -25,7 +25,7 @@ class PhpRedisConnector
     }
 
     /**
-     * Create a new clustered Predis connection.
+     * Create a new clustered PhpRedis connection.
      *
      * @param  array  $config
      * @param  array  $clusterOptions
@@ -49,7 +49,7 @@ class PhpRedisConnector
      */
     protected function buildClusterConnectionString(array $server)
     {
-        return $server['host'].':'.$server['port'].'?'.http_build_query(Arr::only($server, [
+        return $server['host'].':'.$server['port'].'?'.Arr::query(Arr::only($server, [
             'database', 'password', 'prefix', 'read_timeout',
         ]));
     }
@@ -92,9 +92,21 @@ class PhpRedisConnector
      */
     protected function establishConnection($client, array $config)
     {
-        $client->{($config['persistent'] ?? false) === true ? 'pconnect' : 'connect'}(
-            $config['host'], $config['port'], Arr::get($config, 'timeout', 0)
-        );
+        $persistent = $config['persistent'] ?? false;
+
+        $parameters = [
+            $config['host'],
+            $config['port'],
+            Arr::get($config, 'timeout', 0.0),
+            $persistent ? Arr::get($config, 'persistent_id', null) : null,
+            Arr::get($config, 'retry_interval', 0),
+        ];
+
+        if (version_compare(phpversion('redis'), '3.1.3', '>=')) {
+            $parameters[] = Arr::get($config, 'read_timeout', 0.0);
+        }
+
+        $client->{($persistent ? 'pconnect' : 'connect')}(...$parameters);
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Redis/Events/CommandExecuted.php b/vendor/laravel/framework/src/Illuminate/Redis/Events/CommandExecuted.php
new file mode 100644
index 00000000..fa65719a
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Redis/Events/CommandExecuted.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Illuminate\Redis\Events;
+
+class CommandExecuted
+{
+    /**
+     * The Redis command that was executed.
+     *
+     * @var string
+     */
+    public $command;
+
+    /**
+     * The array of command parameters.
+     *
+     * @var array
+     */
+    public $parameters;
+
+    /**
+     * The number of milliseconds it took to execute the command.
+     *
+     * @var float
+     */
+    public $time;
+
+    /**
+     * The Redis connection instance.
+     *
+     * @var \Illuminate\Redis\Connections\Connection
+     */
+    public $connection;
+
+    /**
+     * The Redis connection name.
+     *
+     * @var string
+     */
+    public $connectionName;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param  string  $command
+     * @param  array  $parameters
+     * @param  float|null  $time
+     * @param  \Illuminate\Redis\Connections\Connection  $connection
+     * @return void
+     */
+    public function __construct($command, $parameters, $time, $connection)
+    {
+        $this->time = $time;
+        $this->command = $command;
+        $this->parameters = $parameters;
+        $this->connection = $connection;
+        $this->connectionName = $connection->getName();
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Redis/Limiters/ConcurrencyLimiter.php b/vendor/laravel/framework/src/Illuminate/Redis/Limiters/ConcurrencyLimiter.php
index c6db2e20..78fc9237 100644
--- a/vendor/laravel/framework/src/Illuminate/Redis/Limiters/ConcurrencyLimiter.php
+++ b/vendor/laravel/framework/src/Illuminate/Redis/Limiters/ConcurrencyLimiter.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Redis\Limiters;
 
+use Exception;
 use Illuminate\Contracts\Redis\LimiterTimeoutException;
 
 class ConcurrencyLimiter
@@ -57,7 +58,9 @@ class ConcurrencyLimiter
      * @param  int  $timeout
      * @param  callable|null  $callback
      * @return bool
+     *
      * @throws \Illuminate\Contracts\Redis\LimiterTimeoutException
+     * @throws \Exception
      */
     public function block($timeout, $callback = null)
     {
@@ -72,9 +75,15 @@ class ConcurrencyLimiter
         }
 
         if (is_callable($callback)) {
-            return tap($callback(), function () use ($slot) {
+            try {
+                return tap($callback(), function () use ($slot) {
+                    $this->release($slot);
+                });
+            } catch (Exception $exception) {
                 $this->release($slot);
-            });
+
+                throw $exception;
+            }
         }
 
         return true;
@@ -91,9 +100,10 @@ class ConcurrencyLimiter
             return $this->name.$i;
         }, range(1, $this->maxLocks));
 
-        return $this->redis->eval($this->luaScript(), count($slots),
-            ...array_merge($slots, [$this->name, $this->releaseAfter])
-        );
+        return $this->redis->eval(...array_merge(
+            [$this->luaScript(), count($slots)],
+            array_merge($slots, [$this->name, $this->releaseAfter])
+        ));
     }
 
     /**
@@ -125,6 +135,6 @@ LUA;
      */
     protected function release($key)
     {
-        $this->redis->del($key);
+        $this->redis->command('del', [$key]);
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Redis/Limiters/DurationLimiter.php b/vendor/laravel/framework/src/Illuminate/Redis/Limiters/DurationLimiter.php
index 0cd0ab26..3c740878 100644
--- a/vendor/laravel/framework/src/Illuminate/Redis/Limiters/DurationLimiter.php
+++ b/vendor/laravel/framework/src/Illuminate/Redis/Limiters/DurationLimiter.php
@@ -71,6 +71,7 @@ class DurationLimiter
      * @param  int $timeout
      * @param  callable|null $callback
      * @return bool
+     *
      * @throws \Illuminate\Contracts\Redis\LimiterTimeoutException
      */
     public function block($timeout, $callback = null)
@@ -99,8 +100,8 @@ class DurationLimiter
      */
     public function acquire()
     {
-        $results = $this->redis->eval($this->luaScript(), 1,
-            $this->name, microtime(true), time(), $this->decay, $this->maxLocks
+        $results = $this->redis->eval(
+            $this->luaScript(), 1, $this->name, microtime(true), time(), $this->decay, $this->maxLocks
         );
 
         $this->decaysAt = $results[1];
diff --git a/vendor/laravel/framework/src/Illuminate/Redis/RedisManager.php b/vendor/laravel/framework/src/Illuminate/Redis/RedisManager.php
index 3217916d..969c4dbe 100644
--- a/vendor/laravel/framework/src/Illuminate/Redis/RedisManager.php
+++ b/vendor/laravel/framework/src/Illuminate/Redis/RedisManager.php
@@ -4,12 +4,20 @@ namespace Illuminate\Redis;
 
 use InvalidArgumentException;
 use Illuminate\Contracts\Redis\Factory;
+use Illuminate\Redis\Connections\Connection;
 
 /**
  * @mixin \Illuminate\Redis\Connections\Connection
  */
 class RedisManager implements Factory
 {
+    /**
+     * The application instance.
+     *
+     * @var \Illuminate\Foundation\Application
+     */
+    protected $app;
+
     /**
      * The name of the default driver.
      *
@@ -31,15 +39,24 @@ class RedisManager implements Factory
      */
     protected $connections;
 
+    /**
+     * Indicates whether event dispatcher is set on connections.
+     *
+     * @var bool
+     */
+    protected $events = false;
+
     /**
      * Create a new Redis manager instance.
      *
+     * @param  \Illuminate\Foundation\Application  $app
      * @param  string  $driver
      * @param  array  $config
      * @return void
      */
-    public function __construct($driver, array $config)
+    public function __construct($app, $driver, array $config)
     {
+        $this->app = $app;
         $this->driver = $driver;
         $this->config = $config;
     }
@@ -58,7 +75,9 @@ class RedisManager implements Factory
             return $this->connections[$name];
         }
 
-        return $this->connections[$name] = $this->resolve($name);
+        return $this->connections[$name] = $this->configure(
+            $this->resolve($name), $name
+        );
     }
 
     /**
@@ -83,9 +102,7 @@ class RedisManager implements Factory
             return $this->resolveCluster($name);
         }
 
-        throw new InvalidArgumentException(
-            "Redis connection [{$name}] not configured."
-        );
+        throw new InvalidArgumentException("Redis connection [{$name}] not configured.");
     }
 
     /**
@@ -103,6 +120,24 @@ class RedisManager implements Factory
         );
     }
 
+    /**
+     * Configure the given connection to prepare it for commands.
+     *
+     * @param  \Illuminate\Redis\Connections\Connection  $connection
+     * @param  string  $name
+     * @return \Illuminate\Redis\Connections\Connection
+     */
+    protected function configure(Connection $connection, $name)
+    {
+        $connection->setName($name);
+
+        if ($this->events && $this->app->bound('events')) {
+            $connection->setEventDispatcher($this->app->make('events'));
+        }
+
+        return $connection;
+    }
+
     /**
      * Get the connector instance for the current driver.
      *
@@ -128,6 +163,26 @@ class RedisManager implements Factory
         return $this->connections;
     }
 
+    /**
+     * Enable the firing of Redis command events.
+     *
+     * @return void
+     */
+    public function enableEvents()
+    {
+        $this->events = true;
+    }
+
+    /**
+     * Disable the firing of Redis command events.
+     *
+     * @return void
+     */
+    public function disableEvents()
+    {
+        $this->events = false;
+    }
+
     /**
      * Pass methods onto the default Redis connection.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Redis/RedisServiceProvider.php b/vendor/laravel/framework/src/Illuminate/Redis/RedisServiceProvider.php
index 20d78e60..2d419388 100755
--- a/vendor/laravel/framework/src/Illuminate/Redis/RedisServiceProvider.php
+++ b/vendor/laravel/framework/src/Illuminate/Redis/RedisServiceProvider.php
@@ -22,9 +22,9 @@ class RedisServiceProvider extends ServiceProvider
     public function register()
     {
         $this->app->singleton('redis', function ($app) {
-            $config = $app->make('config')->get('database.redis');
+            $config = $app->make('config')->get('database.redis', []);
 
-            return new RedisManager(Arr::pull($config, 'client', 'predis'), $config);
+            return new RedisManager($app, Arr::pull($config, 'client', 'predis'), $config);
         });
 
         $this->app->bind('redis.connection', function ($app) {
diff --git a/vendor/laravel/framework/src/Illuminate/Redis/composer.json b/vendor/laravel/framework/src/Illuminate/Redis/composer.json
index 741a13ed..72f8b3b7 100755
--- a/vendor/laravel/framework/src/Illuminate/Redis/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Redis/composer.json
@@ -14,10 +14,10 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/support": "5.5.*",
-        "predis/predis": "~1.0"
+        "php": "^7.1.3",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/support": "5.7.*",
+        "predis/predis": "^1.0"
     },
     "autoload": {
         "psr-4": {
@@ -26,7 +26,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "config": {
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/Console/ControllerMakeCommand.php b/vendor/laravel/framework/src/Illuminate/Routing/Console/ControllerMakeCommand.php
index 4ce15afd..85ee7d39 100755
--- a/vendor/laravel/framework/src/Illuminate/Routing/Console/ControllerMakeCommand.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/Console/ControllerMakeCommand.php
@@ -37,15 +37,27 @@ class ControllerMakeCommand extends GeneratorCommand
      */
     protected function getStub()
     {
+        $stub = null;
+
         if ($this->option('parent')) {
-            return __DIR__.'/stubs/controller.nested.stub';
+            $stub = '/stubs/controller.nested.stub';
         } elseif ($this->option('model')) {
-            return __DIR__.'/stubs/controller.model.stub';
+            $stub = '/stubs/controller.model.stub';
+        } elseif ($this->option('invokable')) {
+            $stub = '/stubs/controller.invokable.stub';
         } elseif ($this->option('resource')) {
-            return __DIR__.'/stubs/controller.stub';
+            $stub = '/stubs/controller.stub';
+        }
+
+        if ($this->option('api') && is_null($stub)) {
+            $stub = '/stubs/controller.api.stub';
+        } elseif ($this->option('api') && ! is_null($stub) && ! $this->option('invokable')) {
+            $stub = str_replace('.stub', '.api.stub', $stub);
         }
 
-        return __DIR__.'/stubs/controller.plain.stub';
+        $stub = $stub ?? '/stubs/controller.plain.stub';
+
+        return __DIR__.$stub;
     }
 
     /**
@@ -138,6 +150,8 @@ class ControllerMakeCommand extends GeneratorCommand
      *
      * @param  string  $model
      * @return string
+     *
+     * @throws \InvalidArgumentException
      */
     protected function parseModel($model)
     {
@@ -163,10 +177,10 @@ class ControllerMakeCommand extends GeneratorCommand
     {
         return [
             ['model', 'm', InputOption::VALUE_OPTIONAL, 'Generate a resource controller for the given model.'],
-
             ['resource', 'r', InputOption::VALUE_NONE, 'Generate a resource controller class.'],
-
+            ['invokable', 'i', InputOption::VALUE_NONE, 'Generate a single method, invokable controller class.'],
             ['parent', 'p', InputOption::VALUE_OPTIONAL, 'Generate a nested resource controller class.'],
+            ['api', null, InputOption::VALUE_NONE, 'Exclude the create and edit methods from the controller.'],
         ];
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/Console/stubs/controller.api.stub b/vendor/laravel/framework/src/Illuminate/Routing/Console/stubs/controller.api.stub
new file mode 100644
index 00000000..e11e43af
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Routing/Console/stubs/controller.api.stub
@@ -0,0 +1,64 @@
+<?php
+
+namespace DummyNamespace;
+
+use Illuminate\Http\Request;
+use DummyRootNamespaceHttp\Controllers\Controller;
+
+class DummyClass extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        //
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/Console/stubs/controller.invokable.stub b/vendor/laravel/framework/src/Illuminate/Routing/Console/stubs/controller.invokable.stub
new file mode 100644
index 00000000..f8a953f3
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Routing/Console/stubs/controller.invokable.stub
@@ -0,0 +1,20 @@
+<?php
+
+namespace DummyNamespace;
+
+use Illuminate\Http\Request;
+use DummyRootNamespaceHttp\Controllers\Controller;
+
+class DummyClass extends Controller
+{
+    /**
+     * Handle the incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function __invoke(Request $request)
+    {
+        //
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/Console/stubs/controller.model.api.stub b/vendor/laravel/framework/src/Illuminate/Routing/Console/stubs/controller.model.api.stub
new file mode 100644
index 00000000..c5f3a9ff
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Routing/Console/stubs/controller.model.api.stub
@@ -0,0 +1,65 @@
+<?php
+
+namespace DummyNamespace;
+
+use DummyFullModelClass;
+use Illuminate\Http\Request;
+use DummyRootNamespaceHttp\Controllers\Controller;
+
+class DummyClass extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \DummyFullModelClass  $DummyModelVariable
+     * @return \Illuminate\Http\Response
+     */
+    public function show(DummyModelClass $DummyModelVariable)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \DummyFullModelClass  $DummyModelVariable
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, DummyModelClass $DummyModelVariable)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \DummyFullModelClass  $DummyModelVariable
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(DummyModelClass $DummyModelVariable)
+    {
+        //
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/Console/stubs/controller.nested.api.stub b/vendor/laravel/framework/src/Illuminate/Routing/Console/stubs/controller.nested.api.stub
new file mode 100644
index 00000000..018bfa4e
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Routing/Console/stubs/controller.nested.api.stub
@@ -0,0 +1,71 @@
+<?php
+
+namespace DummyNamespace;
+
+use DummyFullModelClass;
+use ParentDummyFullModelClass;
+use Illuminate\Http\Request;
+use DummyRootNamespaceHttp\Controllers\Controller;
+
+class DummyClass extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @param  \ParentDummyFullModelClass  $ParentDummyModelVariable
+     * @return \Illuminate\Http\Response
+     */
+    public function index(ParentDummyModelClass $ParentDummyModelVariable)
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \ParentDummyFullModelClass  $ParentDummyModelVariable
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request, ParentDummyModelClass $ParentDummyModelVariable)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \ParentDummyFullModelClass  $ParentDummyModelVariable
+     * @param  \DummyFullModelClass  $DummyModelVariable
+     * @return \Illuminate\Http\Response
+     */
+    public function show(ParentDummyModelClass $ParentDummyModelVariable, DummyModelClass $DummyModelVariable)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \ParentDummyFullModelClass  $ParentDummyModelVariable
+     * @param  \DummyFullModelClass  $DummyModelVariable
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, ParentDummyModelClass $ParentDummyModelVariable, DummyModelClass $DummyModelVariable)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \ParentDummyFullModelClass  $ParentDummyModelVariable
+     * @param  \DummyFullModelClass  $DummyModelVariable
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(ParentDummyModelClass $ParentDummyModelVariable, DummyModelClass $DummyModelVariable)
+    {
+        //
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/Controller.php b/vendor/laravel/framework/src/Illuminate/Routing/Controller.php
index bf4c8f18..b6f5a9bc 100644
--- a/vendor/laravel/framework/src/Illuminate/Routing/Controller.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/Controller.php
@@ -65,6 +65,8 @@ abstract class Controller
      */
     public function __call($method, $parameters)
     {
-        throw new BadMethodCallException("Method [{$method}] does not exist on [".get_class($this).'].');
+        throw new BadMethodCallException(sprintf(
+            'Method %s::%s does not exist.', static::class, $method
+        ));
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/Exceptions/InvalidSignatureException.php b/vendor/laravel/framework/src/Illuminate/Routing/Exceptions/InvalidSignatureException.php
new file mode 100644
index 00000000..06a35c5e
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Routing/Exceptions/InvalidSignatureException.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Illuminate\Routing\Exceptions;
+
+use Symfony\Component\HttpKernel\Exception\HttpException;
+
+class InvalidSignatureException extends HttpException
+{
+    /**
+     * Create a new exception instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct(403, 'Invalid signature.');
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/Middleware/ThrottleRequests.php b/vendor/laravel/framework/src/Illuminate/Routing/Middleware/ThrottleRequests.php
index a448ced1..b0b37b87 100644
--- a/vendor/laravel/framework/src/Illuminate/Routing/Middleware/ThrottleRequests.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/Middleware/ThrottleRequests.php
@@ -8,7 +8,7 @@ use Illuminate\Support\Str;
 use Illuminate\Cache\RateLimiter;
 use Illuminate\Support\InteractsWithTime;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
+use Illuminate\Http\Exceptions\ThrottleRequestsException;
 
 class ThrottleRequests
 {
@@ -39,8 +39,9 @@ class ThrottleRequests
      * @param  \Closure  $next
      * @param  int|string  $maxAttempts
      * @param  float|int  $decayMinutes
-     * @return mixed
-     * @throws \Symfony\Component\HttpKernel\Exception\HttpException
+     * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @throws \Illuminate\Http\Exceptions\ThrottleRequestsException
      */
     public function handle($request, Closure $next, $maxAttempts = 60, $decayMinutes = 1)
     {
@@ -48,7 +49,7 @@ class ThrottleRequests
 
         $maxAttempts = $this->resolveMaxAttempts($request, $maxAttempts);
 
-        if ($this->limiter->tooManyAttempts($key, $maxAttempts, $decayMinutes)) {
+        if ($this->limiter->tooManyAttempts($key, $maxAttempts)) {
             throw $this->buildException($key, $maxAttempts);
         }
 
@@ -75,6 +76,10 @@ class ThrottleRequests
             $maxAttempts = explode('|', $maxAttempts, 2)[$request->user() ? 1 : 0];
         }
 
+        if (! is_numeric($maxAttempts) && $request->user()) {
+            $maxAttempts = $request->user()->{$maxAttempts};
+        }
+
         return (int) $maxAttempts;
     }
 
@@ -83,6 +88,7 @@ class ThrottleRequests
      *
      * @param  \Illuminate\Http\Request  $request
      * @return string
+     *
      * @throws \RuntimeException
      */
     protected function resolveRequestSignature($request)
@@ -95,9 +101,7 @@ class ThrottleRequests
             return sha1($route->getDomain().'|'.$request->ip());
         }
 
-        throw new RuntimeException(
-            'Unable to generate the request signature. Route unavailable.'
-        );
+        throw new RuntimeException('Unable to generate the request signature. Route unavailable.');
     }
 
     /**
@@ -105,7 +109,7 @@ class ThrottleRequests
      *
      * @param  string  $key
      * @param  int  $maxAttempts
-     * @return \Symfony\Component\HttpKernel\Exception\HttpException
+     * @return \Illuminate\Http\Exceptions\ThrottleRequestsException
      */
     protected function buildException($key, $maxAttempts)
     {
@@ -117,8 +121,8 @@ class ThrottleRequests
             $retryAfter
         );
 
-        return new HttpException(
-            429, 'Too Many Attempts.', null, $headers
+        return new ThrottleRequestsException(
+            'Too Many Attempts.', null, $headers
         );
     }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/Middleware/ThrottleRequestsWithRedis.php b/vendor/laravel/framework/src/Illuminate/Routing/Middleware/ThrottleRequestsWithRedis.php
index c6f3ff60..fe2567f5 100644
--- a/vendor/laravel/framework/src/Illuminate/Routing/Middleware/ThrottleRequestsWithRedis.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/Middleware/ThrottleRequestsWithRedis.php
@@ -48,6 +48,7 @@ class ThrottleRequestsWithRedis extends ThrottleRequests
      * @param  int|string  $maxAttempts
      * @param  float|int  $decayMinutes
      * @return mixed
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\HttpException
      */
     public function handle($request, Closure $next, $maxAttempts = 60, $decayMinutes = 1)
@@ -83,7 +84,7 @@ class ThrottleRequestsWithRedis extends ThrottleRequests
         );
 
         return tap(! $limiter->acquire(), function () use ($limiter) {
-            list($this->decaysAt, $this->remaining) = [
+            [$this->decaysAt, $this->remaining] = [
                 $limiter->decaysAt, $limiter->remaining,
             ];
         });
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/Middleware/ValidateSignature.php b/vendor/laravel/framework/src/Illuminate/Routing/Middleware/ValidateSignature.php
new file mode 100644
index 00000000..85de9a24
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Routing/Middleware/ValidateSignature.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Illuminate\Routing\Middleware;
+
+use Closure;
+use Illuminate\Routing\Exceptions\InvalidSignatureException;
+
+class ValidateSignature
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return \Illuminate\Http\Response
+     *
+     * @throws \Illuminate\Routing\Exceptions\InvalidSignatureException
+     */
+    public function handle($request, Closure $next)
+    {
+        if ($request->hasValidSignature()) {
+            return $next($request);
+        }
+
+        throw new InvalidSignatureException;
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/MiddlewareNameResolver.php b/vendor/laravel/framework/src/Illuminate/Routing/MiddlewareNameResolver.php
index ad67b46c..605d61a7 100644
--- a/vendor/laravel/framework/src/Illuminate/Routing/MiddlewareNameResolver.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/MiddlewareNameResolver.php
@@ -37,7 +37,7 @@ class MiddlewareNameResolver
         // Finally, when the middleware is simply a string mapped to a class name the
         // middleware name will get parsed into the full class name and parameters
         // which may be run using the Pipeline which accepts this string format.
-        list($name, $parameters) = array_pad(explode(':', $name, 2), 2, null);
+        [$name, $parameters] = array_pad(explode(':', $name, 2), 2, null);
 
         return ($map[$name] ?? $name).(! is_null($parameters) ? ':'.$parameters : '');
     }
@@ -66,7 +66,7 @@ class MiddlewareNameResolver
                 continue;
             }
 
-            list($middleware, $parameters) = array_pad(
+            [$middleware, $parameters] = array_pad(
                 explode(':', $middleware, 2), 2, null
             );
 
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/PendingResourceRegistration.php b/vendor/laravel/framework/src/Illuminate/Routing/PendingResourceRegistration.php
index fbb54e8c..f4ec5bc0 100644
--- a/vendor/laravel/framework/src/Illuminate/Routing/PendingResourceRegistration.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/PendingResourceRegistration.php
@@ -2,8 +2,12 @@
 
 namespace Illuminate\Routing;
 
+use Illuminate\Support\Traits\Macroable;
+
 class PendingResourceRegistration
 {
+    use Macroable;
+
     /**
      * The resource registrar.
      *
@@ -32,6 +36,13 @@ class PendingResourceRegistration
      */
     protected $options = [];
 
+    /**
+     * The resource's registration status.
+     *
+     * @var bool
+     */
+    protected $registered = false;
+
     /**
      * Create a new pending resource registration instance.
      *
@@ -142,6 +153,20 @@ class PendingResourceRegistration
         return $this;
     }
 
+    /**
+     * Register the resource route.
+     *
+     * @return \Illuminate\Routing\RouteCollection
+     */
+    public function register()
+    {
+        $this->registered = true;
+
+        return $this->registrar->register(
+            $this->name, $this->controller, $this->options
+        );
+    }
+
     /**
      * Handle the object's destruction.
      *
@@ -149,6 +174,8 @@ class PendingResourceRegistration
      */
     public function __destruct()
     {
-        $this->registrar->register($this->name, $this->controller, $this->options);
+        if (! $this->registered) {
+            $this->register();
+        }
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/RedirectController.php b/vendor/laravel/framework/src/Illuminate/Routing/RedirectController.php
index 82dbf337..e825ddfa 100644
--- a/vendor/laravel/framework/src/Illuminate/Routing/RedirectController.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/RedirectController.php
@@ -14,7 +14,7 @@ class RedirectController extends Controller
      */
     public function __invoke(...$args)
     {
-        list($destination, $status) = array_slice($args, -2);
+        [$destination, $status] = array_slice($args, -2);
 
         return new RedirectResponse($destination, $status);
     }
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/Redirector.php b/vendor/laravel/framework/src/Illuminate/Routing/Redirector.php
index 2f490849..87716e06 100755
--- a/vendor/laravel/framework/src/Illuminate/Routing/Redirector.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/Redirector.php
@@ -82,7 +82,15 @@ class Redirector
      */
     public function guest($path, $status = 302, $headers = [], $secure = null)
     {
-        $this->session->put('url.intended', $this->generator->full());
+        $request = $this->generator->getRequest();
+
+        $intended = $request->method() == 'GET' && $request->route() && ! $request->expectsJson()
+                        ? $this->generator->full()
+                        : $this->generator->previous();
+
+        if ($intended) {
+            $this->session->put('url.intended', $intended);
+        }
 
         return $this->to($path, $status, $headers, $secure);
     }
@@ -147,7 +155,7 @@ class Redirector
      * Create a new redirect response to a named route.
      *
      * @param  string  $route
-     * @param  array   $parameters
+     * @param  mixed   $parameters
      * @param  int     $status
      * @param  array   $headers
      * @return \Illuminate\Http\RedirectResponse
@@ -160,8 +168,8 @@ class Redirector
     /**
      * Create a new redirect response to a controller action.
      *
-     * @param  string  $action
-     * @param  array   $parameters
+     * @param  string|array  $action
+     * @param  mixed   $parameters
      * @param  int     $status
      * @param  array   $headers
      * @return \Illuminate\Http\RedirectResponse
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/ResourceRegistrar.php b/vendor/laravel/framework/src/Illuminate/Routing/ResourceRegistrar.php
index 5209e9e9..7528173e 100644
--- a/vendor/laravel/framework/src/Illuminate/Routing/ResourceRegistrar.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/ResourceRegistrar.php
@@ -68,7 +68,7 @@ class ResourceRegistrar
      * @param  string  $name
      * @param  string  $controller
      * @param  array   $options
-     * @return void
+     * @return \Illuminate\Routing\RouteCollection
      */
     public function register($name, $controller, array $options = [])
     {
@@ -92,9 +92,15 @@ class ResourceRegistrar
 
         $defaults = $this->resourceDefaults;
 
+        $collection = new RouteCollection;
+
         foreach ($this->getResourceMethods($defaults, $options) as $m) {
-            $this->{'addResource'.ucfirst($m)}($name, $base, $controller, $options);
+            $collection->add($this->{'addResource'.ucfirst($m)}(
+                $name, $base, $controller, $options
+            ));
         }
+
+        return $collection;
     }
 
     /**
@@ -107,7 +113,7 @@ class ResourceRegistrar
      */
     protected function prefixedResource($name, $controller, array $options)
     {
-        list($name, $prefix) = $this->getResourcePrefix($name);
+        [$name, $prefix] = $this->getResourcePrefix($name);
 
         // We need to extract the base resource from the resource name. Nested resources
         // are supported in the framework, but we need to know what name to use for a
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/ResponseFactory.php b/vendor/laravel/framework/src/Illuminate/Routing/ResponseFactory.php
index 0fe01512..58e04faa 100644
--- a/vendor/laravel/framework/src/Illuminate/Routing/ResponseFactory.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/ResponseFactory.php
@@ -43,7 +43,7 @@ class ResponseFactory implements FactoryContract
     }
 
     /**
-     * Return a new response from the application.
+     * Create a new response instance.
      *
      * @param  string  $content
      * @param  int  $status
@@ -56,7 +56,19 @@ class ResponseFactory implements FactoryContract
     }
 
     /**
-     * Return a new view response from the application.
+     * Create a new "no content" response.
+     *
+     * @param  int  $status
+     * @param  array  $headers
+     * @return \Illuminate\Http\Response
+     */
+    public function noContent($status = 204, array $headers = [])
+    {
+        return $this->make('', $status, $headers);
+    }
+
+    /**
+     * Create a new response for a given view.
      *
      * @param  string  $view
      * @param  array  $data
@@ -70,7 +82,7 @@ class ResponseFactory implements FactoryContract
     }
 
     /**
-     * Return a new JSON response from the application.
+     * Create a new JSON response instance.
      *
      * @param  mixed  $data
      * @param  int  $status
@@ -84,7 +96,7 @@ class ResponseFactory implements FactoryContract
     }
 
     /**
-     * Return a new JSONP response from the application.
+     * Create a new JSONP response instance.
      *
      * @param  string  $callback
      * @param  mixed  $data
@@ -99,7 +111,7 @@ class ResponseFactory implements FactoryContract
     }
 
     /**
-     * Return a new streamed response from the application.
+     * Create a new streamed response instance.
      *
      * @param  \Closure  $callback
      * @param  int  $status
@@ -111,11 +123,35 @@ class ResponseFactory implements FactoryContract
         return new StreamedResponse($callback, $status, $headers);
     }
 
+    /**
+     * Create a new streamed response instance as a file download.
+     *
+     * @param  \Closure  $callback
+     * @param  string|null  $name
+     * @param  array  $headers
+     * @param  string|null  $disposition
+     * @return \Symfony\Component\HttpFoundation\StreamedResponse
+     */
+    public function streamDownload($callback, $name = null, array $headers = [], $disposition = 'attachment')
+    {
+        $response = new StreamedResponse($callback, 200, $headers);
+
+        if (! is_null($name)) {
+            $response->headers->set('Content-Disposition', $response->headers->makeDisposition(
+                $disposition,
+                $name,
+                $this->fallbackName($name)
+            ));
+        }
+
+        return $response;
+    }
+
     /**
      * Create a new file download response.
      *
      * @param  \SplFileInfo|string  $file
-     * @param  string  $name
+     * @param  string|null  $name
      * @param  array  $headers
      * @param  string|null  $disposition
      * @return \Symfony\Component\HttpFoundation\BinaryFileResponse
@@ -125,12 +161,23 @@ class ResponseFactory implements FactoryContract
         $response = new BinaryFileResponse($file, 200, $headers, true, $disposition);
 
         if (! is_null($name)) {
-            return $response->setContentDisposition($disposition, $name, str_replace('%', '', Str::ascii($name)));
+            return $response->setContentDisposition($disposition, $name, $this->fallbackName($name));
         }
 
         return $response;
     }
 
+    /**
+     * Convert the string to ASCII characters that are equivalent to the given name.
+     *
+     * @param  string  $name
+     * @return string
+     */
+    protected function fallbackName($name)
+    {
+        return str_replace('%', '', Str::ascii($name));
+    }
+
     /**
      * Return the raw contents of a binary file.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/Route.php b/vendor/laravel/framework/src/Illuminate/Routing/Route.php
index 7725fc75..56b676bf 100755
--- a/vendor/laravel/framework/src/Illuminate/Routing/Route.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/Route.php
@@ -645,7 +645,7 @@ class Route
     /**
      * Determine whether the route's name matches the given patterns.
      *
-     * @param  dynamic  $patterns
+     * @param  mixed  ...$patterns
      * @return bool
      */
     public function named(...$patterns)
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/RouteAction.php b/vendor/laravel/framework/src/Illuminate/Routing/RouteAction.php
index 678806ba..9c84ff1a 100644
--- a/vendor/laravel/framework/src/Illuminate/Routing/RouteAction.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/RouteAction.php
@@ -29,7 +29,10 @@ class RouteAction
         // as the "uses" property, because there is nothing else we need to do when
         // it is available. Otherwise we will need to find it in the action list.
         if (is_callable($action)) {
-            return ['uses' => $action];
+            return ! is_array($action) ? ['uses' => $action] : [
+                'uses' => $action[0].'@'.$action[1],
+                'controller' => $action[0].'@'.$action[1],
+            ];
         }
 
         // If no "uses" property has been set, we will dig through the array to find a
@@ -77,6 +80,8 @@ class RouteAction
      *
      * @param  string $action
      * @return string
+     *
+     * @throws \UnexpectedValueException
      */
     protected static function makeInvokable($action)
     {
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/RouteBinding.php b/vendor/laravel/framework/src/Illuminate/Routing/RouteBinding.php
index 51053199..e2f284c3 100644
--- a/vendor/laravel/framework/src/Illuminate/Routing/RouteBinding.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/RouteBinding.php
@@ -37,7 +37,7 @@ class RouteBinding
             // If the binding has an @ sign, we will assume it's being used to delimit
             // the class name from the bind method name. This allows for bindings
             // to run multiple bind methods in a single class for convenience.
-            list($class, $method) = Str::parseCallback($binding, 'bind');
+            [$class, $method] = Str::parseCallback($binding, 'bind');
 
             $callable = [$container->make($class), $method];
 
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/RouteCollection.php b/vendor/laravel/framework/src/Illuminate/Routing/RouteCollection.php
index f2338527..32c1bf40 100644
--- a/vendor/laravel/framework/src/Illuminate/Routing/RouteCollection.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/RouteCollection.php
@@ -84,15 +84,15 @@ class RouteCollection implements Countable, IteratorAggregate
         // If the route has a name, we will add it to the name look-up table so that we
         // will quickly be able to find any route associate with a name and not have
         // to iterate through every route every time we need to perform a look-up.
-        $action = $route->getAction();
-
-        if (isset($action['as'])) {
-            $this->nameList[$action['as']] = $route;
+        if ($name = $route->getName()) {
+            $this->nameList[$name] = $route;
         }
 
         // When the route is routing to a controller we will also store the action that
         // is used by the route. This will let us reverse route to controllers while
         // processing a request and easily generate URLs to the given controllers.
+        $action = $route->getAction();
+
         if (isset($action['controller'])) {
             $this->addToActionList($action, $route);
         }
@@ -183,13 +183,13 @@ class RouteCollection implements Countable, IteratorAggregate
      * Determine if a route in the array matches the request.
      *
      * @param  array  $routes
-     * @param  \Illuminate\http\Request  $request
+     * @param  \Illuminate\Http\Request  $request
      * @param  bool  $includingMethod
      * @return \Illuminate\Routing\Route|null
      */
     protected function matchAgainstRoutes(array $routes, $request, $includingMethod = true)
     {
-        list($fallbacks, $routes) = collect($routes)->partition(function ($route) {
+        [$fallbacks, $routes] = collect($routes)->partition(function ($route) {
             return $route->isFallback;
         });
 
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/RouteCompiler.php b/vendor/laravel/framework/src/Illuminate/Routing/RouteCompiler.php
index 5fb1e30e..c191663b 100644
--- a/vendor/laravel/framework/src/Illuminate/Routing/RouteCompiler.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/RouteCompiler.php
@@ -36,7 +36,7 @@ class RouteCompiler
         $uri = preg_replace('/\{(\w+?)\?\}/', '{$1}', $this->route->uri());
 
         return (
-            new SymfonyRoute($uri, $optionals, $this->route->wheres, [], $this->route->getDomain() ?: '')
+            new SymfonyRoute($uri, $optionals, $this->route->wheres, ['utf8' => true], $this->route->getDomain() ?: '')
         )->compile();
     }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/RouteGroup.php b/vendor/laravel/framework/src/Illuminate/Routing/RouteGroup.php
index ba33beeb..4041f1f7 100644
--- a/vendor/laravel/framework/src/Illuminate/Routing/RouteGroup.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/RouteGroup.php
@@ -40,7 +40,7 @@ class RouteGroup
     protected static function formatNamespace($new, $old)
     {
         if (isset($new['namespace'])) {
-            return isset($old['namespace'])
+            return isset($old['namespace']) && strpos($new['namespace'], '\\') !== 0
                     ? trim($old['namespace'], '\\').'\\'.trim($new['namespace'], '\\')
                     : trim($new['namespace'], '\\');
         }
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/RouteRegistrar.php b/vendor/laravel/framework/src/Illuminate/Routing/RouteRegistrar.php
index 58acdf2f..b911f1b5 100644
--- a/vendor/laravel/framework/src/Illuminate/Routing/RouteRegistrar.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/RouteRegistrar.php
@@ -7,6 +7,22 @@ use BadMethodCallException;
 use Illuminate\Support\Arr;
 use InvalidArgumentException;
 
+/**
+ * @method \Illuminate\Routing\Route get(string $uri, \Closure|array|string|null $action = null)
+ * @method \Illuminate\Routing\Route post(string $uri, \Closure|array|string|null $action = null)
+ * @method \Illuminate\Routing\Route put(string $uri, \Closure|array|string|null $action = null)
+ * @method \Illuminate\Routing\Route delete(string $uri, \Closure|array|string|null $action = null)
+ * @method \Illuminate\Routing\Route patch(string $uri, \Closure|array|string|null $action = null)
+ * @method \Illuminate\Routing\Route options(string $uri, \Closure|array|string|null $action = null)
+ * @method \Illuminate\Routing\Route any(string $uri, \Closure|array|string|null $action = null)
+ * @method \Illuminate\Routing\RouteRegistrar as(string $value)
+ * @method \Illuminate\Routing\RouteRegistrar domain(string $value)
+ * @method \Illuminate\Routing\RouteRegistrar middleware(array|string|null $middleware)
+ * @method \Illuminate\Routing\RouteRegistrar name(string $value)
+ * @method \Illuminate\Routing\RouteRegistrar namespace(string $value)
+ * @method \Illuminate\Routing\RouteRegistrar prefix(string  $prefix)
+ * @method \Illuminate\Routing\RouteRegistrar where(array  $where)
+ */
 class RouteRegistrar
 {
     /**
@@ -38,7 +54,7 @@ class RouteRegistrar
      * @var array
      */
     protected $allowedAttributes = [
-        'as', 'domain', 'middleware', 'name', 'namespace', 'prefix',
+        'as', 'domain', 'middleware', 'name', 'namespace', 'prefix', 'where',
     ];
 
     /**
@@ -160,6 +176,8 @@ class RouteRegistrar
      * @param  string  $method
      * @param  array  $parameters
      * @return \Illuminate\Routing\Route|$this
+     *
+     * @throws \BadMethodCallException
      */
     public function __call($method, $parameters)
     {
@@ -175,6 +193,8 @@ class RouteRegistrar
             return $this->attribute($method, $parameters[0]);
         }
 
-        throw new BadMethodCallException("Method [{$method}] does not exist.");
+        throw new BadMethodCallException(sprintf(
+            'Method %s::%s does not exist.', static::class, $method
+        ));
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/RouteSignatureParameters.php b/vendor/laravel/framework/src/Illuminate/Routing/RouteSignatureParameters.php
index c09baeb9..59d660f7 100644
--- a/vendor/laravel/framework/src/Illuminate/Routing/RouteSignatureParameters.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/RouteSignatureParameters.php
@@ -34,7 +34,7 @@ class RouteSignatureParameters
      */
     protected static function fromClassMethodString($uses)
     {
-        list($class, $method) = Str::parseCallback($uses);
+        [$class, $method] = Str::parseCallback($uses);
 
         if (! method_exists($class, $method) && is_callable($class, $method)) {
             return [];
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/RouteUrlGenerator.php b/vendor/laravel/framework/src/Illuminate/Routing/RouteUrlGenerator.php
index b5a4c1cb..4a82b4f5 100644
--- a/vendor/laravel/framework/src/Illuminate/Routing/RouteUrlGenerator.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/RouteUrlGenerator.php
@@ -83,7 +83,8 @@ class RouteUrlGenerator
         // will need to throw the exception to let the developers know one was not given.
         $uri = $this->addQueryString($this->url->format(
             $root = $this->replaceRootParameters($route, $domain, $parameters),
-            $this->replaceRouteParameters($route->uri(), $parameters)
+            $this->replaceRouteParameters($route->uri(), $parameters),
+            $route
         ), $parameters);
 
         if (preg_match('/\{.*?\}/', $uri)) {
@@ -96,7 +97,13 @@ class RouteUrlGenerator
         $uri = strtr(rawurlencode($uri), $this->dontEncode);
 
         if (! $absolute) {
-            return '/'.ltrim(str_replace($root, '', $uri), '/');
+            $uri = preg_replace('#^(//|[^/?])+#', '', $uri);
+
+            if ($base = $this->request->getBaseUrl()) {
+                $uri = preg_replace('#^'.$base.'#i', '', $uri);
+            }
+
+            return '/'.ltrim($uri, '/');
         }
 
         return $uri;
@@ -142,7 +149,7 @@ class RouteUrlGenerator
             return 'https://';
         }
 
-        return $this->url->formatScheme(null);
+        return $this->url->formatScheme();
     }
 
     /**
@@ -254,7 +261,7 @@ class RouteUrlGenerator
             return '';
         }
 
-        $query = http_build_query(
+        $query = Arr::query(
             $keyed = $this->getStringParameters($parameters)
         );
 
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/Router.php b/vendor/laravel/framework/src/Illuminate/Routing/Router.php
index adbafaa2..14c4ba8f 100644
--- a/vendor/laravel/framework/src/Illuminate/Routing/Router.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/Router.php
@@ -11,6 +11,7 @@ use Illuminate\Http\Response;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Collection;
 use Illuminate\Container\Container;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Traits\Macroable;
 use Illuminate\Contracts\Support\Jsonable;
 use Illuminate\Contracts\Events\Dispatcher;
@@ -235,13 +236,25 @@ class Router implements RegistrarContract, BindingRegistrar
      * @param  int  $status
      * @return \Illuminate\Routing\Route
      */
-    public function redirect($uri, $destination, $status = 301)
+    public function redirect($uri, $destination, $status = 302)
     {
         return $this->any($uri, '\Illuminate\Routing\RedirectController')
                 ->defaults('destination', $destination)
                 ->defaults('status', $status);
     }
 
+    /**
+     * Create a permanent redirect from one URI to another.
+     *
+     * @param  string  $uri
+     * @param  string  $destination
+     * @return \Illuminate\Routing\Route
+     */
+    public function permanentRedirect($uri, $destination)
+    {
+        return $this->redirect($uri, $destination, 301);
+    }
+
     /**
      * Register a new route that returns a view.
      *
@@ -274,12 +287,13 @@ class Router implements RegistrarContract, BindingRegistrar
      * Register an array of resource controllers.
      *
      * @param  array  $resources
+     * @param  array  $options
      * @return void
      */
-    public function resources(array $resources)
+    public function resources(array $resources, array $options = [])
     {
         foreach ($resources as $name => $controller) {
-            $this->resource($name, $controller);
+            $this->resource($name, $controller, $options);
         }
     }
 
@@ -308,12 +322,13 @@ class Router implements RegistrarContract, BindingRegistrar
      * Register an array of API resource controllers.
      *
      * @param  array  $resources
+     * @param  array  $options
      * @return void
      */
-    public function apiResources(array $resources)
+    public function apiResources(array $resources, array $options = [])
     {
         foreach ($resources as $name => $controller) {
-            $this->apiResource($name, $controller);
+            $this->apiResource($name, $controller, $options);
         }
     }
 
@@ -327,8 +342,14 @@ class Router implements RegistrarContract, BindingRegistrar
      */
     public function apiResource($name, $controller, array $options = [])
     {
+        $only = ['index', 'show', 'store', 'update', 'destroy'];
+
+        if (isset($options['except'])) {
+            $only = array_diff($only, (array) $options['except']);
+        }
+
         return $this->resource($name, $controller, array_merge([
-            'only' => ['index', 'show', 'store', 'update', 'destroy'],
+            'only' => $only,
         ], $options));
     }
 
@@ -418,7 +439,7 @@ class Router implements RegistrarContract, BindingRegistrar
      * @param  \Closure|array|string|null  $action
      * @return \Illuminate\Routing\Route
      */
-    protected function addRoute($methods, $uri, $action)
+    public function addRoute($methods, $uri, $action)
     {
         return $this->routes->add($this->createRoute($methods, $uri, $action));
     }
@@ -619,8 +640,8 @@ class Router implements RegistrarContract, BindingRegistrar
     /**
      * Return the response for the given route.
      *
-     * @param  Route  $route
-     * @param  Request  $request
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Routing\Route  $route
      * @return mixed
      */
     protected function runRoute(Request $request, Route $route)
@@ -713,6 +734,8 @@ class Router implements RegistrarContract, BindingRegistrar
 
         if ($response instanceof PsrResponseInterface) {
             $response = (new HttpFoundationFactory)->createResponse($response);
+        } elseif ($response instanceof Model && $response->wasRecentlyCreated) {
+            $response = new JsonResponse($response, 201);
         } elseif (! $response instanceof SymfonyResponse &&
                    ($response instanceof Arrayable ||
                     $response instanceof Jsonable ||
@@ -1053,7 +1076,7 @@ class Router implements RegistrarContract, BindingRegistrar
     /**
      * Alias for the "currentRouteNamed" method.
      *
-     * @param  dynamic  $patterns
+     * @param  mixed  ...$patterns
      * @return bool
      */
     public function is(...$patterns)
@@ -1064,7 +1087,7 @@ class Router implements RegistrarContract, BindingRegistrar
     /**
      * Determine if the current route matches a pattern.
      *
-     * @param  dynamic  $patterns
+     * @param  mixed  ...$patterns
      * @return bool
      */
     public function currentRouteNamed(...$patterns)
@@ -1115,9 +1138,10 @@ class Router implements RegistrarContract, BindingRegistrar
     /**
      * Register the typical authentication routes for an application.
      *
+     * @param  array  $options
      * @return void
      */
-    public function auth()
+    public function auth(array $options = [])
     {
         // Authentication Routes...
         $this->get('login', 'Auth\LoginController@showLoginForm')->name('login');
@@ -1125,14 +1149,33 @@ class Router implements RegistrarContract, BindingRegistrar
         $this->post('logout', 'Auth\LoginController@logout')->name('logout');
 
         // Registration Routes...
-        $this->get('register', 'Auth\RegisterController@showRegistrationForm')->name('register');
-        $this->post('register', 'Auth\RegisterController@register');
+        if ($options['register'] ?? true) {
+            $this->get('register', 'Auth\RegisterController@showRegistrationForm')->name('register');
+            $this->post('register', 'Auth\RegisterController@register');
+        }
 
         // Password Reset Routes...
         $this->get('password/reset', 'Auth\ForgotPasswordController@showLinkRequestForm')->name('password.request');
         $this->post('password/email', 'Auth\ForgotPasswordController@sendResetLinkEmail')->name('password.email');
         $this->get('password/reset/{token}', 'Auth\ResetPasswordController@showResetForm')->name('password.reset');
-        $this->post('password/reset', 'Auth\ResetPasswordController@reset');
+        $this->post('password/reset', 'Auth\ResetPasswordController@reset')->name('password.update');
+
+        // Email Verification Routes...
+        if ($options['verify'] ?? false) {
+            $this->emailVerification();
+        }
+    }
+
+    /**
+     * Register the typical email verification routes for an application.
+     *
+     * @return void
+     */
+    public function emailVerification()
+    {
+        $this->get('email/verify', 'Auth\VerificationController@show')->name('verification.notice');
+        $this->get('email/verify/{id}', 'Auth\VerificationController@verify')->name('verification.verify');
+        $this->get('email/resend', 'Auth\VerificationController@resend')->name('verification.resend');
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/RoutingServiceProvider.php b/vendor/laravel/framework/src/Illuminate/Routing/RoutingServiceProvider.php
index f449ad7b..74b4a1fb 100755
--- a/vendor/laravel/framework/src/Illuminate/Routing/RoutingServiceProvider.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/RoutingServiceProvider.php
@@ -21,17 +21,11 @@ class RoutingServiceProvider extends ServiceProvider
     public function register()
     {
         $this->registerRouter();
-
         $this->registerUrlGenerator();
-
         $this->registerRedirector();
-
         $this->registerPsrRequest();
-
         $this->registerPsrResponse();
-
         $this->registerResponseFactory();
-
         $this->registerControllerDispatcher();
     }
 
@@ -68,10 +62,17 @@ class RoutingServiceProvider extends ServiceProvider
                 )
             );
 
+            // Next we will set a few service resolvers on the URL generator so it can
+            // get the information it needs to function. This just provides some of
+            // the convenience features to this URL generator like "signed" URLs.
             $url->setSessionResolver(function () {
                 return $this->app['session'];
             });
 
+            $url->setKeyResolver(function () {
+                return $this->app->make('config')->get('app.key');
+            });
+
             // If the route collection is "rebound", for example, when the routes stay
             // cached for the application, we will need to rebind the routes on the
             // URL generator instance so it has the latest version of the routes.
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/SortedMiddleware.php b/vendor/laravel/framework/src/Illuminate/Routing/SortedMiddleware.php
index ad094567..6af28d57 100644
--- a/vendor/laravel/framework/src/Illuminate/Routing/SortedMiddleware.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/SortedMiddleware.php
@@ -10,7 +10,7 @@ class SortedMiddleware extends Collection
      * Create a new Sorted Middleware container.
      *
      * @param  array  $priorityMap
-     * @param  array|Collection  $middlewares
+     * @param  array|\Illuminate\Support\Collection  $middlewares
      * @return void
      */
     public function __construct(array $priorityMap, $middlewares)
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/UrlGenerator.php b/vendor/laravel/framework/src/Illuminate/Routing/UrlGenerator.php
index bf1839b3..6c29daad 100755
--- a/vendor/laravel/framework/src/Illuminate/Routing/UrlGenerator.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/UrlGenerator.php
@@ -7,13 +7,15 @@ use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use InvalidArgumentException;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Traits\Macroable;
+use Illuminate\Support\InteractsWithTime;
 use Illuminate\Contracts\Routing\UrlRoutable;
 use Illuminate\Contracts\Routing\UrlGenerator as UrlGeneratorContract;
 
 class UrlGenerator implements UrlGeneratorContract
 {
-    use Macroable;
+    use InteractsWithTime, Macroable;
 
     /**
      * The route collection.
@@ -71,6 +73,13 @@ class UrlGenerator implements UrlGeneratorContract
      */
     protected $sessionResolver;
 
+    /**
+     * The encryption key resolver callable.
+     *
+     * @var callable
+     */
+    protected $keyResolver;
+
     /**
      * The callback to use to format hosts.
      *
@@ -185,7 +194,7 @@ class UrlGenerator implements UrlGeneratorContract
         // for passing the array of parameters to this URL as a list of segments.
         $root = $this->formatRoot($this->formatScheme($secure));
 
-        list($path, $query) = $this->extractQueryString($path);
+        [$path, $query] = $this->extractQueryString($path);
 
         return $this->format(
             $root, '/'.trim($path.'/'.$tail, '/')
@@ -273,7 +282,7 @@ class UrlGenerator implements UrlGeneratorContract
      * @param  bool|null  $secure
      * @return string
      */
-    public function formatScheme($secure)
+    public function formatScheme($secure = null)
     {
         if (! is_null($secure)) {
             return $secure ? 'https://' : 'http://';
@@ -286,6 +295,66 @@ class UrlGenerator implements UrlGeneratorContract
         return $this->cachedSchema;
     }
 
+    /**
+     * Create a signed route URL for a named route.
+     *
+     * @param  string  $name
+     * @param  array  $parameters
+     * @param  \DateTimeInterface|int  $expiration
+     * @param  bool  $absolute
+     * @return string
+     */
+    public function signedRoute($name, $parameters = [], $expiration = null, $absolute = true)
+    {
+        $parameters = $this->formatParameters($parameters);
+
+        if ($expiration) {
+            $parameters = $parameters + ['expires' => $this->availableAt($expiration)];
+        }
+
+        ksort($parameters);
+
+        $key = call_user_func($this->keyResolver);
+
+        return $this->route($name, $parameters + [
+            'signature' => hash_hmac('sha256', $this->route($name, $parameters), $key),
+        ], $absolute);
+    }
+
+    /**
+     * Create a temporary signed route URL for a named route.
+     *
+     * @param  string  $name
+     * @param  \DateTimeInterface|int  $expiration
+     * @param  array  $parameters
+     * @param  bool  $absolute
+     * @return string
+     */
+    public function temporarySignedRoute($name, $expiration, $parameters = [], $absolute = true)
+    {
+        return $this->signedRoute($name, $parameters, $expiration, $absolute);
+    }
+
+    /**
+     * Determine if the given request has a valid signature.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return bool
+     */
+    public function hasValidSignature(Request $request)
+    {
+        $original = rtrim($request->url().'?'.Arr::query(
+            Arr::except($request->query(), 'signature')
+        ), '?');
+
+        $expires = Arr::get($request->query(), 'expires');
+
+        $signature = hash_hmac('sha256', $original, call_user_func($this->keyResolver));
+
+        return  hash_equals($signature, $request->query('signature', '')) &&
+               ! ($expires && Carbon::now()->getTimestamp() > $expires);
+    }
+
     /**
      * Get the URL to a named route.
      *
@@ -325,7 +394,7 @@ class UrlGenerator implements UrlGeneratorContract
     /**
      * Get the URL to a controller action.
      *
-     * @param  string  $action
+     * @param  string|array  $action
      * @param  mixed   $parameters
      * @param  bool    $absolute
      * @return string
@@ -344,11 +413,15 @@ class UrlGenerator implements UrlGeneratorContract
     /**
      * Format the given controller action.
      *
-     * @param  string  $action
+     * @param  string|array  $action
      * @return string
      */
     protected function formatAction($action)
     {
+        if (is_array($action)) {
+            $action = '\\'.implode('@', $action);
+        }
+
         if ($this->rootNamespace && ! (strpos($action, '\\') === 0)) {
             return $this->rootNamespace.'\\'.$action;
         } else {
@@ -420,18 +493,19 @@ class UrlGenerator implements UrlGeneratorContract
      *
      * @param  string  $root
      * @param  string  $path
+     * @param  \Illuminate\Routing\Route|null  $route
      * @return string
      */
-    public function format($root, $path)
+    public function format($root, $path, $route = null)
     {
         $path = '/'.trim($path, '/');
 
         if ($this->formatHostUsing) {
-            $root = call_user_func($this->formatHostUsing, $root);
+            $root = call_user_func($this->formatHostUsing, $root, $route);
         }
 
         if ($this->formatPathUsing) {
-            $path = call_user_func($this->formatPathUsing, $path);
+            $path = call_user_func($this->formatPathUsing, $path, $route);
         }
 
         return trim($root.$path, '/');
@@ -614,6 +688,19 @@ class UrlGenerator implements UrlGeneratorContract
         return $this;
     }
 
+    /**
+     * Set the encryption key resolver.
+     *
+     * @param  callable  $keyResolver
+     * @return $this
+     */
+    public function setKeyResolver(callable $keyResolver)
+    {
+        $this->keyResolver = $keyResolver;
+
+        return $this;
+    }
+
     /**
      * Set the root controller namespace.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/ViewController.php b/vendor/laravel/framework/src/Illuminate/Routing/ViewController.php
index c1f9d09d..232013f8 100644
--- a/vendor/laravel/framework/src/Illuminate/Routing/ViewController.php
+++ b/vendor/laravel/framework/src/Illuminate/Routing/ViewController.php
@@ -32,7 +32,7 @@ class ViewController extends Controller
      */
     public function __invoke(...$args)
     {
-        list($view, $data) = array_slice($args, -2);
+        [$view, $data] = array_slice($args, -2);
 
         return $this->view->make($view, $data);
     }
diff --git a/vendor/laravel/framework/src/Illuminate/Routing/composer.json b/vendor/laravel/framework/src/Illuminate/Routing/composer.json
index 7b12355c..e438d419 100644
--- a/vendor/laravel/framework/src/Illuminate/Routing/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Routing/composer.json
@@ -14,17 +14,17 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/container": "5.5.*",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/http": "5.5.*",
-        "illuminate/pipeline": "5.5.*",
-        "illuminate/session": "5.5.*",
-        "illuminate/support": "5.5.*",
-        "symfony/debug": "~3.3",
-        "symfony/http-foundation": "~3.3",
-        "symfony/http-kernel": "~3.3",
-        "symfony/routing": "~3.3"
+        "php": "^7.1.3",
+        "illuminate/container": "5.7.*",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/http": "5.7.*",
+        "illuminate/pipeline": "5.7.*",
+        "illuminate/session": "5.7.*",
+        "illuminate/support": "5.7.*",
+        "symfony/debug": "^4.1",
+        "symfony/http-foundation": "^4.1",
+        "symfony/http-kernel": "^4.1",
+        "symfony/routing": "^4.1"
     },
     "autoload": {
         "psr-4": {
@@ -33,12 +33,12 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "suggest": {
-        "illuminate/console": "Required to use the make commands (5.5.*).",
-        "symfony/psr-http-message-bridge": "Required to psr7 bridging features (~1.0)."
+        "illuminate/console": "Required to use the make commands (5.7.*).",
+        "symfony/psr-http-message-bridge": "Required to psr7 bridging features (^1.0)."
     },
     "config": {
         "sort-packages": true
diff --git a/vendor/laravel/framework/src/Illuminate/Session/FileSessionHandler.php b/vendor/laravel/framework/src/Illuminate/Session/FileSessionHandler.php
index 6e472f80..839e6e4c 100644
--- a/vendor/laravel/framework/src/Illuminate/Session/FileSessionHandler.php
+++ b/vendor/laravel/framework/src/Illuminate/Session/FileSessionHandler.php
@@ -66,9 +66,9 @@ class FileSessionHandler implements SessionHandlerInterface
      */
     public function read($sessionId)
     {
-        if ($this->files->exists($path = $this->path.'/'.$sessionId)) {
-            if (filemtime($path) >= Carbon::now()->subMinutes($this->minutes)->getTimestamp()) {
-                return $this->files->get($path, true);
+        if ($this->files->isFile($path = $this->path.'/'.$sessionId)) {
+            if ($this->files->lastModified($path) >= Carbon::now()->subMinutes($this->minutes)->getTimestamp()) {
+                return $this->files->sharedGet($path);
             }
         }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Session/Store.php b/vendor/laravel/framework/src/Illuminate/Session/Store.php
index 0f4f20c9..d99c55fd 100755
--- a/vendor/laravel/framework/src/Illuminate/Session/Store.php
+++ b/vendor/laravel/framework/src/Illuminate/Session/Store.php
@@ -3,6 +3,7 @@
 namespace Illuminate\Session;
 
 use Closure;
+use stdClass;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use SessionHandlerInterface;
@@ -174,8 +175,10 @@ class Store implements Session
      */
     public function exists($key)
     {
-        return ! collect(is_array($key) ? $key : func_get_args())->contains(function ($key) {
-            return ! Arr::exists($this->attributes, $key);
+        $placeholder = new stdClass();
+
+        return ! collect(is_array($key) ? $key : func_get_args())->contains(function ($key) use ($placeholder) {
+            return $this->get($key, $placeholder) === $placeholder;
         });
     }
 
@@ -472,7 +475,9 @@ class Store implements Session
      */
     public function regenerate($destroy = false)
     {
-        return $this->migrate($destroy);
+        return tap($this->migrate($destroy), function () {
+            $this->regenerateToken();
+        });
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Session/composer.json b/vendor/laravel/framework/src/Illuminate/Session/composer.json
index a854c506..7e912c12 100755
--- a/vendor/laravel/framework/src/Illuminate/Session/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Session/composer.json
@@ -14,12 +14,12 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/filesystem": "5.5.*",
-        "illuminate/support": "5.5.*",
-        "symfony/finder": "~3.3",
-        "symfony/http-foundation": "~3.3"
+        "php": "^7.1.3",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/filesystem": "5.7.*",
+        "illuminate/support": "5.7.*",
+        "symfony/finder": "^4.1",
+        "symfony/http-foundation": "^4.1"
     },
     "autoload": {
         "psr-4": {
@@ -28,11 +28,11 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "suggest": {
-        "illuminate/console": "Required to use the session:table command (5.5.*)."
+        "illuminate/console": "Required to use the session:table command (5.7.*)."
     },
     "config": {
         "sort-packages": true
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Arr.php b/vendor/laravel/framework/src/Illuminate/Support/Arr.php
index 5cf83eb1..a50829bf 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Arr.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Arr.php
@@ -385,7 +385,7 @@ class Arr
     {
         $results = [];
 
-        list($value, $key) = static::explodePluckParameters($value, $key);
+        [$value, $key] = static::explodePluckParameters($value, $key);
 
         foreach ($array as $item) {
             $itemValue = data_get($item, $value);
@@ -541,11 +541,20 @@ class Arr
      * Shuffle the given array and return the result.
      *
      * @param  array  $array
+     * @param  int|null  $seed
      * @return array
      */
-    public static function shuffle($array)
+    public static function shuffle($array, $seed = null)
     {
-        shuffle($array);
+        if (is_null($seed)) {
+            shuffle($array);
+        } else {
+            srand($seed);
+
+            usort($array, function () {
+                return rand(-1, 1);
+            });
+        }
 
         return $array;
     }
@@ -585,6 +594,17 @@ class Arr
         return $array;
     }
 
+    /**
+     * Convert the array into a query string.
+     *
+     * @param  array  $array
+     * @return string
+     */
+    public static function query($array)
+    {
+        return http_build_query($array, null, '&', PHP_QUERY_RFC3986);
+    }
+
     /**
      * Filter the array using the given callback.
      *
@@ -598,13 +618,17 @@ class Arr
     }
 
     /**
-     * If the given value is not an array, wrap it in one.
+     * If the given value is not an array and not null, wrap it in one.
      *
      * @param  mixed  $value
      * @return array
      */
     public static function wrap($value)
     {
+        if (is_null($value)) {
+            return [];
+        }
+
         return ! is_array($value) ? [$value] : $value;
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Carbon.php b/vendor/laravel/framework/src/Illuminate/Support/Carbon.php
index db1bdbef..d7f537f2 100644
--- a/vendor/laravel/framework/src/Illuminate/Support/Carbon.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Carbon.php
@@ -2,47 +2,8 @@
 
 namespace Illuminate\Support;
 
-use JsonSerializable;
 use Carbon\Carbon as BaseCarbon;
-use Illuminate\Support\Traits\Macroable;
 
-class Carbon extends BaseCarbon implements JsonSerializable
+class Carbon extends BaseCarbon
 {
-    use Macroable;
-
-    /**
-     * The custom Carbon JSON serializer.
-     *
-     * @var callable|null
-     */
-    protected static $serializer;
-
-    /**
-     * Prepare the object for JSON serialization.
-     *
-     * @return array|string
-     */
-    public function jsonSerialize()
-    {
-        if (static::$serializer) {
-            return call_user_func(static::$serializer, $this);
-        }
-
-        $carbon = $this;
-
-        return call_user_func(function () use ($carbon) {
-            return get_object_vars($carbon);
-        });
-    }
-
-    /**
-     * JSON serialize all Carbon instances using the given callback.
-     *
-     * @param  callable  $callback
-     * @return void
-     */
-    public static function serializeUsing($callback)
-    {
-        static::$serializer = $callback;
-    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Collection.php b/vendor/laravel/framework/src/Illuminate/Support/Collection.php
index 38dd526f..fc3132c1 100644
--- a/vendor/laravel/framework/src/Illuminate/Support/Collection.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Collection.php
@@ -11,11 +11,34 @@ use ArrayIterator;
 use CachingIterator;
 use JsonSerializable;
 use IteratorAggregate;
-use Illuminate\Support\Debug\Dumper;
 use Illuminate\Support\Traits\Macroable;
 use Illuminate\Contracts\Support\Jsonable;
+use Symfony\Component\VarDumper\VarDumper;
 use Illuminate\Contracts\Support\Arrayable;
 
+/**
+ * @property-read HigherOrderCollectionProxy $average
+ * @property-read HigherOrderCollectionProxy $avg
+ * @property-read HigherOrderCollectionProxy $contains
+ * @property-read HigherOrderCollectionProxy $each
+ * @property-read HigherOrderCollectionProxy $every
+ * @property-read HigherOrderCollectionProxy $filter
+ * @property-read HigherOrderCollectionProxy $first
+ * @property-read HigherOrderCollectionProxy $flatMap
+ * @property-read HigherOrderCollectionProxy $groupBy
+ * @property-read HigherOrderCollectionProxy $keyBy
+ * @property-read HigherOrderCollectionProxy $map
+ * @property-read HigherOrderCollectionProxy $max
+ * @property-read HigherOrderCollectionProxy $min
+ * @property-read HigherOrderCollectionProxy $partition
+ * @property-read HigherOrderCollectionProxy $reject
+ * @property-read HigherOrderCollectionProxy $sortBy
+ * @property-read HigherOrderCollectionProxy $sortByDesc
+ * @property-read HigherOrderCollectionProxy $sum
+ * @property-read HigherOrderCollectionProxy $unique
+ *
+ * Class Collection
+ */
 class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate, Jsonable, JsonSerializable
 {
     use Macroable;
@@ -33,8 +56,9 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
      * @var array
      */
     protected static $proxies = [
-        'average', 'avg', 'contains', 'each', 'every', 'filter', 'first', 'flatMap',
-        'keyBy', 'map', 'partition', 'reject', 'sortBy', 'sortByDesc', 'sum', 'unique',
+        'average', 'avg', 'contains', 'each', 'every', 'filter', 'first',
+        'flatMap', 'groupBy', 'keyBy', 'map', 'max', 'min', 'partition',
+        'reject', 'sortBy', 'sortByDesc', 'sum', 'unique',
     ];
 
     /**
@@ -121,8 +145,16 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
      */
     public function avg($callback = null)
     {
-        if ($count = $this->count()) {
-            return $this->sum($callback) / $count;
+        $callback = $this->valueRetriever($callback);
+
+        $items = $this->map(function ($value) use ($callback) {
+            return $callback($value);
+        })->filter(function ($value) {
+            return ! is_null($value);
+        });
+
+        if ($count = $items->count()) {
+            return $items->sum() / $count;
         }
     }
 
@@ -145,15 +177,17 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
      */
     public function median($key = null)
     {
-        $count = $this->count();
+        $values = (isset($key) ? $this->pluck($key) : $this)
+            ->filter(function ($item) {
+                return ! is_null($item);
+            })->sort()->values();
+
+        $count = $values->count();
 
         if ($count == 0) {
             return;
         }
 
-        $values = (isset($key) ? $this->pluck($key) : $this)
-                    ->sort()->values();
-
         $middle = (int) ($count / 2);
 
         if ($count % 2) {
@@ -173,9 +207,7 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
      */
     public function mode($key = null)
     {
-        $count = $this->count();
-
-        if ($count == 0) {
+        if ($this->count() == 0) {
             return;
         }
 
@@ -216,7 +248,7 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
      */
     public function contains($key, $operator = null, $value = null)
     {
-        if (func_num_args() == 1) {
+        if (func_num_args() === 1) {
             if ($this->useAsCallable($key)) {
                 $placeholder = new stdClass;
 
@@ -238,7 +270,7 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
      */
     public function containsStrict($key, $value = null)
     {
-        if (func_num_args() == 2) {
+        if (func_num_args() === 2) {
             return $this->contains(function ($item) use ($key, $value) {
                 return data_get($item, $key) === $value;
             });
@@ -271,8 +303,6 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
      */
     public function dd(...$args)
     {
-        http_response_code(500);
-
         call_user_func_array([$this, 'dump'], $args);
 
         die(1);
@@ -288,7 +318,7 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
         (new static(func_get_args()))
             ->push($this)
             ->each(function ($item) {
-                (new Dumper)->dump($item);
+                VarDumper::dump($item);
             });
 
         return $this;
@@ -305,6 +335,18 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
         return new static(array_diff($this->items, $this->getArrayableItems($items)));
     }
 
+    /**
+     * Get the items in the collection that are not present in the given items.
+     *
+     * @param  mixed  $items
+     * @param  callable  $callback
+     * @return static
+     */
+    public function diffUsing($items, callable $callback)
+    {
+        return new static(array_udiff($this->items, $this->getArrayableItems($items), $callback));
+    }
+
     /**
      * Get the items in the collection whose keys and values are not present in the given items.
      *
@@ -316,6 +358,18 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
         return new static(array_diff_assoc($this->items, $this->getArrayableItems($items)));
     }
 
+    /**
+     * Get the items in the collection whose keys and values are not present in the given items.
+     *
+     * @param  mixed  $items
+     * @param  callable  $callback
+     * @return static
+     */
+    public function diffAssocUsing($items, callable $callback)
+    {
+        return new static(array_diff_uassoc($this->items, $this->getArrayableItems($items), $callback));
+    }
+
     /**
      * Get the items in the collection whose keys are not present in the given items.
      *
@@ -327,6 +381,18 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
         return new static(array_diff_key($this->items, $this->getArrayableItems($items)));
     }
 
+    /**
+     * Get the items in the collection whose keys are not present in the given items.
+     *
+     * @param  mixed   $items
+     * @param  callable  $callback
+     * @return static
+     */
+    public function diffKeysUsing($items, callable $callback)
+    {
+        return new static(array_diff_ukey($this->items, $this->getArrayableItems($items), $callback));
+    }
+
     /**
      * Execute a callback over each item.
      *
@@ -369,7 +435,7 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
      */
     public function every($key, $operator = null, $value = null)
     {
-        if (func_num_args() == 1) {
+        if (func_num_args() === 1) {
             $callback = $this->valueRetriever($key);
 
             foreach ($this->items as $k => $v) {
@@ -422,7 +488,7 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
      * @param  bool  $value
      * @param  callable  $callback
      * @param  callable  $default
-     * @return mixed
+     * @return static|mixed
      */
     public function when($value, callable $callback, callable $default = null)
     {
@@ -441,7 +507,7 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
      * @param  bool  $value
      * @param  callable  $callback
      * @param  callable  $default
-     * @return mixed
+     * @return static|mixed
      */
     public function unless($value, callable $callback, callable $default = null)
     {
@@ -456,7 +522,7 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
      * @param  mixed  $value
      * @return static
      */
-    public function where($key, $operator, $value = null)
+    public function where($key, $operator = null, $value = null)
     {
         return $this->filter($this->operatorForWhere(...func_get_args()));
     }
@@ -469,9 +535,15 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
      * @param  mixed  $value
      * @return \Closure
      */
-    protected function operatorForWhere($key, $operator, $value = null)
+    protected function operatorForWhere($key, $operator = null, $value = null)
     {
-        if (func_num_args() == 2) {
+        if (func_num_args() === 1) {
+            $value = true;
+
+            $operator = '=';
+        }
+
+        if (func_num_args() === 2) {
             $value = $operator;
 
             $operator = '=';
@@ -574,6 +646,19 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
         return $this->whereNotIn($key, $values, true);
     }
 
+    /**
+     * Filter the items, removing any items that don't match the given type.
+     *
+     * @param  string  $type
+     * @return static
+     */
+    public function whereInstanceOf($type)
+    {
+        return $this->filter(function ($value) use ($type) {
+            return $value instanceof $type;
+        });
+    }
+
     /**
      * Get the first item from the collection.
      *
@@ -592,7 +677,7 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
      * @param  string  $key
      * @param  mixed  $operator
      * @param  mixed  $value
-     * @return static
+     * @return mixed
      */
     public function firstWhere($key, $operator, $value = null)
     {
@@ -888,11 +973,21 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
      */
     public function mapToDictionary(callable $callback)
     {
-        $dictionary = $this->map($callback)->reduce(function ($groups, $pair) {
-            $groups[key($pair)][] = reset($pair);
+        $dictionary = [];
+
+        foreach ($this->items as $key => $item) {
+            $pair = $callback($item, $key);
+
+            $key = key($pair);
+
+            $value = reset($pair);
+
+            if (! isset($dictionary[$key])) {
+                $dictionary[$key] = [];
+            }
 
-            return $groups;
-        }, []);
+            $dictionary[$key][] = $value;
+        }
 
         return new static($dictionary);
     }
@@ -1021,11 +1116,11 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
     {
         $callback = $this->valueRetriever($callback);
 
-        return $this->filter(function ($value) {
+        return $this->map(function ($value) use ($callback) {
+            return $callback($value);
+        })->filter(function ($value) {
             return ! is_null($value);
-        })->reduce(function ($result, $item) use ($callback) {
-            $value = $callback($item);
-
+        })->reduce(function ($result, $value) {
             return is_null($result) || $value < $result ? $value : $result;
         });
     }
@@ -1092,14 +1187,18 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
     /**
      * Partition the collection into two arrays using the given callback or key.
      *
-     * @param  callable|string  $callback
+     * @param  callable|string  $key
+     * @param  mixed  $operator
+     * @param  mixed  $value
      * @return static
      */
-    public function partition($callback)
+    public function partition($key, $operator = null, $value = null)
     {
         $partitions = [new static, new static];
 
-        $callback = $this->valueRetriever($callback);
+        $callback = func_num_args() === 1
+                ? $this->valueRetriever($key)
+                : $this->operatorForWhere(...func_get_args());
 
         foreach ($this->items as $key => $item) {
             $partitions[(int) ! $callback($item, $key)][$key] = $item;
@@ -1159,8 +1258,8 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
     /**
      * Push all of the given items onto the collection.
      *
-     * @param  \Traversable  $source
-     * @return $this
+     * @param  \Traversable|array  $source
+     * @return static
      */
     public function concat($source)
     {
@@ -1203,7 +1302,7 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
      * Get one or a specified number of items randomly from the collection.
      *
      * @param  int|null  $number
-     * @return mixed
+     * @return static|mixed
      *
      * @throws \InvalidArgumentException
      */
@@ -1297,19 +1396,7 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
      */
     public function shuffle($seed = null)
     {
-        $items = $this->items;
-
-        if (is_null($seed)) {
-            shuffle($items);
-        } else {
-            srand($seed);
-
-            usort($items, function () {
-                return rand(-1, 1);
-            });
-        }
-
-        return new static($items);
+        return new static(Arr::shuffle($this->items, $seed));
     }
 
     /**
@@ -1336,9 +1423,29 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
             return new static;
         }
 
-        $groupSize = ceil($this->count() / $numberOfGroups);
+        $groups = new static;
+
+        $groupSize = floor($this->count() / $numberOfGroups);
+
+        $remain = $this->count() % $numberOfGroups;
+
+        $start = 0;
+
+        for ($i = 0; $i < $numberOfGroups; $i++) {
+            $size = $groupSize;
 
-        return $this->chunk($groupSize);
+            if ($i < $remain) {
+                $size++;
+            }
+
+            if ($size) {
+                $groups->push(new static(array_slice($this->items, $start, $size)));
+
+                $start += $size;
+            }
+        }
+
+        return $groups;
     }
 
     /**
@@ -1425,6 +1532,33 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
         return $this->sortBy($callback, $options, true);
     }
 
+    /**
+     * Sort the collection keys.
+     *
+     * @param  int  $options
+     * @param  bool  $descending
+     * @return static
+     */
+    public function sortKeys($options = SORT_REGULAR, $descending = false)
+    {
+        $items = $this->items;
+
+        $descending ? krsort($items, $options) : ksort($items, $options);
+
+        return new static($items);
+    }
+
+    /**
+     * Sort the collection keys in descending order.
+     *
+     * @param  int $options
+     * @return static
+     */
+    public function sortKeysDesc($options = SORT_REGULAR)
+    {
+        return $this->sortKeys($options, true);
+    }
+
     /**
      * Splice a portion of the underlying collection array.
      *
@@ -1435,7 +1569,7 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
      */
     public function splice($offset, $length = null, $replacement = [])
     {
-        if (func_num_args() == 1) {
+        if (func_num_args() === 1) {
             return new static(array_splice($this->items, $offset));
         }
 
@@ -1511,10 +1645,6 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
      */
     public function unique($key = null, $strict = false)
     {
-        if (is_null($key)) {
-            return new static(array_unique($this->items, SORT_REGULAR));
-        }
-
         $callback = $this->valueRetriever($key);
 
         $exists = [];
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Debug/Dumper.php b/vendor/laravel/framework/src/Illuminate/Support/Debug/Dumper.php
deleted file mode 100644
index 7442343f..00000000
--- a/vendor/laravel/framework/src/Illuminate/Support/Debug/Dumper.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Illuminate\Support\Debug;
-
-use Symfony\Component\VarDumper\Cloner\VarCloner;
-use Symfony\Component\VarDumper\Dumper\CliDumper;
-
-class Dumper
-{
-    /**
-     * Dump a value with elegance.
-     *
-     * @param  mixed  $value
-     * @return void
-     */
-    public function dump($value)
-    {
-        if (class_exists(CliDumper::class)) {
-            $dumper = in_array(PHP_SAPI, ['cli', 'phpdbg']) ? new CliDumper : new HtmlDumper;
-
-            $dumper->dump((new VarCloner)->cloneVar($value));
-        } else {
-            var_dump($value);
-        }
-    }
-}
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Debug/HtmlDumper.php b/vendor/laravel/framework/src/Illuminate/Support/Debug/HtmlDumper.php
deleted file mode 100644
index 5825ac8d..00000000
--- a/vendor/laravel/framework/src/Illuminate/Support/Debug/HtmlDumper.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Illuminate\Support\Debug;
-
-use Symfony\Component\VarDumper\Dumper\HtmlDumper as SymfonyHtmlDumper;
-
-class HtmlDumper extends SymfonyHtmlDumper
-{
-    /**
-     * Colour definitions for output.
-     *
-     * @var array
-     */
-    protected $styles = [
-        'default' => 'background-color:#fff; color:#222; line-height:1.2em; font-weight:normal; font:12px Monaco, Consolas, monospace; word-wrap: break-word; white-space: pre-wrap; position:relative; z-index:100000',
-        'num' => 'color:#a71d5d',
-        'const' => 'color:#795da3',
-        'str' => 'color:#df5000',
-        'cchr' => 'color:#222',
-        'note' => 'color:#a71d5d',
-        'ref' => 'color:#a0a0a0',
-        'public' => 'color:#795da3',
-        'protected' => 'color:#795da3',
-        'private' => 'color:#795da3',
-        'meta' => 'color:#b729d9',
-        'key' => 'color:#df5000',
-        'index' => 'color:#a71d5d',
-    ];
-}
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Auth.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Auth.php
index 3f9d0d28..d794a0b6 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Auth.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Auth.php
@@ -18,6 +18,11 @@ namespace Illuminate\Support\Facades;
  * @method static bool onceUsingId(mixed $id)
  * @method static bool viaRemember()
  * @method static void logout()
+ * @method static \Symfony\Component\HttpFoundation\Response|null onceBasic(string $field = 'email',array $extraConditions = [])
+ * @method static null|bool logoutOtherDevices(string $password, string $attribute = 'password')
+ * @method static \Illuminate\Contracts\Auth\UserProvider|null createUserProvider(string $provider = null)
+ * @method static \Illuminate\Auth\AuthManager extend(string $driver, \Closure $callback)
+ * @method static \Illuminate\Auth\AuthManager provider(string $name, \Closure $callback)
  *
  * @see \Illuminate\Auth\AuthManager
  * @see \Illuminate\Contracts\Auth\Factory
@@ -39,10 +44,11 @@ class Auth extends Facade
     /**
      * Register the typical authentication routes for an application.
      *
+     * @param  array  $options
      * @return void
      */
-    public static function routes()
+    public static function routes(array $options = [])
     {
-        static::$app->make('router')->auth();
+        static::$app->make('router')->auth($options);
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Blade.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Blade.php
index b016a46c..241f6c6a 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Blade.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Blade.php
@@ -3,6 +3,23 @@
 namespace Illuminate\Support\Facades;
 
 /**
+ * @method static void compile($path = null)
+ * @method static string getPath()
+ * @method static void setPath($path)
+ * @method static string compileString($value)
+ * @method static string stripParentheses($expression)
+ * @method static void extend(callable $compiler)
+ * @method static array getExtensions()
+ * @method static void if($name, callable $callback)
+ * @method static bool check($name, ...$parameters)
+ * @method static void component($path, $alias = null)
+ * @method static void include($path, $alias = null)
+ * @method static void directive($name, callable $handler)
+ * @method static array getCustomDirectives()
+ * @method static void setEchoFormat($format)
+ * @method static void withDoubleEncoding()
+ * @method static void withoutDoubleEncoding()
+ *
  * @see \Illuminate\View\Compilers\BladeCompiler
  */
 class Blade extends Facade
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Broadcast.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Broadcast.php
index 81af9321..304aba9f 100644
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Broadcast.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Broadcast.php
@@ -5,6 +5,10 @@ namespace Illuminate\Support\Facades;
 use Illuminate\Contracts\Broadcasting\Factory as BroadcastingFactoryContract;
 
 /**
+ * @method static void connection($name = null);
+ * @method static \Illuminate\Broadcasting\Broadcasters\Broadcaster channel(string $channel, callable|string  $callback)
+ * @method static mixed auth(\Illuminate\Http\Request $request)
+ *
  * @see \Illuminate\Contracts\Broadcasting\Factory
  */
 class Broadcast extends Facade
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Bus.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Bus.php
index eeebac4f..9bbd4901 100644
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Bus.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Bus.php
@@ -6,6 +6,13 @@ use Illuminate\Support\Testing\Fakes\BusFake;
 use Illuminate\Contracts\Bus\Dispatcher as BusDispatcherContract;
 
 /**
+ * @method static mixed dispatch($command)
+ * @method static mixed dispatchNow($command, $handler = null)
+ * @method static bool hasCommandHandler($command)
+ * @method static bool|mixed getCommandHandler($command)
+ * @method static \Illuminate\Contracts\Bus\Dispatcher pipeThrough(array $pipes)
+ * @method static \Illuminate\Contracts\Bus\Dispatcher map(array $map)
+ *
  * @see \Illuminate\Contracts\Bus\Dispatcher
  */
 class Bus extends Facade
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Cache.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Cache.php
index 2e32301f..6be6f13d 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Cache.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Cache.php
@@ -3,6 +3,21 @@
 namespace Illuminate\Support\Facades;
 
 /**
+ * @method static \Illuminate\Contracts\Cache\Repository  store(string|null $name = null)
+ * @method static bool has(string $key)
+ * @method static mixed get(string $key, mixed $default = null)
+ * @method static mixed pull(string $key, mixed $default = null)
+ * @method static void put(string $key, $value, \DateTimeInterface|\DateInterval|float|int $minutes)
+ * @method static bool add(string $key, $value, \DateTimeInterface|\DateInterval|float|int $minutes)
+ * @method static int|bool increment(string $key, $value = 1)
+ * @method static int|bool decrement(string $key, $value = 1)
+ * @method static void forever(string $key, $value)
+ * @method static mixed remember(string $key, \DateTimeInterface|\DateInterval|float|int $minutes, \Closure $callback)
+ * @method static mixed sear(string $key, \Closure $callback)
+ * @method static mixed rememberForever(string $key, \Closure $callback)
+ * @method static bool forget(string $key)
+ * @method static \Illuminate\Contracts\Cache\Store getStore()
+ *
  * @see \Illuminate\Cache\CacheManager
  * @see \Illuminate\Cache\Repository
  */
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Config.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Config.php
index 3eb4fdf3..e1fa74ab 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Config.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Config.php
@@ -3,6 +3,13 @@
 namespace Illuminate\Support\Facades;
 
 /**
+ * @method static bool has($key)
+ * @method static mixed get($key, $default = null)
+ * @method static array all()
+ * @method static void set($key, $value = null)
+ * @method static void prepend($key, $value)
+ * @method static void push($key, $value)
+ *
  * @see \Illuminate\Config\Repository
  */
 class Config extends Facade
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Cookie.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Cookie.php
index bbcd5a30..c9f89b35 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Cookie.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Cookie.php
@@ -3,6 +3,10 @@
 namespace Illuminate\Support\Facades;
 
 /**
+ * @method static void queue(...$parameters)
+ * @method static unqueue($name)
+ * @method static array getQueuedCookies()
+ *
  * @see \Illuminate\Cookie\CookieJar
  */
 class Cookie extends Facade
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Crypt.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Crypt.php
index 0eef08d1..84317c37 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Crypt.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Crypt.php
@@ -3,6 +3,9 @@
 namespace Illuminate\Support\Facades;
 
 /**
+ * @method static string encrypt(string $value, bool $serialize = true)
+ * @method static string decrypt(string $payload, bool $unserialize = true)
+ *
  * @see \Illuminate\Encryption\Encrypter
  */
 class Crypt extends Facade
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/DB.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/DB.php
index 0369128e..93df8236 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/DB.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/DB.php
@@ -3,6 +3,27 @@
 namespace Illuminate\Support\Facades;
 
 /**
+ * @method static \Illuminate\Database\ConnectionInterface connection(string $name = null)
+ * @method static string getDefaultConnection()
+ * @method static void setDefaultConnection(string $name)
+ * @method static \Illuminate\Database\Query\Builder table(string $table)
+ * @method static \Illuminate\Database\Query\Expression raw($value)
+ * @method static mixed selectOne(string $query, array $bindings = [])
+ * @method static array select(string $query, array $bindings = [])
+ * @method static bool insert(string $query, array $bindings = [])
+ * @method static int update(string $query, array $bindings = [])
+ * @method static int delete(string $query, array $bindings = [])
+ * @method static bool statement(string $query, array $bindings = [])
+ * @method static int affectingStatement(string $query, array $bindings = [])
+ * @method static bool unprepared(string $query)
+ * @method static array prepareBindings(array $bindings)
+ * @method static mixed transaction(\Closure $callback, int $attempts = 1)
+ * @method static void beginTransaction()
+ * @method static void commit()
+ * @method static void rollBack()
+ * @method static int transactionLevel()
+ * @method static array pretend(\Closure $callback)
+ *
  * @see \Illuminate\Database\DatabaseManager
  * @see \Illuminate\Database\Connection
  */
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Event.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Event.php
index 11757f02..aefc49bb 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Event.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Event.php
@@ -6,6 +6,16 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Testing\Fakes\EventFake;
 
 /**
+ * @method static void listen(string|array $events, $listener)
+ * @method static bool hasListeners(string $eventName)
+ * @method static void subscribe(object|string $subscriber)
+ * @method static array|null until(string|object $event, $payload = [])
+ * @method static array|null dispatch(string|object $event, $payload = [], bool $halt = false)
+ * @method static void push(string $event, array $payload = [])
+ * @method static void flush(string $event)
+ * @method static void forget(string $event)
+ * @method static void forgetPushed()
+ *
  * @see \Illuminate\Events\Dispatcher
  */
 class Event extends Facade
@@ -23,6 +33,26 @@ class Event extends Facade
         Model::setEventDispatcher($fake);
     }
 
+    /**
+     * Replace the bound instance with a fake during the given callable's execution.
+     *
+     * @param  callable  $callable
+     * @param  array  $eventsToFake
+     * @return callable
+     */
+    public static function fakeFor(callable $callable, array $eventsToFake = [])
+    {
+        $originalDispatcher = static::getFacadeRoot();
+
+        static::fake($eventsToFake);
+
+        return tap($callable(), function () use ($originalDispatcher) {
+            static::swap($originalDispatcher);
+
+            Model::setEventDispatcher($originalDispatcher);
+        });
+    }
+
     /**
      * Get the registered name of the component.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Facade.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Facade.php
index c53180cc..579bd7a0 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Facade.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Facade.php
@@ -25,14 +25,16 @@ abstract class Facade
     /**
      * Convert the facade into a Mockery spy.
      *
-     * @return void
+     * @return \Mockery\MockInterface
      */
     public static function spy()
     {
         if (! static::isMock()) {
             $class = static::getMockableClass();
 
-            static::swap($class ? Mockery::spy($class) : Mockery::spy());
+            return tap($class ? Mockery::spy($class) : Mockery::spy(), function ($spy) {
+                static::swap($spy);
+            });
         }
     }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/File.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/File.php
index 0f81bf62..ff0290d5 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/File.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/File.php
@@ -3,6 +3,42 @@
 namespace Illuminate\Support\Facades;
 
 /**
+ * @method static bool exists(string $path)
+ * @method static string get(string $path, bool $lock = false)
+ * @method static string sharedGet(string $path)
+ * @method static mixed getRequire(string $path)
+ * @method static mixed requireOnce(string $file)
+ * @method static string hash(string $path)
+ * @method static int put(string $path, string $contents, bool $lock = false)
+ * @method static int prepend(string $path, string $data)
+ * @method static int append(string $path, string $data)
+ * @method static mixed chmod(string $path, int $mode = null)
+ * @method static bool delete(string|array $paths)
+ * @method static bool move(string $path, string $target)
+ * @method static bool copy(string $path, string $target)
+ * @method static void link(string $target, string $link)
+ * @method static string name(string $path)
+ * @method static string basename(string $path)
+ * @method static string dirname(string $path)
+ * @method static string extension(string $path)
+ * @method static string type(string $path)
+ * @method static string|false mimeType(string $path)
+ * @method static int size(string $path)
+ * @method static int lastModified(string $path)
+ * @method static bool isDirectory(string $directory)
+ * @method static bool isReadable(string $path)
+ * @method static bool isWritable(string $path)
+ * @method static bool isFile(string $file)
+ * @method static array glob(string $pattern, int $flags = 0)
+ * @method static \Symfony\Component\Finder\SplFileInfo[] files(string $directory, bool $hidden = false)
+ * @method static \Symfony\Component\Finder\SplFileInfo[] allFiles(string $directory, bool $hidden = false)
+ * @method static array directories(string $directory)
+ * @method static bool makeDirectory(string $path, int $mode = 0755,  bool $recursive = false, bool $force = false)
+ * @method static bool moveDirectory(string $from, string $to, bool $overwrite = false)
+ * @method static bool copyDirectory(string $directory, string $destination, int $options = null)
+ * @method static bool deleteDirectory(string $directory, bool $preserve = false)
+ * @method static bool cleanDirectory(string $directory)
+ *
  * @see \Illuminate\Filesystem\Filesystem
  */
 class File extends Facade
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Gate.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Gate.php
index 62977c63..01a8519f 100644
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Gate.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Gate.php
@@ -5,6 +5,20 @@ namespace Illuminate\Support\Facades;
 use Illuminate\Contracts\Auth\Access\Gate as GateContract;
 
 /**
+ * @method static bool has(string $ability)
+ * @method static \Illuminate\Contracts\Auth\Access\Gate define(string $ability, callable|string $callback)
+ * @method static \Illuminate\Contracts\Auth\Access\Gate policy(string $class, string $policy)
+ * @method static \Illuminate\Contracts\Auth\Access\Gate before(callable $callback)
+ * @method static \Illuminate\Contracts\Auth\Access\Gate after(callable $callback)
+ * @method static bool allows(string $ability, array|mixed $arguments = [])
+ * @method static bool denies(string $ability, array|mixed $arguments = [])
+ * @method static bool check(iterable|string $abilities, array|mixed $arguments = [])
+ * @method static bool any(iterable|string $abilities, array|mixed $arguments = [])
+ * @method static \Illuminate\Auth\Access\Response authorize(string $ability, array|mixed $arguments = [])
+ * @method static mixed getPolicyFor(object|string $class)
+ * @method static \Illuminate\Contracts\Auth\Access\Gate forUser(\Illuminate\Contracts\Auth\Authenticatable|mixed $user)
+ * @method static array abilities()
+ *
  * @see \Illuminate\Contracts\Auth\Access\Gate
  */
 class Gate extends Facade
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Hash.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Hash.php
index 84864254..70cf07c4 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Hash.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Hash.php
@@ -3,7 +3,12 @@
 namespace Illuminate\Support\Facades;
 
 /**
- * @see \Illuminate\Hashing\BcryptHasher
+ * @method static array info(string $hashedValue)
+ * @method static string make(string $value, array $options = [])
+ * @method static bool check(string $value, string $hashedValue, array $options = [])
+ * @method static bool needsRehash(string $hashedValue, array $options = [])
+ *
+ * @see \Illuminate\Hashing\HashManager
  */
 class Hash extends Facade
 {
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Input.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Input.php
index 35f52d56..7402b544 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Input.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Input.php
@@ -3,6 +3,45 @@
 namespace Illuminate\Support\Facades;
 
 /**
+ * @method static \Illuminate\Http\Request instance()
+ * @method static string method()
+ * @method static string root()
+ * @method static string url()
+ * @method static string fullUrl()
+ * @method static string fullUrlWithQuery(array $query)
+ * @method static string path()
+ * @method static string decodedPath()
+ * @method static string|null segment(int $index, string|null $default = null)
+ * @method static array segments()
+ * @method static bool is(...$patterns)
+ * @method static bool routeIs(...$patterns)
+ * @method static bool fullUrlIs(...$patterns)
+ * @method static bool ajax()
+ * @method static bool pjax()
+ * @method static bool secure()
+ * @method static string ip()
+ * @method static array ips()
+ * @method static string userAgent()
+ * @method static \Illuminate\Http\Request merge(array $input)
+ * @method static \Illuminate\Http\Request replace(array $input)
+ * @method static \Symfony\Component\HttpFoundation\ParameterBag|mixed json(string $key = null, $default = null)
+ * @method static \Illuminate\Session\Store session()
+ * @method static \Illuminate\Session\Store|null getSession()
+ * @method static void setLaravelSession(\Illuminate\Contracts\Session\Session $session)
+ * @method static mixed user(string|null $guard = null)
+ * @method static \Illuminate\Routing\Route|object|string route(string|null $param = null)
+ * @method static string fingerprint()
+ * @method static \Illuminate\Http\Request setJson(\Symfony\Component\HttpFoundation\ParameterBag $json)
+ * @method static \Closure getUserResolver()
+ * @method static \Illuminate\Http\Request setUserResolver(\Closure $callback)
+ * @method static \Closure getRouteResolver()
+ * @method static \Illuminate\Http\Request setRouteResolver(\Closure $callback)
+ * @method static array toArray()
+ * @method static bool offsetExists(string $offset)
+ * @method static mixed offsetGet(string $offset)
+ * @method static void offsetSet(string $offset, $value)
+ * @method static void offsetUnset(string $offset)
+ *
  * @see \Illuminate\Http\Request
  */
 class Input extends Facade
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Lang.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Lang.php
index e5862b99..5d533052 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Lang.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Lang.php
@@ -3,6 +3,12 @@
 namespace Illuminate\Support\Facades;
 
 /**
+ * @method static mixed trans(string $key, array $replace = [], string $locale = null)
+ * @method static string transChoice(string $key, int|array|\Countable $number, array $replace = [], string $locale = null)
+ * @method static string getLocale()
+ * @method static void setLocale(string $locale)
+ * @method static string|array|null get(string $key, array $replace = [], string $locale = null, bool $fallback = true)
+ *
  * @see \Illuminate\Translation\Translator
  */
 class Lang extends Facade
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Log.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Log.php
index b10e0647..cf25934d 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Log.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Log.php
@@ -2,10 +2,20 @@
 
 namespace Illuminate\Support\Facades;
 
-use Psr\Log\LoggerInterface;
-
 /**
- * @see \Illuminate\Log\Writer
+ * @method static void emergency(string $message, array $context = [])
+ * @method static void alert(string $message, array $context = [])
+ * @method static void critical(string $message, array $context = [])
+ * @method static void error(string $message, array $context = [])
+ * @method static void warning(string $message, array $context = [])
+ * @method static void notice(string $message, array $context = [])
+ * @method static void info(string $message, array $context = [])
+ * @method static void debug(string $message, array $context = [])
+ * @method static void log($level, string $message, array $context = [])
+ * @method static mixed channel(string $channel = null)
+ * @method static \Psr\Log\LoggerInterface stack(array $channels, string $channel = null)
+ *
+ * @see \Illuminate\Log\Logger
  */
 class Log extends Facade
 {
@@ -16,6 +26,6 @@ class Log extends Facade
      */
     protected static function getFacadeAccessor()
     {
-        return LoggerInterface::class;
+        return 'log';
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Mail.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Mail.php
index f5140c47..bee470c7 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Mail.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Mail.php
@@ -5,7 +5,26 @@ namespace Illuminate\Support\Facades;
 use Illuminate\Support\Testing\Fakes\MailFake;
 
 /**
+ * @method static \Illuminate\Mail\PendingMail to($users)
+ * @method static \Illuminate\Mail\PendingMail bcc($users)
+ * @method static void raw(string $text, $callback)
+ * @method static void send(string|array|\Illuminate\Contracts\Mail\Mailable $view, array $data = [], \Closure|string $callback = null)
+ * @method static array failures()
+ * @method static mixed queue(string|array|\Illuminate\Contracts\Mail\Mailable $view, string $queue = null)
+ * @method static mixed later(\DateTimeInterface|\DateInterval|int $delay, string|array|\Illuminate\Contracts\Mail\Mailable $view, string $queue = null)
+ * @method static void assertSent(string $mailable, \Closure|string $callback = null)
+ * @method static void assertNotSent(string $mailable, \Closure|string $callback = null)
+ * @method static void assertNothingSent()
+ * @method static void assertQueued(string $mailable, \Closure|string $callback = null)
+ * @method static void assertNotQueued(string $mailable, \Closure|string $callback = null)
+ * @method static void assertNothingQueued()
+ * @method static \Illuminate\Support\Collection sent(string $mailable, \Closure|string $callback = null)
+ * @method static bool hasSent(string $mailable)
+ * @method static \Illuminate\Support\Collection queued(string $mailable, \Closure|string $callback = null)
+ * @method static bool hasQueued(string $mailable)
+ *
  * @see \Illuminate\Mail\Mailer
+ * @see \Illuminate\Support\Testing\Fakes\MailFake
  */
 class Mail extends Facade
 {
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Notification.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Notification.php
index 37fb6c93..425520d8 100644
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Notification.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Notification.php
@@ -7,6 +7,11 @@ use Illuminate\Notifications\AnonymousNotifiable;
 use Illuminate\Support\Testing\Fakes\NotificationFake;
 
 /**
+ * @method static void send(\Illuminate\Support\Collection|array|mixed $notifiables, $notification)
+ * @method static void sendNow(\Illuminate\Support\Collection|array|mixed $notifiables, $notification)
+ * @method static mixed channel(string|null $name = null)
+ * @method static \Illuminate\Notifications\ChannelManager locale(string|null $locale)
+ *
  * @see \Illuminate\Notifications\ChannelManager
  */
 class Notification extends Facade
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Password.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Password.php
index 6ebea841..c291b97f 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Password.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Password.php
@@ -3,6 +3,11 @@
 namespace Illuminate\Support\Facades;
 
 /**
+ * @method static string sendResetLink(array $credentials)
+ * @method static mixed reset(array $credentials, \Closure $callback)
+ * @method static void validator(\Closure $callback)
+ * @method static bool validateNewPassword(array $credentials)
+ *
  * @see \Illuminate\Auth\Passwords\PasswordBroker
  */
 class Password extends Facade
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Queue.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Queue.php
index 647312f2..1f57ba0f 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Queue.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Queue.php
@@ -5,6 +5,17 @@ namespace Illuminate\Support\Facades;
 use Illuminate\Support\Testing\Fakes\QueueFake;
 
 /**
+ * @method static int size(string $queue = null)
+ * @method static mixed push(string|object $job, string $data = '', $queue = null)
+ * @method static mixed pushOn(string $queue, string|object $job, $data = '')
+ * @method static mixed pushRaw(string $payload, string $queue = null, array $options = [])
+ * @method static mixed later(\DateTimeInterface|\DateInterval|int $delay, string|object $job, $data = '', string $queue = null)
+ * @method static mixed laterOn(string $queue, \DateTimeInterface|\DateInterval|int $delay, string|object $job, $data = '')
+ * @method static mixed bulk(array $jobs, $data = '', string $queue = null)
+ * @method static \Illuminate\Contracts\Queue\Job|null pop(string $queue = null)
+ * @method static string getConnectionName()
+ * @method static \Illuminate\Contracts\Queue\Queue setConnectionName(string $name)
+ *
  * @see \Illuminate\Queue\QueueManager
  * @see \Illuminate\Queue\Queue
  */
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Redirect.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Redirect.php
index 647a7c31..0138bd9b 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Redirect.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Redirect.php
@@ -3,6 +3,19 @@
 namespace Illuminate\Support\Facades;
 
 /**
+ * @method static \Illuminate\Http\RedirectResponse home(int $status = 302)
+ * @method static \Illuminate\Http\RedirectResponse back(int $status = 302, array $headers = [], $fallback = false)
+ * @method static \Illuminate\Http\RedirectResponse refresh(int $status = 302, array $headers = [])
+ * @method static \Illuminate\Http\RedirectResponse guest(string $path, int $status = 302, array $headers = [], bool $secure = null)
+ * @method static intended(string $default = '/', int $status = 302, array $headers = [], bool $secure = null)
+ * @method static \Illuminate\Http\RedirectResponse to(string $path, int $status = 302, array $headers = [], bool $secure = null)
+ * @method static \Illuminate\Http\RedirectResponse away(string $path, int $status = 302, array $headers = [])
+ * @method static \Illuminate\Http\RedirectResponse secure(string $path, int $status = 302, array $headers = [])
+ * @method static \Illuminate\Http\RedirectResponse route(string $route, array $parameters = [], int $status = 302, array $headers = [])
+ * @method static \Illuminate\Http\RedirectResponse action(string $action, array $parameters = [], int $status = 302, array $headers = [])
+ * @method static \Illuminate\Routing\UrlGenerator getUrlGenerator()
+ * @method static void setSession(\Illuminate\Session\Store $session)
+ *
  * @see \Illuminate\Routing\Redirector
  */
 class Redirect extends Facade
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Redis.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Redis.php
index a7491ba5..f0fc8e1b 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Redis.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Redis.php
@@ -3,6 +3,8 @@
 namespace Illuminate\Support\Facades;
 
 /**
+ * @method static \Illuminate\Redis\Connections\Connection connection(string $name = null)
+ *
  * @see \Illuminate\Redis\RedisManager
  * @see \Illuminate\Contracts\Redis\Factory
  */
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Request.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Request.php
index 5cb12f4e..95e482e1 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Request.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Request.php
@@ -3,6 +3,45 @@
 namespace Illuminate\Support\Facades;
 
 /**
+ * @method static \Illuminate\Http\Request instance()
+ * @method static string method()
+ * @method static string root()
+ * @method static string url()
+ * @method static string fullUrl()
+ * @method static string fullUrlWithQuery(array $query)
+ * @method static string path()
+ * @method static string decodedPath()
+ * @method static string|null segment(int $index, string|null $default = null)
+ * @method static array segments()
+ * @method static bool is(...$patterns)
+ * @method static bool routeIs(...$patterns)
+ * @method static bool fullUrlIs(...$patterns)
+ * @method static bool ajax()
+ * @method static bool pjax()
+ * @method static bool secure()
+ * @method static string ip()
+ * @method static array ips()
+ * @method static string userAgent()
+ * @method static \Illuminate\Http\Request merge(array $input)
+ * @method static \Illuminate\Http\Request replace(array $input)
+ * @method static \Symfony\Component\HttpFoundation\ParameterBag|mixed json(string $key = null, $default = null)
+ * @method static \Illuminate\Session\Store session()
+ * @method static \Illuminate\Session\Store|null getSession()
+ * @method static void setLaravelSession(\Illuminate\Contracts\Session\Session $session)
+ * @method static mixed user(string|null $guard = null)
+ * @method static \Illuminate\Routing\Route|object|string route(string|null $param = null)
+ * @method static string fingerprint()
+ * @method static \Illuminate\Http\Request setJson(\Symfony\Component\HttpFoundation\ParameterBag $json)
+ * @method static \Closure getUserResolver()
+ * @method static \Illuminate\Http\Request setUserResolver(\Closure $callback)
+ * @method static \Closure getRouteResolver()
+ * @method static \Illuminate\Http\Request setRouteResolver(\Closure $callback)
+ * @method static array toArray()
+ * @method static bool offsetExists(string $offset)
+ * @method static mixed offsetGet(string $offset)
+ * @method static void offsetSet(string $offset, $value)
+ * @method static void offsetUnset(string $offset)
+ *
  * @see \Illuminate\Http\Request
  */
 class Request extends Facade
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Response.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Response.php
index 2bbf02b0..11161c27 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Response.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Response.php
@@ -5,6 +5,19 @@ namespace Illuminate\Support\Facades;
 use Illuminate\Contracts\Routing\ResponseFactory as ResponseFactoryContract;
 
 /**
+ * @method static \Illuminate\Http\Response make(string $content = '', int $status = 200, array $headers = [])
+ * @method static \Illuminate\Http\Response view(string $view, array $data = [], int $status = 200, array $headers = [])
+ * @method static \Illuminate\Http\JsonResponse json(string|array $data = [], int $status = 200, array $headers = [], int $options = 0)
+ * @method static \Illuminate\Http\JsonResponse jsonp(string $callback, string|array $data = [], int $status = 200, array $headers = [], int $options = 0)
+ * @method static \Symfony\Component\HttpFoundation\StreamedResponse stream(\Closure $callback, int $status = 200, array $headers = [])
+ * @method static \Symfony\Component\HttpFoundation\StreamedResponse streamDownload(\Closure $callback, string|null $name = null, array $headers = [], string|null $disposition = 'attachment')
+ * @method static \Symfony\Component\HttpFoundation\BinaryFileResponse download(\SplFileInfo|string $file, string|null $name = null, array $headers = [], string|null $disposition = 'attachment')
+ * @method static \Illuminate\Http\RedirectResponse redirectTo(string $path, int $status = 302, array $headers = [], bool|null $secure = null)
+ * @method static \Illuminate\Http\RedirectResponse redirectToRoute(string $route, array $parameters = [], int $status = 302, array $headers = [])
+ * @method static \Illuminate\Http\RedirectResponse redirectToAction(string $action, array $parameters = [], int $status = 302, array $headers = [])
+ * @method static \Illuminate\Http\RedirectResponse redirectGuest(string $path, int $status = 302, array $headers = [], bool|null $secure = null)
+ * @method static \Illuminate\Http\RedirectResponse redirectToIntended(string $default = '/', int $status = 302, array $headers = [], bool|null $secure = null)
+ *
  * @see \Illuminate\Contracts\Routing\ResponseFactory
  */
 class Response extends Facade
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Route.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Route.php
index 4fa80413..ed23f024 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Route.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Route.php
@@ -3,28 +3,34 @@
 namespace Illuminate\Support\Facades;
 
 /**
- * @method static \Illuminate\Support\Facades\Route get(string $uri, \Closure|array|string|null $action = null)
- * @method static \Illuminate\Support\Facades\Route post(string $uri, \Closure|array|string|null $action = null)
- * @method static \Illuminate\Support\Facades\Route put(string $uri, \Closure|array|string|null $action = null)
- * @method static \Illuminate\Support\Facades\Route delete(string $uri, \Closure|array|string|null $action = null)
- * @method static \Illuminate\Support\Facades\Route patch(string $uri, \Closure|array|string|null $action = null)
- * @method static \Illuminate\Support\Facades\Route options(string $uri, \Closure|array|string|null $action = null)
- * @method static \Illuminate\Support\Facades\Route any(string $uri, \Closure|array|string|null $action = null)
- * @method static \Illuminate\Support\Facades\Route match(array|string $methods, string $uri, \Closure|array|string|null $action = null)
- * @method static \Illuminate\Support\Facades\Route prefix(string  $prefix)
+ * @method static \Illuminate\Routing\Route get(string $uri, \Closure|array|string|null $action = null)
+ * @method static \Illuminate\Routing\Route post(string $uri, \Closure|array|string|null $action = null)
+ * @method static \Illuminate\Routing\Route put(string $uri, \Closure|array|string|null $action = null)
+ * @method static \Illuminate\Routing\Route delete(string $uri, \Closure|array|string|null $action = null)
+ * @method static \Illuminate\Routing\Route patch(string $uri, \Closure|array|string|null $action = null)
+ * @method static \Illuminate\Routing\Route options(string $uri, \Closure|array|string|null $action = null)
+ * @method static \Illuminate\Routing\Route any(string $uri, \Closure|array|string|null $action = null)
+ * @method static \Illuminate\Routing\Route match(array|string $methods, string $uri, \Closure|array|string|null $action = null)
+ * @method static \Illuminate\Routing\RouteRegistrar prefix(string  $prefix)
+ * @method static \Illuminate\Routing\RouteRegistrar where(array  $where)
  * @method static \Illuminate\Routing\PendingResourceRegistration resource(string $name, string $controller, array $options = [])
  * @method static \Illuminate\Routing\PendingResourceRegistration apiResource(string $name, string $controller, array $options = [])
- * @method static \Illuminate\Support\Facades\Route middleware(array|string|null $middleware)
- * @method static \Illuminate\Support\Facades\Route substituteBindings(\Illuminate\Support\Facades\Route $route)
+ * @method static void apiResources(array $resources)
+ * @method static \Illuminate\Routing\RouteRegistrar middleware(array|string|null $middleware)
+ * @method static \Illuminate\Routing\Route substituteBindings(\Illuminate\Support\Facades\Route $route)
  * @method static void substituteImplicitBindings(\Illuminate\Support\Facades\Route $route)
- * @method static \Illuminate\Support\Facades\Route as(string $value)
- * @method static \Illuminate\Support\Facades\Route domain(string $value)
- * @method static \Illuminate\Support\Facades\Route name(string $value)
- * @method static \Illuminate\Support\Facades\Route namespace(string $value)
- * @method static \Illuminate\Support\Facades\Route where(array|string $name, string $expression = null)
- * @method static \Illuminate\Routing\Router group(\Closure|string|array $value)
- * @method static \Illuminate\Support\Facades\Route redirect(string $uri, string $destination, int $status = 301)
- * @method static \Illuminate\Support\Facades\Route view(string $uri, string $view, array $data = [])
+ * @method static \Illuminate\Routing\RouteRegistrar as(string $value)
+ * @method static \Illuminate\Routing\RouteRegistrar domain(string $value)
+ * @method static \Illuminate\Routing\RouteRegistrar name(string $value)
+ * @method static \Illuminate\Routing\RouteRegistrar namespace(string $value)
+ * @method static \Illuminate\Routing\Router|\Illuminate\Routing\RouteRegistrar group(array|\Closure|string $attributes, \Closure|string $routes)
+ * @method static \Illuminate\Routing\Route redirect(string $uri, string $destination, int $status = 302)
+ * @method static \Illuminate\Routing\Route permanentRedirect(string $uri, string $destination)
+ * @method static \Illuminate\Routing\Route view(string $uri, string $view, array $data = [])
+ * @method static void bind(string $key, string|callable $binder)
+ * @method static \Illuminate\Routing\Route current()
+ * @method static string|null currentRouteName()
+ * @method static string|null currentRouteAction()
  *
  * @see \Illuminate\Routing\Router
  */
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Schema.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Schema.php
index 0cf1ee94..31748e15 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Schema.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Schema.php
@@ -7,6 +7,7 @@ namespace Illuminate\Support\Facades;
  * @method static \Illuminate\Database\Schema\Builder drop(string $table)
  * @method static \Illuminate\Database\Schema\Builder dropIfExists(string $table)
  * @method static \Illuminate\Database\Schema\Builder table(string $table, \Closure $callback)
+ * @method static void defaultStringLength(int $length)
  *
  * @see \Illuminate\Database\Schema\Builder
  */
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Session.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Session.php
index bc9b5fd9..3b0be943 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Session.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Session.php
@@ -3,6 +3,28 @@
 namespace Illuminate\Support\Facades;
 
 /**
+ * @method static string getName()
+ * @method static string getId()
+ * @method static void setId(string $id)
+ * @method static bool start()
+ * @method static bool save()
+ * @method static array all()
+ * @method static bool exists(string|array $key)
+ * @method static bool has(string|array $key)
+ * @method static mixed get(string $key, $default = null)
+ * @method static void put(string|array $key, $value = null)
+ * @method static string token()
+ * @method static mixed remove(string $key)
+ * @method static void forget(string|array $keys)
+ * @method static void flush()
+ * @method static bool migrate(bool $destroy = false)
+ * @method static bool isStarted()
+ * @method static string|null previousUrl()
+ * @method static void setPreviousUrl(string $url)
+ * @method static \SessionHandlerInterface getHandler()
+ * @method static bool handlerNeedsRequest()
+ * @method static void setRequestOnHandler(\Illuminate\Http\Request $request)
+ *
  * @see \Illuminate\Session\SessionManager
  * @see \Illuminate\Session\Store
  */
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Storage.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Storage.php
index 1ab840d9..5bcbfd65 100644
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Storage.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Storage.php
@@ -5,6 +5,8 @@ namespace Illuminate\Support\Facades;
 use Illuminate\Filesystem\Filesystem;
 
 /**
+ * @method static \Illuminate\Contracts\Filesystem\Filesystem disk(string $name = null)
+ *
  * @see \Illuminate\Filesystem\FilesystemManager
  */
 class Storage extends Facade
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/URL.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/URL.php
index e17414bc..e1d781fa 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/URL.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/URL.php
@@ -3,6 +3,20 @@
 namespace Illuminate\Support\Facades;
 
 /**
+ * @method static string current()
+ * @method static string full()
+ * @method static string previous($fallback = false)
+ * @method static string to(string $path, $extra = [], bool $secure = null)
+ * @method static string secure(string $path, array $parameters = [])
+ * @method static string asset(string $path, bool $secure = null)
+ * @method static string route(string $name, $parameters = [], bool $absolute = true)
+ * @method static string action(string $action, $parameters = [], bool $absolute = true)
+ * @method static \Illuminate\Contracts\Routing\UrlGenerator setRootControllerNamespace(string $rootNamespace)
+ * @method static string signedRoute(string $name, array $parameters = [], \DateTimeInterface|int $expiration = null)
+ * @method static string temporarySignedRoute(string $name, \DateTimeInterface|int $expiration, array $parameters = [])
+ * @method static string hasValidSignature(\Illuminate\Http\Request $request)
+ * @method static void defaults(array $defaults)
+ *
  * @see \Illuminate\Routing\UrlGenerator
  */
 class URL extends Facade
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/Validator.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/Validator.php
index e3e1ba4d..30f9f9b1 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/Validator.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/Validator.php
@@ -3,6 +3,11 @@
 namespace Illuminate\Support\Facades;
 
 /**
+ * @method static \Illuminate\Contracts\Validation\Validator make(array $data, array $rules, array $messages = [], array $customAttributes = [])
+ * @method static void extend(string $rule, \Closure|string $extension, string $message = null)
+ * @method static void extendImplicit(string $rule, \Closure|string $extension, string $message = null)
+ * @method static void replacer(string $rule, \Closure|string $replacer)
+ *
  * @see \Illuminate\Validation\Factory
  */
 class Validator extends Facade
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Facades/View.php b/vendor/laravel/framework/src/Illuminate/Support/Facades/View.php
index 9de57c32..e7b16c19 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Facades/View.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Facades/View.php
@@ -3,6 +3,15 @@
 namespace Illuminate\Support\Facades;
 
 /**
+ * @method static bool exists(string $view)
+ * @method static \Illuminate\Contracts\View\View file(string $path, array $data = [], array $mergeData = [])
+ * @method static \Illuminate\Contracts\View\View make(string $view, array $data = [], array $mergeData = [])
+ * @method static mixed share(array|string $key, $value = null)
+ * @method static array composer(array|string $views, \Closure|string $callback)
+ * @method static array creator(array|string $views, \Closure|string $callback)
+ * @method static \Illuminate\Contracts\View\Factory addNamespace(string $namespace, string|array $hints)
+ * @method static \Illuminate\Contracts\View\Factory replaceNamespace(string $namespace, string|array $hints)
+ *
  * @see \Illuminate\View\Factory
  */
 class View extends Facade
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Manager.php b/vendor/laravel/framework/src/Illuminate/Support/Manager.php
index 592776c2..5bff0f3f 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Manager.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Manager.php
@@ -51,11 +51,19 @@ abstract class Manager
      *
      * @param  string  $driver
      * @return mixed
+     *
+     * @throws \InvalidArgumentException
      */
     public function driver($driver = null)
     {
         $driver = $driver ?: $this->getDefaultDriver();
 
+        if (is_null($driver)) {
+            throw new InvalidArgumentException(sprintf(
+                'Unable to resolve NULL driver for [%s].', static::class
+            ));
+        }
+
         // If the given driver has not been created before, we will create the instances
         // here and cache it so we can return it next time very quickly. If there is
         // already a driver created by this name, we'll just return that instance.
diff --git a/vendor/laravel/framework/src/Illuminate/Support/MessageBag.php b/vendor/laravel/framework/src/Illuminate/Support/MessageBag.php
index da2c31e2..41672fe7 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/MessageBag.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/MessageBag.php
@@ -34,8 +34,9 @@ class MessageBag implements Arrayable, Countable, Jsonable, JsonSerializable, Me
     public function __construct(array $messages = [])
     {
         foreach ($messages as $key => $value) {
-            $this->messages[$key] = $value instanceof Arrayable
-                    ? $value->toArray() : (array) $value;
+            $value = $value instanceof Arrayable ? $value->toArray() : (array) $value;
+
+            $this->messages[$key] = array_unique($value);
         }
     }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Support/NamespacedItemResolver.php b/vendor/laravel/framework/src/Illuminate/Support/NamespacedItemResolver.php
index fea32753..cc389578 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/NamespacedItemResolver.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/NamespacedItemResolver.php
@@ -74,7 +74,7 @@ class NamespacedItemResolver
      */
     protected function parseNamespacedSegments($key)
     {
-        list($namespace, $item) = explode('::', $key);
+        [$namespace, $item] = explode('::', $key);
 
         // First we'll just explode the first segment to get the namespace and group
         // since the item should be in the remaining segments. Once we have these
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Optional.php b/vendor/laravel/framework/src/Illuminate/Support/Optional.php
index 8f35221a..5e0b7d9c 100644
--- a/vendor/laravel/framework/src/Illuminate/Support/Optional.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Optional.php
@@ -3,6 +3,7 @@
 namespace Illuminate\Support;
 
 use ArrayAccess;
+use ArrayObject;
 
 class Optional implements ArrayAccess
 {
@@ -37,26 +38,27 @@ class Optional implements ArrayAccess
     public function __get($key)
     {
         if (is_object($this->value)) {
-            return $this->value->{$key};
+            return $this->value->{$key} ?? null;
         }
     }
 
     /**
-     * Dynamically pass a method to the underlying object.
+     * Dynamically check a property exists on the underlying object.
      *
-     * @param  string  $method
-     * @param  array  $parameters
-     * @return mixed
+     * @param  mixed  $name
+     * @return bool
      */
-    public function __call($method, $parameters)
+    public function __isset($name)
     {
-        if (static::hasMacro($method)) {
-            return $this->macroCall($method, $parameters);
+        if (is_object($this->value)) {
+            return isset($this->value->{$name});
         }
 
-        if (is_object($this->value)) {
-            return $this->value->{$method}(...$parameters);
+        if (is_array($this->value) || $this->value instanceof ArrayObject) {
+            return isset($this->value[$name]);
         }
+
+        return false;
     }
 
     /**
@@ -107,4 +109,22 @@ class Optional implements ArrayAccess
             unset($this->value[$key]);
         }
     }
+
+    /**
+     * Dynamically pass a method to the underlying object.
+     *
+     * @param  string  $method
+     * @param  array  $parameters
+     * @return mixed
+     */
+    public function __call($method, $parameters)
+    {
+        if (static::hasMacro($method)) {
+            return $this->macroCall($method, $parameters);
+        }
+
+        if (is_object($this->value)) {
+            return $this->value->{$method}(...$parameters);
+        }
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Pluralizer.php b/vendor/laravel/framework/src/Illuminate/Support/Pluralizer.php
index 6cc55ad7..75a2f6ac 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/Pluralizer.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Pluralizer.php
@@ -64,7 +64,7 @@ class Pluralizer
      */
     public static function plural($value, $count = 2)
     {
-        if ((int) $count === 1 || static::uncountable($value)) {
+        if ((int) abs($count) === 1 || static::uncountable($value)) {
             return $value;
         }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Support/ServiceProvider.php b/vendor/laravel/framework/src/Illuminate/Support/ServiceProvider.php
index 8ea8038a..8a217871 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/ServiceProvider.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/ServiceProvider.php
@@ -9,7 +9,7 @@ abstract class ServiceProvider
     /**
      * The application instance.
      *
-     * @var \Illuminate\Contracts\Foundation\Application
+     * @var \Illuminate\Foundation\Application
      */
     protected $app;
 
@@ -37,7 +37,7 @@ abstract class ServiceProvider
     /**
      * Create a new service provider instance.
      *
-     * @param  \Illuminate\Contracts\Foundation\Application  $app
+     * @param  \Illuminate\Foundation\Application  $app
      * @return void
      */
     public function __construct($app)
@@ -75,7 +75,7 @@ abstract class ServiceProvider
     /**
      * Register a view file namespace.
      *
-     * @param  string  $path
+     * @param  string|array  $path
      * @param  string  $namespace
      * @return void
      */
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Str.php b/vendor/laravel/framework/src/Illuminate/Support/Str.php
index 6775f92d..1953cab5 100644
--- a/vendor/laravel/framework/src/Illuminate/Support/Str.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Str.php
@@ -2,7 +2,11 @@
 
 namespace Illuminate\Support;
 
+use Ramsey\Uuid\Uuid;
+use Ramsey\Uuid\UuidFactory;
 use Illuminate\Support\Traits\Macroable;
+use Ramsey\Uuid\Generator\CombGenerator;
+use Ramsey\Uuid\Codec\TimestampFirstCombCodec;
 
 class Str
 {
@@ -149,7 +153,7 @@ class Str
      */
     public static function is($pattern, $value)
     {
-        $patterns = is_array($pattern) ? $pattern : (array) $pattern;
+        $patterns = Arr::wrap($pattern);
 
         if (empty($patterns)) {
             return false;
@@ -517,6 +521,37 @@ class Str
         return static::upper(static::substr($string, 0, 1)).static::substr($string, 1);
     }
 
+    /**
+     * Generate a UUID (version 4).
+     *
+     * @return \Ramsey\Uuid\UuidInterface
+     */
+    public static function uuid()
+    {
+        return Uuid::uuid4();
+    }
+
+    /**
+     * Generate a time-ordered UUID (version 4).
+     *
+     * @return \Ramsey\Uuid\UuidInterface
+     */
+    public static function orderedUuid()
+    {
+        $factory = new UuidFactory;
+
+        $factory->setRandomGenerator(new CombGenerator(
+            $factory->getRandomGenerator(),
+            $factory->getNumberConverter()
+        ));
+
+        $factory->setCodec(new TimestampFirstCombCodec(
+            $factory->getUuidBuilder()
+        ));
+
+        return $factory->uuid4();
+    }
+
     /**
      * Returns the replacements for the ascii method.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/BusFake.php b/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/BusFake.php
index ae1209a3..b42491e4 100644
--- a/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/BusFake.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/BusFake.php
@@ -129,4 +129,37 @@ class BusFake implements Dispatcher
     {
         //
     }
+
+    /**
+     * Determine if the given command has a handler.
+     *
+     * @param  mixed  $command
+     * @return bool
+     */
+    public function hasCommandHandler($command)
+    {
+        return false;
+    }
+
+    /**
+     * Retrieve the handler for a command.
+     *
+     * @param  mixed  $command
+     * @return mixed
+     */
+    public function getCommandHandler($command)
+    {
+        return false;
+    }
+
+    /**
+     * Map a command to a handler.
+     *
+     * @param  array  $map
+     * @return $this
+     */
+    public function map(array $map)
+    {
+        return $this;
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/EventFake.php b/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/EventFake.php
index edbb90eb..57e47c89 100644
--- a/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/EventFake.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/EventFake.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Support\Testing\Fakes;
 
+use Closure;
 use Illuminate\Support\Arr;
 use PHPUnit\Framework\Assert as PHPUnit;
 use Illuminate\Contracts\Events\Dispatcher;
@@ -134,7 +135,7 @@ class EventFake implements Dispatcher
      */
     public function listen($events, $listener)
     {
-        //
+        $this->dispatcher->listen($events, $listener);
     }
 
     /**
@@ -145,7 +146,7 @@ class EventFake implements Dispatcher
      */
     public function hasListeners($eventName)
     {
-        //
+        return $this->dispatcher->hasListeners($eventName);
     }
 
     /**
@@ -168,7 +169,7 @@ class EventFake implements Dispatcher
      */
     public function subscribe($subscriber)
     {
-        //
+        $this->dispatcher->subscribe($subscriber);
     }
 
     /**
@@ -207,7 +208,7 @@ class EventFake implements Dispatcher
     {
         $name = is_object($event) ? get_class($event) : (string) $event;
 
-        if ($this->shouldFakeEvent($name)) {
+        if ($this->shouldFakeEvent($name, $payload)) {
             $this->events[$name][] = func_get_args();
         } else {
             $this->dispatcher->dispatch($event, $payload, $halt);
@@ -218,11 +219,22 @@ class EventFake implements Dispatcher
      * Determine if an event should be faked or actually dispatched.
      *
      * @param  string  $eventName
+     * @param  mixed  $payload
      * @return bool
      */
-    protected function shouldFakeEvent($eventName)
+    protected function shouldFakeEvent($eventName, $payload)
     {
-        return empty($this->eventsToFake) || in_array($eventName, $this->eventsToFake);
+        if (empty($this->eventsToFake)) {
+            return true;
+        }
+
+        return collect($this->eventsToFake)
+            ->filter(function ($event) use ($eventName, $payload) {
+                return $event instanceof Closure
+                            ? $event($eventName, $payload)
+                            : $event === $eventName;
+            })
+            ->isNotEmpty();
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/MailFake.php b/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/MailFake.php
index 0d11c086..b6f4b813 100644
--- a/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/MailFake.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/MailFake.php
@@ -4,10 +4,11 @@ namespace Illuminate\Support\Testing\Fakes;
 
 use Illuminate\Contracts\Mail\Mailer;
 use Illuminate\Contracts\Mail\Mailable;
+use Illuminate\Contracts\Mail\MailQueue;
 use PHPUnit\Framework\Assert as PHPUnit;
 use Illuminate\Contracts\Queue\ShouldQueue;
 
-class MailFake implements Mailer
+class MailFake implements Mailer, MailQueue
 {
     /**
      * All of the mailables that have been sent.
@@ -36,9 +37,15 @@ class MailFake implements Mailer
             return $this->assertSentTimes($mailable, $callback);
         }
 
+        $message = "The expected [{$mailable}] mailable was not sent.";
+
+        if (count($this->queuedMailables) > 0) {
+            $message .= ' Did you mean to use assertQueued() instead?';
+        }
+
         PHPUnit::assertTrue(
             $this->sent($mailable, $callback)->count() > 0,
-            "The expected [{$mailable}] mailable was not sent."
+            $message
         );
     }
 
@@ -282,7 +289,7 @@ class MailFake implements Mailer
         }
 
         if ($view instanceof ShouldQueue) {
-            return $this->queue($view, $data, $callback);
+            return $this->queue($view, $data);
         }
 
         $this->mailables[] = $view;
@@ -304,6 +311,19 @@ class MailFake implements Mailer
         $this->queuedMailables[] = $view;
     }
 
+    /**
+     * Queue a new e-mail message for sending after (n) seconds.
+     *
+     * @param  \DateTimeInterface|\DateInterval|int  $delay
+     * @param  string|array|\Illuminate\Contracts\Mail\Mailable  $view
+     * @param  string  $queue
+     * @return mixed
+     */
+    public function later($delay, $view, $queue = null)
+    {
+        $this->queue($view, $queue);
+    }
+
     /**
      * Get the array of failed recipients.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/NotificationFake.php b/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/NotificationFake.php
index b610932b..72b6ab9b 100644
--- a/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/NotificationFake.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/NotificationFake.php
@@ -2,7 +2,7 @@
 
 namespace Illuminate\Support\Testing\Fakes;
 
-use Ramsey\Uuid\Uuid;
+use Illuminate\Support\Str;
 use Illuminate\Support\Collection;
 use PHPUnit\Framework\Assert as PHPUnit;
 use Illuminate\Contracts\Notifications\Factory as NotificationFactory;
@@ -17,6 +17,13 @@ class NotificationFake implements NotificationFactory, NotificationDispatcher
      */
     protected $notifications = [];
 
+    /**
+     * Locale used when sending notifications.
+     *
+     * @var string|null
+     */
+    public $locale;
+
     /**
      * Assert if a notification was sent based on a truth-test callback.
      *
@@ -57,7 +64,7 @@ class NotificationFake implements NotificationFactory, NotificationDispatcher
     {
         PHPUnit::assertTrue(
             ($count = $this->sent($notifiable, $notification)->count()) === $times,
-            "The expected [{$notification}] notification was sent {$count} times instead of {$times} times."
+            "Expected [{$notification}] to be sent {$times} times, but was sent {$count} times."
         );
     }
 
@@ -95,6 +102,27 @@ class NotificationFake implements NotificationFactory, NotificationDispatcher
         PHPUnit::assertEmpty($this->notifications, 'Notifications were sent unexpectedly.');
     }
 
+    /**
+     * Assert the total amount of times a notification was sent.
+     *
+     * @param  int  $expectedCount
+     * @param  string  $notification
+     * @return void
+     */
+    public function assertTimesSent($expectedCount, $notification)
+    {
+        $actualCount = collect($this->notifications)
+            ->flatten(1)
+            ->reduce(function ($count, $sent) use ($notification) {
+                return $count + count($sent[$notification] ?? []);
+            }, 0);
+
+        PHPUnit::assertSame(
+            $expectedCount, $actualCount,
+            "Expected [{$notification}] to be sent {$expectedCount} times, but was sent {$actualCount} times."
+        );
+    }
+
     /**
      * Get all of the notifications matching a truth-test callback.
      *
@@ -175,13 +203,14 @@ class NotificationFake implements NotificationFactory, NotificationDispatcher
 
         foreach ($notifiables as $notifiable) {
             if (! $notification->id) {
-                $notification->id = Uuid::uuid4()->toString();
+                $notification->id = Str::uuid()->toString();
             }
 
             $this->notifications[get_class($notifiable)][$notifiable->getKey()][get_class($notification)][] = [
                 'notification' => $notification,
                 'channels' => $notification->via($notifiable),
                 'notifiable' => $notifiable,
+                'locale' => $notification->locale ?? $this->locale,
             ];
         }
     }
@@ -196,4 +225,17 @@ class NotificationFake implements NotificationFactory, NotificationDispatcher
     {
         //
     }
+
+    /**
+     * Set the locale of notifications.
+     *
+     * @param  string  $locale
+     * @return $this
+     */
+    public function locale($locale)
+    {
+        $this->locale = $locale;
+
+        return $this;
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/QueueFake.php b/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/QueueFake.php
index 66d191e9..960a776e 100644
--- a/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/QueueFake.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Testing/Fakes/QueueFake.php
@@ -68,6 +68,90 @@ class QueueFake extends QueueManager implements Queue
         });
     }
 
+    /**
+     * Assert if a job was pushed with chained jobs based on a truth-test callback.
+     *
+     * @param  string $job
+     * @param  array $expectedChain
+     * @param  callable|null $callback
+     * @return void
+     */
+    public function assertPushedWithChain($job, $expectedChain = [], $callback = null)
+    {
+        PHPUnit::assertTrue(
+            $this->pushed($job, $callback)->isNotEmpty(),
+            "The expected [{$job}] job was not pushed."
+        );
+
+        PHPUnit::assertTrue(
+            collect($expectedChain)->isNotEmpty(),
+            'The expected chain can not be empty.'
+        );
+
+        $this->isChainOfObjects($expectedChain)
+                ? $this->assertPushedWithChainOfObjects($job, $expectedChain, $callback)
+                : $this->assertPushedWithChainOfClasses($job, $expectedChain, $callback);
+    }
+
+    /**
+     * Assert if a job was pushed with chained jobs based on a truth-test callback.
+     *
+     * @param  string $job
+     * @param  array $expectedChain
+     * @param  callable|null $callback
+     * @return void
+     */
+    protected function assertPushedWithChainOfObjects($job, $expectedChain, $callback)
+    {
+        $chain = collect($expectedChain)->map(function ($job) {
+            return serialize($job);
+        })->all();
+
+        PHPUnit::assertTrue(
+            $this->pushed($job, $callback)->filter(function ($job) use ($chain) {
+                return $job->chained == $chain;
+            })->isNotEmpty(),
+            'The expected chain was not pushed.'
+        );
+    }
+
+    /**
+     * Assert if a job was pushed with chained jobs based on a truth-test callback.
+     *
+     * @param  string $job
+     * @param  array $expectedChain
+     * @param  callable|null $callback
+     * @return void
+     */
+    protected function assertPushedWithChainOfClasses($job, $expectedChain, $callback)
+    {
+        $matching = $this->pushed($job, $callback)->map->chained->map(function ($chain) {
+            return collect($chain)->map(function ($job) {
+                return get_class(unserialize($job));
+            });
+        })->filter(function ($chain) use ($expectedChain) {
+            return $chain->all() === $expectedChain;
+        });
+
+        PHPUnit::assertTrue(
+            $matching->isNotEmpty(), 'The expected chain was not pushed.'
+        );
+    }
+
+    /**
+     * Determine if the given chain is entirely composed of objects.
+     *
+     * @param  array  $chain
+     * @return bool
+     */
+    protected function isChainOfObjects($chain)
+    {
+        return collect($chain)->count() == collect($chain)
+                    ->filter(function ($job) {
+                        return is_object($job);
+                    })->count();
+    }
+
     /**
      * Determine if a job was pushed based on a truth-test callback.
      *
@@ -145,7 +229,7 @@ class QueueFake extends QueueManager implements Queue
      */
     public function size($queue = null)
     {
-        return 0;
+        return count($this->jobs);
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Traits/ForwardsCalls.php b/vendor/laravel/framework/src/Illuminate/Support/Traits/ForwardsCalls.php
new file mode 100644
index 00000000..3d0f122f
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Support/Traits/ForwardsCalls.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Illuminate\Support\Traits;
+
+use Error;
+use BadMethodCallException;
+
+trait ForwardsCalls
+{
+    /**
+     * Forward a method call to the given object.
+     *
+     * @param  mixed  $object
+     * @param  string  $method
+     * @param  array  $parameters
+     * @return mixed
+     *
+     * @throws \BadMethodCallException
+     */
+    protected function forwardCallTo($object, $method, $parameters)
+    {
+        try {
+            return $object->{$method}(...$parameters);
+        } catch (Error | BadMethodCallException $e) {
+            $pattern = '~^Call to undefined method (?P<class>[^:]+)::(?P<method>[^\(]+)\(\)$~';
+
+            if (! preg_match($pattern, $e->getMessage(), $matches)) {
+                throw $e;
+            }
+
+            if ($matches['class'] != get_class($object) ||
+                $matches['method'] != $method) {
+                throw $e;
+            }
+
+            static::throwBadMethodCallException($method);
+        }
+    }
+
+    /**
+     * Throw a bad method call exception for the given method.
+     *
+     * @param  string  $method
+     * @return void
+     *
+     * @throws \BadMethodCallException
+     */
+    protected static function throwBadMethodCallException($method)
+    {
+        throw new BadMethodCallException(sprintf(
+            'Call to undefined method %s::%s()', static::class, $method
+        ));
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Traits/Localizable.php b/vendor/laravel/framework/src/Illuminate/Support/Traits/Localizable.php
new file mode 100644
index 00000000..b03276d2
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Support/Traits/Localizable.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Illuminate\Support\Traits;
+
+use Illuminate\Container\Container;
+
+trait Localizable
+{
+    /**
+     * Run the callback with the given locale.
+     *
+     * @param  string   $locale
+     * @param  \Closure $callback
+     * @return mixed
+     */
+    public function withLocale($locale, $callback)
+    {
+        if (! $locale) {
+            return $callback();
+        }
+
+        $app = Container::getInstance();
+
+        $original = $app->getLocale();
+
+        try {
+            $app->setLocale($locale);
+
+            return $callback();
+        } finally {
+            $app->setLocale($original);
+        }
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Support/Traits/Macroable.php b/vendor/laravel/framework/src/Illuminate/Support/Traits/Macroable.php
index a7703b14..80793cf5 100644
--- a/vendor/laravel/framework/src/Illuminate/Support/Traits/Macroable.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/Traits/Macroable.php
@@ -34,6 +34,8 @@ trait Macroable
      *
      * @param  object  $mixin
      * @return void
+     *
+     * @throws \ReflectionException
      */
     public static function mixin($mixin)
     {
@@ -71,7 +73,9 @@ trait Macroable
     public static function __callStatic($method, $parameters)
     {
         if (! static::hasMacro($method)) {
-            throw new BadMethodCallException("Method {$method} does not exist.");
+            throw new BadMethodCallException(sprintf(
+                'Method %s::%s does not exist.', static::class, $method
+            ));
         }
 
         if (static::$macros[$method] instanceof Closure) {
@@ -93,7 +97,9 @@ trait Macroable
     public function __call($method, $parameters)
     {
         if (! static::hasMacro($method)) {
-            throw new BadMethodCallException("Method {$method} does not exist.");
+            throw new BadMethodCallException(sprintf(
+                'Method %s::%s does not exist.', static::class, $method
+            ));
         }
 
         $macro = static::$macros[$method];
diff --git a/vendor/laravel/framework/src/Illuminate/Support/composer.json b/vendor/laravel/framework/src/Illuminate/Support/composer.json
index 35f3ebd2..d1efbcd3 100644
--- a/vendor/laravel/framework/src/Illuminate/Support/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Support/composer.json
@@ -14,13 +14,13 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
+        "php": "^7.1.3",
         "ext-mbstring": "*",
-        "doctrine/inflector": "~1.1",
-        "illuminate/contracts": "5.5.*",
-        "nesbot/carbon": "^1.24.1"
+        "doctrine/inflector": "^1.1",
+        "illuminate/contracts": "5.7.*",
+        "nesbot/carbon": "^1.26.3"
     },
-    "replace": {
+    "conflict": {
         "tightenco/collect": "<5.5.33"
     },
     "autoload": {
@@ -33,13 +33,15 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "suggest": {
-        "illuminate/filesystem": "Required to use the composer class (5.5.*).",
-        "symfony/process": "Required to use the composer class (~3.3).",
-        "symfony/var-dumper": "Required to use the dd function (~3.3)."
+        "illuminate/filesystem": "Required to use the composer class (5.7.*).",
+        "moontoast/math": "Required to use ordered UUIDs (^1.1).",
+        "ramsey/uuid": "Required to use Str::uuid() (^3.7).",
+        "symfony/process": "Required to use the composer class (^4.1).",
+        "symfony/var-dumper": "Required to use the dd function (^4.1)."
     },
     "config": {
         "sort-packages": true
diff --git a/vendor/laravel/framework/src/Illuminate/Support/helpers.php b/vendor/laravel/framework/src/Illuminate/Support/helpers.php
index c52fd66f..05ea9da9 100755
--- a/vendor/laravel/framework/src/Illuminate/Support/helpers.php
+++ b/vendor/laravel/framework/src/Illuminate/Support/helpers.php
@@ -4,7 +4,6 @@ use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Support\Optional;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Debug\Dumper;
 use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Support\HigherOrderTapProxy;
 
@@ -390,7 +389,7 @@ if (! function_exists('class_basename')) {
 
 if (! function_exists('class_uses_recursive')) {
     /**
-     * Returns all traits used by a class, its subclasses and trait of their traits.
+     * Returns all traits used by a class, its parent classes and trait of their traits.
      *
      * @param  object|string  $class
      * @return array
@@ -403,7 +402,7 @@ if (! function_exists('class_uses_recursive')) {
 
         $results = [];
 
-        foreach (array_merge([$class => $class], class_parents($class)) as $class) {
+        foreach (array_reverse(class_parents($class)) + [$class => $class] as $class) {
             $results += trait_uses_recursive($class);
         }
 
@@ -464,7 +463,11 @@ if (! function_exists('data_get')) {
                     return value($default);
                 }
 
-                $result = Arr::pluck($target, $key);
+                $result = [];
+
+                foreach ($target as $item) {
+                    $result[] = data_get($item, $key);
+                }
 
                 return in_array('*', $key) ? Arr::collapse($result) : $result;
             }
@@ -544,25 +547,6 @@ if (! function_exists('data_set')) {
     }
 }
 
-if (! function_exists('dd')) {
-    /**
-     * Dump the passed variables and end the script.
-     *
-     * @param  mixed  $args
-     * @return void
-     */
-    function dd(...$args)
-    {
-        http_response_code(500);
-
-        foreach ($args as $x) {
-            (new Dumper)->dump($x);
-        }
-
-        die(1);
-    }
-}
-
 if (! function_exists('e')) {
     /**
      * Escape HTML special characters in a string.
@@ -571,7 +555,7 @@ if (! function_exists('e')) {
      * @param  bool  $doubleEncode
      * @return string
      */
-    function e($value, $doubleEncode = false)
+    function e($value, $doubleEncode = true)
     {
         if ($value instanceof Htmlable) {
             return $value->toHtml();
@@ -626,7 +610,7 @@ if (! function_exists('env')) {
                 return;
         }
 
-        if (strlen($value) > 1 && Str::startsWith($value, '"') && Str::endsWith($value, '"')) {
+        if (($valueLength = strlen($value)) > 1 && $value[0] === '"' && $value[$valueLength - 1] === '"') {
             return substr($value, 1, -1);
         }
 
@@ -718,11 +702,16 @@ if (! function_exists('optional')) {
      * Provide access to optional objects.
      *
      * @param  mixed  $value
+     * @param  callable|null  $callback
      * @return mixed
      */
-    function optional($value = null)
+    function optional($value = null, callable $callback = null)
     {
-        return new Optional($value);
+        if (is_null($callback)) {
+            return new Optional($value);
+        } elseif (! is_null($value)) {
+            return $callback($value);
+        }
     }
 }
 
@@ -1049,6 +1038,7 @@ if (! function_exists('throw_if')) {
      * @param  \Throwable|string  $exception
      * @param  array  ...$parameters
      * @return mixed
+     *
      * @throws \Throwable
      */
     function throw_if($condition, $exception, ...$parameters)
diff --git a/vendor/laravel/framework/src/Illuminate/Translation/FileLoader.php b/vendor/laravel/framework/src/Illuminate/Translation/FileLoader.php
index 5a29c749..66fb8a0f 100755
--- a/vendor/laravel/framework/src/Illuminate/Translation/FileLoader.php
+++ b/vendor/laravel/framework/src/Illuminate/Translation/FileLoader.php
@@ -25,7 +25,7 @@ class FileLoader implements Loader
     /**
      * All of the registered paths to JSON translation files.
      *
-     * @var string
+     * @var array
      */
     protected $jsonPaths = [];
 
diff --git a/vendor/laravel/framework/src/Illuminate/Translation/MessageSelector.php b/vendor/laravel/framework/src/Illuminate/Translation/MessageSelector.php
index 3ac3386b..fdea3c2d 100755
--- a/vendor/laravel/framework/src/Illuminate/Translation/MessageSelector.php
+++ b/vendor/laravel/framework/src/Illuminate/Translation/MessageSelector.php
@@ -60,7 +60,7 @@ class MessageSelector
     {
         preg_match('/^[\{\[]([^\[\]\{\}]*)[\}\]](.*)/s', $part, $matches);
 
-        if (count($matches) != 3) {
+        if (count($matches) !== 3) {
             return;
         }
 
@@ -69,7 +69,7 @@ class MessageSelector
         $value = $matches[2];
 
         if (Str::contains($condition, ',')) {
-            list($from, $to) = explode(',', $condition, 2);
+            [$from, $to] = explode(',', $condition, 2);
 
             if ($to == '*' && $number >= $from) {
                 return $value;
diff --git a/vendor/laravel/framework/src/Illuminate/Translation/Translator.php b/vendor/laravel/framework/src/Illuminate/Translation/Translator.php
index 8633b69a..7514ba2c 100755
--- a/vendor/laravel/framework/src/Illuminate/Translation/Translator.php
+++ b/vendor/laravel/framework/src/Illuminate/Translation/Translator.php
@@ -6,6 +6,7 @@ use Countable;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Support\Collection;
+use Illuminate\Support\HtmlString;
 use Illuminate\Support\Traits\Macroable;
 use Illuminate\Contracts\Translation\Loader;
 use Illuminate\Support\NamespacedItemResolver;
@@ -112,7 +113,7 @@ class Translator extends NamespacedItemResolver implements TranslatorContract
      */
     public function get($key, array $replace = [], $locale = null, $fallback = true)
     {
-        list($namespace, $group, $item) = $this->parseKey($key);
+        [$namespace, $group, $item] = $this->parseKey($key);
 
         // Here we will get the locale that should be used for the language line. If one
         // was not passed, we will use the default locales which was given to us when
@@ -264,6 +265,8 @@ class Translator extends NamespacedItemResolver implements TranslatorContract
         $replace = $this->sortReplacements($replace);
 
         foreach ($replace as $key => $value) {
+            // $value = $value instanceof HtmlString ? $value->toHtml() : e($value);
+
             $line = str_replace(
                 [':'.$key, ':'.Str::upper($key), ':'.Str::ucfirst($key)],
                 [$value, Str::upper($value), Str::ucfirst($value)],
@@ -298,7 +301,7 @@ class Translator extends NamespacedItemResolver implements TranslatorContract
     public function addLines(array $lines, $locale, $namespace = '*')
     {
         foreach ($lines as $key => $value) {
-            list($group, $item) = explode('.', $key, 2);
+            [$group, $item] = explode('.', $key, 2);
 
             Arr::set($this->loaded, "$namespace.$group.$locale.$item", $value);
         }
@@ -476,4 +479,15 @@ class Translator extends NamespacedItemResolver implements TranslatorContract
     {
         $this->fallback = $fallback;
     }
+
+    /**
+     * Set the loaded translation groups.
+     *
+     * @param  array  $loaded
+     * @return void
+     */
+    public function setLoaded(array $loaded)
+    {
+        $this->loaded = $loaded;
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Translation/composer.json b/vendor/laravel/framework/src/Illuminate/Translation/composer.json
index b84b17fd..d8784d7c 100755
--- a/vendor/laravel/framework/src/Illuminate/Translation/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Translation/composer.json
@@ -14,10 +14,10 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/filesystem": "5.5.*",
-        "illuminate/support": "5.5.*"
+        "php": "^7.1.3",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/filesystem": "5.7.*",
+        "illuminate/support": "5.7.*"
     },
     "autoload": {
         "psr-4": {
@@ -26,7 +26,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "config": {
diff --git a/vendor/laravel/framework/src/Illuminate/Validation/Concerns/FormatsMessages.php b/vendor/laravel/framework/src/Illuminate/Validation/Concerns/FormatsMessages.php
index 5744830d..c3dc5765 100644
--- a/vendor/laravel/framework/src/Illuminate/Validation/Concerns/FormatsMessages.php
+++ b/vendor/laravel/framework/src/Illuminate/Validation/Concerns/FormatsMessages.php
@@ -377,7 +377,7 @@ trait FormatsMessages
      */
     protected function callClassBasedReplacer($callback, $message, $attribute, $rule, $parameters, $validator)
     {
-        list($class, $method) = Str::parseCallback($callback, 'replace');
+        [$class, $method] = Str::parseCallback($callback, 'replace');
 
         return call_user_func_array([$this->container->make($class), $method], array_slice(func_get_args(), 1));
     }
diff --git a/vendor/laravel/framework/src/Illuminate/Validation/Concerns/ReplacesAttributes.php b/vendor/laravel/framework/src/Illuminate/Validation/Concerns/ReplacesAttributes.php
index ed108768..3594dd9b 100644
--- a/vendor/laravel/framework/src/Illuminate/Validation/Concerns/ReplacesAttributes.php
+++ b/vendor/laravel/framework/src/Illuminate/Validation/Concerns/ReplacesAttributes.php
@@ -248,6 +248,78 @@ trait ReplacesAttributes
         return str_replace(':size', $parameters[0], $message);
     }
 
+    /**
+     * Replace all place-holders for the gt rule.
+     *
+     * @param  string  $message
+     * @param  string  $attribute
+     * @param  string  $rule
+     * @param  array   $parameters
+     * @return string
+     */
+    protected function replaceGt($message, $attribute, $rule, $parameters)
+    {
+        if (is_null($value = $this->getValue($parameters[0]))) {
+            return str_replace(':value', $parameters[0], $message);
+        }
+
+        return str_replace(':value', $this->getSize($attribute, $value), $message);
+    }
+
+    /**
+     * Replace all place-holders for the lt rule.
+     *
+     * @param  string  $message
+     * @param  string  $attribute
+     * @param  string  $rule
+     * @param  array   $parameters
+     * @return string
+     */
+    protected function replaceLt($message, $attribute, $rule, $parameters)
+    {
+        if (is_null($value = $this->getValue($parameters[0]))) {
+            return str_replace(':value', $parameters[0], $message);
+        }
+
+        return str_replace(':value', $this->getSize($attribute, $value), $message);
+    }
+
+    /**
+     * Replace all place-holders for the gte rule.
+     *
+     * @param  string  $message
+     * @param  string  $attribute
+     * @param  string  $rule
+     * @param  array   $parameters
+     * @return string
+     */
+    protected function replaceGte($message, $attribute, $rule, $parameters)
+    {
+        if (is_null($value = $this->getValue($parameters[0]))) {
+            return str_replace(':value', $parameters[0], $message);
+        }
+
+        return str_replace(':value', $this->getSize($attribute, $value), $message);
+    }
+
+    /**
+     * Replace all place-holders for the lte rule.
+     *
+     * @param  string  $message
+     * @param  string  $attribute
+     * @param  string  $rule
+     * @param  array   $parameters
+     * @return string
+     */
+    protected function replaceLte($message, $attribute, $rule, $parameters)
+    {
+        if (is_null($value = $this->getValue($parameters[0]))) {
+            return str_replace(':value', $parameters[0], $message);
+        }
+
+        return str_replace(':value', $this->getSize($attribute, $value), $message);
+    }
+
     /**
      * Replace all place-holders for the required_if rule.
      *
@@ -277,9 +349,15 @@ trait ReplacesAttributes
      */
     protected function replaceRequiredUnless($message, $attribute, $rule, $parameters)
     {
-        $other = $this->getDisplayableAttribute(array_shift($parameters));
+        $other = $this->getDisplayableAttribute($parameters[0]);
+
+        $values = [];
+
+        foreach (array_slice($parameters, 1) as $value) {
+            $values[] = $this->getDisplayableValue($parameters[0], $value);
+        }
 
-        return str_replace([':other', ':values'], [$other, implode(', ', $parameters)], $message);
+        return str_replace([':other', ':values'], [$other, implode(', ', $values)], $message);
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Validation/Concerns/ValidatesAttributes.php b/vendor/laravel/framework/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
index 453c81e6..541e69b1 100644
--- a/vendor/laravel/framework/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
+++ b/vendor/laravel/framework/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
@@ -11,6 +11,7 @@ use DateTimeInterface;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use InvalidArgumentException;
+use Illuminate\Support\Carbon;
 use Illuminate\Validation\Rules\Exists;
 use Illuminate\Validation\Rules\Unique;
 use Illuminate\Validation\ValidationData;
@@ -147,9 +148,7 @@ trait ValidatesAttributes
         }
 
         if ($format = $this->getDateFormat($attribute)) {
-            return $this->checkDateTimeOrder(
-                $format, $value, $this->getValue($parameters[0]) ?: $parameters[0], $operator
-            );
+            return $this->checkDateTimeOrder($format, $value, $parameters[0], $operator);
         }
 
         if (! $date = $this->getDateTimestamp($parameters[0])) {
@@ -180,7 +179,19 @@ trait ValidatesAttributes
      */
     protected function getDateTimestamp($value)
     {
-        return $value instanceof DateTimeInterface ? $value->getTimestamp() : strtotime($value);
+        if ($value instanceof DateTimeInterface) {
+            return $value->getTimestamp();
+        }
+
+        if ($this->isTestingRelativeDateTime($value)) {
+            $date = $this->getDateTime($value);
+
+            if (! is_null($date)) {
+                return $date->getTimestamp();
+            }
+        }
+
+        return strtotime($value);
     }
 
     /**
@@ -194,11 +205,13 @@ trait ValidatesAttributes
      */
     protected function checkDateTimeOrder($format, $first, $second, $operator)
     {
-        $first = $this->getDateTimeWithOptionalFormat($format, $first);
+        $firstDate = $this->getDateTimeWithOptionalFormat($format, $first);
 
-        $second = $this->getDateTimeWithOptionalFormat($format, $second);
+        if (! $secondDate = $this->getDateTimeWithOptionalFormat($format, $second)) {
+            $secondDate = $this->getDateTimeWithOptionalFormat($format, $this->getValue($second));
+        }
 
-        return ($first && $second) && ($this->compare($first, $second, $operator));
+        return ($firstDate && $secondDate) && ($this->compare($firstDate, $secondDate, $operator));
     }
 
     /**
@@ -214,13 +227,41 @@ trait ValidatesAttributes
             return $date;
         }
 
+        return $this->getDateTime($value);
+    }
+
+    /**
+     * Get a DateTime instance from a string with no format.
+     *
+     * @param  string $value
+     * @return \DateTime|null
+     */
+    protected function getDateTime($value)
+    {
         try {
+            if ($this->isTestingRelativeDateTime($value)) {
+                return new Carbon($value);
+            }
+
             return new DateTime($value);
         } catch (Exception $e) {
             //
         }
     }
 
+    /**
+     * Check if the given value should be adjusted to Carbon::getTestNow().
+     *
+     * @param  mixed $value
+     * @return bool
+     */
+    protected function isTestingRelativeDateTime($value)
+    {
+        return Carbon::hasTestNow() && is_string($value) && (
+            $value === 'now' || Carbon::hasRelativeKeywords($value)
+        );
+    }
+
     /**
      * Validate that an attribute contains only alphabetic characters.
      *
@@ -447,13 +488,17 @@ trait ValidatesAttributes
      */
     public function validateDimensions($attribute, $value, $parameters)
     {
+        if ($this->isValidFileInstance($value) && $value->getClientMimeType() == 'image/svg+xml') {
+            return true;
+        }
+
         if (! $this->isValidFileInstance($value) || ! $sizeDetails = @getimagesize($value->getRealPath())) {
             return false;
         }
 
         $this->requireParameterCount(1, $parameters, 'dimensions');
 
-        list($width, $height) = $sizeDetails;
+        [$width, $height] = $sizeDetails;
 
         $parameters = $this->parseNamedParameters($parameters);
 
@@ -497,7 +542,7 @@ trait ValidatesAttributes
             return false;
         }
 
-        list($numerator, $denominator) = array_replace(
+        [$numerator, $denominator] = array_replace(
             [1, 1], array_filter(sscanf($parameters['ratio'], '%f/%d'))
         );
 
@@ -559,14 +604,14 @@ trait ValidatesAttributes
     {
         $this->requireParameterCount(1, $parameters, 'exists');
 
-        list($connection, $table) = $this->parseTable($parameters[0]);
+        [$connection, $table] = $this->parseTable($parameters[0]);
 
         // The second parameter position holds the name of the column that should be
         // verified as existing. If this parameter is not specified we will guess
         // that the columns being "verified" shares the given attribute's name.
         $column = $this->getQueryColumn($parameters, $attribute);
 
-        $expected = (is_array($value)) ? count($value) : 1;
+        $expected = is_array($value) ? count(array_unique($value)) : 1;
 
         return $this->getExistCount(
             $connection, $table, $column, $value, $parameters
@@ -614,17 +659,17 @@ trait ValidatesAttributes
     {
         $this->requireParameterCount(1, $parameters, 'unique');
 
-        list($connection, $table) = $this->parseTable($parameters[0]);
+        [$connection, $table] = $this->parseTable($parameters[0]);
 
         // The second parameter position holds the name of the column that needs to
         // be verified as unique. If this parameter isn't specified we will just
         // assume that this column to be verified shares the attribute's name.
         $column = $this->getQueryColumn($parameters, $attribute);
 
-        list($idColumn, $id) = [null, null];
+        [$idColumn, $id] = [null, null];
 
         if (isset($parameters[2])) {
-            list($idColumn, $id) = $this->getUniqueIds($parameters);
+            [$idColumn, $id] = $this->getUniqueIds($parameters);
         }
 
         // The presence verifier is responsible for counting rows within this store
@@ -781,6 +826,106 @@ trait ValidatesAttributes
         return true;
     }
 
+    /**
+     * Validate that an attribute is greater than another attribute.
+     *
+     * @param  string  $attribute
+     * @param  mixed   $value
+     * @param  array   $parameters
+     * @return bool
+     */
+    public function validateGt($attribute, $value, $parameters)
+    {
+        $this->requireParameterCount(1, $parameters, 'gt');
+
+        $comparedToValue = $this->getValue($parameters[0]);
+
+        $this->shouldBeNumeric($attribute, 'Gt');
+
+        if (is_null($comparedToValue) && (is_numeric($value) && is_numeric($parameters[0]))) {
+            return $this->getSize($attribute, $value) > $parameters[0];
+        }
+
+        $this->requireSameType($value, $comparedToValue);
+
+        return $this->getSize($attribute, $value) > $this->getSize($attribute, $comparedToValue);
+    }
+
+    /**
+     * Validate that an attribute is less than another attribute.
+     *
+     * @param  string  $attribute
+     * @param  mixed   $value
+     * @param  array   $parameters
+     * @return bool
+     */
+    public function validateLt($attribute, $value, $parameters)
+    {
+        $this->requireParameterCount(1, $parameters, 'lt');
+
+        $comparedToValue = $this->getValue($parameters[0]);
+
+        $this->shouldBeNumeric($attribute, 'Lt');
+
+        if (is_null($comparedToValue) && (is_numeric($value) && is_numeric($parameters[0]))) {
+            return $this->getSize($attribute, $value) < $parameters[0];
+        }
+
+        $this->requireSameType($value, $comparedToValue);
+
+        return $this->getSize($attribute, $value) < $this->getSize($attribute, $comparedToValue);
+    }
+
+    /**
+     * Validate that an attribute is greater than or equal another attribute.
+     *
+     * @param  string  $attribute
+     * @param  mixed   $value
+     * @param  array   $parameters
+     * @return bool
+     */
+    public function validateGte($attribute, $value, $parameters)
+    {
+        $this->requireParameterCount(1, $parameters, 'gte');
+
+        $comparedToValue = $this->getValue($parameters[0]);
+
+        $this->shouldBeNumeric($attribute, 'Gte');
+
+        if (is_null($comparedToValue) && (is_numeric($value) && is_numeric($parameters[0]))) {
+            return $this->getSize($attribute, $value) >= $parameters[0];
+        }
+
+        $this->requireSameType($value, $comparedToValue);
+
+        return $this->getSize($attribute, $value) >= $this->getSize($attribute, $comparedToValue);
+    }
+
+    /**
+     * Validate that an attribute is less than or equal another attribute.
+     *
+     * @param  string  $attribute
+     * @param  mixed   $value
+     * @param  array   $parameters
+     * @return bool
+     */
+    public function validateLte($attribute, $value, $parameters)
+    {
+        $this->requireParameterCount(1, $parameters, 'lte');
+
+        $comparedToValue = $this->getValue($parameters[0]);
+
+        $this->shouldBeNumeric($attribute, 'Lte');
+
+        if (is_null($comparedToValue) && (is_numeric($value) && is_numeric($parameters[0]))) {
+            return $this->getSize($attribute, $value) <= $parameters[0];
+        }
+
+        $this->requireSameType($value, $comparedToValue);
+
+        return $this->getSize($attribute, $value) <= $this->getSize($attribute, $comparedToValue);
+    }
+
     /**
      * Validate the MIME type of a file is an image MIME type.
      *
@@ -981,9 +1126,13 @@ trait ValidatesAttributes
             return false;
         }
 
+        $phpExtensions = [
+            'php', 'php3', 'php4', 'php5', 'phtml',
+        ];
+
         return ($value instanceof UploadedFile)
-           ? trim(strtolower($value->getClientOriginalExtension())) === 'php'
-           : trim(strtolower($value->getExtension())) === 'php';
+           ? in_array(trim(strtolower($value->getClientOriginalExtension())), $phpExtensions)
+           : in_array(trim(strtolower($value->getExtension())), $phpExtensions);
     }
 
     /**
@@ -1069,6 +1218,25 @@ trait ValidatesAttributes
         return preg_match($parameters[0], $value) > 0;
     }
 
+    /**
+     * Validate that an attribute does not pass a regular expression check.
+     *
+     * @param  string  $attribute
+     * @param  mixed   $value
+     * @param  array   $parameters
+     * @return bool
+     */
+    public function validateNotRegex($attribute, $value, $parameters)
+    {
+        if (! is_string($value) && ! is_numeric($value)) {
+            return false;
+        }
+
+        $this->requireParameterCount(1, $parameters, 'not_regex');
+
+        return preg_match($parameters[0], $value) < 1;
+    }
+
     /**
      * Validate that a required attribute exists.
      *
@@ -1360,7 +1528,7 @@ trait ValidatesAttributes
             ((aaa|aaas|about|acap|acct|acr|adiumxtra|afp|afs|aim|apt|attachment|aw|barion|beshare|bitcoin|blob|bolo|callto|cap|chrome|chrome-extension|cid|coap|coaps|com-eventbrite-attendee|content|crid|cvs|data|dav|dict|dlna-playcontainer|dlna-playsingle|dns|dntp|dtn|dvb|ed2k|example|facetime|fax|feed|feedready|file|filesystem|finger|fish|ftp|geo|gg|git|gizmoproject|go|gopher|gtalk|h323|ham|hcp|http|https|iax|icap|icon|im|imap|info|iotdisco|ipn|ipp|ipps|irc|irc6|ircs|iris|iris.beep|iris.lwz|iris.xpc|iris.xpcs|itms|jabber|jar|jms|keyparc|lastfm|ldap|ldaps|magnet|mailserver|mailto|maps|market|message|mid|mms|modem|ms-help|ms-settings|ms-settings-airplanemode|ms-settings-bluetooth|ms-settings-camera|ms-settings-cellular|ms-settings-cloudstorage|ms-settings-emailandaccounts|ms-settings-language|ms-settings-location|ms-settings-lock|ms-settings-nfctransactions|ms-settings-notifications|ms-settings-power|ms-settings-privacy|ms-settings-proximity|ms-settings-screenrotation|ms-settings-wifi|ms-settings-workplace|msnim|msrp|msrps|mtqp|mumble|mupdate|mvn|news|nfs|ni|nih|nntp|notes|oid|opaquelocktoken|pack|palm|paparazzi|pkcs11|platform|pop|pres|prospero|proxy|psyc|query|redis|rediss|reload|res|resource|rmi|rsync|rtmfp|rtmp|rtsp|rtsps|rtspu|secondlife|s3|service|session|sftp|sgn|shttp|sieve|sip|sips|skype|smb|sms|smtp|snews|snmp|soap.beep|soap.beeps|soldat|spotify|ssh|steam|stun|stuns|submit|svn|tag|teamspeak|tel|teliaeid|telnet|tftp|things|thismessage|tip|tn3270|turn|turns|tv|udp|unreal|urn|ut2004|vemmi|ventrilo|videotex|view-source|wais|webcal|ws|wss|wtai|wyciwyg|xcon|xcon-userid|xfire|xmlrpc\.beep|xmlrpc.beeps|xmpp|xri|ymsgr|z39\.50|z39\.50r|z39\.50s))://                                 # protocol
             (([\pL\pN-]+:)?([\pL\pN-]+)@)?          # basic auth
             (
-                ([\pL\pN\pS-\.])+(\.?([\pL]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
+                ([\pL\pN\pS\-\.])+(\.?([\pL]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
                     |                                              # or
                 \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}                 # an IP address
                     |                                              # or
@@ -1423,6 +1591,8 @@ trait ValidatesAttributes
      * @param  mixed  $second
      * @param  string  $operator
      * @return bool
+     *
+     * @throws \InvalidArgumentException
      */
     protected function compare($first, $second, $operator)
     {
@@ -1451,7 +1621,7 @@ trait ValidatesAttributes
     protected function parseNamedParameters($parameters)
     {
         return array_reduce($parameters, function ($result, $item) {
-            list($key, $value) = array_pad(explode('=', $item, 2), 2, null);
+            [$key, $value] = array_pad(explode('=', $item, 2), 2, null);
 
             $result[$key] = $value;
 
@@ -1475,4 +1645,35 @@ trait ValidatesAttributes
             throw new InvalidArgumentException("Validation rule $rule requires at least $count parameters.");
         }
     }
+
+    /**
+     * Require comparison values to be of the same type.
+     *
+     * @param  mixed  $first
+     * @param  mixed  $second
+     * @return void
+     *
+     * @throws \InvalidArgumentException
+     */
+    protected function requireSameType($first, $second)
+    {
+        if (gettype($first) != gettype($second)) {
+            throw new InvalidArgumentException('The values under comparison must be of the same type');
+        }
+    }
+
+    /**
+     * Adds the existing rule to the numericRules array if the attribute's value is numeric.
+     *
+     * @param  string  $attribute
+     * @param  string  $rule
+     *
+     * @return void
+     */
+    protected function shouldBeNumeric($attribute, $rule)
+    {
+        if (is_numeric($this->getValue($attribute))) {
+            $this->numericRules[] = $rule;
+        }
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Validation/DatabasePresenceVerifier.php b/vendor/laravel/framework/src/Illuminate/Validation/DatabasePresenceVerifier.php
index 3486c7f5..cb0c247b 100755
--- a/vendor/laravel/framework/src/Illuminate/Validation/DatabasePresenceVerifier.php
+++ b/vendor/laravel/framework/src/Illuminate/Validation/DatabasePresenceVerifier.php
@@ -68,7 +68,7 @@ class DatabasePresenceVerifier implements PresenceVerifierInterface
     {
         $query = $this->table($collection)->whereIn($column, $values);
 
-        return $this->addConditions($query, $extra)->count();
+        return $this->addConditions($query, $extra)->distinct()->count($column);
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Validation/Factory.php b/vendor/laravel/framework/src/Illuminate/Validation/Factory.php
index c31ee4a4..3660af0c 100755
--- a/vendor/laravel/framework/src/Illuminate/Validation/Factory.php
+++ b/vendor/laravel/framework/src/Illuminate/Validation/Factory.php
@@ -69,7 +69,7 @@ class Factory implements FactoryContract
     /**
      * The Validator resolver instance.
      *
-     * @var Closure
+     * @var \Closure
      */
     protected $resolver;
 
@@ -127,13 +127,13 @@ class Factory implements FactoryContract
      * @param  array  $rules
      * @param  array  $messages
      * @param  array  $customAttributes
-     * @return void
+     * @return array
      *
      * @throws \Illuminate\Validation\ValidationException
      */
     public function validate(array $data, array $rules, array $messages = [], array $customAttributes = [])
     {
-        $this->make($data, $rules, $messages, $customAttributes)->validate();
+        return $this->make($data, $rules, $messages, $customAttributes)->validate();
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/Validation/Rule.php b/vendor/laravel/framework/src/Illuminate/Validation/Rule.php
index 0bd7738d..87e41df6 100644
--- a/vendor/laravel/framework/src/Illuminate/Validation/Rule.php
+++ b/vendor/laravel/framework/src/Illuminate/Validation/Rule.php
@@ -3,6 +3,7 @@
 namespace Illuminate\Validation;
 
 use Illuminate\Support\Traits\Macroable;
+use Illuminate\Contracts\Support\Arrayable;
 
 class Rule
 {
@@ -34,25 +35,44 @@ class Rule
     /**
      * Get an in constraint builder instance.
      *
-     * @param  array|string  $values
+     * @param  \Illuminate\Contracts\Support\Arrayable|array|string  $values
      * @return \Illuminate\Validation\Rules\In
      */
     public static function in($values)
     {
+        if ($values instanceof Arrayable) {
+            $values = $values->toArray();
+        }
+
         return new Rules\In(is_array($values) ? $values : func_get_args());
     }
 
     /**
      * Get a not_in constraint builder instance.
      *
-     * @param  array|string  $values
+     * @param  \Illuminate\Contracts\Support\Arrayable|array|string  $values
      * @return \Illuminate\Validation\Rules\NotIn
      */
     public static function notIn($values)
     {
+        if ($values instanceof Arrayable) {
+            $values = $values->toArray();
+        }
+
         return new Rules\NotIn(is_array($values) ? $values : func_get_args());
     }
 
+    /**
+     * Get a required_if constraint builder instance.
+     *
+     * @param  callable  $callback
+     * @return \Illuminate\Validation\Rules\RequiredIf
+     */
+    public static function requiredIf($callback)
+    {
+        return new Rules\RequiredIf($callback);
+    }
+
     /**
      * Get a unique constraint builder instance.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/Validation/Rules/DatabaseRule.php b/vendor/laravel/framework/src/Illuminate/Validation/Rules/DatabaseRule.php
index 7305b155..9b7652f5 100644
--- a/vendor/laravel/framework/src/Illuminate/Validation/Rules/DatabaseRule.php
+++ b/vendor/laravel/framework/src/Illuminate/Validation/Rules/DatabaseRule.php
@@ -21,7 +21,7 @@ trait DatabaseRule
     protected $column;
 
     /**
-     * There extra where clauses for the query.
+     * The extra where clauses for the query.
      *
      * @var array
      */
diff --git a/vendor/laravel/framework/src/Illuminate/Validation/Rules/RequiredIf.php b/vendor/laravel/framework/src/Illuminate/Validation/Rules/RequiredIf.php
new file mode 100644
index 00000000..c4a1001d
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/Validation/Rules/RequiredIf.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Illuminate\Validation\Rules;
+
+class RequiredIf
+{
+    /**
+     * The condition that validates the attribute.
+     *
+     * @var callable|bool
+     */
+    public $condition;
+
+    /**
+     * Create a new required validation rule based on a condition.
+     *
+     * @param  callable|bool  $condition
+     * @return void
+     */
+    public function __construct($condition)
+    {
+        $this->condition = $condition;
+    }
+
+    /**
+     * Convert the rule to a validation string.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        if (is_callable($this->condition)) {
+            return call_user_func($this->condition) ? 'required' : '';
+        }
+
+        return $this->condition ? 'required' : '';
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/Validation/Rules/Unique.php b/vendor/laravel/framework/src/Illuminate/Validation/Rules/Unique.php
index b607c07b..bce18d8d 100644
--- a/vendor/laravel/framework/src/Illuminate/Validation/Rules/Unique.php
+++ b/vendor/laravel/framework/src/Illuminate/Validation/Rules/Unique.php
@@ -2,6 +2,8 @@
 
 namespace Illuminate\Validation\Rules;
 
+use Illuminate\Database\Eloquent\Model;
+
 class Unique
 {
     use DatabaseRule;
@@ -24,13 +26,32 @@ class Unique
      * Ignore the given ID during the unique check.
      *
      * @param  mixed  $id
-     * @param  string  $idColumn
+     * @param  string|null  $idColumn
      * @return $this
      */
-    public function ignore($id, $idColumn = 'id')
+    public function ignore($id, $idColumn = null)
     {
+        if ($id instanceof Model) {
+            return $this->ignoreModel($id, $idColumn);
+        }
+
         $this->ignore = $id;
-        $this->idColumn = $idColumn;
+        $this->idColumn = $idColumn ?? 'id';
+
+        return $this;
+    }
+
+    /**
+     * Ignore the given model during the unique check.
+     *
+     * @param  \Illuminate\Database\Eloquent\Model  $model
+     * @param  string|null  $idColumn
+     * @return $this
+     */
+    public function ignoreModel($model, $idColumn = null)
+    {
+        $this->idColumn = $idColumn ?? $model->getKeyName();
+        $this->ignore = $model->{$this->idColumn};
 
         return $this;
     }
diff --git a/vendor/laravel/framework/src/Illuminate/Validation/ValidatesWhenResolvedTrait.php b/vendor/laravel/framework/src/Illuminate/Validation/ValidatesWhenResolvedTrait.php
index ad555543..e4de332f 100644
--- a/vendor/laravel/framework/src/Illuminate/Validation/ValidatesWhenResolvedTrait.php
+++ b/vendor/laravel/framework/src/Illuminate/Validation/ValidatesWhenResolvedTrait.php
@@ -12,15 +12,17 @@ trait ValidatesWhenResolvedTrait
      *
      * @return void
      */
-    public function validate()
+    public function validateResolved()
     {
         $this->prepareForValidation();
 
-        $instance = $this->getValidatorInstance();
-
         if (! $this->passesAuthorization()) {
             $this->failedAuthorization();
-        } elseif (! $instance->passes()) {
+        }
+
+        $instance = $this->getValidatorInstance();
+
+        if ($instance->fails()) {
             $this->failedValidation($instance);
         }
     }
diff --git a/vendor/laravel/framework/src/Illuminate/Validation/ValidationData.php b/vendor/laravel/framework/src/Illuminate/Validation/ValidationData.php
index 185cdb6a..74f55259 100644
--- a/vendor/laravel/framework/src/Illuminate/Validation/ValidationData.php
+++ b/vendor/laravel/framework/src/Illuminate/Validation/ValidationData.php
@@ -7,6 +7,13 @@ use Illuminate\Support\Str;
 
 class ValidationData
 {
+    /**
+     * Initialize and gather data for given attribute.
+     *
+     * @param  string  $attribute
+     * @param  array  $masterData
+     * @return array
+     */
     public static function initializeAndGatherData($attribute, $masterData)
     {
         $data = Arr::dot(static::initializeAttributeOnData($attribute, $masterData));
diff --git a/vendor/laravel/framework/src/Illuminate/Validation/ValidationRuleParser.php b/vendor/laravel/framework/src/Illuminate/Validation/ValidationRuleParser.php
index 43a28db9..b8e42559 100644
--- a/vendor/laravel/framework/src/Illuminate/Validation/ValidationRuleParser.php
+++ b/vendor/laravel/framework/src/Illuminate/Validation/ValidationRuleParser.php
@@ -231,7 +231,7 @@ class ValidationRuleParser
         // easy {rule}:{parameters} formatting convention. For instance the
         // rule "Max:3" states that the value may only be three letters.
         if (strpos($rules, ':') !== false) {
-            list($rules, $parameter) = explode(':', $rules, 2);
+            [$rules, $parameter] = explode(':', $rules, 2);
 
             $parameters = static::parseParameters($rules, $parameter);
         }
@@ -248,7 +248,9 @@ class ValidationRuleParser
      */
     protected static function parseParameters($rule, $parameter)
     {
-        if (strtolower($rule) == 'regex') {
+        $rule = strtolower($rule);
+
+        if (in_array($rule, ['regex', 'not_regex', 'notregex'], true)) {
             return [$parameter];
         }
 
diff --git a/vendor/laravel/framework/src/Illuminate/Validation/Validator.php b/vendor/laravel/framework/src/Illuminate/Validation/Validator.php
index 2c85af8b..911c0be2 100755
--- a/vendor/laravel/framework/src/Illuminate/Validation/Validator.php
+++ b/vendor/laravel/framework/src/Illuminate/Validation/Validator.php
@@ -167,7 +167,7 @@ class Validator implements ValidatorContract
     protected $dependentRules = [
         'RequiredWith', 'RequiredWithAll', 'RequiredWithout', 'RequiredWithoutAll',
         'RequiredIf', 'RequiredUnless', 'Confirmed', 'Same', 'Different', 'Unique',
-        'Before', 'After', 'BeforeOrEqual', 'AfterOrEqual',
+        'Before', 'After', 'BeforeOrEqual', 'AfterOrEqual', 'Gt', 'Lt', 'Gte', 'Lte',
     ];
 
     /**
@@ -175,7 +175,7 @@ class Validator implements ValidatorContract
      *
      * @var array
      */
-    protected $sizeRules = ['Size', 'Between', 'Min', 'Max'];
+    protected $sizeRules = ['Size', 'Between', 'Min', 'Max', 'Gt', 'Lt', 'Gte', 'Lte'];
 
     /**
      * The numeric related validation rules.
@@ -296,7 +296,7 @@ class Validator implements ValidatorContract
     /**
      * Run the validator's rules against its data.
      *
-     * @return void
+     * @return array
      *
      * @throws \Illuminate\Validation\ValidationException
      */
@@ -305,6 +305,20 @@ class Validator implements ValidatorContract
         if ($this->fails()) {
             throw new ValidationException($this);
         }
+
+        $results = [];
+
+        $missingValue = Str::random(10);
+
+        foreach (array_keys($this->getRules()) as $key) {
+            $value = data_get($this->getData(), $key, $missingValue);
+
+            if ($value !== $missingValue) {
+                Arr::set($results, $key, $value);
+            }
+        }
+
+        return $results;
     }
 
     /**
@@ -318,7 +332,7 @@ class Validator implements ValidatorContract
     {
         $this->currentRule = $rule;
 
-        list($rule, $parameters) = ValidationRuleParser::parse($rule);
+        [$rule, $parameters] = ValidationRuleParser::parse($rule);
 
         if ($rule == '') {
             return;
@@ -487,7 +501,7 @@ class Validator implements ValidatorContract
         $data = ValidationData::initializeAndGatherData($attribute, $this->data);
 
         return array_key_exists($attribute, $data)
-                    || in_array($attribute, array_keys($this->data));
+                    || array_key_exists($attribute, $this->data);
     }
 
     /**
@@ -552,7 +566,7 @@ class Validator implements ValidatorContract
         }
 
         if (isset($this->failedRules[$attribute]) &&
-            in_array('uploaded', array_keys($this->failedRules[$attribute]))) {
+            array_key_exists('uploaded', $this->failedRules[$attribute])) {
             return true;
         }
 
@@ -572,8 +586,12 @@ class Validator implements ValidatorContract
      * @param  array   $parameters
      * @return void
      */
-    protected function addFailure($attribute, $rule, $parameters)
+    public function addFailure($attribute, $rule, $parameters = [])
     {
+        if (! $this->messages) {
+            $this->passes();
+        }
+
         $this->messages->add($attribute, $this->makeReplacements(
             $this->getMessage($attribute, $rule), $attribute, $rule, $parameters
         ));
@@ -697,7 +715,7 @@ class Validator implements ValidatorContract
         $rules = (array) $rules;
 
         foreach ($this->rules[$attribute] as $rule) {
-            list($rule, $parameters) = ValidationRuleParser::parse($rule);
+            [$rule, $parameters] = ValidationRuleParser::parse($rule);
 
             if (in_array($rule, $rules)) {
                 return [$rule, $parameters];
@@ -1115,7 +1133,7 @@ class Validator implements ValidatorContract
      */
     protected function callClassBasedExtension($callback, $parameters)
     {
-        list($class, $method) = Str::parseCallback($callback, 'validate');
+        [$class, $method] = Str::parseCallback($callback, 'validate');
 
         return call_user_func_array([$this->container->make($class), $method], $parameters);
     }
@@ -1137,6 +1155,8 @@ class Validator implements ValidatorContract
             return $this->callExtension($rule, $parameters);
         }
 
-        throw new BadMethodCallException("Method [$method] does not exist.");
+        throw new BadMethodCallException(sprintf(
+            'Method %s::%s does not exist.', static::class, $method
+        ));
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/Validation/composer.json b/vendor/laravel/framework/src/Illuminate/Validation/composer.json
index a026981b..4a9da5f2 100755
--- a/vendor/laravel/framework/src/Illuminate/Validation/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/Validation/composer.json
@@ -14,12 +14,12 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/container": "5.5.*",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/support": "5.5.*",
-        "illuminate/translation": "5.5.*",
-        "symfony/http-foundation": "~3.3"
+        "php": "^7.1.3",
+        "illuminate/container": "5.7.*",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/support": "5.7.*",
+        "illuminate/translation": "5.7.*",
+        "symfony/http-foundation": "^4.1"
     },
     "autoload": {
         "psr-4": {
@@ -28,11 +28,11 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "suggest": {
-        "illuminate/database": "Required to use the database presence verifier (5.5.*)."
+        "illuminate/database": "Required to use the database presence verifier (5.7.*)."
     },
     "config": {
         "sort-packages": true
diff --git a/vendor/laravel/framework/src/Illuminate/View/Compilers/BladeCompiler.php b/vendor/laravel/framework/src/Illuminate/View/Compilers/BladeCompiler.php
index 6a999c93..119a20ab 100644
--- a/vendor/laravel/framework/src/Illuminate/View/Compilers/BladeCompiler.php
+++ b/vendor/laravel/framework/src/Illuminate/View/Compilers/BladeCompiler.php
@@ -12,6 +12,7 @@ class BladeCompiler extends Compiler implements CompilerInterface
         Concerns\CompilesComponents,
         Concerns\CompilesConditionals,
         Concerns\CompilesEchos,
+        Concerns\CompilesHelpers,
         Concerns\CompilesIncludes,
         Concerns\CompilesInjections,
         Concerns\CompilesJson,
@@ -271,7 +272,7 @@ class BladeCompiler extends Compiler implements CompilerInterface
      */
     protected function parseToken($token)
     {
-        list($id, $content) = $token;
+        [$id, $content] = $token;
 
         if ($id == T_INLINE_HTML) {
             foreach ($this->compilers as $type) {
@@ -395,13 +396,13 @@ class BladeCompiler extends Compiler implements CompilerInterface
         $this->conditions[$name] = $callback;
 
         $this->directive($name, function ($expression) use ($name) {
-            return $expression
+            return $expression !== ''
                     ? "<?php if (\Illuminate\Support\Facades\Blade::check('{$name}', {$expression})): ?>"
                     : "<?php if (\Illuminate\Support\Facades\Blade::check('{$name}')): ?>";
         });
 
         $this->directive('else'.$name, function ($expression) use ($name) {
-            return $expression
+            return $expression !== ''
                 ? "<?php elseif (\Illuminate\Support\Facades\Blade::check('{$name}', {$expression})): ?>"
                 : "<?php elseif (\Illuminate\Support\Facades\Blade::check('{$name}')): ?>";
         });
@@ -423,6 +424,46 @@ class BladeCompiler extends Compiler implements CompilerInterface
         return call_user_func($this->conditions[$name], ...$parameters);
     }
 
+    /**
+     * Register a component alias directive.
+     *
+     * @param  string  $path
+     * @param  string  $alias
+     * @return void
+     */
+    public function component($path, $alias = null)
+    {
+        $alias = $alias ?: Arr::last(explode('.', $path));
+
+        $this->directive($alias, function ($expression) use ($path) {
+            return $expression
+                        ? "<?php \$__env->startComponent('{$path}', {$expression}); ?>"
+                        : "<?php \$__env->startComponent('{$path}'); ?>";
+        });
+
+        $this->directive('end'.$alias, function ($expression) {
+            return '<?php echo $__env->renderComponent(); ?>';
+        });
+    }
+
+    /**
+     * Register an include alias directive.
+     *
+     * @param  string  $path
+     * @param  string  $alias
+     * @return void
+     */
+    public function include($path, $alias = null)
+    {
+        $alias = $alias ?: Arr::last(explode('.', $path));
+
+        $this->directive($alias, function ($expression) use ($path) {
+            $expression = $this->stripParentheses($expression) ?: '[]';
+
+            return "<?php echo \$__env->make('{$path}', {$expression}, \Illuminate\Support\Arr::except(get_defined_vars(), array('__data', '__path')))->render(); ?>";
+        });
+    }
+
     /**
      * Register a handler for custom directives.
      *
@@ -457,12 +498,22 @@ class BladeCompiler extends Compiler implements CompilerInterface
     }
 
     /**
-     * Set the echo format to double encode entities.
+     * Set the "echo" format to double encode entities.
      *
      * @return void
      */
-    public function doubleEncode()
+    public function withDoubleEncoding()
     {
         $this->setEchoFormat('e(%s, true)');
     }
+
+    /**
+     * Set the "echo" format to not double encode entities.
+     *
+     * @return void
+     */
+    public function withoutDoubleEncoding()
+    {
+        $this->setEchoFormat('e(%s, false)');
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesAuthorizations.php b/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesAuthorizations.php
index 39119ec6..4f969982 100644
--- a/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesAuthorizations.php
+++ b/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesAuthorizations.php
@@ -26,6 +26,17 @@ trait CompilesAuthorizations
         return "<?php if (app(\Illuminate\\Contracts\\Auth\\Access\\Gate::class)->denies{$expression}): ?>";
     }
 
+    /**
+     * Compile the canany statements into valid PHP.
+     *
+     * @param  string  $expression
+     * @return string
+     */
+    protected function compileCanany($expression)
+    {
+        return "<?php if (app(\Illuminate\\Contracts\\Auth\\Access\\Gate::class)->any{$expression}): ?>";
+    }
+
     /**
      * Compile the else-can statements into valid PHP.
      *
@@ -48,6 +59,17 @@ trait CompilesAuthorizations
         return "<?php elseif (app(\Illuminate\\Contracts\\Auth\\Access\\Gate::class)->denies{$expression}): ?>";
     }
 
+    /**
+     * Compile the else-canany statements into valid PHP.
+     *
+     * @param  string  $expression
+     * @return string
+     */
+    protected function compileElsecanany($expression)
+    {
+        return "<?php elseif (app(\Illuminate\\Contracts\\Auth\\Access\\Gate::class)->any{$expression}): ?>";
+    }
+
     /**
      * Compile the end-can statements into valid PHP.
      *
@@ -67,4 +89,14 @@ trait CompilesAuthorizations
     {
         return '<?php endif; ?>';
     }
+
+    /**
+     * Compile the end-canany statements into valid PHP.
+     *
+     * @return string
+     */
+    protected function compileEndcanany()
+    {
+        return '<?php endif; ?>';
+    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesConditionals.php b/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesConditionals.php
index bf721343..d592ef17 100644
--- a/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesConditionals.php
+++ b/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesConditionals.php
@@ -11,7 +11,7 @@ trait CompilesConditionals
      */
     protected $firstCaseInSwitch = true;
 
-    /*
+    /**
      * Compile the if-auth statements into valid PHP.
      *
      * @param  string|null  $guard
@@ -24,6 +24,19 @@ trait CompilesConditionals
         return "<?php if(auth()->guard{$guard}->check()): ?>";
     }
 
+    /**
+     * Compile the else-auth statements into valid PHP.
+     *
+     * @param  string|null  $guard
+     * @return string
+     */
+    protected function compileElseAuth($guard = null)
+    {
+        $guard = is_null($guard) ? '()' : $guard;
+
+        return "<?php elseif(auth()->guard{$guard}->check()): ?>";
+    }
+
     /**
      * Compile the end-auth statements into valid PHP.
      *
@@ -47,6 +60,19 @@ trait CompilesConditionals
         return "<?php if(auth()->guard{$guard}->guest()): ?>";
     }
 
+    /**
+     * Compile the else-guest statements into valid PHP.
+     *
+     * @param  string|null  $guard
+     * @return string
+     */
+    protected function compileElseGuest($guard = null)
+    {
+        $guard = is_null($guard) ? '()' : $guard;
+
+        return "<?php elseif(auth()->guard{$guard}->guest()): ?>";
+    }
+
     /**
      * Compile the end-guest statements into valid PHP.
      *
diff --git a/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesEchos.php b/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesEchos.php
index 018f90b8..86f352e2 100644
--- a/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesEchos.php
+++ b/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesEchos.php
@@ -46,7 +46,7 @@ trait CompilesEchos
         $callback = function ($matches) {
             $whitespace = empty($matches[3]) ? '' : $matches[3].$matches[3];
 
-            return $matches[1] ? substr($matches[0], 1) : "<?php echo {$this->compileEchoDefaults($matches[2])}; ?>{$whitespace}";
+            return $matches[1] ? substr($matches[0], 1) : "<?php echo {$matches[2]}; ?>{$whitespace}";
         };
 
         return preg_replace_callback($pattern, $callback, $value);
@@ -65,7 +65,7 @@ trait CompilesEchos
         $callback = function ($matches) {
             $whitespace = empty($matches[3]) ? '' : $matches[3].$matches[3];
 
-            $wrapped = sprintf($this->echoFormat, $this->compileEchoDefaults($matches[2]));
+            $wrapped = sprintf($this->echoFormat, $matches[2]);
 
             return $matches[1] ? substr($matches[0], 1) : "<?php echo {$wrapped}; ?>{$whitespace}";
         };
@@ -86,20 +86,9 @@ trait CompilesEchos
         $callback = function ($matches) {
             $whitespace = empty($matches[3]) ? '' : $matches[3].$matches[3];
 
-            return $matches[1] ? $matches[0] : "<?php echo e({$this->compileEchoDefaults($matches[2])}); ?>{$whitespace}";
+            return $matches[1] ? $matches[0] : "<?php echo e({$matches[2]}); ?>{$whitespace}";
         };
 
         return preg_replace_callback($pattern, $callback, $value);
     }
-
-    /**
-     * Compile the default values for the echo statement.
-     *
-     * @param  string  $value
-     * @return string
-     */
-    public function compileEchoDefaults($value)
-    {
-        return preg_replace('/^(?=\$)(.+?)(?:\s+or\s+)(.+?)$/si', 'isset($1) ? $1 : $2', $value);
-    }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesHelpers.php b/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesHelpers.php
new file mode 100644
index 00000000..979cadc5
--- /dev/null
+++ b/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesHelpers.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Illuminate\View\Compilers\Concerns;
+
+trait CompilesHelpers
+{
+    /**
+     * Compile the CSRF statements into valid PHP.
+     *
+     * @return string
+     */
+    protected function compileCsrf()
+    {
+        return '<?php echo csrf_field(); ?>';
+    }
+
+    /**
+     * Compile the "dd" statements into valid PHP.
+     *
+     * @param  string  $arguments
+     * @return string
+     */
+    protected function compileDd($arguments)
+    {
+        return "<?php dd{$arguments}; ?>";
+    }
+
+    /**
+     * Compile the "dump" statements into valid PHP.
+     *
+     * @param  string  $arguments
+     * @return string
+     */
+    protected function compileDump($arguments)
+    {
+        return "<?php dump{$arguments}; ?>";
+    }
+
+    /**
+     * Compile the method statements into valid PHP.
+     *
+     * @param  string  $method
+     * @return string
+     */
+    protected function compileMethod($method)
+    {
+        return "<?php echo method_field{$method}; ?>";
+    }
+}
diff --git a/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesIncludes.php b/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesIncludes.php
index 417d4ef6..0a310ceb 100644
--- a/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesIncludes.php
+++ b/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesIncludes.php
@@ -25,7 +25,7 @@ trait CompilesIncludes
     {
         $expression = $this->stripParentheses($expression);
 
-        return "<?php echo \$__env->make({$expression}, array_except(get_defined_vars(), array('__data', '__path')))->render(); ?>";
+        return "<?php echo \$__env->make({$expression}, \Illuminate\Support\Arr::except(get_defined_vars(), array('__data', '__path')))->render(); ?>";
     }
 
     /**
@@ -38,7 +38,7 @@ trait CompilesIncludes
     {
         $expression = $this->stripParentheses($expression);
 
-        return "<?php if (\$__env->exists({$expression})) echo \$__env->make({$expression}, array_except(get_defined_vars(), array('__data', '__path')))->render(); ?>";
+        return "<?php if (\$__env->exists({$expression})) echo \$__env->make({$expression}, \Illuminate\Support\Arr::except(get_defined_vars(), array('__data', '__path')))->render(); ?>";
     }
 
     /**
@@ -51,7 +51,7 @@ trait CompilesIncludes
     {
         $expression = $this->stripParentheses($expression);
 
-        return "<?php echo \$__env->renderWhen($expression, array_except(get_defined_vars(), array('__data', '__path'))); ?>";
+        return "<?php echo \$__env->renderWhen($expression, \Illuminate\Support\Arr::except(get_defined_vars(), array('__data', '__path'))); ?>";
     }
 
     /**
@@ -64,6 +64,6 @@ trait CompilesIncludes
     {
         $expression = $this->stripParentheses($expression);
 
-        return "<?php echo \$__env->first({$expression}, array_except(get_defined_vars(), array('__data', '__path')))->render(); ?>";
+        return "<?php echo \$__env->first({$expression}, \Illuminate\Support\Arr::except(get_defined_vars(), array('__data', '__path')))->render(); ?>";
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesLayouts.php b/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesLayouts.php
index 329a7055..67429c7f 100644
--- a/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesLayouts.php
+++ b/vendor/laravel/framework/src/Illuminate/View/Compilers/Concerns/CompilesLayouts.php
@@ -23,7 +23,7 @@ trait CompilesLayouts
     {
         $expression = $this->stripParentheses($expression);
 
-        $echo = "<?php echo \$__env->make({$expression}, array_except(get_defined_vars(), array('__data', '__path')))->render(); ?>";
+        $echo = "<?php echo \$__env->make({$expression}, \Illuminate\Support\Arr::except(get_defined_vars(), array('__data', '__path')))->render(); ?>";
 
         $this->footer[] = $echo;
 
diff --git a/vendor/laravel/framework/src/Illuminate/View/Concerns/ManagesComponents.php b/vendor/laravel/framework/src/Illuminate/View/Concerns/ManagesComponents.php
index d523f7e8..703b9c5d 100644
--- a/vendor/laravel/framework/src/Illuminate/View/Concerns/ManagesComponents.php
+++ b/vendor/laravel/framework/src/Illuminate/View/Concerns/ManagesComponents.php
@@ -88,7 +88,7 @@ trait ManagesComponents
      */
     public function slot($name, $content = null)
     {
-        if (count(func_get_args()) == 2) {
+        if (func_num_args() === 2) {
             $this->slots[$this->currentComponent()][$name] = $content;
         } else {
             if (ob_start()) {
diff --git a/vendor/laravel/framework/src/Illuminate/View/Concerns/ManagesEvents.php b/vendor/laravel/framework/src/Illuminate/View/Concerns/ManagesEvents.php
index f3d7717c..7e844b29 100644
--- a/vendor/laravel/framework/src/Illuminate/View/Concerns/ManagesEvents.php
+++ b/vendor/laravel/framework/src/Illuminate/View/Concerns/ManagesEvents.php
@@ -115,7 +115,7 @@ trait ManagesEvents
      */
     protected function buildClassEventCallback($class, $prefix)
     {
-        list($class, $method) = $this->parseClassEvent($class, $prefix);
+        [$class, $method] = $this->parseClassEvent($class, $prefix);
 
         // Once we have the class and method name, we can build the Closure to resolve
         // the instance out of the IoC container and call the method on it with the
diff --git a/vendor/laravel/framework/src/Illuminate/View/Concerns/ManagesLayouts.php b/vendor/laravel/framework/src/Illuminate/View/Concerns/ManagesLayouts.php
index 6f492d19..c1ef8714 100644
--- a/vendor/laravel/framework/src/Illuminate/View/Concerns/ManagesLayouts.php
+++ b/vendor/laravel/framework/src/Illuminate/View/Concerns/ManagesLayouts.php
@@ -77,6 +77,7 @@ trait ManagesLayouts
      *
      * @param  bool  $overwrite
      * @return string
+     *
      * @throws \InvalidArgumentException
      */
     public function stopSection($overwrite = false)
@@ -100,6 +101,7 @@ trait ManagesLayouts
      * Stop injecting content into a section and append it.
      *
      * @return string
+     *
      * @throws \InvalidArgumentException
      */
     public function appendSection()
diff --git a/vendor/laravel/framework/src/Illuminate/View/Concerns/ManagesStacks.php b/vendor/laravel/framework/src/Illuminate/View/Concerns/ManagesStacks.php
index 53af024f..4e063af1 100644
--- a/vendor/laravel/framework/src/Illuminate/View/Concerns/ManagesStacks.php
+++ b/vendor/laravel/framework/src/Illuminate/View/Concerns/ManagesStacks.php
@@ -49,6 +49,7 @@ trait ManagesStacks
      * Stop injecting content into a push section.
      *
      * @return string
+     *
      * @throws \InvalidArgumentException
      */
     public function stopPush()
@@ -104,6 +105,7 @@ trait ManagesStacks
      * Stop prepending content into a push section.
      *
      * @return string
+     *
      * @throws \InvalidArgumentException
      */
     public function stopPrepend()
diff --git a/vendor/laravel/framework/src/Illuminate/View/Engines/EngineResolver.php b/vendor/laravel/framework/src/Illuminate/View/Engines/EngineResolver.php
index b6abb68f..98d14ed6 100755
--- a/vendor/laravel/framework/src/Illuminate/View/Engines/EngineResolver.php
+++ b/vendor/laravel/framework/src/Illuminate/View/Engines/EngineResolver.php
@@ -42,6 +42,7 @@ class EngineResolver
      *
      * @param  string  $engine
      * @return \Illuminate\Contracts\View\Engine
+     *
      * @throws \InvalidArgumentException
      */
     public function resolve($engine)
@@ -54,6 +55,6 @@ class EngineResolver
             return $this->resolved[$engine] = call_user_func($this->resolvers[$engine]);
         }
 
-        throw new InvalidArgumentException("Engine $engine not found.");
+        throw new InvalidArgumentException("Engine [{$engine}] not found.");
     }
 }
diff --git a/vendor/laravel/framework/src/Illuminate/View/Factory.php b/vendor/laravel/framework/src/Illuminate/View/Factory.php
index 2b11ec54..7918155d 100755
--- a/vendor/laravel/framework/src/Illuminate/View/Factory.php
+++ b/vendor/laravel/framework/src/Illuminate/View/Factory.php
@@ -101,7 +101,7 @@ class Factory implements FactoryContract
      * Get the evaluated view contents for the given view.
      *
      * @param  string  $path
-     * @param  array   $data
+     * @param  \Illuminate\Contracts\Support\Arrayable|array   $data
      * @param  array   $mergeData
      * @return \Illuminate\Contracts\View\View
      */
@@ -118,7 +118,7 @@ class Factory implements FactoryContract
      * Get the evaluated view contents for the given view.
      *
      * @param  string  $view
-     * @param  array   $data
+     * @param  \Illuminate\Contracts\Support\Arrayable|array   $data
      * @param  array   $mergeData
      * @return \Illuminate\Contracts\View\View
      */
@@ -142,13 +142,15 @@ class Factory implements FactoryContract
      * Get the first view that actually exists from the given list.
      *
      * @param  array  $views
-     * @param  array   $data
+     * @param  \Illuminate\Contracts\Support\Arrayable|array   $data
      * @param  array   $mergeData
      * @return \Illuminate\Contracts\View\View
+     *
+     * @throws \InvalidArgumentException
      */
     public function first(array $views, $data = [], $mergeData = [])
     {
-        $view = collect($views)->first(function ($view) {
+        $view = Arr::first($views, function ($view) {
             return $this->exists($view);
         });
 
@@ -164,7 +166,7 @@ class Factory implements FactoryContract
      *
      * @param  bool  $condition
      * @param  string  $view
-     * @param  array   $data
+     * @param  \Illuminate\Contracts\Support\Arrayable|array   $data
      * @param  array   $mergeData
      * @return string
      */
@@ -240,7 +242,7 @@ class Factory implements FactoryContract
      *
      * @param  string  $view
      * @param  string  $path
-     * @param  array  $data
+     * @param  \Illuminate\Contracts\Support\Arrayable|array  $data
      * @return \Illuminate\Contracts\View\View
      */
     protected function viewInstance($view, $path, $data)
@@ -276,7 +278,7 @@ class Factory implements FactoryContract
     public function getEngineFromPath($path)
     {
         if (! $extension = $this->getExtension($path)) {
-            throw new InvalidArgumentException("Unrecognized extension in file: $path");
+            throw new InvalidArgumentException("Unrecognized extension in file: {$path}");
         }
 
         $engine = $this->extensions[$extension];
diff --git a/vendor/laravel/framework/src/Illuminate/View/FileViewFinder.php b/vendor/laravel/framework/src/Illuminate/View/FileViewFinder.php
index cf6bb8ef..4a380f9c 100755
--- a/vendor/laravel/framework/src/Illuminate/View/FileViewFinder.php
+++ b/vendor/laravel/framework/src/Illuminate/View/FileViewFinder.php
@@ -87,7 +87,7 @@ class FileViewFinder implements ViewFinderInterface
      */
     protected function findNamespacedView($name)
     {
-        list($namespace, $view) = $this->parseNamespaceSegments($name);
+        [$namespace, $view] = $this->parseNamespaceSegments($name);
 
         return $this->findInPaths($view, $this->hints[$namespace]);
     }
@@ -104,8 +104,8 @@ class FileViewFinder implements ViewFinderInterface
     {
         $segments = explode(static::HINT_PATH_DELIMITER, $name);
 
-        if (count($segments) != 2) {
-            throw new InvalidArgumentException("View [$name] has an invalid name.");
+        if (count($segments) !== 2) {
+            throw new InvalidArgumentException("View [{$name}] has an invalid name.");
         }
 
         if (! isset($this->hints[$segments[0]])) {
@@ -134,7 +134,7 @@ class FileViewFinder implements ViewFinderInterface
             }
         }
 
-        throw new InvalidArgumentException("View [$name] not found.");
+        throw new InvalidArgumentException("View [{$name}] not found.");
     }
 
     /**
diff --git a/vendor/laravel/framework/src/Illuminate/View/View.php b/vendor/laravel/framework/src/Illuminate/View/View.php
index 496eb6cb..b888860e 100755
--- a/vendor/laravel/framework/src/Illuminate/View/View.php
+++ b/vendor/laravel/framework/src/Illuminate/View/View.php
@@ -9,6 +9,7 @@ use BadMethodCallException;
 use Illuminate\Support\Str;
 use Illuminate\Support\MessageBag;
 use Illuminate\Contracts\View\Engine;
+use Illuminate\Support\Traits\Macroable;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Contracts\Support\MessageProvider;
@@ -16,6 +17,10 @@ use Illuminate\Contracts\View\View as ViewContract;
 
 class View implements ArrayAccess, ViewContract
 {
+    use Macroable {
+        __call as macroCall;
+    }
+
     /**
      * The view factory instance.
      *
@@ -159,6 +164,8 @@ class View implements ArrayAccess, ViewContract
      * Get the sections of the rendered view.
      *
      * @return string
+     *
+     * @throws \Throwable
      */
     public function renderSections()
     {
@@ -377,7 +384,7 @@ class View implements ArrayAccess, ViewContract
      * Remove a piece of bound data from the view.
      *
      * @param  string  $key
-     * @return bool
+     * @return void
      */
     public function __unset($key)
     {
@@ -395,8 +402,14 @@ class View implements ArrayAccess, ViewContract
      */
     public function __call($method, $parameters)
     {
+        if (static::hasMacro($method)) {
+            return $this->macroCall($method, $parameters);
+        }
+
         if (! Str::startsWith($method, 'with')) {
-            throw new BadMethodCallException("Method [$method] does not exist on view.");
+            throw new BadMethodCallException(sprintf(
+                'Method %s::%s does not exist.', static::class, $method
+            ));
         }
 
         return $this->with(Str::camel(substr($method, 4)), $parameters[0]);
@@ -406,6 +419,8 @@ class View implements ArrayAccess, ViewContract
      * Get the string contents of the view.
      *
      * @return string
+     *
+     * @throws \Throwable
      */
     public function __toString()
     {
diff --git a/vendor/laravel/framework/src/Illuminate/View/ViewFinderInterface.php b/vendor/laravel/framework/src/Illuminate/View/ViewFinderInterface.php
index 49d609ea..7b8a849e 100755
--- a/vendor/laravel/framework/src/Illuminate/View/ViewFinderInterface.php
+++ b/vendor/laravel/framework/src/Illuminate/View/ViewFinderInterface.php
@@ -50,7 +50,7 @@ interface ViewFinderInterface
      *
      * @param  string  $namespace
      * @param  string|array  $hints
-     * @return $this
+     * @return void
      */
     public function replaceNamespace($namespace, $hints);
 
diff --git a/vendor/laravel/framework/src/Illuminate/View/ViewName.php b/vendor/laravel/framework/src/Illuminate/View/ViewName.php
index ab5d9ce2..03efcc5a 100644
--- a/vendor/laravel/framework/src/Illuminate/View/ViewName.php
+++ b/vendor/laravel/framework/src/Illuminate/View/ViewName.php
@@ -18,7 +18,7 @@ class ViewName
             return str_replace('/', '.', $name);
         }
 
-        list($namespace, $name) = explode($delimiter, $name);
+        [$namespace, $name] = explode($delimiter, $name);
 
         return $namespace.$delimiter.str_replace('/', '.', $name);
     }
diff --git a/vendor/laravel/framework/src/Illuminate/View/composer.json b/vendor/laravel/framework/src/Illuminate/View/composer.json
index 142c7559..44ecebcc 100644
--- a/vendor/laravel/framework/src/Illuminate/View/composer.json
+++ b/vendor/laravel/framework/src/Illuminate/View/composer.json
@@ -14,13 +14,13 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/container": "5.5.*",
-        "illuminate/contracts": "5.5.*",
-        "illuminate/events": "5.5.*",
-        "illuminate/filesystem": "5.5.*",
-        "illuminate/support": "5.5.*",
-        "symfony/debug": "~3.3"
+        "php": "^7.1.3",
+        "illuminate/container": "5.7.*",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/events": "5.7.*",
+        "illuminate/filesystem": "5.7.*",
+        "illuminate/support": "5.7.*",
+        "symfony/debug": "^4.1"
     },
     "autoload": {
         "psr-4": {
@@ -29,7 +29,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "config": {
diff --git a/vendor/laravel/tinker/README.md b/vendor/laravel/tinker/README.md
index bf2cb4cb..380c97c3 100644
--- a/vendor/laravel/tinker/README.md
+++ b/vendor/laravel/tinker/README.md
@@ -17,20 +17,10 @@ To get started with Laravel Tinker, simply run:
 
     composer require laravel/tinker
 
-If you are using Laravel 5.5+, there is no need to manually register the service provider. However, if you are using an earlier version of Laravel, register the `TinkerServiceProvider` in your `app` configuration file:
-
-```php
-'providers' => [
-    // Other service providers...
-
-    Laravel\Tinker\TinkerServiceProvider::class,
-],
-```
-
 ## Basic Usage
 
 From your console, execute the `php artisan tinker` command.
 
 ## License
 
-Laravel Tinker is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)
+Laravel Tinker is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
diff --git a/vendor/laravel/tinker/config/tinker.php b/vendor/laravel/tinker/config/tinker.php
index 1341c1b0..181f0fdb 100644
--- a/vendor/laravel/tinker/config/tinker.php
+++ b/vendor/laravel/tinker/config/tinker.php
@@ -2,6 +2,21 @@
 
 return [
 
+    /*
+    |--------------------------------------------------------------------------
+    | Console Commands
+    |--------------------------------------------------------------------------
+    |
+    | This option allows you to add additional Artisan commands that should
+    | be available within the Tinker environment. Once the command is in
+    | this array you may execute the command in Tinker using its name.
+    |
+    */
+
+    'commands' => [
+        // App\Console\Commands\ExampleCommand::class,
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Alias Blacklist
diff --git a/vendor/laravel/tinker/src/Console/TinkerCommand.php b/vendor/laravel/tinker/src/Console/TinkerCommand.php
index 8985e249..a6f57275 100644
--- a/vendor/laravel/tinker/src/Console/TinkerCommand.php
+++ b/vendor/laravel/tinker/src/Console/TinkerCommand.php
@@ -54,7 +54,7 @@ class TinkerCommand extends Command
         $shell->addCommands($this->getCommands());
         $shell->setIncludes($this->argument('include'));
 
-        $path = $this->getLaravel()->basePath('vendor/composer/autoload_classmap.php');
+        $path = $this->getLaravel()->basePath().DIRECTORY_SEPARATOR.'vendor/composer/autoload_classmap.php';
 
         $loader = ClassAliasAutoloader::register($shell, $path);
 
diff --git a/vendor/laravelcollective/html/composer.json b/vendor/laravelcollective/html/composer.json
index 9746b163..c43f0b86 100755
--- a/vendor/laravelcollective/html/composer.json
+++ b/vendor/laravelcollective/html/composer.json
@@ -18,17 +18,17 @@
         }
     ],
     "require": {
-        "php": ">=7.0.0",
-        "illuminate/http": "5.5.*",
-        "illuminate/routing": "5.5.*",
-        "illuminate/session": "5.5.*",
-        "illuminate/support": "5.5.*",
-        "illuminate/view": "5.5.*"
+        "php": ">=7.1.3",
+        "illuminate/http": "5.7.*",
+        "illuminate/routing": "5.7.*",
+        "illuminate/session": "5.7.*",
+        "illuminate/support": "5.7.*",
+        "illuminate/view": "5.7.*"
     },
     "require-dev": {
-        "illuminate/database": "5.5.*",
-        "mockery/mockery": "~0.9.4",
-        "phpunit/phpunit": "~5.4"
+        "illuminate/database": "5.7.*",
+        "mockery/mockery": "~1.0",
+        "phpunit/phpunit": "~7.1"
     },
     "autoload": {
         "psr-4": {
@@ -40,7 +40,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.5-dev"
+            "dev-master": "5.7-dev"
         },
         "laravel": {
             "providers": [
diff --git a/vendor/laravelcollective/html/src/Eloquent/FormAccessible.php b/vendor/laravelcollective/html/src/Eloquent/FormAccessible.php
index 9b5d6d0a..0afd17ee 100644
--- a/vendor/laravelcollective/html/src/Eloquent/FormAccessible.php
+++ b/vendor/laravelcollective/html/src/Eloquent/FormAccessible.php
@@ -49,11 +49,11 @@ trait FormAccessible
             unset($keys[0]);
             $key = implode('.', $keys);
 
-            if ($this->hasFormMutator($key)) {
+            if (method_exists($relatedModel, 'hasFormMutator') && $key !== '' && $relatedModel->hasFormMutator($key)) {
                 return $relatedModel->getFormValue($key);
             }
 
-            return data_get($relatedModel, $key);
+            return data_get($relatedModel, empty($key)? null: $key);
         }
 
         // No form mutator, let the model resolve this
@@ -81,7 +81,7 @@ trait FormAccessible
      *
      * @return bool
      */
-    protected function hasFormMutator($key)
+    public function hasFormMutator($key)
     {
         $methods = $this->getReflection()->getMethods(ReflectionMethod::IS_PUBLIC);
 
diff --git a/vendor/laravelcollective/html/src/FormBuilder.php b/vendor/laravelcollective/html/src/FormBuilder.php
index 00ba728f..f28aaba2 100644
--- a/vendor/laravelcollective/html/src/FormBuilder.php
+++ b/vendor/laravelcollective/html/src/FormBuilder.php
@@ -49,6 +49,12 @@ class FormBuilder
      */
     protected $csrfToken;
 
+    /**
+     * Consider Request variables while auto fill.
+     * @var bool
+     */
+    protected $considerRequest = false;
+
     /**
      * The session store implementation.
      *
@@ -108,6 +114,7 @@ class FormBuilder
      * @param  \Illuminate\Contracts\Routing\UrlGenerator $url
      * @param  \Illuminate\Contracts\View\Factory         $view
      * @param  string                                     $csrfToken
+     * @param  Request                                    $request
      */
     public function __construct(HtmlBuilder $html, UrlGenerator $url, Factory $view, $csrfToken, Request $request = null)
     {
@@ -190,7 +197,7 @@ class FormBuilder
     {
         $this->model = $model;
     }
-    
+
     /**
      * Get the current model instance on the form builder.
      *
@@ -329,6 +336,20 @@ class FormBuilder
         return $this->input('password', $name, '', $options);
     }
 
+    /**
+     * Create a range input field.
+     *
+     * @param  string $name
+     * @param  string $value
+     * @param  array  $options
+     *
+     * @return \Illuminate\Support\HtmlString
+     */
+    public function range($name, $value = null, $options = [])
+    {
+        return $this->input('range', $name, $value, $options);
+    }
+
     /**
      * Create a hidden input field.
      *
@@ -464,6 +485,10 @@ class FormBuilder
      */
     public function time($name, $value = null, $options = [])
     {
+        if ($value instanceof DateTime) {
+            $value = $value->format('H:i');
+        }
+
         return $this->input('time', $name, $value, $options);
     }
 
@@ -481,6 +506,24 @@ class FormBuilder
         return $this->input('url', $name, $value, $options);
     }
 
+    /**
+     * Create a week input field.
+     *
+     * @param  string $name
+     * @param  string $value
+     * @param  array  $options
+     *
+     * @return \Illuminate\Support\HtmlString
+     */
+    public function week($name, $value = null, $options = [])
+    {
+        if ($value instanceof DateTime) {
+            $value = $value->format('Y-\WW');
+        }
+
+        return $this->input('week', $name, $value, $options);
+    }
+
     /**
      * Create a file input field.
      *
@@ -527,7 +570,7 @@ class FormBuilder
         // the element. Then we'll create the final textarea elements HTML for us.
         $options = $this->html->attributes($options);
 
-        return $this->toHtmlString('<textarea' . $options . '>' . e($value). '</textarea>');
+        return $this->toHtmlString('<textarea' . $options . '>' . e($value, false). '</textarea>');
     }
 
     /**
@@ -694,7 +737,7 @@ class FormBuilder
      */
     public function getSelectOption($display, $value, $selected, array $attributes = [], array $optgroupAttributes = [])
     {
-        if (is_array($display)) {
+        if (is_iterable($display)) {
             return $this->optionGroup($display, $value, $selected, $optgroupAttributes, $attributes);
         }
 
@@ -709,20 +752,23 @@ class FormBuilder
      * @param  string $selected
      * @param  array  $attributes
      * @param  array  $optionsAttributes
+     * @param  integer  $level
      *
      * @return \Illuminate\Support\HtmlString
      */
-    protected function optionGroup($list, $label, $selected, array $attributes = [], array $optionsAttributes = [])
+    protected function optionGroup($list, $label, $selected, array $attributes = [], array $optionsAttributes = [], $level = 0)
     {
         $html = [];
-
+        $space = str_repeat("&nbsp;", $level);
         foreach ($list as $value => $display) {
             $optionAttributes = $optionsAttributes[$value] ?? [];
-
-            $html[] = $this->option($display, $value, $selected, $optionAttributes);
+            if (is_iterable($display)) {
+                $html[] = $this->optionGroup($display, $value, $selected, $attributes, $optionAttributes, $level+5);
+            } else {
+                $html[] = $this->option($space.$display, $value, $selected, $optionAttributes);
+            }
         }
-        
-        return $this->toHtmlString('<optgroup label="' . e($label) . '"' . $this->html->attributes($attributes) . '>' . implode('', $html) . '</optgroup>');
+        return $this->toHtmlString('<optgroup label="' . e($space.$label, false) . '"' . $this->html->attributes($attributes) . '>' . implode('', $html) . '</optgroup>');
     }
 
     /**
@@ -743,7 +789,7 @@ class FormBuilder
 
         $string = '<option' . $this->html->attributes($options) . '>';
         if ($display !== null) {
-            $string .= e($display) . '</option>';
+            $string .= e($display, false) . '</option>';
         }
 
         return $this->toHtmlString($string);
@@ -766,7 +812,7 @@ class FormBuilder
             'value' => '',
         ];
 
-        return $this->toHtmlString('<option' . $this->html->attributes($options) . '>' . e($display) . '</option>');
+        return $this->toHtmlString('<option' . $this->html->attributes($options) . '>' . e($display, false) . '</option>');
     }
 
     /**
@@ -868,7 +914,7 @@ class FormBuilder
                 return $this->getRadioCheckedState($name, $value, $checked);
 
             default:
-                return $this->getValueAttribute($name) === $value;
+                return $this->compareValues($name, $value);
         }
     }
 
@@ -921,7 +967,21 @@ class FormBuilder
             return $checked;
         }
 
-        return $this->getValueAttribute($name) === $value;
+        return $this->compareValues($name, $value);
+    }
+
+    /**
+     * Determine if the provide value loosely compares to the value assigned to the field.
+     * Use loose comparison because Laravel model casting may be in affect and therefore
+     * 1 == true and 0 == false.
+     *
+     * @param  string $name
+     * @param  string $value
+     * @return bool
+     */
+    protected function compareValues($name, $value)
+    {
+        return $this->getValueAttribute($name) == $value;
     }
 
     /**
@@ -965,6 +1025,24 @@ class FormBuilder
         return $this->input('image', $name, null, $attributes);
     }
 
+    /**
+     * Create a month input field.
+     *
+     * @param  string $name
+     * @param  string $value
+     * @param  array  $options
+     *
+     * @return \Illuminate\Support\HtmlString
+     */
+    public function month($name, $value = null, $options = [])
+    {
+        if ($value instanceof DateTime) {
+            $value = $value->format('Y-m');
+        }
+
+        return $this->input('month', $name, $value, $options);
+    }
+
     /**
      * Create a color input field.
      *
@@ -1009,6 +1087,50 @@ class FormBuilder
         return $this->toHtmlString('<button' . $this->html->attributes($options) . '>' . $value . '</button>');
     }
 
+    /**
+     * Create a datalist box field.
+     *
+     * @param  string $id
+     * @param  array  $list
+     *
+     * @return \Illuminate\Support\HtmlString
+     */
+    public function datalist($id, $list = [])
+    {
+        $this->type = 'datalist';
+
+        $attributes['id'] = $id;
+
+        $html = [];
+
+        if ($this->isAssociativeArray($list)) {
+            foreach ($list as $value => $display) {
+                $html[] = $this->option($display, $value, null, []);
+            }
+        } else {
+            foreach ($list as $value) {
+                $html[] = $this->option($value, $value, null, []);
+            }
+        }
+
+        $attributes = $this->html->attributes($attributes);
+
+        $list = implode('', $html);
+
+        return $this->toHtmlString("<datalist{$attributes}>{$list}</datalist>");
+    }
+
+    /**
+     * Determine if an array is associative.
+     *
+     * @param  array $array
+     * @return bool
+     */
+    protected function isAssociativeArray($array)
+    {
+        return (array_values($array) !== $array);
+    }
+
     /**
      * Parse the form action method.
      *
@@ -1175,7 +1297,7 @@ class FormBuilder
             if ($hasNullMiddleware
                 && is_null($old)
                 && is_null($value)
-                && ! is_null($this->view->shared('errors'))
+                && !is_null($this->view->shared('errors'))
                 && count($this->view->shared('errors')) > 0
             ) {
                 return null;
@@ -1183,7 +1305,7 @@ class FormBuilder
         }
 
         $request = $this->request($name);
-        if (! is_null($request) && $name !== '_method') {
+        if (! is_null($request) && $name != '_method') {
             return $request;
         }
 
@@ -1196,6 +1318,15 @@ class FormBuilder
         }
     }
 
+    /**
+     * Take Request in fill process
+     * @param bool $consider
+     */
+    public function considerRequest($consider = true)
+    {
+        $this->considerRequest = $consider;
+    }
+
     /**
      * Get value from current Request
      * @param $name
@@ -1203,7 +1334,11 @@ class FormBuilder
      */
     protected function request($name)
     {
-        if (! isset($this->request)) {
+        if (!$this->considerRequest) {
+            return null;
+        }
+
+        if (!isset($this->request)) {
             return null;
         }
 
@@ -1241,16 +1376,16 @@ class FormBuilder
             $key = $this->transformKey($name);
             $payload = $this->session->getOldInput($key);
 
-            if (! is_array($payload)) {
+            if (!is_array($payload)) {
                 return $payload;
             }
 
-            if (! in_array($this->type, ['select', 'checkbox'])) {
-                if (! isset($this->payload[$key])) {
+            if (!in_array($this->type, ['select', 'checkbox'])) {
+                if (!isset($this->payload[$key])) {
                     $this->payload[$key] = collect($payload);
                 }
 
-                if (! empty($this->payload[$key])) {
+                if (!empty($this->payload[$key])) {
                     $value = $this->payload[$key]->shift();
                     return $value;
                 }
@@ -1267,7 +1402,7 @@ class FormBuilder
      */
     public function oldInputIsEmpty()
     {
-        return (isset($this->session) && count($this->session->getOldInput()) === 0);
+        return (isset($this->session) && count((array) $this->session->getOldInput()) === 0);
     }
 
     /**
diff --git a/vendor/laravelcollective/html/src/HtmlBuilder.php b/vendor/laravelcollective/html/src/HtmlBuilder.php
index 7eb37ae0..743b32a0 100755
--- a/vendor/laravelcollective/html/src/HtmlBuilder.php
+++ b/vendor/laravelcollective/html/src/HtmlBuilder.php
@@ -94,7 +94,7 @@ class HtmlBuilder
     {
         $defaults = ['media' => 'all', 'type' => 'text/css', 'rel' => 'stylesheet'];
 
-        $attributes = array_merge($attributes, $defaults);
+        $attributes = array_merge($defaults, $attributes);
 
         $attributes['href'] = $this->url->asset($url, $secure);
 
@@ -387,7 +387,7 @@ class HtmlBuilder
         if (is_array($value)) {
             return $this->nestedListing($key, $type, $value);
         } else {
-            return '<li>' . e($value) . '</li>';
+            return '<li>' . e($value, false) . '</li>';
         }
     }
 
@@ -455,8 +455,12 @@ class HtmlBuilder
             return $value ? $key : '';
         }
 
+        if (is_array($value) && $key === 'class') {
+            return 'class="' . implode(' ', $value) . '"';
+        }
+
         if (! is_null($value)) {
-            return $key . '="' . e($value) . '"';
+            return $key . '="' . e($value, false) . '"';
         }
     }
 
diff --git a/vendor/league/flysystem/composer.json b/vendor/league/flysystem/composer.json
index 6fc135c9..696c26fe 100644
--- a/vendor/league/flysystem/composer.json
+++ b/vendor/league/flysystem/composer.json
@@ -14,12 +14,12 @@
         }
     ],
     "require": {
-        "php": ">=5.5.9"
+        "php": ">=5.5.9",
+        "ext-fileinfo": "*"
     },
     "require-dev": {
-        "ext-fileinfo": "*",
         "phpspec/phpspec": "^3.4",
-        "phpunit/phpunit": "^5.7"
+        "phpunit/phpunit": "^5.7.10"
     },
     "autoload": {
         "psr-4": {
diff --git a/vendor/league/flysystem/deprecations.md b/vendor/league/flysystem/deprecations.md
new file mode 100644
index 00000000..ef786d16
--- /dev/null
+++ b/vendor/league/flysystem/deprecations.md
@@ -0,0 +1,19 @@
+# Deprecations
+
+This document lists all the planned deprecations.
+
+## Handlers will be removed in 2.0
+
+The `Handler` type and associated calls will be removed in version 2.0.
+
+### Upgrade path
+
+You should create your own implementation for handling OOP usage,
+but it's recommended to move away from using an OOP-style wrapper entirely.
+
+The reason for this is that it's too easy for implementation details (for
+your application this is Flysystem) to leak into the application. The most
+important part for Flysystem is that it improves portability and creates a
+solid boundary between your application core and the infrastructure you use.
+The OOP-style handling breaks this principle, therefore I want to stop
+promoting it. 
\ No newline at end of file
diff --git a/vendor/league/flysystem/src/Adapter/AbstractFtpAdapter.php b/vendor/league/flysystem/src/Adapter/AbstractFtpAdapter.php
index d4263073..932ffbbf 100644
--- a/vendor/league/flysystem/src/Adapter/AbstractFtpAdapter.php
+++ b/vendor/league/flysystem/src/Adapter/AbstractFtpAdapter.php
@@ -71,11 +71,6 @@ abstract class AbstractFtpAdapter extends AbstractAdapter
      */
     protected $systemType;
 
-    /**
-     * @var bool
-     */
-    protected $alternativeRecursion = false;
-
     /**
      * @var SafeStorage
      */
diff --git a/vendor/league/flysystem/src/Adapter/Local.php b/vendor/league/flysystem/src/Adapter/Local.php
index 3e3c8276..238d91fe 100644
--- a/vendor/league/flysystem/src/Adapter/Local.php
+++ b/vendor/league/flysystem/src/Adapter/Local.php
@@ -150,18 +150,11 @@ class Local extends AbstractAdapter
         $this->ensureDirectory(dirname($location));
         $stream = fopen($location, 'w+b');
 
-        if ( ! $stream) {
-            return false;
-        }
-
-        stream_copy_to_stream($resource, $stream);
-
-        if ( ! fclose($stream)) {
+        if ( ! $stream || stream_copy_to_stream($resource, $stream) === false || ! fclose($stream)) {
             return false;
         }
 
         $type = 'file';
-
         $result = compact('type', 'path');
 
         if ($visibility = $config->get('visibility')) {
@@ -261,7 +254,7 @@ class Local extends AbstractAdapter
     {
         $location = $this->applyPathPrefix($path);
 
-        return unlink($location);
+        return @unlink($location);
     }
 
     /**
diff --git a/vendor/league/flysystem/src/MountManager.php b/vendor/league/flysystem/src/MountManager.php
index 6dea2001..620f540e 100644
--- a/vendor/league/flysystem/src/MountManager.php
+++ b/vendor/league/flysystem/src/MountManager.php
@@ -3,7 +3,6 @@
 namespace League\Flysystem;
 
 use InvalidArgumentException;
-use League\Flysystem\FilesystemNotFoundException;
 use League\Flysystem\Plugin\PluggableTrait;
 use League\Flysystem\Plugin\PluginNotFoundException;
 
@@ -14,36 +13,15 @@ use League\Flysystem\Plugin\PluginNotFoundException;
  *
  * @method AdapterInterface getAdapter($prefix)
  * @method Config getConfig($prefix)
- * @method bool has($path)
- * @method bool write($path, $contents, array $config = [])
- * @method bool writeStream($path, $resource, array $config = [])
- * @method bool put($path, $contents, $config = [])
- * @method bool putStream($path, $contents, $config = [])
- * @method string readAndDelete($path)
- * @method bool update($path, $contents, $config = [])
- * @method bool updateStream($path, $resource, $config = [])
- * @method string|false read($path)
- * @method resource|false readStream($path)
- * @method bool rename($path, $newpath)
- * @method bool delete($path)
- * @method bool deleteDir($dirname)
- * @method bool createDir($dirname, $config = [])
  * @method array listFiles($directory = '', $recursive = false)
  * @method array listPaths($directory = '', $recursive = false)
  * @method array getWithMetadata($path, array $metadata)
- * @method string|false getMimetype($path)
- * @method int|false getTimestamp($path)
- * @method string|false getVisibility($path)
- * @method int|false getSize($path);
- * @method bool setVisibility($path, $visibility)
- * @method array|false getMetadata($path)
- * @method Handler get($path, Handler $handler = null)
  * @method Filesystem flushCache()
  * @method void assertPresent($path)
  * @method void assertAbsent($path)
  * @method Filesystem addPlugin(PluginInterface $plugin)
  */
-class MountManager
+class MountManager implements FilesystemInterface
 {
     use PluggableTrait;
 
@@ -195,6 +173,7 @@ class MountManager
      *
      * @throws InvalidArgumentException
      * @throws FilesystemNotFoundException
+     * @throws FileExistsException
      *
      * @return bool
      */
@@ -317,4 +296,353 @@ class MountManager
 
         return explode('://', $path, 2);
     }
+
+    /**
+     * Check whether a file exists.
+     *
+     * @param string $path
+     *
+     * @return bool
+     */
+    public function has($path)
+    {
+        list($prefix, $path) = $this->getPrefixAndPath($path);
+
+        return $this->getFilesystem($prefix)->has($path);
+    }
+
+    /**
+     * Read a file.
+     *
+     * @param string $path The path to the file.
+     *
+     * @throws FileNotFoundException
+     *
+     * @return string|false The file contents or false on failure.
+     */
+    public function read($path)
+    {
+        list($prefix, $path) = $this->getPrefixAndPath($path);
+
+        return $this->getFilesystem($prefix)->read($path);
+    }
+
+    /**
+     * Retrieves a read-stream for a path.
+     *
+     * @param string $path The path to the file.
+     *
+     * @throws FileNotFoundException
+     *
+     * @return resource|false The path resource or false on failure.
+     */
+    public function readStream($path)
+    {
+        list($prefix, $path) = $this->getPrefixAndPath($path);
+
+        return $this->getFilesystem($prefix)->readStream($path);
+    }
+
+    /**
+     * Get a file's metadata.
+     *
+     * @param string $path The path to the file.
+     *
+     * @throws FileNotFoundException
+     *
+     * @return array|false The file metadata or false on failure.
+     */
+    public function getMetadata($path)
+    {
+        list($prefix, $path) = $this->getPrefixAndPath($path);
+
+        return $this->getFilesystem($prefix)->getMetadata($path);
+    }
+
+    /**
+     * Get a file's size.
+     *
+     * @param string $path The path to the file.
+     *
+     * @throws FileNotFoundException
+     *
+     * @return int|false The file size or false on failure.
+     */
+    public function getSize($path)
+    {
+        list($prefix, $path) = $this->getPrefixAndPath($path);
+
+        return $this->getFilesystem($prefix)->getSize($path);
+    }
+
+    /**
+     * Get a file's mime-type.
+     *
+     * @param string $path The path to the file.
+     *
+     * @throws FileNotFoundException
+     *
+     * @return string|false The file mime-type or false on failure.
+     */
+    public function getMimetype($path)
+    {
+        list($prefix, $path) = $this->getPrefixAndPath($path);
+
+        return $this->getFilesystem($prefix)->getMimetype($path);
+    }
+
+    /**
+     * Get a file's timestamp.
+     *
+     * @param string $path The path to the file.
+     *
+     * @throws FileNotFoundException
+     *
+     * @return string|false The timestamp or false on failure.
+     */
+    public function getTimestamp($path)
+    {
+        list($prefix, $path) = $this->getPrefixAndPath($path);
+
+        return $this->getFilesystem($prefix)->getTimestamp($path);
+    }
+
+    /**
+     * Get a file's visibility.
+     *
+     * @param string $path The path to the file.
+     *
+     * @throws FileNotFoundException
+     *
+     * @return string|false The visibility (public|private) or false on failure.
+     */
+    public function getVisibility($path)
+    {
+        list($prefix, $path) = $this->getPrefixAndPath($path);
+
+        return $this->getFilesystem($prefix)->getVisibility($path);
+    }
+
+    /**
+     * Write a new file.
+     *
+     * @param string $path     The path of the new file.
+     * @param string $contents The file contents.
+     * @param array  $config   An optional configuration array.
+     *
+     * @throws FileExistsException
+     *
+     * @return bool True on success, false on failure.
+     */
+    public function write($path, $contents, array $config = [])
+    {
+        list($prefix, $path) = $this->getPrefixAndPath($path);
+
+        return $this->getFilesystem($prefix)->write($path, $contents, $config);
+    }
+
+    /**
+     * Write a new file using a stream.
+     *
+     * @param string   $path     The path of the new file.
+     * @param resource $resource The file handle.
+     * @param array    $config   An optional configuration array.
+     *
+     * @throws InvalidArgumentException If $resource is not a file handle.
+     * @throws FileExistsException
+     *
+     * @return bool True on success, false on failure.
+     */
+    public function writeStream($path, $resource, array $config = [])
+    {
+        list($prefix, $path) = $this->getPrefixAndPath($path);
+
+        return $this->getFilesystem($prefix)->writeStream($path, $resource, $config);
+    }
+
+    /**
+     * Update an existing file.
+     *
+     * @param string $path     The path of the existing file.
+     * @param string $contents The file contents.
+     * @param array  $config   An optional configuration array.
+     *
+     * @throws FileNotFoundException
+     *
+     * @return bool True on success, false on failure.
+     */
+    public function update($path, $contents, array $config = [])
+    {
+        list($prefix, $path) = $this->getPrefixAndPath($path);
+
+        return $this->getFilesystem($prefix)->update($path, $contents, $config);
+    }
+
+    /**
+     * Update an existing file using a stream.
+     *
+     * @param string   $path     The path of the existing file.
+     * @param resource $resource The file handle.
+     * @param array    $config   An optional configuration array.
+     *
+     * @throws InvalidArgumentException If $resource is not a file handle.
+     * @throws FileNotFoundException
+     *
+     * @return bool True on success, false on failure.
+     */
+    public function updateStream($path, $resource, array $config = [])
+    {
+        list($prefix, $path) = $this->getPrefixAndPath($path);
+
+        return $this->getFilesystem($prefix)->updateStream($path, $resource, $config);
+    }
+
+    /**
+     * Rename a file.
+     *
+     * @param string $path    Path to the existing file.
+     * @param string $newpath The new path of the file.
+     *
+     * @throws FileExistsException   Thrown if $newpath exists.
+     * @throws FileNotFoundException Thrown if $path does not exist.
+     *
+     * @return bool True on success, false on failure.
+     */
+    public function rename($path, $newpath)
+    {
+        list($prefix, $path) = $this->getPrefixAndPath($path);
+
+        return $this->getFilesystem($prefix)->rename($path, $newpath);
+    }
+
+    /**
+     * Delete a file.
+     *
+     * @param string $path
+     *
+     * @throws FileNotFoundException
+     *
+     * @return bool True on success, false on failure.
+     */
+    public function delete($path)
+    {
+        list($prefix, $path) = $this->getPrefixAndPath($path);
+
+        return $this->getFilesystem($prefix)->delete($path);
+    }
+
+    /**
+     * Delete a directory.
+     *
+     * @param string $dirname
+     *
+     * @throws RootViolationException Thrown if $dirname is empty.
+     *
+     * @return bool True on success, false on failure.
+     */
+    public function deleteDir($dirname)
+    {
+        list($prefix, $dirname) = $this->getPrefixAndPath($dirname);
+
+        return $this->getFilesystem($prefix)->deleteDir($dirname);
+    }
+
+    /**
+     * Create a directory.
+     *
+     * @param string $dirname The name of the new directory.
+     * @param array  $config  An optional configuration array.
+     *
+     * @return bool True on success, false on failure.
+     */
+    public function createDir($dirname, array $config = [])
+    {
+        list($prefix, $dirname) = $this->getPrefixAndPath($dirname);
+
+        return $this->getFilesystem($prefix)->createDir($dirname);
+    }
+
+    /**
+     * Set the visibility for a file.
+     *
+     * @param string $path       The path to the file.
+     * @param string $visibility One of 'public' or 'private'.
+     *
+     * @throws FileNotFoundException
+     *
+     * @return bool True on success, false on failure.
+     */
+    public function setVisibility($path, $visibility)
+    {
+        list($prefix, $path) = $this->getPrefixAndPath($path);
+
+        return $this->getFilesystem($prefix)->setVisibility($path, $visibility);
+    }
+
+    /**
+     * Create a file or update if exists.
+     *
+     * @param string $path     The path to the file.
+     * @param string $contents The file contents.
+     * @param array  $config   An optional configuration array.
+     *
+     * @return bool True on success, false on failure.
+     */
+    public function put($path, $contents, array $config = [])
+    {
+        list($prefix, $path) = $this->getPrefixAndPath($path);
+
+        return $this->getFilesystem($prefix)->put($path, $contents, $config);
+    }
+
+    /**
+     * Create a file or update if exists.
+     *
+     * @param string   $path     The path to the file.
+     * @param resource $resource The file handle.
+     * @param array    $config   An optional configuration array.
+     *
+     * @throws InvalidArgumentException Thrown if $resource is not a resource.
+     *
+     * @return bool True on success, false on failure.
+     */
+    public function putStream($path, $resource, array $config = [])
+    {
+        list($prefix, $path) = $this->getPrefixAndPath($path);
+
+        return $this->getFilesystem($prefix)->putStream($path, $resource, $config);
+    }
+
+    /**
+     * Read and delete a file.
+     *
+     * @param string $path The path to the file.
+     *
+     * @throws FileNotFoundException
+     *
+     * @return string|false The file contents, or false on failure.
+     */
+    public function readAndDelete($path)
+    {
+        list($prefix, $path) = $this->getPrefixAndPath($path);
+
+        return $this->getFilesystem($prefix)->readAndDelete($path);
+    }
+
+    /**
+     * Get a file/directory handler.
+     *
+     * @deprecated
+     *
+     * @param string  $path    The path to the file.
+     * @param Handler $handler An optional existing handler to populate.
+     *
+     * @return Handler Either a file or directory handler.
+     */
+    public function get($path, Handler $handler = null)
+    {
+        list($prefix, $path) = $this->getPrefixAndPath($path);
+
+        return $this->getFilesystem($prefix)->get($path);
+    }
 }
diff --git a/vendor/league/flysystem/src/Util/MimeType.php b/vendor/league/flysystem/src/Util/MimeType.php
index 69e35e72..58622a2e 100644
--- a/vendor/league/flysystem/src/Util/MimeType.php
+++ b/vendor/league/flysystem/src/Util/MimeType.php
@@ -10,6 +10,165 @@ use ErrorException;
  */
 class MimeType
 {
+    protected static $extensionToMimeTypeMap = [
+        'hqx'   => 'application/mac-binhex40',
+        'cpt'   => 'application/mac-compactpro',
+        'csv'   => 'text/x-comma-separated-values',
+        'bin'   => 'application/octet-stream',
+        'dms'   => 'application/octet-stream',
+        'lha'   => 'application/octet-stream',
+        'lzh'   => 'application/octet-stream',
+        'exe'   => 'application/octet-stream',
+        'class' => 'application/octet-stream',
+        'psd'   => 'application/x-photoshop',
+        'so'    => 'application/octet-stream',
+        'sea'   => 'application/octet-stream',
+        'dll'   => 'application/octet-stream',
+        'oda'   => 'application/oda',
+        'pdf'   => 'application/pdf',
+        'ai'    => 'application/pdf',
+        'eps'   => 'application/postscript',
+        'epub'  => 'application/epub+zip',
+        'ps'    => 'application/postscript',
+        'smi'   => 'application/smil',
+        'smil'  => 'application/smil',
+        'mif'   => 'application/vnd.mif',
+        'xls'   => 'application/vnd.ms-excel',
+        'ppt'   => 'application/powerpoint',
+        'pptx'  => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+        'wbxml' => 'application/wbxml',
+        'wmlc'  => 'application/wmlc',
+        'dcr'   => 'application/x-director',
+        'dir'   => 'application/x-director',
+        'dxr'   => 'application/x-director',
+        'dvi'   => 'application/x-dvi',
+        'gtar'  => 'application/x-gtar',
+        'gz'    => 'application/x-gzip',
+        'gzip'  => 'application/x-gzip',
+        'php'   => 'application/x-httpd-php',
+        'php4'  => 'application/x-httpd-php',
+        'php3'  => 'application/x-httpd-php',
+        'phtml' => 'application/x-httpd-php',
+        'phps'  => 'application/x-httpd-php-source',
+        'js'    => 'application/javascript',
+        'swf'   => 'application/x-shockwave-flash',
+        'sit'   => 'application/x-stuffit',
+        'tar'   => 'application/x-tar',
+        'tgz'   => 'application/x-tar',
+        'z'     => 'application/x-compress',
+        'xhtml' => 'application/xhtml+xml',
+        'xht'   => 'application/xhtml+xml',
+        'zip'   => 'application/x-zip',
+        'rar'   => 'application/x-rar',
+        'mid'   => 'audio/midi',
+        'midi'  => 'audio/midi',
+        'mpga'  => 'audio/mpeg',
+        'mp2'   => 'audio/mpeg',
+        'mp3'   => 'audio/mpeg',
+        'aif'   => 'audio/x-aiff',
+        'aiff'  => 'audio/x-aiff',
+        'aifc'  => 'audio/x-aiff',
+        'ram'   => 'audio/x-pn-realaudio',
+        'rm'    => 'audio/x-pn-realaudio',
+        'rpm'   => 'audio/x-pn-realaudio-plugin',
+        'ra'    => 'audio/x-realaudio',
+        'rv'    => 'video/vnd.rn-realvideo',
+        'wav'   => 'audio/x-wav',
+        'jpg'   => 'image/jpeg',
+        'jpeg'  => 'image/jpeg',
+        'jpe'   => 'image/jpeg',
+        'png'   => 'image/png',
+        'gif'   => 'image/gif',
+        'bmp'   => 'image/bmp',
+        'tiff'  => 'image/tiff',
+        'tif'   => 'image/tiff',
+        'svg'   => 'image/svg+xml',
+        'css'   => 'text/css',
+        'html'  => 'text/html',
+        'htm'   => 'text/html',
+        'shtml' => 'text/html',
+        'txt'   => 'text/plain',
+        'text'  => 'text/plain',
+        'log'   => 'text/plain',
+        'rtx'   => 'text/richtext',
+        'rtf'   => 'text/rtf',
+        'xml'   => 'application/xml',
+        'xsl'   => 'application/xml',
+        'dmn'   => 'application/octet-stream',
+        'bpmn'  => 'application/octet-stream',
+        'mpeg'  => 'video/mpeg',
+        'mpg'   => 'video/mpeg',
+        'mpe'   => 'video/mpeg',
+        'qt'    => 'video/quicktime',
+        'mov'   => 'video/quicktime',
+        'avi'   => 'video/x-msvideo',
+        'movie' => 'video/x-sgi-movie',
+        'doc'   => 'application/msword',
+        'docx'  => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+        'docm'  => 'application/vnd.ms-word.template.macroEnabled.12',
+        'dot'   => 'application/msword',
+        'dotx'  => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+        'xlsx'  => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+        'word'  => 'application/msword',
+        'xl'    => 'application/excel',
+        'eml'   => 'message/rfc822',
+        'json'  => 'application/json',
+        'pem'   => 'application/x-x509-user-cert',
+        'p10'   => 'application/x-pkcs10',
+        'p12'   => 'application/x-pkcs12',
+        'p7a'   => 'application/x-pkcs7-signature',
+        'p7c'   => 'application/pkcs7-mime',
+        'p7m'   => 'application/pkcs7-mime',
+        'p7r'   => 'application/x-pkcs7-certreqresp',
+        'p7s'   => 'application/pkcs7-signature',
+        'crt'   => 'application/x-x509-ca-cert',
+        'crl'   => 'application/pkix-crl',
+        'der'   => 'application/x-x509-ca-cert',
+        'kdb'   => 'application/octet-stream',
+        'pgp'   => 'application/pgp',
+        'gpg'   => 'application/gpg-keys',
+        'sst'   => 'application/octet-stream',
+        'csr'   => 'application/octet-stream',
+        'rsa'   => 'application/x-pkcs7',
+        'cer'   => 'application/pkix-cert',
+        '3g2'   => 'video/3gpp2',
+        '3gp'   => 'video/3gp',
+        'mp4'   => 'video/mp4',
+        'm4a'   => 'audio/x-m4a',
+        'f4v'   => 'video/mp4',
+        'webm'  => 'video/webm',
+        'aac'   => 'audio/x-acc',
+        'm4u'   => 'application/vnd.mpegurl',
+        'm3u'   => 'text/plain',
+        'xspf'  => 'application/xspf+xml',
+        'vlc'   => 'application/videolan',
+        'wmv'   => 'video/x-ms-wmv',
+        'au'    => 'audio/x-au',
+        'ac3'   => 'audio/ac3',
+        'flac'  => 'audio/x-flac',
+        'ogg'   => 'audio/ogg',
+        'kmz'   => 'application/vnd.google-earth.kmz',
+        'kml'   => 'application/vnd.google-earth.kml+xml',
+        'ics'   => 'text/calendar',
+        'zsh'   => 'text/x-scriptzsh',
+        '7zip'  => 'application/x-7z-compressed',
+        'cdr'   => 'application/cdr',
+        'wma'   => 'audio/x-ms-wma',
+        'jar'   => 'application/java-archive',
+        'tex'   => 'application/x-tex',
+        'latex' => 'application/x-latex',
+        'odt'   => 'application/vnd.oasis.opendocument.text',
+        'ods'   => 'application/vnd.oasis.opendocument.spreadsheet',
+        'odp'   => 'application/vnd.oasis.opendocument.presentation',
+        'odg'   => 'application/vnd.oasis.opendocument.graphics',
+        'odc'   => 'application/vnd.oasis.opendocument.chart',
+        'odf'   => 'application/vnd.oasis.opendocument.formula',
+        'odi'   => 'application/vnd.oasis.opendocument.image',
+        'odm'   => 'application/vnd.oasis.opendocument.text-master',
+        'odb'   => 'application/vnd.oasis.opendocument.database',
+        'ott'   => 'application/vnd.oasis.opendocument.text-template',
+    ];
+
     /**
      * Detects MIME Type based on given content.
      *
@@ -41,17 +200,9 @@ class MimeType
      */
     public static function detectByFileExtension($extension)
     {
-        static $extensionToMimeTypeMap;
-
-        if (! $extensionToMimeTypeMap) {
-            $extensionToMimeTypeMap = static::getExtensionToMimeTypeMap();
-        }
-
-        if (isset($extensionToMimeTypeMap[$extension])) {
-            return $extensionToMimeTypeMap[$extension];
-        }
-
-        return 'text/plain';
+        return isset(static::$extensionToMimeTypeMap[$extension])
+            ? static::$extensionToMimeTypeMap[$extension]
+            : 'text/plain';
     }
 
     /**
@@ -71,162 +222,6 @@ class MimeType
      */
     public static function getExtensionToMimeTypeMap()
     {
-        return [
-            'hqx'   => 'application/mac-binhex40',
-            'cpt'   => 'application/mac-compactpro',
-            'csv'   => 'text/x-comma-separated-values',
-            'bin'   => 'application/octet-stream',
-            'dms'   => 'application/octet-stream',
-            'lha'   => 'application/octet-stream',
-            'lzh'   => 'application/octet-stream',
-            'exe'   => 'application/octet-stream',
-            'class' => 'application/octet-stream',
-            'psd'   => 'application/x-photoshop',
-            'so'    => 'application/octet-stream',
-            'sea'   => 'application/octet-stream',
-            'dll'   => 'application/octet-stream',
-            'oda'   => 'application/oda',
-            'pdf'   => 'application/pdf',
-            'ai'    => 'application/pdf',
-            'eps'   => 'application/postscript',
-            'ps'    => 'application/postscript',
-            'smi'   => 'application/smil',
-            'smil'  => 'application/smil',
-            'mif'   => 'application/vnd.mif',
-            'xls'   => 'application/vnd.ms-excel',
-            'ppt'   => 'application/powerpoint',
-            'pptx'  => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-            'wbxml' => 'application/wbxml',
-            'wmlc'  => 'application/wmlc',
-            'dcr'   => 'application/x-director',
-            'dir'   => 'application/x-director',
-            'dxr'   => 'application/x-director',
-            'dvi'   => 'application/x-dvi',
-            'gtar'  => 'application/x-gtar',
-            'gz'    => 'application/x-gzip',
-            'gzip'  => 'application/x-gzip',
-            'php'   => 'application/x-httpd-php',
-            'php4'  => 'application/x-httpd-php',
-            'php3'  => 'application/x-httpd-php',
-            'phtml' => 'application/x-httpd-php',
-            'phps'  => 'application/x-httpd-php-source',
-            'js'    => 'application/javascript',
-            'swf'   => 'application/x-shockwave-flash',
-            'sit'   => 'application/x-stuffit',
-            'tar'   => 'application/x-tar',
-            'tgz'   => 'application/x-tar',
-            'z'     => 'application/x-compress',
-            'xhtml' => 'application/xhtml+xml',
-            'xht'   => 'application/xhtml+xml',
-            'zip'   => 'application/x-zip',
-            'rar'   => 'application/x-rar',
-            'mid'   => 'audio/midi',
-            'midi'  => 'audio/midi',
-            'mpga'  => 'audio/mpeg',
-            'mp2'   => 'audio/mpeg',
-            'mp3'   => 'audio/mpeg',
-            'aif'   => 'audio/x-aiff',
-            'aiff'  => 'audio/x-aiff',
-            'aifc'  => 'audio/x-aiff',
-            'ram'   => 'audio/x-pn-realaudio',
-            'rm'    => 'audio/x-pn-realaudio',
-            'rpm'   => 'audio/x-pn-realaudio-plugin',
-            'ra'    => 'audio/x-realaudio',
-            'rv'    => 'video/vnd.rn-realvideo',
-            'wav'   => 'audio/x-wav',
-            'jpg'   => 'image/jpeg',
-            'jpeg'  => 'image/jpeg',
-            'jpe'   => 'image/jpeg',
-            'png'   => 'image/png',
-            'gif'   => 'image/gif',
-            'bmp'   => 'image/bmp',
-            'tiff'  => 'image/tiff',
-            'tif'   => 'image/tiff',
-            'svg'   => 'image/svg+xml',
-            'css'   => 'text/css',
-            'html'  => 'text/html',
-            'htm'   => 'text/html',
-            'shtml' => 'text/html',
-            'txt'   => 'text/plain',
-            'text'  => 'text/plain',
-            'log'   => 'text/plain',
-            'rtx'   => 'text/richtext',
-            'rtf'   => 'text/rtf',
-            'xml'   => 'application/xml',
-            'xsl'   => 'application/xml',
-            'dmn'   => 'application/octet-stream',
-            'bpmn'  => 'application/octet-stream',
-            'mpeg'  => 'video/mpeg',
-            'mpg'   => 'video/mpeg',
-            'mpe'   => 'video/mpeg',
-            'qt'    => 'video/quicktime',
-            'mov'   => 'video/quicktime',
-            'avi'   => 'video/x-msvideo',
-            'movie' => 'video/x-sgi-movie',
-            'doc'   => 'application/msword',
-            'docx'  => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-            'docm'  => 'application/vnd.ms-word.template.macroEnabled.12',
-            'dot'   => 'application/msword',
-            'dotx'  => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-            'xlsx'  => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-            'word'  => 'application/msword',
-            'xl'    => 'application/excel',
-            'eml'   => 'message/rfc822',
-            'json'  => 'application/json',
-            'pem'   => 'application/x-x509-user-cert',
-            'p10'   => 'application/x-pkcs10',
-            'p12'   => 'application/x-pkcs12',
-            'p7a'   => 'application/x-pkcs7-signature',
-            'p7c'   => 'application/pkcs7-mime',
-            'p7m'   => 'application/pkcs7-mime',
-            'p7r'   => 'application/x-pkcs7-certreqresp',
-            'p7s'   => 'application/pkcs7-signature',
-            'crt'   => 'application/x-x509-ca-cert',
-            'crl'   => 'application/pkix-crl',
-            'der'   => 'application/x-x509-ca-cert',
-            'kdb'   => 'application/octet-stream',
-            'pgp'   => 'application/pgp',
-            'gpg'   => 'application/gpg-keys',
-            'sst'   => 'application/octet-stream',
-            'csr'   => 'application/octet-stream',
-            'rsa'   => 'application/x-pkcs7',
-            'cer'   => 'application/pkix-cert',
-            '3g2'   => 'video/3gpp2',
-            '3gp'   => 'video/3gp',
-            'mp4'   => 'video/mp4',
-            'm4a'   => 'audio/x-m4a',
-            'f4v'   => 'video/mp4',
-            'webm'  => 'video/webm',
-            'aac'   => 'audio/x-acc',
-            'm4u'   => 'application/vnd.mpegurl',
-            'm3u'   => 'text/plain',
-            'xspf'  => 'application/xspf+xml',
-            'vlc'   => 'application/videolan',
-            'wmv'   => 'video/x-ms-wmv',
-            'au'    => 'audio/x-au',
-            'ac3'   => 'audio/ac3',
-            'flac'  => 'audio/x-flac',
-            'ogg'   => 'audio/ogg',
-            'kmz'   => 'application/vnd.google-earth.kmz',
-            'kml'   => 'application/vnd.google-earth.kml+xml',
-            'ics'   => 'text/calendar',
-            'zsh'   => 'text/x-scriptzsh',
-            '7zip'  => 'application/x-7z-compressed',
-            'cdr'   => 'application/cdr',
-            'wma'   => 'audio/x-ms-wma',
-            'jar'   => 'application/java-archive',
-            'tex'   => 'application/x-tex',
-            'latex' => 'application/x-latex',
-            'odt'   => 'application/vnd.oasis.opendocument.text',
-            'ods'   => 'application/vnd.oasis.opendocument.spreadsheet',
-            'odp'   => 'application/vnd.oasis.opendocument.presentation',
-            'odg'   => 'application/vnd.oasis.opendocument.graphics',
-            'odc'   => 'application/vnd.oasis.opendocument.chart',
-            'odf'   => 'application/vnd.oasis.opendocument.formula',
-            'odi'   => 'application/vnd.oasis.opendocument.image',
-            'odm'   => 'application/vnd.oasis.opendocument.text-master',
-            'odb'   => 'application/vnd.oasis.opendocument.database',
-            'ott'   => 'application/vnd.oasis.opendocument.text-template',
-        ];
+        return static::$extensionToMimeTypeMap;
     }
 }
diff --git a/vendor/mockery/mockery/.gitignore b/vendor/mockery/mockery/.gitignore
index cef6c54e..062faccc 100644
--- a/vendor/mockery/mockery/.gitignore
+++ b/vendor/mockery/mockery/.gitignore
@@ -12,3 +12,4 @@ phpunit.xml
 .idea/*
 .php_cs.cache
 docs/api
+phpDocumentor.phar*
diff --git a/vendor/mockery/mockery/.phpstorm.meta.php b/vendor/mockery/mockery/.phpstorm.meta.php
new file mode 100644
index 00000000..6c53f80c
--- /dev/null
+++ b/vendor/mockery/mockery/.phpstorm.meta.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace PHPSTORM_META;
+
+override(\Mockery::mock(0), type(0));
+override(\Mockery::spy(0), type(0));
+override(\Mockery::namedMock(0), type(0));
+override(\Mockery::instanceMock(0), type(0));
+override(\mock(0), type(0));
+override(\spy(0), type(0));
+override(\namedMock(0), type(0));
\ No newline at end of file
diff --git a/vendor/mockery/mockery/.styleci.yml b/vendor/mockery/mockery/.styleci.yml
index cadbbdc2..12423d91 100644
--- a/vendor/mockery/mockery/.styleci.yml
+++ b/vendor/mockery/mockery/.styleci.yml
@@ -2,5 +2,6 @@ preset: psr2
 
 finder:
   not-name:
+    - MethodWithHHVMReturnType.php
     - MockingParameterAndReturnTypesTest.php
     - SemiReservedWordsAsMethods.php
diff --git a/vendor/mockery/mockery/.travis.yml b/vendor/mockery/mockery/.travis.yml
index f2ed8f80..8d568a17 100644
--- a/vendor/mockery/mockery/.travis.yml
+++ b/vendor/mockery/mockery/.travis.yml
@@ -72,13 +72,18 @@ before_script:
     fi
 
 script:
-  - vendor/bin/phpunit --coverage-text --coverage-clover=${clover=build/logs/clover.xml}
+- |
+    if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then
+      ./vendor/bin/phpunit --coverage-text --coverage-clover="build/logs/clover.xml" --testsuite="Mockery Test Suite PHP56";
+    else
+      ./vendor/bin/phpunit --coverage-text --coverage-clover="build/logs/clover.xml" --testsuite="Mockery Test Suite";
+    fi
 
 after_success:
   - composer require satooshi/php-coveralls
   - vendor/bin/coveralls -v
   - wget https://scrutinizer-ci.com/ocular.phar
-  - php ocular.phar code-coverage:upload --format=php-clover "$clover"
+  - php ocular.phar code-coverage:upload --format=php-clover "build/logs/clover.xml"
   - make apidocs
 
 notifications:
diff --git a/vendor/mockery/mockery/CHANGELOG.md b/vendor/mockery/mockery/CHANGELOG.md
index 3e742e5a..ba8a3e67 100644
--- a/vendor/mockery/mockery/CHANGELOG.md
+++ b/vendor/mockery/mockery/CHANGELOG.md
@@ -1,6 +1,16 @@
 # Change Log
 
-## x.y.z. (unreleased)
+## x.y.z (unreleased)
+
+## 1.2.0 (2018-10-02)
+
+* Starts counting default expectations towards count (#910)
+* Adds workaround for some HHVM return types (#909)
+* Adds PhpStorm metadata support for autocomplete etc (#904)
+* Further attempts to support multiple PHPUnit versions (#903)
+* Allows setting constructor expectations on instance mocks (#900)
+* Adds workaround for HHVM memoization decorator (#893)
+* Adds experimental support for callable spys (#712)
 
 ## 1.1.0 (2018-05-08)
 
@@ -23,6 +33,7 @@
 * Fix internal error when using --static-backup (#845)
 * Adds `andAnyOtherArgs` as an optional argument matcher (#860)
 * Fixes namespace qualifying with namespaced named mocks (#872)
+* Added possibility to add Constructor-Expections on hard dependencies, read: Mockery::mock('overload:...') (#781)
 
 ## 1.0.0 (2017-09-06)
 
@@ -50,7 +61,6 @@
 * BC BREAK - Fix Mockery not trying default expectations if there is any concrete expectation
 * BC BREAK - Mockery's PHPUnit integration will mark a test as risky if it
   thinks one it's exceptions has been swallowed in PHPUnit > 5.7.6. Use `$e->dismiss()` to dismiss.
-
  
 ## 0.9.4 (XXXX-XX-XX)
 
diff --git a/vendor/mockery/mockery/CONTRIBUTING.md b/vendor/mockery/mockery/CONTRIBUTING.md
index 9992dc43..b714f3f4 100644
--- a/vendor/mockery/mockery/CONTRIBUTING.md
+++ b/vendor/mockery/mockery/CONTRIBUTING.md
@@ -74,7 +74,7 @@ to run the unit tests. If everything goes to plan, there will be no failed tests
 
 ## Debugging Mockery
 
-Mockery and it's code generation can be difficult to debug. A good start is to
+Mockery and its code generation can be difficult to debug. A good start is to
 use the `RequireLoader`, which will dump the code generated by mockery to a file
 before requiring it, rather than using eval. This will help with stack traces,
 and you will be able to open the mock class in your editor.
diff --git a/vendor/mockery/mockery/Makefile b/vendor/mockery/mockery/Makefile
index db8dcd91..c312f705 100644
--- a/vendor/mockery/mockery/Makefile
+++ b/vendor/mockery/mockery/Makefile
@@ -11,9 +11,13 @@ test: deps
 .PHONY: apidocs
 apidocs: docs/api/index.html
 
+phpDocumentor.phar: 
+	wget https://github.com/phpDocumentor/phpDocumentor2/releases/download/v3.0.0-alpha.2-nightly-gdff5545/phpDocumentor.phar
+	wget https://github.com/phpDocumentor/phpDocumentor2/releases/download/v3.0.0-alpha.2-nightly-gdff5545/phpDocumentor.phar.pubkey
+
 library_files=$(shell find library -name '*.php')
-docs/api/index.html: vendor/composer/installed.json $(library_files) 
-	vendor/bin/phpdoc -d library -t docs/api
+docs/api/index.html: vendor/composer/installed.json $(library_files) phpDocumentor.phar
+	php phpDocumentor.phar run -d library -t docs/api
 
 .PHONY: test-all
 test-all: test-72 test-71 test-70 test-56
diff --git a/vendor/mockery/mockery/README.md b/vendor/mockery/mockery/README.md
index ab33107f..b346f4b0 100644
--- a/vendor/mockery/mockery/README.md
+++ b/vendor/mockery/mockery/README.md
@@ -25,8 +25,6 @@ version
 composer require --dev mockery/mockery
 ```
 
-⚠️️ The remainder of this README refers specifically to the master branch (1.0-dev).
-
 ## Documentation
 
 In older versions, this README file was the documentation for Mockery. Over time
@@ -237,7 +235,7 @@ $spy->shouldHaveReceived()
 
 All of the global helpers are wrapped in a `!function_exists` call to avoid
 conflicts. So if you already have a global function called `spy`, Mockery will
-silently skip the declaring it's own `spy` function.
+silently skip the declaring its own `spy` function.
 
 ### Testing Traits
 
@@ -260,6 +258,21 @@ $double->allows()->doFoo()->andReturns(123);
 $double->foo(); // int(123)
 ```
 
+### Testing the constructor arguments of hard Dependencies
+
+See [Mocking hard dependencies](http://docs.mockery.io/en/latest/cookbook/mocking_hard_dependencies.html)
+
+``` php
+$implementationMock = Mockery::mock('overload:\Some\Implementation');
+
+$implementationMock->shouldReceive('__construct')
+    ->once()
+    ->with(['host' => 'localhost]);
+// add other expectations as usual
+
+$implementation = new \Some\Implementation(['host' => 'localhost']);
+```
+
 ## Versioning
 
 The Mockery team attempts to adhere to [Semantic Versioning](http://semver.org),
diff --git a/vendor/mockery/mockery/composer.json b/vendor/mockery/mockery/composer.json
index 12f23f6d..4d7c96c2 100644
--- a/vendor/mockery/mockery/composer.json
+++ b/vendor/mockery/mockery/composer.json
@@ -36,8 +36,7 @@
         "hamcrest/hamcrest-php": "~2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~5.7.10|~6.5",
-        "phpdocumentor/phpdocumentor": "^2.9"
+        "phpunit/phpunit": "~5.7.10|~6.5|~7.0"
     },
     "autoload": {
         "psr-0": {
diff --git a/vendor/mockery/mockery/docs/cookbook/class_constants.rst b/vendor/mockery/mockery/docs/cookbook/class_constants.rst
index f1489531..0d13dd20 100644
--- a/vendor/mockery/mockery/docs/cookbook/class_constants.rst
+++ b/vendor/mockery/mockery/docs/cookbook/class_constants.rst
@@ -171,7 +171,7 @@ It can be mocked with:
 
 .. code-block:: php
 
-    \Mockery()->getConfiguration->setConstantsMap([
+    \Mockery::getConfiguration()->setConstantsMap([
         'Fetcher' => [
             'SUCCESS' => 'success',
             'FAILURE' => 'fail',
diff --git a/vendor/mockery/mockery/docs/mockery/configuration.rst b/vendor/mockery/mockery/docs/mockery/configuration.rst
index 67ab36a5..3a89579c 100644
--- a/vendor/mockery/mockery/docs/mockery/configuration.rst
+++ b/vendor/mockery/mockery/docs/mockery/configuration.rst
@@ -29,7 +29,7 @@ just select tests) by using the following call:
 Passing a true allows the behaviour, false disallows it. It takes effect
 immediately until switched back. If the behaviour is detected when not allowed,
 it will result in an Exception being thrown at that point. Note that disallowing
-ths behaviour should be carefully considered since it necessarily removes at
+this behaviour should be carefully considered since it necessarily removes at
 least some of Mockery's flexibility.
 
 The other two methods are:
diff --git a/vendor/mockery/mockery/docs/mockery/gotchas.rst b/vendor/mockery/mockery/docs/mockery/gotchas.rst
index 4ca5b2af..ebd690fb 100644
--- a/vendor/mockery/mockery/docs/mockery/gotchas.rst
+++ b/vendor/mockery/mockery/docs/mockery/gotchas.rst
@@ -14,7 +14,7 @@ so it can be documented and resolved where possible. Here is a list to note:
    expectations set for it. This is necessary since Mockery must serialize and
    unserialize objects to avoid some ``__construct()`` insanity and attempting
    to mock a ``__wakeup()`` method as normal leads to a
-   ``BadMethodCallException`` been thrown.
+   ``BadMethodCallException`` being thrown.
 
 2. Classes using non-real methods, i.e. where a method call triggers a
    ``__call()`` method, will throw an exception that the non-real method does
diff --git a/vendor/mockery/mockery/docs/reference/partial_mocks.rst b/vendor/mockery/mockery/docs/reference/partial_mocks.rst
index d5f2af56..457eb8de 100644
--- a/vendor/mockery/mockery/docs/reference/partial_mocks.rst
+++ b/vendor/mockery/mockery/docs/reference/partial_mocks.rst
@@ -28,7 +28,7 @@ of a default state of being for a mocked object.
 
     $mock = \Mockery::mock('MyClass')->makePartial();
 
-With a generated partial, we assume that all methods will simply defer to the
+With a runtime partial, we assume that all methods will simply defer to the
 parent class (``MyClass``) original methods unless a method call matches a
 known expectation. If we have no matching expectation for a specific method
 call, that call is deferred to the class being mocked. Since the division
@@ -85,7 +85,7 @@ need to get creative.
 
 Yes, the new mock is a Proxy. It intercepts calls and reroutes them to the
 proxied object (which we construct and pass in) for methods which are not
-subject to any expectations. Indirectly, this allows we to mock methods
+subject to any expectations. Indirectly, this allows us to mock methods
 marked final since the Proxy is not subject to those limitations. The tradeoff
 should be obvious - a proxied partial will fail any typehint checks for the
 class being mocked since it cannot extend that class.
diff --git a/vendor/mockery/mockery/docs/reference/spies.rst b/vendor/mockery/mockery/docs/reference/spies.rst
index c0f1546c..77f37f3d 100644
--- a/vendor/mockery/mockery/docs/reference/spies.rst
+++ b/vendor/mockery/mockery/docs/reference/spies.rst
@@ -16,7 +16,7 @@ our tests more clear.
 
 Spies also allow us to follow the more familiar Arrange-Act-Assert or
 Given-When-Then style within our tests. With mocks, we have to follow a less
-familiar style, something a long the lines of Arrange-Expect-Act-Assert, where
+familiar style, something along the lines of Arrange-Expect-Act-Assert, where
 we have to tell our mocks what to expect before we act on the sut, then assert
 that those expectations where met:
 
diff --git a/vendor/mockery/mockery/library/Mockery.php b/vendor/mockery/mockery/library/Mockery.php
index 9914b9b8..8725f919 100644
--- a/vendor/mockery/mockery/library/Mockery.php
+++ b/vendor/mockery/mockery/library/Mockery.php
@@ -26,6 +26,7 @@ use Mockery\Generator\StringManipulationGenerator;
 use Mockery\Loader\EvalLoader;
 use Mockery\Loader\Loader;
 use Mockery\Matcher\MatcherAbstract;
+use Mockery\ClosureWrapper;
 
 class Mockery
 {
@@ -126,6 +127,10 @@ class Mockery
      */
     public static function spy(...$args)
     {
+        if (count($args) && $args[0] instanceof \Closure) {
+            $args[0] = new ClosureWrapper($args[0]);
+        }
+
         return call_user_func_array(array(self::getContainer(), 'mock'), $args)->shouldIgnoreMissing();
     }
 
diff --git a/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/Legacy/TestListenerForV5.php b/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/Legacy/TestListenerForV5.php
new file mode 100644
index 00000000..38d73e02
--- /dev/null
+++ b/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/Legacy/TestListenerForV5.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Mockery
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://github.com/padraic/mockery/blob/master/LICENSE
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to padraic@php.net so we can send you a copy immediately.
+ *
+ * @category  Mockery
+ * @package   Mockery
+ * @copyright Copyright (c) 2010 Pádraic Brady (http://blog.astrumfutura.com)
+ * @license   http://github.com/padraic/mockery/blob/master/LICENSE New BSD License
+ */
+
+namespace Mockery\Adapter\Phpunit\Legacy;
+
+class TestListenerForV5 extends \PHPUnit_Framework_BaseTestListener
+{
+    private $trait;
+
+    public function __construct()
+    {
+        $this->trait = new TestListenerTrait();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function endTest(\PHPUnit_Framework_Test $test, $time)
+    {
+        $this->trait->endTest($test, $time);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function startTestSuite(\PHPUnit_Framework_TestSuite $suite)
+    {
+        $this->trait->startTestSuite();
+    }
+}
diff --git a/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/Legacy/TestListenerForV6.php b/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/Legacy/TestListenerForV6.php
new file mode 100644
index 00000000..815b13c1
--- /dev/null
+++ b/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/Legacy/TestListenerForV6.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Mockery
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://github.com/padraic/mockery/blob/master/LICENSE
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to padraic@php.net so we can send you a copy immediately.
+ *
+ * @category  Mockery
+ * @package   Mockery
+ * @copyright Copyright (c) 2010 Pádraic Brady (http://blog.astrumfutura.com)
+ * @license   http://github.com/padraic/mockery/blob/master/LICENSE New BSD License
+ */
+
+namespace Mockery\Adapter\Phpunit\Legacy;
+
+use PHPUnit\Framework\BaseTestListener;
+use PHPUnit\Framework\Test;
+use PHPUnit\Framework\TestSuite;
+
+class TestListenerForV6 extends BaseTestListener
+{
+    private $trait;
+
+    public function __construct()
+    {
+        $this->trait = new TestListenerTrait();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function endTest(Test $test, $time)
+    {
+        $this->trait->endTest($test, $time);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function startTestSuite(TestSuite $suite)
+    {
+        $this->trait->startTestSuite();
+    }
+}
diff --git a/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/Legacy/TestListenerForV7.php b/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/Legacy/TestListenerForV7.php
new file mode 100644
index 00000000..d590825a
--- /dev/null
+++ b/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/Legacy/TestListenerForV7.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Mockery
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://github.com/padraic/mockery/blob/master/LICENSE
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to padraic@php.net so we can send you a copy immediately.
+ *
+ * @category  Mockery
+ * @package   Mockery
+ * @copyright Copyright (c) 2010 Pádraic Brady (http://blog.astrumfutura.com)
+ * @license   http://github.com/padraic/mockery/blob/master/LICENSE New BSD License
+ */
+
+namespace Mockery\Adapter\Phpunit\Legacy;
+
+use PHPUnit\Framework\Test;
+use PHPUnit\Framework\TestListener;
+use PHPUnit\Framework\TestListenerDefaultImplementation;
+use PHPUnit\Framework\TestSuite;
+
+class TestListenerForV7 implements TestListener
+{
+    use TestListenerDefaultImplementation;
+
+    private $trait;
+
+    public function __construct()
+    {
+        $this->trait = new TestListenerTrait();
+    }
+
+
+    /**
+     * {@inheritdoc}
+     */
+    public function endTest(Test $test, float $time): void
+    {
+        $this->trait->endTest($test, $time);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function startTestSuite(TestSuite $suite): void
+    {
+        $this->trait->startTestSuite();
+    }
+}
diff --git a/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/Legacy/TestListenerTrait.php b/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/Legacy/TestListenerTrait.php
new file mode 100644
index 00000000..08848b88
--- /dev/null
+++ b/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/Legacy/TestListenerTrait.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Mockery
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://github.com/padraic/mockery/blob/master/LICENSE
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to padraic@php.net so we can send you a copy immediately.
+ *
+ * @category  Mockery
+ * @package   Mockery
+ * @copyright Copyright (c) 2010 Pádraic Brady (http://blog.astrumfutura.com)
+ * @license   http://github.com/padraic/mockery/blob/master/LICENSE New BSD License
+ */
+
+namespace Mockery\Adapter\Phpunit\Legacy;
+
+if (class_exists('PHPUnit_Framework_TestCase') && ! class_exists('PHPUnit\Framework\TestCase')) {
+    class_alias('PHPUnit_Framework_ExpectationFailedException', 'PHPUnit\Framework\ExpectationFailedException');
+    class_alias('PHPUnit_Framework_Test', 'PHPUnit\Framework\Test');
+    class_alias('PHPUnit_Framework_TestCase', 'PHPUnit\Framework\TestCase');
+    class_alias('PHPUnit_Util_Blacklist', 'PHPUnit\Util\Blacklist');
+    class_alias('PHPUnit_Runner_BaseTestRunner', 'PHPUnit\Runner\BaseTestRunner');
+}
+
+use PHPUnit\Framework\ExpectationFailedException;
+use PHPUnit\Framework\Test;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Util\Blacklist;
+use PHPUnit\Runner\BaseTestRunner;
+
+class TestListenerTrait
+{
+    /**
+     * endTest is called after each test and checks if \Mockery::close() has
+     * been called, and will let the test fail if it hasn't.
+     *
+     * @param Test  $test
+     * @param float $time
+     */
+    public function endTest(Test $test, $time)
+    {
+        if (!$test instanceof TestCase) {
+            // We need the getTestResultObject and getStatus methods which are
+            // not part of the interface.
+            return;
+        }
+
+        if ($test->getStatus() !== BaseTestRunner::STATUS_PASSED) {
+            // If the test didn't pass there is no guarantee that
+            // verifyMockObjects and assertPostConditions have been called.
+            // And even if it did, the point here is to prevent false
+            // negatives, not to make failing tests fail for more reasons.
+            return;
+        }
+
+        try {
+            // The self() call is used as a sentinel. Anything that throws if
+            // the container is closed already will do.
+            \Mockery::self();
+        } catch (\LogicException $_) {
+            return;
+        }
+
+        $e = new ExpectationFailedException(
+            \sprintf(
+                "Mockery's expectations have not been verified. Make sure that \Mockery::close() is called at the end of the test. Consider using %s\MockeryPHPUnitIntegration or extending %s\MockeryTestCase.",
+                __NAMESPACE__,
+                __NAMESPACE__
+            )
+        );
+
+        /** @var \PHPUnit\Framework\TestResult $result */
+        $result = $test->getTestResultObject();
+
+        if ($result !== null) {
+            $result->addFailure($test, $e, $time);
+        }
+    }
+
+    public function startTestSuite()
+    {
+        Blacklist::$blacklistedClassNames[\Mockery::class] = 1;
+    }
+}
diff --git a/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/TestListener.php b/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/TestListener.php
index 858e1d17..180761a1 100644
--- a/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/TestListener.php
+++ b/vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/TestListener.php
@@ -20,60 +20,16 @@
 
 namespace Mockery\Adapter\Phpunit;
 
-use PHPUnit\Framework\BaseTestListener;
-use PHPUnit\Framework\ExpectationFailedException;
-use PHPUnit\Framework\Test;
-use PHPUnit\Framework\TestCase;
-use PHPUnit\Runner\BaseTestRunner;
-
-class TestListener extends BaseTestListener
-{
-    /**
-     * endTest is called after each test and checks if \Mockery::close() has
-     * been called, and will let the test fail if it hasn't.
-     *
-     * @param Test  $test
-     * @param float $time
-     */
-    public function endTest(Test $test, $time)
-    {
-        if (!$test instanceof TestCase) {
-            // We need the getTestResultObject and getStatus methods which are
-            // not part of the interface.
-            return;
-        }
-
-        if ($test->getStatus() !== BaseTestRunner::STATUS_PASSED) {
-            // If the test didn't pass there is no guarantee that
-            // verifyMockObjects and assertPostConditions have been called.
-            // And even if it did, the point here is to prevent false
-            // negatives, not to make failing tests fail for more reasons.
-            return;
-        }
-
-        try {
-            // The self() call is used as a sentinel. Anything that throws if
-            // the container is closed already will do.
-            \Mockery::self();
-        } catch (\LogicException $_) {
-            return;
-        }
-
-        $e = new ExpectationFailedException(
-            sprintf(
-                "Mockery's expectations have not been verified. Make sure that \Mockery::close() is called at the end of the test. Consider using %s\MockeryPHPUnitIntegration or extending %s\MockeryTestCase.",
-                __NAMESPACE__,
-                __NAMESPACE__
-            )
-        );
-        $result = $test->getTestResultObject();
-        $result->addFailure($test, $e, $time);
-    }
+if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Version::id(), '6.0.0', '<')) {
+    class_alias('Mockery\Adapter\Phpunit\Legacy\TestListenerForV5', 'Mockery\Adapter\Phpunit\TestListener');
+} elseif (version_compare(\PHPUnit\Runner\Version::id(), '7.0.0', '<')) {
+    class_alias('Mockery\Adapter\Phpunit\Legacy\TestListenerForV6', 'Mockery\Adapter\Phpunit\TestListener');
+} else {
+    class_alias('Mockery\Adapter\Phpunit\Legacy\TestListenerForV7', 'Mockery\Adapter\Phpunit\TestListener');
+}
 
-    public function startTestSuite(\PHPUnit\Framework\TestSuite $suite)
+if (false) {
+    class TestListener
     {
-        \PHPUnit\Util\Blacklist::$blacklistedClassNames[\Mockery::class] = 1;
-
-        parent::startTestSuite($suite);
     }
 }
diff --git a/vendor/mockery/mockery/library/Mockery/ClosureWrapper.php b/vendor/mockery/mockery/library/Mockery/ClosureWrapper.php
new file mode 100644
index 00000000..35ca16db
--- /dev/null
+++ b/vendor/mockery/mockery/library/Mockery/ClosureWrapper.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Mockery
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://github.com/padraic/mockery/blob/master/LICENSE
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to padraic@php.net so we can send you a copy immediately.
+ *
+ * @category   Mockery
+ * @package    Mockery
+ * @copyright  Copyright (c) 2017 Dave Marshall https://github.com/davedevelopment
+ * @license    http://github.com/padraic/mockery/blob/master/LICENSE New BSD License
+ */
+
+namespace Mockery;
+
+use Mockery\Matcher\Closure;
+
+/**
+ * @internal
+ */
+class ClosureWrapper
+{
+    private $closure;
+
+    public function __construct(\Closure $closure)
+    {
+        $this->closure = $closure;
+    }
+
+    public function __invoke()
+    {
+        return call_user_func_array($this->closure, func_get_args());
+    }
+}
diff --git a/vendor/mockery/mockery/library/Mockery/ExpectationDirector.php b/vendor/mockery/mockery/library/Mockery/ExpectationDirector.php
index 97368454..d9bb6fba 100644
--- a/vendor/mockery/mockery/library/Mockery/ExpectationDirector.php
+++ b/vendor/mockery/mockery/library/Mockery/ExpectationDirector.php
@@ -213,6 +213,6 @@ class ExpectationDirector
      */
     public function getExpectationCount()
     {
-        return count($this->getExpectations());
+        return count($this->getExpectations()) ?: count($this->getDefaultExpectations());
     }
 }
diff --git a/vendor/mockery/mockery/library/Mockery/Generator/Method.php b/vendor/mockery/mockery/library/Mockery/Generator/Method.php
index 467683d8..713a340c 100644
--- a/vendor/mockery/mockery/library/Mockery/Generator/Method.php
+++ b/vendor/mockery/mockery/library/Mockery/Generator/Method.php
@@ -43,6 +43,19 @@ class Method
 
     public function getReturnType()
     {
+        if (defined('HHVM_VERSION') && method_exists($this->method, 'getReturnTypeText') && $this->method->hasReturnType()) {
+            // Available in HHVM
+            $returnType = $this->method->getReturnTypeText();
+
+            // Remove tuple, ImmVector<>, ImmSet<>, ImmMap<>, array<>, anything with <>, void, mixed which cause eval() errors
+            if (preg_match('/(\w+<.*>)|(\(.+\))|(HH\\\\(void|mixed|this))/', $returnType)) {
+                return '';
+            }
+
+            // return directly without going through php logic.
+            return $returnType;
+        }
+
         if (version_compare(PHP_VERSION, '7.0.0-dev') >= 0 && $this->method->hasReturnType()) {
             $returnType = (string) $this->method->getReturnType();
 
diff --git a/vendor/mockery/mockery/library/Mockery/Generator/MockConfiguration.php b/vendor/mockery/mockery/library/Mockery/Generator/MockConfiguration.php
index 35ce0fea..52931189 100644
--- a/vendor/mockery/mockery/library/Mockery/Generator/MockConfiguration.php
+++ b/vendor/mockery/mockery/library/Mockery/Generator/MockConfiguration.php
@@ -521,6 +521,34 @@ class MockConfiguration
             return true;
         });
 
+        // In HHVM, class methods can be annotated with the built-in
+        // <<__Memoize>> attribute (similar to a Python decorator),
+        // which builds an LRU cache of method arguments and their
+        // return values.
+        // https://docs.hhvm.com/hack/attributes/special#__memoize
+        //
+        // HHVM implements this behavior by inserting a private helper
+        // method into the class at runtime which is named as the
+        // method to be memoized, suffixed by `$memoize_impl`.
+        // https://github.com/facebook/hhvm/blob/6aa46f1e8c2351b97d65e67b73e26f274a7c3f2e/hphp/runtime/vm/func.cpp#L364
+        //
+        // Ordinarily, PHP does not all allow the `$` token in method
+        // names, but since the memoization helper is inserted at
+        // runtime (and not in userland), HHVM allows it.
+        //
+        // We use code generation and eval() for some types of mocks,
+        // so to avoid syntax errors from these memoization helpers,
+        // we must filter them from our list of class methods.
+        //
+        // This effectively disables the memoization behavior in HHVM,
+        // but that's preferable to failing catastrophically when
+        // attempting to mock a class using the attribute.
+        if (defined('HHVM_VERSION')) {
+            $methods = array_filter($methods, function ($method) {
+                return strpos($method->getName(), '$memoize_impl') === false;
+            });
+        }
+
         return $this->allMethods = $methods;
     }
 
diff --git a/vendor/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/InstanceMockPass.php b/vendor/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/InstanceMockPass.php
index 8bb567ef..62791475 100644
--- a/vendor/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/InstanceMockPass.php
+++ b/vendor/mockery/mockery/library/Mockery/Generator/StringManipulation/Pass/InstanceMockPass.php
@@ -60,6 +60,8 @@ class InstanceMockPass
             }
         }
         \Mockery::getContainer()->rememberMock(\$this);
+        
+        \$this->_mockery_constructorCalled(func_get_args());
     }
 MOCK;
 
diff --git a/vendor/mockery/mockery/library/Mockery/Mock.php b/vendor/mockery/mockery/library/Mockery/Mock.php
index d4899691..cf0aa13d 100644
--- a/vendor/mockery/mockery/library/Mockery/Mock.php
+++ b/vendor/mockery/mockery/library/Mockery/Mock.php
@@ -745,6 +745,11 @@ class Mock implements MockInterface
         return $director;
     }
 
+    public function shouldHaveBeenCalled()
+    {
+        return $this->shouldHaveReceived("__invoke");
+    }
+
     public function shouldNotHaveReceived($method = null, $args = null)
     {
         if ($method === null) {
@@ -762,6 +767,11 @@ class Mock implements MockInterface
         return null;
     }
 
+    public function shouldNotHaveBeenCalled(array $args = null)
+    {
+        return $this->shouldNotHaveReceived("__invoke", $args);
+    }
+
     protected static function _mockery_handleStaticMethodCall($method, array $args)
     {
         $associatedRealObject = \Mockery::fetchMock(__CLASS__);
@@ -782,6 +792,20 @@ class Mock implements MockInterface
         return $this->_mockery_receivedMethodCalls ?: $this->_mockery_receivedMethodCalls = new \Mockery\ReceivedMethodCalls();
     }
 
+    /**
+     * Called when an instance Mock was created and its constructor is getting called
+     *
+     * @see \Mockery\Generator\StringManipulation\Pass\InstanceMockPass
+     * @param array $args
+     */
+    protected function _mockery_constructorCalled(array $args)
+    {
+        if (!isset($this->_mockery_expectations['__construct']) /* _mockery_handleMethodCall runs the other checks */) {
+            return;
+        }
+        $this->_mockery_handleMethodCall('__construct', $args);
+    }
+
     protected function _mockery_findExpectedMethodHandler($method)
     {
         if (isset($this->_mockery_expectations[$method])) {
diff --git a/vendor/mockery/mockery/library/Mockery/MockInterface.php b/vendor/mockery/mockery/library/Mockery/MockInterface.php
index a0bd6b68..e7a2685e 100644
--- a/vendor/mockery/mockery/library/Mockery/MockInterface.php
+++ b/vendor/mockery/mockery/library/Mockery/MockInterface.php
@@ -101,6 +101,11 @@ interface MockInterface
      */
     public function shouldHaveReceived($method, $args = null);
 
+    /**
+     * @return mixed
+     */
+    public function shouldHaveBeenCalled();
+
     /**
      * @param null|string $method
      * @param null $args
@@ -108,6 +113,11 @@ interface MockInterface
      */
     public function shouldNotHaveReceived($method, $args = null);
 
+    /**
+     * @param array $args (optional)
+     * @return mixed
+     */
+    public function shouldNotHaveBeenCalled(array $args = null);
 
     /**
      * In the event shouldReceive() accepting an array of methods/returns
diff --git a/vendor/mockery/mockery/library/helpers.php b/vendor/mockery/mockery/library/helpers.php
index 7f5af5da..72b7240e 100644
--- a/vendor/mockery/mockery/library/helpers.php
+++ b/vendor/mockery/mockery/library/helpers.php
@@ -26,21 +26,21 @@ use Mockery\Matcher\NoArgs;
 if (!function_exists("mock")) {
     function mock(...$args)
     {
-        return call_user_func_array([Mockery::class, "mock"], $args);
+        return Mockery::mock(...$args);
     }
 }
 
 if (!function_exists("spy")) {
     function spy(...$args)
     {
-        return call_user_func_array([Mockery::class, "spy"], $args);
+        return Mockery::spy(...$args);
     }
 }
 
 if (!function_exists("namedMock")) {
     function namedMock(...$args)
     {
-        return call_user_func_array([Mockery::class, "namedMock"], $args);
+        return Mockery::namedMock(...$args);
     }
 }
 
diff --git a/vendor/mockery/mockery/phpunit.xml.dist b/vendor/mockery/mockery/phpunit.xml.dist
index c4e4a7e9..0608e3ad 100644
--- a/vendor/mockery/mockery/phpunit.xml.dist
+++ b/vendor/mockery/mockery/phpunit.xml.dist
@@ -1,37 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="./tests/Bootstrap.php"
+<phpunit bootstrap="./tests/Bootstrap.php"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         syntaxCheck="true"
-         verbose="true">
+         verbose="true"
 >
     <testsuites>
         <testsuite name="Mockery Test Suite">
             <directory suffix="Test.php">./tests</directory>
-            <exclude>./tests/Mockery/MockingOldStyleConstructorTest.php</exclude>
+            <directory phpVersion="7.0.0" phpVersionOperator=">=">./tests/PHP70</directory>
+            <directory phpVersion="7.2.0" phpVersionOperator=">=">./tests/PHP72</directory>
+
+            <exclude>./tests/PHP56</exclude>
+            <exclude>./tests/Mockery/MockingVariadicArgumentsTest.php</exclude>
+        </testsuite>
+
+        <testsuite name="Mockery Test Suite PHP56">
+            <directory suffix="Test.php">./tests</directory>
+            <directory suffix="Test.php">./tests/PHP56</directory>
+
+            <exclude>./tests/PHP70</exclude>
+            <exclude>./tests/PHP72</exclude>
             <exclude>./tests/Mockery/MockingVariadicArgumentsTest.php</exclude>
-            <exclude>./tests/Mockery/MockingParameterAndReturnTypesTest.php</exclude>
-            <exclude>./tests/Mockery/Generator/StringManipulation/Pass/MagicMethodTypeHintsPassTest.php</exclude>
-            <exclude>./tests/Mockery/Php72LanguageFeaturesTest.php</exclude>
-            <file phpVersion="7.0.0-dev" phpVersionOperator="&lt;">./tests/Mockery/MockingOldStyleConstructorTest.php</file>
-            <file phpVersion="7.0.0-dev" phpVersionOperator=">=">./tests/Mockery/MockingParameterAndReturnTypesTest.php</file>
-            <file phpVersion="7.0.0-dev" phpVersionOperator=">=">./tests/Mockery/Generator/StringManipulation/Pass/MagicMethodTypeHintsPassTest.php</file>
-            <file phpVersion="7.2.0-dev" phpVersionOperator=">=">./tests/Mockery/Php72LanguageFeaturesTest.php</file>
         </testsuite>
     </testsuites>
+
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">./library/</directory>
             <exclude>
+                <directory>./library/Mockery/Adapter/Phpunit/Legacy</directory>
                 <file>./library/Mockery/Adapter/Phpunit/TestListener.php</file>
             </exclude>
         </whitelist>
     </filter>
+
 </phpunit>
diff --git a/vendor/mockery/mockery/tests/Mockery/Adapter/Phpunit/TestListenerTest.php b/vendor/mockery/mockery/tests/Mockery/Adapter/Phpunit/TestListenerTest.php
index fcabd999..9a73c81d 100644
--- a/vendor/mockery/mockery/tests/Mockery/Adapter/Phpunit/TestListenerTest.php
+++ b/vendor/mockery/mockery/tests/Mockery/Adapter/Phpunit/TestListenerTest.php
@@ -24,9 +24,16 @@ namespace tests\Mockery\Adapter\Phpunit;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\TestResult;
 use Mockery\Adapter\Phpunit\TestListener;
-use PHPUnit\Runner\BaseTestRunner;
 
-class Mockery_Adapter_Phpunit_TestListenerTest extends TestCase
+if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Version::id(), '6.0.0', '<')) {
+    class_alias('test\Mockery\Fixtures\EmptyTestCaseV5', 'tests\Mockery\Adapter\Phpunit\EmptyTestCase');
+} elseif (version_compare(\PHPUnit\Runner\Version::id(), '7.0.0', '<')) {
+    class_alias('test\Mockery\Fixtures\EmptyTestCaseV6', 'tests\Mockery\Adapter\Phpunit\EmptyTestCase');
+} else {
+    class_alias('test\Mockery\Fixtures\EmptyTestCaseV7', 'tests\Mockery\Adapter\Phpunit\EmptyTestCase');
+}
+
+class TestListenerTest extends TestCase
 {
     protected function setUp()
     {
@@ -38,6 +45,7 @@ class Mockery_Adapter_Phpunit_TestListenerTest extends TestCase
         } else {
             $ver = \PHPUnit_Runner_Version::series();
         }
+
         if (intval($ver) < 6) {
             $this->markTestSkipped('The TestListener is only supported with PHPUnit 6+.');
             return;
@@ -93,11 +101,3 @@ class Mockery_Adapter_Phpunit_TestListenerTest extends TestCase
         $this->assertSame(1, \PHPUnit\Util\Blacklist::$blacklistedClassNames[\Mockery::class]);
     }
 }
-
-class EmptyTestCase extends TestCase
-{
-    public function getStatus()
-    {
-        return BaseTestRunner::STATUS_PASSED;
-    }
-}
diff --git a/vendor/mockery/mockery/tests/Mockery/CallableSpyTest.php b/vendor/mockery/mockery/tests/Mockery/CallableSpyTest.php
new file mode 100644
index 00000000..013e5b11
--- /dev/null
+++ b/vendor/mockery/mockery/tests/Mockery/CallableSpyTest.php
@@ -0,0 +1,199 @@
+<?php
+
+/**
+ * Mockery
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://github.com/padraic/mockery/blob/master/LICENSE
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to padraic@php.net so we can send you a copy immediately.
+ *
+ * @category   Mockery
+ * @package    Mockery
+ * @copyright  Copyright (c) 2017 Dave Marshall https://github.com/davedevelopment
+ * @license    http://github.com/padraic/mockery/blob/master/LICENSE New BSD License
+ */
+
+namespace test\Mockery;
+
+use Mockery\Adapter\Phpunit\MockeryTestCase;
+use Mockery\Exception\InvalidCountException;
+
+class CallableSpyTest extends MockeryTestCase
+{
+    /** @test */
+    public function it_verifies_the_closure_was_called()
+    {
+        $spy = spy(function() {});
+
+        $spy();
+
+        $spy->shouldHaveBeenCalled();
+    }
+
+    /** @test */
+    public function it_throws_if_the_callable_was_not_called_at_all()
+    {
+        $spy = spy(function() {});
+
+        $this->expectException(InvalidCountException::class);
+        $spy->shouldHaveBeenCalled();
+    }
+
+    /** @test */
+    public function it_throws_if_there_were_no_arguments_but_we_expected_some()
+    {
+        $spy = spy(function() {});
+
+        $spy();
+
+        $this->expectException(InvalidCountException::class);
+        $spy->shouldHaveBeenCalled()->with(123, 546);
+    }
+
+    /** @test */
+    public function it_throws_if_the_arguments_do_not_match()
+    {
+        $spy = spy(function() {});
+
+        $spy(123);
+
+        $this->expectException(InvalidCountException::class);
+        $spy->shouldHaveBeenCalled()->with(123, 546);
+    }
+
+    /** @test */
+    public function it_verifies_the_closure_was_not_called()
+    {
+        $spy = spy(function () {});
+
+        $spy->shouldNotHaveBeenCalled();
+    }
+
+    /** @test */
+    public function it_throws_if_it_was_called_when_we_expected_it_to_not_have_been_called()
+    {
+        $spy = spy(function () {});
+
+        $spy();
+
+        $this->expectException(InvalidCountException::class);
+        $spy->shouldNotHaveBeenCalled();
+    }
+
+    /** @test */
+    public function it_verifies_it_was_not_called_with_some_particular_arguments_when_called_with_no_args()
+    {
+        $spy = spy(function () {});
+
+        $spy();
+
+        $spy->shouldNotHaveBeenCalled([123]);
+    }
+
+    /** @test */
+    public function it_verifies_it_was_not_called_with_some_particular_arguments_when_called_with_different_args()
+    {
+        $spy = spy(function () {});
+
+        $spy(456);
+
+        $spy->shouldNotHaveBeenCalled([123]);
+    }
+
+    /** @test */
+    public function it_throws_if_it_was_called_with_the_args_we_were_not_expecting()
+    {
+        $spy = spy(function () {});
+
+        $spy(123);
+
+        $this->expectException(InvalidCountException::class);
+        $spy->shouldNotHaveBeenCalled([123]);
+    }
+
+    /** @test */
+    public function it_can_verify_it_was_called_a_number_of_times()
+    {
+        $spy = spy(function () {});
+
+        $spy();
+        $spy();
+
+        $spy->shouldHaveBeenCalled()->twice();
+    }
+
+    /** @test */
+    public function it_can_verify_it_was_called_a_number_of_times_with_particular_arguments()
+    {
+        $spy = spy(function () {});
+
+        $spy(123);
+        $spy(123);
+
+        $spy->shouldHaveBeenCalled()->with(123)->twice();
+    }
+
+    /** @test */
+    public function it_throws_if_it_was_called_less_than_the_number_of_times_we_expected()
+    {
+        $spy = spy(function () {});
+
+        $spy();
+
+        $this->expectException(InvalidCountException::class);
+        $spy->shouldHaveBeenCalled()->twice();
+    }
+
+    /** @test */
+    public function it_throws_if_it_was_called_less_than_the_number_of_times_we_expected_with_particular_arguments()
+    {
+        $spy = spy(function () {});
+
+        $spy();
+        $spy(123);
+
+        $this->expectException(InvalidCountException::class);
+        $spy->shouldHaveBeenCalled()->with(123)->twice();
+    }
+
+    /** @test */
+    public function it_throws_if_it_was_called_more_than_the_number_of_times_we_expected()
+    {
+        $spy = spy(function () {});
+
+        $spy();
+        $spy();
+        $spy();
+
+        $this->expectException(InvalidCountException::class);
+        $spy->shouldHaveBeenCalled()->twice();
+    }
+
+    /** @test */
+    public function it_throws_if_it_was_called_more_than_the_number_of_times_we_expected_with_particular_arguments()
+    {
+        $spy = spy(function () {});
+
+        $spy(123);
+        $spy(123);
+        $spy(123);
+
+        $this->expectException(InvalidCountException::class);
+        $spy->shouldHaveBeenCalled()->with(123)->twice();
+    }
+
+    /** @test */
+    public function it_acts_as_partial()
+    {
+        $spy = spy(function ($number) { return $number + 1;});
+
+        $this->assertEquals(124, $spy(123));
+        $spy->shouldHaveBeenCalled();
+    }
+}
diff --git a/vendor/mockery/mockery/tests/Mockery/ContainerTest.php b/vendor/mockery/mockery/tests/Mockery/ContainerTest.php
index c71f3f7d..446d9e3f 100644
--- a/vendor/mockery/mockery/tests/Mockery/ContainerTest.php
+++ b/vendor/mockery/mockery/tests/Mockery/ContainerTest.php
@@ -742,6 +742,44 @@ class ContainerTest extends MockeryTestCase
         $this->assertEquals('baz', $instance->bar);
     }
 
+    public function testInstantiationOfInstanceMockWithConstructorParameterValidation()
+    {
+        $m = mock('overload:MyNamespace\MyClass14');
+        $params = [
+            'value1' => uniqid('test_')
+        ];
+        $m->shouldReceive('__construct')->with($params);
+
+        new MyNamespace\MyClass14($params);
+    }
+
+    /**
+     * @expectedException \Mockery\Exception\NoMatchingExpectationException
+     */
+    public function testInstantiationOfInstanceMockWithConstructorParameterValidationNegative()
+    {
+        $m = mock('overload:MyNamespace\MyClass15');
+        $params = [
+            'value1' => uniqid('test_')
+        ];
+        $m->shouldReceive('__construct')->with($params);
+
+        new MyNamespace\MyClass15([]);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessageRegExp /^instanceMock \d{3}$/
+     */
+    public function testInstantiationOfInstanceMockWithConstructorParameterValidationException()
+    {
+        $m = mock('overload:MyNamespace\MyClass16');
+        $m->shouldReceive('__construct')
+            ->andThrow(new \Exception('instanceMock '.rand(100, 999)));
+
+        new MyNamespace\MyClass16();
+    }
+
     public function testMethodParamsPassedByReferenceHaveReferencePreserved()
     {
         $m = mock('MockeryTestRef1');
diff --git a/vendor/mockery/mockery/tests/Mockery/Fixtures/EmptyTestCaseV5.php b/vendor/mockery/mockery/tests/Mockery/Fixtures/EmptyTestCaseV5.php
new file mode 100644
index 00000000..935cc07b
--- /dev/null
+++ b/vendor/mockery/mockery/tests/Mockery/Fixtures/EmptyTestCaseV5.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Mockery
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://github.com/padraic/mockery/master/LICENSE
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to padraic@php.net so we can send you a copy immediately.
+ *
+ * @category   Mockery
+ * @package    Mockery
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2010 Pádraic Brady (http://blog.astrumfutura.com)
+ * @license    http://github.com/padraic/mockery/blob/master/LICENSE New BSD License
+ */
+
+namespace test\Mockery\Fixtures;
+
+class EmptyTestCaseV5 extends \PHPUnit_Framework_TestCase
+{
+    public function getStatus()
+    {
+        return \PHPUnit_Runner_BaseTestRunner::STATUS_PASSED;
+    }
+}
diff --git a/vendor/mockery/mockery/tests/Mockery/Fixtures/EmptyTestCaseV6.php b/vendor/mockery/mockery/tests/Mockery/Fixtures/EmptyTestCaseV6.php
new file mode 100644
index 00000000..27ca0e77
--- /dev/null
+++ b/vendor/mockery/mockery/tests/Mockery/Fixtures/EmptyTestCaseV6.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Mockery
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://github.com/padraic/mockery/master/LICENSE
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to padraic@php.net so we can send you a copy immediately.
+ *
+ * @category   Mockery
+ * @package    Mockery
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2010 Pádraic Brady (http://blog.astrumfutura.com)
+ * @license    http://github.com/padraic/mockery/blob/master/LICENSE New BSD License
+ */
+
+namespace test\Mockery\Fixtures;
+
+use PHPUnit\Runner\BaseTestRunner;
+use \PHPUnit\Framework\TestCase;
+
+class EmptyTestCaseV6 extends TestCase
+{
+    public function getStatus()
+    {
+        return BaseTestRunner::STATUS_PASSED;
+    }
+}
diff --git a/vendor/mockery/mockery/tests/Mockery/Fixtures/EmptyTestCaseV7.php b/vendor/mockery/mockery/tests/Mockery/Fixtures/EmptyTestCaseV7.php
new file mode 100644
index 00000000..2bfcbc27
--- /dev/null
+++ b/vendor/mockery/mockery/tests/Mockery/Fixtures/EmptyTestCaseV7.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Mockery
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://github.com/padraic/mockery/master/LICENSE
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to padraic@php.net so we can send you a copy immediately.
+ *
+ * @category   Mockery
+ * @package    Mockery
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2010 Pádraic Brady (http://blog.astrumfutura.com)
+ * @license    http://github.com/padraic/mockery/blob/master/LICENSE New BSD License
+ */
+
+namespace test\Mockery\Fixtures;
+
+use PHPUnit\Runner\BaseTestRunner;
+use \PHPUnit\Framework\TestCase;
+
+class EmptyTestCaseV7 extends TestCase
+{
+    public function getStatus(): int
+    {
+        return BaseTestRunner::STATUS_PASSED;
+    }
+}
diff --git a/vendor/mockery/mockery/tests/Mockery/Fixtures/MethodWithHHVMReturnType.php b/vendor/mockery/mockery/tests/Mockery/Fixtures/MethodWithHHVMReturnType.php
new file mode 100644
index 00000000..ff089b78
--- /dev/null
+++ b/vendor/mockery/mockery/tests/Mockery/Fixtures/MethodWithHHVMReturnType.php
@@ -0,0 +1,57 @@
+<?hh
+/**
+ * Mockery
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://github.com/padraic/mockery/master/LICENSE
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to padraic@php.net so we can send you a copy immediately.
+ *
+ * @category   Mockery
+ * @package    Mockery
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2010 Pádraic Brady (http://blog.astrumfutura.com)
+ * @license    http://github.com/padraic/mockery/blob/master/LICENSE New BSD License
+ */
+
+namespace test\Mockery\Fixtures;
+
+use Mockery\Adapter\Phpunit\MockeryTestCase;
+
+class MethodWithHHVMReturnType extends MockeryTestCase
+{
+    public function nullableHHVMArray() : ?array<string, bool>
+    {
+        return array('key' => true);
+    }
+
+    public function HHVMVoid() : ?void
+    {
+        return null;
+    }
+
+    public function HHVMMixed() : mixed
+    {
+        return null;
+    }
+
+    public function HHVMThis() : this
+    {
+        return $this;
+    }
+
+    public function HHVMString() : string
+    {
+        return 'a string';
+    }
+
+    public function HHVMImmVector() : ImmVector<int>
+    {
+        return new ImmVector([1, 2, 3]);
+    }
+}
diff --git a/vendor/mockery/mockery/tests/Mockery/Generator/StringManipulation/Pass/InstanceMockPassTest.php b/vendor/mockery/mockery/tests/Mockery/Generator/StringManipulation/Pass/InstanceMockPassTest.php
index 7523157b..94be5266 100644
--- a/vendor/mockery/mockery/tests/Mockery/Generator/StringManipulation/Pass/InstanceMockPassTest.php
+++ b/vendor/mockery/mockery/tests/Mockery/Generator/StringManipulation/Pass/InstanceMockPassTest.php
@@ -40,5 +40,6 @@ class InstanceMockPassTest extends TestCase
         $code = $pass->apply('class Dave { }', $config);
         $this->assertContains('public function __construct', $code);
         $this->assertContains('protected $_mockery_ignoreVerification', $code);
+        $this->assertContains('this->_mockery_constructorCalled(func_get_args());', $code);
     }
 }
diff --git a/vendor/mockery/mockery/tests/Mockery/MockTest.php b/vendor/mockery/mockery/tests/Mockery/MockTest.php
index d8efd238..15b4b7be 100644
--- a/vendor/mockery/mockery/tests/Mockery/MockTest.php
+++ b/vendor/mockery/mockery/tests/Mockery/MockTest.php
@@ -20,6 +20,7 @@
  */
 
 use Mockery\Adapter\Phpunit\MockeryTestCase;
+use Mockery\Mock;
 
 class Mockery_MockTest extends MockeryTestCase
 {
@@ -153,6 +154,38 @@ class Mockery_MockTest extends MockeryTestCase
     {
         mock('ClassName.CannotContainDot');
     }
+
+
+    /** @test */
+    public function expectation_count_will_count_expectations()
+    {
+        $mock = new Mock();
+        $mock->shouldReceive("doThis")->once();
+        $mock->shouldReceive("doThat")->once();
+
+        $this->assertEquals(2, $mock->mockery_getExpectationCount());
+    }
+
+    /** @test */
+    public function expectation_count_will_ignore_defaults_if_overriden()
+    {
+        $mock = new Mock();
+        $mock->shouldReceive("doThis")->once()->byDefault();
+        $mock->shouldReceive("doThis")->twice();
+        $mock->shouldReceive("andThis")->twice();
+
+        $this->assertEquals(2, $mock->mockery_getExpectationCount());
+    }
+
+    /** @test */
+    public function expectation_count_will_count_defaults_if_not_overriden()
+    {
+        $mock = new Mock();
+        $mock->shouldReceive("doThis")->once()->byDefault();
+        $mock->shouldReceive("doThat")->once()->byDefault();
+
+        $this->assertEquals(2, $mock->mockery_getExpectationCount());
+    }
 }
 
 
diff --git a/vendor/mockery/mockery/tests/Mockery/MockingHHVMMethodsTest.php b/vendor/mockery/mockery/tests/Mockery/MockingHHVMMethodsTest.php
new file mode 100644
index 00000000..7377f160
--- /dev/null
+++ b/vendor/mockery/mockery/tests/Mockery/MockingHHVMMethodsTest.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Mockery
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://github.com/padraic/mockery/master/LICENSE
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to padraic@php.net so we can send you a copy immediately.
+ *
+ * @category   Mockery
+ * @package    Mockery
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2010 Pádraic Brady (http://blog.astrumfutura.com)
+ * @license    http://github.com/padraic/mockery/blob/master/LICENSE New BSD License
+ */
+
+namespace test\Mockery;
+
+use Mockery\Adapter\Phpunit\MockeryTestCase;
+use Mockery\Generator\Method;
+use test\Mockery\Fixtures\MethodWithHHVMReturnType;
+
+class MockingHHVMMethodsTest extends MockeryTestCase
+{
+    /**
+     * @var \Mockery\Container
+     */
+    private $container;
+
+    protected function setUp()
+    {
+        if (!$this->isHHVM()) {
+            $this->markTestSkipped('For HHVM test only');
+        }
+
+        parent::setUp();
+
+        require_once __DIR__."/Fixtures/MethodWithHHVMReturnType.php";
+    }
+
+    /** @test */
+    public function it_strip_hhvm_array_return_types()
+    {
+        $mock = mock('test\Mockery\Fixtures\MethodWithHHVMReturnType');
+
+        $mock->shouldReceive('nullableHHVMArray')->andReturn(array('key' => true));
+        $mock->nullableHHVMArray();
+    }
+
+    /** @test */
+    public function it_strip_hhvm_void_return_types()
+    {
+        $mock = mock('test\Mockery\Fixtures\MethodWithHHVMReturnType');
+
+        $mock->shouldReceive('HHVMVoid')->andReturnNull();
+        $mock->HHVMVoid();
+    }
+
+    /** @test */
+    public function it_strip_hhvm_mixed_return_types()
+    {
+        $mock = mock('test\Mockery\Fixtures\MethodWithHHVMReturnType');
+
+        $mock->shouldReceive('HHVMMixed')->andReturnNull();
+        $mock->HHVMMixed();
+    }
+
+    /** @test */
+    public function it_strip_hhvm_this_return_types()
+    {
+        $mock = mock('test\Mockery\Fixtures\MethodWithHHVMReturnType');
+
+        $mock->shouldReceive('HHVMThis')->andReturn(new MethodWithHHVMReturnType());
+        $mock->HHVMThis();
+    }
+
+    /** @test */
+    public function it_allow_hhvm_string_return_types()
+    {
+        $mock = mock('test\Mockery\Fixtures\MethodWithHHVMReturnType');
+
+        $mock->shouldReceive('HHVMString')->andReturn('a string');
+        $mock->HHVMString();
+    }
+
+    /** @test */
+    public function it_allow_hhvm_imm_vector_return_types()
+    {
+        $mock = mock('test\Mockery\Fixtures\MethodWithHHVMReturnType');
+
+        $mock->shouldReceive('HHVMImmVector')->andReturn(new \HH\ImmVector([1, 2, 3]));
+        $mock->HHVMImmVector();
+    }
+
+    /**
+     * Returns true when it is HHVM.
+     */
+    private function isHHVM()
+    {
+        return \defined('HHVM_VERSION');
+    }
+}
diff --git a/vendor/mockery/mockery/tests/Mockery/MockingOldStyleConstructorTest.php b/vendor/mockery/mockery/tests/PHP56/MockingOldStyleConstructorTest.php
similarity index 97%
rename from vendor/mockery/mockery/tests/Mockery/MockingOldStyleConstructorTest.php
rename to vendor/mockery/mockery/tests/PHP56/MockingOldStyleConstructorTest.php
index c1ec5d85..89e66c07 100644
--- a/vendor/mockery/mockery/tests/Mockery/MockingOldStyleConstructorTest.php
+++ b/vendor/mockery/mockery/tests/PHP56/MockingOldStyleConstructorTest.php
@@ -22,9 +22,11 @@
 use Mockery\Adapter\Phpunit\MockeryTestCase;
 use Mockery\MockInterface;
 
+/**
+ * @requires PHP 5.6.0-dev
+ */
 class MockingOldStyleConstructorTest extends MockeryTestCase
 {
-
     /**
      * @issue issue/139
      */
diff --git a/vendor/mockery/mockery/tests/Mockery/Generator/StringManipulation/Pass/MagicMethodTypeHintsPassTest.php b/vendor/mockery/mockery/tests/PHP70/Generator/StringManipulation/Pass/MagicMethodTypeHintsPassTest.php
similarity index 100%
rename from vendor/mockery/mockery/tests/Mockery/Generator/StringManipulation/Pass/MagicMethodTypeHintsPassTest.php
rename to vendor/mockery/mockery/tests/PHP70/Generator/StringManipulation/Pass/MagicMethodTypeHintsPassTest.php
diff --git a/vendor/mockery/mockery/tests/Mockery/MockingParameterAndReturnTypesTest.php b/vendor/mockery/mockery/tests/PHP70/MockingParameterAndReturnTypesTest.php
similarity index 100%
rename from vendor/mockery/mockery/tests/Mockery/MockingParameterAndReturnTypesTest.php
rename to vendor/mockery/mockery/tests/PHP70/MockingParameterAndReturnTypesTest.php
diff --git a/vendor/mockery/mockery/tests/Mockery/Php72LanguageFeaturesTest.php b/vendor/mockery/mockery/tests/PHP72/Php72LanguageFeaturesTest.php
similarity index 100%
rename from vendor/mockery/mockery/tests/Mockery/Php72LanguageFeaturesTest.php
rename to vendor/mockery/mockery/tests/PHP72/Php72LanguageFeaturesTest.php
diff --git a/vendor/mtdowling/cron-expression/composer.json b/vendor/mtdowling/cron-expression/composer.json
deleted file mode 100644
index ce42d40d..00000000
--- a/vendor/mtdowling/cron-expression/composer.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "name": "mtdowling/cron-expression",
-    "type": "library",
-    "description": "CRON for PHP: Calculate the next or previous run date and determine if a CRON expression is due",
-    "keywords": ["cron", "schedule"],
-    "license": "MIT",
-    "authors": [{
-        "name": "Michael Dowling",
-        "email": "mtdowling@gmail.com",
-        "homepage": "https://github.com/mtdowling"
-    }],
-    "require": {
-        "php": ">=5.3.2"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.0|~5.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Cron\\": "src/Cron/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\": "tests/Cron/"
-        }
-    }
-}
\ No newline at end of file
diff --git a/vendor/mtdowling/cron-expression/src/Cron/AbstractField.php b/vendor/mtdowling/cron-expression/src/Cron/AbstractField.php
deleted file mode 100644
index cd2410ab..00000000
--- a/vendor/mtdowling/cron-expression/src/Cron/AbstractField.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-
-namespace Cron;
-
-/**
- * Abstract CRON expression field
- */
-abstract class AbstractField implements FieldInterface
-{
-    /**
-     * Check to see if a field is satisfied by a value
-     *
-     * @param string $dateValue Date value to check
-     * @param string $value     Value to test
-     *
-     * @return bool
-     */
-    public function isSatisfied($dateValue, $value)
-    {
-        if ($this->isIncrementsOfRanges($value)) {
-            return $this->isInIncrementsOfRanges($dateValue, $value);
-        } elseif ($this->isRange($value)) {
-            return $this->isInRange($dateValue, $value);
-        }
-
-        return $value == '*' || $dateValue == $value;
-    }
-
-    /**
-     * Check if a value is a range
-     *
-     * @param string $value Value to test
-     *
-     * @return bool
-     */
-    public function isRange($value)
-    {
-        return strpos($value, '-') !== false;
-    }
-
-    /**
-     * Check if a value is an increments of ranges
-     *
-     * @param string $value Value to test
-     *
-     * @return bool
-     */
-    public function isIncrementsOfRanges($value)
-    {
-        return strpos($value, '/') !== false;
-    }
-
-    /**
-     * Test if a value is within a range
-     *
-     * @param string $dateValue Set date value
-     * @param string $value     Value to test
-     *
-     * @return bool
-     */
-    public function isInRange($dateValue, $value)
-    {
-        $parts = array_map('trim', explode('-', $value, 2));
-
-        return $dateValue >= $parts[0] && $dateValue <= $parts[1];
-    }
-
-    /**
-     * Test if a value is within an increments of ranges (offset[-to]/step size)
-     *
-     * @param string $dateValue Set date value
-     * @param string $value     Value to test
-     *
-     * @return bool
-     */
-    public function isInIncrementsOfRanges($dateValue, $value)
-    {
-        $parts = array_map('trim', explode('/', $value, 2));
-        $stepSize = isset($parts[1]) ? (int) $parts[1] : 0;
-
-        if ($stepSize === 0) {
-            return false;
-        }
-
-        if (($parts[0] == '*' || $parts[0] === '0')) {
-            return (int) $dateValue % $stepSize == 0;
-        }
-
-        $range = explode('-', $parts[0], 2);
-        $offset = $range[0];
-        $to = isset($range[1]) ? $range[1] : $dateValue;
-        // Ensure that the date value is within the range
-        if ($dateValue < $offset || $dateValue > $to) {
-            return false;
-        }
-
-        if ($dateValue > $offset && 0 === $stepSize) {
-          return false;
-        }
-
-        for ($i = $offset; $i <= $to; $i+= $stepSize) {
-            if ($i == $dateValue) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns a range of values for the given cron expression
-     *
-     * @param string $expression The expression to evaluate
-     * @param int $max           Maximum offset for range
-     *
-     * @return array
-     */
-    public function getRangeForExpression($expression, $max)
-    {
-        $values = array();
-
-        if ($this->isRange($expression) || $this->isIncrementsOfRanges($expression)) {
-            if (!$this->isIncrementsOfRanges($expression)) {
-                list ($offset, $to) = explode('-', $expression);
-                $stepSize = 1;
-            }
-            else {
-                $range = array_map('trim', explode('/', $expression, 2));
-                $stepSize = isset($range[1]) ? $range[1] : 0;
-                $range = $range[0];
-                $range = explode('-', $range, 2);
-                $offset = $range[0];
-                $to = isset($range[1]) ? $range[1] : $max;
-            }
-            $offset = $offset == '*' ? 0 : $offset;
-            for ($i = $offset; $i <= $to; $i += $stepSize) {
-                $values[] = $i;
-            }
-            sort($values);
-        }
-        else {
-            $values = array($expression);
-        }
-
-        return $values;
-    }
-
-}
diff --git a/vendor/mtdowling/cron-expression/src/Cron/YearField.php b/vendor/mtdowling/cron-expression/src/Cron/YearField.php
deleted file mode 100644
index db244fba..00000000
--- a/vendor/mtdowling/cron-expression/src/Cron/YearField.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Cron;
-
-use DateTime;
-
-
-/**
- * Year field.  Allows: * , / -
- */
-class YearField extends AbstractField
-{
-    public function isSatisfiedBy(DateTime $date, $value)
-    {
-        return $this->isSatisfied($date->format('Y'), $value);
-    }
-
-    public function increment(DateTime $date, $invert = false)
-    {
-        if ($invert) {
-            $date->modify('-1 year');
-            $date->setDate($date->format('Y'), 12, 31);
-            $date->setTime(23, 59, 0);
-        } else {
-            $date->modify('+1 year');
-            $date->setDate($date->format('Y'), 1, 1);
-            $date->setTime(0, 0, 0);
-        }
-
-        return $this;
-    }
-
-    public function validate($value)
-    {
-        return (bool) preg_match('/^[\*,\/\-0-9]+$/', $value);
-    }
-}
diff --git a/vendor/mtdowling/cron-expression/tests/Cron/AbstractFieldTest.php b/vendor/mtdowling/cron-expression/tests/Cron/AbstractFieldTest.php
deleted file mode 100644
index a1d653b2..00000000
--- a/vendor/mtdowling/cron-expression/tests/Cron/AbstractFieldTest.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-namespace Cron\Tests;
-
-use Cron\DayOfWeekField;
-use PHPUnit_Framework_TestCase;
-
-/**
- * @author Michael Dowling <mtdowling@gmail.com>
- */
-class AbstractFieldTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @covers Cron\AbstractField::isRange
-     */
-    public function testTestsIfRange()
-    {
-        $f = new DayOfWeekField();
-        $this->assertTrue($f->isRange('1-2'));
-        $this->assertFalse($f->isRange('2'));
-    }
-
-    /**
-     * @covers Cron\AbstractField::isIncrementsOfRanges
-     */
-    public function testTestsIfIncrementsOfRanges()
-    {
-        $f = new DayOfWeekField();
-        $this->assertFalse($f->isIncrementsOfRanges('1-2'));
-        $this->assertTrue($f->isIncrementsOfRanges('1/2'));
-        $this->assertTrue($f->isIncrementsOfRanges('*/2'));
-        $this->assertTrue($f->isIncrementsOfRanges('3-12/2'));
-    }
-
-    /**
-     * @covers Cron\AbstractField::isInRange
-     */
-    public function testTestsIfInRange()
-    {
-        $f = new DayOfWeekField();
-        $this->assertTrue($f->isInRange('1', '1-2'));
-        $this->assertTrue($f->isInRange('2', '1-2'));
-        $this->assertTrue($f->isInRange('5', '4-12'));
-        $this->assertFalse($f->isInRange('3', '4-12'));
-        $this->assertFalse($f->isInRange('13', '4-12'));
-    }
-
-    /**
-     * @covers Cron\AbstractField::isInIncrementsOfRanges
-     */
-    public function testTestsIfInIncrementsOfRanges()
-    {
-        $f = new DayOfWeekField();
-        $this->assertTrue($f->isInIncrementsOfRanges('3', '3-59/2'));
-        $this->assertTrue($f->isInIncrementsOfRanges('13', '3-59/2'));
-        $this->assertTrue($f->isInIncrementsOfRanges('15', '3-59/2'));
-        $this->assertTrue($f->isInIncrementsOfRanges('14', '*/2'));
-        $this->assertFalse($f->isInIncrementsOfRanges('2', '3-59/13'));
-        $this->assertFalse($f->isInIncrementsOfRanges('14', '*/13'));
-        $this->assertFalse($f->isInIncrementsOfRanges('14', '3-59/2'));
-        $this->assertFalse($f->isInIncrementsOfRanges('3', '2-59'));
-        $this->assertFalse($f->isInIncrementsOfRanges('3', '2'));
-        $this->assertFalse($f->isInIncrementsOfRanges('3', '*'));
-        $this->assertFalse($f->isInIncrementsOfRanges('0', '*/0'));
-        $this->assertFalse($f->isInIncrementsOfRanges('1', '*/0'));
-
-        $this->assertTrue($f->isInIncrementsOfRanges('4', '4/10'));
-        $this->assertTrue($f->isInIncrementsOfRanges('14', '4/10'));
-        $this->assertTrue($f->isInIncrementsOfRanges('34', '4/10'));
-    }
-
-    /**
-     * @covers Cron\AbstractField::isSatisfied
-     */
-    public function testTestsIfSatisfied()
-    {
-        $f = new DayOfWeekField();
-        $this->assertTrue($f->isSatisfied('12', '3-13'));
-        $this->assertTrue($f->isSatisfied('15', '3-59/12'));
-        $this->assertTrue($f->isSatisfied('12', '*'));
-        $this->assertTrue($f->isSatisfied('12', '12'));
-        $this->assertFalse($f->isSatisfied('12', '3-11'));
-        $this->assertFalse($f->isSatisfied('12', '3-59/13'));
-        $this->assertFalse($f->isSatisfied('12', '11'));
-    }
-}
diff --git a/vendor/mtdowling/cron-expression/tests/Cron/MinutesFieldTest.php b/vendor/mtdowling/cron-expression/tests/Cron/MinutesFieldTest.php
deleted file mode 100644
index af3fef7f..00000000
--- a/vendor/mtdowling/cron-expression/tests/Cron/MinutesFieldTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Cron\Tests;
-
-use Cron\MinutesField;
-use DateTime;
-use PHPUnit_Framework_TestCase;
-
-/**
- * @author Michael Dowling <mtdowling@gmail.com>
- */
-class MinutesFieldTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @covers Cron\MinutesField::validate
-     */
-    public function testValidatesField()
-    {
-        $f = new MinutesField();
-        $this->assertTrue($f->validate('1'));
-        $this->assertTrue($f->validate('*'));
-        $this->assertTrue($f->validate('*/3,1,1-12'));
-    }
-
-    /**
-     * @covers Cron\MinutesField::increment
-     */
-    public function testIncrementsDate()
-    {
-        $d = new DateTime('2011-03-15 11:15:00');
-        $f = new MinutesField();
-        $f->increment($d);
-        $this->assertEquals('2011-03-15 11:16:00', $d->format('Y-m-d H:i:s'));
-        $f->increment($d, true);
-        $this->assertEquals('2011-03-15 11:15:00', $d->format('Y-m-d H:i:s'));
-    }
-}
diff --git a/vendor/mtdowling/cron-expression/tests/Cron/YearFieldTest.php b/vendor/mtdowling/cron-expression/tests/Cron/YearFieldTest.php
deleted file mode 100644
index b5059ece..00000000
--- a/vendor/mtdowling/cron-expression/tests/Cron/YearFieldTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Cron\Tests;
-
-use Cron\YearField;
-use DateTime;
-use PHPUnit_Framework_TestCase;
-
-/**
- * @author Michael Dowling <mtdowling@gmail.com>
- */
-class YearFieldTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @covers Cron\YearField::validate
-     */
-    public function testValidatesField()
-    {
-        $f = new YearField();
-        $this->assertTrue($f->validate('2011'));
-        $this->assertTrue($f->validate('*'));
-        $this->assertTrue($f->validate('*/10,2012,1-12'));
-    }
-
-    /**
-     * @covers Cron\YearField::increment
-     */
-    public function testIncrementsDate()
-    {
-        $d = new DateTime('2011-03-15 11:15:00');
-        $f = new YearField();
-        $f->increment($d);
-        $this->assertEquals('2012-01-01 00:00:00', $d->format('Y-m-d H:i:s'));
-        $f->increment($d, true);
-        $this->assertEquals('2011-12-31 23:59:00', $d->format('Y-m-d H:i:s'));
-    }
-}
diff --git a/vendor/nesbot/carbon/.php_cs.dist b/vendor/nesbot/carbon/.php_cs.dist
deleted file mode 100644
index f731e3ad..00000000
--- a/vendor/nesbot/carbon/.php_cs.dist
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-use PhpCsFixer\Config;
-use PhpCsFixer\Finder;
-
-$rules = array(
-    '@PSR2' => true,
-    'array_syntax' => array(
-        'syntax' => 'long',
-    ),
-    'binary_operator_spaces' => array(
-        'align_double_arrow' => false,
-        'align_equals' => false,
-    ),
-    'blank_line_before_return' => true,
-    'cast_spaces' => true,
-    'concat_space' => array(
-        'spacing' => 'none',
-    ),
-    'ereg_to_preg' => true,
-    'method_separation' => true,
-    'no_blank_lines_after_phpdoc' => true,
-    'no_extra_consecutive_blank_lines' => true,
-    'no_short_bool_cast' => true,
-    'no_unneeded_control_parentheses' => true,
-    'no_unused_imports' => true,
-    'no_whitespace_in_blank_line' => true,
-    'ordered_imports' => true,
-    'phpdoc_align' => true,
-    'phpdoc_indent' => true,
-    'phpdoc_inline_tag' => true,
-    'phpdoc_no_access' => true,
-    'phpdoc_no_alias_tag' => array(
-        'type' => 'var',
-    ),
-    'phpdoc_no_package' => true,
-    'phpdoc_order' => true,
-    'phpdoc_scalar' => true,
-    'phpdoc_separation' => true,
-    'phpdoc_to_comment' => true,
-    'phpdoc_trim' => true,
-    'phpdoc_types' => true,
-    'phpdoc_var_without_name' => true,
-    'self_accessor' => true,
-    'single_quote' => true,
-    'space_after_semicolon' => true,
-    'standardize_not_equals' => true,
-    'ternary_operator_spaces' => true,
-    'trailing_comma_in_multiline_array' => true,
-    'trim_array_spaces' => true,
-    'unary_operator_spaces' => true,
-    'line_ending' => true,
-    'blank_line_after_namespace' => true,
-    'no_unused_imports' => true,
-);
-
-return Config::create()->setRules($rules)
-             ->setFinder(Finder::create()->in(__DIR__))
-             ->setUsingCache(true)
-             ->setRiskyAllowed(true);
diff --git a/vendor/nesbot/carbon/build.php b/vendor/nesbot/carbon/build.php
deleted file mode 100644
index 3cb0b5be..00000000
--- a/vendor/nesbot/carbon/build.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-chdir(__DIR__);
-$currentBranch = 'master';
-if (preg_match('/On branch ([^\n]+)\n/', shell_exec('git status'), $match)) {
-    $currentBranch = $match[1];
-}
-shell_exec('git fetch --all --tags --prune');
-$remotes = explode("\n", trim(shell_exec('git remote')));
-$tagsCommand = count($remotes)
-    ? 'git ls-remote --tags '.(in_array('upstream', $remotes) ? 'upstream' : (in_array('origin', $remotes) ? 'origin' : $remotes[0]))
-    : 'git tag';
-$tags = array_map(function ($ref) {
-    $ref = explode('refs/tags/', $ref);
-
-    return isset($ref[1]) ? $ref[1] : $ref[0];
-}, array_filter(explode("\n", trim(shell_exec($tagsCommand))), function ($ref) {
-    return substr($ref, -3) !== '^{}';
-}));
-usort($tags, 'version_compare');
-
-$tag = isset($argv[1]) && !in_array($argv[1], array('last', 'latest')) ? $argv[1] : end($tags);
-
-if (strtolower($tag) !== 'all') {
-    if (!in_array($tag, $tags)) {
-        echo "Tag must be one of remote tags available:\n";
-        foreach ($tags as $_tag) {
-            echo "  - $_tag\n";
-        }
-        echo "\"$tag\" does not match.\n";
-
-        exit(1);
-    }
-
-    $tags = array($tag);
-}
-
-foreach ($tags as $tag) {
-    $archive = "Carbon-$tag.zip";
-    if (isset($argv[2]) && $argv[2] === 'missing' && file_exists($archive)) {
-        continue;
-    }
-
-    $branch = "build-$tag";
-    shell_exec('git stash');
-    shell_exec("git branch -d $branch");
-    shell_exec("git checkout tags/$tag -b $branch");
-    shell_exec('composer config platform.php 5.3.9');
-    shell_exec('composer update --no-interaction --no-dev --optimize-autoloader');
-    $zip = new ZipArchive();
-
-    $zip->open($archive, ZipArchive::CREATE | ZipArchive::OVERWRITE);
-
-    foreach (array('src', 'vendor', 'Carbon') as $directory) {
-        if (is_dir($directory)) {
-            $directory = realpath($directory);
-            $base = dirname($directory);
-
-            $files = new RecursiveIteratorIterator(
-                new RecursiveDirectoryIterator($directory),
-                RecursiveIteratorIterator::LEAVES_ONLY
-            );
-
-            foreach ($files as $name => $file) {
-                if (!$file->isDir()) {
-                    $filePath = $file->getRealPath();
-
-                    $zip->addFile($filePath, substr($filePath, strlen($base) + 1));
-                }
-            }
-        }
-    }
-
-    $autoload = 'autoload.php';
-    file_put_contents($autoload, "<?php\n\n/**\n * @version $tag\n */\n\nrequire __DIR__.'/vendor/autoload.php';\n");
-    $zip->addFile($autoload, $autoload);
-    $zip->close();
-    unlink($autoload);
-
-    shell_exec('git checkout .');
-    shell_exec("git checkout $currentBranch");
-    shell_exec("git branch -d $branch");
-    shell_exec('git stash pop');
-    shell_exec('composer update --no-interaction');
-}
-
-exit(0);
diff --git a/vendor/nesbot/carbon/composer.json b/vendor/nesbot/carbon/composer.json
index 3ce2fbd5..40be3f55 100644
--- a/vendor/nesbot/carbon/composer.json
+++ b/vendor/nesbot/carbon/composer.json
@@ -49,5 +49,12 @@
         "phpunit": "phpunit --verbose --coverage-clover=coverage.xml",
         "phpcs": "php-cs-fixer fix -v --diff --dry-run",
         "phpstan": "phpstan analyse --configuration phpstan.neon --level 3 src tests"
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Carbon\\Laravel\\ServiceProvider"
+            ]
+        }
     }
 }
diff --git a/vendor/nesbot/carbon/src/Carbon/Carbon.php b/vendor/nesbot/carbon/src/Carbon/Carbon.php
index e5b7d99d..f62dd45e 100644
--- a/vendor/nesbot/carbon/src/Carbon/Carbon.php
+++ b/vendor/nesbot/carbon/src/Carbon/Carbon.php
@@ -51,6 +51,14 @@ use Symfony\Component\Translation\TranslatorInterface;
  * @property-read bool $utc checks if the timezone is UTC, true if UTC, false otherwise
  * @property-read string $timezoneName
  * @property-read string $tzName
+ * @property-read string $englishDayOfWeek the day of week in English
+ * @property-read string $shortEnglishDayOfWeek the abbreviated day of week in English
+ * @property-read string $englishMonth the day of week in English
+ * @property-read string $shortEnglishMonth the abbreviated day of week in English
+ * @property-read string $localeDayOfWeek the day of week in current locale LC_TIME
+ * @property-read string $shortLocaleDayOfWeek the abbreviated day of week in current locale LC_TIME
+ * @property-read string $localeMonth the month in current locale LC_TIME
+ * @property-read string $shortLocaleMonth the abbreviated month in current locale LC_TIME
  */
 class Carbon extends DateTime implements JsonSerializable
 {
@@ -1007,17 +1015,24 @@ class Carbon extends DateTime implements JsonSerializable
     }
 
     /**
-     * Throws an exception if the given object is not a DateTime and does not implement DateTimeInterface.
+     * Throws an exception if the given object is not a DateTime and does not implement DateTimeInterface
+     * and not in $other.
      *
-     * @param mixed $date
+     * @param mixed        $date
+     * @param string|array $other
      *
      * @throws \InvalidArgumentException
      */
-    protected static function expectDateTime($date)
+    protected static function expectDateTime($date, $other = array())
     {
+        $message = 'Expected ';
+        foreach ((array) $other as $expect) {
+            $message .= "{$expect}, ";
+        }
+
         if (!$date instanceof DateTime && !$date instanceof DateTimeInterface) {
             throw new InvalidArgumentException(
-                'Expected null, string, DateTime or DateTimeInterface, '.
+                $message.'DateTime or DateTimeInterface, '.
                 (is_object($date) ? get_class($date) : gettype($date)).' given'
             );
         }
@@ -1041,7 +1056,7 @@ class Carbon extends DateTime implements JsonSerializable
             return static::parse($date, $this->getTimezone());
         }
 
-        static::expectDateTime($date);
+        static::expectDateTime($date, array('null', 'string'));
 
         return $date instanceof self ? $date : static::instance($date);
     }
@@ -1057,7 +1072,7 @@ class Carbon extends DateTime implements JsonSerializable
      *
      * @throws \InvalidArgumentException
      *
-     * @return string|int|\DateTimeZone
+     * @return string|int|bool|\DateTimeZone
      */
     public function __get($name)
     {
@@ -1076,11 +1091,23 @@ class Carbon extends DateTime implements JsonSerializable
             'weekOfYear' => 'W',
             'daysInMonth' => 't',
             'timestamp' => 'U',
+            'englishDayOfWeek' => 'l',
+            'shortEnglishDayOfWeek' => 'D',
+            'englishMonth' => 'F',
+            'shortEnglishMonth' => 'M',
+            'localeDayOfWeek' => '%A',
+            'shortLocaleDayOfWeek' => '%a',
+            'localeMonth' => '%B',
+            'shortLocaleMonth' => '%b',
         );
 
         switch (true) {
             case isset($formats[$name]):
-                return (int) $this->format($formats[$name]);
+                $format = $formats[$name];
+                $method = substr($format, 0, 1) === '%' ? 'formatLocalized' : 'format';
+                $value = $this->$method($format);
+
+                return is_numeric($value) ? (int) $value : $value;
 
             case $name === 'weekOfMonth':
                 return (int) ceil($this->day / static::DAYS_PER_WEEK);
@@ -1427,10 +1454,16 @@ class Carbon extends DateTime implements JsonSerializable
      *
      * @param int $day week start day
      *
+     * @throws InvalidArgumentException
+     *
      * @return void
      */
     public static function setWeekStartsAt($day)
     {
+        if ($day > static::SATURDAY || $day < static::SUNDAY) {
+            throw new InvalidArgumentException('Day of a week should be greater than or equal to 0 and less than or equal to 6.');
+        }
+
         static::$weekStartsAt = $day;
     }
 
@@ -1449,10 +1482,16 @@ class Carbon extends DateTime implements JsonSerializable
      *
      * @param int $day
      *
+     * @throws InvalidArgumentException
+     *
      * @return void
      */
     public static function setWeekEndsAt($day)
     {
+        if ($day > static::SATURDAY || $day < static::SUNDAY) {
+            throw new InvalidArgumentException('Day of a week should be greater than or equal to 0 and less than or equal to 6.');
+        }
+
         static::$weekEndsAt = $day;
     }
 
@@ -1632,6 +1671,142 @@ class Carbon extends DateTime implements JsonSerializable
         return static::translator()->setLocale($locale) !== false;
     }
 
+    /**
+     * Set the current locale to the given, execute the passed function, reset the locale to previous one,
+     * then return the result of the closure (or null if the closure was void).
+     *
+     * @param string $locale locale ex. en
+     *
+     * @return mixed
+     */
+    public static function executeWithLocale($locale, $func)
+    {
+        $currentLocale = static::getLocale();
+        $result = call_user_func($func, static::setLocale($locale) ? static::getLocale() : false, static::translator());
+        static::setLocale($currentLocale);
+
+        return $result;
+    }
+
+    /**
+     * Returns true if the given locale is internally supported and has short-units support.
+     * Support is considered enabled if either year, day or hour has a short variant translated.
+     *
+     * @param string $locale locale ex. en
+     *
+     * @return bool
+     */
+    public static function localeHasShortUnits($locale)
+    {
+        return static::executeWithLocale($locale, function ($newLocale, TranslatorInterface $translator) {
+            return $newLocale &&
+                (
+                    ($y = $translator->trans('y')) !== 'y' &&
+                    $y !== $translator->trans('year')
+                ) || (
+                    ($y = $translator->trans('d')) !== 'd' &&
+                    $y !== $translator->trans('day')
+                ) || (
+                    ($y = $translator->trans('h')) !== 'h' &&
+                    $y !== $translator->trans('hour')
+                );
+        });
+    }
+
+    /**
+     * Returns true if the given locale is internally supported and has diff syntax support (ago, from now, before, after).
+     * Support is considered enabled if the 4 sentences are translated in the given locale.
+     *
+     * @param string $locale locale ex. en
+     *
+     * @return bool
+     */
+    public static function localeHasDiffSyntax($locale)
+    {
+        return static::executeWithLocale($locale, function ($newLocale, TranslatorInterface $translator) {
+            return $newLocale &&
+                $translator->trans('ago') !== 'ago' &&
+                $translator->trans('from_now') !== 'from_now' &&
+                $translator->trans('before') !== 'before' &&
+                $translator->trans('after') !== 'after';
+        });
+    }
+
+    /**
+     * Returns true if the given locale is internally supported and has words for 1-day diff (just now, yesterday, tomorrow).
+     * Support is considered enabled if the 3 words are translated in the given locale.
+     *
+     * @param string $locale locale ex. en
+     *
+     * @return bool
+     */
+    public static function localeHasDiffOneDayWords($locale)
+    {
+        return static::executeWithLocale($locale, function ($newLocale, TranslatorInterface $translator) {
+            return $newLocale &&
+                $translator->trans('diff_now') !== 'diff_now' &&
+                $translator->trans('diff_yesterday') !== 'diff_yesterday' &&
+                $translator->trans('diff_tomorrow') !== 'diff_tomorrow';
+        });
+    }
+
+    /**
+     * Returns true if the given locale is internally supported and has words for 2-days diff (before yesterday, after tomorrow).
+     * Support is considered enabled if the 2 words are translated in the given locale.
+     *
+     * @param string $locale locale ex. en
+     *
+     * @return bool
+     */
+    public static function localeHasDiffTwoDayWords($locale)
+    {
+        return static::executeWithLocale($locale, function ($newLocale, TranslatorInterface $translator) {
+            return $newLocale &&
+                $translator->trans('diff_before_yesterday') !== 'diff_before_yesterday' &&
+                $translator->trans('diff_after_tomorrow') !== 'diff_after_tomorrow';
+        });
+    }
+
+    /**
+     * Returns true if the given locale is internally supported and has period syntax support (X times, every X, from X, to X).
+     * Support is considered enabled if the 4 sentences are translated in the given locale.
+     *
+     * @param string $locale locale ex. en
+     *
+     * @return bool
+     */
+    public static function localeHasPeriodSyntax($locale)
+    {
+        return static::executeWithLocale($locale, function ($newLocale, TranslatorInterface $translator) {
+            return $newLocale &&
+                $translator->trans('period_recurrences') !== 'period_recurrences' &&
+                $translator->trans('period_interval') !== 'period_interval' &&
+                $translator->trans('period_start_date') !== 'period_start_date' &&
+                $translator->trans('period_end_date') !== 'period_end_date';
+        });
+    }
+
+    /**
+     * Returns the list of internally available locales and already loaded custom locales.
+     * (It will ignore custom translator dynamic loading.)
+     *
+     * @return array
+     */
+    public static function getAvailableLocales()
+    {
+        $translator = static::translator();
+        $locales = array();
+        if ($translator instanceof Translator) {
+            foreach (glob(__DIR__.'/Lang/*.php') as $file) {
+                $locales[] = substr($file, strrpos($file, '/') + 1, -4);
+            }
+
+            $locales = array_unique(array_merge($locales, array_keys($translator->getMessages())));
+        }
+
+        return $locales;
+    }
+
     ///////////////////////////////////////////////////////////////////
     /////////////////////// STRING FORMATTING /////////////////////////
     ///////////////////////////////////////////////////////////////////
@@ -1679,7 +1854,7 @@ class Carbon extends DateTime implements JsonSerializable
     /**
      * Set the default format used when type juggling a Carbon instance to a string
      *
-     * @param string $format
+     * @param string|Closure $format
      *
      * @return void
      */
@@ -1695,7 +1870,9 @@ class Carbon extends DateTime implements JsonSerializable
      */
     public function __toString()
     {
-        return $this->format(static::$toStringFormat);
+        $format = static::$toStringFormat;
+
+        return $this->format($format instanceof Closure ? $format($this) : $format);
     }
 
     /**
@@ -2116,7 +2293,7 @@ class Carbon extends DateTime implements JsonSerializable
     /**
      * Get the minimum instance between a given instance (default now) and the current instance.
      *
-     * @param \Carbon\Carbon|\DateTimeInterface|mixed $date
+     * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
      *
      * @return static
      */
@@ -2144,7 +2321,7 @@ class Carbon extends DateTime implements JsonSerializable
     /**
      * Get the maximum instance between a given instance (default now) and the current instance.
      *
-     * @param \Carbon\Carbon|\DateTimeInterface|mixed $date
+     * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
      *
      * @return static
      */
@@ -2355,7 +2532,7 @@ class Carbon extends DateTime implements JsonSerializable
     {
         $date = $date ?: static::now($this->tz);
 
-        static::expectDateTime($date);
+        static::expectDateTime($date, 'null');
 
         return $this->format($format) === $date->format($format);
     }
@@ -2404,7 +2581,7 @@ class Carbon extends DateTime implements JsonSerializable
     {
         $date = $date ? static::instance($date) : static::now($this->tz);
 
-        static::expectDateTime($date);
+        static::expectDateTime($date, 'null');
 
         $ofSameYear = is_null($ofSameYear) ? static::shouldCompareYearWithMonth() : $ofSameYear;
 
@@ -3965,9 +4142,8 @@ class Carbon extends DateTime implements JsonSerializable
                     }
                 }
             }
-            // Some langs have special pluralization for past and future tense.
+            // Some languages have special pluralization for past and future tense.
             $key = $unit.'_'.$transId;
-            $count = isset($count) ? $count : 1;
             if ($key !== static::translator()->transChoice($key, $count)) {
                 $time = static::translator()->transChoice($key, $count, array(':count' => $count));
             }
@@ -3997,7 +4173,7 @@ class Carbon extends DateTime implements JsonSerializable
      */
     public function endOfDay()
     {
-        return $this->modify('23.59.59.999999');
+        return $this->modify('23:59:59.999999');
     }
 
     /**
@@ -4155,7 +4331,7 @@ class Carbon extends DateTime implements JsonSerializable
      */
     public function endOfHour()
     {
-        return $this->setTime($this->hour, 59, 59);
+        return $this->modify("$this->hour:59:59.999999");
     }
 
     /**
@@ -4175,7 +4351,27 @@ class Carbon extends DateTime implements JsonSerializable
      */
     public function endOfMinute()
     {
-        return $this->setTime($this->hour, $this->minute, 59);
+        return $this->modify("$this->hour:$this->minute:59.999999");
+    }
+
+    /**
+     * Modify to start of current minute, seconds become 0
+     *
+     * @return static
+     */
+    public function startOfSecond()
+    {
+        return $this->modify("$this->hour:$this->minute:$this->second.0");
+    }
+
+    /**
+     * Modify to end of current minute, seconds become 59
+     *
+     * @return static
+     */
+    public function endOfSecond()
+    {
+        return $this->modify("$this->hour:$this->minute:$this->second.999999");
     }
 
     /**
@@ -4449,7 +4645,7 @@ class Carbon extends DateTime implements JsonSerializable
     /**
      * Modify the current instance to the average of a given instance (default now) and the current instance.
      *
-     * @param \Carbon\Carbon|\DateTimeInterface|null $date
+     * @param \Carbon\Carbon|\DateTimeInterface|string|null $date
      *
      * @return static
      */
diff --git a/vendor/nesbot/carbon/src/Carbon/CarbonInterval.php b/vendor/nesbot/carbon/src/Carbon/CarbonInterval.php
index ed64f030..a4d78500 100644
--- a/vendor/nesbot/carbon/src/Carbon/CarbonInterval.php
+++ b/vendor/nesbot/carbon/src/Carbon/CarbonInterval.php
@@ -941,12 +941,12 @@ class CarbonInterval extends DateInterval
             $factor = -$factor;
         }
 
-        $this->years = round($this->years * $factor);
-        $this->months = round($this->months * $factor);
-        $this->dayz = round($this->dayz * $factor);
-        $this->hours = round($this->hours * $factor);
-        $this->minutes = round($this->minutes * $factor);
-        $this->seconds = round($this->seconds * $factor);
+        $this->years = (int) round($this->years * $factor);
+        $this->months = (int) round($this->months * $factor);
+        $this->dayz = (int) round($this->dayz * $factor);
+        $this->hours = (int) round($this->hours * $factor);
+        $this->minutes = (int) round($this->minutes * $factor);
+        $this->seconds = (int) round($this->seconds * $factor);
 
         return $this;
     }
diff --git a/vendor/nesbot/carbon/src/Carbon/CarbonPeriod.php b/vendor/nesbot/carbon/src/Carbon/CarbonPeriod.php
index 2adf1404..ae52c0b8 100644
--- a/vendor/nesbot/carbon/src/Carbon/CarbonPeriod.php
+++ b/vendor/nesbot/carbon/src/Carbon/CarbonPeriod.php
@@ -212,7 +212,7 @@ class CarbonPeriod implements Iterator, Countable
     /**
      * The cached validation result for current date.
      *
-     * @var bool|static::END_ITERATION
+     * @var bool|string|null
      */
     protected $validationResult;
 
@@ -237,8 +237,10 @@ class CarbonPeriod implements Iterator, Countable
     {
         // PHP 5.3 equivalent of new static(...$params).
         $reflection = new ReflectionClass(get_class());
+        /** @var static $instance */
+        $instance = $reflection->newInstanceArgs($params);
 
-        return $reflection->newInstanceArgs($params);
+        return $instance;
     }
 
     /**
@@ -878,7 +880,7 @@ class CarbonPeriod implements Iterator, Countable
      * @param \Carbon\Carbon $current
      * @param int            $key
      *
-     * @return bool|static::END_ITERATION
+     * @return bool|string
      */
     protected function filterRecurrences($current, $key)
     {
@@ -954,7 +956,7 @@ class CarbonPeriod implements Iterator, Countable
      *
      * @param \Carbon\Carbon $current
      *
-     * @return bool|static::END_ITERATION
+     * @return bool|string
      */
     protected function filterEndDate($current)
     {
@@ -972,7 +974,7 @@ class CarbonPeriod implements Iterator, Countable
     /**
      * End iteration filter callback.
      *
-     * @return static::END_ITERATION
+     * @return string
      */
     protected function endIteration()
     {
@@ -981,8 +983,6 @@ class CarbonPeriod implements Iterator, Countable
 
     /**
      * Handle change of the parameters.
-     *
-     * @return void
      */
     protected function handleChangedParameters()
     {
@@ -1014,7 +1014,7 @@ class CarbonPeriod implements Iterator, Countable
     /**
      * Check whether current value and key pass all the filters.
      *
-     * @return bool|static::END_ITERATION
+     * @return bool|string
      */
     protected function checkFilters()
     {
@@ -1139,6 +1139,22 @@ class CarbonPeriod implements Iterator, Countable
         }
     }
 
+    /**
+     * Skip iterations and returns iteration state (false if ended, true if still valid).
+     *
+     * @param int $count steps number to skip (1 by default)
+     *
+     * @return bool
+     */
+    public function skip($count = 1)
+    {
+        for ($i = $count; $this->valid() && $i > 0; $i--) {
+            $this->next();
+        }
+
+        return $this->valid();
+    }
+
     /**
      * Keep incrementing the current date until a valid date is found or the iteration is ended.
      *
diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/az.php b/vendor/nesbot/carbon/src/Carbon/Lang/az.php
index d567c63c..25f5c4a4 100644
--- a/vendor/nesbot/carbon/src/Carbon/Lang/az.php
+++ b/vendor/nesbot/carbon/src/Carbon/Lang/az.php
@@ -28,4 +28,13 @@ return array(
     'from_now' => ':time sonra',
     'after' => ':time sonra',
     'before' => ':time əvvəl',
+    'diff_now' => 'indi',
+    'diff_yesterday' => 'dünən',
+    'diff_tomorrow' => 'sabah',
+    'diff_before_yesterday' => 'srağagün',
+    'diff_after_tomorrow' => 'birisi gün',
+    'period_recurrences' => ':count dəfədən bir',
+    'period_interval' => 'hər :interval',
+    'period_start_date' => ':date tarixindən başlayaraq',
+    'period_end_date' => ':date tarixinədək',
 );
diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/bn.php b/vendor/nesbot/carbon/src/Carbon/Lang/bn.php
index a930df38..5817599c 100644
--- a/vendor/nesbot/carbon/src/Carbon/Lang/bn.php
+++ b/vendor/nesbot/carbon/src/Carbon/Lang/bn.php
@@ -10,22 +10,29 @@
  */
 
 return array(
-     'year' => '১ বছর|:count বছর',
-     'y' => '১ বছর|:count বছর',
-     'month' => '১ মাস|:count মাস',
-     'm' => '১ মাস|:count মাস',
-     'week' => '১ সপ্তাহ|:count সপ্তাহ',
-     'w' => '১ সপ্তাহ|:count সপ্তাহ',
-     'day' => '১ দিন|:count দিন',
-     'd' => '১ দিন|:count দিন',
-     'hour' => '১ ঘন্টা|:count ঘন্টা',
-     'h' => '১ ঘন্টা|:count ঘন্টা',
-     'minute' => '১ মিনিট|:count মিনিট',
-     'min' => '১ মিনিট|:count মিনিট',
-     'second' => '১ সেকেন্ড|:count সেকেন্ড',
-     's' => '১ সেকেন্ড|:count সেকেন্ড',
-     'ago' => ':time পূর্বে',
-     'from_now' => 'এখন থেকে :time',
-     'after' => ':time পরে',
-     'before' => ':time আগে',
+    'year' => '১ বছর|:count বছর',
+    'y' => '১ বছর|:count বছর',
+    'month' => '১ মাস|:count মাস',
+    'm' => '১ মাস|:count মাস',
+    'week' => '১ সপ্তাহ|:count সপ্তাহ',
+    'w' => '১ সপ্তাহ|:count সপ্তাহ',
+    'day' => '১ দিন|:count দিন',
+    'd' => '১ দিন|:count দিন',
+    'hour' => '১ ঘন্টা|:count ঘন্টা',
+    'h' => '১ ঘন্টা|:count ঘন্টা',
+    'minute' => '১ মিনিট|:count মিনিট',
+    'min' => '১ মিনিট|:count মিনিট',
+    'second' => '১ সেকেন্ড|:count সেকেন্ড',
+    's' => '১ সেকেন্ড|:count সেকেন্ড',
+    'ago' => ':time পূর্বে',
+    'from_now' => 'এখন থেকে :time',
+    'after' => ':time পরে',
+    'before' => ':time আগে',
+    'diff_now' => 'এখন',
+    'diff_yesterday' => 'গতকাল',
+    'diff_tomorrow' => 'আগামীকাল',
+    'period_recurrences' => ':count বার|:count বার',
+    'period_interval' => 'প্রতি :interval',
+    'period_start_date' => ':date থেকে',
+    'period_end_date' => ':date পর্যন্ত',
 );
diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/ca.php b/vendor/nesbot/carbon/src/Carbon/Lang/ca.php
index 0a016700..c854b5a9 100644
--- a/vendor/nesbot/carbon/src/Carbon/Lang/ca.php
+++ b/vendor/nesbot/carbon/src/Carbon/Lang/ca.php
@@ -25,7 +25,7 @@ return array(
     'second' => ':count segon|:count segons',
     's' => ':count segon|:count segons',
     'ago' => 'fa :time',
-    'from_now' => 'dins de :time',
+    'from_now' => 'd\'aquí :time',
     'after' => ':time després',
     'before' => ':time abans',
     'diff_now' => 'ara mateix',
@@ -33,4 +33,8 @@ return array(
     'diff_tomorrow' => 'demà',
     'diff_before_yesterday' => "abans d'ahir",
     'diff_after_tomorrow' => 'demà passat',
+    'period_recurrences' => ':count cop|:count cops',
+    'period_interval' => 'cada :interval',
+    'period_start_date' => 'de :date',
+    'period_end_date' => 'fins a :date',
 );
diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/es.php b/vendor/nesbot/carbon/src/Carbon/Lang/es.php
index 607a6b0b..567a280f 100644
--- a/vendor/nesbot/carbon/src/Carbon/Lang/es.php
+++ b/vendor/nesbot/carbon/src/Carbon/Lang/es.php
@@ -31,6 +31,6 @@ return array(
     'diff_now' => 'ahora mismo',
     'diff_yesterday' => 'ayer',
     'diff_tomorrow' => 'mañana',
-    'diff_before_yesterday' => 'anteayer',
+    'diff_before_yesterday' => 'antier',
     'diff_after_tomorrow' => 'pasado mañana',
 );
diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/fr.php b/vendor/nesbot/carbon/src/Carbon/Lang/fr.php
index 5436d21c..0b20cdd2 100644
--- a/vendor/nesbot/carbon/src/Carbon/Lang/fr.php
+++ b/vendor/nesbot/carbon/src/Carbon/Lang/fr.php
@@ -33,4 +33,8 @@ return array(
     'diff_tomorrow' => 'demain',
     'diff_before_yesterday' => 'avant-hier',
     'diff_after_tomorrow' => 'après-demain',
+    'period_recurrences' => ':count fois',
+    'period_interval' => 'tous les :interval',
+    'period_start_date' => 'de :date',
+    'period_end_date' => 'à :date',
 );
diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/my.php b/vendor/nesbot/carbon/src/Carbon/Lang/my.php
new file mode 100644
index 00000000..e8e491ec
--- /dev/null
+++ b/vendor/nesbot/carbon/src/Carbon/Lang/my.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Carbon package.
+ *
+ * (c) Brian Nesbitt <brian@nesbot.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return array(
+    'year' => ':count နှစ်|:count နှစ်',
+    'y' => ':count နှစ်|:count နှစ်',
+    'month' => ':count လ|:count လ',
+    'm' => ':count လ|:count လ',
+    'week' => ':count ပတ်|:count ပတ်',
+    'w' => ':count ပတ်|:count ပတ်',
+    'day' => ':count ရက်|:count ရက်',
+    'd' => ':count ရက်|:count ရက်',
+    'hour' => ':count နာရီ|:count နာရီ',
+    'h' => ':count နာရီ|:count နာရီ',
+    'minute' => ':count မိနစ်|:count မိနစ်',
+    'min' => ':count မိနစ်|:count မိနစ်',
+    'second' => ':count စက္ကန့်|:count စက္ကန့်',
+    's' => ':count စက္ကန့်|:count စက္ကန့်',
+    'ago' => 'လွန်ခဲ့သော :time က',
+    'from_now' => 'ယခုမှစ၍နောက် :time အကြာ',
+    'after' => ':time ကြာပြီးနောက်',
+    'before' => ':time မတိုင်ခင်',
+    'diff_now' => 'အခုလေးတင်',
+    'diff_yesterday' => 'မနေ့က',
+    'diff_tomorrow' => 'မနက်ဖြန်',
+    'diff_before_yesterday' => 'တမြန်နေ့က',
+    'diff_after_tomorrow' => 'တဘက်ခါ',
+    'period_recurrences' => ':count ကြိမ်',
+);
diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/oc.php b/vendor/nesbot/carbon/src/Carbon/Lang/oc.php
index 6271a429..e89e94c3 100644
--- a/vendor/nesbot/carbon/src/Carbon/Lang/oc.php
+++ b/vendor/nesbot/carbon/src/Carbon/Lang/oc.php
@@ -37,4 +37,8 @@ return array(
     'diff_tomorrow' => 'deman',
     'diff_before_yesterday' => 'ièr delà',
     'diff_after_tomorrow' => 'deman passat',
+    'period_recurrences' => ':count còp|:count còps',
+    'period_interval' => 'cada :interval',
+    'period_start_date' => 'de :date',
+    'period_end_date' => 'fins a :date',
 );
diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/pt_BR.php b/vendor/nesbot/carbon/src/Carbon/Lang/pt_BR.php
index 22d12201..1f84eac5 100644
--- a/vendor/nesbot/carbon/src/Carbon/Lang/pt_BR.php
+++ b/vendor/nesbot/carbon/src/Carbon/Lang/pt_BR.php
@@ -11,21 +11,30 @@
 
 return array(
     'year' => ':count ano|:count anos',
-    'y' => ':count ano|:count anos',
+    'y' => ':counta|:counta',
     'month' => ':count mês|:count meses',
-    'm' => ':count mês|:count meses',
+    'm' => ':countm|:countm',
     'week' => ':count semana|:count semanas',
-    'w' => ':count semana|:count semanas',
+    'w' => ':countsem|:countsem',
     'day' => ':count dia|:count dias',
-    'd' => ':count dia|:count dias',
+    'd' => ':countd|:countd',
     'hour' => ':count hora|:count horas',
-    'h' => ':count hora|:count horas',
+    'h' => ':counth|:counth',
     'minute' => ':count minuto|:count minutos',
-    'min' => ':count minuto|:count minutos',
+    'min' => ':countmin|:countmin',
     'second' => ':count segundo|:count segundos',
-    's' => ':count segundo|:count segundos',
+    's' => ':counts|:counts',
     'ago' => 'há :time',
     'from_now' => 'em :time',
     'after' => 'após :time',
     'before' => ':time atrás',
+    'diff_now' => 'agora',
+    'diff_yesterday' => 'ontem',
+    'diff_tomorrow' => 'amanhã',
+    'diff_before_yesterday' => 'anteontem',
+    'diff_after_tomorrow' => 'depois de amanhã',
+    'period_recurrences' => 'uma|:count vez',
+    'period_interval' => 'toda :interval',
+    'period_start_date' => 'de :date',
+    'period_end_date' => 'até :date',
 );
diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/ru.php b/vendor/nesbot/carbon/src/Carbon/Lang/ru.php
index 680cbdcb..6a83fb13 100644
--- a/vendor/nesbot/carbon/src/Carbon/Lang/ru.php
+++ b/vendor/nesbot/carbon/src/Carbon/Lang/ru.php
@@ -11,19 +11,19 @@
 
 return array(
     'year' => ':count год|:count года|:count лет',
-    'y' => ':count год|:count года|:count лет',
+    'y' => ':count г|:count г|:count л',
     'month' => ':count месяц|:count месяца|:count месяцев',
-    'm' => ':count месяц|:count месяца|:count месяцев',
+    'm' => ':count м|:count м|:count м',
     'week' => ':count неделю|:count недели|:count недель',
-    'w' => ':count неделю|:count недели|:count недель',
+    'w' => ':count н|:count н|:count н',
     'day' => ':count день|:count дня|:count дней',
-    'd' => ':count день|:count дня|:count дней',
+    'd' => ':count д|:count д|:count д',
     'hour' => ':count час|:count часа|:count часов',
-    'h' => ':count час|:count часа|:count часов',
+    'h' => ':count ч|:count ч|:count ч',
     'minute' => ':count минуту|:count минуты|:count минут',
-    'min' => ':count минуту|:count минуты|:count минут',
+    'min' => ':count мин|:count мин|:count мин',
     'second' => ':count секунду|:count секунды|:count секунд',
-    's' => ':count секунду|:count секунды|:count секунд',
+    's' => ':count с|:count с|:count с',
     'ago' => ':time назад',
     'from_now' => 'через :time',
     'after' => ':time после',
diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/sh.php b/vendor/nesbot/carbon/src/Carbon/Lang/sh.php
index d520cf03..57f287a7 100644
--- a/vendor/nesbot/carbon/src/Carbon/Lang/sh.php
+++ b/vendor/nesbot/carbon/src/Carbon/Lang/sh.php
@@ -9,6 +9,10 @@
  * file that was distributed with this source code.
  */
 
+\Symfony\Component\Translation\PluralizationRules::set(function ($number) {
+    return ((1 == $number % 10) && (11 != $number % 100)) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
+}, 'sh');
+
 return array(
     'year' => ':count godina|:count godine|:count godina',
     'y' => ':count godina|:count godine|:count godina',
diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/uk.php b/vendor/nesbot/carbon/src/Carbon/Lang/uk.php
index eaba601b..8d08eaa4 100644
--- a/vendor/nesbot/carbon/src/Carbon/Lang/uk.php
+++ b/vendor/nesbot/carbon/src/Carbon/Lang/uk.php
@@ -28,4 +28,13 @@ return array(
     'from_now' => 'через :time',
     'after' => ':time після',
     'before' => ':time до',
+    'diff_now' => 'щойно',
+    'diff_yesterday' => 'вчора',
+    'diff_tomorrow' => 'завтра',
+    'diff_before_yesterday' => 'позавчора',
+    'diff_after_tomorrow' => 'післязавтра',
+    'period_recurrences' => 'один раз|:count рази|:count разів',
+    'period_interval' => 'кожні :interval',
+    'period_start_date' => 'з :date',
+    'period_end_date' => 'до :date',
 );
diff --git a/vendor/nesbot/carbon/src/Carbon/Laravel/ServiceProvider.php b/vendor/nesbot/carbon/src/Carbon/Laravel/ServiceProvider.php
new file mode 100644
index 00000000..4d83b0c6
--- /dev/null
+++ b/vendor/nesbot/carbon/src/Carbon/Laravel/ServiceProvider.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Carbon\Laravel;
+
+use Carbon\Carbon;
+use Illuminate\Events\Dispatcher;
+use Illuminate\Events\EventDispatcher;
+use Illuminate\Translation\Translator as IlluminateTranslator;
+use Symfony\Component\Translation\Translator;
+
+class ServiceProvider extends \Illuminate\Support\ServiceProvider
+{
+    public function boot()
+    {
+        $service = $this;
+        $events = $this->app['events'];
+        if ($events instanceof EventDispatcher || $events instanceof Dispatcher) {
+            $events->listen(class_exists('Illuminate\Foundation\Events\LocaleUpdated') ? 'Illuminate\Foundation\Events\LocaleUpdated' : 'locale.changed', function () use ($service) {
+                $service->updateLocale();
+            });
+            $service->updateLocale();
+        }
+    }
+
+    public function updateLocale()
+    {
+        $translator = $this->app['translator'];
+        if ($translator instanceof Translator || $translator instanceof IlluminateTranslator) {
+            Carbon::setLocale($translator->getLocale());
+        }
+    }
+
+    public function register()
+    {
+        // Needed for Laravel < 5.3 compatibility
+    }
+}
diff --git a/vendor/nesbot/carbon/src/JsonSerializable.php b/vendor/nesbot/carbon/src/JsonSerializable.php
index b678e736..d34060b4 100644
--- a/vendor/nesbot/carbon/src/JsonSerializable.php
+++ b/vendor/nesbot/carbon/src/JsonSerializable.php
@@ -1,16 +1,18 @@
 <?php
 
-interface JsonSerializable
-{
-    /**
-     * Specify data which should be serialized to JSON.
-     *
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     *
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     *               which is a value of any type other than a resource.
-     *
-     * @since 5.4.0
-     */
-    public function jsonSerialize();
+if (!interface_exists('JsonSerializable')) {
+    interface JsonSerializable
+    {
+        /**
+         * Specify data which should be serialized to JSON.
+         *
+         * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+         *
+         * @return mixed data which can be serialized by <b>json_encode</b>,
+         *               which is a value of any type other than a resource.
+         *
+         * @since 5.4.0
+         */
+        public function jsonSerialize();
+    }
 }
diff --git a/vendor/nikic/php-parser/.travis.yml b/vendor/nikic/php-parser/.travis.yml
index 989d7a04..ee8eba99 100644
--- a/vendor/nikic/php-parser/.travis.yml
+++ b/vendor/nikic/php-parser/.travis.yml
@@ -23,7 +23,7 @@ matrix:
 
 script:
   - if [ $TRAVIS_PHP_VERSION = '7.0' ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; else vendor/bin/phpunit; fi
-  - if [ $TRAVIS_PHP_VERSION = '7.1' ]; then test_old/run-php-src.sh; fi
+  - if [ $TRAVIS_PHP_VERSION = '7.2' ]; then test_old/run-php-src.sh; fi
 
 after_success:
   - if [ $TRAVIS_PHP_VERSION = '7.0' ]; then php vendor/bin/coveralls; fi
diff --git a/vendor/nikic/php-parser/CHANGELOG.md b/vendor/nikic/php-parser/CHANGELOG.md
index 3c812a28..4a3f0063 100644
--- a/vendor/nikic/php-parser/CHANGELOG.md
+++ b/vendor/nikic/php-parser/CHANGELOG.md
@@ -1,8 +1,57 @@
-Version 4.0.3-dev
+Version 4.1.1-dev
 -----------------
 
 Nothing yet.
 
+Version 4.1.0 (2018-10-10)
+--------------------------
+
+### Added
+
+* Added support for PHP 7.3 flexible heredoc/nowdoc strings, completing support for PHP 7.3. There
+  are two caveats for this feature:
+   * In some rare, pathological cases flexible heredoc/nowdoc strings change the interpretation of
+     existing doc strings. PHP-Parser will now use the new interpretation.
+   * Flexible heredoc/nowdoc strings require special support from the lexer. Because this is not
+     available on PHP versions before 7.3, support has to be emulated. This emulation is not perfect
+     and some cases which we do not expect to occur in practice (such as flexible doc strings being
+     nested within each other through abuse of variable-variable interpolation syntax) may not be
+     recognized correctly.
+* Added `DONT_TRAVERSER_CURRENT_AND_CHILDREN` to `NodeTraverser` to skip both traversal of child
+  nodes, and prevent subsequent visitors from visiting the current node.
+
+Version 4.0.4 (2018-09-18)
+--------------------------
+
+### Added
+
+* The following methods have been added to `BuilderFactory`:
+  * `useTrait()` (fluent builder)
+  * `traitUseAdaptation()` (fluent builder)
+  * `useFunction()` (fluent builder)
+  * `useConst()` (fluent builder)
+  * `var()`
+  * `propertyFetch()`
+  
+### Deprecated
+
+* `Builder\Param::setTypeHint()` has been deprecated in favor of the newly introduced
+  `Builder\Param::setType()`.
+
+Version 4.0.3 (2018-07-15)
+--------------------------
+
+### Fixed
+
+* Fixed possible undefined offset notice in formatting-preserving printer. (#513)
+
+### Added
+
+* Improved error recovery inside arrays.
+* Preserve trailing comment inside classes. **Note:** This change is possibly BC breaking if your
+  code validates that classes can only contain certain statement types. After this change, classes
+  can also contain Nop statements, while this was not previously possible. (#509)
+
 Version 4.0.2 (2018-06-03)
 --------------------------
 
diff --git a/vendor/nikic/php-parser/README.md b/vendor/nikic/php-parser/README.md
index 7b1fedab..5ae789f9 100644
--- a/vendor/nikic/php-parser/README.md
+++ b/vendor/nikic/php-parser/README.md
@@ -6,9 +6,9 @@ PHP Parser
 This is a PHP 5.2 to PHP 7.2 parser written in PHP. Its purpose is to simplify static code analysis and
 manipulation.
 
-[**Documentation for version 4.x**][doc_master] (stable; for running on PHP >= 7.0; for parsing PHP 5.2 to PHP 7.2).
+[**Documentation for version 4.x**][doc_master] (stable; for running on PHP >= 7.0; for parsing PHP 5.2 to PHP 7.3).
 
-[Documentation for version 3.x][doc_3_x] (stable; for running on PHP >= 5.5; for parsing PHP 5.2 to PHP 7.2).
+[Documentation for version 3.x][doc_3_x] (unsupported; for running on PHP >= 5.5; for parsing PHP 5.2 to PHP 7.2).
 
 Features
 --------
diff --git a/vendor/nikic/php-parser/composer.json b/vendor/nikic/php-parser/composer.json
index 7ae425ff..12e8458a 100644
--- a/vendor/nikic/php-parser/composer.json
+++ b/vendor/nikic/php-parser/composer.json
@@ -24,7 +24,7 @@
     "bin": ["bin/php-parse"],
     "extra": {
         "branch-alias": {
-            "dev-master": "4.0-dev"
+            "dev-master": "4.1-dev"
         }
     }
 }
diff --git a/vendor/nikic/php-parser/doc/component/AST_builders.markdown b/vendor/nikic/php-parser/doc/component/AST_builders.markdown
index 5597e2a4..4f338f6e 100644
--- a/vendor/nikic/php-parser/doc/component/AST_builders.markdown
+++ b/vendor/nikic/php-parser/doc/component/AST_builders.markdown
@@ -28,16 +28,26 @@ use PhpParser\Node;
 
 $factory = new BuilderFactory;
 $node = $factory->namespace('Name\Space')
-    ->addStmt($factory->use('Some\Other\Thingy')->as('SomeOtherClass'))
+    ->addStmt($factory->use('Some\Other\Thingy')->as('SomeClass'))
+    ->addStmt($factory->useFunction('strlen'))
+    ->addStmt($factory->useConst('PHP_VERSION'))
     ->addStmt($factory->class('SomeOtherClass')
         ->extend('SomeClass')
         ->implement('A\Few', '\Interfaces')
         ->makeAbstract() // ->makeFinal()
 
+        ->addStmt($factory->useTrait('FirstTrait'))
+
+        ->addStmt($factory->useTrait('SecondTrait', 'ThirdTrait')
+            ->and('AnotherTrait')
+            ->with($factory->traitUseAdaptation('foo')->as('bar'))
+            ->with($factory->traitUseAdaptation('AnotherTrait', 'baz')->as('test'))
+            ->with($factory->traitUseAdaptation('AnotherTrait', 'func')->insteadof('SecondTrait')))
+
         ->addStmt($factory->method('someMethod')
             ->makePublic()
             ->makeAbstract() // ->makeFinal()
-            ->setReturnType('bool')
+            ->setReturnType('bool') // ->makeReturnByRef()
             ->addParam($factory->param('someParam')->setTypeHint('SomeClass'))
             ->setDocComment('/**
                               * This method does something.
@@ -74,8 +84,16 @@ This will produce the following output with the standard pretty printer:
 namespace Name\Space;
 
 use Some\Other\Thingy as SomeClass;
+use function strlen;
+use const PHP_VERSION;
 abstract class SomeOtherClass extends SomeClass implements A\Few, \Interfaces
 {
+    use FirstTrait;
+    use SecondTrait, ThirdTrait, AnotherTrait {
+        foo as bar;
+        AnotherTrait::baz as test;
+        AnotherTrait::func insteadof SecondTrait;
+    }
     protected $someProperty;
     private $anotherProperty = array(1, 2, 3);
     /**
@@ -98,6 +116,7 @@ The `BuilderFactory` also provides a number of additional helper methods, which
 nodes. The following methods are currently available:
 
  * `val($value)`: Creates an AST node for a literal value like `42` or `[1, 2, 3]`.
+ * `var($name)`: Creates variable node.
  * `args(array $args)`: Creates an array of function/method arguments, including the required `Arg`
    wrappers. Also converts literals to AST nodes.
  * `funcCall($name, array $args = [])`: Create a function call node. Converts `$name` to a `Name`
@@ -111,7 +130,9 @@ nodes. The following methods are currently available:
  * `constFetch($name)`: Create a constant fetch node. Converts `$name` to a `Name` node.
  * `classConstFetch($class, $name)`: Create a class constant fetch node. Converts `$class` to a
    `Name` node and `$name` to an `Identifier` node.
+ * `propertyFetch($var, $name)`: Creates a property fetch node. Converts `$name` to an `Identifier`
+   node.
  * `concat(...$exprs)`: Create a tree of `BinaryOp\Concat` nodes for the given expressions.
 
 These methods may be expanded on an as-needed basis. Please open an issue or PR if a common
-operation is missing.
\ No newline at end of file
+operation is missing.
diff --git a/vendor/nikic/php-parser/grammar/php5.y b/vendor/nikic/php-parser/grammar/php5.y
index 379cd3c7..abc5cedf 100644
--- a/vendor/nikic/php-parser/grammar/php5.y
+++ b/vendor/nikic/php-parser/grammar/php5.y
@@ -454,11 +454,17 @@ static_var:
     | plain_variable '=' static_scalar                      { $$ = Stmt\StaticVar[$1, $3]; }
 ;
 
-class_statement_list:
-      class_statement_list class_statement                  { push($1, $2); }
+class_statement_list_ex:
+      class_statement_list_ex class_statement               { if ($2 !== null) { push($1, $2); } }
     | /* empty */                                           { init(); }
 ;
 
+class_statement_list:
+      class_statement_list_ex
+          { makeNop($nop, $this->lookaheadStartAttributes, $this->endAttributes);
+            if ($nop !== null) { $1[] = $nop; } $$ = $1; }
+;
+
 class_statement:
       variable_modifiers property_declaration_list ';'
           { $$ = Stmt\Property[$1, $2]; $this->checkProperty($$, #1); }
@@ -785,11 +791,9 @@ common_scalar:
     | T_FUNC_C                                              { $$ = Scalar\MagicConst\Function_[]; }
     | T_NS_C                                                { $$ = Scalar\MagicConst\Namespace_[]; }
     | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC
-          { $attrs = attributes(); setDocStringAttrs($attrs, $1);
-            $$ = new Scalar\String_(Scalar\String_::parseDocString($1, $2, false), $attrs); }
+          { $$ = $this->parseDocString($1, $2, $3, attributes(), stackAttributes(#3), false); }
     | T_START_HEREDOC T_END_HEREDOC
-          { $attrs = attributes(); setDocStringAttrs($attrs, $1);
-            $$ = new Scalar\String_('', $attrs); }
+          { $$ = $this->parseDocString($1, '', $2, attributes(), stackAttributes(#2), false); }
 ;
 
 static_scalar:
@@ -850,8 +854,7 @@ scalar:
           { $attrs = attributes(); $attrs['kind'] = Scalar\String_::KIND_DOUBLE_QUOTED;
             parseEncapsed($2, '"', true); $$ = new Scalar\Encapsed($2, $attrs); }
     | T_START_HEREDOC encaps_list T_END_HEREDOC
-          { $attrs = attributes(); setDocStringAttrs($attrs, $1);
-            parseEncapsedDoc($2, true); $$ = new Scalar\Encapsed($2, $attrs); }
+          { $$ = $this->parseDocString($1, $2, $3, attributes(), stackAttributes(#3), true); }
 ;
 
 static_array_pair_list:
diff --git a/vendor/nikic/php-parser/grammar/php7.y b/vendor/nikic/php-parser/grammar/php7.y
index 8f784301..f7d32ef4 100644
--- a/vendor/nikic/php-parser/grammar/php7.y
+++ b/vendor/nikic/php-parser/grammar/php7.y
@@ -522,11 +522,17 @@ static_var:
     | plain_variable '=' expr                               { $$ = Stmt\StaticVar[$1, $3]; }
 ;
 
-class_statement_list:
-      class_statement_list class_statement                  { if ($2 !== null) { push($1, $2); } }
+class_statement_list_ex:
+      class_statement_list_ex class_statement               { if ($2 !== null) { push($1, $2); } }
     | /* empty */                                           { init(); }
 ;
 
+class_statement_list:
+      class_statement_list_ex
+          { makeNop($nop, $this->lookaheadStartAttributes, $this->endAttributes);
+            if ($nop !== null) { $1[] = $nop; } $$ = $1; }
+;
+
 class_statement:
       variable_modifiers property_declaration_list ';'
           { $$ = Stmt\Property[$1, $2]; $this->checkProperty($$, #1); }
@@ -841,17 +847,14 @@ scalar:
     | dereferencable_scalar                                 { $$ = $1; }
     | constant                                              { $$ = $1; }
     | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC
-          { $attrs = attributes(); setDocStringAttrs($attrs, $1);
-            $$ = new Scalar\String_(Scalar\String_::parseDocString($1, $2), $attrs); }
+          { $$ = $this->parseDocString($1, $2, $3, attributes(), stackAttributes(#3), true); }
     | T_START_HEREDOC T_END_HEREDOC
-          { $attrs = attributes(); setDocStringAttrs($attrs, $1);
-            $$ = new Scalar\String_('', $attrs); }
+          { $$ = $this->parseDocString($1, '', $2, attributes(), stackAttributes(#2), true); }
     | '"' encaps_list '"'
           { $attrs = attributes(); $attrs['kind'] = Scalar\String_::KIND_DOUBLE_QUOTED;
             parseEncapsed($2, '"', true); $$ = new Scalar\Encapsed($2, $attrs); }
     | T_START_HEREDOC encaps_list T_END_HEREDOC
-          { $attrs = attributes(); setDocStringAttrs($attrs, $1);
-            parseEncapsedDoc($2, true); $$ = new Scalar\Encapsed($2, $attrs); }
+          { $$ = $this->parseDocString($1, $2, $3, attributes(), stackAttributes(#3), true); }
 ;
 
 optional_expr:
@@ -952,8 +955,13 @@ array_pair_list:
           { $$ = $1; $end = count($$)-1; if ($$[$end] === null) array_pop($$); }
 ;
 
+comma_or_error:
+      ','
+    | error
+;
+
 inner_array_pair_list:
-      inner_array_pair_list ',' array_pair                  { push($1, $3); }
+      inner_array_pair_list comma_or_error array_pair       { push($1, $3); }
     | array_pair                                            { init($1); }
 ;
 
diff --git a/vendor/nikic/php-parser/grammar/rebuildParsers.php b/vendor/nikic/php-parser/grammar/rebuildParsers.php
index 3be5edb6..1882d5fe 100644
--- a/vendor/nikic/php-parser/grammar/rebuildParsers.php
+++ b/vendor/nikic/php-parser/grammar/rebuildParsers.php
@@ -166,15 +166,6 @@ function resolveMacros($code) {
                      . ' $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, ' . $args[1] . ', ' . $args[2] . '); } }';
             }
 
-            if ('parseEncapsedDoc' == $name) {
-                assertArgs(2, $args, $name);
-
-                return 'foreach (' . $args[0] . ' as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) {'
-                     . ' $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, null, ' . $args[1] . '); } }'
-                     . ' $s->value = preg_replace(\'~(\r\n|\n|\r)\z~\', \'\', $s->value);'
-                     . ' if (\'\' === $s->value) array_pop(' . $args[0] . ');';
-            }
-
             if ('makeNop' == $name) {
                 assertArgs(3, $args, $name);
 
@@ -192,15 +183,6 @@ function resolveMacros($code) {
                      . '? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED)';
             }
 
-            if ('setDocStringAttrs' == $name) {
-                assertArgs(2, $args, $name);
-
-                return $args[0] . '[\'kind\'] = strpos(' . $args[1] . ', "\'") === false '
-                     . '? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; '
-                     . 'preg_match(\'/\A[bB]?<<<[ \t]*[\\\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\\\'"]?(?:\r\n|\n|\r)\z/\', ' . $args[1] . ', $matches); '
-                     . $args[0] . '[\'docLabel\'] = $matches[1];';
-            }
-
             if ('prependLeadingComments' == $name) {
                 assertArgs(1, $args, $name);
 
diff --git a/vendor/nikic/php-parser/lib/PhpParser/Builder/Param.php b/vendor/nikic/php-parser/lib/PhpParser/Builder/Param.php
index eff76cb4..184813a6 100644
--- a/vendor/nikic/php-parser/lib/PhpParser/Builder/Param.php
+++ b/vendor/nikic/php-parser/lib/PhpParser/Builder/Param.php
@@ -42,13 +42,13 @@ class Param implements PhpParser\Builder
     }
 
     /**
-     * Sets type hint for the parameter.
+     * Sets type for the parameter.
      *
-     * @param string|Node\Name|Node\NullableType $type Type hint to use
+     * @param string|Node\Name|Node\NullableType $type Parameter type
      *
      * @return $this The builder instance (for fluid interface)
      */
-    public function setTypeHint($type) {
+    public function setType($type) {
         $this->type = BuilderHelpers::normalizeType($type);
         if ($this->type == 'void') {
             throw new \LogicException('Parameter type cannot be void');
@@ -57,6 +57,19 @@ class Param implements PhpParser\Builder
         return $this;
     }
 
+    /**
+     * Sets type for the parameter.
+     *
+     * @param string|Node\Name|Node\NullableType $type Parameter type
+     *
+     * @return $this The builder instance (for fluid interface)
+     *
+     * @deprecated Use setType() instead
+     */
+    public function setTypeHint($type) {
+        return $this->setType($type);
+    }
+
     /**
      * Make the parameter accept the value by reference.
      *
diff --git a/vendor/nikic/php-parser/lib/PhpParser/Builder/TraitUse.php b/vendor/nikic/php-parser/lib/PhpParser/Builder/TraitUse.php
new file mode 100644
index 00000000..311e8cd7
--- /dev/null
+++ b/vendor/nikic/php-parser/lib/PhpParser/Builder/TraitUse.php
@@ -0,0 +1,64 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Builder;
+
+use PhpParser\Builder;
+use PhpParser\BuilderHelpers;
+use PhpParser\Node;
+use PhpParser\Node\Stmt;
+
+class TraitUse implements Builder
+{
+    protected $traits = [];
+    protected $adaptations = [];
+
+    /**
+     * Creates a trait use builder.
+     *
+     * @param Node\Name|string ...$traits Names of used traits
+     */
+    public function __construct(...$traits) {
+        foreach ($traits as $trait) {
+            $this->and($trait);
+        }
+    }
+
+    /**
+     * Adds used trait.
+     *
+     * @param Node\Name|string $trait Trait name
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function and($trait) {
+        $this->traits[] = BuilderHelpers::normalizeName($trait);
+        return $this;
+    }
+
+    /**
+     * Adds trait adaptation.
+     *
+     * @param Stmt\TraitUseAdaptation|Builder\TraitUseAdaptation $adaptation Trait adaptation
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function with($adaptation) {
+        $adaptation = BuilderHelpers::normalizeNode($adaptation);
+
+        if (!$adaptation instanceof Stmt\TraitUseAdaptation) {
+            throw new \LogicException('Adaptation must have type TraitUseAdaptation');
+        }
+
+        $this->adaptations[] = $adaptation;
+        return $this;
+    }
+
+    /**
+     * Returns the built node.
+     *
+     * @return Node The built node
+     */
+    public function getNode() : Node {
+        return new Stmt\TraitUse($this->traits, $this->adaptations);
+    }
+}
diff --git a/vendor/nikic/php-parser/lib/PhpParser/Builder/TraitUseAdaptation.php b/vendor/nikic/php-parser/lib/PhpParser/Builder/TraitUseAdaptation.php
new file mode 100644
index 00000000..eb6c0b62
--- /dev/null
+++ b/vendor/nikic/php-parser/lib/PhpParser/Builder/TraitUseAdaptation.php
@@ -0,0 +1,148 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Builder;
+
+use PhpParser\Builder;
+use PhpParser\BuilderHelpers;
+use PhpParser\Node;
+use PhpParser\Node\Stmt;
+
+class TraitUseAdaptation implements Builder
+{
+    const TYPE_UNDEFINED  = 0;
+    const TYPE_ALIAS      = 1;
+    const TYPE_PRECEDENCE = 2;
+
+    /** @var int Type of building adaptation */
+    protected $type;
+
+    protected $trait;
+    protected $method;
+
+    protected $modifier = null;
+    protected $alias = null;
+
+    protected $insteadof = [];
+
+    /**
+     * Creates a trait use adaptation builder.
+     *
+     * @param Node\Name|string|null  $trait  Name of adaptated trait
+     * @param Node\Identifier|string $method Name of adaptated method
+     */
+    public function __construct($trait, $method) {
+        $this->type = self::TYPE_UNDEFINED;
+
+        $this->trait = is_null($trait)? null: BuilderHelpers::normalizeName($trait);
+        $this->method = BuilderHelpers::normalizeIdentifier($method);
+    }
+
+    /**
+     * Sets alias of method.
+     *
+     * @param Node\Identifier|string $alias Alias for adaptated method
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function as($alias) {
+        if ($this->type === self::TYPE_UNDEFINED) {
+            $this->type = self::TYPE_ALIAS;
+        }
+
+        if ($this->type !== self::TYPE_ALIAS) {
+            throw new \LogicException('Cannot set alias for not alias adaptation buider');
+        }
+
+        $this->alias = $alias;
+        return $this;
+    }
+
+    /**
+     * Sets adaptated method public.
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function makePublic() {
+        $this->setModifier(Stmt\Class_::MODIFIER_PUBLIC);
+        return $this;
+    }
+
+    /**
+     * Sets adaptated method protected.
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function makeProtected() {
+        $this->setModifier(Stmt\Class_::MODIFIER_PROTECTED);
+        return $this;
+    }
+
+    /**
+     * Sets adaptated method private.
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function makePrivate() {
+        $this->setModifier(Stmt\Class_::MODIFIER_PRIVATE);
+        return $this;
+    }
+
+    /**
+     * Adds overwritten traits.
+     *
+     * @param Node\Name|string ...$traits Traits for overwrite
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function insteadof(...$traits) {
+        if ($this->type === self::TYPE_UNDEFINED) {
+            if (is_null($this->trait)) {
+                throw new \LogicException('Precedence adaptation must have trait');
+            }
+
+            $this->type = self::TYPE_PRECEDENCE;
+        }
+
+        if ($this->type !== self::TYPE_PRECEDENCE) {
+            throw new \LogicException('Cannot add overwritten traits for not precedence adaptation buider');
+        }
+
+        foreach ($traits as $trait) {
+            $this->insteadof[] = BuilderHelpers::normalizeName($trait);
+        }
+
+        return $this;
+    }
+
+    protected function setModifier(int $modifier) {
+        if ($this->type === self::TYPE_UNDEFINED) {
+            $this->type = self::TYPE_ALIAS;
+        }
+
+        if ($this->type !== self::TYPE_ALIAS) {
+            throw new \LogicException('Cannot set access modifier for not alias adaptation buider');
+        }
+
+        if (is_null($this->modifier)) {
+            $this->modifier = $modifier;
+        } else {
+            throw new \LogicException('Multiple access type modifiers are not allowed');
+        }
+    }
+
+    /**
+     * Returns the built node.
+     *
+     * @return Node The built node
+     */
+    public function getNode() : Node {
+        switch ($this->type) {
+            case self::TYPE_ALIAS:
+                return new Stmt\TraitUseAdaptation\Alias($this->trait, $this->method, $this->modifier, $this->alias);
+            case self::TYPE_PRECEDENCE:
+                return new Stmt\TraitUseAdaptation\Precedence($this->trait, $this->method, $this->insteadof);
+            default:
+                throw new \LogicException('Type of adaptation is not defined');
+        }
+    }
+}
diff --git a/vendor/nikic/php-parser/lib/PhpParser/BuilderFactory.php b/vendor/nikic/php-parser/lib/PhpParser/BuilderFactory.php
index ee855589..77d282e0 100644
--- a/vendor/nikic/php-parser/lib/PhpParser/BuilderFactory.php
+++ b/vendor/nikic/php-parser/lib/PhpParser/BuilderFactory.php
@@ -57,6 +57,34 @@ class BuilderFactory
         return new Builder\Trait_($name);
     }
 
+    /**
+     * Creates a trait use builder.
+     *
+     * @param Node\Name|string ...$traits Trait names
+     *
+     * @return Builder\TraitUse The create trait use builder
+     */
+    public function useTrait(...$traits) : Builder\TraitUse {
+        return new Builder\TraitUse(...$traits);
+    }
+
+    /**
+     * Creates a trait use adaptation builder.
+     *
+     * @param Node\Name|string|null  $trait  Trait name
+     * @param Node\Identifier|string $method Method name
+     *
+     * @return Builder\TraitUseAdaptation The create trait use adaptation builder
+     */
+    public function traitUseAdaptation($trait, $method = null) : Builder\TraitUseAdaptation {
+        if (is_null($method)) {
+            $method = $trait;
+            $trait = null;
+        }
+
+        return new Builder\TraitUseAdaptation($trait, $method);
+    }
+
     /**
      * Creates a method builder.
      *
@@ -104,14 +132,36 @@ class BuilderFactory
     /**
      * Creates a namespace/class use builder.
      *
-     * @param string|Node\Name $name Name to alias
+     * @param Node\Name|string $name Name of the entity (namespace or class) to alias
      *
-     * @return Builder\Use_ The create use builder
+     * @return Builder\Use_ The created use builder
      */
     public function use($name) : Builder\Use_ {
         return new Builder\Use_($name, Use_::TYPE_NORMAL);
     }
 
+    /**
+     * Creates a function use builder.
+     *
+     * @param Node\Name|string $name Name of the function to alias
+     *
+     * @return Builder\Use_ The created use function builder
+     */
+    public function useFunction($name) : Builder\Use_ {
+        return new Builder\Use_($name, Use_::TYPE_FUNCTION);
+    }
+
+    /**
+     * Creates a constant use builder.
+     *
+     * @param Node\Name|string $name Name of the const to alias
+     *
+     * @return Builder\Use_ The created use const builder
+     */
+    public function useConst($name) : Builder\Use_ {
+        return new Builder\Use_($name, Use_::TYPE_CONSTANT);
+    }
+
     /**
      * Creates node a for a literal value.
      *
@@ -123,6 +173,21 @@ class BuilderFactory
         return BuilderHelpers::normalizeValue($value);
     }
 
+    /**
+     * Creates variable node.
+     *
+     * @param string|Expr $name Name
+     *
+     * @return Expr\Variable
+     */
+    public function var($name) : Expr\Variable {
+        if (!\is_string($name) && !$name instanceof Expr) {
+            throw new \LogicException('Variable name must be string or Expr');
+        }
+
+        return new Expr\Variable($name);
+    }
+
     /**
      * Normalizes an argument list.
      *
@@ -218,6 +283,18 @@ class BuilderFactory
     public function constFetch($name) : Expr\ConstFetch {
         return new Expr\ConstFetch(BuilderHelpers::normalizeName($name));
     }
+    
+    /**
+     * Creates a property fetch node.
+     *
+     * @param Expr                   $var  Variable holding object
+     * @param string|Identifier|Expr $name Property name
+     *
+     * @return Expr\PropertyFetch
+     */
+    public function propertyFetch(Expr $var, $name) : Expr\PropertyFetch {
+        return new Expr\PropertyFetch($var, BuilderHelpers::normalizeIdentifierOrExpr($name));
+    }
 
     /**
      * Creates a class constant fetch node.
diff --git a/vendor/nikic/php-parser/lib/PhpParser/BuilderHelpers.php b/vendor/nikic/php-parser/lib/PhpParser/BuilderHelpers.php
index d5ae1792..790e8877 100644
--- a/vendor/nikic/php-parser/lib/PhpParser/BuilderHelpers.php
+++ b/vendor/nikic/php-parser/lib/PhpParser/BuilderHelpers.php
@@ -71,7 +71,7 @@ final class BuilderHelpers
             return new Identifier($name);
         }
 
-        throw new \LogicException('Expected string or instance of Node\Identifier or Node\Expr');
+        throw new \LogicException('Expected string or instance of Node\Identifier');
     }
 
     /**
diff --git a/vendor/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php b/vendor/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php
index 647aaa34..b62d79cc 100644
--- a/vendor/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php
+++ b/vendor/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php
@@ -2,7 +2,202 @@
 
 namespace PhpParser\Lexer;
 
+use PhpParser\Error;
+use PhpParser\ErrorHandler;
+
 class Emulative extends \PhpParser\Lexer
 {
-    /* No features requiring emulation have been added in PHP > 7.0 */
-}
+    const PHP_7_3 = '7.3.0dev';
+
+    /**
+     * @var array Patches used to reverse changes introduced in the code
+     */
+    private $patches;
+
+    public function startLexing(string $code, ErrorHandler $errorHandler = null) {
+        $this->patches = [];
+        $preparedCode = $this->prepareCode($code);
+        if (null === $preparedCode) {
+            // Nothing to emulate, yay
+            parent::startLexing($code, $errorHandler);
+            return;
+        }
+
+        $collector = new ErrorHandler\Collecting();
+        parent::startLexing($preparedCode, $collector);
+        $this->fixupTokens();
+
+        $errors = $collector->getErrors();
+        if (!empty($errors)) {
+            $this->fixupErrors($errors);
+            foreach ($errors as $error) {
+                $errorHandler->handleError($error);
+            }
+        }
+    }
+
+    /**
+     * Prepares code for emulation. If nothing has to be emulated null is returned.
+     *
+     * @param string $code
+     * @return null|string
+     */
+    private function prepareCode(string $code) {
+        if (version_compare(\PHP_VERSION, self::PHP_7_3, '>=')) {
+            return null;
+        }
+
+        if (strpos($code, '<<<') === false) {
+            // Definitely doesn't contain heredoc/nowdoc
+            return null;
+        }
+
+        $flexibleDocStringRegex = <<<'REGEX'
+/<<<[ \t]*(['"]?)([a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*)\1\r?\n
+(?:.*\r?\n)*?
+(?<indentation>\h*)\2(?![a-zA-Z_\x80-\xff])(?<separator>(?:;?[\r\n])?)/x
+REGEX;
+        if (!preg_match_all($flexibleDocStringRegex, $code, $matches, PREG_SET_ORDER|PREG_OFFSET_CAPTURE)) {
+            // No heredoc/nowdoc found
+            return null;
+        }
+
+        // Keep track of how much we need to adjust string offsets due to the modifications we
+        // already made
+        $posDelta = 0;
+        foreach ($matches as $match) {
+            $indentation = $match['indentation'][0];
+            $indentationStart = $match['indentation'][1];
+
+            $separator = $match['separator'][0];
+            $separatorStart = $match['separator'][1];
+
+            if ($indentation === '' && $separator !== '') {
+                // Ordinary heredoc/nowdoc
+                continue;
+            }
+
+            if ($indentation !== '') {
+                // Remove indentation
+                $indentationLen = strlen($indentation);
+                $code = substr_replace($code, '', $indentationStart + $posDelta, $indentationLen);
+                $this->patches[] = [$indentationStart + $posDelta, 'add', $indentation];
+                $posDelta -= $indentationLen;
+            }
+
+            if ($separator === '') {
+                // Insert newline as separator
+                $code = substr_replace($code, "\n", $separatorStart + $posDelta, 0);
+                $this->patches[] = [$separatorStart + $posDelta, 'remove', "\n"];
+                $posDelta += 1;
+            }
+        }
+
+        if (empty($this->patches)) {
+            // We did not end up emulating anything
+            return null;
+        }
+
+        return $code;
+    }
+
+    private function fixupTokens() {
+        assert(count($this->patches) > 0);
+
+        // Load first patch
+        $patchIdx = 0;
+        list($patchPos, $patchType, $patchText) = $this->patches[$patchIdx];
+
+        // We use a manual loop over the tokens, because we modify the array on the fly
+        $pos = 0;
+        for ($i = 0, $c = \count($this->tokens); $i < $c; $i++) {
+            $token = $this->tokens[$i];
+            if (\is_string($token)) {
+                // We assume that patches don't apply to string tokens
+                $pos += \strlen($token);
+                continue;
+            }
+
+            $len = \strlen($token[1]);
+            $posDelta = 0;
+            while ($patchPos >= $pos && $patchPos < $pos + $len) {
+                $patchTextLen = \strlen($patchText);
+                if ($patchType === 'remove') {
+                    if ($patchPos === $pos && $patchTextLen === $len) {
+                        // Remove token entirely
+                        array_splice($this->tokens, $i, 1, []);
+                        $i--;
+                        $c--;
+                    } else {
+                        // Remove from token string
+                        $this->tokens[$i][1] = substr_replace(
+                            $token[1], '', $patchPos - $pos + $posDelta, $patchTextLen
+                        );
+                        $posDelta -= $patchTextLen;
+                    }
+                } elseif ($patchType === 'add') {
+                    // Insert into the token string
+                    $this->tokens[$i][1] = substr_replace(
+                        $token[1], $patchText, $patchPos - $pos + $posDelta, 0
+                    );
+                    $posDelta += $patchTextLen;
+                } else {
+                    assert(false);
+                }
+
+                // Fetch the next patch
+                $patchIdx++;
+                if ($patchIdx >= \count($this->patches)) {
+                    // No more patches, we're done
+                    return;
+                }
+
+                list($patchPos, $patchType, $patchText) = $this->patches[$patchIdx];
+
+                // Multiple patches may apply to the same token. Reload the current one to check
+                // If the new patch applies
+                $token = $this->tokens[$i];
+            }
+
+            $pos += $len;
+        }
+
+        // A patch did not apply
+        assert(false);
+    }
+
+    /**
+     * Fixup line and position information in errors.
+     *
+     * @param Error[] $errors
+     */
+    private function fixupErrors(array $errors) {
+        foreach ($errors as $error) {
+            $attrs = $error->getAttributes();
+
+            $posDelta = 0;
+            $lineDelta = 0;
+            foreach ($this->patches as $patch) {
+                list($patchPos, $patchType, $patchText) = $patch;
+                if ($patchPos >= $attrs['startFilePos']) {
+                    // No longer relevant
+                    break;
+                }
+
+                if ($patchType === 'add') {
+                    $posDelta += strlen($patchText);
+                    $lineDelta += substr_count($patchText, "\n");
+                } else {
+                    $posDelta -= strlen($patchText);
+                    $lineDelta -= substr_count($patchText, "\n");
+                }
+            }
+
+            $attrs['startFilePos'] += $posDelta;
+            $attrs['endFilePos'] += $posDelta;
+            $attrs['startLine'] += $lineDelta;
+            $attrs['endLine'] += $lineDelta;
+            $error->setAttributes($attrs);
+        }
+    }
+}
\ No newline at end of file
diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/StaticCall.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/StaticCall.php
index 5dc2d316..e467c221 100644
--- a/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/StaticCall.php
+++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Expr/StaticCall.php
@@ -10,7 +10,7 @@ class StaticCall extends Expr
 {
     /** @var Node\Name|Expr Class name */
     public $class;
-    /** @var string|Identifier|Expr Method name */
+    /** @var Identifier|Expr Method name */
     public $name;
     /** @var Node\Arg[] Arguments */
     public $args;
diff --git a/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/String_.php b/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/String_.php
index 93a8633d..cf12e8c6 100644
--- a/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/String_.php
+++ b/vendor/nikic/php-parser/lib/PhpParser/Node/Scalar/String_.php
@@ -134,29 +134,6 @@ class String_ extends Scalar
         }
         throw new Error('Invalid UTF-8 codepoint escape sequence: Codepoint too large');
     }
-
-    /**
-     * @internal
-     *
-     * Parses a constant doc string.
-     *
-     * @param string $startToken Doc string start token content (<<<SMTHG)
-     * @param string $str        String token content
-     * @param bool $parseUnicodeEscape Whether to parse PHP 7 \u escapes
-     *
-     * @return string Parsed string
-     */
-    public static function parseDocString(string $startToken, string $str, bool $parseUnicodeEscape = true) : string {
-        // strip last newline (thanks tokenizer for sticking it into the string!)
-        $str = preg_replace('~(\r\n|\n|\r)\z~', '', $str);
-
-        // nowdoc string
-        if (false !== strpos($startToken, '\'')) {
-            return $str;
-        }
-
-        return self::parseEscapeSequences($str, null, $parseUnicodeEscape);
-    }
     
     public function getType() : string {
         return 'Scalar_String';
diff --git a/vendor/nikic/php-parser/lib/PhpParser/NodeTraverser.php b/vendor/nikic/php-parser/lib/PhpParser/NodeTraverser.php
index fe3045ae..97d45bda 100644
--- a/vendor/nikic/php-parser/lib/PhpParser/NodeTraverser.php
+++ b/vendor/nikic/php-parser/lib/PhpParser/NodeTraverser.php
@@ -30,17 +30,23 @@ class NodeTraverser implements NodeTraverserInterface
      */
     const REMOVE_NODE = 3;
 
+    /**
+     * If NodeVisitor::enterNode() returns DONT_TRAVERSE_CURRENT_AND_CHILDREN, child nodes
+     * of the current node will not be traversed for any visitors.
+     *
+     * For subsequent visitors enterNode() will not be called as well.
+     * leaveNode() will be invoked for visitors that has enterNode() method invoked.
+     */
+    const DONT_TRAVERSE_CURRENT_AND_CHILDREN = 4;
+
     /** @var NodeVisitor[] Visitors */
-    protected $visitors;
+    protected $visitors = [];
 
     /** @var bool Whether traversal should be stopped */
     protected $stopTraversal;
 
-    /**
-     * Constructs a node traverser.
-     */
     public function __construct() {
-        $this->visitors = [];
+        // for BC
     }
 
     /**
@@ -111,7 +117,9 @@ class NodeTraverser implements NodeTraverserInterface
                 }
             } elseif ($subNode instanceof Node) {
                 $traverseChildren = true;
-                foreach ($this->visitors as $visitor) {
+                $breakVisitorIndex = null;
+
+                foreach ($this->visitors as $visitorIndex => $visitor) {
                     $return = $visitor->enterNode($subNode);
                     if (null !== $return) {
                         if ($return instanceof Node) {
@@ -119,6 +127,10 @@ class NodeTraverser implements NodeTraverserInterface
                             $subNode = $return;
                         } elseif (self::DONT_TRAVERSE_CHILDREN === $return) {
                             $traverseChildren = false;
+                        } elseif (self::DONT_TRAVERSE_CURRENT_AND_CHILDREN === $return) {
+                            $traverseChildren = false;
+                            $breakVisitorIndex = $visitorIndex;
+                            break;
                         } elseif (self::STOP_TRAVERSAL === $return) {
                             $this->stopTraversal = true;
                             break 2;
@@ -137,8 +149,9 @@ class NodeTraverser implements NodeTraverserInterface
                     }
                 }
 
-                foreach ($this->visitors as $visitor) {
+                foreach ($this->visitors as $visitorIndex => $visitor) {
                     $return = $visitor->leaveNode($subNode);
+
                     if (null !== $return) {
                         if ($return instanceof Node) {
                             $this->ensureReplacementReasonable($subNode, $return);
@@ -157,6 +170,10 @@ class NodeTraverser implements NodeTraverserInterface
                             );
                         }
                     }
+
+                    if ($breakVisitorIndex === $visitorIndex) {
+                        break;
+                    }
                 }
             }
         }
@@ -177,7 +194,9 @@ class NodeTraverser implements NodeTraverserInterface
         foreach ($nodes as $i => &$node) {
             if ($node instanceof Node) {
                 $traverseChildren = true;
-                foreach ($this->visitors as $visitor) {
+                $breakVisitorIndex = null;
+
+                foreach ($this->visitors as $visitorIndex => $visitor) {
                     $return = $visitor->enterNode($node);
                     if (null !== $return) {
                         if ($return instanceof Node) {
@@ -185,6 +204,10 @@ class NodeTraverser implements NodeTraverserInterface
                             $node = $return;
                         } elseif (self::DONT_TRAVERSE_CHILDREN === $return) {
                             $traverseChildren = false;
+                        } elseif (self::DONT_TRAVERSE_CURRENT_AND_CHILDREN === $return) {
+                            $traverseChildren = false;
+                            $breakVisitorIndex = $visitorIndex;
+                            break;
                         } elseif (self::STOP_TRAVERSAL === $return) {
                             $this->stopTraversal = true;
                             break 2;
@@ -203,8 +226,9 @@ class NodeTraverser implements NodeTraverserInterface
                     }
                 }
 
-                foreach ($this->visitors as $visitor) {
+                foreach ($this->visitors as $visitorIndex => $visitor) {
                     $return = $visitor->leaveNode($node);
+
                     if (null !== $return) {
                         if ($return instanceof Node) {
                             $this->ensureReplacementReasonable($node, $return);
@@ -229,6 +253,10 @@ class NodeTraverser implements NodeTraverserInterface
                             );
                         }
                     }
+
+                    if ($breakVisitorIndex === $visitorIndex) {
+                        break;
+                    }
                 }
             } elseif (\is_array($node)) {
                 throw new \LogicException('Invalid node structure: Contains nested arrays');
diff --git a/vendor/nikic/php-parser/lib/PhpParser/Parser/Php5.php b/vendor/nikic/php-parser/lib/PhpParser/Parser/Php5.php
index f16c811b..4da2dc97 100644
--- a/vendor/nikic/php-parser/lib/PhpParser/Parser/Php5.php
+++ b/vendor/nikic/php-parser/lib/PhpParser/Parser/Php5.php
@@ -18,16 +18,16 @@ use PhpParser\Node\Stmt;
 class Php5 extends \PhpParser\ParserAbstract
 {
     protected $tokenToSymbolMapSize = 392;
-    protected $actionTableSize = 1075;
-    protected $gotoTableSize = 700;
+    protected $actionTableSize = 1072;
+    protected $gotoTableSize = 644;
 
     protected $invalidSymbol = 157;
     protected $errorSymbol = 1;
     protected $defaultAction = -32766;
     protected $unexpectedTokenRule = 32767;
 
-    protected $YY2TBLSTATE = 406;
-    protected $numNonLeafStates = 671;
+    protected $YY2TBLSTATE = 403;
+    protected $numNonLeafStates = 672;
 
     protected $symbolToName = array(
         "EOF",
@@ -233,300 +233,300 @@ class Php5 extends \PhpParser\ParserAbstract
     );
 
     protected $action = array(
-          676,  677,  678,  679,  680,-32766,  681,  682,  683,  719,
-          720,  218,  219,  220,  221,  222,  223,  224,  225,  226,
+          677,  678,  679,  680,  681,  279,  682,  683,  684,  720,
+          721,  218,  219,  220,  221,  222,  223,  224,  225,  226,
             0,  227,  228,  229,  230,  231,  232,  233,  234,  235,
           236,  237,  238,-32766,-32766,-32766,-32766,-32766,-32766,-32766,
-        -32766,-32767,-32767,-32767,-32767,  421,  239,  240,-32766,-32766,
-        -32766,-32766,  684,-32766,  311,-32766,-32766,-32766,-32766,-32766,
-        -32766,-32767,-32767,-32767,-32767,-32767,  685,  686,  687,  688,
-          689,  690,  691, 1180,   10,  751,-32766,-32766,-32766,-32766,
-        -32766,  424,  692,  693,  694,  695,  696,  697,  698,  699,
-          700,  701,  702,  722,  723,  724,  725,  726,  714,  715,
-          716,  717,  718,  703,  704,  705,  706,  707,  708,  709,
-          745,  746,  747,  748,  749,  750,  710,  711,  712,  713,
-          743,  734,  732,  733,  729,  730,  282,  721,  727,  728,
-          735,  736,  738,  737,  739,  740,   54,   55,  425,   56,
-           57,  731,  742,  741,   25,   58,   59,  339,   60,-32766,
-        -32766,-32766,-32766,-32766,-32766,-32766,-32766,-32766,    9,-32767,
-        -32767,-32767,-32767,   52,  327,-32766, 1044,  952,  953,  954,
-          951,  950,  949,  944,-32766,-32766,-32766,   48,  770,  771,
-          828,   61,   62,  125, -272,  206,  815,   63, 1180,   64,
-          293,  294,   65,   66,   67,   68,   69,   70,   71,   72,
-          420,   26,  301,   73,  417,-32766,-32766,-32766,-32766, 1095,
-         1096,  755,  753,  758,-32766,  926,  876,  474,-32766,-32766,
-        -32766,  829,  410,-32766,  309,-32766, 1062,-32766,-32766,-32766,
-        -32766,-32766,-32766,  215,  216,  217,  437,-32766,-32766,-32766,
-        -32766,-32766,-32766,-32766,-32766,  122,  498,  952,  953,  954,
-          951,  950,  949,  202,  482,  483,  284,  627,  127,  118,
-          900,  901,  339,  484,  485, -219, 1101, 1102, 1103, 1104,
-         1098, 1099,  312,  499,  353,  423,  433,  499, 1105, 1100,
-          433,  525, -223,-32766,-32766,   41,  422,  335,  323,  907,
-          324,  426, -125, -125, -125,   -4,  829,  473,  101,  102,
-          103,  817,  303, 1044,   40,   21,  427, -125,  475, -125,
-          476, -125,  477, -125,  104,  428,  215,  216,  217,   31,
-           32,  429,  430,  628,   33,  478,  433,  819,   74,  592,
-          930,  351,  352,  479,  480,  877,  202,  243, 1107,  481,
-          297,  769,  800,  847,  431,  432,  300,  236,  237,  238,
+        -32766,-32767,-32767,-32767,-32767,  206,  239,  240,-32766,-32766,
+        -32766,-32766,  685,-32766,  123,-32766,-32766,-32766,-32766,-32766,
+        -32766,-32767,-32767,-32767,-32767,-32767,  686,  687,  688,  689,
+          690,  691,  692,  350,   30,  752,  954,  955,  956,  953,
+          952,  951,  693,  694,  695,  696,  697,  698,  699,  700,
+          701,  702,  703,  723,  724,  725,  726,  727,  715,  716,
+          717,  718,  719,  704,  705,  706,  707,  708,  709,  710,
+          746,  747,  748,  749,  750,  751,  711,  712,  713,  714,
+          744,  735,  733,  734,  730,  731, 1046,  722,  728,  729,
+          736,  737,  739,  738,  740,  741,   54,   55,  422,   56,
+           57,  732,  743,  742, -219,   58,   59,  413,   60,-32766,
+        -32766,-32766,-32766,-32766,-32766,-32766,-32766,-32766, 1046,-32767,
+        -32767,-32767,-32767,-32767,-32767,-32767,-32767,   96,   97,   98,
+           99,  100,-32766,-32766,-32766,-32766,-32766, 1224,   52,  829,
+         1225,   61,   62,-32766,-32766,-32766,  294,   63,  590,   64,
+          290,  291,   65,   66,   67,   68,   69,   70,   71,   72,
+         1046,   26,  298,   73,  414,-32766,-32766,-32766,  877, 1097,
+         1098,  756,  754,  759,  815,  771,  772,  471,-32766,-32766,
+        -32766,  830,  421,  294,  548,-32766, 1182,-32766,-32766,-32766,
+        -32766,-32766,-32766,  215,  216,  217,  434,  420,-32766,  306,
+        -32766,-32766,-32766,-32766,-32766, 1109,  495,  954,  955,  956,
+          953,  952,  951,  202,  479,  480,  215,  216,  217,  407,
+          122,  241,  813,  481,  482, 1046, 1103, 1104, 1105, 1106,
+         1100, 1101,  309,  901,  902,  328,  202,  496, 1107, 1102,
+          430,-32766,  215,  216,  217,   41,  496,  332,  320,  430,
+          321,  423, -125, -125, -125,   -4,  830,  470,  126,  417,
+          336,  818,  202,  907,   40,   21,  424, -125,  472, -125,
+          473, -125,  474, -125,-32766,  425,  215,  216,  217,   31,
+           32,  426,  427,   10,   33,  475,  820,  878,   74,  216,
+          217,  348,  349,  476,  477,  126,  202,  243,  418,  478,
+         1046,  444,  801,  848,  428,  429,  281,  756,  202,  759,
            35,  105,  106,  107,  108,  109,  110,  111,  112,  113,
-          114,  115,  116,  239,  240, 1044,  426,  416,  831,  642,
-         -125,  829,  473,  215,  216,  217,  817, 1146,  241,   40,
-           21,  427,  350,  475,  447,  476, 1107,  477,  297, 1044,
-          428,  983,  985,  202,   31,   32,  429,  430,  408,   33,
-          478, 1195, 1222,   74,  322, 1223,  351,  352,  479,  480,
-        -32766,-32766,-32766, 1044,  481,  814,  925,  762,  847,  431,
-          432,-32767,-32767,-32767,-32767,   96,   97,   98,   99,  100,
-        -32766,   20,-32766,-32766,-32766,-32766, 1194,  123,  336,  810,
-          484,  426,   36,  831,  642,   -4,  829,  473,  900,  901,
-          338,  817,  126, 1044,   40,   21,  427,  906,  475,  299,
-          476,  499,  477, -501,  433,  428, -203, -203, -203,   31,
-           32,  429,  430,  217,   33,  478,  285,  758,   74,  551,
-         1213,  351,  352,  479,  480,-32766,-32766,-32766,  334,  481,
-           51,  202,  800,  847,  431,  432, 1044,  755,   30,  758,
-          126,-32766,-32766,-32766,  448,-32766,  331,-32766,-32766,-32766,
-           49,  450,  753,-32766,-32766,-32766,  426, 1044,  831,  642,
-         -203,-32766,  473,-32766,-32766,  812,  817,-32766,-32766,   40,
-           21,  427, 1072,  475,  121,  476,  202,  477,   29,  296,
-          428, -204, -204, -204,   31,   32,  429,  430,  117,   33,
-          478,  418, 1044,   74,  207,  829,  351,  352,  479,  480,
-          215,  216,  217,  499,  481,  208,  433,  800,  847,  431,
-          432,  438,  120,  335, 1044,  298,   78,   79,   80,-32766,
-          202,  239,  240,  645,  128,   98,   99,  100,  335,  233,
-          234,  235,  119,  831,  642, -204,   34,  295,   81,   82,
+          114,  115,  116,-32766,-32766,-32766,  423, 1064,  832,  643,
+         -125,  830,  470,  215,  216,  217,  818, 1148,  927,   40,
+           21,  424, 1074,  472,  628,  473,-32766,  474,-32766,  419,
+          425,  985,  987,  202,   31,   32,  426,  427,  405,   33,
+          475,  811, 1046,   74,  319, 1046,  348,  349,  476,  477,
+        -32766,-32766,-32766,  496,  478,   25,  430,  763,  848,  428,
+          429,  435,   48,  332,  415,  295,  901,  902,  282, 1147,
+        -32766,  297,-32766,-32766,-32766,-32766, 1182,  347,  333,  496,
+          770,  423,  430,  832,  643,   -4,  830,  470, -223,  331,
+          629,  818,-32766,  430,   40,   21,  424,  932,  472,  308,
+          473,  445,  474, -502,  928,  425, -203, -203, -203,   31,
+           32,  426,  427,  296,   33,  475,  809,  759,   74,  816,
+         1215,  348,  349,  476,  477,-32766,-32766,-32766, 1046,  478,
+          335, 1197,  801,  848,  428,  429,  236,  237,  238,  217,
+           49,-32766,-32766,-32766,  118,-32766,  127,-32766,-32766,-32766,
+          336,  292,  239,  240, 1046, 1196,  423,  202,  832,  643,
+         -203,-32766,  470,-32766,-32766,  481,  818,  208,  131,   40,
+           21,  424,  581,  472,   20,  473,   36,  474,   29,  293,
+          425, -204, -204, -204,   31,   32,  426,  427,   51,   33,
+          475,  447,  121,   74,  202,  830,  348,  349,  476,  477,
+          908,-32766,-32766,-32766,  478,  244,  522,  801,  848,  428,
+          429,  101,  102,  103,    9,  300,   78,   79,   80,  246,
+          324,-32766,  119,  646,  233,  234,  235,  104,   77,  946,
+          130,  754,  332,  832,  643, -204,   34,  245,   81,   82,
            83,   84,   85,   86,   87,   88,   89,   90,   91,   92,
            93,   94,   95,   96,   97,   98,   99,  100,  101,  102,
-          103,  246,  303,  244,  829,  426,  216,  217,  215,  216,
-          217,  473,  808,  499,  104,  817,  433,  131,   40,   21,
-          427,  583,  475,   77,  476,  202,  477,  335,  202,  428,
-          462,  598,  648,   31,   32,  429,  829,  443,   33,  478,
-          644,  245,   74,  457,   22,  351,  352,-32766,-32766,-32766,
-          132,  361,  209,  481,  770,  771,  605,  606,  941,  658,
-          929,  670,  763,  647,  646,  -82,  840,-32766,  303,  649,
-          652,  130,  827,  315,  426,  104,-32766,   53,   46,   47,
-          473,  301,  831,  642,  817,   44,   45,   40,   21,  427,
-          129,  475,   43,  476,   50,  477,  611,  753,  428,  531,
-          758,  755,   31,   32,  429,  829,  426,   33,  478,  756,
-        -32766,   74,  473,  957,  351,  352,  817,  586,  636,   40,
-           21,  427,  481,  475,  446,  476,  615,  477,  849,  848,
-          428,  326, 1106,  655,   31,   32,  429,  829,  623,   33,
-          478,  330,  281,   74,  449,   11,  351,  352,  -80,  589,
-           12,  863,  642,  602,  481, 1145,  328,  467,  441, -219,
-            0,  603,  411,    0,    0,  650,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,  426,    0, -502,    0,    0,
-            0,  473,    0,  831,  642,  817,  325, -501,   40,   21,
-          427,  308,  475,  310,  476,  484,  477, 1152,    0,  428,
-            0,    0,    0,   31,   32,  429,  829,  426,   33,  478,
-            6,  360,   74,  473, -410,  351,  352,  817, -402,    5,
-           40,   21,  427,  481,  475,   14,  476, -411,  477,  842,
-          412,  428,  533,  443,  394,   31,   32,  429,  386,  385,
-           33,  478,  374,  816,   74,  663,  662,  351,  352,   39,
-           38,  767,  831,  642,  766,  481,  809,  811,  935,  813,
-          825,  933,  768,  818,  934,  937,  936,  859,  861,  864,
-          803,  871,  870,  879,  820,  805,  426,  826,  869,  407,
-          333,  332,  473,  124,  831,  642,  817,  406,   77,   40,
-           21,  427,  667,  475,  666,  476,  242,  477,  665,  660,
-          428,  657,  656,  654,   31,   32,  429,  653,  651,   33,
-          478,  643,  340,   74,  210,  211,  351,  352,  942,  834,
-          212, 1047,  213,  843,  481,  772,  775,  774,  868, 1218,
-         1188, 1186, 1171, 1184,  204, 1086,  918, 1192, 1182,  210,
-          211,  773, 1095, 1096, 1058,  212,-32766,  213,  844,  845,
-         1097, 1046,  836,  831,  642,  307, 1220,  764,  765,  204,
-         1221, 1219,  801,  664,  461,  846,    0, 1095, 1096,  306,
-          409,-32766,  305,  304,   24, 1097,   27,  292,  291,  283,
-          415,   28,   37,   42,   75,  205,   76,-32766,    0, -220,
-         1048, 1024, 1023, 1088,  576, 1111,  908,  572, 1052, 1101,
-         1102, 1103, 1104, 1098, 1099,  384, 1049,  633,  566,  471,
-          466, 1105, 1100,  465,  458,  379,   18,   17,  214,  286,
-        -32766,   16,  572,  609, 1101, 1102, 1103, 1104, 1098, 1099,
-          384, 1042, -420,    0, 1166, 1165, 1105, 1100, 1112, 1216,
-         1085, 1183, 1055,  214, 1170,-32766, 1185,    0, 1071, 1056,
-         1057, 1054, 1053,    0, 1151
+          103, -254,  300, 1109,  830,  423,   98,   99,  100,  496,
+          120,  470,  430, 1046,  104,  818,-32766,-32766,   40,   21,
+          424,  117,  472,  828,  473,  440,  474,  207,  645,  425,
+          125,  209,  647,   31,   32,  426,  830,  841,   33,  475,
+        -32766,-32766,   74,  128,  657,  348,  349,  332,  239,  240,
+          459,  597,  654,  478,  312,  454,   22,  132,  358,  771,
+          772,  604,  605,  -82,  660,  300,  943,  663,  931,  671,
+          764,  649,-32766,  104,  423,  756,  757,   53,  612,  959,
+          470,   43,  832,  643,  818,   44,   45,   40,   21,  424,
+          298,  472, -273,  473,   46,  474,   50,   47,  425,  129,
+          759,  754,   31,   32,  426,  830,  423,   33,  475,  637,
+          528,   74,  470,-32766,  348,  349,  818,  624,  850,   40,
+           21,  424,  478,  472,  443,  473,  584,  474,  849,  616,
+          425,  -80, 1108,  655,   31,   32,  426,  830,   11,   33,
+          475,  446,  278,   74,  438,  601,  348,  349,  587,  602,
+          283,  832,  643,  464,  478,  325, 1154,    0,    0,  327,
+            0,    0,    0,    0,    0,  651,    0,    0,    0,  322,
+            0,    0,    0,  323,    0,  423,    0,    0,  307,    0,
+            0,  470,  305,  832,  643,  818, -503, -502,   40,   21,
+          424,  481,  472,    0,  473, -403,  474,   14,    5,  425,
+            0,    0,    6,   31,   32,  426,  830,  423,   33,  475,
+          357, -411,   74,  470,   12,  348,  349,  818, -412,  440,
+           40,   21,  424,  478,  472,  382,  473,  409,  474,  408,
+          383,  425,  391,  371,  530,   31,   32,  426,  843,  329,
+           33,  475,  666,  810,   74,   39,   38,  348,  349,  880,
+          821,  769,  832,  643,  819,  478,  937,  806,  667,  768,
+          827,  936,  939,  812,  767,  814,  826,  872,  804,  938,
+          865,  862,  817,  860,  935,  871,  423,   77,  644,  648,
+          650,  652,  470,  653,  864,  643,  818,  656,  658,   40,
+           21,  424,  659,  472,  661,  473,  242,  474,  662,  330,
+          425,  403,  404,  124,   31,   32,  426,  845,  773,   33,
+          475,  776,  775,   74,  210,  211,  348,  349,  870,  668,
+          212,  802,  213, 1221,  478,  458, 1220, 1190, 1188, 1173,
+         1186, 1088,  919, 1194,  204, 1184,  869,  944,  835,  210,
+          211, 1049, 1097, 1098,  844,  212,-32766,  213, 1048,  837,
+         1099, 1060,  774,  832,  643,   42, 1222,  846,  765,  204,
+          847,  766, 1223, 1044,   37,   28,  412, 1097, 1098,  406,
+          337,-32766,   75,   76,  304, 1099,  303,  302,  301,   27,
+           24,  289,  288,  280,-32766,  205,    0, 1025,  573, 1026,
+         1050, -220, 1090, -219,   16, 1113,  909,  569, 1054, 1103,
+         1104, 1105, 1106, 1100, 1101,  381, 1051,  634,  563,  468,
+          463, 1107, 1102,  462,  455,  376,   18,   17,  214,    0,
+        -32766,  608,  569, -421, 1103, 1104, 1105, 1106, 1100, 1101,
+          381, 1168, 1167, 1114, 1218, 1087, 1107, 1102, 1185, 1057,
+         1172, 1187, 1073,  214, 1058,-32766, 1059,    0, 1056, 1055,
+            0, 1153
     );
 
     protected $actionCheck = array(
-            2,    3,    4,    5,    6,    8,    8,    9,   10,   11,
+            2,    3,    4,    5,    6,   13,    8,    9,   10,   11,
            12,   31,   32,   33,   34,   35,   36,   37,   38,   39,
             0,   41,   42,   43,   44,   45,   46,   47,   48,   49,
            50,   51,   52,    8,    9,   10,   31,   32,   33,   34,
            35,   36,   37,   38,   39,    7,   66,   67,   31,   32,
            33,   34,   54,   28,    7,   30,   31,   32,   33,   34,
            35,   36,   37,   38,   39,   40,   68,   69,   70,   71,
-           72,   73,   74,   79,    7,   77,   31,   32,   33,   34,
-           35,    7,   84,   85,   86,   87,   88,   89,   90,   91,
+           72,   73,   74,    7,    7,   77,  112,  113,  114,  115,
+          116,  117,   84,   85,   86,   87,   88,   89,   90,   91,
            92,   93,   94,   95,   96,   97,   98,   99,  100,  101,
           102,  103,  104,  105,  106,  107,  108,  109,  110,  111,
           112,  113,  114,  115,  116,  117,  118,  119,  120,  121,
-          122,  123,  124,  125,  126,  127,   13,  129,  130,  131,
+          122,  123,  124,  125,  126,  127,   12,  129,  130,  131,
           132,  133,  134,  135,  136,  137,    2,    3,    4,    5,
-            6,  143,  144,  145,    7,   11,   12,  153,   14,   31,
-           32,   33,   34,   35,   36,   37,   38,   39,  103,   41,
-           42,   43,   44,   67,  109,   79,   12,  112,  113,  114,
-          115,  116,  117,  118,    8,    9,   10,   67,  102,  103,
-            1,   47,   48,   29,   79,    7,  148,   53,   79,   55,
+            6,  143,  144,  145,  152,   11,   12,    7,   14,   31,
+           32,   33,   34,   35,   36,   37,   38,   39,   12,   41,
+           42,   43,   44,   41,   42,   43,   44,   45,   46,   47,
+           48,   49,   31,   32,   33,   34,   35,   77,   67,    1,
+           80,   47,   48,    8,    9,   10,   35,   53,   82,   55,
            56,   57,   58,   59,   60,   61,   62,   63,   64,   65,
-            7,   67,   68,   69,   70,    8,    9,   10,  103,   75,
-           76,   77,   77,   79,  109,  148,   29,   83,    8,    9,
-           10,    1,  146,  118,  128,   28,  152,   30,   31,   32,
-           33,   34,   35,    8,    9,   10,  102,  151,   28,  153,
-           30,   31,   32,   33,   34,  149,  112,  112,  113,  114,
-          115,  116,  117,   28,  120,  121,    7,   77,  149,  149,
-          130,  131,  153,  129,  130,  152,  132,  133,  134,  135,
-          136,  137,  138,  143,    7,    7,  146,  143,  144,  145,
-          146,   82,  152,    8,    9,  151,    7,  153,  154,  152,
-          156,   71,   72,   73,   74,    0,    1,   77,   50,   51,
-           52,   81,   54,   12,   84,   85,   86,   87,   88,   89,
-           90,   91,   92,   93,   66,   95,    8,    9,   10,   99,
-          100,  101,  102,  143,  104,  105,  146,  148,  108,   82,
-          150,  111,  112,  113,  114,  148,   28,   29,  139,  119,
-           35,  148,  122,  123,  124,  125,   35,   50,   51,   52,
+           12,   67,   68,   69,   70,    8,    9,   10,   29,   75,
+           76,   77,   77,   79,  148,  102,  103,   83,    8,    9,
+           10,    1,    7,   35,   78,   28,   79,   30,   31,   32,
+           33,   34,   35,    8,    9,   10,  102,    7,   28,  128,
+           30,   31,   32,   33,   34,  139,  112,  112,  113,  114,
+          115,  116,  117,   28,  120,  121,    8,    9,   10,  146,
+          149,   13,  148,  129,  130,   12,  132,  133,  134,  135,
+          136,  137,  138,  130,  131,    7,   28,  143,  144,  145,
+          146,    8,    8,    9,   10,  151,  143,  153,  154,  146,
+          156,   71,   72,   73,   74,    0,    1,   77,  147,    7,
+          153,   81,   28,  152,   84,   85,   86,   87,   88,   89,
+           90,   91,   92,   93,   79,   95,    8,    9,   10,   99,
+          100,  101,  102,    7,  104,  105,  148,  148,  108,    9,
+           10,  111,  112,  113,  114,  147,   28,   29,    7,  119,
+           12,   29,  122,  123,  124,  125,    7,   77,   28,   79,
            15,   16,   17,   18,   19,   20,   21,   22,   23,   24,
-           25,   26,   27,   66,   67,   12,   71,    7,  148,  149,
-          150,    1,   77,    8,    9,   10,   81,  152,   13,   84,
-           85,   86,    7,   88,   29,   90,  139,   92,   35,   12,
+           25,   26,   27,   31,   32,   33,   71,  152,  148,  149,
+          150,    1,   77,    8,    9,   10,   81,  152,  148,   84,
+           85,   86,  112,   88,   77,   90,  151,   92,  153,    7,
            95,   56,   57,   28,   99,  100,  101,  102,  103,  104,
-          105,  152,   77,  108,  109,   80,  111,  112,  113,  114,
-            8,    9,   10,   12,  119,  148,  148,  122,  123,  124,
-          125,   41,   42,   43,   44,   45,   46,   47,   48,   49,
-           28,  152,   30,   31,   32,   33,    1,    7,  143,  148,
-          129,   71,   13,  148,  149,  150,    1,   77,  130,  131,
-           67,   81,  147,   12,   84,   85,   86,  152,   88,    7,
-           90,  143,   92,  128,  146,   95,   96,   97,   98,   99,
-          100,  101,  102,   10,  104,  105,   35,   79,  108,   78,
-           82,  111,  112,  113,  114,    8,    9,   10,    7,  119,
-           67,   28,  122,  123,  124,  125,   12,   77,    7,   79,
-          147,    8,    9,   10,  149,   28,    7,   30,   31,   32,
-           67,  128,   77,   31,   32,   33,   71,   12,  148,  149,
-          150,   28,   77,   30,   31,  148,   81,   31,   32,   84,
-           85,   86,  112,   88,   13,   90,   28,   92,  140,  141,
-           95,   96,   97,   98,   99,  100,  101,  102,   15,  104,
-          105,  123,   12,  108,   15,    1,  111,  112,  113,  114,
-            8,    9,   10,  143,  119,   15,  146,  122,  123,  124,
-          125,  151,  149,  153,   12,   35,    8,    9,   10,  151,
-           28,   66,   67,   29,  149,   47,   48,   49,  153,   47,
-           48,   49,  149,  148,  149,  150,   28,   35,   30,   31,
+          105,  148,   12,  108,  109,   12,  111,  112,  113,  114,
+            8,    9,   10,  143,  119,    7,  146,  122,  123,  124,
+          125,  151,   67,  153,  123,   35,  130,  131,   35,  155,
+           28,   35,   30,   31,   32,   33,   79,    7,  143,  143,
+          148,   71,  146,  148,  149,  150,    1,   77,  152,    7,
+          143,   81,  151,  146,   84,   85,   86,  150,   88,    7,
+           90,  149,   92,  128,  148,   95,   96,   97,   98,   99,
+          100,  101,  102,    7,  104,  105,  148,   79,  108,  148,
+           82,  111,  112,  113,  114,    8,    9,   10,   12,  119,
+           67,  152,  122,  123,  124,  125,   50,   51,   52,   10,
+           67,    8,    9,   10,  149,   28,  149,   30,   31,   32,
+          153,   35,   66,   67,   12,    1,   71,   28,  148,  149,
+          150,   28,   77,   30,   31,  129,   81,   15,  149,   84,
+           85,   86,  153,   88,  152,   90,   13,   92,  140,  141,
+           95,   96,   97,   98,   99,  100,  101,  102,   67,  104,
+          105,  128,   13,  108,   28,    1,  111,  112,  113,  114,
+          152,    8,    9,   10,  119,   15,   82,  122,  123,  124,
+          125,   50,   51,   52,  103,   54,    8,    9,   10,   15,
+          109,   28,  149,   29,   47,   48,   49,   66,  149,  118,
+           29,   77,  153,  148,  149,  150,   28,   15,   30,   31,
            32,   33,   34,   35,   36,   37,   38,   39,   40,   41,
            42,   43,   44,   45,   46,   47,   48,   49,   50,   51,
-           52,   15,   54,   15,    1,   71,    9,   10,    8,    9,
-           10,   77,  148,  143,   66,   81,  146,  149,   84,   85,
-           86,  153,   88,  149,   90,   28,   92,  153,   28,   95,
-           72,   73,   29,   99,  100,  101,    1,  146,  104,  105,
-          149,   15,  108,   72,   73,  111,  112,    8,    9,   10,
-           97,   98,   15,  119,  102,  103,  106,  107,  148,  149,
-          148,  149,  148,  149,   29,   29,   35,   28,   54,   29,
-           29,   29,   29,   29,   71,   66,   31,   67,   67,   67,
-           77,   68,  148,  149,   81,   67,   67,   84,   85,   86,
-           67,   88,   67,   90,   67,   92,   74,   77,   95,   82,
-           79,   77,   99,  100,  101,    1,   71,  104,  105,   77,
-           82,  108,   77,   79,  111,  112,   81,   87,   89,   84,
-           85,   86,  119,   88,   86,   90,   93,   92,  123,  123,
-           95,  127,  139,   29,   99,  100,  101,    1,   91,  104,
-          105,  126,   94,  108,   94,   94,  111,  112,   94,   96,
-          142,  148,  149,   96,  119,  155,  110,  102,  102,  152,
-           -1,  109,  146,   -1,   -1,   29,   -1,   -1,   -1,   -1,
-           -1,   -1,   -1,   -1,   -1,   71,   -1,  128,   -1,   -1,
-           -1,   77,   -1,  148,  149,   81,  126,  128,   84,   85,
-           86,  128,   88,  128,   90,  129,   92,  139,   -1,   95,
-           -1,   -1,   -1,   99,  100,  101,    1,   71,  104,  105,
-          142,  142,  108,   77,  142,  111,  112,   81,  142,  142,
-           84,   85,   86,  119,   88,  142,   90,  142,   92,  147,
-          146,   95,  146,  146,  146,   99,  100,  101,  146,  146,
-          104,  105,  146,  148,  108,  148,  148,  111,  112,  148,
+           52,  150,   54,  139,    1,   71,   47,   48,   49,  143,
+          149,   77,  146,   12,   66,   81,    8,    9,   84,   85,
+           86,   15,   88,   29,   90,  146,   92,   15,  149,   95,
+           29,   15,   29,   99,  100,  101,    1,   35,  104,  105,
+           31,   32,  108,  149,   29,  111,  112,  153,   66,   67,
+           72,   73,   29,  119,   29,   72,   73,   97,   98,  102,
+          103,  106,  107,   29,   29,   54,  148,  149,  148,  149,
+          148,  149,   31,   66,   71,   77,   77,   67,   74,   79,
+           77,   67,  148,  149,   81,   67,   67,   84,   85,   86,
+           68,   88,   79,   90,   67,   92,   67,   67,   95,   67,
+           79,   77,   99,  100,  101,    1,   71,  104,  105,   89,
+           82,  108,   77,   82,  111,  112,   81,   91,  123,   84,
+           85,   86,  119,   88,   86,   90,   87,   92,  123,   93,
+           95,   94,  139,   29,   99,  100,  101,    1,   94,  104,
+          105,   94,   94,  108,  102,   96,  111,  112,   96,  109,
+          153,  148,  149,  102,  119,  110,  139,   -1,   -1,  126,
+           -1,   -1,   -1,   -1,   -1,   29,   -1,   -1,   -1,  126,
+           -1,   -1,   -1,  127,   -1,   71,   -1,   -1,  128,   -1,
+           -1,   77,  128,  148,  149,   81,  128,  128,   84,   85,
+           86,  129,   88,   -1,   90,  142,   92,  142,  142,   95,
+           -1,   -1,  142,   99,  100,  101,    1,   71,  104,  105,
+          142,  142,  108,   77,  142,  111,  112,   81,  142,  146,
+           84,   85,   86,  119,   88,  146,   90,  146,   92,  146,
+          146,   95,  146,  146,  146,   99,  100,  101,  147,  149,
+          104,  105,  148,  148,  108,  148,  148,  111,  112,  148,
           148,  148,  148,  149,  148,  119,  148,  148,  148,  148,
           148,  148,  148,  148,  148,  148,  148,  148,  148,  148,
-          148,  148,  148,  148,  148,  148,   71,  148,  150,  149,
+          148,  148,  148,  148,  148,  148,   71,  149,  149,  149,
           149,  149,   77,  149,  148,  149,   81,  149,  149,   84,
            85,   86,  149,   88,  149,   90,   29,   92,  149,  149,
-           95,  149,  149,  149,   99,  100,  101,  149,  149,  104,
-          105,  149,  151,  108,   47,   48,  111,  112,  150,  150,
+           95,  149,  149,  149,   99,  100,  101,  150,  150,  104,
+          105,  150,  150,  108,   47,   48,  111,  112,  150,  150,
            53,  150,   55,  150,  119,  150,  150,  150,  150,  150,
           150,  150,  150,  150,   67,  150,  150,  150,  150,   47,
            48,  150,   75,   76,  150,   53,   79,   55,  150,  150,
            83,  150,  150,  148,  149,  151,  150,  150,  150,   67,
-          150,  150,  150,  150,  150,  150,   -1,   75,   76,  151,
+          150,  150,  150,  154,  151,  151,  151,   75,   76,  151,
           151,   79,  151,  151,  151,   83,  151,  151,  151,  151,
-          151,  151,  151,  151,  151,  151,  151,  151,   -1,  152,
+          151,  151,  151,  151,  151,  151,   -1,  152,  152,  152,
           152,  152,  152,  152,  152,  152,  152,  130,  152,  132,
           133,  134,  135,  136,  137,  138,  152,  152,  152,  152,
-          152,  144,  145,  152,  152,  152,  152,  152,  151,  153,
-          153,  152,  130,  155,  132,  133,  134,  135,  136,  137,
-          138,  154,  154,   -1,  155,  155,  144,  145,  155,  155,
+          152,  144,  145,  152,  152,  152,  152,  152,  151,   -1,
+          153,  155,  130,  154,  132,  133,  134,  135,  136,  137,
+          138,  155,  155,  155,  155,  155,  144,  145,  155,  155,
           155,  155,  155,  151,  155,  153,  155,   -1,  155,  155,
-          155,  155,  155,   -1,  156
+           -1,  156
     );
 
     protected $actionBase = array(
-            0,  220,  295,  445,  370,  109,  109,  180,  730,   -2,
-           -2,  135,   -2,   -2,   -2,  655,  756,  724,  756,  554,
-          623,  825,  825,  825,  305,  353,  562,  562,  861,  401,
-          562,  484,  291,  377,  154,  441,  540,  505,  505,  505,
-          505,  134,  134,  505,  505,  505,  505,  505,  505,  505,
-          505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-          505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-          505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-          505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-          505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-          505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-          505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-          505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-          505,  505,  505,  187,  179,  521,  429,  728,  729,  731,
-          732,  858,  668,  859,  799,  800,  662,  801,  802,  803,
-          805,  806,  834,  807,  888,  808,  568,  568,  568,  568,
-          568,  568,  568,  568,  568,  568,  568,   -3,  365,  225,
-          308,  620,  275,  552,  552,  552,  552,  552,  552,  552,
-          166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-          166,  166,  166,  166,  166,  166,  166,  617,  659,  659,
-          659,  463,  887,  508,  912,  912,  912,  912,  912,  912,
+            0,  220,  295,  445,  370,  357,  357,  307,  728,   -2,
+           -2,  135,   -2,   -2,   -2,  623,  724,  655,  724,  554,
+          756,  825,  825,  825,  151,  188,  476,  476,  860,  146,
+          476,  328,  253,  114,  621,  393,  390,  502,  502,  502,
+          502,  134,  134,  502,  502,  502,  502,  502,  502,  502,
+          502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
+          502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
+          502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
+          502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
+          502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
+          502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
+          502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
+          502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
+          502,  502,  502,  179,  178,  539,  523,  715,  735,  737,
+          738,  858,  668,  857,  796,  797,  561,  798,  799,  800,
+          801,  802,  795,  803,  886,  805,  568,  568,  568,  568,
+          568,  568,  568,  568,  568,  568,  568,  273,  248,  225,
+          308,  274,  628,  365,  365,  365,  365,  365,  365,  365,
+          175,  175,  175,  175,  175,  175,  175,  175,  175,  175,
+          175,  175,  175,  175,  175,  175,  175,  320,  553,  553,
+          553,  489,  887,  526,  912,  912,  912,  912,  912,  912,
           912,  912,  912,  912,  912,  912,  912,  912,  912,  912,
           912,  912,  912,  912,  912,  912,  912,  912,  912,  912,
           912,  912,  912,  912,  912,  912,  912,  912,  912,  912,
           912,  912,  912,  912,  912,  912,  912,  493,  -20,  -20,
-          477,  665,  402,  496,  210,  482,  197,   25,   25,   25,
-           25,   25,   17,   45,    5,    5,    5,    5,  335,  380,
-          380,  380,  380,  118,  118,  118,  118,  835,  819,  818,
-          814,  311,  311,  686,  686,  633,  754,  538,  538,  542,
-          542,  420,  420,  420,  420,  420,  420,  420,  420,  420,
-          420,  428,  105,  856,  130,  130,  130,  130,  435,  435,
-          435,  318,  199,  678,  918,  318,  248,  248,  248,  297,
-          297,  297,   76,  637,  398,   86,   86,   86,   86,  398,
-           86,   86,  572,  572,  572,  494,  511,  648,  325,  488,
-          490,  443,  673,  798,  677,  748,  532,  705,   96,  636,
-          704,  886,  676,  886,  591,  578,  570,  696,  355,  842,
-           -6,  187,  530,  423,  634,  715,  193,  726,  267,   38,
-          383,  534,  110,  279,  752,  723,  862,  860,  249,  669,
-          634,  634,  634,  137,  247,  751,  758,  110,  113,  515,
-          515,  515,  515,  797,  750,  515,  515,  515,  515,  796,
-          795,   67,  268,  811,   74,  733,  644,  644,  640,  640,
-          644,  644,  644,  644,  654,  651,  644,  850,  843,  843,
-          640,  641,  640,  654,  651,  852,  852,  852,  852,  640,
-          651,  640,  640,  644,  640,  843,  843,  651,  633,  843,
-          491,  651,  680,  644,  635,  635,  852,  718,  717,  640,
-          640,  624,  843,  843,  843,  624,  651,  852,  672,  702,
-          178,  843,  852,  664,  641,  664,  672,  651,  664,  641,
-          641,  664,   20,  656,  645,  851,  853,  839,  782,  626,
-          625,  847,  846,  855,  848,  845,  663,  706,  734,  735,
-          533,  638,  639,  631,  632,  697,  647,  683,  676,  707,
-          629,  629,  629,  679,  688,  679,  629,  629,  629,  629,
-          629,  629,  629,  629,  917,  692,  689,  685,  658,  749,
-          539,  716,  670,  550,  770,  613,  706,  706,  832,  874,
-          883,  898,  897,  652,  842,  876,  679,  907,  722,  430,
-          657,  841,  833,  713,  712,  679,  838,  679,  769,  679,
-          866,  831,  643,  830,  706,  828,  629,  864,  916,  915,
-          914,  913,  911,  909,  899,  906,  630,  905,  747,  650,
-          882,   47,  854,  696,  628,  708,  746,  499,  904,  827,
-          679,  679,  765,  759,  679,  763,  745,  721,  889,  744,
-          881,  903,  613,  878,  679,  675,  900,  499,  660,  642,
-          857,  653,  743,  849,  863,  781,  779,  608,  646,  826,
-          661,  742,  885,  884,  627,  741,  778,  606,  774,  667,
-          822,  773,  824,  740,  821,  793,  875,  674,  707,  703,
-          666,  671,  649,  772,  791,  877,  739,  738,  737,  789,
-          736,  788,    0,    0,    0,    0,    0,    0,    0,    0,
+          477,  661,  402,  629,  210,  332,  197,   25,   25,   25,
+           25,   25,   17,  141,    5,    5,    5,    5,  335,  122,
+          122,  122,  122,  118,  118,  118,  118,  471,  396,  396,
+          682,  682,  642,  774,  579,  579,  537,  537,  270,  270,
+          270,  270,  270,  270,  270,  270,  270,  270,  301,  633,
+          853,  296,  296,  296,  296,  514,  514,  514,  143,  484,
+          637,  915,  143,  521,  521,  521,  446,  446,  446,  113,
+          648,  398,  235,  235,  235,  235,  398,  235,  235,  577,
+          577,  577,  439,  499,  651,  100,  379,  486,  433,  672,
+          806,  669,  788,  540,  696,  111,  703,  701,  617,  662,
+          617,  603,  598,  575,  673,  312,  847,  147,  179,  538,
+          481,  631,  744,  292,  736,   66,  331,  423,  542,  355,
+          382,  710,  731,  856,  855,  339,  678,  631,  631,  631,
+          408,  106,  770,  772,  355,   -8,  602,  602,  602,  602,
+          782,  773,  602,  602,  602,  602,  781,  778,  316,  230,
+          822,  215,  746,  618,  618,  644,  644,  618,  618,  618,
+          618,  620,  622,  618,  834,  849,  849,  644,  641,  644,
+          620,  622,  824,  824,  824,  824,  644,  622,  644,  644,
+          618,  644,  849,  849,  622,  642,  849,   67,  622,  663,
+          618,  653,  653,  824,  714,  730,  644,  644,  666,  849,
+          849,  849,  666,  622,  824,  660,  711,   38,  849,  824,
+          645,  641,  645,  660,  622,  645,  641,  641,  645,   20,
+          654,  634,  833,  841,  838,  749,  625,  615,  851,  850,
+          842,  852,  848,  614,  708,  723,  726,  626,  638,  639,
+          647,  650,  676,  649,  674,  662,  693,  627,  627,  627,
+          679,  680,  679,  627,  627,  627,  627,  627,  627,  627,
+          627,  914,  689,  688,  670,  658,  732,  632,  707,  667,
+          512,  750,  613,  708,  708,  791,  874,  883,  889,  829,
+          619,  847,  876,  679,  904,  718,   47,  636,  846,  789,
+          699,  704,  679,  845,  679,  751,  679,  866,  793,  652,
+          832,  708,  831,  627,  864,  913,  911,  909,  907,  906,
+          905,  896,  903,  630,  900,  729,  659,  882,  452,  854,
+          673,  692,  706,  722,  830,  268,  899,  828,  679,  679,
+          752,  748,  679,  754,  721,  717,  862,  747,  881,  898,
+          613,  878,  679,  671,  827,  897,  268,  643,  624,  859,
+          656,  739,  835,  863,  839,  758,  550,  582,  826,  777,
+          821,  635,  740,  885,  884,  861,  742,  759,  564,  763,
+          646,  819,  765,  843,  743,  818,  814,  875,  657,  693,
+          675,  665,  664,  640,  769,  811,  877,  745,  741,  734,
+          808,  733,  807,    0,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,  134,  134,  134,  134,   -2,   -2,   -2,   -2,
-            0,    0,   -2,    0,    0,    0,  134,  134,  134,  134,
+            0,    0,    0,  134,  134,  134,  134,   -2,   -2,   -2,
+           -2,    0,    0,   -2,    0,    0,    0,  134,  134,  134,
           134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
           134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-          134,  134,    0,    0,  134,  134,  134,  134,  134,  134,
+          134,  134,  134,    0,    0,  134,  134,  134,  134,  134,
           134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
           134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
           134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
@@ -535,178 +535,173 @@ class Php5 extends \PhpParser\ParserAbstract
           134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
           134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
           134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-          134,  134,  134,  134,  568,  568,  568,  568,  568,  568,
+          134,  134,  134,  134,  134,  568,  568,  568,  568,  568,
           568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
-          568,  568,  568,  568,  568,  568,  568,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,    0,    0,  568,  -20,
-          -20,  -20,  -20,  568,  -20,  -20,  -20,  -20,  -20,  -20,
-          -20,  568,  568,  568,  568,  568,  568,  568,  568,  568,
-          568,  568,  568,  568,  568,  568,  568,  568,  -20,  568,
-          568,  568,  -20,  420,  -20,  420,  420,  420,  420,  420,
-          420,  420,  420,  420,  420,  420,  420,  420,  420,  420,
-          420,  420,  420,  420,  420,  420,  420,  420,  420,  420,
-          420,  420,  420,  420,  420,  420,  420,  420,  420,  420,
-          420,  420,  420,  420,  420,  420,  420,  420,  568,    0,
-            0,  568,  -20,  568,  -20,  568,  -20,  568,  568,  568,
-          568,  568,  568,  -20,  -20,  -20,  -20,  -20,  -20,    0,
-          248,  248,  248,  248,  -20,  -20,  -20,  -20,   55,   55,
-           55,   55,  420,  420,  420,  420,  420,  420,  248,  248,
-          297,  297,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,  420,   55,  420,  644,  644,  644,  644,  641,
-          641,  641,  644,  398,  398,  398,  644,    0,    0,    0,
-            0,    0,    0,  644,  398,    0,  420,  420,  420,  420,
-            0,  420,  420,  644,  644,  644,  641,  644,  398,  641,
-          641,  644,  843,  573,  573,  573,  573,  499,  110,    0,
-          644,  644,  641,  641,  641,    0,    0,    0,  843,    0,
-          640,    0,    0,    0,    0,  629,  430,    0,  375,    0,
-            0,    0,    0,    0,    0,  652,  375,  452,  452,    0,
-          630,  629,  629,  629,    0,    0,  652,  652,    0,    0,
-            0,    0,    0,    0,  481,  652,    0,    0,    0,    0,
-          481,  360,    0,    0,  360,    0,  499
+          568,  568,  568,  568,  568,  568,  568,  568,    0,    0,
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  568,
+          -20,  -20,  -20,  -20,  568,  -20,  -20,  -20,  -20,  -20,
+          -20,  -20,  568,  568,  568,  568,  568,  568,  568,  568,
+          568,  568,  568,  568,  568,  568,  568,  568,  568,  -20,
+          568,  568,  568,  -20,  270,  -20,  270,  270,  270,  270,
+          270,  270,  270,  270,  270,  270,  270,  270,  270,  270,
+          270,  270,  270,  270,  270,  270,  270,  270,  270,  270,
+          270,  270,  270,  270,  270,  270,  270,  270,  270,  270,
+          270,  270,  270,  270,  270,  270,  270,  270,  270,  568,
+            0,    0,  568,  -20,  568,  -20,  568,  -20,  568,  568,
+          568,  568,  568,  568,  -20,  -20,  -20,  -20,  -20,  -20,
+            0,  521,  521,  521,  521,  -20,  -20,  -20,  -20,  -36,
+          270,  270,  270,  270,  270,  270,  521,  521,  446,  446,
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+          270,  -36,  270,  618,  618,  618,  618,  641,  641,  641,
+          618,  398,  398,  398,  618,    0,    0,    0,    0,    0,
+            0,  618,  398,    0,  270,  270,  270,  270,    0,  270,
+          270,  618,  618,  618,  641,  618,  398,  641,  641,  618,
+          849,  580,  580,  580,  580,  268,  355,    0,  618,  618,
+          641,  641,  641,    0,    0,    0,  849,    0,  644,    0,
+            0,    0,    0,  627,   47,    0,  430,    0,    0,    0,
+            0,    0,    0,  619,  430,  466,  466,    0,  630,  627,
+          627,  627,    0,    0,  619,  619,    0,    0,    0,    0,
+            0,    0,  442,  619,    0,    0,    0,    0,  442,  140,
+            0,    0,  140,    0,  268
     );
 
     protected $actionDefault = array(
             3,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,  530,  530,32767,32767,
-          485,32767,32767,32767,32767,32767,32767,  291,  291,  291,
-        32767,32767,32767,  518,  518,  518,  518,  518,  518,  518,
-          518,  518,  518,  518,32767,32767,32767,32767,32767,  373,
-        32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,32767,32767,32767,  531,  531,32767,32767,
+          486,32767,32767,32767,32767,32767,32767,  292,  292,  292,
+        32767,32767,32767,  519,  519,  519,  519,  519,  519,  519,
+          519,  519,  519,  519,32767,32767,32767,32767,32767,  374,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,  379,  535,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,  354,  355,  357,  358,
-          290,  519,  240,  380,  534,  289,  242,  318,  489,32767,
-        32767,32767,  320,  119,  251,  196,  488,  122,  288,  227,
-          372,  374,  319,  295,  300,  301,  302,  303,  304,  305,
-          306,  307,  308,  309,  310,  311,  294,  445,  351,  350,
-          349,  447,32767,  446,  482,  482,  485,32767,32767,32767,
+        32767,32767,32767,32767,32767,  380,  536,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,32767,32767,32767,  355,  356,  358,  359,
+          291,  520,  240,  381,  535,  290,  242,  319,  490,32767,
+        32767,32767,  321,  119,  251,  196,  489,  122,  289,  227,
+          373,  375,  320,  296,  301,  302,  303,  304,  305,  306,
+          307,  308,  309,  310,  311,  312,  295,  446,  352,  351,
+          350,  448,32767,  447,  483,  483,  486,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,  316,  473,  472,
-          317,  443,  321,  444,  323,  448,  322,  339,  340,  337,
-          338,  341,  450,  449,  466,  467,  464,  465,  293,  342,
-          343,  344,  345,  468,  469,  470,  471,  274,  274,  274,
-          274,32767,32767,  529,  529,32767,32767,  330,  331,  457,
-          458,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,  275,32767,  231,  231,  231,  231,32767,32767,
-        32767,  231,32767,32767,32767,32767,  325,  326,  324,  452,
-          453,  451,32767,  419,32767,32767,32767,32767,32767,  421,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,  490,32767,32767,32767,32767,32767,  503,  408,32767,
-        32767,32767,  401,32767,  215,  217,  164,  476,32767,32767,
-        32767,32767,32767,  508,  335,32767,32767,32767,32767,32767,
-          544,32767,  503,32767,32767,32767,32767,32767,32767,  348,
-          327,  328,  329,32767,32767,32767,32767,  507,  501,  460,
-          461,  462,  463,32767,32767,  454,  455,  456,  459,32767,
+        32767,32767,32767,32767,32767,32767,32767,  317,  474,  473,
+          318,  444,  322,  445,  324,  449,  323,  340,  341,  338,
+          339,  342,  451,  450,  467,  468,  465,  466,  294,  343,
+          344,  345,  346,  469,  470,  471,  472,  275,32767,32767,
+          530,  530,32767,32767,  331,  332,  458,  459,32767,32767,
+        32767,32767,32767,32767,32767,32767,32767,32767,32767,  276,
+        32767,  231,  231,  231,  231,32767,32767,32767,  231,32767,
+        32767,32767,32767,  326,  327,  325,  453,  454,  452,32767,
+          420,32767,32767,32767,32767,32767,  422,32767,32767,32767,
+        32767,32767,32767,32767,32767,32767,32767,32767,  491,32767,
+        32767,32767,32767,32767,  504,  409,32767,32767,32767,  402,
+        32767,  215,  217,  164,  477,32767,32767,32767,32767,32767,
+          509,  336,32767,32767,32767,32767,32767,  545,32767,  504,
+        32767,32767,32767,32767,32767,32767,  349,  328,  329,  330,
+        32767,32767,32767,32767,  508,  502,  461,  462,  463,  464,
+        32767,32767,  455,  456,  457,  460,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,  168,32767,  416,  422,  422,
-        32767,32767,32767,32767,  168,32767,32767,32767,32767,32767,
-          168,32767,32767,32767,32767,  506,  505,  168,32767,  402,
-          484,  168,  181,32767,  179,  179,32767,  201,  201,32767,
-        32767,  183,  477,  496,32767,  183,  168,32767,  390,  170,
-          484,32767,32767,  233,32767,  233,  390,  168,  233,32767,
-        32767,  233,32767,   84,  426,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,  403,32767,32767,
-        32767,  369,  370,  479,  492,32767,  493,32767,  401,32767,
-          333,  334,  336,  313,32767,  315,  359,  360,  361,  362,
-          363,  364,  365,  367,32767,  406,32767,  409,32767,32767,
-        32767,   86,  111,  250,32767,  542,   86,  404,32767,32767,
-          298,  542,32767,32767,32767,32767,  537,32767,32767,  292,
-        32767,32767,32767,   86,   86,  246,32767,  166,32767,  527,
-        32767,  543,32767,  501,  405,32767,  332,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,  502,32767,32767,32767,
-        32767,  222,32767,  439,32767,   86,32767,  182,32767,32767,
-          296,  241,32767,32767,  536,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,  167,32767,32767,  184,32767,32767,
-          501,32767,32767,32767,32767,32767,32767,32767,  287,32767,
-        32767,32767,32767,32767,  501,32767,32767,  226,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,   84,   60,32767,
-          268,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,  124,  124,    3,  124,  124,    3,  124,  124,
-          124,  124,  124,  124,  124,  124,  124,  124,  124,  209,
-          253,  212,  201,  201,  161,  253,  253,  253,  124,  124,
-          260
+        32767,32767,  168,32767,  417,  423,  423,32767,32767,32767,
+        32767,  168,32767,32767,32767,32767,32767,  168,32767,32767,
+        32767,32767,  507,  506,  168,32767,  403,  485,  168,  181,
+        32767,  179,  179,32767,  201,  201,32767,32767,  183,  478,
+          497,32767,  183,  168,32767,  391,  170,  485,32767,32767,
+          233,32767,  233,  391,  168,  233,32767,32767,  233,32767,
+           84,  427,32767,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,32767,  404,32767,32767,32767,  370,  371,
+          480,  493,32767,  494,32767,  402,32767,  334,  335,  337,
+          314,32767,  316,  360,  361,  362,  363,  364,  365,  366,
+          368,32767,  407,32767,  410,32767,32767,32767,   86,  111,
+          250,32767,  543,   86,  405,32767,32767,  299,  543,32767,
+        32767,32767,32767,  538,32767,32767,  293,32767,32767,32767,
+           86,   86,  246,32767,  166,32767,  528,32767,  544,32767,
+          502,  406,32767,  333,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,  503,32767,32767,32767,32767,  222,32767,
+          440,32767,   86,32767,32767,  182,32767,32767,  297,  241,
+        32767,32767,  537,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,  167,32767,32767,32767,  184,32767,32767,  502,
+        32767,32767,32767,32767,32767,32767,32767,  288,32767,32767,
+        32767,32767,32767,32767,32767,  502,32767,32767,  226,32767,
+        32767,32767,32767,32767,32767,32767,32767,32767,   84,   60,
+        32767,  269,32767,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,  124,  124,    3,  124,  124,  253,    3,
+          253,  124,  253,  253,  124,  124,  124,  124,  124,  124,
+          124,  124,  124,  124,  209,  212,  201,  201,  161,  124,
+          124,  261
     );
 
     protected $goto = array(
           162,  162,  136,  136,  141,  144,  136,  137,  138,  139,
           146,  183,  164,  160,  160,  160,  160,  141,  141,  161,
           161,  161,  161,  161,  161,  161,  161,  161,  161,  161,
-          156,  157,  158,  159,  180,  135,  181,  500,  501,  364,
-          502,  506,  507,  508,  509,  510,  511,  512,  513,  970,
+          156,  157,  158,  159,  180,  135,  181,  497,  498,  361,
+          499,  503,  504,  505,  506,  507,  508,  509,  510,  972,
           140,  142,  143,  145,  167,  172,  182,  198,  247,  250,
           252,  254,  256,  257,  258,  259,  260,  261,  269,  270,
-          271,  272,  287,  288,  316,  317,  318,  380,  381,  382,
-          556,  184,  185,  186,  187,  188,  189,  190,  191,  192,
+          271,  272,  284,  285,  313,  314,  315,  377,  378,  379,
+          553,  184,  185,  186,  187,  188,  189,  190,  191,  192,
           193,  194,  195,  196,  147,  148,  149,  163,  150,  165,
-          151,  199,  166,  152,  153,  154,  200,  155,  133,  629,
-          574,  761,  574,  574,  574,  574,  574,  574,  574,  574,
-          574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
-          574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
-          574,  574,  574,  574,  574,  574,  574,  574,  574,  574,
-          574,  574,  574,  574,  574, 1108,  637, 1108, 1108, 1108,
-         1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108,
-         1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108,
-         1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108,
-         1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108,
-          343,  791,  504,  504,  504,  504,  504,  504,  517,  515,
-          517,  515,  504,  504,  504,  504,  504,  504,  504,  504,
-          504,  504,  516,  557,  516,    8,  760,  529,  892,  892,
-         1199, 1199,  754,  856,  856,  856,  856,  170,  851,  857,
-          529,  529,  173,  174,  175,  389,  390,  391,  392,  169,
-          197,  201,  203,  251,  253,  255,  262,  263,  264,  265,
-          266,  267,  273,  274,  275,  276,  289,  290,  319,  320,
-          321,  395,  396,  397,  398,  171,  176,  248,  249,  177,
-          178,  179,  388,  614,  549,  549,  580,  545,  590,  593,
-          635,  822,  547,  547,  503,  505,  536,  553,  581,  584,
-          594,  600,  530, 1177,  573, 1177,  573,  573,  573,  573,
-          573,  573,  573,  573,  573,  573,  573,  573,  573,  573,
-          573,  573,  573,  573,  573,  573,  573,  573,  573,  573,
-          573,  573,  573,  573,  573,  573,  573,  573,  573,  573,
-          573,  573,  573,  573,  573,  573,  573,  573,  573,  618,
-          521,  555,  621,  862,  579,  362,  597,  346,  405,  910,
-          526,  526,  526,  550,  526,  558,  559,  560,  561,  562,
-          563,  564,  565,  567,  596,  587,  612,  544,  526,  278,
-          279,  280, 1203,  439,  439,  439,  439,  439,  439, 1084,
-         1083,  784,  604,  439,  439,  439,  439,  439,  439,  439,
-          439,  439,  439, 1073,  365, 1073,  899,  899,  899,  899,
-         1210, 1210, 1157,  899,  344,  345,  613,  899,  784,  784,
-         1196,  329,  314,    3,    4,  377, 1210, 1073, 1073, 1073,
-         1073, 1017, 1073, 1073,  526,  526, 1209, 1209,  543,  575,
-          526,  526,  470,  896,  526,  905, 1169,  370,  370,  370,
-          399,  349, 1209, 1191, 1191, 1191,  780,  371,  370,  370,
-         1212,  527, 1066,  375,  370,  778,  914,  403,  372,  372,
-          372,  554,  370, 1224, 1059,  777,  777,  759,  788,  785,
-          785,  785,  787,  919,  956,  776,  916,  523,  916,  866,
-          878,  860,  858,  860,  659,  372,  518,  887,  882,  387,
-          542,  668,  661,  569,  541,  601,  889,  619,  620,  885,
-          624,  625,  632,  634,  639,  641,  948,  452,  454,  940,
-          640,  455,  468, 1089, 1109,  622,  938, 1064, 1176,  585,
-         1176, 1027,   19,   15,  358, 1193, 1193, 1193,  359, 1154,
-         1069, 1070,    0,    0, 1066,  534,  968,    0,    0,  546,
-            0,    0,  568,  520,  540,    0,  523, 1067, 1168, 1067,
-            0,    0, 1175,   23,  459,  520, 1068,  540,  610,    0,
-            0,    0,    0,    0,  519,   13,  524,  442,    0,  444,
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,  783, 1217,    0,    0,    0,  617,
-            0,    0,    0,    0, 1065,  626,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+          151,  199,  166,  152,  153,  154,  200,  155,  133,  630,
+          571,  792,  571,  571,  571,  571,  571,  571,  571,  571,
+          571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+          571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+          571,  571,  571,  571,  571,  571,  571,  571,  571,  571,
+          571,  571,  571,  571,  571, 1110,  762, 1110, 1110, 1110,
+         1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110,
+         1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110,
+         1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110,
+         1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1110,
+          501,  501,  501,  501,  501,  501,  512,  638,  512,  761,
+          501,  501,  501,  501,  501,  501,  501,  501,  501,  501,
+          513,  755,  513,  893,  893, 1201, 1201,  527,  585,  613,
+          857,  857,  857,  857,  170,  852,  858, 1086, 1085,  173,
+          174,  175,  386,  387,  388,  389,  169,  197,  201,  203,
+          251,  253,  255,  262,  263,  264,  265,  266,  267,  273,
+          274,  275,  276,  286,  287,  316,  317,  318,  392,  393,
+          394,  395,  171,  176,  248,  249,  177,  178,  179,  385,
+          615,  546,  546,  578,  542, 1212, 1212,  823,  340,  544,
+          544,  500,  502,  533,  550,  579,  582,  592,  599,  619,
+          863, 1212,  622,  911,  570,  359,  570,  570,  570,  570,
+          570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+          570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+          570,  570,  570,  570,  570,  570,  570,  570,  570,  570,
+          570,  570,  570,  570,  570,  570,  570,  570,  570,  555,
+          556,  557,  558,  559,  560,  561,  562,  564,  595,  518,
+          554,  326,  311,  594,  526,  609,  610,  949,  552,  523,
+          523,  523,  577,  523,  588,  591,  636,  526,  526,  547,
+          436,  436,  436,  436,  436,  436,  541,  523, 1205,  950,
+          436,  436,  436,  436,  436,  436,  436,  436,  436,  436,
+         1075,  362, 1075,  900,  900,  900,  900,  596,  343,  402,
+          900,  514, 1159,  514,  900, 1179,  603, 1179,    3,    4,
+          367,  367,  367,  614, 1075, 1075, 1075, 1075,  785, 1075,
+         1075,  367,  367, 1178, 1198, 1178, 1171,  367,  374,  467,
+         1195, 1195, 1195,  523,  523,  367, 1226,  540,  572,  523,
+          523, 1019, 1068,  523,  897,  785,  785,  906,  346,  917,
+          520,  917,  396,  368,  781,  372,  915, 1177,  970,  779,
+          524,  539,  669,  665,  566,  400, 1061,  920,  600,  760,
+          551,  890,  620,  621,  886,  625,  626,  633,  635,  640,
+          642,  789,  879,  861,  859,  861,  664, 1091,  515,  888,
+          883, 1193, 1193, 1193,  867, 1029,   19,   15,  355,  341,
+          342,  958,  778,  778,  356, 1066,  786,  786,  786,  788,
+          452,  531,  777, 1156,  465,  543,  565,  583,    0,  520,
+         1071, 1072,    0,    0, 1068,    0,    0,   23, 1211, 1211,
+          456,    0,  611,  369,  369,  369,    0, 1069, 1170, 1069,
+            0,   13,  538,    0, 1211,    0, 1070,  449,  451,  942,
+          641,    0, 1214,    0, 1111,  623,  940,    0,    0,    0,
+          369,    0,  618,    0,  384,    0,    0, 1067,  627,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+            0,  517,  537,    0,    0,    0,    0,    0,    0,    0,
+            0,    0,    0,  517,    0,  537,    0,    0,    0,    0,
+            0,  532,  516,    0,  521,  439,    0,  441,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  535
+            0,    0,  784, 1219
     );
 
     protected $gotoCheck = array(
@@ -721,101 +716,96 @@ class Php5 extends \PhpParser\ParserAbstract
            42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
            42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
            42,   42,   42,   42,   42,   42,   42,   42,   42,   56,
-           66,   15,   66,   66,   66,   66,   66,   66,   66,   66,
+           66,   28,   66,   66,   66,   66,   66,   66,   66,   66,
            66,   66,   66,   66,   66,   66,   66,   66,   66,   66,
            66,   66,   66,   66,   66,   66,   66,   66,   66,   66,
            66,   66,   66,   66,   66,   66,   66,   66,   66,   66,
-           66,   66,   66,   66,   66,  123,    8,  123,  123,  123,
-          123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
-          123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
-          123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
-          123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
-           69,   28,  114,  114,  114,  114,  114,  114,  119,   66,
-          119,   66,  114,  114,  114,  114,  114,  114,  114,  114,
-          114,  114,  114,   46,  114,   94,   14,   46,   74,   74,
-           74,   74,    5,   66,   66,   66,   66,   26,   66,   66,
-           46,   46,   26,   26,   26,   26,   26,   26,   26,   26,
+           66,   66,   66,   66,   66,  124,   15,  124,  124,  124,
+          124,  124,  124,  124,  124,  124,  124,  124,  124,  124,
+          124,  124,  124,  124,  124,  124,  124,  124,  124,  124,
+          124,  124,  124,  124,  124,  124,  124,  124,  124,  124,
+          124,  124,  124,  124,  124,  124,  124,  124,  124,  124,
+          115,  115,  115,  115,  115,  115,   66,    8,   66,   14,
+          115,  115,  115,  115,  115,  115,  115,  115,  115,  115,
+          115,    5,  115,   74,   74,   74,   74,   99,   39,   39,
+           66,   66,   66,   66,   26,   66,   66,  122,  122,   26,
            26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
            26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
            26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
-           26,   26,   50,   50,   50,   50,   50,   50,   59,   59,
-           59,   49,   50,   50,   50,   50,   50,   50,   50,   50,
-           50,   50,   98,  115,   56,  115,   56,   56,   56,   56,
+           26,   26,   26,   26,   26,   26,   26,   26,   26,   50,
+           50,   50,   50,   50,   50,  140,  140,   49,   69,   50,
+           50,   50,   50,   50,   50,   50,   50,   50,   50,   60,
+           32,  140,   60,   81,   56,   60,   56,   56,   56,   56,
            56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
            56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
            56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
-           56,   56,   56,   56,   56,   56,   56,   56,   56,   60,
-           10,    2,   60,   32,    2,   60,   67,   67,   67,   81,
-           10,   10,   10,  106,   10,  107,  107,  107,  107,  107,
-          107,  107,  107,  107,  107,   39,   39,   10,   10,   64,
-           64,   64,  137,   56,   56,   56,   56,   56,   56,  121,
-          121,   22,  124,   56,   56,   56,   56,   56,   56,   56,
-           56,   56,   56,   56,   45,   56,   56,   56,   56,   56,
-          139,  139,  128,   56,   69,   69,   48,   56,   22,   22,
-          135,  122,  122,   29,   29,   47,  139,   56,   56,   56,
-           56,   99,   56,   56,   10,   10,  138,  138,   10,   10,
-           10,   10,   56,   76,   10,   78,   79,   12,   12,   12,
-           21,   17,  138,    8,    8,    8,   24,   11,   12,   12,
-          138,   10,   79,   16,   12,   23,   82,   20,  120,  120,
-          120,   10,   12,   12,  110,   22,   22,   13,   25,   22,
-           22,   22,   22,   83,   96,   22,   12,   12,   12,   68,
-           13,   13,   13,   13,   13,  120,   13,   13,   13,  120,
-           31,   71,   31,   31,    8,   31,   31,   31,   31,   31,
-           31,   31,   31,   31,   31,   31,   94,    7,    7,    7,
-            7,   62,  105,   33,    7,    7,    7,  112,  116,   63,
-          116,   33,   33,   33,   33,  116,  116,  116,   57,  127,
-           79,   79,   -1,   -1,   79,   57,   98,   -1,   -1,   57,
-           -1,   -1,   33,    8,    8,   -1,   12,   79,   79,   79,
-           -1,   -1,  116,   33,   57,    8,   79,    8,   33,   -1,
-           -1,   -1,   -1,   -1,    8,   57,    8,    8,   -1,    8,
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-           -1,   -1,   -1,   -1,    8,    8,   -1,   -1,   -1,   12,
-           -1,   -1,   -1,   -1,   12,   12,   -1,   -1,   -1,   -1,
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+           56,   56,   56,   56,   56,   56,   56,   56,   56,  108,
+          108,  108,  108,  108,  108,  108,  108,  108,  108,   10,
+           46,  123,  123,   64,   46,   64,   64,   95,    2,   10,
+           10,   10,    2,   10,   59,   59,   59,   46,   46,  107,
+           56,   56,   56,   56,   56,   56,   10,   10,  138,   95,
+           56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+           56,   45,   56,   56,   56,   56,   56,   67,   67,   67,
+           56,  120,  129,  120,   56,  116,  125,  116,   29,   29,
+           12,   12,   12,   48,   56,   56,   56,   56,   22,   56,
+           56,   12,   12,  117,  136,  117,   79,   12,   47,   56,
+          117,  117,  117,   10,   10,   12,   12,   10,   10,   10,
+           10,  100,   79,   10,   76,   22,   22,   78,   17,   12,
+           12,   12,   21,   11,   24,   16,   82,  117,   99,   23,
+           10,   31,   71,   31,   31,   20,  111,   83,   31,   13,
+           10,   31,   31,   31,   31,   31,   31,   31,   31,   31,
+           31,   25,   13,   13,   13,   13,   13,   33,   13,   13,
+           13,    8,    8,    8,   68,   33,   33,   33,   33,   69,
+           69,   97,   22,   22,   57,  113,   22,   22,   22,   22,
+           62,   57,   22,  128,  106,   57,   33,   63,   -1,   12,
+           79,   79,   -1,   -1,   79,   -1,   -1,   33,  139,  139,
+           57,   -1,   33,  121,  121,  121,   -1,   79,   79,   79,
+           -1,   57,    8,   -1,  139,   -1,   79,    7,    7,    7,
+            7,   -1,  139,   -1,    7,    7,    7,   -1,   -1,   -1,
+          121,   -1,   12,   -1,  121,   -1,   -1,   12,   12,   -1,
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+           -1,    8,    8,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+           -1,   -1,   -1,    8,   -1,    8,   -1,   -1,   -1,   -1,
+           -1,   99,    8,   -1,    8,    8,   -1,    8,   -1,   -1,
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   98
+           -1,   -1,    8,    8
     );
 
     protected $gotoBase = array(
-            0,    0, -293,    0,    0,  221,    0,  512,  145,    0,
-           28,  121,  135,  475,  224,  109,  114,  129,    0,    0,
-           60,  117,   69,  115,  122,   58,   35,    0,  191, -245,
-            0, -143,  333,  106,    0,    0,    0,    0,    0,  337,
-            0,    0,  -24,    0,    0,  364,  199,  133,  134,  273,
-            1,    0,    0,    0,    0,    0,  102,  108,    0,  -17,
-         -116,    0,   76,   74, -286,    0,  -92,   30,   67, -248,
-            0,  140,    0,    0,  -53,    0,  132,    0,  130,  105,
-            0,  334,  113,   62,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,  214,    0,   61,    0,  261,  128,
-            0,    0,    0,    0,    0,   56,  336,  321,    0,    0,
-           55,    0,  103,    0,  -79,    2,  227,    0,    0,  -93,
-          160,   80,   98,  -47,  187,    0,    0,   79,  206,    0,
-            0,    0,    0,    0,    0,  136,    0,  352,  123,   97,
-            0,    0
+            0,    0, -277,    0,    0,  210,    0,  552,  196,    0,
+           40,  130,  111,  477,  207,  154,  119,  139,    0,    0,
+           71,  132,  109,  122,  133,   74,   32,    0,  101, -251,
+            0, -173,  280,   83,    0,    0,    0,    0,    0,  190,
+            0,    0,  -24,    0,    0,  361,  336,  149,  144,  269,
+            1,    0,    0,    0,    0,    0,  102,   87,    0,   72,
+         -163,    0,   78,   75, -287,    0,  -92,   84,   85, -157,
+            0,  114,    0,    0,  -55,    0,  146,    0,  145,   98,
+            0,  278,  116,   59,    0,    0,    0,    0,    0,    0,
+            0,    0,    0,    0,    0,   90,    0,   91,    0,  186,
+          151,    0,    0,    0,    0,    0,   61,  352,  305,    0,
+            0,   60,    0,   94,    0,  -78,  117,  135,    0,    0,
+          113,  238,  -69,   41,  -47,  211,    0,    0,   66,  206,
+            0,    0,    0,    0,    0,    0,  153,    0,  358,  228,
+          -25,    0,    0
     );
 
     protected $gotoDefault = array(
-        -32768,  472,  672,    2,  673,  744,  752,  607,  486,  638,
-          487,  522, 1187,  797,  798,  799,  367,  413,  488,  366,
-          400,  393,  786,  779,  781,  789,  168,  401,  792,    1,
-          794,  528,  830, 1018,  354,  802,  355,  599,  804,  538,
-          806,  807,  134,  368,  369,  539,  489,  376,  588,  821,
-          268,  373,  823,  356,  824,  833,  357,  469,  464,  570,
-          616,  434,  451,  582,  277,  548, 1081,  577,  865,  342,
-          873,  669,  881,  884,  490,  571,  895,  456,  903, 1094,
-          383,  909,  915,  920,  923,  414,  402,  595,  927,  928,
-            7,  932,  630,  631,  947,  302,  955,  608,  969,  419,
-         1037, 1039,  491,  492,  532,  463,  514,  537,  493, 1060,
-          445,  404, 1063,  494,  495,  435,  436, 1078,  348, 1162,
-          347,  453,  313, 1149,  591, 1113,  460, 1202, 1158,  341,
-          496,  497,  363, 1181,  378, 1197,  440, 1204, 1211,  337,
-          552,  578
+        -32768,  469,  673,    2,  674,  745,  753,  606,  483,  639,
+          484,  519, 1189,  798,  799,  800,  364,  410,  485,  363,
+          397,  390,  787,  780,  782,  790,  168,  398,  793,    1,
+          795,  525,  831, 1020,  351,  803,  352,  598,  805,  535,
+          807,  808,  134,  365,  366,  536,  486,  373,  586,  822,
+          268,  370,  824,  353,  825,  834,  354,  466,  461,  567,
+          617,  431,  448,  580,  574,  545, 1083,  575,  866,  339,
+          874,  670,  882,  885,  487,  568,  896,  453,  904, 1096,
+          380,  910,  916,  921,  277,  924,  411,  399,  593,  929,
+          930,    7,  934,  631,  632,    8,  299,  957,  607,  971,
+          416, 1039, 1041,  488,  489,  529,  460,  511,  534,  490,
+         1062,  442,  401, 1065,  491,  492,  432,  433, 1080,  345,
+         1164,  344,  450,  310, 1151,  589, 1115,  457, 1204, 1160,
+          338,  493,  494,  360, 1183,  375, 1199,  437, 1206, 1213,
+          334,  549,  576
     );
 
     protected $ruleToNonTerminal = array(
@@ -844,11 +834,11 @@ class Php5 extends \PhpParser\ParserAbstract
            48,   48,   59,   59,   75,   75,   76,   76,   78,   78,
            78,   77,   77,   60,   60,   79,   79,   79,   80,   80,
            81,   81,   81,   43,   43,   82,   82,   82,   44,   44,
-           83,   83,   64,   64,   84,   84,   84,   84,   89,   89,
-           90,   90,   91,   91,   91,   91,   91,   92,   93,   93,
-           88,   88,   85,   85,   87,   87,   95,   95,   94,   94,
-           94,   94,   94,   94,   86,   86,   97,   96,   96,   45,
-           45,   39,   39,   42,   42,   42,   42,   42,   42,   42,
+           83,   83,   84,   84,   64,   85,   85,   85,   85,   90,
+           90,   91,   91,   92,   92,   92,   92,   92,   93,   94,
+           94,   89,   89,   86,   86,   88,   88,   96,   96,   95,
+           95,   95,   95,   95,   95,   87,   87,   98,   97,   97,
+           45,   45,   39,   39,   42,   42,   42,   42,   42,   42,
            42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
            42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
            42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
@@ -856,25 +846,25 @@ class Php5 extends \PhpParser\ParserAbstract
            42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
            42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
            42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
-           42,   42,   42,   42,   42,   42,   42,   33,   33,   46,
-           46,  102,  102,  103,  103,  103,  103,  109,   98,   98,
-          105,  105,  111,  111,  112,  113,  113,  113,  113,  113,
-          113,   66,   66,   56,   56,   56,   99,   99,  117,  117,
-          114,  114,  118,  118,  118,  118,  100,  100,  100,  104,
-          104,  104,  110,  110,  123,  123,  123,  123,  123,  123,
-          123,  123,  123,  123,  123,  123,  123,   26,   26,   26,
-           26,   26,   26,  125,  125,  125,  125,  125,  125,  125,
-          125,  125,  125,  125,  125,  125,  125,  125,  125,  125,
-          125,  125,  125,  125,  125,  125,  125,  125,  125,  125,
-          125,  125,  125,  125,  125,  125,  108,  108,  101,  101,
-          101,  101,  124,  124,  127,  127,  126,  126,  128,  128,
-           50,   50,   50,   50,  130,  130,  129,  129,  129,  129,
-          129,  131,  131,  116,  116,  119,  119,  115,  115,  133,
-          132,  132,  132,  132,  120,  120,  120,  120,  107,  107,
-          121,  121,  121,  121,   74,  134,  134,  135,  135,  135,
-          106,  106,  136,  136,  137,  137,  137,  137,  122,  122,
-          122,  122,  139,  140,  138,  138,  138,  138,  138,  138,
-          138,  141,  141,  141
+           42,   42,   42,   42,   42,   42,   42,   42,   33,   33,
+           46,   46,  103,  103,  104,  104,  104,  104,  110,   99,
+           99,  106,  106,  112,  112,  113,  114,  114,  114,  114,
+          114,  114,   66,   66,   56,   56,   56,  100,  100,  118,
+          118,  115,  115,  119,  119,  119,  119,  101,  101,  101,
+          105,  105,  105,  111,  111,  124,  124,  124,  124,  124,
+          124,  124,  124,  124,  124,  124,  124,  124,   26,   26,
+           26,   26,   26,   26,  126,  126,  126,  126,  126,  126,
+          126,  126,  126,  126,  126,  126,  126,  126,  126,  126,
+          126,  126,  126,  126,  126,  126,  126,  126,  126,  126,
+          126,  126,  126,  126,  126,  126,  126,  109,  109,  102,
+          102,  102,  102,  125,  125,  128,  128,  127,  127,  129,
+          129,   50,   50,   50,   50,  131,  131,  130,  130,  130,
+          130,  130,  132,  132,  117,  117,  120,  120,  116,  116,
+          134,  133,  133,  133,  133,  121,  121,  121,  121,  108,
+          108,  122,  122,  122,  122,   74,  135,  135,  136,  136,
+          136,  107,  107,  137,  137,  138,  138,  138,  138,  123,
+          123,  123,  123,  140,  141,  139,  139,  139,  139,  139,
+          139,  139,  142,  142,  142
     );
 
     protected $ruleToLength = array(
@@ -903,37 +893,37 @@ class Php5 extends \PhpParser\ParserAbstract
             2,    1,    1,    0,    1,    3,    4,    6,    1,    1,
             1,    0,    1,    0,    2,    2,    3,    3,    1,    3,
             1,    2,    2,    3,    1,    1,    2,    4,    3,    1,
-            1,    3,    2,    0,    3,    3,    9,    3,    1,    3,
-            0,    2,    4,    5,    4,    4,    4,    3,    1,    1,
-            1,    3,    1,    1,    0,    1,    1,    2,    1,    1,
-            1,    1,    1,    1,    1,    3,    1,    1,    3,    3,
-            1,    0,    1,    1,    3,    3,    4,    4,    1,    2,
-            3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-            3,    3,    2,    2,    2,    2,    3,    3,    3,    3,
-            3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+            1,    3,    2,    0,    1,    3,    3,    9,    3,    1,
+            3,    0,    2,    4,    5,    4,    4,    4,    3,    1,
+            1,    1,    3,    1,    1,    0,    1,    1,    2,    1,
+            1,    1,    1,    1,    1,    1,    3,    1,    1,    3,
+            3,    1,    0,    1,    1,    3,    3,    4,    4,    1,
+            2,    3,    3,    3,    3,    3,    3,    3,    3,    3,
             3,    3,    3,    2,    2,    2,    2,    3,    3,    3,
-            3,    3,    3,    3,    3,    3,    3,    1,    3,    5,
-            4,    3,    4,    4,    2,    2,    2,    2,    2,    2,
-            2,    2,    2,    2,    2,    2,    2,    2,    1,    1,
-            1,    3,    2,    1,    2,   10,   11,    3,    3,    2,
-            4,    4,    3,    4,    4,    4,    4,    7,    3,    2,
-            0,    4,    1,    3,    2,    2,    4,    6,    2,    2,
-            4,    1,    1,    1,    2,    3,    1,    1,    1,    1,
-            1,    1,    3,    3,    4,    4,    0,    2,    1,    0,
-            1,    1,    0,    1,    1,    1,    1,    1,    1,    1,
-            1,    1,    1,    1,    1,    3,    2,    1,    3,    1,
-            4,    3,    1,    3,    3,    3,    3,    3,    3,    3,
             3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-            2,    2,    2,    2,    3,    3,    3,    3,    3,    3,
-            3,    3,    5,    4,    4,    3,    1,    3,    1,    1,
-            3,    3,    0,    2,    0,    1,    3,    1,    3,    1,
-            1,    1,    1,    1,    6,    4,    3,    4,    2,    4,
-            4,    1,    3,    1,    2,    1,    1,    4,    1,    1,
-            3,    6,    4,    4,    4,    4,    1,    4,    0,    1,
-            1,    3,    1,    1,    4,    3,    1,    1,    1,    0,
-            0,    2,    3,    1,    3,    1,    4,    2,    2,    2,
-            1,    2,    1,    1,    1,    4,    3,    3,    3,    6,
-            3,    1,    1,    1
+            3,    3,    3,    3,    2,    2,    2,    2,    3,    3,
+            3,    3,    3,    3,    3,    3,    3,    3,    1,    3,
+            5,    4,    3,    4,    4,    2,    2,    2,    2,    2,
+            2,    2,    2,    2,    2,    2,    2,    2,    2,    1,
+            1,    1,    3,    2,    1,    2,   10,   11,    3,    3,
+            2,    4,    4,    3,    4,    4,    4,    4,    7,    3,
+            2,    0,    4,    1,    3,    2,    2,    4,    6,    2,
+            2,    4,    1,    1,    1,    2,    3,    1,    1,    1,
+            1,    1,    1,    3,    3,    4,    4,    0,    2,    1,
+            0,    1,    1,    0,    1,    1,    1,    1,    1,    1,
+            1,    1,    1,    1,    1,    1,    3,    2,    1,    3,
+            1,    4,    3,    1,    3,    3,    3,    3,    3,    3,
+            3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+            3,    2,    2,    2,    2,    3,    3,    3,    3,    3,
+            3,    3,    3,    5,    4,    4,    3,    1,    3,    1,
+            1,    3,    3,    0,    2,    0,    1,    3,    1,    3,
+            1,    1,    1,    1,    1,    6,    4,    3,    4,    2,
+            4,    4,    1,    3,    1,    2,    1,    1,    4,    1,
+            1,    3,    6,    4,    4,    4,    4,    1,    4,    0,
+            1,    1,    3,    1,    1,    4,    3,    1,    1,    1,
+            0,    0,    2,    3,    1,    3,    1,    4,    2,    2,
+            2,    1,    2,    1,    1,    1,    4,    3,    3,    3,
+            6,    3,    1,    1,    1
     );
 
     protected function initReduceCallbacks() {
@@ -1713,358 +1703,359 @@ class Php5 extends \PhpParser\ParserAbstract
                  $this->semValue = new Stmt\StaticVar($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             252 => function ($stackPos) {
-                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+                 if ($this->semStack[$stackPos-(2-2)] !== null) { $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; }
             },
             253 => function ($stackPos) {
                  $this->semValue = array();
             },
             254 => function ($stackPos) {
-                 $this->semValue = new Stmt\Property($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->checkProperty($this->semValue, $stackPos-(3-1));
+                 $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop($startAttributes + $this->endAttributes); } else { $nop = null; };
+            if ($nop !== null) { $this->semStack[$stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             255 => function ($stackPos) {
-                 $this->semValue = new Stmt\ClassConst($this->semStack[$stackPos-(3-2)], 0, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Stmt\Property($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->checkProperty($this->semValue, $stackPos-(3-1));
             },
             256 => function ($stackPos) {
-                 $this->semValue = new Stmt\ClassMethod($this->semStack[$stackPos-(9-4)], ['type' => $this->semStack[$stackPos-(9-1)], 'byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-6)], 'returnType' => $this->semStack[$stackPos-(9-8)], 'stmts' => $this->semStack[$stackPos-(9-9)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes);
-            $this->checkClassMethod($this->semValue, $stackPos-(9-1));
+                 $this->semValue = new Stmt\ClassConst($this->semStack[$stackPos-(3-2)], 0, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             257 => function ($stackPos) {
-                 $this->semValue = new Stmt\TraitUse($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Stmt\ClassMethod($this->semStack[$stackPos-(9-4)], ['type' => $this->semStack[$stackPos-(9-1)], 'byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-6)], 'returnType' => $this->semStack[$stackPos-(9-8)], 'stmts' => $this->semStack[$stackPos-(9-9)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes);
+            $this->checkClassMethod($this->semValue, $stackPos-(9-1));
             },
             258 => function ($stackPos) {
-                 $this->semValue = array();
+                 $this->semValue = new Stmt\TraitUse($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             259 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = array();
             },
             260 => function ($stackPos) {
-                 $this->semValue = array();
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
             261 => function ($stackPos) {
-                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+                 $this->semValue = array();
             },
             262 => function ($stackPos) {
-                 $this->semValue = new Stmt\TraitUseAdaptation\Precedence($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
             },
             263 => function ($stackPos) {
-                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(5-1)][0], $this->semStack[$stackPos-(5-1)][1], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-4)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+                 $this->semValue = new Stmt\TraitUseAdaptation\Precedence($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             264 => function ($stackPos) {
-                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], null, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(5-1)][0], $this->semStack[$stackPos-(5-1)][1], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-4)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
             },
             265 => function ($stackPos) {
-                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], null, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             266 => function ($stackPos) {
                  $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             267 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]);
+                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             268 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]);
             },
             269 => function ($stackPos) {
-                 $this->semValue = array(null, $this->semStack[$stackPos-(1-1)]);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             270 => function ($stackPos) {
-                 $this->semValue = null;
+                 $this->semValue = array(null, $this->semStack[$stackPos-(1-1)]);
             },
             271 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = null;
             },
             272 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
             273 => function ($stackPos) {
-                 $this->semValue = 0;
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             274 => function ($stackPos) {
                  $this->semValue = 0;
             },
             275 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = 0;
             },
             276 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             277 => function ($stackPos) {
-                 $this->checkModifier($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $this->semValue = $this->semStack[$stackPos-(2-1)] | $this->semStack[$stackPos-(2-2)];
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             278 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_PUBLIC;
+                 $this->checkModifier($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $this->semValue = $this->semStack[$stackPos-(2-1)] | $this->semStack[$stackPos-(2-2)];
             },
             279 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_PROTECTED;
+                 $this->semValue = Stmt\Class_::MODIFIER_PUBLIC;
             },
             280 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_PRIVATE;
+                 $this->semValue = Stmt\Class_::MODIFIER_PROTECTED;
             },
             281 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_STATIC;
+                 $this->semValue = Stmt\Class_::MODIFIER_PRIVATE;
             },
             282 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT;
+                 $this->semValue = Stmt\Class_::MODIFIER_STATIC;
             },
             283 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_FINAL;
+                 $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT;
             },
             284 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+                 $this->semValue = Stmt\Class_::MODIFIER_FINAL;
             },
             285 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
             },
             286 => function ($stackPos) {
-                 $this->semValue = new Node\VarLikeIdentifier(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
             },
             287 => function ($stackPos) {
-                 $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(1-1)], null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Node\VarLikeIdentifier(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             288 => function ($stackPos) {
-                 $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(1-1)], null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             289 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+                 $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             290 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
             },
             291 => function ($stackPos) {
-                 $this->semValue = array();
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
             },
             292 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = array();
             },
             293 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             294 => function ($stackPos) {
-                 $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             295 => function ($stackPos) {
                  $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             296 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignRef($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             297 => function ($stackPos) {
                  $this->semValue = new Expr\AssignRef($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             298 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\AssignRef($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             299 => function ($stackPos) {
-                 $this->semValue = new Expr\Clone_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             300 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Clone_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             301 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             302 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             303 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             304 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             305 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             306 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             307 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             308 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             309 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             310 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             311 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             312 => function ($stackPos) {
-                 $this->semValue = new Expr\PostInc($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             313 => function ($stackPos) {
-                 $this->semValue = new Expr\PreInc($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\PostInc($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             314 => function ($stackPos) {
-                 $this->semValue = new Expr\PostDec($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\PreInc($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             315 => function ($stackPos) {
-                 $this->semValue = new Expr\PreDec($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\PostDec($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             316 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\BooleanOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\PreDec($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             317 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\BooleanAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\BooleanOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             318 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\LogicalOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\BooleanAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             319 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\LogicalAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\LogicalOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             320 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\LogicalXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\LogicalAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             321 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\LogicalXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             322 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             323 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             324 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             325 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             326 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             327 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             328 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             329 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             330 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             331 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             332 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             333 => function ($stackPos) {
-                 $this->semValue = new Expr\UnaryPlus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             334 => function ($stackPos) {
-                 $this->semValue = new Expr\UnaryMinus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\UnaryPlus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             335 => function ($stackPos) {
-                 $this->semValue = new Expr\BooleanNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\UnaryMinus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             336 => function ($stackPos) {
-                 $this->semValue = new Expr\BitwiseNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BooleanNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             337 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Identical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BitwiseNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             338 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\NotIdentical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Identical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             339 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Equal($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\NotIdentical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             340 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\NotEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Equal($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             341 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Spaceship($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\NotEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             342 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Smaller($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Spaceship($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             343 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\SmallerOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Smaller($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             344 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Greater($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\SmallerOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             345 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\GreaterOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Greater($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             346 => function ($stackPos) {
-                 $this->semValue = new Expr\Instanceof_($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\GreaterOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             347 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\Instanceof_($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             348 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             349 => function ($stackPos) {
-                 $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(5-1)], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
             350 => function ($stackPos) {
-                 $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(4-1)], null, $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(5-1)], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
             },
             351 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Coalesce($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(4-1)], null, $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             352 => function ($stackPos) {
-                 $this->semValue = new Expr\Isset_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Coalesce($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             353 => function ($stackPos) {
-                 $this->semValue = new Expr\Empty_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Isset_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             354 => function ($stackPos) {
-                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Empty_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             355 => function ($stackPos) {
-                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             356 => function ($stackPos) {
-                 $this->semValue = new Expr\Eval_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             357 => function ($stackPos) {
-                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Eval_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             358 => function ($stackPos) {
-                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             359 => function ($stackPos) {
-                 $this->semValue = new Expr\Cast\Int_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             360 => function ($stackPos) {
-                 $this->semValue = new Expr\Cast\Double($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Cast\Int_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             361 => function ($stackPos) {
-                 $this->semValue = new Expr\Cast\String_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Cast\Double($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             362 => function ($stackPos) {
-                 $this->semValue = new Expr\Cast\Array_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Cast\String_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             363 => function ($stackPos) {
-                 $this->semValue = new Expr\Cast\Object_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Cast\Array_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             364 => function ($stackPos) {
-                 $this->semValue = new Expr\Cast\Bool_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Cast\Object_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             365 => function ($stackPos) {
-                 $this->semValue = new Expr\Cast\Unset_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Cast\Bool_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             366 => function ($stackPos) {
+                 $this->semValue = new Expr\Cast\Unset_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            367 => function ($stackPos) {
                  $attrs = $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes;
             $attrs['kind'] = strtolower($this->semStack[$stackPos-(2-1)]) === 'exit' ? Expr\Exit_::KIND_EXIT : Expr\Exit_::KIND_DIE;
             $this->semValue = new Expr\Exit_($this->semStack[$stackPos-(2-2)], $attrs);
             },
-            367 => function ($stackPos) {
-                 $this->semValue = new Expr\ErrorSuppress($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
-            },
             368 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\ErrorSuppress($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             369 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
@@ -2073,116 +2064,116 @@ class Php5 extends \PhpParser\ParserAbstract
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             371 => function ($stackPos) {
-                 $this->semValue = new Expr\ShellExec($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             372 => function ($stackPos) {
-                 $this->semValue = new Expr\Print_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ShellExec($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             373 => function ($stackPos) {
-                 $this->semValue = new Expr\Yield_(null, null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Print_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             374 => function ($stackPos) {
-                 $this->semValue = new Expr\YieldFrom($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Yield_(null, null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             375 => function ($stackPos) {
-                 $this->semValue = new Expr\Closure(['static' => false, 'byRef' => $this->semStack[$stackPos-(10-2)], 'params' => $this->semStack[$stackPos-(10-4)], 'uses' => $this->semStack[$stackPos-(10-6)], 'returnType' => $this->semStack[$stackPos-(10-7)], 'stmts' => $this->semStack[$stackPos-(10-9)]], $this->startAttributeStack[$stackPos-(10-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\YieldFrom($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             376 => function ($stackPos) {
-                 $this->semValue = new Expr\Closure(['static' => true, 'byRef' => $this->semStack[$stackPos-(11-3)], 'params' => $this->semStack[$stackPos-(11-5)], 'uses' => $this->semStack[$stackPos-(11-7)], 'returnType' => $this->semStack[$stackPos-(11-8)], 'stmts' => $this->semStack[$stackPos-(11-10)]], $this->startAttributeStack[$stackPos-(11-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Closure(['static' => false, 'byRef' => $this->semStack[$stackPos-(10-2)], 'params' => $this->semStack[$stackPos-(10-4)], 'uses' => $this->semStack[$stackPos-(10-6)], 'returnType' => $this->semStack[$stackPos-(10-7)], 'stmts' => $this->semStack[$stackPos-(10-9)]], $this->startAttributeStack[$stackPos-(10-1)] + $this->endAttributes);
             },
             377 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = new Expr\Closure(['static' => true, 'byRef' => $this->semStack[$stackPos-(11-3)], 'params' => $this->semStack[$stackPos-(11-5)], 'uses' => $this->semStack[$stackPos-(11-7)], 'returnType' => $this->semStack[$stackPos-(11-8)], 'stmts' => $this->semStack[$stackPos-(11-10)]], $this->startAttributeStack[$stackPos-(11-1)] + $this->endAttributes);
             },
             378 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
             379 => function ($stackPos) {
-                 $this->semValue = new Expr\Yield_($this->semStack[$stackPos-(2-2)], null, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
             380 => function ($stackPos) {
-                 $this->semValue = new Expr\Yield_($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-2)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Yield_($this->semStack[$stackPos-(2-2)], null, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             381 => function ($stackPos) {
+                 $this->semValue = new Expr\Yield_($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-2)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            382 => function ($stackPos) {
                  $attrs = $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_LONG;
             $this->semValue = new Expr\Array_($this->semStack[$stackPos-(4-3)], $attrs);
             },
-            382 => function ($stackPos) {
+            383 => function ($stackPos) {
                  $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_SHORT;
             $this->semValue = new Expr\Array_($this->semStack[$stackPos-(3-2)], $attrs);
             },
-            383 => function ($stackPos) {
+            384 => function ($stackPos) {
                  $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
-            384 => function ($stackPos) {
+            385 => function ($stackPos) {
                  $attrs = $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes; $attrs['kind'] = ($this->semStack[$stackPos-(4-1)][0] === "'" || ($this->semStack[$stackPos-(4-1)][1] === "'" && ($this->semStack[$stackPos-(4-1)][0] === 'b' || $this->semStack[$stackPos-(4-1)][0] === 'B')) ? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED);
             $this->semValue = new Expr\ArrayDimFetch(new Scalar\String_(Scalar\String_::parse($this->semStack[$stackPos-(4-1)]), $attrs), $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
-            385 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
-            },
             386 => function ($stackPos) {
                  $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             387 => function ($stackPos) {
-                 $this->semValue = array(new Stmt\Class_(null, ['type' => 0, 'extends' => $this->semStack[$stackPos-(7-3)], 'implements' => $this->semStack[$stackPos-(7-4)], 'stmts' => $this->semStack[$stackPos-(7-6)]], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes), $this->semStack[$stackPos-(7-2)]);
-            $this->checkClass($this->semValue[0], -1);
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             388 => function ($stackPos) {
-                 $this->semValue = new Expr\New_($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = array(new Stmt\Class_(null, ['type' => 0, 'extends' => $this->semStack[$stackPos-(7-3)], 'implements' => $this->semStack[$stackPos-(7-4)], 'stmts' => $this->semStack[$stackPos-(7-6)]], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes), $this->semStack[$stackPos-(7-2)]);
+            $this->checkClass($this->semValue[0], -1);
             },
             389 => function ($stackPos) {
-                 list($class, $ctorArgs) = $this->semStack[$stackPos-(2-2)]; $this->semValue = new Expr\New_($class, $ctorArgs, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\New_($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             390 => function ($stackPos) {
-                 $this->semValue = array();
+                 list($class, $ctorArgs) = $this->semStack[$stackPos-(2-2)]; $this->semValue = new Expr\New_($class, $ctorArgs, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             391 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(4-3)];
+                 $this->semValue = array();
             },
             392 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+                 $this->semValue = $this->semStack[$stackPos-(4-3)];
             },
             393 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
             },
             394 => function ($stackPos) {
-                 $this->semValue = new Expr\ClosureUse($this->semStack[$stackPos-(2-2)], $this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
             },
             395 => function ($stackPos) {
-                 $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ClosureUse($this->semStack[$stackPos-(2-2)], $this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             396 => function ($stackPos) {
-                 $this->semValue = new Expr\StaticCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             397 => function ($stackPos) {
-                 $this->semValue = new Expr\StaticCall($this->semStack[$stackPos-(6-1)], $this->semStack[$stackPos-(6-4)], $this->semStack[$stackPos-(6-6)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\StaticCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             398 => function ($stackPos) {
-                 $this->semValue = $this->fixupPhp5StaticPropCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\StaticCall($this->semStack[$stackPos-(6-1)], $this->semStack[$stackPos-(6-4)], $this->semStack[$stackPos-(6-6)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
             },
             399 => function ($stackPos) {
-                 $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = $this->fixupPhp5StaticPropCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             400 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             401 => function ($stackPos) {
-                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             402 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             403 => function ($stackPos) {
-                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             404 => function ($stackPos) {
-                 $this->semValue = new Name\FullyQualified($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             405 => function ($stackPos) {
-                 $this->semValue = new Name\Relative($this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Name\FullyQualified($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             406 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Name\Relative($this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             407 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
@@ -2200,246 +2191,243 @@ class Php5 extends \PhpParser\ParserAbstract
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             412 => function ($stackPos) {
-                 $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             413 => function ($stackPos) {
                  $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             414 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             415 => function ($stackPos) {
                  $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             416 => function ($stackPos) {
-                 $this->semValue = null;
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             417 => function ($stackPos) {
                  $this->semValue = null;
             },
             418 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = null;
             },
             419 => function ($stackPos) {
-                 $this->semValue = array();
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             420 => function ($stackPos) {
-                 $this->semValue = array(new Scalar\EncapsedStringPart(Scalar\String_::parseEscapeSequences($this->semStack[$stackPos-(1-1)], '`', false), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes));
+                 $this->semValue = array();
             },
             421 => function ($stackPos) {
-                 foreach ($this->semStack[$stackPos-(1-1)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '`', false); } }; $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = array(new Scalar\EncapsedStringPart(Scalar\String_::parseEscapeSequences($this->semStack[$stackPos-(1-1)], '`', false), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes));
             },
             422 => function ($stackPos) {
-                 $this->semValue = array();
+                 foreach ($this->semStack[$stackPos-(1-1)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '`', false); } }; $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             423 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = array();
             },
             424 => function ($stackPos) {
-                 $this->semValue = $this->parseLNumber($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes, true);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             425 => function ($stackPos) {
-                 $this->semValue = new Scalar\DNumber(Scalar\DNumber::parse($this->semStack[$stackPos-(1-1)]), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = $this->parseLNumber($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes, true);
             },
             426 => function ($stackPos) {
-                 $attrs = $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes; $attrs['kind'] = ($this->semStack[$stackPos-(1-1)][0] === "'" || ($this->semStack[$stackPos-(1-1)][1] === "'" && ($this->semStack[$stackPos-(1-1)][0] === 'b' || $this->semStack[$stackPos-(1-1)][0] === 'B')) ? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED);
-            $this->semValue = new Scalar\String_(Scalar\String_::parse($this->semStack[$stackPos-(1-1)], false), $attrs);
+                 $this->semValue = new Scalar\DNumber(Scalar\DNumber::parse($this->semStack[$stackPos-(1-1)]), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             427 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\Line($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $attrs = $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes; $attrs['kind'] = ($this->semStack[$stackPos-(1-1)][0] === "'" || ($this->semStack[$stackPos-(1-1)][1] === "'" && ($this->semStack[$stackPos-(1-1)][0] === 'b' || $this->semStack[$stackPos-(1-1)][0] === 'B')) ? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED);
+            $this->semValue = new Scalar\String_(Scalar\String_::parse($this->semStack[$stackPos-(1-1)], false), $attrs);
             },
             428 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\File($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\MagicConst\Line($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             429 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\Dir($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\MagicConst\File($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             430 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\Class_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\MagicConst\Dir($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             431 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\Trait_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\MagicConst\Class_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             432 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\Method($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\MagicConst\Trait_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             433 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\Function_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\MagicConst\Method($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             434 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\Namespace_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\MagicConst\Function_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             435 => function ($stackPos) {
-                 $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$stackPos-(3-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$stackPos-(3-1)], $matches); $attrs['docLabel'] = $matches[1];;
-            $this->semValue = new Scalar\String_(Scalar\String_::parseDocString($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], false), $attrs);
+                 $this->semValue = new Scalar\MagicConst\Namespace_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             436 => function ($stackPos) {
-                 $attrs = $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$stackPos-(2-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$stackPos-(2-1)], $matches); $attrs['docLabel'] = $matches[1];;
-            $this->semValue = new Scalar\String_('', $attrs);
+                 $this->semValue = $this->parseDocString($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes, $this->startAttributeStack[$stackPos-(3-3)] + $this->endAttributeStack[$stackPos-(3-3)], false);
             },
             437 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = $this->parseDocString($this->semStack[$stackPos-(2-1)], '', $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes, $this->startAttributeStack[$stackPos-(2-2)] + $this->endAttributeStack[$stackPos-(2-2)], false);
             },
             438 => function ($stackPos) {
-                 $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             439 => function ($stackPos) {
-                 $this->semValue = new Expr\ConstFetch($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             440 => function ($stackPos) {
-                 $this->semValue = new Expr\Array_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ConstFetch($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             441 => function ($stackPos) {
-                 $this->semValue = new Expr\Array_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Array_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             442 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\Array_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             443 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\BooleanOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             444 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\BooleanAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\BooleanOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             445 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\LogicalOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\BooleanAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             446 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\LogicalAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\LogicalOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             447 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\LogicalXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\LogicalAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             448 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\LogicalXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             449 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             450 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             451 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             452 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             453 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             454 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             455 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             456 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             457 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             458 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             459 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             460 => function ($stackPos) {
-                 $this->semValue = new Expr\UnaryPlus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             461 => function ($stackPos) {
-                 $this->semValue = new Expr\UnaryMinus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\UnaryPlus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             462 => function ($stackPos) {
-                 $this->semValue = new Expr\BooleanNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\UnaryMinus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             463 => function ($stackPos) {
-                 $this->semValue = new Expr\BitwiseNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BooleanNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             464 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Identical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BitwiseNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             465 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\NotIdentical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Identical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             466 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Equal($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\NotIdentical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             467 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\NotEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Equal($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             468 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Smaller($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\NotEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             469 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\SmallerOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Smaller($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             470 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Greater($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\SmallerOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             471 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\GreaterOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Greater($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             472 => function ($stackPos) {
-                 $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(5-1)], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\GreaterOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             473 => function ($stackPos) {
-                 $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(4-1)], null, $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(5-1)], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
             },
             474 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(4-1)], null, $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             475 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             476 => function ($stackPos) {
-                 $this->semValue = new Expr\ConstFetch($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
             477 => function ($stackPos) {
-                 $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ConstFetch($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             478 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             479 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             480 => function ($stackPos) {
-                 $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Scalar\String_::KIND_DOUBLE_QUOTED;
-            foreach ($this->semStack[$stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '"', true); } }; $this->semValue = new Scalar\Encapsed($this->semStack[$stackPos-(3-2)], $attrs);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             481 => function ($stackPos) {
-                 $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$stackPos-(3-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$stackPos-(3-1)], $matches); $attrs['docLabel'] = $matches[1];;
-            foreach ($this->semStack[$stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, null, true); } } $s->value = preg_replace('~(\r\n|\n|\r)\z~', '', $s->value); if ('' === $s->value) array_pop($this->semStack[$stackPos-(3-2)]);; $this->semValue = new Scalar\Encapsed($this->semStack[$stackPos-(3-2)], $attrs);
+                 $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Scalar\String_::KIND_DOUBLE_QUOTED;
+            foreach ($this->semStack[$stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '"', true); } }; $this->semValue = new Scalar\Encapsed($this->semStack[$stackPos-(3-2)], $attrs);
             },
             482 => function ($stackPos) {
-                 $this->semValue = array();
+                 $this->semValue = $this->parseDocString($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes, $this->startAttributeStack[$stackPos-(3-3)] + $this->endAttributeStack[$stackPos-(3-3)], true);
             },
             483 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+                 $this->semValue = array();
             },
             484 => function ($stackPos) {
-                $this->semValue = $this->semStack[$stackPos];
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
             },
             485 => function ($stackPos) {
                 $this->semValue = $this->semStack[$stackPos];
             },
             486 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+                $this->semValue = $this->semStack[$stackPos];
             },
             487 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
             },
             488 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
             },
             489 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             490 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             491 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
@@ -2451,61 +2439,61 @@ class Php5 extends \PhpParser\ParserAbstract
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             494 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-5)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             495 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-5)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
             },
             496 => function ($stackPos) {
-                 $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             497 => function ($stackPos) {
-                 $this->semValue = new Expr\MethodCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             498 => function ($stackPos) {
-                 $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\MethodCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             499 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             500 => function ($stackPos) {
                  $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             501 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             502 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             503 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
             504 => function ($stackPos) {
-                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             505 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             506 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             507 => function ($stackPos) {
-                 $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             508 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             509 => function ($stackPos) {
-                 $var = substr($this->semStack[$stackPos-(1-1)], 1); $this->semValue = \is_string($var) ? new Node\VarLikeIdentifier($var, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes) : $var;
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             510 => function ($stackPos) {
-                 $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $var = substr($this->semStack[$stackPos-(1-1)], 1); $this->semValue = \is_string($var) ? new Node\VarLikeIdentifier($var, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes) : $var;
             },
             511 => function ($stackPos) {
-                 $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(6-1)], $this->semStack[$stackPos-(6-5)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             512 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(6-1)], $this->semStack[$stackPos-(6-5)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
             },
             513 => function ($stackPos) {
                  $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
@@ -2517,117 +2505,120 @@ class Php5 extends \PhpParser\ParserAbstract
                  $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             516 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             517 => function ($stackPos) {
-                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             518 => function ($stackPos) {
-                 $this->semValue = null;
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             519 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = null;
             },
             520 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             521 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             522 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
             523 => function ($stackPos) {
-                 $this->semValue = new Expr\Error($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2;
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             524 => function ($stackPos) {
-                 $this->semValue = new Expr\List_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Error($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2;
             },
             525 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+                 $this->semValue = new Expr\List_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             526 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
             },
             527 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
             },
             528 => function ($stackPos) {
                  $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             529 => function ($stackPos) {
-                 $this->semValue = null;
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             530 => function ($stackPos) {
-                 $this->semValue = array();
+                 $this->semValue = null;
             },
             531 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+                 $this->semValue = array();
             },
             532 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
             },
             533 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
             },
             534 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
             },
             535 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             536 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-1)], true, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             537 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-1)], true, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             538 => function ($stackPos) {
-                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             539 => function ($stackPos) {
                  $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
             },
             540 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
             },
             541 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)]);
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
             },
             542 => function ($stackPos) {
-                 $this->semValue = new Scalar\EncapsedStringPart($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = array($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)]);
             },
             543 => function ($stackPos) {
-                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\EncapsedStringPart($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             544 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             545 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             546 => function ($stackPos) {
-                 $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             547 => function ($stackPos) {
-                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             548 => function ($stackPos) {
                  $this->semValue = new Expr\Variable($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             549 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-4)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             550 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-4)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
             },
             551 => function ($stackPos) {
-                 $this->semValue = new Scalar\String_($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
             552 => function ($stackPos) {
-                 $this->semValue = $this->parseNumString($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\String_($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             553 => function ($stackPos) {
+                 $this->semValue = $this->parseNumString($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            554 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
         ];
diff --git a/vendor/nikic/php-parser/lib/PhpParser/Parser/Php7.php b/vendor/nikic/php-parser/lib/PhpParser/Parser/Php7.php
index 329028e0..768da721 100644
--- a/vendor/nikic/php-parser/lib/PhpParser/Parser/Php7.php
+++ b/vendor/nikic/php-parser/lib/PhpParser/Parser/Php7.php
@@ -18,16 +18,16 @@ use PhpParser\Node\Stmt;
 class Php7 extends \PhpParser\ParserAbstract
 {
     protected $tokenToSymbolMapSize = 392;
-    protected $actionTableSize = 950;
-    protected $gotoTableSize = 488;
+    protected $actionTableSize = 940;
+    protected $gotoTableSize = 486;
 
     protected $invalidSymbol = 157;
     protected $errorSymbol = 1;
     protected $defaultAction = -32766;
     protected $unexpectedTokenRule = 32767;
 
-    protected $YY2TBLSTATE = 338;
-    protected $numNonLeafStates = 580;
+    protected $YY2TBLSTATE = 336;
+    protected $numNonLeafStates = 581;
 
     protected $symbolToName = array(
         "EOF",
@@ -233,262 +233,260 @@ class Php7 extends \PhpParser\ParserAbstract
     );
 
     protected $action = array(
-          585,  586,  587,  588,  589,  218,  590,  591,  592,  628,
-          629,  492,   32,  102,  103,  104,  105,  106,  107,  108,
-          109,  110,  111,  112,  113,-32766,-32766,-32766,   98,   99,
-          100,  375,  244,  489,  556,-32766,-32766,-32766,  664,  855,
-         1095,  662,    0, 1096,  101,-32766,  823,-32766,-32766,-32766,
-        -32766,-32766,  593,  912,  914,-32766,   29,-32766,-32766,-32766,
-        -32766,-32766,-32766, -491,  253,  669,  594,  595,  596,  597,
-          598,  599,  600,  430,  253,  660,  879,  880,  881,  878,
-          877,  876,  601,  602,  603,  604,  605,  606,  607,  608,
-          609,  610,  611,  631,  632,  633,  634,  635,  623,  624,
-          625,  626,  627,  612,  613,  614,  615,  616,  617,  618,
-          654,  655,  656,  657,  658,  659,  619,  620,  621,  622,
-          652,  643,  641,  642,  638,  639,  217,  630,  636,  637,
-          644,  645,  647,  646,  648,  649,   45,   46,  407,   47,
-           48,  640,  651,  650, -233,   49,   50,  263,   51,  253,
-          879,  880,  881,  878,  877,  876,  871,-32767,-32767,-32767,
-        -32767,   93,   94,   95,   96,   97,  827,  828,  390, 1063,
-          667,  685,  686, 1086, -452,  995,  827,  828,-32766,-32766,
-        -32766,   52,   53,  117,  763, -292, -292,   54,  -91,   55,
-          226,  227,   56,   57,   58,   59,   60,   61,   62,   63,
-         -451,   25,  237,   64,  359,-32766,-32766,-32766, -491, 1012,
-         1013,  409,  668, 1045, -487,  348,  119, 1011,-32766,-32766,
-        -32766,  745,  799,  228,  234,-32766,  454,-32766,-32766,-32766,
-        -32766,   28,  229,  976,  245, -452,  367,    9,-32766,  268,
-        -32766,-32766,-32766,   24, -176,  662,  293,-32766,-32766, -452,
-          294,  827,  828, 1045,  419,  420, -452,  664, -455,  297,
-          995, -451,  301,  421,  422,  664, 1017, 1018, 1019, 1020,
-         1014, 1015,  248, -238, -450, -451,  352,  431, 1021, 1016,
-          364, 1048, -451, 1025, -454,   66,  988,  260,  391,  265,
-          270,  408, -136, -136, -136,   -4,  745,  353,  358,-32766,
-          430,  734,   25, -490,   37,   20,  410, -136,  411, -136,
-          412, -136,  413, -136, 1045,  414,  232,  125, 1011,   38,
-           39,  360,  361,  431,   40,  415,  364, 1007,   65,  277,
-          270,  292,  563,  416,  417, -450, -292, -292, 1045,  418,
-          122,  800,  720,  768,  362,  363,  355,  988, -500, -450,
-         -450,   33,-32766,-32766,-32766, -499, -450,  356,  664, -487,
-           44,  539,-32766,-32766,-32766,  422,  408,  745,  747,  554,
-         -136,  988,-32766,-32766,-32766,-32766,  734, -290,  236,   37,
-           20,  410,-32766,  411,  765,  412,   68,  413,  664, -176,
-          414,  270,  235,  430,   38,   39,  360,  361,  344,   40,
-          415,  516,   21,   65,  259, 1045,  292,-32766,  416,  417,
-           25, -450, -292, -292,  418,  270,-32766,  677,  768,  362,
-          363,  252, 1045,  430,   25, -450, 1011,  540,  123,   74,
-          364,  269, -450,  833,  857,  296, 1045,  408,  279,  745,
-         1011,  232,  118,  747,  554,   -4,  219,  734, -490,   42,
-           37,   20,  410,  357,  411,  988,  412,  133,  413,  134,
-          766,  414, -217, -217, -217,   38,   39,  360,  361,  988,
-           40,  415,  421,  422,   65,  124, -177,  292,  230,  416,
-          417,   30,  270,  664, -258,  418,  421,  422,  720,  768,
-          362,  363,  381, -500,   68, -500, -292, -292, -488,  270,
-         -499, 1045, -499,  231,  121,  233,  664,  477,   68,  408,
-          251,  528,  529,  270,  747,  554, -217,  120,  430,  734,
-          664,  114,   37,   20,  410,  115,  411,  127,  412,  131,
-          413,  116,  -82,  414, -218, -218, -218,   38,   39,  360,
-          361,  430,   40,  415,  767,  664,   65,  664,  745,  292,
-          129,  416,  417,  123,  759,  430,  247,  418,  130,  319,
-          720,  768,  362,  363,-32766,-32766,-32766,  400,    8,   75,
-           76,   77,   95,   96,   97,  564,  565,  567,  270,  744,
-          430,  101,  430,  685,  686,  281,  747,  554, -218,   31,
-          244,   78,   79,   80,   81,   82,   83,   84,   85,   86,
+          586,  587,  588,  589,  590,  218,  591,  592,  593,  629,
+          630,  665,   32,  102,  103,  104,  105,  106,  107,  108,
+          109,  110,  111,  112,  113,-32766,-32766,-32766,  881,  882,
+          883,  880,  879,  878,    0,-32766,-32766,-32766,-32766,-32766,
+        -32766,  663,  824,  117,   24,-32766,  428,-32766,-32766,-32766,
+        -32766,-32766,  594,  914,  916,-32766,    9,-32766,-32766,-32766,
+        -32766,-32766,-32766,  857,  250,  350,  595,  596,  597,  598,
+          599,  600,  601,  119,  250,  661,  881,  882,  883,  880,
+          879,  878,  602,  603,  604,  605,  606,  607,  608,  609,
+          610,  611,  612,  632,  633,  634,  635,  636,  624,  625,
+          626,  627,  628,  613,  614,  615,  616,  617,  618,  619,
+          655,  656,  657,  658,  659,  660,  620,  621,  622,  623,
+          653,  644,  642,  643,  639,  640,  800,  631,  637,  638,
+          645,  646,  648,  647,  649,  650,   45,   46,  405,   47,
+           48,  641,  652,  651, -233,   49,   50,  231,   51,-32767,
+        -32767,-32767,-32767,   93,   94,   95,   96,   97,-32766,-32766,
+        -32766,   42, -451,   25, -293, -293,  828,  829,   98,   99,
+          100,  260,  241,  230, -453, 1047,  828,  829,-32766, 1013,
+          873,   52,   53,  486,  101,  670,  242,   54, -238,   55,
+          223,  224,   56,   57,   58,   59,   60,   61,   62,   63,
+         -452,   25,  234,   64,  357,-32766,-32766,-32766,  990, 1014,
+         1015,  407, -271, 1047, -488,  665,  265, 1013,-32766,-32766,
+        -32766,  746,  248, -451,  250,-32766,  420,-32766,-32766,-32766,
+        -32766,  388, -258, 1078,  277, -453,  365, -451,-32766, 1077,
+        -32766,-32766,-32766,  116, -451,  801,  291,   68,  665, -453,
+          428,  292,  267, 1065,  417,  418, -453, -489, -456,  373,
+          997, -452,  557,  419,  420, 1050, 1019, 1020, 1021, 1022,
+         1016, 1017,  245,  764, -451, -452,  217,  429, 1023, 1018,
+          362,  295, -452, 1047, -455,   66, 1009,  257,-32766,  262,
+          267,  406, -136, -136, -136,   -4,  746,  686,  687,  299,
+          668,  735,  266, 1090,   37,   20,  408, -136,  409, -136,
+          410, -136,  411, -136,  429,  412,  229,  362,  490,   38,
+           39,  358,  359,  355,   40,  413,  828,  829,   65,  663,
+           44,  290,  669,  414,  415, -451, -492,   33, 1047,  416,
+          122,  346,  721,  769,  360,  361,  353, 1099,  -91, -451,
+         1100,  389,-32766,-32766,-32766,  354, -451,  121,  665, -488,
+          267,   28,  226,  379, 1047,  228,  406,  746,  748,  555,
+         -136,  990,-32766,  219,-32766,-32766,  735, -258,  233,   37,
+           20,  408,  351,  409, -495,  410, -495,  411,  665,  451,
+          412,  249,  232,  428,   38,   39,  358,  359,  342,   40,
+          413,  125, -489,   65,  256,  294,  290,  665,  414,  415,
+           25,   30,  118,   74,  416,  267,  356,  678,  769,  360,
+          361,  568, 1047,  428,   25,  127, 1013,  540,  123,-32766,
+        -32766,-32766, -176,  834,  124, -177, 1047,  406,  279,  746,
+         1013,  267,  428,  748,  555,   -4, 1027,  735,  665,  474,
+           37,   20,  408,  281,  409,  990,  410,  115,  411,-32766,
+        -32766,  412, -218, -218, -218,   38,   39,  358,  359,  990,
+           40,  413,  419,  420,   65, -491,  225,  290,  229,  414,
+          415, -492,  569,  428,  114,  416,  419,  420,  721,  769,
+          360,  361,  131,  541,   68,  133,  362,  130,  317,  267,
+          859,  134,  227,  529,  530,  997,  517,   21,   68,  406,
+           95,   96,   97,  267,  748,  555, -218,  120,  665,  735,
+          665,  129,   37,   20,  408,  745,  409,  244,  410,  -82,
+          411,  686,  687,  412, -217, -217, -217,   38,   39,  358,
+          359,  572,   40,  413,  665,  760,   65,  241,  746,  290,
+          101,  414,  415,  428,   43,  428, 1066,  416,  398,    8,
+          721,  769,  360,  361,  508,  509,  828,  829,  128,   75,
+           76,   77,  858,  578,  665, 1101,  570, -176, -291,  428,
+         -177,  537,  666, 1047,  523,  663,  748,  555, -217,   31,
+          123,   78,   79,   80,   81,   82,   83,   84,   85,   86,
            87,   88,   89,   90,   91,   92,   93,   94,   95,   96,
-           97,   98,   99,  100,  536,  244,   43,  745,  408,  509,
-          510, -177,  827,  828,  856,  577, 1064,  101,  734, -258,
-          128,   37,   20,  410,  664,  411,  665,  412, 1097,  413,
-          463,  662,  414, -488,  667,  558,   38,   39,  360,  745,
-          885,   40,  415,  517,-32766,   65,  458,  548,  292,  261,
-          531,  -80,  372,  522,  508,  988,  418,   10,  770,  379,
-          267, 1027,  532,  523,  769,  375, 1024,  559,  761,  555,
-           12, -409,  863,    5,  295, 1092,    0,  408,  264,  262,
-            0,  861,    0,    0,    0,  747,  554,  734,    0,    0,
-           37,   20,  410,    0,  411,    0,  412,    0,  413,    0,
-            0,  414,    0,    0,    0,   38,   39,  360,  745,  408,
-           40,  415,    0,    0,   65,  350,  337,  292,  333,  734,
-          332,  326,   37,   20,  410,  418,  411,  460,  412,  349,
-          413,  557,  864,  414,  862,  575,  561,   38,   39,  360,
-          745,  860,   40,  415,  781,  576,   65,  851,  723,  292,
-           36,  725,  868,  794,  747,  554,  783,  418,  852,  793,
-          786,  802,   35,  515,  562,  275,  276,  342,  560,  566,
-          343,  573,  568,  570,  572,    0,  721, 1094,  408,  745,
-          569,  792,  791,  762,  754,  688,  747,  554,  734, 1093,
-          687,   37,   20,  410, 1091,  411, 1046,  412, 1039,  413,
-         1053, 1058,  414, 1061,  680,  690,   38,   39,  360,  752,
-          408,   40,  415,  689,  679,   65,   26,   23,  292, -453,
-          734, -454, -455,   37,   20,  410,  418,  411, -477,  412,
-         -479,  413,   27,   34,  414,   41,   67,   69,   38,   39,
-          360,   70,   71,   40,  415,   72,   73,   65,  126,  408,
-          292,  132,  135,  224,  225,  747,  554,  240,  418,  734,
-          347,  345,   37,   20,  410,  278,  411,  243,  412,  242,
-          413,  241,  968,  414,  952,  955,  547,   38,   39,  360,
-          504,  487,   40,  415,  315,  255,   65,  785,  554,  292,
-        -32766,-32766,-32766,   22,   18,   13, -236,  418,  -91, -234,
-          980,  834, 1009,  951,  999,  545,  405,  398,  396,  392,
-        -32766,  316,-32766,-32766,-32766,-32766,-32766,-32766,-32767,-32767,
-        -32767,-32767,-32767,   19,   17,   16,  747,  554,   15,   14,
-         1026, -233,    0, -421,    0, 1052, 1089, 1037, 1038, 1008
+           97,   98,   99,  100,  887,  241,  990,  746,  406,  668,
+         -491,  455,  460,-32766,  518,  532,  -80,  101,  735,  533,
+          370,   37,   20,  408,  549,  409,  377,  410,   10,  411,
+          507,  990,  412,  770,  524,  566,   38,   39,  358,  746,
+          771,   40,  413,  261, 1029,   65,  264, 1026,  290,   12,
+          267,  293,  373, -410,  258,    5,  416,  970,  347,    0,
+          335,  348,  331,  259,    0,    0,    0,  563,    0,    0,
+            0,    0,    0,    0,    0,    0,    0,  406,    0,    0,
+            0,    0,    0,    0,    0,  748,  555,  735,  330,  324,
+           37,   20,  408,  457,  409,  762,  410,  853,  411,  556,
+          870,  412,  726,  577,   36,   38,   39,  358,  746,  406,
+           40,  413,   35,  576,   65,  803,  863,  290,  866,  735,
+          787,  865,   37,   20,  408,  416,  409,  862,  410,  782,
+          411,  724,  795,  412,  784,  854,  561,   38,   39,  358,
+          746,  794,   40,  413,  864,  793,   65,  558,  341,  290,
+          340,  560,  276,  275,  748,  555,  571,  416,  567,  565,
+          564,  559,  514,  792,  753,  763,  755,  689,  562,  978,
+          766, 1097, 1048,  722, 1096, 1098,  681,  768,  406,  746,
+          680,  690,  767,  691,  688, 1095,  786,  555,  735, 1063,
+         1041,   37,   20,  408, 1055,  409, 1060,  410,  573,  411,
+           41,   34,  412,   27,   26,   23,   38,   39,  358, -454,
+          406,   40,  413, -455, -456,   65, -478, -480,  290,  237,
+          735,  345,  343,   37,   20,  408,  416,  409,  278,  410,
+          240,  411,  239,  238,  412,  222,  221,  135,   38,   39,
+          358,  132,  126,   40,  413,   73,   72,   65,   71,  406,
+          290,   70,   69,   67, 1028,  748,  555,  954,  416,  735,
+          957,  548,   37,   20,  408,  503,  409,  484,  410,  313,
+          411,  252,   22,  412,   18,   13, -236,   38,   39,  358,
+          982,  835,   40,  413, 1011,  953,   65,  748,  555,  290,
+        -32766,-32766,-32766, 1001,  546,  403,  396,  416,  394,  390,
+          314,   19,   17,   16,  -91,   15,   14, -233, -234,    0,
+        -32766, -422,-32766,-32766,-32766,-32766,-32766,-32766,-32767,-32767,
+        -32767,-32767,-32767, 1010, 1093, 1054,  748,  555, 1040, 1039
     );
 
     protected $actionCheck = array(
             2,    3,    4,    5,    6,   13,    8,    9,   10,   11,
-           12,   48,   15,   16,   17,   18,   19,   20,   21,   22,
-           23,   24,   25,   26,   27,    8,    9,   10,   50,   51,
-           52,  146,   54,    1,  149,    8,    9,   10,   77,    1,
-           77,   77,    0,   80,   66,   28,    1,   30,   31,   32,
+           12,   77,   15,   16,   17,   18,   19,   20,   21,   22,
+           23,   24,   25,   26,   27,    8,    9,   10,  112,  113,
+          114,  115,  116,  117,    0,    8,    9,   10,    8,    9,
+           10,   77,    1,   13,    7,   28,  112,   30,   31,   32,
            33,   34,   54,   56,   57,   28,    7,   30,   31,   32,
-           33,   34,   35,    7,   28,    1,   68,   69,   70,   71,
-           72,   73,   74,  112,   28,   77,  112,  113,  114,  115,
+           33,   34,   35,    1,   28,    7,   68,   69,   70,   71,
+           72,   73,   74,    7,   28,   77,  112,  113,  114,  115,
           116,  117,   84,   85,   86,   87,   88,   89,   90,   91,
            92,   93,   94,   95,   96,   97,   98,   99,  100,  101,
           102,  103,  104,  105,  106,  107,  108,  109,  110,  111,
           112,  113,  114,  115,  116,  117,  118,  119,  120,  121,
-          122,  123,  124,  125,  126,  127,   94,  129,  130,  131,
+          122,  123,  124,  125,  126,  127,   29,  129,  130,  131,
           132,  133,  134,  135,  136,  137,    2,    3,    4,    5,
-            6,  143,  144,  145,  152,   11,   12,  109,   14,   28,
-          112,  113,  114,  115,  116,  117,  118,   41,   42,   43,
-           44,   45,   46,   47,   48,   49,  130,  131,   29,    1,
-           79,  102,  103,   82,   67,    1,  130,  131,    8,    9,
-           10,   47,   48,   13,    1,  102,  103,   53,  152,   55,
+            6,  143,  144,  145,  152,   11,   12,    7,   14,   41,
+           42,   43,   44,   45,   46,   47,   48,   49,    8,    9,
+           10,   67,   67,   67,  102,  103,  130,  131,   50,   51,
+           52,  109,   54,   35,   67,   79,  130,  131,   28,   83,
+          118,   47,   48,    1,   66,    1,    7,   53,  152,   55,
            56,   57,   58,   59,   60,   61,   62,   63,   64,   65,
-           67,   67,   68,   69,   70,    8,    9,   10,  152,   75,
-           76,   77,  148,   79,    7,  146,    7,   83,    8,    9,
-           10,    1,   29,   35,    7,   28,   82,   30,   31,   32,
-           33,  140,  141,  150,    7,  128,  102,    7,   28,    7,
-           30,   31,   32,    7,    7,   77,  112,    8,    9,  142,
-            7,  130,  131,   79,  120,  121,  149,   77,  151,    7,
-            1,  128,    7,  129,  130,   77,  132,  133,  134,  135,
-          136,  137,  138,  152,   67,  142,    7,  143,  144,  145,
-          146,    1,  149,  139,  151,  151,  112,  153,  149,  155,
-          156,   71,   72,   73,   74,    0,    1,  123,    7,    1,
-          112,   81,   67,    7,   84,   85,   86,   87,   88,   89,
-           90,   91,   92,   93,   79,   95,   35,  149,   83,   99,
-          100,  101,  102,  143,  104,  105,  146,    1,  108,    7,
-          156,  111,  149,  113,  114,  128,  102,  103,   79,  119,
-           29,  148,  122,  123,  124,  125,    7,  112,    7,  142,
-           67,   13,    8,    9,   10,    7,  149,    7,   77,  152,
-           67,   77,    8,    9,   10,  130,   71,    1,  148,  149,
-          150,  112,   28,    8,   30,   31,   81,   79,   35,   84,
-           85,   86,   28,   88,  150,   90,  151,   92,   77,  152,
-           95,  156,   35,  112,   99,  100,  101,  102,  103,  104,
-          105,   72,   73,  108,  109,   79,  111,  109,  113,  114,
-           67,  128,  102,  103,  119,  156,  118,  122,  123,  124,
-          125,  128,   79,  112,   67,  142,   83,  143,  147,  149,
-          146,   67,  149,  152,  150,  142,   79,   71,  143,    1,
-           83,   35,  149,  148,  149,  150,   13,   81,  152,   67,
-           84,   85,   86,    7,   88,  112,   90,   15,   92,   15,
-          150,   95,   96,   97,   98,   99,  100,  101,  102,  112,
-          104,  105,  129,  130,  108,  149,    7,  111,   35,  113,
-          114,    7,  156,   77,    7,  119,  129,  130,  122,  123,
-          124,  125,  128,  152,  151,  154,  102,  103,    7,  156,
-          152,   79,  154,   35,   15,   35,   77,   78,  151,   71,
-          128,   72,   73,  156,  148,  149,  150,   15,  112,   81,
-           77,   15,   84,   85,   86,   15,   88,   15,   90,   15,
-           92,  149,   29,   95,   96,   97,   98,   99,  100,  101,
-          102,  112,  104,  105,  150,   77,  108,   77,    1,  111,
-           29,  113,  114,  147,   35,  112,   29,  119,   97,   98,
-          122,  123,  124,  125,    8,    9,   10,  102,  103,    8,
-            9,   10,   47,   48,   49,   29,   29,   29,  156,   29,
-          112,   66,  112,  102,  103,   33,  148,  149,  150,   28,
-           54,   30,   31,   32,   33,   34,   35,   36,   37,   38,
+           67,   67,   68,   69,   70,    8,    9,   10,  112,   75,
+           76,   77,  150,   79,    7,   77,    7,   83,    8,    9,
+           10,    1,  128,  128,   28,   28,  130,   30,   31,   32,
+           33,   29,    7,    1,    7,  128,  102,  142,   28,    7,
+           30,   31,   32,  149,  149,  148,  112,  151,   77,  142,
+          112,    7,  156,    1,  120,  121,  149,    7,  151,  146,
+            1,  128,  149,  129,  130,    1,  132,  133,  134,  135,
+          136,  137,  138,    1,   67,  142,   94,  143,  144,  145,
+          146,    7,  149,   79,  151,  151,    1,  153,    8,  155,
+          156,   71,   72,   73,   74,    0,    1,  102,  103,    7,
+           79,   81,   67,   82,   84,   85,   86,   87,   88,   89,
+           90,   91,   92,   93,  143,   95,   35,  146,   48,   99,
+          100,  101,  102,    7,  104,  105,  130,  131,  108,   77,
+           67,  111,  148,  113,  114,  128,    7,   13,   79,  119,
+           29,  146,  122,  123,  124,  125,    7,   77,  152,  142,
+           80,  149,    8,    9,   10,    7,  149,   15,   77,  152,
+          156,  140,  141,  128,   79,   35,   71,    1,  148,  149,
+          150,  112,   28,   13,   30,   31,   81,  152,   35,   84,
+           85,   86,  123,   88,  152,   90,  154,   92,   77,   82,
+           95,  128,   35,  112,   99,  100,  101,  102,  103,  104,
+          105,  149,  152,  108,  109,  142,  111,   77,  113,  114,
+           67,    7,  149,  149,  119,  156,    7,  122,  123,  124,
+          125,  149,   79,  112,   67,   15,   83,   77,  147,    8,
+            9,   10,    7,  152,  149,    7,   79,   71,  143,    1,
+           83,  156,  112,  148,  149,  150,  139,   81,   77,   78,
+           84,   85,   86,   33,   88,  112,   90,   15,   92,    8,
+            9,   95,   96,   97,   98,   99,  100,  101,  102,  112,
+          104,  105,  129,  130,  108,    7,   35,  111,   35,  113,
+          114,  152,   29,  112,   15,  119,  129,  130,  122,  123,
+          124,  125,   15,  143,  151,   15,  146,   97,   98,  156,
+          150,   15,   35,   72,   73,    1,   72,   73,  151,   71,
+           47,   48,   49,  156,  148,  149,  150,   15,   77,   81,
+           77,   29,   84,   85,   86,   29,   88,   29,   90,   29,
+           92,  102,  103,   95,   96,   97,   98,   99,  100,  101,
+          102,   29,  104,  105,   77,   35,  108,   54,    1,  111,
+           66,  113,  114,  112,   67,  112,  152,  119,  102,  103,
+          122,  123,  124,  125,  106,  107,  130,  131,   67,    8,
+            9,   10,  148,  149,   77,   80,   29,  152,   79,  112,
+          152,   74,   77,   79,   93,   77,  148,  149,  150,   28,
+          147,   30,   31,   32,   33,   34,   35,   36,   37,   38,
            39,   40,   41,   42,   43,   44,   45,   46,   47,   48,
-           49,   50,   51,   52,   74,   54,   67,    1,   71,  106,
-          107,  152,  130,  131,  148,  149,  152,   66,   81,  152,
-           67,   84,   85,   86,   77,   88,   77,   90,   80,   92,
-           86,   77,   95,  152,   79,   29,   99,  100,  101,    1,
-           79,  104,  105,   87,   82,  108,   82,   89,  111,  126,
-           91,   94,  102,   93,  109,  112,  119,   94,  123,   94,
-          126,  139,   96,   96,  123,  146,  139,   29,  147,  149,
-          142,  142,  148,  142,  142,  150,   -1,   71,  110,  127,
-           -1,  148,   -1,   -1,   -1,  148,  149,   81,   -1,   -1,
-           84,   85,   86,   -1,   88,   -1,   90,   -1,   92,   -1,
-           -1,   95,   -1,   -1,   -1,   99,  100,  101,    1,   71,
-          104,  105,   -1,   -1,  108,  146,  146,  111,  146,   81,
-          146,  146,   84,   85,   86,  119,   88,  146,   90,  146,
-           92,  149,  148,   95,  148,  148,   29,   99,  100,  101,
-            1,  148,  104,  105,  148,  148,  108,  148,  148,  111,
-          148,  148,  148,  148,  148,  149,  148,  119,  148,  148,
-          148,  148,  148,  154,  149,  149,  149,  149,   29,  149,
-          149,  149,  149,  149,  149,   -1,  150,  150,   71,    1,
+           49,   50,   51,   52,   79,   54,  112,    1,   71,   79,
+          152,   82,   86,   82,   87,   91,   94,   66,   81,   96,
+          102,   84,   85,   86,   89,   88,   94,   90,   94,   92,
+          109,  112,   95,  123,   96,   29,   99,  100,  101,    1,
+          123,  104,  105,  110,  139,  108,  126,  139,  111,  142,
+          156,  142,  146,  142,  126,  142,  119,  153,  146,   -1,
+          146,  146,  146,  127,   -1,   -1,   -1,   29,   -1,   -1,
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   71,   -1,   -1,
+           -1,   -1,   -1,   -1,   -1,  148,  149,   81,  146,  146,
+           84,   85,   86,  146,   88,  147,   90,  148,   92,  149,
+          148,   95,  148,  148,  148,   99,  100,  101,    1,   71,
+          104,  105,  148,  148,  108,  148,  148,  111,  148,   81,
+          148,  148,   84,   85,   86,  119,   88,  148,   90,  148,
+           92,  148,  148,   95,  148,  148,   29,   99,  100,  101,
+            1,  148,  104,  105,  148,  150,  108,  149,  149,  111,
+          149,  149,  149,  149,  148,  149,  149,  119,  149,  149,
+          149,  149,  154,  150,  150,  150,  150,  150,   29,  150,
+          150,  150,  150,  150,  150,  150,  150,  150,   71,    1,
           150,  150,  150,  150,  150,  150,  148,  149,   81,  150,
           150,   84,   85,   86,  150,   88,  150,   90,  150,   92,
-          150,  150,   95,  150,  150,  150,   99,  100,  101,  150,
-           71,  104,  105,  150,  150,  108,  151,  151,  111,  151,
+          151,  151,   95,  151,  151,  151,   99,  100,  101,  151,
+           71,  104,  105,  151,  151,  108,  151,  151,  111,  151,
            81,  151,  151,   84,   85,   86,  119,   88,  151,   90,
           151,   92,  151,  151,   95,  151,  151,  151,   99,  100,
           101,  151,  151,  104,  105,  151,  151,  108,  151,   71,
-          111,  151,  151,  151,  151,  148,  149,  151,  119,   81,
-          151,  151,   84,   85,   86,  151,   88,  151,   90,  151,
-           92,  151,  153,   95,  152,  152,  152,   99,  100,  101,
+          111,  151,  151,  151,  155,  148,  149,  152,  119,   81,
+          152,  152,   84,   85,   86,  152,   88,  152,   90,  152,
+           92,  152,  152,   95,  152,  152,  152,   99,  100,  101,
           152,  152,  104,  105,  152,  152,  108,  148,  149,  111,
             8,    9,   10,  152,  152,  152,  152,  119,  152,  152,
-          152,  152,  152,  152,  152,  152,  152,  152,  152,  152,
-           28,  152,   30,   31,   32,   33,   34,   35,   36,   37,
-           38,   39,   40,  152,  152,  152,  148,  149,  152,  152,
-          155,  152,   -1,  153,   -1,  154,  154,  154,  154,  154
+          152,  152,  152,  152,  152,  152,  152,  152,  152,   -1,
+           28,  153,   30,   31,   32,   33,   34,   35,   36,   37,
+           38,   39,   40,  154,  154,  154,  148,  149,  154,  154
     );
 
     protected $actionBase = array(
-            0,  220,  295,  438,  366,  326,  284,  596,   -2,   -2,
-          -36,   -2,   -2,  648,  717,  717,  547,  717,  616,  749,
-          788,  788,  788,  281,  406,  188,  188,  443,  429,  188,
-          443,  311,  468,  470,  -39,  -39,  -39,  -39,  -39,  -39,
-          -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,
-          -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,
-          -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,
-          -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,
-          -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,
-          -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,
-          -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,
-          -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,
-          -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,
-          -39,  -39,  -39,  -39,  -39,  -39,   64,   64,  193,   32,
-          338,  743,  733,  739,  752,  753,  742,  732,  433,  654,
-          656,  521,  658,  660,  661,  663,  738,  619,  751,  734,
+            0,  220,  295,  366,  438,  285,  350,  606,   -2,   -2,
+          -36,   -2,   -2,  749,  616,  616,  547,  616,  717,  648,
+          788,  788,  788,  281,  443,  441,  441,  467,  371,  441,
+          467,  311,  330,  138,  -66,  -66,  -66,  -66,  -66,  -66,
+          -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,
+          -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,
+          -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,
+          -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,
+          -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,
+          -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,
+          -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,
+          -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,
+          -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,
+          -66,  -66,  -66,  -66,  -66,  -66,  184,  184,   97,  182,
+          324,  729,  718,  725,  732,  733,  727,  715,  360,  645,
+          632,  492,  650,  654,  656,  649,  723,  618,  730,  719,
           561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-          561,  561,  561,  561,  561,  561,  365,  170,  239,  556,
-          556,  556,  556,  556,  556,  556,  556,  556,  556,  556,
-          556,  556,  556,  556,  556,  556,  556,  556,  354,  354,
-          354,  344,  210,  207,  197,   17,  283,   27,  892,  892,
-          892,  892,  892,  116,  116,  116,  116,  357,  357,  343,
-          394,  310,  234,   83,  235,  235,  235,  235,  235,  235,
-          235,  235,  235,  235,  235,  235,  235,  174,  525,  525,
-          121,  121,  121,  121,  259,   36,  298,   46,  144,  532,
-          785,  168,  168,  492,  107,  133,  -22,  -22,  -22,   69,
-          574,  553,  553,  553,  553,   91,   91,  553,  553,  -37,
-          280,  283,  283,  293,  283,  481,  481,  481,  180, -115,
-          572,  180,  614,  592,  577,  642,  576,  641,  382,  341,
-          348,  593,  422,  560,  579,  422,  422,  422,  513,  329,
-          439,  756,   64,  539,   64,   64,   64,   64,  716,   64,
-           64,   64,   64,   64,   64,  139,   64,   45,  476,  193,
-          183,  183,  552,  183,  536,  364,  626,  237,  474,  536,
-          536,  536,  627,  628,  491,  477,   -8,  631,  469,  465,
-          296,   56,  557,  557,  564,  564,  571,  519,  557,  557,
-          557,  557,  557,  676,  676,  564,  565,  564,  571,  694,
-          564,  519,  564,  564,  557,  564,  676,  519,  209,  339,
-          243,  252,  519,  350,  533,  557,  544,  544,  446,  564,
-          217,  564,  236,  562,  676,  676,  562,  227,  519,  232,
-          597,  607,  555,  531,  322,  527,  527,  269,  555,  291,
-          519,  527,  230,  565,  255,  527,   42,  695,  696,  503,
-          700,  692,  701,  720,  704,  530,  551,  545,  712,  713,
-          705,  691,  675,  550,  591,  506,  510,  541,  549,  678,
-          560,  529,  515,  515,  515,  549,  681,  515,  515,  515,
-          515,  515,  515,  515,  515,  795,   49,  542,  554,  502,
-          585,  575,  489,  633,  537,  591,  591,  636,  790,  729,
-          559,  716,  762,  707,  624,  512,  781,  730,  640,  584,
-          582,  728,  769,  761,  634,  506,  760,  535,  563,  637,
-          591,  664,  515,  687,  689,  793,  794,  680,  791,  787,
-          767,  580,  558,  792,  674,  759,  635,  632,  612,  786,
-          754,  766,  673,  765,  613,  566,  757,  570,  719,  724,
-          625,  665,  650,  609,  514,  649,  710,  623,  783,  569,
-          782,  789,  622,  621,  442,  645,  444,  620,  711,  546,
-          540,  618,  615,  758,  644,  726,  610,  643,  763,  567,
-          529,  538,  578,  573,  568,  630,  764,  548,  606,  603,
-          534,  594,  669,  543,    0,    0,    0,    0,    0,    0,
+          561,  561,  561,  561,  561,  561,  280,   30,  451,  421,
+          421,  421,  421,  421,  421,  421,  421,  421,  421,  421,
+          421,  421,  421,  421,  421,  421,  421,  421,  150,  150,
+          150,  344,  210,  207,  197,   17,   95,   27,  892,  892,
+          892,  892,  892,  108,  108,  108,  108,  357,  357,  343,
+           62,   96,   96,   96,   96,   96,   96,   96,   96,   96,
+           96,   96,   96,   96,  259,  463,  463,   36,   36,   36,
+           36,  504,  196,  499,   46,  307,  515,  709,  252,  252,
+          436,  107,  133,  118,  118,  118,  195,  539,  529,  529,
+          529,  529,  221,  221,  529,  529,  270,  264,  232,   95,
+           95,  263,   95,   95,   95,  429,  429,  429,  171,  113,
+          541,  171,  562,  622,  548,  623,  533,  605,   94,  522,
+          204,  528,  525,  204,  204,  204,  458,  434,  431,  762,
+          184,  521,  184,  184,  184,  184,  678,  184,  184,  184,
+          184,  184,  184,  202,  184,   41,  424,   97,  272,  272,
+          420,  272,  493,  235,  614,  425,  404,  493,  493,  493,
+          613,  611,  250,  225,   -8,  609,  428,  456,  468,  329,
+          497,  497,  508,  508,  535,  510,  497,  497,  497,  497,
+          497,  664,  664,  508,  540,  508,  535,  659,  508,  510,
+          508,  508,  497,  508,  664,  510,   66,  339,  244,  274,
+          510,  348,  538,  497,  530,  530,  316,  508,  140,  508,
+           37,  546,  664,  664,  546,  179,  510,  209,  575,  565,
+          531,  558,  227,  498,  498,   58,  531,  409,  510,  498,
+           49,  540,  292,  498,   34,  712,  711,  500,  710,  660,
+          707,  681,  705,  560,  520,  527,  695,  694,  704,  662,
+          663,  496,  557,  469,  442,  523,  487,  668,  528,  516,
+          484,  484,  484,  487,  673,  484,  484,  484,  484,  484,
+          484,  484,  484,  779,  519,  536,  502,  553,  542,  342,
+          608,  518,  557,  557,  633,  768,  514,  505,  678,  751,
+          701,  574,  410,  759,  692,  658,  552,  526,  691,  758,
+          743,  612,  469,  742,  634,  501,  635,  557,  636,  484,
+          675,  676,  785,  784,  672,  781,  764,  757,  524,  637,
+          495,  780,  640,  739,  621,  620,  566,  763,  734,  756,
+          641,  754,  642,  564,  537,  766,  491,  680,  687,  619,
+          643,  644,  559,  477,  631,  630,  629,  700,  577,  761,
+          534,  760,  765,  582,  603,  480,  627,  486,  597,  696,
+          453,  507,  596,  594,  738,  626,  689,  593,  625,  752,
+          532,  516,  517,  543,  544,  545,  617,  753,  512,  591,
+          589,  583,  580,  624,  578,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,  134,  134,  134,  134,   -2,   -2,   -2,    0,    0,
-           -2,    0,    0,  134,  134,  134,  134,  134,  134,  134,
+            0,    0,  134,  134,  134,  134,   -2,   -2,   -2,    0,
+            0,   -2,    0,    0,  134,  134,  134,  134,  134,  134,
           134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
           134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
           134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
@@ -500,36 +498,36 @@ class Php7 extends \PhpParser\ParserAbstract
           134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
           134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
           134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-          134,  134,  134,  134,  134,  134,  561,  561,  561,  561,
+          134,  134,  134,  134,  134,  134,  134,  561,  561,  561,
           561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
           561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,  561,  561,  561,  561,
+          561,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+            0,    0,    0,    0,    0,    0,    0,  561,  561,  561,
           561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
           561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
-          561,  561,  561,   -3,  561,  561,   -3,  561,  561,  561,
-          561,  561,  561,  -22,  -22,  -22,  -22,  180,  180,  180,
-           38,   38,   38,   38,  180,  180,  180,  180,  180,  180,
-          180,  180,  180,  180,  180,  180,  180,  180,  -22,  -22,
-          180,  180,  180,  180,  180,  180,   38,  180,   91,   91,
-           91,  422,  422,  180,    0,    0,    0,    0,    0,  557,
-           91,  180,  180,  180,  180,    0,    0,  180,  180,  565,
-          422,    0,    0,    0,    0,  557,  557,  557,    0,  557,
-           91,    0,  183,   64,  461,  461,  461,  461,    0,    0,
-            0,  557,    0,  565,  557,    0,    0,    0,    0,    0,
-            0,  519,    0,  676,    0,    0,    0,    0,  564,    0,
-            0,    0,    0,    0,    0,    0,    0,  565,    0,    0,
-            0,    0,  565,    0,  515,    0,  559,    0,    0,  515,
-          515,  515,  559,  559,    0,    0,    0,  559
+          561,  561,  561,  561,   -3,  561,  561,   -3,  561,  561,
+          561,  561,  561,  561,  118,  118,  118,  118,  171,  171,
+          171,  -84,  171,  171,  171,  171,  171,  171,  171,  171,
+          171,  171,  171,  171,  171,  171,  118,  118,  171,  171,
+          171,  171,  171,  171,  -84,  171,  221,  221,  221,  204,
+          204,  171,    0,    0,    0,    0,    0,  497,  221,  171,
+          171,  171,  171,    0,    0,  171,  171,  540,  204,    0,
+            0,    0,    0,    0,    0,    0,  497,  497,  497,    0,
+          497,  221,    0,  272,  184,  400,  400,  400,  400,    0,
+          497,    0,  540,  497,    0,    0,    0,    0,    0,    0,
+          510,    0,  664,    0,    0,    0,    0,  508,    0,    0,
+            0,    0,    0,    0,    0,    0,  540,    0,    0,    0,
+            0,  540,    0,  484,    0,  505,    0,    0,  484,  484,
+          484,  505,  505,    0,    0,    0,  505
     );
 
     protected $actionDefault = array(
             3,32767,32767,32767,32767,32767,32767,32767,32767,   91,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,   93,  501,  501,  493,32767,  501,
-          493,32767,32767,32767,  311,  311,  311,32767,  448,  448,
-          448,  448,  448,  448,  448,32767,32767,32767,32767,32767,
-          390,32767,32767,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,32767,   93,  504,  504,  494,32767,  504,
+          494,32767,32767,32767,  312,  312,  312,32767,  449,  449,
+          449,  449,  449,  449,  449,32767,32767,32767,32767,32767,
+          391,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
@@ -538,102 +536,103 @@ class Php7 extends \PhpParser\ParserAbstract
         32767,32767,32767,32767,32767,32767,32767,32767,32767,   91,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-          498,32767,32767,32767,32767,32767,32767,32767,32767,32767,
+          501,32767,32767,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
+          374,  375,  377,  378,  311,  450,  257,  500,  310,  129,
+          268,  259,  210,  308,  242,  133,  339,  392,  341,  390,
+          394,  340,  317,  321,  322,  323,  324,  325,  326,  327,
+          328,  329,  330,  331,  332,  315,  316,  393,  371,  370,
+          369,  337,  338,  314,  342,  344,  314,  343,  360,  361,
+          358,  359,  362,  363,  364,  365,  366,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-          373,  374,  376,  377,  310,  449,  257,  497,  309,  129,
-          268,  259,  210,  307,  242,  133,  338,  391,  340,  389,
-          393,  339,  316,  320,  321,  322,  323,  324,  325,  326,
-          327,  328,  329,  330,  331,  314,  315,  392,  370,  369,
-          368,  336,  337,  313,  341,  343,  313,  342,  359,  360,
-          357,  358,  361,  362,  363,  364,  365,32767,32767,32767,
+        32767,   93,32767,32767,32767,  351,  352,  249,  249,  249,
+          249,32767,  249,  294,32767,32767,32767,32767,32767,32767,
+        32767,  443,  368,  346,  347,  345,32767,  421,32767,32767,
+        32767,32767,32767,  423,32767,   91,32767,32767,32767,  334,
+          336,  415,  503,  318,  502,32767,32767,   93,32767,32767,
+        32767,32767,32767,32767,32767,32767,32767,32767,  418,32767,
+        32767,  409,   91,32767,32767,   91,  173,  229,  231,  178,
+        32767,  426,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,   93,32767,32767,32767,  350,  351,
-          249,  249,  249,  249,32767,  249,  293,32767,32767,32767,
-        32767,32767,32767,32767,  442,  367,  345,  346,  344,32767,
-          420,32767,32767,32767,32767,32767,  422,32767,   91,32767,
-        32767,  333,  335,  414,  317,32767,32767,   93,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,32767,  417,  450,
-          450,32767,32767,  408,   91,32767,32767,   91,  173,  229,
-          231,  178,32767,  425,32767,32767,32767,32767,32767,32767,
+        32767,32767,  356,  511,32767,  451,32767,  348,  349,  350,
+        32767,32767,  451,  451,  451,32767,  451,32767,  451,  451,
+        32767,32767,32767,32767,32767,  178,32767,32767,32767,32767,
+           93,  424,  424,   91,   91,   91,   91,  419,32767,  178,
+        32767,32767,32767,32767,32767,  178,   90,   90,   90,   90,
+          178,   90,  193,32767,  191,  191,   90,32767,   92,32767,
+           92,  195,32767,  465,  195,   90,  178,   90,  215,  215,
+          400,  180,   92,  251,  251,   92,  400,   90,  178,  251,
+           90,32767,   90,  251,32767,32767,32767,   84,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,  355,  508,32767,  450,32767,  347,
-          348,  349,32767,32767,  450,  450,  450,32767,  450,32767,
-          450,  450,32767,32767,32767,32767,32767,  178,32767,32767,
-        32767,32767,   93,  423,  423,   91,   91,   91,   91,  418,
-        32767,  178,32767,32767,32767,32767,32767,  178,   90,   90,
-           90,   90,  178,   90,  193,32767,  191,  191,   90,32767,
-           92,32767,   92,  195,32767,  464,  195,   90,  178,   90,
-          215,  215,  399,  180,   92,  251,  251,   92,  399,   90,
-          178,  251,   90,32767,   90,  251,32767,32767,32767,   84,
+        32767,32767,  411,32767,  431,32767,  444,  463,  409,32767,
+          354,  355,  357,32767,  453,  379,  380,  381,  382,  383,
+          384,  385,  387,32767,  414,32767,32767,   86,  120,  267,
+        32767,  509,   86,  412,32767,  509,32767,32767,32767,32767,
+        32767,32767,32767,32767,32767,32767,   86,   86,32767,32767,
+        32767,32767,  490,32767,  510,32767,  451,  413,32767,  353,
+          427,  470,32767,32767,  452,32767,32767,32767,   86,32767,
+        32767,32767,32767,32767,32767,32767,32767,32767,  431,32767,
+        32767,32767,32767,32767,32767,  451,32767,32767,32767,32767,
+        32767,32767,32767,  307,32767,32767,32767,32767,32767,32767,
+        32767,32767,  451,32767,32767,  241,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,  410,32767,  430,32767,  443,  462,
-          408,32767,  353,  354,  356,32767,  452,  378,  379,  380,
-          381,  382,  383,  384,  386,32767,  494,  413,32767,32767,
-           86,  120,  267,32767,  506,   86,  411,32767,  506,32767,
-        32767,32767,32767,32767,32767,32767,32767,32767,32767,   86,
-           86,32767,32767,32767,32767,  489,32767,  507,32767,  450,
-          412,32767,  352,  426,  469,32767,32767,  451,32767,32767,
-        32767,   86,32767,32767,32767,32767,32767,32767,32767,32767,
-          430,32767,32767,32767,32767,32767,  450,32767,32767,32767,
-        32767,32767,32767,32767,  306,32767,32767,32767,32767,32767,
-        32767,  450,32767,32767,  241,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,32767,32767,   84,
-           60,32767,  286,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,  135,  135,    3,    3,  135,  135,
-          135,  135,  135,  135,  135,  135,  135,  135,  270,  168,
-          270,  223,  270,  270,  226,  215,  215,  278,  135,  135
+           84,   60,32767,  287,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,32767,32767,  135,  135,    3,  270,    3,
+          270,  135,  135,  135,  270,  270,  135,  135,  135,  135,
+          135,  135,  135,  168,  223,  226,  215,  215,  279,  135,
+          135
     );
 
     protected $goto = array(
           166,  166,  140,  140,  148,  149,  140,  148,  151,  182,
           167,  164,  164,  164,  164,  165,  165,  165,  165,  165,
-          165,  165,  160,  161,  162,  163,  179,  177,  180,  432,
-          433,  324,  434,  437,  438,  439,  440,  441,  442,  443,
-          444,  899,  137,  141,  142,  143,  144,  145,  139,  146,
+          165,  165,  160,  161,  162,  163,  179,  177,  180,  430,
+          431,  322,  432,  435,  436,  437,  438,  439,  440,  441,
+          442,  901,  137,  141,  142,  143,  144,  145,  139,  146,
           147,  150,  176,  178,  181,  198,  201,  202,  204,  205,
           207,  208,  209,  210,  211,  212,  213,  214,  215,  216,
-          238,  239,  256,  257,  258,  329,  330,  331,  482,  183,
+          235,  236,  253,  254,  255,  327,  328,  329,  479,  183,
           184,  185,  186,  187,  188,  189,  190,  191,  192,  193,
           194,  195,  196,  152,  197,  153,  168,  169,  170,  199,
           171,  154,  155,  156,  172,  157,  200,  138,  173,  158,
-          174,  175,  159,  541,  203,  450,  550,  203,  742,  306,
-          310,  462,  485,  486,  488,  974,  764,  221,  975,  222,
-          223,  455,  455,  455,  484,  455,  483,  867,  553,  501,
-          503,  546,  535,  865,  435,  435,  435,  470,  985,  285,
-          455,  435,  435,  435,  435,  435,  435,  435,  435,  435,
-          435,  435,  435,  435,  436,  436,  436,    7,  702,  498,
-          518,  436,  436,  436,  436,  436,  436,  436,  436,  436,
-          436,  436,  436,  436,  468, 1082, 1082,  574,  505,  507,
-          519,  534,  537,  812,  544,  552,  808,  495,  455,  455,
-          702,  675, 1082,  702,  469,  491,  455,  455,  455,  697,
-          475,  986,  691,  475,  321,  676, 1085,  266,  711,  323,
-          456,  663,  250,  282,  784,  500,  500, 1010,  836,  987,
-         1041,  480, 1010, 1010, 1010, 1010, 1010, 1010, 1010, 1010,
-         1010, 1010, 1010, 1010, 1010,  706,  694,  840, 1098,  844,
-          476,  693,  693,  737,  787,  738, 1075,  703,  703,  703,
-          705,  692, 1065,  817,  678,  777,  304, 1083, 1083, 1055,
-         1056,  308,  452,  481,  494,  882,  520,  461,  710,  473,
-          981,  946,  471,  683, 1083,  733,  728,  729,  743,  820,
-          684,  730,  681,  731,  732,  682,  524,  736,  393,  832,
-          447,  538,    3,    4,  336,  521,  340,  447, 1054,  291,
-           11,  327,  327,  271,  272,  289,  479,  334,  274,  335,
-          290,  338,  506,  341,  778,  778,  778,  778,  825,  511,
-          772,  779,  698,  286,  287,  452,  776,  318,  549,  283,
-          314,  695,  841,  578,  989,  525,  982,  826,  826,  826,
-          826,  989,  826,  707,  826,  977,  497, 1060, 1060,  845,
-          826,  789,  386,  884,  401,    0, 1051,    0,  989,  989,
-          989,  989,    0, 1051,  989,  989,    0,    0,  674,    0,
-         1062, 1062,  984,    0,    0,  750,    0,    0,  751,  801,
-          782,  782,  780,  782,  571,    0,  448,  810,  805, 1047,
-          815,  815, 1072,  875,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,  467,    0,    0,    0,    0,    0,
-            0,  843,    0,    0, 1049, 1049,  843,    0,    0,    0,
+          174,  175,  159,  542,  203,  447,  551,  203,  743,  444,
+          304,  308,  459,  482,  483,  485,  444,  493,  496,  519,
+         1087, 1087,  987,  481,  452,  452,  452,  472,  452,  698,
+          472,  677,  692,  779,  779,  779,  779, 1087,  467,  773,
+          780,  452,  433,  433,  433,  285,  433,  433,  433,  433,
+          433,  433,  433,  433,  433,  433,  433,  433,  433,  434,
+          434,  434,  676,  434,  434,  434,  434,  434,  434,  434,
+          434,  434,  434,  434,  434,  434,  480,  869,  554,  319,
+          664,  263,  536,  867,  321,  988,  247,  502,  282,  452,
+          452,  515,  516, 1057, 1058,  466,  488,  452,  452,  452,
+            3,    4,  465,  989, 1043,  712,  785,  575,  504,  506,
+          837,  453,  520,  535,  538,  813,  545,  553,  809,  498,
+          498, 1012,  477, 1012, 1012, 1012, 1012, 1012, 1012, 1012,
+         1012, 1012, 1012, 1012, 1012, 1012,  703,  675,  976,  765,
+          738,  977,  739, 1086, 1086,  499,  501,  547,  802,  783,
+          783,  781,  783,  574,  679,  445,  811,  806,  473, 1079,
+         1086,  876, 1102,  777,  316,  550,  478, 1067,  492,  703,
+          302,  684,  703,  734,  729,  730,  744, 1089,  685,  731,
+          682,  732,  733,  683,  877,  737,  306,  449,  521,  470,
+          948,  833,  458,  821,  334,  522,  338,  468,  325,  325,
+          269,  270,  272,  476,  332,  273,  333,  274,  336,  505,
+          339,  525, 1056,  391,  826,  289,  539,  816,  816, 1074,
+          694,  694,  510,  283,  312,   11,  704,  704,  704,  706,
+          693,  991,  286,  287,  827,  827,  827,  827,  991,  827,
+          696,  827,  699,  579, 1062, 1062,  526,  827,  842,  846,
+          449,  984, 1053,  708,  790,  991,  991,  991,  991, 1053,
+          979,  991,  991,  384,  399,  886, 1064, 1064,  707,  695,
+          841,  495,  845,    0,    0,  751,    0,  788,  752,    0,
+            0,    0,    0,    0,    0, 1049,  818,    0,  778,    0,
+            0,    0,    0,    0,    0,    0,    0,  986,  884,    0,
+            0,  711,  464,  983,    0,    0,    0,    0,  844,    0,
+            0, 1051, 1051,  844,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+            0,    0,    0,    0,    0,    0,    0,    0,  446,  462,
+            0,    0,    0,    0,    0,    0,    0,    0,    0,  446,
+            0,  462,    0,    0,  305,    0,  450,  372,    0,  374,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-          449,  465,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,  449,    0,  465,    0,    0,  307,    0,  453,  374,
-            0,  376,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,  701,    0, 1090
+            0,    0,    0,  702,    0, 1094
     );
 
     protected $gotoCheck = array(
@@ -648,80 +647,82 @@ class Php7 extends \PhpParser\ParserAbstract
            33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
            33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
            33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
-           33,   33,   33,   63,   56,   10,    8,   56,   13,   49,
-           49,   49,   49,   49,   49,   67,   67,   73,   67,   73,
-           73,   10,   10,   10,   97,   10,    7,    7,    7,   68,
-           68,   68,    7,    7,  134,  134,  134,   10,   92,   80,
-           10,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-          134,  134,  134,  134,  136,  136,  136,  110,   26,   46,
-           46,  136,  136,  136,  136,  136,  136,  136,  136,  136,
-          136,  136,  136,  136,   39,  145,  145,   39,   39,   39,
-           39,   39,   39,   39,   39,   39,   39,   15,   10,   10,
-           26,   17,  145,   26,   10,   10,   10,   10,   10,   15,
-           85,   92,   15,   85,   69,   18,  145,  133,   36,   69,
-           10,    5,  133,   69,   40,   86,   86,   86,   94,   92,
-           92,   10,   86,   86,   86,   86,   86,   86,   86,   86,
-           86,   86,   86,   86,   86,   14,   14,   14,   12,   14,
-          135,   26,   26,   55,   14,   55,  144,   26,   26,   26,
-           26,   26,  142,   14,   13,   14,   52,  146,  146,  140,
-          140,   65,   12,    2,    2,   14,   54,   65,   14,   53,
-           14,  117,   65,   13,  146,   13,   13,   13,   13,   88,
-           13,   13,   13,   13,   13,   13,   12,   13,   65,   90,
-           75,   12,   37,   37,   56,   56,   56,   75,  138,   20,
-           65,   56,   56,   56,   56,   56,   56,   56,   56,   56,
-           56,   56,   56,   56,   75,   75,   75,   75,   91,   24,
-           75,   75,   30,   80,   80,   12,   76,   76,   76,   11,
-           19,   28,   96,   82,   63,   23,  126,   63,   63,   63,
-           63,   63,   63,   32,   63,  123,   72,    8,    8,   99,
-           63,   79,   71,  113,  121,   -1,   97,   -1,   63,   63,
-           63,   63,   -1,   97,   63,   63,   -1,   -1,   16,   -1,
-           97,   97,   12,   -1,   -1,   63,   -1,   -1,   63,   16,
-           16,   16,   16,   16,   16,   -1,   16,   16,   16,   97,
-           85,   85,   85,  110,   -1,   -1,   -1,   -1,   -1,   -1,
-           -1,   -1,   -1,   -1,    8,   -1,   -1,   -1,   -1,   -1,
-           -1,   97,   -1,   -1,   97,   97,   97,   -1,   -1,   -1,
+           33,   33,   33,   63,   56,   10,    8,   56,   13,   75,
+           49,   49,   49,   49,   49,   49,   75,   15,   46,   46,
+          148,  148,   92,   97,   10,   10,   10,   85,   10,   15,
+           85,   18,   15,   75,   75,   75,   75,  148,   10,   75,
+           75,   10,  135,  135,  135,   80,  135,  135,  135,  135,
+          135,  135,  135,  135,  135,  135,  135,  135,  135,  137,
+          137,  137,   17,  137,  137,  137,  137,  137,  137,  137,
+          137,  137,  137,  137,  137,  137,    7,    7,    7,   69,
+            5,  134,    7,    7,   69,   92,  134,   73,   69,   10,
+           10,   73,   73,  141,  141,   10,   10,   10,   10,   10,
+           37,   37,   39,   92,   92,   36,   40,   39,   39,   39,
+           94,   10,   39,   39,   39,   39,   39,   39,   39,   86,
+           86,   86,   10,   86,   86,   86,   86,   86,   86,   86,
+           86,   86,   86,   86,   86,   86,   26,   16,   67,   67,
+           55,   67,   55,  147,  147,   68,   68,   68,   16,   16,
+           16,   16,   16,   16,   13,   16,   16,   16,  136,  146,
+          147,  111,   12,   76,   76,   76,    2,  143,    2,   26,
+           52,   13,   26,   13,   13,   13,   13,  147,   13,   13,
+           13,   13,   13,   13,  111,   13,   65,   12,   54,   53,
+          118,   90,   65,   88,   56,   56,   56,   65,   56,   56,
+           56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+           56,   12,  139,   65,   91,   20,   12,   85,   85,   85,
+           26,   26,   24,   11,   19,   65,   26,   26,   26,   26,
+           26,   63,   80,   80,   63,   63,   63,   63,   63,   63,
+           28,   63,   30,   82,    8,    8,   23,   63,   96,   99,
+           12,  127,   97,   32,   79,   63,   63,   63,   63,   97,
+          124,   63,   63,   71,  122,  114,   97,   97,   14,   14,
+           14,   72,   14,   -1,   -1,   63,   -1,   14,   63,   -1,
+           -1,   -1,   -1,   -1,   -1,   97,   14,   -1,   14,   -1,
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   12,   14,   -1,
+           -1,   14,    8,   14,   -1,   -1,   -1,   -1,   97,   -1,
+           -1,   97,   97,   97,   -1,   -1,   -1,   -1,   -1,   -1,
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    8,    8,
+           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    8,
+           -1,    8,   -1,   -1,    8,   -1,    8,    8,   -1,    8,
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-            8,    8,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-           -1,    8,   -1,    8,   -1,   -1,    8,   -1,    8,    8,
-           -1,    8,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-           -1,   -1,   -1,   -1,   -1,    8,   -1,    8
+           -1,   -1,   -1,    8,   -1,    8
     );
 
     protected $gotoBase = array(
-            0,    0, -283,    0,    0,  211,    0,  131,  106,    0,
-         -144,   60,  -21,  -19, -124, -185,  376,  199,  213,   49,
-           50,    0,    0,    2,   53,    0,  -91,    0,   47,    0,
-           55,    0,   -2,  -23,    0,    0,  209, -276,    0, -371,
-          205,    0,    0,    0,    0,    0,  134,    0,    0,   80,
-            0,    0,  229,   54,   58,  238,   87,    0,    0,    0,
-            0,    0,    0,  107,    0,  -90,    0, -195, -102, -182,
-            0,  -15,  -30, -443,    0,   63,   74,    0,    0,    4,
-         -242,    0,   24,    0,    0,  183,    8,    0,   44,    0,
-           52,   75, -155,    0,  204,    0,   45,  129,    0,    3,
+            0,    0, -281,    0,    0,  180,    0,  181,  106,    0,
+         -141,   54,    6,  -19,   11, -253,  245,  170,  139,   45,
+           69,    0,    0,   15,   56,    0,  -10,    0,   58,    0,
+           75,    0,   10,  -23,    0,    0,  206, -369,    0, -344,
+          197,    0,    0,    0,    0,    0,   93,    0,    0,   81,
+            0,    0,  243,   77,   80,  235,   87,    0,    0,    0,
+            0,    0,    0,  107,    0,  -63,    0,  -70,   17, -205,
+            0,   -2,   -3, -363,    0, -115,   14,    0,    0,    9,
+         -234,    0,   36,    0,    0,  110,   12,    0,   61,    0,
+           57,   74, -169,    0,  196,    0,   63,  128,    0,    5,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-          157,    0,    0,    5,    0,    0,    0,   37,    0,    0,
-            0,  -34,    0,    1,    0,    0,   -1,    0,    0,    0,
-            0,    0,    0,  -43,  -73,  224,  -53,    0,   56,    0,
-          -26,    0,  232,    0,  227,  -64,   18,    0,    0
+            0,   51,    0,    0,   19,    0,    0,    0,   59,    0,
+            0,    0,  -22,    0,   18,    0,    0,   16,    0,    0,
+            0,    0,    0,    0,  -66,  -65,  242,  -48,    0,   73,
+            0,  -90,    0,  247,    0,    0,  240,    7, -116,    0,
+            0
     );
 
     protected $gotoDefault = array(
-        -32768,  406,  581,    2,  582,  653,  661,  526,  423,  551,
-          424,  451,  325,  735,  888,  755,  717,  718,  719,  311,
-          351,  302,  309,  512,  502,  397,  704,  370,  696,  394,
-          699,  369,  708,  136,  527,  402,  712,    1,  714,  457,
-          746,  299,  722,  300,  530,  724,  464,  726,  727,  305,
-          312,  313,  892,  472,  499,  739,  206,  466,  740,  298,
-          741,  749,  322,  303,  380,  403,  317,  869,  490,  320,
-          365,  383,  496,  220,  474,  996,  774,  389,  378,  788,
-          284,  796,  579,  804,  807,  425,  426,  387,  819,  388,
-          830,  824, 1004,  382,  835,  371,  842, 1036,  373,  846,
-          849,  346,  513,  339,  853,  854,    6,  859,  542,  543,
-          874,  246,  399,  883,  514,  368,  898,  354,  965,  967,
-          459,  395,  978,  377,  533,  404,  983, 1040,  366,  427,
-          384,  273,  288,  249,  428,  445,  254,  429,  385, 1043,
-         1050,  328, 1066,  446, 1076, 1084,  280,  478,  493
+        -32768,  404,  582,    2,  583,  654,  662,  527,  421,  552,
+          422,  448,  323,  736,  890,  756,  718,  719,  720,  309,
+          349,  300,  307,  511,  500,  395,  705,  368,  697,  392,
+          700,  367,  709,  136,  528,  400,  713,    1,  715,  454,
+          747,  297,  723,  298,  531,  725,  461,  727,  728,  303,
+          310,  311,  894,  469,  497,  740,  206,  463,  741,  296,
+          742,  750,  320,  301,  378,  401,  315,  871,  487,  318,
+          363,  381,  494,  489,  471,  998,  775,  387,  376,  789,
+          284,  797,  580,  805,  808,  423,  424,  385,  820,  386,
+          831,  825, 1006,  380,  836,  369,  843, 1038,  371,  847,
+          220,  850,  344,  512,  337,  855,  856,    6,  861,  543,
+          544,    7,  243,  397,  885,  513,  366,  900,  352,  967,
+          969,  456,  393,  980,  375,  534,  402,  985, 1042,  364,
+          425,  382,  271,  288,  246,  426,  443,  251,  427,  383,
+         1045, 1052,  326, 1068,  268,   29, 1080, 1088,  280,  475,
+          491
     );
 
     protected $ruleToNonTerminal = array(
@@ -751,12 +752,12 @@ class Php7 extends \PhpParser\ParserAbstract
            42,   44,   44,   54,   54,   54,   54,   68,   68,   87,
            87,   88,   88,   88,   90,   90,   91,   91,   91,   89,
            89,   69,   69,   92,   92,   93,   93,   94,   94,   94,
-           50,   95,   95,   96,   51,   98,   98,   99,   99,   73,
-           73,  100,  100,  100,  100,  100,  105,  105,  106,  106,
-          107,  107,  107,  107,  107,  108,  109,  109,  104,  104,
-          101,  101,  103,  103,  111,  111,  110,  110,  110,  110,
-          110,  110,  102,  112,  112,  114,  113,  113,   52,  115,
-          115,   46,   46,   33,   33,   33,   33,   33,   33,   33,
+           50,   95,   95,   96,   51,   98,   98,   99,   99,  100,
+          100,   73,  101,  101,  101,  101,  101,  106,  106,  107,
+          107,  108,  108,  108,  108,  108,  109,  110,  110,  105,
+          105,  102,  102,  104,  104,  112,  112,  111,  111,  111,
+          111,  111,  111,  103,  113,  113,  115,  114,  114,   52,
+          116,  116,   46,   46,   33,   33,   33,   33,   33,   33,
            33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
            33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
            33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
@@ -764,19 +765,20 @@ class Php7 extends \PhpParser\ParserAbstract
            33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
            33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
            33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
-           33,   33,   33,   33,   33,   33,  122,  116,  116,  121,
-          121,  124,  125,  125,  126,  127,  127,  127,   75,   75,
-           63,   63,   63,  117,  117,  117,  129,  129,  118,  118,
-          120,  120,  120,  123,  123,  134,  134,  134,   86,  136,
-          136,  136,  119,  119,  119,  119,  119,  119,  119,  119,
-          119,  119,  119,  119,  119,  119,  119,  119,   49,   49,
-          132,  132,  132,  128,  128,  128,  137,  137,  137,  137,
-          137,  137,   56,   56,   56,   97,   97,   97,   97,  140,
-          139,  131,  131,  131,  131,  131,  131,  130,  130,  130,
-          138,  138,  138,  138,   85,  141,  141,  142,  142,  142,
-          142,  142,  142,  142,  135,  143,  143,  144,  144,  144,
-          144,  144,  133,  133,  133,  133,  146,  147,  145,  145,
-          145,  145,  145,  145,  145,  148,  148,  148,  148
+           33,   33,   33,   33,   33,   33,   33,  123,  117,  117,
+          122,  122,  125,  126,  126,  127,  128,  128,  128,   75,
+           75,   63,   63,   63,  118,  118,  118,  130,  130,  119,
+          119,  121,  121,  121,  124,  124,  135,  135,  135,   86,
+          137,  137,  137,  120,  120,  120,  120,  120,  120,  120,
+          120,  120,  120,  120,  120,  120,  120,  120,  120,   49,
+           49,  133,  133,  133,  129,  129,  129,  138,  138,  138,
+          138,  138,  138,   56,   56,   56,   97,   97,   97,   97,
+          141,  140,  132,  132,  132,  132,  132,  132,  131,  131,
+          131,  139,  139,  139,  139,   85,  142,  142,  143,  143,
+          143,  143,  143,  143,  143,  136,  145,  145,  144,  144,
+          146,  146,  146,  146,  146,  134,  134,  134,  134,  148,
+          149,  147,  147,  147,  147,  147,  147,  147,  150,  150,
+          150,  150
     );
 
     protected $ruleToLength = array(
@@ -807,31 +809,32 @@ class Php7 extends \PhpParser\ParserAbstract
             3,    4,    6,    4,    1,    2,    1,    1,    1,    0,
             1,    0,    2,    2,    4,    1,    3,    1,    2,    2,
             2,    3,    1,    1,    2,    3,    1,    1,    3,    2,
-            0,    3,    4,    9,    3,    1,    1,    3,    0,    2,
-            4,    5,    4,    4,    4,    3,    1,    1,    1,    1,
-            1,    1,    0,    1,    1,    2,    1,    1,    1,    1,
-            1,    1,    2,    1,    3,    1,    1,    3,    2,    3,
-            1,    0,    1,    1,    3,    3,    3,    4,    1,    2,
-            3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-            3,    3,    2,    2,    2,    2,    3,    3,    3,    3,
-            3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+            0,    1,    3,    4,    9,    3,    1,    1,    3,    0,
+            2,    4,    5,    4,    4,    4,    3,    1,    1,    1,
+            1,    1,    1,    0,    1,    1,    2,    1,    1,    1,
+            1,    1,    1,    2,    1,    3,    1,    1,    3,    2,
+            3,    1,    0,    1,    1,    3,    3,    3,    4,    1,
+            2,    3,    3,    3,    3,    3,    3,    3,    3,    3,
             3,    3,    3,    2,    2,    2,    2,    3,    3,    3,
-            3,    3,    3,    3,    3,    3,    3,    3,    5,    4,
-            3,    4,    4,    2,    2,    4,    2,    2,    2,    2,
-            2,    2,    2,    2,    2,    2,    2,    1,    3,    2,
-            1,    2,    4,    2,    8,    9,    7,    3,    2,    0,
-            4,    2,    1,    3,    2,    2,    2,    4,    1,    1,
-            1,    2,    3,    1,    1,    1,    1,    1,    0,    3,
-            0,    1,    1,    0,    1,    1,    3,    3,    3,    4,
-            1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-            1,    1,    1,    1,    3,    2,    3,    3,    0,    1,
-            1,    3,    1,    1,    3,    1,    1,    4,    4,    4,
-            1,    4,    1,    1,    3,    1,    4,    2,    2,    1,
-            3,    1,    4,    4,    3,    3,    3,    1,    3,    1,
-            1,    3,    1,    1,    4,    3,    1,    1,    2,    1,
-            3,    4,    3,    0,    1,    3,    1,    3,    1,    4,
-            2,    0,    2,    2,    1,    2,    1,    1,    1,    4,
-            3,    3,    3,    6,    3,    1,    1,    2,    1
+            3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+            3,    3,    3,    3,    2,    2,    2,    2,    3,    3,
+            3,    3,    3,    3,    3,    3,    3,    3,    3,    5,
+            4,    3,    4,    4,    2,    2,    4,    2,    2,    2,
+            2,    2,    2,    2,    2,    2,    2,    2,    1,    3,
+            2,    1,    2,    4,    2,    8,    9,    7,    3,    2,
+            0,    4,    2,    1,    3,    2,    2,    2,    4,    1,
+            1,    1,    2,    3,    1,    1,    1,    1,    1,    0,
+            3,    0,    1,    1,    0,    1,    1,    3,    3,    3,
+            4,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+            1,    1,    1,    1,    1,    3,    2,    3,    3,    0,
+            1,    1,    3,    1,    1,    3,    1,    1,    4,    4,
+            4,    1,    4,    1,    1,    3,    1,    4,    2,    2,
+            1,    3,    1,    4,    4,    3,    3,    3,    1,    3,
+            1,    1,    3,    1,    1,    4,    3,    1,    1,    2,
+            1,    3,    4,    3,    0,    1,    1,    1,    3,    1,
+            3,    1,    4,    2,    0,    2,    2,    1,    2,    1,
+            1,    1,    4,    3,    3,    3,    6,    3,    1,    1,
+            2,    1
     );
 
     protected function initReduceCallbacks() {
@@ -1668,137 +1671,138 @@ class Php7 extends \PhpParser\ParserAbstract
                  $this->semValue = array();
             },
             271 => function ($stackPos) {
-                 $this->semValue = new Stmt\Property($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->checkProperty($this->semValue, $stackPos-(3-1));
+                 $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop($startAttributes + $this->endAttributes); } else { $nop = null; };
+            if ($nop !== null) { $this->semStack[$stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             272 => function ($stackPos) {
-                 $this->semValue = new Stmt\ClassConst($this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-1)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); $this->checkClassConst($this->semValue, $stackPos-(4-1));
+                 $this->semValue = new Stmt\Property($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->checkProperty($this->semValue, $stackPos-(3-1));
             },
             273 => function ($stackPos) {
-                 $this->semValue = new Stmt\ClassMethod($this->semStack[$stackPos-(9-4)], ['type' => $this->semStack[$stackPos-(9-1)], 'byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-6)], 'returnType' => $this->semStack[$stackPos-(9-8)], 'stmts' => $this->semStack[$stackPos-(9-9)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes);
-            $this->checkClassMethod($this->semValue, $stackPos-(9-1));
+                 $this->semValue = new Stmt\ClassConst($this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-1)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); $this->checkClassConst($this->semValue, $stackPos-(4-1));
             },
             274 => function ($stackPos) {
-                 $this->semValue = new Stmt\TraitUse($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Stmt\ClassMethod($this->semStack[$stackPos-(9-4)], ['type' => $this->semStack[$stackPos-(9-1)], 'byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-6)], 'returnType' => $this->semStack[$stackPos-(9-8)], 'stmts' => $this->semStack[$stackPos-(9-9)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes);
+            $this->checkClassMethod($this->semValue, $stackPos-(9-1));
             },
             275 => function ($stackPos) {
-                 $this->semValue = null; /* will be skipped */
+                 $this->semValue = new Stmt\TraitUse($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             276 => function ($stackPos) {
-                 $this->semValue = array();
+                 $this->semValue = null; /* will be skipped */
             },
             277 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = array();
             },
             278 => function ($stackPos) {
-                 $this->semValue = array();
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
             279 => function ($stackPos) {
-                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+                 $this->semValue = array();
             },
             280 => function ($stackPos) {
-                 $this->semValue = new Stmt\TraitUseAdaptation\Precedence($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
             },
             281 => function ($stackPos) {
-                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(5-1)][0], $this->semStack[$stackPos-(5-1)][1], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-4)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+                 $this->semValue = new Stmt\TraitUseAdaptation\Precedence($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             282 => function ($stackPos) {
-                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], null, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(5-1)][0], $this->semStack[$stackPos-(5-1)][1], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-4)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
             },
             283 => function ($stackPos) {
-                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], null, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             284 => function ($stackPos) {
                  $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             285 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]);
+                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             286 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]);
             },
             287 => function ($stackPos) {
-                 $this->semValue = array(null, $this->semStack[$stackPos-(1-1)]);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             288 => function ($stackPos) {
-                 $this->semValue = null;
+                 $this->semValue = array(null, $this->semStack[$stackPos-(1-1)]);
             },
             289 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = null;
             },
             290 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             291 => function ($stackPos) {
-                 $this->semValue = 0;
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             292 => function ($stackPos) {
                  $this->semValue = 0;
             },
             293 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = 0;
             },
             294 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             295 => function ($stackPos) {
-                 $this->checkModifier($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $this->semValue = $this->semStack[$stackPos-(2-1)] | $this->semStack[$stackPos-(2-2)];
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             296 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_PUBLIC;
+                 $this->checkModifier($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $this->semValue = $this->semStack[$stackPos-(2-1)] | $this->semStack[$stackPos-(2-2)];
             },
             297 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_PROTECTED;
+                 $this->semValue = Stmt\Class_::MODIFIER_PUBLIC;
             },
             298 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_PRIVATE;
+                 $this->semValue = Stmt\Class_::MODIFIER_PROTECTED;
             },
             299 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_STATIC;
+                 $this->semValue = Stmt\Class_::MODIFIER_PRIVATE;
             },
             300 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT;
+                 $this->semValue = Stmt\Class_::MODIFIER_STATIC;
             },
             301 => function ($stackPos) {
-                 $this->semValue = Stmt\Class_::MODIFIER_FINAL;
+                 $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT;
             },
             302 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+                 $this->semValue = Stmt\Class_::MODIFIER_FINAL;
             },
             303 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
             },
             304 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
             },
             305 => function ($stackPos) {
-                 $this->semValue = new Node\VarLikeIdentifier(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
             },
             306 => function ($stackPos) {
-                 $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(1-1)], null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Node\VarLikeIdentifier(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             307 => function ($stackPos) {
-                 $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(1-1)], null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             308 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+                 $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             309 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
             },
             310 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
             },
             311 => function ($stackPos) {
-                 $this->semValue = array();
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
             },
             312 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = array();
             },
             313 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             314 => function ($stackPos) {
-                 $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             315 => function ($stackPos) {
                  $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
@@ -1807,437 +1811,434 @@ class Php7 extends \PhpParser\ParserAbstract
                  $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             317 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignRef($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             318 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\AssignRef($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             319 => function ($stackPos) {
-                 $this->semValue = new Expr\Clone_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             320 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Clone_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             321 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             322 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             323 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             324 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             325 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             326 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             327 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             328 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             329 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             330 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             331 => function ($stackPos) {
-                 $this->semValue = new Expr\AssignOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             332 => function ($stackPos) {
-                 $this->semValue = new Expr\PostInc($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\AssignOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             333 => function ($stackPos) {
-                 $this->semValue = new Expr\PreInc($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\PostInc($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             334 => function ($stackPos) {
-                 $this->semValue = new Expr\PostDec($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\PreInc($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             335 => function ($stackPos) {
-                 $this->semValue = new Expr\PreDec($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\PostDec($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             336 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\BooleanOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\PreDec($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             337 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\BooleanAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\BooleanOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             338 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\LogicalOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\BooleanAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             339 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\LogicalAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\LogicalOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             340 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\LogicalXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\LogicalAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             341 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\LogicalXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             342 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             343 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             344 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             345 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             346 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             347 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             348 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             349 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             350 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             351 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             352 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             353 => function ($stackPos) {
-                 $this->semValue = new Expr\UnaryPlus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             354 => function ($stackPos) {
-                 $this->semValue = new Expr\UnaryMinus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\UnaryPlus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             355 => function ($stackPos) {
-                 $this->semValue = new Expr\BooleanNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\UnaryMinus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             356 => function ($stackPos) {
-                 $this->semValue = new Expr\BitwiseNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BooleanNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             357 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Identical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BitwiseNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             358 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\NotIdentical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Identical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             359 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Equal($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\NotIdentical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             360 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\NotEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Equal($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             361 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Spaceship($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\NotEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             362 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Smaller($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Spaceship($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             363 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\SmallerOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Smaller($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             364 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Greater($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\SmallerOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             365 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\GreaterOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Greater($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             366 => function ($stackPos) {
-                 $this->semValue = new Expr\Instanceof_($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\GreaterOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             367 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = new Expr\Instanceof_($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             368 => function ($stackPos) {
-                 $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(5-1)], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
             369 => function ($stackPos) {
-                 $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(4-1)], null, $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(5-1)], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
             },
             370 => function ($stackPos) {
-                 $this->semValue = new Expr\BinaryOp\Coalesce($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(4-1)], null, $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             371 => function ($stackPos) {
-                 $this->semValue = new Expr\Isset_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\BinaryOp\Coalesce($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             372 => function ($stackPos) {
-                 $this->semValue = new Expr\Empty_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Isset_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             373 => function ($stackPos) {
-                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Empty_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             374 => function ($stackPos) {
-                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             375 => function ($stackPos) {
-                 $this->semValue = new Expr\Eval_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             376 => function ($stackPos) {
-                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Eval_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             377 => function ($stackPos) {
-                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             378 => function ($stackPos) {
-                 $this->semValue = new Expr\Cast\Int_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             379 => function ($stackPos) {
-                 $this->semValue = new Expr\Cast\Double($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Cast\Int_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             380 => function ($stackPos) {
-                 $this->semValue = new Expr\Cast\String_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Cast\Double($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             381 => function ($stackPos) {
-                 $this->semValue = new Expr\Cast\Array_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Cast\String_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             382 => function ($stackPos) {
-                 $this->semValue = new Expr\Cast\Object_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Cast\Array_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             383 => function ($stackPos) {
-                 $this->semValue = new Expr\Cast\Bool_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Cast\Object_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             384 => function ($stackPos) {
-                 $this->semValue = new Expr\Cast\Unset_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Cast\Bool_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             385 => function ($stackPos) {
+                 $this->semValue = new Expr\Cast\Unset_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            386 => function ($stackPos) {
                  $attrs = $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes;
             $attrs['kind'] = strtolower($this->semStack[$stackPos-(2-1)]) === 'exit' ? Expr\Exit_::KIND_EXIT : Expr\Exit_::KIND_DIE;
             $this->semValue = new Expr\Exit_($this->semStack[$stackPos-(2-2)], $attrs);
             },
-            386 => function ($stackPos) {
+            387 => function ($stackPos) {
                  $this->semValue = new Expr\ErrorSuppress($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
-            387 => function ($stackPos) {
+            388 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
-            388 => function ($stackPos) {
+            389 => function ($stackPos) {
                  $this->semValue = new Expr\ShellExec($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
-            389 => function ($stackPos) {
+            390 => function ($stackPos) {
                  $this->semValue = new Expr\Print_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
-            390 => function ($stackPos) {
+            391 => function ($stackPos) {
                  $this->semValue = new Expr\Yield_(null, null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
-            391 => function ($stackPos) {
+            392 => function ($stackPos) {
                  $this->semValue = new Expr\Yield_($this->semStack[$stackPos-(2-2)], null, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
-            392 => function ($stackPos) {
+            393 => function ($stackPos) {
                  $this->semValue = new Expr\Yield_($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-2)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
-            393 => function ($stackPos) {
+            394 => function ($stackPos) {
                  $this->semValue = new Expr\YieldFrom($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
-            394 => function ($stackPos) {
+            395 => function ($stackPos) {
                  $this->semValue = new Expr\Closure(['static' => false, 'byRef' => $this->semStack[$stackPos-(8-2)], 'params' => $this->semStack[$stackPos-(8-4)], 'uses' => $this->semStack[$stackPos-(8-6)], 'returnType' => $this->semStack[$stackPos-(8-7)], 'stmts' => $this->semStack[$stackPos-(8-8)]], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes);
             },
-            395 => function ($stackPos) {
+            396 => function ($stackPos) {
                  $this->semValue = new Expr\Closure(['static' => true, 'byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-5)], 'uses' => $this->semStack[$stackPos-(9-7)], 'returnType' => $this->semStack[$stackPos-(9-8)], 'stmts' => $this->semStack[$stackPos-(9-9)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes);
             },
-            396 => function ($stackPos) {
+            397 => function ($stackPos) {
                  $this->semValue = array(new Stmt\Class_(null, ['type' => 0, 'extends' => $this->semStack[$stackPos-(7-3)], 'implements' => $this->semStack[$stackPos-(7-4)], 'stmts' => $this->semStack[$stackPos-(7-6)]], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes), $this->semStack[$stackPos-(7-2)]);
             $this->checkClass($this->semValue[0], -1);
             },
-            397 => function ($stackPos) {
-                 $this->semValue = new Expr\New_($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
-            },
             398 => function ($stackPos) {
-                 list($class, $ctorArgs) = $this->semStack[$stackPos-(2-2)]; $this->semValue = new Expr\New_($class, $ctorArgs, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\New_($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             399 => function ($stackPos) {
-                 $this->semValue = array();
+                 list($class, $ctorArgs) = $this->semStack[$stackPos-(2-2)]; $this->semValue = new Expr\New_($class, $ctorArgs, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             400 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(4-3)];
+                 $this->semValue = array();
             },
             401 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+                 $this->semValue = $this->semStack[$stackPos-(4-3)];
             },
             402 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
             },
             403 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
             },
             404 => function ($stackPos) {
-                 $this->semValue = new Expr\ClosureUse($this->semStack[$stackPos-(2-2)], $this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
             },
             405 => function ($stackPos) {
-                 $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ClosureUse($this->semStack[$stackPos-(2-2)], $this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             406 => function ($stackPos) {
                  $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             407 => function ($stackPos) {
-                 $this->semValue = new Expr\StaticCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             408 => function ($stackPos) {
-                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\StaticCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             409 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             410 => function ($stackPos) {
-                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             411 => function ($stackPos) {
-                 $this->semValue = new Name\FullyQualified($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             412 => function ($stackPos) {
-                 $this->semValue = new Name\Relative($this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Name\FullyQualified($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             413 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Name\Relative($this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             414 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             415 => function ($stackPos) {
-                 $this->semValue = new Expr\Error($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2;
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             416 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\Error($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2;
             },
             417 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             418 => function ($stackPos) {
-                 $this->semValue = null;
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             419 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = null;
             },
             420 => function ($stackPos) {
-                 $this->semValue = array();
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
             421 => function ($stackPos) {
-                 $this->semValue = array(new Scalar\EncapsedStringPart(Scalar\String_::parseEscapeSequences($this->semStack[$stackPos-(1-1)], '`'), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes));
+                 $this->semValue = array();
             },
             422 => function ($stackPos) {
-                 foreach ($this->semStack[$stackPos-(1-1)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '`', true); } }; $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = array(new Scalar\EncapsedStringPart(Scalar\String_::parseEscapeSequences($this->semStack[$stackPos-(1-1)], '`'), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes));
             },
             423 => function ($stackPos) {
-                 $this->semValue = array();
+                 foreach ($this->semStack[$stackPos-(1-1)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '`', true); } }; $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             424 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = array();
             },
             425 => function ($stackPos) {
-                 $this->semValue = new Expr\ConstFetch($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             426 => function ($stackPos) {
-                 $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ConstFetch($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             427 => function ($stackPos) {
-                 $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], new Expr\Error($this->startAttributeStack[$stackPos-(3-3)] + $this->endAttributeStack[$stackPos-(3-3)]), $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->errorState = 2;
+                 $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             428 => function ($stackPos) {
+                 $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], new Expr\Error($this->startAttributeStack[$stackPos-(3-3)] + $this->endAttributeStack[$stackPos-(3-3)]), $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->errorState = 2;
+            },
+            429 => function ($stackPos) {
                  $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_SHORT;
             $this->semValue = new Expr\Array_($this->semStack[$stackPos-(3-2)], $attrs);
             },
-            429 => function ($stackPos) {
+            430 => function ($stackPos) {
                  $attrs = $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_LONG;
             $this->semValue = new Expr\Array_($this->semStack[$stackPos-(4-3)], $attrs);
             },
-            430 => function ($stackPos) {
+            431 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
-            431 => function ($stackPos) {
+            432 => function ($stackPos) {
                  $attrs = $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes; $attrs['kind'] = ($this->semStack[$stackPos-(1-1)][0] === "'" || ($this->semStack[$stackPos-(1-1)][1] === "'" && ($this->semStack[$stackPos-(1-1)][0] === 'b' || $this->semStack[$stackPos-(1-1)][0] === 'B')) ? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED);
             $this->semValue = new Scalar\String_(Scalar\String_::parse($this->semStack[$stackPos-(1-1)]), $attrs);
             },
-            432 => function ($stackPos) {
-                 $this->semValue = $this->parseLNumber($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
-            },
             433 => function ($stackPos) {
-                 $this->semValue = new Scalar\DNumber(Scalar\DNumber::parse($this->semStack[$stackPos-(1-1)]), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = $this->parseLNumber($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             434 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\Line($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\DNumber(Scalar\DNumber::parse($this->semStack[$stackPos-(1-1)]), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             435 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\File($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\MagicConst\Line($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             436 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\Dir($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\MagicConst\File($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             437 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\Class_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\MagicConst\Dir($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             438 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\Trait_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\MagicConst\Class_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             439 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\Method($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\MagicConst\Trait_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             440 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\Function_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\MagicConst\Method($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             441 => function ($stackPos) {
-                 $this->semValue = new Scalar\MagicConst\Namespace_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\MagicConst\Function_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             442 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Scalar\MagicConst\Namespace_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             443 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             444 => function ($stackPos) {
-                 $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$stackPos-(3-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$stackPos-(3-1)], $matches); $attrs['docLabel'] = $matches[1];;
-            $this->semValue = new Scalar\String_(Scalar\String_::parseDocString($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)]), $attrs);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             445 => function ($stackPos) {
-                 $attrs = $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$stackPos-(2-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$stackPos-(2-1)], $matches); $attrs['docLabel'] = $matches[1];;
-            $this->semValue = new Scalar\String_('', $attrs);
+                 $this->semValue = $this->parseDocString($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes, $this->startAttributeStack[$stackPos-(3-3)] + $this->endAttributeStack[$stackPos-(3-3)], true);
             },
             446 => function ($stackPos) {
-                 $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Scalar\String_::KIND_DOUBLE_QUOTED;
-            foreach ($this->semStack[$stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '"', true); } }; $this->semValue = new Scalar\Encapsed($this->semStack[$stackPos-(3-2)], $attrs);
+                 $this->semValue = $this->parseDocString($this->semStack[$stackPos-(2-1)], '', $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes, $this->startAttributeStack[$stackPos-(2-2)] + $this->endAttributeStack[$stackPos-(2-2)], true);
             },
             447 => function ($stackPos) {
-                 $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$stackPos-(3-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$stackPos-(3-1)], $matches); $attrs['docLabel'] = $matches[1];;
-            foreach ($this->semStack[$stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, null, true); } } $s->value = preg_replace('~(\r\n|\n|\r)\z~', '', $s->value); if ('' === $s->value) array_pop($this->semStack[$stackPos-(3-2)]);; $this->semValue = new Scalar\Encapsed($this->semStack[$stackPos-(3-2)], $attrs);
+                 $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Scalar\String_::KIND_DOUBLE_QUOTED;
+            foreach ($this->semStack[$stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '"', true); } }; $this->semValue = new Scalar\Encapsed($this->semStack[$stackPos-(3-2)], $attrs);
             },
             448 => function ($stackPos) {
-                 $this->semValue = null;
+                 $this->semValue = $this->parseDocString($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes, $this->startAttributeStack[$stackPos-(3-3)] + $this->endAttributeStack[$stackPos-(3-3)], true);
             },
             449 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = null;
             },
             450 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             451 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             452 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
             453 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             454 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             455 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
             456 => function ($stackPos) {
-                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             457 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             458 => function ($stackPos) {
                  $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
@@ -2246,180 +2247,189 @@ class Php7 extends \PhpParser\ParserAbstract
                  $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             460 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             461 => function ($stackPos) {
-                 $this->semValue = new Expr\MethodCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             462 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\MethodCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             463 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             464 => function ($stackPos) {
-                 $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             465 => function ($stackPos) {
-                 $this->semValue = substr($this->semStack[$stackPos-(1-1)], 1);
+                 $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             466 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(4-3)];
+                 $this->semValue = substr($this->semStack[$stackPos-(1-1)], 1);
             },
             467 => function ($stackPos) {
-                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(4-3)];
             },
             468 => function ($stackPos) {
-                 $this->semValue = new Expr\Error($this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); $this->errorState = 2;
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             469 => function ($stackPos) {
-                 $var = $this->semStack[$stackPos-(1-1)]; $this->semValue = \is_string($var) ? new Node\VarLikeIdentifier($var, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes) : $var;
+                 $this->semValue = new Expr\Error($this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); $this->errorState = 2;
             },
             470 => function ($stackPos) {
-                 $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $var = $this->semStack[$stackPos-(1-1)]; $this->semValue = \is_string($var) ? new Node\VarLikeIdentifier($var, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes) : $var;
             },
             471 => function ($stackPos) {
-                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             472 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             473 => function ($stackPos) {
                  $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             474 => function ($stackPos) {
-                 $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             475 => function ($stackPos) {
-                 $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             476 => function ($stackPos) {
                  $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             477 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             478 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             479 => function ($stackPos) {
-                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
             480 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             481 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             482 => function ($stackPos) {
-                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
             483 => function ($stackPos) {
-                 $this->semValue = new Expr\Error($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2;
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             484 => function ($stackPos) {
-                 $this->semValue = new Expr\List_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Error($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2;
             },
             485 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+                 $this->semValue = new Expr\List_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             486 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
             },
             487 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
             },
             488 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             489 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             490 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             491 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-1)], true, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             492 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-1)], true, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             493 => function ($stackPos) {
-                 $this->semValue = null;
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             494 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)]; $end = count($this->semValue)-1; if ($this->semValue[$end] === null) array_pop($this->semValue);
+                 $this->semValue = null;
             },
             495 => function ($stackPos) {
-                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+                 $this->semValue = $this->semStack[$stackPos-(1-1)]; $end = count($this->semValue)-1; if ($this->semValue[$end] === null) array_pop($this->semValue);
             },
             496 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+                $this->semValue = $this->semStack[$stackPos];
             },
             497 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                $this->semValue = $this->semStack[$stackPos];
             },
             498 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
             },
             499 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-1)], true, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
             },
             500 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             501 => function ($stackPos) {
-                 $this->semValue = null;
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             502 => function ($stackPos) {
-                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-1)], true, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             503 => function ($stackPos) {
-                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
             },
             504 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+                 $this->semValue = null;
             },
             505 => function ($stackPos) {
-                 $this->semValue = array($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)]);
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
             },
             506 => function ($stackPos) {
-                 $this->semValue = new Scalar\EncapsedStringPart($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
             },
             507 => function ($stackPos) {
-                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
             },
             508 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+                 $this->semValue = array($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)]);
             },
             509 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+                 $this->semValue = new Scalar\EncapsedStringPart($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             510 => function ($stackPos) {
-                 $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
             },
             511 => function ($stackPos) {
-                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
             512 => function ($stackPos) {
-                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             },
             513 => function ($stackPos) {
-                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-4)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             514 => function ($stackPos) {
-                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             515 => function ($stackPos) {
-                 $this->semValue = new Scalar\String_($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             },
             516 => function ($stackPos) {
-                 $this->semValue = $this->parseNumString($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-4)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
             },
             517 => function ($stackPos) {
-                 $this->semValue = $this->parseNumString('-' . $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
             },
             518 => function ($stackPos) {
+                 $this->semValue = new Scalar\String_($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            519 => function ($stackPos) {
+                 $this->semValue = $this->parseNumString($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            520 => function ($stackPos) {
+                 $this->semValue = $this->parseNumString('-' . $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            521 => function ($stackPos) {
                  $this->semValue = $this->semStack[$stackPos-(1-1)];
             },
         ];
diff --git a/vendor/nikic/php-parser/lib/PhpParser/ParserAbstract.php b/vendor/nikic/php-parser/lib/PhpParser/ParserAbstract.php
index dab6aea7..8b7bba83 100644
--- a/vendor/nikic/php-parser/lib/PhpParser/ParserAbstract.php
+++ b/vendor/nikic/php-parser/lib/PhpParser/ParserAbstract.php
@@ -9,6 +9,7 @@ namespace PhpParser;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Name;
 use PhpParser\Node\Param;
+use PhpParser\Node\Scalar\Encapsed;
 use PhpParser\Node\Scalar\LNumber;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt\Class_;
@@ -710,6 +711,119 @@ abstract class ParserAbstract implements Parser
         return new LNumber($num, $attributes);
     }
 
+    protected function stripIndentation(
+        string $string, int $indentLen, string $indentChar,
+        bool $newlineAtStart, bool $newlineAtEnd, array $attributes
+    ) {
+        if ($indentLen === 0) {
+            return $string;
+        }
+
+        $start = $newlineAtStart ? '(?:(?<=\n)|\A)' : '(?<=\n)';
+        $end = $newlineAtEnd ? '(?:(?=[\r\n])|\z)' : '(?=[\r\n])';
+        $regex = '/' . $start . '([ \t]*)(' . $end . ')?/';
+        return preg_replace_callback(
+            $regex,
+            function ($matches) use ($indentLen, $indentChar, $attributes) {
+                $prefix = substr($matches[1], 0, $indentLen);
+                if (false !== strpos($prefix, $indentChar === " " ? "\t" : " ")) {
+                    $this->emitError(new Error(
+                        'Invalid indentation - tabs and spaces cannot be mixed', $attributes
+                    ));
+                } elseif (strlen($prefix) < $indentLen && !isset($matches[2])) {
+                    $this->emitError(new Error(
+                        'Invalid body indentation level ' .
+                        '(expecting an indentation level of at least ' . $indentLen . ')',
+                        $attributes
+                    ));
+                }
+                return substr($matches[0], strlen($prefix));
+            },
+            $string
+        );
+    }
+
+    protected function parseDocString(
+        string $startToken, $contents, string $endToken,
+        array $attributes, array $endTokenAttributes, bool $parseUnicodeEscape
+    ) {
+        $kind = strpos($startToken, "'") === false
+            ? String_::KIND_HEREDOC : String_::KIND_NOWDOC;
+
+        $regex = '/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/';
+        $result = preg_match($regex, $startToken, $matches);
+        assert($result === 1);
+        $label = $matches[1];
+
+        $result = preg_match('/\A[ \t]*/', $endToken, $matches);
+        assert($result === 1);
+        $indentation = $matches[0];
+
+        $attributes['kind'] = $kind;
+        $attributes['docLabel'] = $label;
+        $attributes['docIndentation'] = $indentation;
+
+        $indentHasSpaces = false !== strpos($indentation, " ");
+        $indentHasTabs = false !== strpos($indentation, "\t");
+        if ($indentHasSpaces && $indentHasTabs) {
+            $this->emitError(new Error(
+                'Invalid indentation - tabs and spaces cannot be mixed',
+                $endTokenAttributes
+            ));
+
+            // Proceed processing as if this doc string is not indented
+            $indentation = '';
+        }
+
+        $indentLen = \strlen($indentation);
+        $indentChar = $indentHasSpaces ? " " : "\t";
+
+        if (\is_string($contents)) {
+            if ($contents === '') {
+                return new String_('', $attributes);
+            }
+
+            $contents = $this->stripIndentation(
+                $contents, $indentLen, $indentChar, true, true, $attributes
+            );
+            $contents = preg_replace('~(\r\n|\n|\r)\z~', '', $contents);
+
+            if ($kind === String_::KIND_HEREDOC) {
+                $contents = String_::parseEscapeSequences($contents, null, $parseUnicodeEscape);
+            }
+
+            return new String_($contents, $attributes);
+        } else {
+            assert(count($contents) > 0);
+            if (!$contents[0] instanceof Node\Scalar\EncapsedStringPart) {
+                // If there is no leading encapsed string part, pretend there is an empty one
+                $this->stripIndentation(
+                    '', $indentLen, $indentChar, true, false, $contents[0]->getAttributes()
+                );
+            }
+
+            $newContents = [];
+            foreach ($contents as $i => $part) {
+                if ($part instanceof Node\Scalar\EncapsedStringPart) {
+                    $isLast = $i === \count($contents) - 1;
+                    $part->value = $this->stripIndentation(
+                        $part->value, $indentLen, $indentChar,
+                        $i === 0, $isLast, $part->getAttributes()
+                    );
+                    $part->value = String_::parseEscapeSequences($part->value, null, $parseUnicodeEscape);
+                    if ($isLast) {
+                        $part->value = preg_replace('~(\r\n|\n|\r)\z~', '', $part->value);
+                    }
+                    if ('' === $part->value) {
+                        continue;
+                    }
+                }
+                $newContents[] = $part;
+            }
+            return new Encapsed($newContents, $attributes);
+        }
+    }
+
     protected function checkModifier($a, $b, $modifierPos) {
         // Jumping through some hoops here because verifyModifier() is also used elsewhere
         try {
diff --git a/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php b/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php
index 5ba48850..2339c75a 100644
--- a/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php
+++ b/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php
@@ -951,12 +951,15 @@ abstract class PrettyPrinterAbstract
      * @param string $append
      */
     protected function safeAppend(string &$str, string $append) {
-        // $append must not be empty in this function
         if ($str === "") {
             $str = $append;
             return;
         }
 
+        if ($append === "") {
+            return;
+        }
+
         if (!$this->labelCharMap[$append[0]]
                 || !$this->labelCharMap[$str[\strlen($str) - 1]]) {
             $str .= $append;
diff --git a/vendor/nikic/php-parser/phpunit.xml.dist b/vendor/nikic/php-parser/phpunit.xml.dist
index cc6bd4fd..b375637b 100644
--- a/vendor/nikic/php-parser/phpunit.xml.dist
+++ b/vendor/nikic/php-parser/phpunit.xml.dist
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="false"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
+         colors="true"
          beStrictAboutTestsThatDoNotTestAnything="false"
          bootstrap="./test/bootstrap.php">
     <testsuites>
diff --git a/vendor/nikic/php-parser/test/PhpParser/Builder/ClassTest.php b/vendor/nikic/php-parser/test/PhpParser/Builder/ClassTest.php
index fe324d76..27d911b0 100644
--- a/vendor/nikic/php-parser/test/PhpParser/Builder/ClassTest.php
+++ b/vendor/nikic/php-parser/test/PhpParser/Builder/ClassTest.php
@@ -123,39 +123,31 @@ DOC;
         );
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Unexpected node of type "Stmt_Echo"
-     */
     public function testInvalidStmtError() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Unexpected node of type "Stmt_Echo"');
         $this->createClassBuilder('Test')
             ->addStmt(new Stmt\Echo_([]))
         ;
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Doc comment must be a string or an instance of PhpParser\Comment\Doc
-     */
     public function testInvalidDocComment() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Doc comment must be a string or an instance of PhpParser\Comment\Doc');
         $this->createClassBuilder('Test')
             ->setDocComment(new Comment('Test'));
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Name cannot be empty
-     */
     public function testEmptyName() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Name cannot be empty');
         $this->createClassBuilder('Test')
             ->extend('');
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Name must be a string or an instance of Node\Name
-     */
     public function testInvalidName() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Name must be a string or an instance of Node\Name');
         $this->createClassBuilder('Test')
             ->extend(['Foo']);
     }
diff --git a/vendor/nikic/php-parser/test/PhpParser/Builder/FunctionTest.php b/vendor/nikic/php-parser/test/PhpParser/Builder/FunctionTest.php
index a2c62192..b7413e1f 100644
--- a/vendor/nikic/php-parser/test/PhpParser/Builder/FunctionTest.php
+++ b/vendor/nikic/php-parser/test/PhpParser/Builder/FunctionTest.php
@@ -92,29 +92,23 @@ class FunctionTest extends TestCase
         ], []), $node);
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage void type cannot be nullable
-     */
     public function testInvalidNullableVoidType() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('void type cannot be nullable');
         $this->createFunctionBuilder('test')->setReturnType('?void');
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Expected parameter node, got "Name"
-     */
     public function testInvalidParamError() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Expected parameter node, got "Name"');
         $this->createFunctionBuilder('test')
             ->addParam(new Node\Name('foo'))
         ;
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Expected statement or expression node
-     */
     public function testAddNonStmt() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Expected statement or expression node');
         $this->createFunctionBuilder('test')
             ->addStmt(new Node\Name('Test'));
     }
diff --git a/vendor/nikic/php-parser/test/PhpParser/Builder/InterfaceTest.php b/vendor/nikic/php-parser/test/PhpParser/Builder/InterfaceTest.php
index 2c926b60..3ea3533c 100644
--- a/vendor/nikic/php-parser/test/PhpParser/Builder/InterfaceTest.php
+++ b/vendor/nikic/php-parser/test/PhpParser/Builder/InterfaceTest.php
@@ -79,11 +79,9 @@ class InterfaceTest extends TestCase
         ]), $node);
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Unexpected node of type "Stmt_PropertyProperty"
-     */
     public function testInvalidStmtError() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Unexpected node of type "Stmt_PropertyProperty"');
         $this->builder->addStmt(new Stmt\PropertyProperty('invalid'));
     }
 
diff --git a/vendor/nikic/php-parser/test/PhpParser/Builder/MethodTest.php b/vendor/nikic/php-parser/test/PhpParser/Builder/MethodTest.php
index 0decbed0..14196790 100644
--- a/vendor/nikic/php-parser/test/PhpParser/Builder/MethodTest.php
+++ b/vendor/nikic/php-parser/test/PhpParser/Builder/MethodTest.php
@@ -135,33 +135,27 @@ class MethodTest extends TestCase
         ], []), $node);
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Cannot add statements to an abstract method
-     */
     public function testAddStmtToAbstractMethodError() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Cannot add statements to an abstract method');
         $this->createMethodBuilder('test')
             ->makeAbstract()
             ->addStmt(new Print_(new String_('test')))
         ;
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Cannot make method with statements abstract
-     */
     public function testMakeMethodWithStmtsAbstractError() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Cannot make method with statements abstract');
         $this->createMethodBuilder('test')
             ->addStmt(new Print_(new String_('test')))
             ->makeAbstract()
         ;
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Expected parameter node, got "Name"
-     */
     public function testInvalidParamError() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Expected parameter node, got "Name"');
         $this->createMethodBuilder('test')
             ->addParam(new Node\Name('foo'))
         ;
diff --git a/vendor/nikic/php-parser/test/PhpParser/Builder/ParamTest.php b/vendor/nikic/php-parser/test/PhpParser/Builder/ParamTest.php
index d3318921..9ed283b7 100644
--- a/vendor/nikic/php-parser/test/PhpParser/Builder/ParamTest.php
+++ b/vendor/nikic/php-parser/test/PhpParser/Builder/ParamTest.php
@@ -80,9 +80,9 @@ class ParamTest extends TestCase
     }
 
     /**
-     * @dataProvider provideTestTypeHints
+     * @dataProvider provideTestTypes
      */
-    public function testTypeHints($typeHint, $expectedType) {
+    public function testTypes($typeHint, $expectedType) {
         $node = $this->createParamBuilder('test')
             ->setTypeHint($typeHint)
             ->getNode()
@@ -100,7 +100,7 @@ class ParamTest extends TestCase
         $this->assertEquals($expectedType, $type);
     }
 
-    public function provideTestTypeHints() {
+    public function provideTestTypes() {
         return [
             ['array', new Node\Identifier('array')],
             ['callable', new Node\Identifier('callable')],
@@ -129,20 +129,16 @@ class ParamTest extends TestCase
         ];
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Parameter type cannot be void
-     */
     public function testVoidTypeError() {
-        $this->createParamBuilder('test')->setTypeHint('void');
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Parameter type cannot be void');
+        $this->createParamBuilder('test')->setType('void');
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Type must be a string, or an instance of Name, Identifier or NullableType
-     */
     public function testInvalidTypeError() {
-        $this->createParamBuilder('test')->setTypeHint(new \stdClass);
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Type must be a string, or an instance of Name, Identifier or NullableType');
+        $this->createParamBuilder('test')->setType(new \stdClass);
     }
 
     public function testByRef() {
diff --git a/vendor/nikic/php-parser/test/PhpParser/Builder/TraitTest.php b/vendor/nikic/php-parser/test/PhpParser/Builder/TraitTest.php
index 666769dc..31535b2c 100644
--- a/vendor/nikic/php-parser/test/PhpParser/Builder/TraitTest.php
+++ b/vendor/nikic/php-parser/test/PhpParser/Builder/TraitTest.php
@@ -37,11 +37,9 @@ class TraitTest extends TestCase
         ]), $trait);
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Unexpected node of type "Stmt_Echo"
-     */
     public function testInvalidStmtError() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Unexpected node of type "Stmt_Echo"');
         $this->createTraitBuilder('Test')
             ->addStmt(new Stmt\Echo_([]))
         ;
diff --git a/vendor/nikic/php-parser/test/PhpParser/Builder/TraitUseAdaptationTest.php b/vendor/nikic/php-parser/test/PhpParser/Builder/TraitUseAdaptationTest.php
new file mode 100644
index 00000000..18f00b9d
--- /dev/null
+++ b/vendor/nikic/php-parser/test/PhpParser/Builder/TraitUseAdaptationTest.php
@@ -0,0 +1,109 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Builder;
+
+use PhpParser\Comment;
+use PhpParser\Node;
+use PhpParser\Node\Name;
+use PhpParser\Node\Stmt;
+use PhpParser\Node\Stmt\Class_;
+use PHPUnit\Framework\TestCase;
+
+class TraitUseAdaptationTest extends TestCase
+{
+    protected function createTraitUseAdaptationBuilder($trait, $method) {
+        return new TraitUseAdaptation($trait, $method);
+    }
+
+    public function testAsMake() {
+        $builder = $this->createTraitUseAdaptationBuilder(null, 'foo');
+
+        $this->assertEquals(
+            new Stmt\TraitUseAdaptation\Alias(null, 'foo', null, 'bar'),
+            (clone $builder)->as('bar')->getNode()
+        );
+
+        $this->assertEquals(
+            new Stmt\TraitUseAdaptation\Alias(null, 'foo', Class_::MODIFIER_PUBLIC, null),
+            (clone $builder)->makePublic()->getNode()
+        );
+
+        $this->assertEquals(
+            new Stmt\TraitUseAdaptation\Alias(null, 'foo', Class_::MODIFIER_PROTECTED, null),
+            (clone $builder)->makeProtected()->getNode()
+        );
+
+        $this->assertEquals(
+            new Stmt\TraitUseAdaptation\Alias(null, 'foo', Class_::MODIFIER_PRIVATE, null),
+            (clone $builder)->makePrivate()->getNode()
+        );
+    }
+
+    public function testInsteadof() {
+        $node = $this->createTraitUseAdaptationBuilder('SomeTrait', 'foo')
+            ->insteadof('AnotherTrait')
+            ->getNode()
+        ;
+
+        $this->assertEquals(
+            new Stmt\TraitUseAdaptation\Precedence(
+                new Name('SomeTrait'),
+                'foo',
+                [new Name('AnotherTrait')]
+            ),
+            $node
+        );
+    }
+
+    public function testAsOnNotAlias() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Cannot set alias for not alias adaptation buider');
+        $this->createTraitUseAdaptationBuilder('Test', 'foo')
+            ->insteadof('AnotherTrait')
+            ->as('bar')
+        ;
+    }
+
+    public function testInsteadofOnNotPrecedence() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Cannot add overwritten traits for not precedence adaptation buider');
+        $this->createTraitUseAdaptationBuilder('Test', 'foo')
+            ->as('bar')
+            ->insteadof('AnotherTrait')
+        ;
+    }
+
+    public function testInsteadofWithoutTrait() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Precedence adaptation must have trait');
+        $this->createTraitUseAdaptationBuilder(null, 'foo')
+            ->insteadof('AnotherTrait')
+        ;
+    }
+
+    public function testMakeOnNotAlias() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Cannot set access modifier for not alias adaptation buider');
+        $this->createTraitUseAdaptationBuilder('Test', 'foo')
+            ->insteadof('AnotherTrait')
+            ->makePublic()
+        ;
+    }
+
+    public function testMultipleMake() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Multiple access type modifiers are not allowed');
+        $this->createTraitUseAdaptationBuilder(null, 'foo')
+            ->makePrivate()
+            ->makePublic()
+        ;
+    }
+
+    public function testUndefinedType() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Type of adaptation is not defined');
+        $this->createTraitUseAdaptationBuilder(null, 'foo')
+            ->getNode()
+        ;
+    }
+}
diff --git a/vendor/nikic/php-parser/test/PhpParser/Builder/TraitUseTest.php b/vendor/nikic/php-parser/test/PhpParser/Builder/TraitUseTest.php
new file mode 100644
index 00000000..ec4e9400
--- /dev/null
+++ b/vendor/nikic/php-parser/test/PhpParser/Builder/TraitUseTest.php
@@ -0,0 +1,55 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Builder;
+
+use PhpParser\Comment;
+use PhpParser\Node;
+use PhpParser\Node\Name;
+use PhpParser\Node\Stmt;
+use PHPUnit\Framework\TestCase;
+
+class TraitUseTest extends TestCase
+{
+    protected function createTraitUseBuilder(...$traits) {
+        return new TraitUse(...$traits);
+    }
+
+    public function testAnd() {
+        $node = $this->createTraitUseBuilder('SomeTrait')
+            ->and('AnotherTrait')
+            ->getNode()
+        ;
+
+        $this->assertEquals(
+            new Stmt\TraitUse([
+                new Name('SomeTrait'),
+                new Name('AnotherTrait')
+            ]),
+            $node
+        );
+    }
+
+    public function testWith() {
+        $node = $this->createTraitUseBuilder('SomeTrait')
+            ->with(new Stmt\TraitUseAdaptation\Alias(null, 'foo', null, 'bar'))
+            ->with((new TraitUseAdaptation(null, 'test'))->as('baz'))
+            ->getNode()
+        ;
+
+        $this->assertEquals(
+            new Stmt\TraitUse([new Name('SomeTrait')], [
+                new Stmt\TraitUseAdaptation\Alias(null, 'foo', null, 'bar'),
+                new Stmt\TraitUseAdaptation\Alias(null, 'test', null, 'baz')
+            ]),
+            $node
+        );
+    }
+
+    public function testInvalidAdaptationNode() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Adaptation must have type TraitUseAdaptation');
+        $this->createTraitUseBuilder('Test')
+            ->with(new Stmt\Echo_([]))
+        ;
+    }
+}
diff --git a/vendor/nikic/php-parser/test/PhpParser/Builder/UseTest.php b/vendor/nikic/php-parser/test/PhpParser/Builder/UseTest.php
index 85c1d77d..54ede584 100644
--- a/vendor/nikic/php-parser/test/PhpParser/Builder/UseTest.php
+++ b/vendor/nikic/php-parser/test/PhpParser/Builder/UseTest.php
@@ -26,5 +26,10 @@ class UseTest extends TestCase
         $this->assertEquals(new Stmt\Use_([
             new Stmt\UseUse(new Name('foo\bar'), 'foo')
         ], Stmt\Use_::TYPE_FUNCTION), $node);
+
+        $node = $this->createUseBuilder('foo\BAR', Stmt\Use_::TYPE_CONSTANT)->as('FOO')->getNode();
+        $this->assertEquals(new Stmt\Use_([
+            new Stmt\UseUse(new Name('foo\BAR'), 'FOO')
+        ], Stmt\Use_::TYPE_CONSTANT), $node);
     }
 }
diff --git a/vendor/nikic/php-parser/test/PhpParser/BuilderFactoryTest.php b/vendor/nikic/php-parser/test/PhpParser/BuilderFactoryTest.php
index 465f600f..9dd20a10 100644
--- a/vendor/nikic/php-parser/test/PhpParser/BuilderFactoryTest.php
+++ b/vendor/nikic/php-parser/test/PhpParser/BuilderFactoryTest.php
@@ -25,15 +25,17 @@ class BuilderFactoryTest extends TestCase
 
     public function provideTestFactory() {
         return [
-            ['namespace', Builder\Namespace_::class],
-            ['class',     Builder\Class_::class],
-            ['interface', Builder\Interface_::class],
-            ['trait',     Builder\Trait_::class],
-            ['method',    Builder\Method::class],
-            ['function',  Builder\Function_::class],
-            ['property',  Builder\Property::class],
-            ['param',     Builder\Param::class],
-            ['use',       Builder\Use_::class],
+            ['namespace',   Builder\Namespace_::class],
+            ['class',       Builder\Class_::class],
+            ['interface',   Builder\Interface_::class],
+            ['trait',       Builder\Trait_::class],
+            ['method',      Builder\Method::class],
+            ['function',    Builder\Function_::class],
+            ['property',    Builder\Property::class],
+            ['param',       Builder\Param::class],
+            ['use',         Builder\Use_::class],
+            ['useFunction', Builder\Use_::class],
+            ['useConst',    Builder\Use_::class],
         ];
     }
 
@@ -67,19 +69,15 @@ class BuilderFactoryTest extends TestCase
         );
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Expected at least two expressions
-     */
     public function testConcatOneError() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Expected at least two expressions');
         (new BuilderFactory())->concat("a");
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Expected string or Expr
-     */
     public function testConcatInvalidExpr() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Expected string or Expr');
         (new BuilderFactory())->concat("a", 42);
     }
 
@@ -188,47 +186,85 @@ class BuilderFactoryTest extends TestCase
         );
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Expected string or instance of Node\Identifier
-     */
+    public function testVar() {
+        $factory = new BuilderFactory();
+        $this->assertEquals(
+            new Expr\Variable("foo"),
+            $factory->var("foo")
+        );
+        $this->assertEquals(
+            new Expr\Variable(new Expr\Variable("foo")),
+            $factory->var($factory->var("foo"))
+        );
+    }
+
+    public function testPropertyFetch() {
+        $f = new BuilderFactory();
+        $this->assertEquals(
+            new Expr\PropertyFetch(new Expr\Variable('foo'), 'bar'),
+            $f->propertyFetch($f->var('foo'), 'bar')
+        );
+        $this->assertEquals(
+            new Expr\PropertyFetch(new Expr\Variable('foo'), 'bar'),
+            $f->propertyFetch($f->var('foo'), new Identifier('bar'))
+        );
+        $this->assertEquals(
+            new Expr\PropertyFetch(new Expr\Variable('foo'), new Expr\Variable('bar')),
+            $f->propertyFetch($f->var('foo'), $f->var('bar'))
+        );
+    }
+
     public function testInvalidIdentifier() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Expected string or instance of Node\Identifier');
         (new BuilderFactory())->classConstFetch('Foo', new Expr\Variable('foo'));
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Expected string or instance of Node\Identifier or Node\Expr
-     */
     public function testInvalidIdentifierOrExpr() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Expected string or instance of Node\Identifier or Node\Expr');
         (new BuilderFactory())->staticCall('Foo', new Name('bar'));
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Name must be a string or an instance of Node\Name or Node\Expr
-     */
     public function testInvalidNameOrExpr() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Name must be a string or an instance of Node\Name or Node\Expr');
         (new BuilderFactory())->funcCall(new Node\Stmt\Return_());
     }
 
+    public function testInvalidVar() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Variable name must be string or Expr');
+        (new BuilderFactory())->var(new Node\Stmt\Return_());
+    }
+
     public function testIntegration() {
         $factory = new BuilderFactory;
         $node = $factory->namespace('Name\Space')
             ->addStmt($factory->use('Foo\Bar\SomeOtherClass'))
             ->addStmt($factory->use('Foo\Bar')->as('A'))
+            ->addStmt($factory->useFunction('strlen'))
+            ->addStmt($factory->useConst('PHP_VERSION'))
             ->addStmt($factory
                 ->class('SomeClass')
                 ->extend('SomeOtherClass')
                 ->implement('A\Few', '\Interfaces')
                 ->makeAbstract()
 
+                ->addStmt($factory->useTrait('FirstTrait'))
+
+                ->addStmt($factory->useTrait('SecondTrait', 'ThirdTrait')
+                    ->and('AnotherTrait')
+                    ->with($factory->traitUseAdaptation('foo')->as('bar'))
+                    ->with($factory->traitUseAdaptation('AnotherTrait', 'baz')->as('test'))
+                    ->with($factory->traitUseAdaptation('AnotherTrait', 'func')->insteadof('SecondTrait')))
+
                 ->addStmt($factory->method('firstMethod'))
 
                 ->addStmt($factory->method('someMethod')
                     ->makePublic()
                     ->makeAbstract()
-                    ->addParam($factory->param('someParam')->setTypeHint('SomeClass'))
+                    ->addParam($factory->param('someParam')->setType('SomeClass'))
                     ->setDocComment('/**
                                       * This method does something.
                                       *
@@ -254,8 +290,16 @@ namespace Name\Space;
 
 use Foo\Bar\SomeOtherClass;
 use Foo\Bar as A;
+use function strlen;
+use const PHP_VERSION;
 abstract class SomeClass extends SomeOtherClass implements A\Few, \Interfaces
 {
+    use FirstTrait;
+    use SecondTrait, ThirdTrait, AnotherTrait {
+        foo as bar;
+        AnotherTrait::baz as test;
+        AnotherTrait::func insteadof SecondTrait;
+    }
     protected $someProperty;
     private $anotherProperty = array(1, 2, 3);
     function firstMethod()
diff --git a/vendor/nikic/php-parser/test/PhpParser/CodeParsingTest.php b/vendor/nikic/php-parser/test/PhpParser/CodeParsingTest.php
index 3bdab812..459996c5 100644
--- a/vendor/nikic/php-parser/test/PhpParser/CodeParsingTest.php
+++ b/vendor/nikic/php-parser/test/PhpParser/CodeParsingTest.php
@@ -52,7 +52,8 @@ class CodeParsingTest extends CodeTestAbstract
         ];
     }
 
-    private function getParseOutput(Parser $parser, $code, array $modes) {
+    // Must be public for updateTests.php
+    public function getParseOutput(Parser $parser, $code, array $modes) {
         $dumpPositions = isset($modes['positions']);
 
         $errors = new ErrorHandler\Collecting;
diff --git a/vendor/nikic/php-parser/test/PhpParser/ConstExprEvaluatorTest.php b/vendor/nikic/php-parser/test/PhpParser/ConstExprEvaluatorTest.php
index d0a83fff..7cd56b5b 100644
--- a/vendor/nikic/php-parser/test/PhpParser/ConstExprEvaluatorTest.php
+++ b/vendor/nikic/php-parser/test/PhpParser/ConstExprEvaluatorTest.php
@@ -73,11 +73,9 @@ class ConstExprEvaluatorTest extends TestCase
         ];
     }
 
-    /**
-     * @expectedException \PhpParser\ConstExprEvaluationException
-     * @expectedExceptionMessage Expression of type Expr_Variable cannot be evaluated
-     */
     public function testEvaluateFails() {
+        $this->expectException(ConstExprEvaluationException::class);
+        $this->expectExceptionMessage('Expression of type Expr_Variable cannot be evaluated');
         $evaluator = new ConstExprEvaluator();
         $evaluator->evaluateDirectly(new Expr\Variable('a'));
     }
diff --git a/vendor/nikic/php-parser/test/PhpParser/ErrorHandler/ThrowingTest.php b/vendor/nikic/php-parser/test/PhpParser/ErrorHandler/ThrowingTest.php
index 31d349ae..8735be8c 100644
--- a/vendor/nikic/php-parser/test/PhpParser/ErrorHandler/ThrowingTest.php
+++ b/vendor/nikic/php-parser/test/PhpParser/ErrorHandler/ThrowingTest.php
@@ -7,11 +7,9 @@ use PHPUnit\Framework\TestCase;
 
 class ThrowingTest extends TestCase
 {
-    /**
-     * @expectedException \PhpParser\Error
-     * @expectedExceptionMessage Test
-     */
     public function testHandleError() {
+        $this->expectException(Error::class);
+        $this->expectExceptionMessage('Test');
         $errorHandler = new Throwing();
         $errorHandler->handleError(new Error('Test'));
     }
diff --git a/vendor/nikic/php-parser/test/PhpParser/ErrorTest.php b/vendor/nikic/php-parser/test/PhpParser/ErrorTest.php
index 4b9d73a1..07a3288f 100644
--- a/vendor/nikic/php-parser/test/PhpParser/ErrorTest.php
+++ b/vendor/nikic/php-parser/test/PhpParser/ErrorTest.php
@@ -94,11 +94,9 @@ class ErrorTest extends TestCase
         }
     }
 
-    /**
-     * @expectedException \RuntimeException
-     * @expectedExceptionMessage Invalid position information
-     */
     public function testInvalidPosInfo() {
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('Invalid position information');
         $error = new Error('Some error', [
             'startFilePos' => 10,
             'endFilePos' => 11,
diff --git a/vendor/nikic/php-parser/test/PhpParser/Lexer/EmulativeTest.php b/vendor/nikic/php-parser/test/PhpParser/Lexer/EmulativeTest.php
index 3a33ba82..533547ae 100644
--- a/vendor/nikic/php-parser/test/PhpParser/Lexer/EmulativeTest.php
+++ b/vendor/nikic/php-parser/test/PhpParser/Lexer/EmulativeTest.php
@@ -2,6 +2,7 @@
 
 namespace PhpParser\Lexer;
 
+use PhpParser\ErrorHandler;
 use PhpParser\LexerTest;
 use PhpParser\Parser\Tokens;
 
@@ -63,12 +64,11 @@ class EmulativeTest extends LexerTest
         $lexer = $this->getLexer();
         $lexer->startLexing('<?php ' . $code);
 
-        foreach ($expectedTokens as $expectedToken) {
-            list($expectedTokenType, $expectedTokenText) = $expectedToken;
-            $this->assertSame($expectedTokenType, $lexer->getNextToken($text));
-            $this->assertSame($expectedTokenText, $text);
+        $tokens = [];
+        while (0 !== $token = $lexer->getNextToken($text)) {
+            $tokens[] = [$token, $text];
         }
-        $this->assertSame(0, $lexer->getNextToken());
+        $this->assertSame($expectedTokens, $tokens);
     }
 
     /**
@@ -85,6 +85,29 @@ class EmulativeTest extends LexerTest
         $this->assertSame(0, $lexer->getNextToken());
     }
 
+    /**
+     * @dataProvider provideTestLexNewFeatures
+     */
+    public function testErrorAfterEmulation($code) {
+        $errorHandler = new ErrorHandler\Collecting;
+        $lexer = $this->getLexer([]);
+        $lexer->startLexing('<?php ' . $code . "\0", $errorHandler);
+
+        $errors = $errorHandler->getErrors();
+        $this->assertCount(1, $errors);
+
+        $error = $errors[0];
+        $this->assertSame('Unexpected null byte', $error->getRawMessage());
+
+        $attrs = $error->getAttributes();
+        $expPos = strlen('<?php ' . $code);
+        $expLine = 1 + substr_count('<?php ' . $code, "\n");
+        $this->assertSame($expPos, $attrs['startFilePos']);
+        $this->assertSame($expPos, $attrs['endFilePos']);
+        $this->assertSame($expLine, $attrs['startLine']);
+        $this->assertSame($expLine, $attrs['endLine']);
+    }
+
     public function provideTestLexNewFeatures() {
         return [
             ['yield from', [
@@ -128,6 +151,43 @@ class EmulativeTest extends LexerTest
                 [Tokens::T_END_HEREDOC, 'NOWDOC'],
                 [ord(';'), ';'],
             ]],
+
+            // Flexible heredoc/nowdoc
+            ["<<<LABEL\nLABEL,", [
+                [Tokens::T_START_HEREDOC, "<<<LABEL\n"],
+                [Tokens::T_END_HEREDOC, "LABEL"],
+                [ord(','), ','],
+            ]],
+            ["<<<LABEL\n    LABEL,", [
+                [Tokens::T_START_HEREDOC, "<<<LABEL\n"],
+                [Tokens::T_END_HEREDOC, "    LABEL"],
+                [ord(','), ','],
+            ]],
+            ["<<<LABEL\n    Foo\n  LABEL;", [
+                [Tokens::T_START_HEREDOC, "<<<LABEL\n"],
+                [Tokens::T_ENCAPSED_AND_WHITESPACE, "    Foo\n"],
+                [Tokens::T_END_HEREDOC, "  LABEL"],
+                [ord(';'), ';'],
+            ]],
+            ["<<<A\n A,<<<A\n A,", [
+                [Tokens::T_START_HEREDOC, "<<<A\n"],
+                [Tokens::T_END_HEREDOC, " A"],
+                [ord(','), ','],
+                [Tokens::T_START_HEREDOC, "<<<A\n"],
+                [Tokens::T_END_HEREDOC, " A"],
+                [ord(','), ','],
+            ]],
+            ["<<<LABEL\nLABELNOPE\nLABEL\n", [
+                [Tokens::T_START_HEREDOC, "<<<LABEL\n"],
+                [Tokens::T_ENCAPSED_AND_WHITESPACE, "LABELNOPE\n"],
+                [Tokens::T_END_HEREDOC, "LABEL"],
+            ]],
+            // Interpretation changed
+            ["<<<LABEL\n    LABEL\nLABEL\n", [
+                [Tokens::T_START_HEREDOC, "<<<LABEL\n"],
+                [Tokens::T_END_HEREDOC, "    LABEL"],
+                [Tokens::T_STRING, "LABEL"],
+            ]],
         ];
     }
 }
diff --git a/vendor/nikic/php-parser/test/PhpParser/LexerTest.php b/vendor/nikic/php-parser/test/PhpParser/LexerTest.php
index c34cc71e..99ed68a3 100644
--- a/vendor/nikic/php-parser/test/PhpParser/LexerTest.php
+++ b/vendor/nikic/php-parser/test/PhpParser/LexerTest.php
@@ -235,11 +235,9 @@ class LexerTest extends TestCase
         ];
     }
 
-    /**
-     * @expectedException \PhpParser\Error
-     * @expectedExceptionMessage __HALT_COMPILER must be followed by "();"
-     */
     public function testHandleHaltCompilerError() {
+        $this->expectException(Error::class);
+        $this->expectExceptionMessage('__HALT_COMPILER must be followed by "();"');
         $lexer = $this->getLexer();
         $lexer->startLexing('<?php ... __halt_compiler invalid ();');
 
diff --git a/vendor/nikic/php-parser/test/PhpParser/Node/NameTest.php b/vendor/nikic/php-parser/test/PhpParser/Node/NameTest.php
index 8fe9ed63..bf7d7967 100644
--- a/vendor/nikic/php-parser/test/PhpParser/Node/NameTest.php
+++ b/vendor/nikic/php-parser/test/PhpParser/Node/NameTest.php
@@ -51,35 +51,27 @@ class NameTest extends TestCase
         $this->assertNull($name->slice(-2, -2));
     }
 
-    /**
-     * @expectedException \OutOfBoundsException
-     * @expectedExceptionMessage Offset 4 is out of bounds
-     */
     public function testSliceOffsetTooLarge() {
+        $this->expectException(\OutOfBoundsException::class);
+        $this->expectExceptionMessage('Offset 4 is out of bounds');
         (new Name('foo\bar\baz'))->slice(4);
     }
 
-    /**
-     * @expectedException \OutOfBoundsException
-     * @expectedExceptionMessage Offset -4 is out of bounds
-     */
     public function testSliceOffsetTooSmall() {
+        $this->expectException(\OutOfBoundsException::class);
+        $this->expectExceptionMessage('Offset -4 is out of bounds');
         (new Name('foo\bar\baz'))->slice(-4);
     }
 
-    /**
-     * @expectedException \OutOfBoundsException
-     * @expectedExceptionMessage Length 4 is out of bounds
-     */
     public function testSliceLengthTooLarge() {
+        $this->expectException(\OutOfBoundsException::class);
+        $this->expectExceptionMessage('Length 4 is out of bounds');
         (new Name('foo\bar\baz'))->slice(0, 4);
     }
 
-    /**
-     * @expectedException \OutOfBoundsException
-     * @expectedExceptionMessage Length -4 is out of bounds
-     */
     public function testSliceLengthTooSmall() {
+        $this->expectException(\OutOfBoundsException::class);
+        $this->expectExceptionMessage('Length -4 is out of bounds');
         (new Name('foo\bar\baz'))->slice(0, -4);
     }
 
@@ -131,27 +123,21 @@ class NameTest extends TestCase
         $this->assertSame('namespace\foo', $name->toCodeString());
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Expected string, array of parts or Name instance
-     */
     public function testInvalidArg() {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Expected string, array of parts or Name instance');
         Name::concat('foo', new \stdClass);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Name cannot be empty
-     */
     public function testInvalidEmptyString() {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Name cannot be empty');
         new Name('');
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Name cannot be empty
-     */
     public function testInvalidEmptyArray() {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Name cannot be empty');
         new Name([]);
     }
 
diff --git a/vendor/nikic/php-parser/test/PhpParser/NodeDumperTest.php b/vendor/nikic/php-parser/test/PhpParser/NodeDumperTest.php
index 64d53117..9f887a7d 100644
--- a/vendor/nikic/php-parser/test/PhpParser/NodeDumperTest.php
+++ b/vendor/nikic/php-parser/test/PhpParser/NodeDumperTest.php
@@ -98,11 +98,9 @@ OUT;
         $this->assertSame($this->canonicalize($expected), $this->canonicalize($dump));
     }
 
-    /**
-     * @expectedException        \InvalidArgumentException
-     * @expectedExceptionMessage Can only dump nodes and arrays.
-     */
     public function testError() {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Can only dump nodes and arrays.');
         $dumper = new NodeDumper;
         $dumper->dump(new \stdClass);
     }
diff --git a/vendor/nikic/php-parser/test/PhpParser/NodeTraverserTest.php b/vendor/nikic/php-parser/test/PhpParser/NodeTraverserTest.php
index 61c8e25b..4818457a 100644
--- a/vendor/nikic/php-parser/test/PhpParser/NodeTraverserTest.php
+++ b/vendor/nikic/php-parser/test/PhpParser/NodeTraverserTest.php
@@ -117,11 +117,9 @@ class NodeTraverserTest extends TestCase
         );
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Invalid node structure: Contains nested arrays
-     */
     public function testInvalidDeepArray() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Invalid node structure: Contains nested arrays');
         $strNode = new String_('Foo');
         $stmts = [[[$strNode]]];
 
@@ -167,6 +165,42 @@ class NodeTraverserTest extends TestCase
         $this->assertEquals($stmts, $traverser->traverse($stmts));
     }
 
+    public function testDontTraverseCurrentAndChildren() {
+        // print 'str'; -($foo * $foo);
+        $strNode = new String_('str');
+        $printNode = new Expr\Print_($strNode);
+        $varNode = new Expr\Variable('foo');
+        $mulNode = new Expr\BinaryOp\Mul($varNode, $varNode);
+        $divNode = new Expr\BinaryOp\Div($varNode, $varNode);
+        $negNode = new Expr\UnaryMinus($mulNode);
+        $stmts = [$printNode, $negNode];
+
+        $visitor1 = $this->getMockBuilder(NodeVisitor::class)->getMock();
+        $visitor2 = $this->getMockBuilder(NodeVisitor::class)->getMock();
+
+        $visitor1->expects($this->at(1))->method('enterNode')->with($printNode)
+            ->will($this->returnValue(NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN));
+        $visitor1->expects($this->at(2))->method('leaveNode')->with($printNode);
+
+        $visitor1->expects($this->at(3))->method('enterNode')->with($negNode);
+        $visitor2->expects($this->at(1))->method('enterNode')->with($negNode);
+
+        $visitor1->expects($this->at(4))->method('enterNode')->with($mulNode)
+            ->will($this->returnValue(NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN));
+        $visitor1->expects($this->at(5))->method('leaveNode')->with($mulNode)->willReturn($divNode);
+
+        $visitor1->expects($this->at(6))->method('leaveNode')->with($negNode);
+        $visitor2->expects($this->at(2))->method('leaveNode')->with($negNode);
+
+        $traverser = new NodeTraverser;
+        $traverser->addVisitor($visitor1);
+        $traverser->addVisitor($visitor2);
+
+        $resultStmts = $traverser->traverse($stmts);
+
+        $this->assertInstanceOf(Expr\BinaryOp\Div::class, $resultStmts[1]->expr);
+    }
+
     public function testStopTraversal() {
         $varNode1 = new Expr\Variable('a');
         $varNode2 = new Expr\Variable('b');
diff --git a/vendor/nikic/php-parser/test/PhpParser/ParserTest.php b/vendor/nikic/php-parser/test/PhpParser/ParserTest.php
index 9c4412dc..d31ac6ef 100644
--- a/vendor/nikic/php-parser/test/PhpParser/ParserTest.php
+++ b/vendor/nikic/php-parser/test/PhpParser/ParserTest.php
@@ -13,29 +13,23 @@ abstract class ParserTest extends TestCase
     /** @returns Parser */
     abstract protected function getParser(Lexer $lexer);
 
-    /**
-     * @expectedException \PhpParser\Error
-     * @expectedExceptionMessage Syntax error, unexpected EOF on line 1
-     */
     public function testParserThrowsSyntaxError() {
+        $this->expectException(Error::class);
+        $this->expectExceptionMessage('Syntax error, unexpected EOF on line 1');
         $parser = $this->getParser(new Lexer());
         $parser->parse('<?php foo');
     }
 
-    /**
-     * @expectedException \PhpParser\Error
-     * @expectedExceptionMessage Cannot use foo as self because 'self' is a special class name on line 1
-     */
     public function testParserThrowsSpecialError() {
+        $this->expectException(Error::class);
+        $this->expectExceptionMessage('Cannot use foo as self because \'self\' is a special class name on line 1');
         $parser = $this->getParser(new Lexer());
         $parser->parse('<?php use foo as self;');
     }
 
-    /**
-     * @expectedException \PhpParser\Error
-     * @expectedExceptionMessage Unterminated comment on line 1
-     */
     public function testParserThrowsLexerError() {
+        $this->expectException(Error::class);
+        $this->expectExceptionMessage('Unterminated comment on line 1');
         $parser = $this->getParser(new Lexer());
         $parser->parse('<?php /*');
     }
@@ -109,11 +103,9 @@ EOC;
         ], $var->getAttributes());
     }
 
-    /**
-     * @expectedException \RangeException
-     * @expectedExceptionMessage The lexer returned an invalid token (id=999, value=foobar)
-     */
     public function testInvalidToken() {
+        $this->expectException(\RangeException::class);
+        $this->expectExceptionMessage('The lexer returned an invalid token (id=999, value=foobar)');
         $lexer = new InvalidTokenLexer;
         $parser = $this->getParser($lexer);
         $parser->parse('dummy');
@@ -123,7 +115,7 @@ EOC;
      * @dataProvider provideTestExtraAttributes
      */
     public function testExtraAttributes($code, $expectedAttributes) {
-        $parser = $this->getParser(new Lexer);
+        $parser = $this->getParser(new Lexer\Emulative);
         $stmts = $parser->parse("<?php $code;");
         $node = $stmts[0] instanceof Stmt\Expression ? $stmts[0]->expr : $stmts[0];
         $attributes = $node->getAttributes();
@@ -152,17 +144,20 @@ EOC;
             ['"foo$bar"', ['kind' => String_::KIND_DOUBLE_QUOTED]],
             ['b"foo$bar"', ['kind' => String_::KIND_DOUBLE_QUOTED]],
             ['B"foo$bar"', ['kind' => String_::KIND_DOUBLE_QUOTED]],
-            ["<<<'STR'\nSTR\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'STR']],
-            ["<<<STR\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR']],
-            ["<<<\"STR\"\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR']],
-            ["b<<<'STR'\nSTR\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'STR']],
-            ["B<<<'STR'\nSTR\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'STR']],
-            ["<<< \t 'STR'\nSTR\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'STR']],
-            ["<<<'\xff'\n\xff\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => "\xff"]],
-            ["<<<\"STR\"\n\$a\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR']],
-            ["b<<<\"STR\"\n\$a\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR']],
-            ["B<<<\"STR\"\n\$a\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR']],
-            ["<<< \t \"STR\"\n\$a\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR']],
+            ["<<<'STR'\nSTR\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'STR', 'docIndentation' => '']],
+            ["<<<STR\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR', 'docIndentation' => '']],
+            ["<<<\"STR\"\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR', 'docIndentation' => '']],
+            ["b<<<'STR'\nSTR\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'STR', 'docIndentation' => '']],
+            ["B<<<'STR'\nSTR\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'STR', 'docIndentation' => '']],
+            ["<<< \t 'STR'\nSTR\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'STR', 'docIndentation' => '']],
+            ["<<<'\xff'\n\xff\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => "\xff", 'docIndentation' => '']],
+            ["<<<\"STR\"\n\$a\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR', 'docIndentation' => '']],
+            ["b<<<\"STR\"\n\$a\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR', 'docIndentation' => '']],
+            ["B<<<\"STR\"\n\$a\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR', 'docIndentation' => '']],
+            ["<<< \t \"STR\"\n\$a\nSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR', 'docIndentation' => '']],
+            ["<<<STR\n    STR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR', 'docIndentation' => '    ']],
+            ["<<<STR\n\tSTR\n", ['kind' => String_::KIND_HEREDOC, 'docLabel' => 'STR', 'docIndentation' => "\t"]],
+            ["<<<'STR'\n    Foo\n  STR\n", ['kind' => String_::KIND_NOWDOC, 'docLabel' => 'STR', 'docIndentation' => '  ']],
             ["die", ['kind' => Expr\Exit_::KIND_DIE]],
             ["die('done')", ['kind' => Expr\Exit_::KIND_DIE]],
             ["exit", ['kind' => Expr\Exit_::KIND_EXIT]],
diff --git a/vendor/nikic/php-parser/test/PhpParser/PrettyPrinterTest.php b/vendor/nikic/php-parser/test/PhpParser/PrettyPrinterTest.php
index b1555719..d3c3f08a 100644
--- a/vendor/nikic/php-parser/test/PhpParser/PrettyPrinterTest.php
+++ b/vendor/nikic/php-parser/test/PhpParser/PrettyPrinterTest.php
@@ -184,11 +184,9 @@ class PrettyPrinterTest extends CodeTestAbstract
         ];
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Cannot pretty-print AST with Error nodes
-     */
     public function testPrettyPrintWithError() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Cannot pretty-print AST with Error nodes');
         $stmts = [new Stmt\Expression(
             new Expr\PropertyFetch(new Expr\Variable('a'), new Expr\Error())
         )];
@@ -196,11 +194,9 @@ class PrettyPrinterTest extends CodeTestAbstract
         $prettyPrinter->prettyPrint($stmts);
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Cannot pretty-print AST with Error nodes
-     */
     public function testPrettyPrintWithErrorInClassConstFetch() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Cannot pretty-print AST with Error nodes');
         $stmts = [new Stmt\Expression(
             new Expr\ClassConstFetch(new Name('Foo'), new Expr\Error())
         )];
@@ -208,11 +204,9 @@ class PrettyPrinterTest extends CodeTestAbstract
         $prettyPrinter->prettyPrint($stmts);
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Cannot directly print EncapsedStringPart
-     */
     public function testPrettyPrintEncapsedStringPart() {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Cannot directly print EncapsedStringPart');
         $expr = new Node\Scalar\EncapsedStringPart('foo');
         $prettyPrinter = new PrettyPrinter\Standard;
         $prettyPrinter->prettyPrintExpr($expr);
diff --git a/vendor/nikic/php-parser/test/code/formatPreservation/nopCommentAtEnd.test b/vendor/nikic/php-parser/test/code/formatPreservation/nopCommentAtEnd.test
new file mode 100644
index 00000000..059b5f11
--- /dev/null
+++ b/vendor/nikic/php-parser/test/code/formatPreservation/nopCommentAtEnd.test
@@ -0,0 +1,11 @@
+Nop statement with comment at end (#513)
+-----
+<?php
+$foo;
+$bar;
+-----
+$stmts[1] = new Stmt\Nop(['comments' => [new Comment('//Some comment here')]]);
+-----
+<?php
+$foo;
+//Some comment here
\ No newline at end of file
diff --git a/vendor/nikic/php-parser/test/code/parser/commentAtEndOfClass.test b/vendor/nikic/php-parser/test/code/parser/commentAtEndOfClass.test
new file mode 100644
index 00000000..389df2be
--- /dev/null
+++ b/vendor/nikic/php-parser/test/code/parser/commentAtEndOfClass.test
@@ -0,0 +1,37 @@
+Comment at end of class (#509)
+-----
+<?php
+class MyClass {
+    protected $a;
+    // my comment
+}
+-----
+array(
+    0: Stmt_Class(
+        flags: 0
+        name: Identifier(
+            name: MyClass
+        )
+        extends: null
+        implements: array(
+        )
+        stmts: array(
+            0: Stmt_Property(
+                flags: MODIFIER_PROTECTED (2)
+                props: array(
+                    0: Stmt_PropertyProperty(
+                        name: VarLikeIdentifier(
+                            name: a
+                        )
+                        default: null
+                    )
+                )
+            )
+            1: Stmt_Nop(
+                comments: array(
+                    0: // my comment
+                )
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/vendor/nikic/php-parser/test/code/parser/errorHandling/recovery.test b/vendor/nikic/php-parser/test/code/parser/errorHandling/recovery.test
index 1f2a06bf..67c0ffee 100644
--- a/vendor/nikic/php-parser/test/code/parser/errorHandling/recovery.test
+++ b/vendor/nikic/php-parser/test/code/parser/errorHandling/recovery.test
@@ -1266,4 +1266,111 @@ array(
             )
         )
     )
+)
+-----
+<?php
+$array = [
+    $this->value $oopsAnotherValue->get()
+];
+$array = [
+    $value $oopsAnotherValue
+];
+$array = [
+    'key' => $value $oopsAnotherValue
+];
+-----
+!!php7
+Syntax error, unexpected T_VARIABLE, expecting ',' or ')' or ']' from 3:18 to 3:34
+Syntax error, unexpected T_VARIABLE, expecting ',' or ')' or ']' from 6:12 to 6:28
+Syntax error, unexpected T_VARIABLE, expecting ',' or ')' or ']' from 9:21 to 9:37
+array(
+    0: Stmt_Expression(
+        expr: Expr_Assign(
+            var: Expr_Variable(
+                name: array
+            )
+            expr: Expr_Array(
+                items: array(
+                    0: Expr_ArrayItem(
+                        key: null
+                        value: Expr_PropertyFetch(
+                            var: Expr_Variable(
+                                name: this
+                            )
+                            name: Identifier(
+                                name: value
+                            )
+                        )
+                        byRef: false
+                    )
+                    1: Expr_ArrayItem(
+                        key: null
+                        value: Expr_MethodCall(
+                            var: Expr_Variable(
+                                name: oopsAnotherValue
+                            )
+                            name: Identifier(
+                                name: get
+                            )
+                            args: array(
+                            )
+                        )
+                        byRef: false
+                    )
+                )
+            )
+        )
+    )
+    1: Stmt_Expression(
+        expr: Expr_Assign(
+            var: Expr_Variable(
+                name: array
+            )
+            expr: Expr_Array(
+                items: array(
+                    0: Expr_ArrayItem(
+                        key: null
+                        value: Expr_Variable(
+                            name: value
+                        )
+                        byRef: false
+                    )
+                    1: Expr_ArrayItem(
+                        key: null
+                        value: Expr_Variable(
+                            name: oopsAnotherValue
+                        )
+                        byRef: false
+                    )
+                )
+            )
+        )
+    )
+    2: Stmt_Expression(
+        expr: Expr_Assign(
+            var: Expr_Variable(
+                name: array
+            )
+            expr: Expr_Array(
+                items: array(
+                    0: Expr_ArrayItem(
+                        key: Scalar_String(
+                            value: key
+                        )
+                        value: Expr_Variable(
+                            name: value
+                        )
+                        byRef: false
+                    )
+                    1: Expr_ArrayItem(
+                        key: null
+                        value: Expr_Variable(
+                            name: oopsAnotherValue
+                        )
+                        byRef: false
+                    )
+                )
+            )
+        )
+    )
 )
\ No newline at end of file
diff --git a/vendor/nikic/php-parser/test/code/parser/scalar/flexibleDocString.test b/vendor/nikic/php-parser/test/code/parser/scalar/flexibleDocString.test
new file mode 100644
index 00000000..4460912c
--- /dev/null
+++ b/vendor/nikic/php-parser/test/code/parser/scalar/flexibleDocString.test
@@ -0,0 +1,359 @@
+Flexible heredoc/nowdoc (PHP 7.3)
+-----
+<?php
+
+$ary = [
+    <<<FOO
+Test
+FOO,
+    <<<'BAR'
+    Test
+    BAR,
+];
+
+<<<'END'
+ END;
+
+<<<END
+
+  END;
+
+<<<END
+@@{ " " }@@
+  END;
+
+<<<'END'
+     a
+    b
+
+   c
+
+  d
+ e
+ END;
+
+<<<END
+	    a
+	   b
+	  $test
+	 d
+	e
+	END;
+
+<<<'END'
+
+    a
+
+   b
+
+  c
+
+ d
+
+e
+
+END;
+
+<<<END
+	a\r\n
+\ta\n
+   b\r\n
+  $test\n
+ d\r\n
+e\n
+END;
+
+<<<BAR
+ $one-
+ BAR;
+
+<<<BAR
+ $two -
+ BAR;
+
+<<<BAR
+ $three	-
+ BAR;
+
+<<<BAR
+ $four-$four
+ BAR;
+
+<<<BAR
+ $five-$five-
+ BAR;
+
+<<<BAR
+ $six-$six-$six
+ BAR;
+
+<<<BAR
+ $seven
+ -
+ BAR;
+
+<<<BAR
+ $eight
+  -
+ BAR;
+
+<<<BAR
+$nine
+BAR;
+
+<<<BAR
+ -
+ BAR;
+
+<<<BAR
+  -
+ BAR;
+-----
+array(
+    0: Stmt_Expression(
+        expr: Expr_Assign(
+            var: Expr_Variable(
+                name: ary
+            )
+            expr: Expr_Array(
+                items: array(
+                    0: Expr_ArrayItem(
+                        key: null
+                        value: Scalar_String(
+                            value: Test
+                        )
+                        byRef: false
+                    )
+                    1: Expr_ArrayItem(
+                        key: null
+                        value: Scalar_String(
+                            value: Test
+                        )
+                        byRef: false
+                    )
+                )
+            )
+        )
+    )
+    1: Stmt_Expression(
+        expr: Scalar_String(
+            value:
+        )
+    )
+    2: Stmt_Expression(
+        expr: Scalar_String(
+            value:
+        )
+    )
+    3: Stmt_Expression(
+        expr: Scalar_String(
+            value:
+        )
+    )
+    4: Stmt_Expression(
+        expr: Scalar_String(
+            value:     a
+           b
+
+          c
+
+         d
+        e
+        )
+    )
+    5: Stmt_Expression(
+        expr: Scalar_Encapsed(
+            parts: array(
+                0: Scalar_EncapsedStringPart(
+                    value:     a
+                   b
+
+                )
+                1: Expr_Variable(
+                    name: test
+                )
+                2: Scalar_EncapsedStringPart(
+                    value:
+                 d
+                e
+                )
+            )
+        )
+    )
+    6: Stmt_Expression(
+        expr: Scalar_String(
+            value:
+            a
+
+           b
+
+          c
+
+         d
+
+        e
+
+        )
+    )
+    7: Stmt_Expression(
+        expr: Scalar_Encapsed(
+            parts: array(
+                0: Scalar_EncapsedStringPart(
+                    value: 	a
+
+                @@{ "\t" }@@a
+
+                   b
+
+
+                )
+                1: Expr_Variable(
+                    name: test
+                )
+                2: Scalar_EncapsedStringPart(
+                    value:
+
+                 d
+
+                e
+
+                )
+            )
+        )
+    )
+    8: Stmt_Expression(
+        expr: Scalar_Encapsed(
+            parts: array(
+                0: Expr_Variable(
+                    name: one
+                )
+                1: Scalar_EncapsedStringPart(
+                    value: -
+                )
+            )
+        )
+    )
+    9: Stmt_Expression(
+        expr: Scalar_Encapsed(
+            parts: array(
+                0: Expr_Variable(
+                    name: two
+                )
+                1: Scalar_EncapsedStringPart(
+                    value:  -
+                )
+            )
+        )
+    )
+    10: Stmt_Expression(
+        expr: Scalar_Encapsed(
+            parts: array(
+                0: Expr_Variable(
+                    name: three
+                )
+                1: Scalar_EncapsedStringPart(
+                    value: 	-
+                )
+            )
+        )
+    )
+    11: Stmt_Expression(
+        expr: Scalar_Encapsed(
+            parts: array(
+                0: Expr_Variable(
+                    name: four
+                )
+                1: Scalar_EncapsedStringPart(
+                    value: -
+                )
+                2: Expr_Variable(
+                    name: four
+                )
+            )
+        )
+    )
+    12: Stmt_Expression(
+        expr: Scalar_Encapsed(
+            parts: array(
+                0: Expr_Variable(
+                    name: five
+                )
+                1: Scalar_EncapsedStringPart(
+                    value: -
+                )
+                2: Expr_Variable(
+                    name: five
+                )
+                3: Scalar_EncapsedStringPart(
+                    value: -
+                )
+            )
+        )
+    )
+    13: Stmt_Expression(
+        expr: Scalar_Encapsed(
+            parts: array(
+                0: Expr_Variable(
+                    name: six
+                )
+                1: Scalar_EncapsedStringPart(
+                    value: -
+                )
+                2: Expr_Variable(
+                    name: six
+                )
+                3: Scalar_EncapsedStringPart(
+                    value: -
+                )
+                4: Expr_Variable(
+                    name: six
+                )
+            )
+        )
+    )
+    14: Stmt_Expression(
+        expr: Scalar_Encapsed(
+            parts: array(
+                0: Expr_Variable(
+                    name: seven
+                )
+                1: Scalar_EncapsedStringPart(
+                    value:
+                -
+                )
+            )
+        )
+    )
+    15: Stmt_Expression(
+        expr: Scalar_Encapsed(
+            parts: array(
+                0: Expr_Variable(
+                    name: eight
+                )
+                1: Scalar_EncapsedStringPart(
+                    value:
+                 -
+                )
+            )
+        )
+    )
+    16: Stmt_Expression(
+        expr: Scalar_Encapsed(
+            parts: array(
+                0: Expr_Variable(
+                    name: nine
+                )
+            )
+        )
+    )
+    17: Stmt_Expression(
+        expr: Scalar_String(
+            value: -
+        )
+    )
+    18: Stmt_Expression(
+        expr: Scalar_String(
+            value:  -
+        )
+    )
+)
\ No newline at end of file
diff --git a/vendor/nikic/php-parser/test/code/parser/scalar/flexibleDocStringErrors.test b/vendor/nikic/php-parser/test/code/parser/scalar/flexibleDocStringErrors.test
new file mode 100644
index 00000000..25b7484b
--- /dev/null
+++ b/vendor/nikic/php-parser/test/code/parser/scalar/flexibleDocStringErrors.test
@@ -0,0 +1,117 @@
+Error conditions for flexible doc strings
+-----
+<?php
+
+<<<A
+ @@{ "\t" }@@A;
+
+<<<A
+    FooBar
+ @@{ "\t" }@@A;
+
+echo <<<END
+@@{ "\t" }@@   X
+@@{ "\t\t" }@@END;
+
+echo <<<END
+      a
+     b
+    c
+     END;
+
+<<<END
+\ta
+@@{ "\t" }@@END;
+
+<<<TEST
+  Foo
+$var
+  TEST;
+
+<<<TEST
+$var
+ TEST;
+
+echo <<<END
+ a
+$a
+ END;
+-----
+Invalid indentation - tabs and spaces cannot be mixed from 4:1 to 4:3
+Invalid indentation - tabs and spaces cannot be mixed from 8:1 to 8:3
+Invalid indentation - tabs and spaces cannot be mixed from 10:6 to 12:5
+Invalid body indentation level (expecting an indentation level of at least 5) from 14:6 to 18:8
+Invalid body indentation level (expecting an indentation level of at least 1) from 20:1 to 22:4
+Invalid body indentation level (expecting an indentation level of at least 2) from 25:1 to 26:0
+Invalid body indentation level (expecting an indentation level of at least 1) from 30:1 to 30:4
+Invalid body indentation level (expecting an indentation level of at least 1) from 34:1 to 35:0
+array(
+    0: Stmt_Expression(
+        expr: Scalar_String(
+            value:
+        )
+    )
+    1: Stmt_Expression(
+        expr: Scalar_String(
+            value:     FooBar
+        )
+    )
+    2: Stmt_Echo(
+        exprs: array(
+            0: Scalar_String(
+                value:   X
+            )
+        )
+    )
+    3: Stmt_Echo(
+        exprs: array(
+            0: Scalar_String(
+                value:  a
+            b
+            c
+            )
+        )
+    )
+    4: Stmt_Expression(
+        expr: Scalar_String(
+            value: 	a
+        )
+    )
+    5: Stmt_Expression(
+        expr: Scalar_Encapsed(
+            parts: array(
+                0: Scalar_EncapsedStringPart(
+                    value: Foo
+
+                )
+                1: Expr_Variable(
+                    name: var
+                )
+            )
+        )
+    )
+    6: Stmt_Expression(
+        expr: Scalar_Encapsed(
+            parts: array(
+                0: Expr_Variable(
+                    name: var
+                )
+            )
+        )
+    )
+    7: Stmt_Echo(
+        exprs: array(
+            0: Scalar_Encapsed(
+                parts: array(
+                    0: Scalar_EncapsedStringPart(
+                        value: a
+
+                    )
+                    1: Expr_Variable(
+                        name: a
+                    )
+                )
+            )
+        )
+    )
+)
\ No newline at end of file
diff --git a/vendor/nikic/php-parser/test/code/parser/semiReserved.test b/vendor/nikic/php-parser/test/code/parser/semiReserved.test
index da155e64..7446a875 100644
--- a/vendor/nikic/php-parser/test/code/parser/semiReserved.test
+++ b/vendor/nikic/php-parser/test/code/parser/semiReserved.test
@@ -222,6 +222,11 @@ array(
                     )
                 )
             )
+            8: Stmt_Nop(
+                comments: array(
+                    0: // __halt_compiler does not work
+                )
+            )
         )
     )
     1: Stmt_Expression(
diff --git a/vendor/nikic/php-parser/test/updateTests.php b/vendor/nikic/php-parser/test/updateTests.php
index d4de79c1..40d0d0a9 100644
--- a/vendor/nikic/php-parser/test/updateTests.php
+++ b/vendor/nikic/php-parser/test/updateTests.php
@@ -21,7 +21,7 @@ foreach (filesInDir($dir, 'test') as $fileName => $code) {
     foreach ($tests as list($modeLine, list($input, $expected))) {
         $modes = null !== $modeLine ? array_fill_keys(explode(',', $modeLine), true) : [];
         list($parser5, $parser7) = $codeParsingTest->createParsers($modes);
-        $output = isset($modes['php5'])
+        list(, $output) = isset($modes['php5'])
             ? $codeParsingTest->getParseOutput($parser5, $input, $modes)
             : $codeParsingTest->getParseOutput($parser7, $input, $modes);
         $newTests[] = [$modeLine, [$input, $output]];
diff --git a/vendor/nikic/php-parser/test_old/run-php-src.sh b/vendor/nikic/php-parser/test_old/run-php-src.sh
index 0d37f851..944cfffa 100755
--- a/vendor/nikic/php-parser/test_old/run-php-src.sh
+++ b/vendor/nikic/php-parser/test_old/run-php-src.sh
@@ -1,4 +1,4 @@
-wget -q https://github.com/php/php-src/archive/php-7.1.0.tar.gz
+wget -q https://github.com/php/php-src/archive/php-7.3.0RC1.tar.gz
 mkdir -p ./data/php-src
-tar -xzf ./php-7.1.0.tar.gz -C ./data/php-src --strip-components=1
+tar -xzf ./php-7.3.0RC1.tar.gz -C ./data/php-src --strip-components=1
 php -n test_old/run.php --verbose --no-progress PHP7 ./data/php-src
diff --git a/vendor/nikic/php-parser/test_old/run.php b/vendor/nikic/php-parser/test_old/run.php
index 2d7cdacc..8b74ab47 100644
--- a/vendor/nikic/php-parser/test_old/run.php
+++ b/vendor/nikic/php-parser/test_old/run.php
@@ -59,9 +59,24 @@ $dir = $arguments[1];
 
 switch ($testType) {
     case 'Symfony':
-        $version = 'Php5';
+        $version = 'Php7';
         $fileFilter = function($path) {
-            return preg_match('~\.php(?:\.cache)?$~', $path) && false === strpos($path, 'skeleton');
+            if (!preg_match('~\.php$~', $path)) {
+                return false;
+            }
+
+            if (preg_match('~(?:
+# invalid php code
+  dependency-injection.Tests.Fixtures.xml.xml_with_wrong_ext
+# difference in nop statement
+| framework-bundle.Resources.views.Form.choice_widget_options\.html
+# difference due to INF
+| yaml.Tests.InlineTest
+)\.php$~x', $path)) {
+                return false;
+            }
+
+            return true;
         };
         $codeExtractor = function($file, $code) {
             return $code;
@@ -77,26 +92,31 @@ switch ($testType) {
             if (preg_match('~(?:
 # skeleton files
   ext.gmp.tests.001
-| ext.skeleton.tests.001
+| ext.skeleton.tests.00\d
 # multibyte encoded files
 | ext.mbstring.tests.zend_multibyte-01
 | Zend.tests.multibyte.multibyte_encoding_001
 | Zend.tests.multibyte.multibyte_encoding_004
 | Zend.tests.multibyte.multibyte_encoding_005
+# invalid code due to missing WS after opening tag
+| tests.run-test.bug75042-3
 # pretty print difference due to INF vs 1e1000
 | ext.standard.tests.general_functions.bug27678
 | tests.lang.bug24640
+| Zend.tests.bug74947
 # pretty print differences due to negative LNumbers
 | Zend.tests.neg_num_string
 | Zend.tests.bug72918
 # pretty print difference due to nop statements
 | ext.mbstring.tests.htmlent
 | ext.standard.tests.file.fread_basic
+# its too hard to emulate these on old PHP versions
+| Zend.tests.flexible-heredoc-complex-test[1-4]
 )\.phpt$~x', $file)) {
                 return null;
             }
 
-            if (!preg_match('~--FILE--\s*(.*?)--[A-Z]+--~s', $code, $matches)) {
+            if (!preg_match('~--FILE--\s*(.*?)\n--[A-Z]+--~s', $code, $matches)) {
                 return null;
             }
             if (preg_match('~--EXPECT(?:F|REGEX)?--\s*(?:Parse|Fatal) error~', $code)) {
diff --git a/vendor/opis/closure/CHANGELOG.md b/vendor/opis/closure/CHANGELOG.md
new file mode 100644
index 00000000..e5f32cd7
--- /dev/null
+++ b/vendor/opis/closure/CHANGELOG.md
@@ -0,0 +1,153 @@
+CHANGELOG
+---------
+
+### v3.1.1, 2018.10.02
+
+* Fixed a bug where `parent` keyword was treated like a class-name and scope was not added to the
+serialized closure
+* Fixed a bug where return type was not properly handled for nested closures
+* Support for anonymous classes was improved
+
+### v3.1.0, 2018.09.20
+
+* Added `transformUseVariables` and `resolveUseVariables` to
+`Opis\Closure\SerializableClosure` class.
+* Added `removeSecurityProvider` static method to 
+`Opis\Closure\SerializableClosure` class. 
+* Fixed some security related issues where a user was able to unserialize an unsigned
+closure, even when a security provider was in use.
+
+### v3.0.12, 2018.02.23
+
+* Bugfix. See [issue 20](https://github.com/opis/closure/issues/20)
+
+### v3.0.11, 2018.01.22
+
+* Bugfix. See [issue 18](https://github.com/opis/closure/issues/18)
+
+### v3.0.10, 2018.01.04
+
+* Improved support for PHP 7.1 & 7.2
+
+### v3.0.9, 2018.01.04
+
+* Fixed a bug where the return type was not properly resolved. 
+See [issue 17](https://github.com/opis/closure/issues/17)
+* Added more tests
+
+### v3.0.8, 2017.12.18
+
+* Fixed a bug. See [issue 16](https://github.com/opis/closure/issues/16)
+
+### v3.0.7, 2017.10.31
+
+* Bugfix: static properties are ignored now, since they are not serializable
+
+### v3.0.6, 2017.10.06
+
+* Fixed a bug introduced by accident in 3.0.5
+
+### v3.0.5, 2017.09.18
+
+* Fixed a bug related to nested references
+
+### v3.0.4, 2017.09.18
+
+* \[*internal*\] Refactored `SerializableClosure::mapPointers` method
+* \[*internal*\] Added a new optional argument to `SerializableClosure::unwrapClosures`
+* \[*internal*\] Removed `SerializableClosure::getClosurePointer` method
+* Fixed various bugs
+
+### v3.0.3, 2017.09.06
+
+* Fixed a bug related to nested object references 
+* \[*internal*\] `Opis\Closure\ClosureScope` now extends `SplObjectStorage`
+* \[*internal*\] The `storage` property was removed from `Opis\Closure\ClosureScope`
+* \[*internal*\] The `instances` and `objects` properties were removed from `Opis\Closure\ClosureContext`
+
+### v3.0.2, 2017.08.28
+
+* Fixed a bug where `$this` object was not handled properly inside the 
+`SerializableClosre::serialize` method. 
+
+### v3.0.1, 2017.04.13
+
+* Fixed a bug in 'ignore_next' state
+
+### v3.0.0, 2017.04.07
+
+* Dropped PHP 5.3 support
+* Moved source files from `lib` to `src` folder
+* Removed second parameter from `Opis\Closure\SerializableClosure::from` method and from constructor
+* Removed `Opis\Closure\{SecurityProviderInterface, DefaultSecurityProvider, SecureClosure}` classes
+* Refactored how signed closures were handled
+* Added `wrapClosures` and `unwrapClosures` static methods to `Opis\Closure\SerializableClosure` class
+* Added `Opis\Colosure\serialize` and `Opis\Closure\unserialize` functions
+* Improved serialization. You can now serialize arbitrary objects and the library will automatically wrap all closures
+
+### v2.4.0, 2016.12.16
+
+* The parser was refactored and improved
+* Refactored `Opis\Closure\SerializableClosure::__invoke` method
+* `Opis\Closure\{ISecurityProvider, SecurityProvider}` were added
+* `Opis\Closure\{SecurityProviderInterface, DefaultSecurityProvider, SecureClosure}` were deprecated
+and they will be removed in the next major version
+* `setSecretKey` and `addSecurityProvider` static methods were added to `Opis\Closure\SerializableClosure`
+
+### v2.3.2, 2016.12.15
+
+* Fixed a bug that prevented namespace resolution to be done properly
+
+### v2.3.1, 2016.12.13
+
+* Hotfix. See [PR](https://github.com/opis/closure/pull/7)
+
+### v2.3.0, 2016.11.17
+
+* Added `isBindingRequired` and `isScopeRequired` to the `Opis\Closure\ReflectionClosure` class
+* Automatically detects when the scope and/or the bound object of a closure needs to be serialized.
+
+### v2.2.1, 2016.08.20
+
+* Fixed a bug in `Opis\Closure\ReflectionClosure::fetchItems`
+
+### v2.2.0, 2016.07.26
+
+* Fixed CS
+* `Opis\Closure\ClosureContext`, `Opis\Closure\ClosureScope`, `Opis\Closure\SelfReference`
+ and `Opis\Closure\SecurityException` classes were moved into separate files
+* Added support for PHP7 syntax
+* Fixed some bugs in `Opis\Closure\ReflectionClosure` class
+* Improved closure parser
+* Added an analyzer for SuperClosure library
+
+### v2.1.0, 2015.09.30
+
+* Added support for the missing `__METHOD__`, `__FUNCTION__` and `__TRAIT__` magic constants
+* Added some security related classes and interfaces: `Opis\Closure\SecurityProviderInterface`,
+`Opis\Closure\DefaultSecurityProvider`, `Opis\Closure\SecureClosure`, `Opis\Closure\SecurityException`.
+* Fiexed a bug in `Opis\Closure\ReflectionClosure::getClasses` method
+* Other minor bugfixes
+* Added support for static closures
+* Added public `isStatic` method to `Opis\Closure\ReflectionClosure` class
+
+
+### v2.0.1, 2015.09.23
+
+* Removed `branch-alias` property from `composer.json`
+* Bugfix. See [issue #6](https://github.com/opis/closure/issues/6)
+
+### v2.0.0, 2015.07.31
+
+* The closure parser was improved
+* Class names are now automatically resolved
+* Added support for the `#trackme` directive which allows tracking closure's residing source
+
+### v1.3.0, 2014.10.18
+
+* Added autoload file
+* Changed README file
+
+### Opis Closure 1.2.2
+
+* Started changelog
diff --git a/vendor/opis/closure/LICENSE b/vendor/opis/closure/LICENSE
new file mode 100644
index 00000000..b2382f9d
--- /dev/null
+++ b/vendor/opis/closure/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2014-2017 The Opis Project
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/opis/closure/NOTICE b/vendor/opis/closure/NOTICE
new file mode 100644
index 00000000..7b831837
--- /dev/null
+++ b/vendor/opis/closure/NOTICE
@@ -0,0 +1,9 @@
+Opis Closure
+Copyright 2018 Zindex Software
+
+This product includes software developed at
+Zindex Software (http://zindex.software).
+
+This software was originally developed by Marius Sarca and Sorin Sarca
+(Copyright 2014-2018). The copyright info was changed with the permission
+of the original authors.
\ No newline at end of file
diff --git a/vendor/opis/closure/README.md b/vendor/opis/closure/README.md
new file mode 100644
index 00000000..47d0434d
--- /dev/null
+++ b/vendor/opis/closure/README.md
@@ -0,0 +1,98 @@
+Opis Closure
+====================
+[![Build Status](https://travis-ci.org/opis/closure.png)](https://travis-ci.org/opis/closure)
+[![Latest Stable Version](https://poser.pugx.org/opis/closure/v/stable.png)](https://packagist.org/packages/opis/closure)
+[![Latest Unstable Version](https://poser.pugx.org/opis/closure/v/unstable.png)](https://packagist.org/packages/opis/closure)
+[![License](https://poser.pugx.org/opis/closure/license.png)](https://packagist.org/packages/opis/closure)
+
+Serializable closures
+---------------------
+**Opis Closure** is a library that aims to overcome PHP's limitations regarding closure
+serialization by providing a wrapper that will make all closures serializable. 
+
+**The library's key features:**
+
+- Serialize any closure
+- Serialize arbitrary objects
+- Doesn't use `eval` for closure serialization or unserialization
+- Works with any PHP version that has support for closures
+- Supports PHP 7 syntax
+- Handles all variables referenced/imported in `use()` and automatically wraps all referenced/imported closures for
+proper serialization
+- Handles recursive closures
+- Handles magic constants like `__FILE__`, `__DIR__`, `__LINE__`, `__NAMESPACE__`, `__CLASS__`,
+`__TRAIT__`, `__METHOD__` and `__FUNCTION__`.
+- Automatically resolves all class names, function names and constant names used inside the closure
+- Track closure's residing source by using the `#trackme` directive
+- Simple and very fast parser
+- Any error or exception, that might occur when executing an unserialized closure, can be caught and treated properly
+- You can serialize/unserialize any closure unlimited times, even those previously unserialized
+(this is possible because `eval()` is not used for unserialization)
+- Handles static closures
+- Supports cryptographically signed closures
+- Provides a reflector that can give you information about the serialized closure
+- Provides an analyzer for *SuperClosure* library
+- Automatically detects when the scope and/or the bound object of a closure needs to be serialized
+in order for the closure to work after deserialization
+
+### Documentation
+
+The full documentation for this library can be found [here][documentation].
+
+### License
+
+**Opis Closure** is licensed under the [MIT License (MIT)][license].
+
+### Requirements
+
+* PHP ^5.4 || ^7.0
+
+## Installation
+
+**Opis Closure** is available on [Packagist] and it can be installed from a 
+command line interface by using [Composer]. 
+
+```bash
+composer require opis/closure
+```
+
+Or you could directly reference it into your `composer.json` file as a dependency
+
+```json
+{
+    "require": {
+        "opis/closure": "^3.1"
+    }
+}
+```
+
+### Migrating from 2.x
+
+If your project needs to support PHP 5.3 you can continue using the `2.x` version
+of **Opis Closure**. Otherwise, assuming you are not using one of the removed/refactored classes or features(see 
+[CHANGELOG]), migrating to version `3.x` is simply a matter of updating your `composer.json` file. 
+
+### Semantic versioning
+
+**Opis Closure** follows [semantic versioning][SemVer] specifications.
+
+### Arbitrary object serialization
+
+This feature was primarily introduced in order to support serializing an object bound 
+to a closure and available via `$this`. The implementation is far from being perfect 
+and it's really hard to make it work flawless. I will try to improve this, but I can 
+not guarantee anything. So my advice regarding the `Opis\Closure\serialize|unserialize` 
+functions is to use them with caution.
+
+### SuperClosure support
+
+**Opis Closure** is shipped with an analyzer(`Opis\Closure\Analyzer`) which 
+aims to provide *Opis Closure*'s parsing precision and speed to [SuperClosure].
+
+[documentation]: https://www.opis.io/closure "Opis Closure"
+[license]: http://opensource.org/licenses/MIT "MIT License"
+[Packagist]: https://packagist.org/packages/opis/closure "Packagist"
+[Composer]: https://getcomposer.org "Composer"
+[SuperClosure]: https://github.com/jeremeamia/super_closure "SuperClosure"
+[SemVer]: http://semver.org/ "Semantic versioning"
+[CHANGELOG]: https://github.com/opis/closure/blob/master/CHANGELOG.md "Changelog"
\ No newline at end of file
diff --git a/vendor/opis/closure/autoload.php b/vendor/opis/closure/autoload.php
new file mode 100644
index 00000000..5c214b34
--- /dev/null
+++ b/vendor/opis/closure/autoload.php
@@ -0,0 +1,39 @@
+<?php
+/* ===========================================================================
+ * Copyright (c) 2018 Zindex Software
+ *
+ * Licensed under the MIT License
+ * =========================================================================== */
+
+require_once 'functions.php';
+
+spl_autoload_register(function($class){
+   
+    $class = ltrim($class, '\\');
+    $dir = __DIR__ . '/src';
+    $namespace = 'Opis\Closure';
+    
+    if(strpos($class, $namespace) === 0)
+    {
+        $class = substr($class, strlen($namespace));
+        $path = '';
+        if(($pos = strripos($class, '\\')) !== FALSE)
+        {
+            $path = str_replace('\\', '/', substr($class, 0, $pos)) . '/';
+            $class = substr($class, $pos + 1);
+        }
+        $path .= str_replace('_', '/', $class) . '.php';
+        $dir .= '/' . $path;
+        
+        if(file_exists($dir))
+        {
+            include $dir;
+            return true;
+        }
+        
+        return false;
+    }
+    
+    return false;
+
+});
diff --git a/vendor/opis/closure/composer.json b/vendor/opis/closure/composer.json
new file mode 100644
index 00000000..3a3f874f
--- /dev/null
+++ b/vendor/opis/closure/composer.json
@@ -0,0 +1,40 @@
+{
+    "name": "opis/closure",
+    "description": "A library that can be used to serialize closures (anonymous functions) and arbitrary objects.",
+    "keywords": ["closure", "serialization", "function", "serializable", "serialize", "anonymous functions"],
+    "homepage": "https://opis.io/closure",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Marius Sarca",
+            "email": "marius.sarca@gmail.com"
+        },
+        {
+            "name": "Sorin Sarca",
+            "email": "sarca_sorin@hotmail.com"
+        }
+    ],
+    "require": {
+        "php": "^5.4 || ^7.0"
+    },
+    "require-dev": {
+        "jeremeamia/superclosure": "^2.0",
+        "phpunit/phpunit": "^4.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Opis\\Closure\\": "src/"
+        },
+        "files": ["functions.php"]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Opis\\Closure\\Test\\": "tests/"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "3.0.x-dev"
+        }
+    }
+}
diff --git a/vendor/opis/closure/functions.php b/vendor/opis/closure/functions.php
new file mode 100644
index 00000000..432842a4
--- /dev/null
+++ b/vendor/opis/closure/functions.php
@@ -0,0 +1,38 @@
+<?php
+/* ===========================================================================
+ * Copyright (c) 2018 Zindex Software
+ *
+ * Licensed under the MIT License
+ * =========================================================================== */
+
+namespace Opis\Closure;
+
+/**
+ * Serialize
+ *
+ * @param $data
+ * @return string
+ */
+function serialize($data)
+{
+    SerializableClosure::enterContext();
+    SerializableClosure::wrapClosures($data);
+    $data = \serialize($data);
+    SerializableClosure::exitContext();
+    return $data;
+}
+
+/**
+ * Unserialize
+ *
+ * @param $data
+ * @return mixed
+ */
+function unserialize($data)
+{
+    SerializableClosure::enterContext();
+    $data = \unserialize($data);
+    SerializableClosure::unwrapClosures($data);
+    SerializableClosure::exitContext();
+    return $data;
+}
diff --git a/vendor/opis/closure/src/Analyzer.php b/vendor/opis/closure/src/Analyzer.php
new file mode 100644
index 00000000..f2c6ed8a
--- /dev/null
+++ b/vendor/opis/closure/src/Analyzer.php
@@ -0,0 +1,59 @@
+<?php
+/* ===========================================================================
+ * Copyright (c) 2018 Zindex Software
+ *
+ * Licensed under the MIT License
+ * =========================================================================== */
+
+namespace Opis\Closure;
+
+use Closure;
+use SuperClosure\Analyzer\ClosureAnalyzer;
+
+class Analyzer extends ClosureAnalyzer
+{
+    /**
+     * Analyzer a given closure.
+     *
+     * @param Closure $closure
+     *
+     * @return array
+     */
+    public function analyze(Closure $closure)
+    {
+        $reflection = new ReflectionClosure($closure);
+        $scope = $reflection->getClosureScopeClass();
+
+        $data = [
+            'reflection' => $reflection,
+            'code'       => $reflection->getCode(),
+            'hasThis'    => $reflection->isBindingRequired(),
+            'context'    => $reflection->getUseVariables(),
+            'hasRefs'    => false,
+            'binding'    => $reflection->getClosureThis(),
+            'scope'      => $scope ? $scope->getName() : null,
+            'isStatic'   => $reflection->isStatic(),
+        ];
+
+        return $data;
+    }
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    protected function determineCode(array &$data)
+    {
+        return null;
+    }
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    protected function determineContext(array &$data)
+    {
+        return null;
+    }
+
+}
diff --git a/vendor/opis/closure/src/ClosureContext.php b/vendor/opis/closure/src/ClosureContext.php
new file mode 100644
index 00000000..7599a9d0
--- /dev/null
+++ b/vendor/opis/closure/src/ClosureContext.php
@@ -0,0 +1,33 @@
+<?php
+/* ===========================================================================
+ * Copyright (c) 2018 Zindex Software
+ *
+ * Licensed under the MIT License
+ * =========================================================================== */
+
+namespace Opis\Closure;
+
+/**
+ * Closure context class
+ */
+class ClosureContext
+{
+    /**
+     * @var ClosureScope Closures scope
+     */
+    public $scope;
+
+    /**
+     * @var integer
+     */
+    public $locks;
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        $this->scope = new ClosureScope();
+        $this->locks = 0;
+    }
+}
\ No newline at end of file
diff --git a/vendor/opis/closure/src/ClosureScope.php b/vendor/opis/closure/src/ClosureScope.php
new file mode 100644
index 00000000..b0ede623
--- /dev/null
+++ b/vendor/opis/closure/src/ClosureScope.php
@@ -0,0 +1,25 @@
+<?php
+/* ===========================================================================
+ * Copyright (c) 2018 Zindex Software
+ *
+ * Licensed under the MIT License
+ * =========================================================================== */
+
+namespace Opis\Closure;
+
+
+/**
+ * Closure scope class
+ */
+class ClosureScope extends \SplObjectStorage
+{
+    /**
+     * @var integer Number of serializations in current scope
+     */
+    public $serializations = 0;
+
+    /**
+     * @var integer Number of closures that have to be serialized
+     */
+    public $toserialize = 0;
+}
\ No newline at end of file
diff --git a/vendor/opis/closure/src/ClosureStream.php b/vendor/opis/closure/src/ClosureStream.php
new file mode 100644
index 00000000..2e979b12
--- /dev/null
+++ b/vendor/opis/closure/src/ClosureStream.php
@@ -0,0 +1,91 @@
+<?php
+/* ===========================================================================
+ * Copyright (c) 2018 Zindex Software
+ *
+ * Licensed under the MIT License
+ * =========================================================================== */
+
+namespace Opis\Closure;
+
+class ClosureStream
+{
+    const STREAM_PROTO = 'closure';
+
+    protected static $isRegistered = false;
+
+    protected $content;
+
+    protected $length;
+
+    protected $pointer = 0;
+
+    function stream_open($path, $mode, $options, &$opened_path)
+    {
+        $this->content = "<?php\nreturn " . substr($path, strlen(static::STREAM_PROTO . '://')) . ";";
+        $this->length = strlen($this->content);
+        return true;
+    }
+
+    public function stream_read($count)
+    {
+        $value = substr($this->content, $this->pointer, $count);
+        $this->pointer += $count;
+        return $value;
+    }
+
+    public function stream_eof()
+    {
+        return $this->pointer >= $this->length;
+    }
+
+    public function stream_stat()
+    {
+        $stat = stat(__FILE__);
+        $stat[7] = $stat['size'] = $this->length;
+        return $stat;
+    }
+
+    public function url_stat($path, $flags)
+    {
+        $stat = stat(__FILE__);
+        $stat[7] = $stat['size'] = $this->length;
+        return $stat;
+    }
+
+    public function stream_seek($offset, $whence = SEEK_SET)
+    {
+        $crt = $this->pointer;
+
+        switch ($whence) {
+            case SEEK_SET:
+                $this->pointer = $offset;
+                break;
+            case SEEK_CUR:
+                $this->pointer += $offset;
+                break;
+            case SEEK_END:
+                $this->pointer = $this->length + $offset;
+                break;
+        }
+
+        if ($this->pointer < 0 || $this->pointer >= $this->length) {
+            $this->pointer = $crt;
+            return false;
+        }
+
+        return true;
+    }
+
+    public function stream_tell()
+    {
+        return $this->pointer;
+    }
+
+    public static function register()
+    {
+        if (!static::$isRegistered) {
+            static::$isRegistered = stream_wrapper_register(static::STREAM_PROTO, __CLASS__);
+        }
+    }
+
+}
diff --git a/vendor/opis/closure/src/ISecurityProvider.php b/vendor/opis/closure/src/ISecurityProvider.php
new file mode 100644
index 00000000..4e507617
--- /dev/null
+++ b/vendor/opis/closure/src/ISecurityProvider.php
@@ -0,0 +1,25 @@
+<?php
+/* ===========================================================================
+ * Copyright (c) 2018 Zindex Software
+ *
+ * Licensed under the MIT License
+ * =========================================================================== */
+
+namespace Opis\Closure;
+
+interface ISecurityProvider
+{
+    /**
+     * Sign serialized closure
+     * @param string $closure
+     * @return array
+     */
+    public function sign($closure);
+
+    /**
+     * Verify signature
+     * @param array $data
+     * @return bool
+     */
+    public function verify(array $data);
+}
\ No newline at end of file
diff --git a/vendor/opis/closure/src/ReflectionClosure.php b/vendor/opis/closure/src/ReflectionClosure.php
new file mode 100644
index 00000000..2cd3703e
--- /dev/null
+++ b/vendor/opis/closure/src/ReflectionClosure.php
@@ -0,0 +1,858 @@
+<?php
+/* ===========================================================================
+ * Copyright (c) 2018 Zindex Software
+ *
+ * Licensed under the MIT License
+ * =========================================================================== */
+
+namespace Opis\Closure;
+
+use Closure;
+use ReflectionFunction;
+
+class ReflectionClosure extends ReflectionFunction
+{
+    protected $code;
+    protected $tokens;
+    protected $hashedName;
+    protected $useVariables;
+    protected $isStaticClosure;
+    protected $isScopeRequired;
+    protected $isBindingRequired;
+
+    protected static $files = array();
+    protected static $classes = array();
+    protected static $functions = array();
+    protected static $constants = array();
+    protected static $structures = array();
+
+
+    /**
+     * ReflectionClosure constructor.
+     * @param Closure $closure
+     * @param string|null $code
+     * @throws \ReflectionException
+     */
+    public function __construct(Closure $closure, $code = null)
+    {
+        $this->code = $code;
+        parent::__construct($closure);
+    }
+
+    /**
+     * @return bool
+     */
+    public function isStatic()
+    {
+        if ($this->isStaticClosure === null) {
+            $this->isStaticClosure = strtolower(substr($this->getCode(), 0, 6)) === 'static';
+        }
+
+        return $this->isStaticClosure;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCode()
+    {
+        if($this->code !== null){
+            return $this->code;
+        }
+
+        $fileName = $this->getFileName();
+        $line = $this->getStartLine() - 1;
+
+        $match = ClosureStream::STREAM_PROTO . '://';
+
+        if ($line === 1 && substr($fileName, 0, strlen($match)) === $match) {
+            return $this->code = substr($fileName, strlen($match));
+        }
+
+        $className = null;
+
+
+        if (null !== $className = $this->getClosureScopeClass()) {
+            $className = '\\' . trim($className->getName(), '\\');
+        }
+
+
+        if($php7 = PHP_MAJOR_VERSION === 7){
+            switch (PHP_MINOR_VERSION){
+                case 0:
+                    $php7_types = array('string', 'int', 'bool', 'float');
+                    break;
+                case 1:
+                    $php7_types = array('string', 'int', 'bool', 'float', 'void');
+                    break;
+                case 2:
+                default:
+                    $php7_types = array('string', 'int', 'bool', 'float', 'void', 'object');
+            }
+        }
+
+        $ns = $this->getNamespaceName();
+        $nsf = $ns == '' ? '' : ($ns[0] == '\\' ? $ns : '\\' . $ns);
+
+        $_file = var_export($fileName, true);
+        $_dir = var_export(dirname($fileName), true);
+        $_namespace = var_export($ns, true);
+        $_class = var_export(trim($className, '\\'), true);
+        $_function = $ns . ($ns == '' ? '' : '\\') . '{closure}';
+        $_method = ($className == '' ? '' : trim($className, '\\') . '::') . $_function;
+        $_function = var_export($_function, true);
+        $_method = var_export($_method, true);
+        $_trait = null;
+
+        $hasTraitSupport = defined('T_TRAIT_C');
+        $tokens = $this->getTokens();
+        $state = $lastState = 'start';
+        $open = 0;
+        $code = '';
+        $id_start = $id_start_ci = $id_name = $context = '';
+        $classes = $functions = $constants = null;
+        $use = array();
+        $lineAdd = 0;
+        $isUsingScope = false;
+        $isUsingThisObject = false;
+
+        for($i = 0, $l = count($tokens); $i < $l; $i++) {
+            $token = $tokens[$i];
+            switch ($state) {
+                case 'start':
+                    if ($token[0] === T_FUNCTION || $token[0] === T_STATIC) {
+                        $code .= $token[1];
+                        $state = $token[0] === T_FUNCTION ? 'function' : 'static';
+                    }
+                    break;
+                case 'static':
+                    if ($token[0] === T_WHITESPACE || $token[0] === T_COMMENT || $token[0] === T_FUNCTION) {
+                        $code .= $token[1];
+                        if ($token[0] === T_FUNCTION) {
+                            $state = 'function';
+                        }
+                    } else {
+                        $code = '';
+                        $state = 'start';
+                    }
+                    break;
+                case 'function':
+                    switch ($token[0]){
+                        case T_STRING:
+                            $code = '';
+                            $state = 'named_function';
+                            break;
+                        case '(':
+                            $code .= '(';
+                            $state = 'closure_args';
+                            break;
+                        default:
+                            $code .= is_array($token) ? $token[1] : $token;
+                    }
+                    break;
+                case 'named_function':
+                    if($token[0] === T_FUNCTION || $token[0] === T_STATIC){
+                        $code = $token[1];
+                        $state = $token[0] === T_FUNCTION ? 'function' : 'static';
+                    }
+                    break;
+                case 'closure_args':
+                    switch ($token[0]){
+                        case T_NS_SEPARATOR:
+                        case T_STRING:
+                            $id_start = $token[1];
+                            $id_start_ci = strtolower($id_start);
+                            $id_name = '';
+                            $context = 'args';
+                            $state = 'id_name';
+                            $lastState = 'closure_args';
+                            break;
+                        case T_USE:
+                            $code .= $token[1];
+                            $state = 'use';
+                            break;
+                        case '=':
+                            $code .= $token;
+                            $lastState = 'closure_args';
+                            $state = 'ignore_next';
+                            break;
+                        case ':':
+                            $code .= ':';
+                            $state = 'return';
+                            break;
+                        case '{':
+                            $code .= '{';
+                            $state = 'closure';
+                            $open++;
+                            break;
+                        default:
+                            $code .= is_array($token) ? $token[1] : $token;
+                    }
+                    break;
+                case 'use':
+                    switch ($token[0]){
+                        case T_VARIABLE:
+                            $use[] = substr($token[1], 1);
+                            $code .= $token[1];
+                            break;
+                        case '{':
+                            $code .= '{';
+                            $state = 'closure';
+                            $open++;
+                            break;
+                        case ':':
+                            $code .= ':';
+                            $state = 'return';
+                            break;
+                        default:
+                            $code .= is_array($token) ? $token[1] : $token;
+                            break;
+                    }
+                    break;
+                case 'return':
+                    switch ($token[0]){
+                        case T_WHITESPACE:
+                        case T_COMMENT:
+                        case T_DOC_COMMENT:
+                            $code .= $token[1];
+                            break;
+                        case T_NS_SEPARATOR:
+                        case T_STRING:
+                            $id_start = $token[1];
+                            $id_start_ci = strtolower($id_start);
+                            $id_name = '';
+                            $context = 'return_type';
+                            $state = 'id_name';
+                            $lastState = 'return';
+                            break 2;
+                        case '{':
+                            $code .= '{';
+                            $state = 'closure';
+                            $open++;
+                            break;
+                        default:
+                            $code .= is_array($token) ? $token[1] : $token;
+                            break;
+                    }
+                    break;
+                case 'closure':
+                    switch ($token[0]){
+                        case T_CURLY_OPEN:
+                        case T_DOLLAR_OPEN_CURLY_BRACES:
+                        case T_STRING_VARNAME:
+                        case '{':
+                            $code .= '{';
+                            $open++;
+                            break;
+                        case '}':
+                            $code .= '}';
+                            if(--$open === 0){
+                                break 3;
+                            }
+                            break;
+                        case T_LINE:
+                            $code .= $token[2] - $line + $lineAdd;
+                            break;
+                        case T_FILE:
+                            $code .= $_file;
+                            break;
+                        case T_DIR:
+                            $code .= $_dir;
+                            break;
+                        case T_NS_C:
+                            $code .= $_namespace;
+                            break;
+                        case T_CLASS_C:
+                            $code .= $_class;
+                            break;
+                        case T_FUNC_C:
+                            $code .= $_function;
+                            break;
+                        case T_METHOD_C:
+                            $code .= $_method;
+                            break;
+                        case T_COMMENT:
+                            if (substr($token[1], 0, 8) === '#trackme') {
+                                $timestamp = time();
+                                $code .= '/**' . PHP_EOL;
+                                $code .= '* Date      : ' . date(DATE_W3C, $timestamp) . PHP_EOL;
+                                $code .= '* Timestamp : ' . $timestamp . PHP_EOL;
+                                $code .= '* Line      : ' . ($line + 1) . PHP_EOL;
+                                $code .= '* File      : ' . $_file . PHP_EOL . '*/' . PHP_EOL;
+                                $lineAdd += 5;
+                            } else {
+                                $code .= $token[1];
+                            }
+                            break;
+                        case T_VARIABLE:
+                            if($token[1] == '$this'){
+                                $isUsingThisObject = true;
+                            }
+                            $code .= $token[1];
+                            break;
+                        case T_STATIC:
+                            $isUsingScope = true;
+                            $code .= $token[1];
+                            break;
+                        case T_NS_SEPARATOR:
+                        case T_STRING:
+                            $id_start = $token[1];
+                            $id_start_ci = strtolower($id_start);
+                            $id_name = '';
+                            $context = 'root';
+                            $state = 'id_name';
+                            $lastState = 'closure';
+                            break 2;
+                        case T_NEW:
+                            $code .= $token[1];
+                            $context = 'new';
+                            $state = 'id_start';
+                            $lastState = 'closure';
+                            break 2;
+                        case T_INSTANCEOF:
+                            $code .= $token[1];
+                            $context = 'instanceof';
+                            $state = 'id_start';
+                            $lastState = 'closure';
+                            break;
+                        case T_OBJECT_OPERATOR:
+                        case T_DOUBLE_COLON:
+                            $code .= $token[1];
+                            $lastState = 'closure';
+                            $state = 'ignore_next';
+                            break;
+                        case T_FUNCTION:
+                            $code .= $token[1];
+                            $state = 'closure_args';
+                            break;
+                        default:
+                            if ($hasTraitSupport && $token[0] == T_TRAIT_C) {
+                                if ($_trait === null) {
+                                    $startLine = $this->getStartLine();
+                                    $endLine = $this->getEndLine();
+                                    $structures = $this->getStructures();
+
+                                    $_trait = '';
+
+                                    foreach ($structures as &$struct) {
+                                        if ($struct['type'] === 'trait' &&
+                                            $struct['start'] <= $startLine &&
+                                            $struct['end'] >= $endLine
+                                        ) {
+                                            $_trait = ($ns == '' ? '' : $ns . '\\') . $struct['name'];
+                                            break;
+                                        }
+                                    }
+
+                                    $_trait = var_export($_trait, true);
+                                }
+
+                                $token[1] = $_trait;
+                            } else {
+                                $code .= is_array($token) ? $token[1] : $token;
+                            }
+                    }
+                    break;
+                case 'ignore_next':
+                    switch ($token[0]){
+                        case T_WHITESPACE:
+                            $code .= $token[1];
+                            break;
+                        case T_CLASS:
+                        case T_STATIC:
+                        case T_VARIABLE:
+                        case T_STRING:
+                            $code .= $token[1];
+                            $state = $lastState;
+                            break;
+                        default:
+                            $state = $lastState;
+                            $i--;
+                    }
+                    break;
+                case 'id_start':
+                    switch ($token[0]){
+                        case T_WHITESPACE:
+                            $code .= $token[1];
+                            break;
+                        case T_NS_SEPARATOR:
+                        case T_STRING:
+                        case T_STATIC:
+                            $id_start = $token[1];
+                            $id_start_ci = strtolower($id_start);
+                            $id_name = '';
+                            $state = 'id_name';
+                            break 2;
+                        case T_VARIABLE:
+                            $code .= $token[1];
+                            $state = $lastState;
+                            break;
+                        case T_CLASS:
+                            $code .= $token[1];
+                            $state = 'anonymous';
+                            break;
+                        default:
+                            $i--;//reprocess last
+                            $state = 'id_name';
+                    }
+                    break;
+                case 'id_name':
+                    switch ($token[0]){
+                        case T_NS_SEPARATOR:
+                        case T_STRING:
+                            $id_name .= $token[1];
+                            break;
+                        case T_WHITESPACE:
+                            $id_name .= $token[1];
+                            break;
+                        case '(':
+                            if($context === 'new' || false !== strpos($id_name, '\\')){
+                                if($id_start !== '\\'){
+                                    if ($classes === null) {
+                                        $classes = $this->getClasses();
+                                    }
+                                    if (isset($classes[$id_start_ci])) {
+                                        $id_start = $classes[$id_start_ci];
+                                    }
+                                    if($id_start[0] !== '\\'){
+                                        $id_start = $nsf . '\\' . $id_start;
+                                    }
+                                }
+                            } else {
+                                if($id_start !== '\\'){
+                                    if($functions === null){
+                                        $functions = $this->getFunctions();
+                                    }
+                                    if(isset($functions[$id_start_ci])){
+                                        $id_start = $functions[$id_start_ci];
+                                    }
+                                }
+                            }
+                            $code .= $id_start . $id_name . '(';
+                            $state = $lastState;
+                            break;
+                        case T_VARIABLE:
+                        case T_DOUBLE_COLON:
+                            if($id_start !== '\\') {
+                                if($id_start_ci === 'self' || $id_start_ci === 'static' || $id_start_ci === 'parent'){
+                                    $isUsingScope = true;
+                                } elseif (!($php7 && in_array($id_start_ci, $php7_types))){
+                                    if ($classes === null) {
+                                        $classes = $this->getClasses();
+                                    }
+                                    if (isset($classes[$id_start_ci])) {
+                                        $id_start = $classes[$id_start_ci];
+                                    }
+                                    if($id_start[0] !== '\\'){
+                                        $id_start = $nsf . '\\' . $id_start;
+                                    }
+                                }
+                            }
+                            $code .= $id_start . $id_name . $token[1];
+                            $state = $token[0] === T_DOUBLE_COLON ? 'ignore_next' : $lastState;
+                            break;
+                        default:
+                            if($id_start !== '\\'){
+                                if($context === 'instanceof' || $context === 'args' || $context === 'return_type' || $context === 'extends'){
+                                    if($id_start_ci === 'self' || $id_start_ci === 'static' || $id_start_ci === 'parent'){
+                                        $isUsingScope = true;
+                                    } elseif (!($php7 && in_array($id_start_ci, $php7_types))){
+                                        if($classes === null){
+                                            $classes = $this->getClasses();
+                                        }
+                                        if(isset($classes[$id_start_ci])){
+                                            $id_start = $classes[$id_start_ci];
+                                        }
+                                        if($id_start[0] !== '\\'){
+                                            $id_start = $nsf . '\\' . $id_start;
+                                        }
+                                    }
+                                } else {
+                                    if($constants === null){
+                                        $constants = $this->getConstants();
+                                    }
+                                    if(isset($constants[$id_start])){
+                                        $id_start = $constants[$id_start];
+                                    }
+                                }
+                            }
+                            $code .= $id_start . $id_name;
+                            $state = $lastState;
+                            $i--;//reprocess last token
+                    }
+                    break;
+                case 'anonymous':
+                    switch ($token[0]) {
+                        case T_NS_SEPARATOR:
+                        case T_STRING:
+                            $id_start = $token[1];
+                            $id_start_ci = strtolower($id_start);
+                            $id_name = '';
+                            $state = 'id_name';
+                            $context = 'extends';
+                            $lastState = 'anonymous';
+                        break;
+                        case '{':
+                            $state = 'closure';
+                            $i--;
+                            break;
+                        default:
+                            $code .= is_array($token) ? $token[1] : $token;
+                    }
+                    break;
+            }
+        }
+
+        $this->isBindingRequired = $isUsingThisObject;
+        $this->isScopeRequired = $isUsingScope;
+        $this->code = $code;
+        $this->useVariables = empty($use) ? $use : array_intersect_key($this->getStaticVariables(), array_flip($use));
+
+        return $this->code;
+    }
+
+    /**
+     * @return array
+     */
+    public function getUseVariables()
+    {
+        if($this->useVariables !== null){
+            return $this->useVariables;
+        }
+
+        $tokens = $this->getTokens();
+        $use = array();
+        $state = 'start';
+
+        foreach ($tokens as &$token) {
+            $is_array = is_array($token);
+
+            switch ($state) {
+                case 'start':
+                    if ($is_array && $token[0] === T_USE) {
+                        $state = 'use';
+                    }
+                    break;
+                case 'use':
+                    if ($is_array) {
+                        if ($token[0] === T_VARIABLE) {
+                            $use[] = substr($token[1], 1);
+                        }
+                    } elseif ($token == ')') {
+                        break 2;
+                    }
+                    break;
+            }
+        }
+
+        $this->useVariables = empty($use) ? $use : array_intersect_key($this->getStaticVariables(), array_flip($use));
+
+        return $this->useVariables;
+    }
+
+    /**
+     * return bool
+     */
+    public function isBindingRequired()
+    {
+        if($this->isBindingRequired === null){
+            $this->getCode();
+        }
+
+        return $this->isBindingRequired;
+    }
+
+    /**
+     * return bool
+     */
+    public function isScopeRequired()
+    {
+        if($this->isScopeRequired === null){
+            $this->getCode();
+        }
+
+        return $this->isScopeRequired;
+    }
+
+    /**
+     * @return string
+     */
+    protected function getHashedFileName()
+    {
+        if ($this->hashedName === null) {
+            $this->hashedName = md5($this->getFileName());
+        }
+
+        return $this->hashedName;
+    }
+
+    /**
+     * @return array
+     */
+    protected function getFileTokens()
+    {
+        $key = $this->getHashedFileName();
+
+        if (!isset(static::$files[$key])) {
+            static::$files[$key] = token_get_all(file_get_contents($this->getFileName()));
+        }
+
+        return static::$files[$key];
+    }
+
+    /**
+     * @return array
+     */
+    protected function getTokens()
+    {
+        if ($this->tokens === null) {
+            $tokens = $this->getFileTokens();
+            $startLine = $this->getStartLine();
+            $endLine = $this->getEndLine();
+            $results = array();
+            $start = false;
+
+            foreach ($tokens as &$token) {
+                if (!is_array($token)) {
+                    if ($start) {
+                        $results[] = $token;
+                    }
+
+                    continue;
+                }
+
+                $line = $token[2];
+
+                if ($line <= $endLine) {
+                    if ($line >= $startLine) {
+                        $start = true;
+                        $results[] = $token;
+                    }
+
+                    continue;
+                }
+
+                break;
+            }
+
+            $this->tokens = $results;
+        }
+
+        return $this->tokens;
+    }
+
+    /**
+     * @return array
+     */
+    protected function getClasses()
+    {
+        $key = $this->getHashedFileName();
+
+        if (!isset(static::$classes[$key])) {
+            $this->fetchItems();
+        }
+
+        return static::$classes[$key];
+    }
+
+    /**
+     * @return array
+     */
+    protected function getFunctions()
+    {
+        $key = $this->getHashedFileName();
+
+        if (!isset(static::$functions[$key])) {
+            $this->fetchItems();
+        }
+
+        return static::$functions[$key];
+    }
+
+    /**
+     * @return array
+     */
+    protected function getConstants()
+    {
+        $key = $this->getHashedFileName();
+
+        if (!isset(static::$constants[$key])) {
+            $this->fetchItems();
+        }
+
+        return static::$constants[$key];
+    }
+
+    /**
+     * @return array
+     */
+    protected function getStructures()
+    {
+        $key = $this->getHashedFileName();
+
+        if (!isset(static::$structures[$key])) {
+            $this->fetchItems();
+        }
+
+        return static::$structures[$key];
+    }
+
+    protected function fetchItems()
+    {
+        $key = $this->getHashedFileName();
+
+        $classes = array();
+        $functions = array();
+        $constants = array();
+        $structures = array();
+        $tokens = $this->getFileTokens();
+
+        $open = 0;
+        $state = 'start';
+        $prefix = '';
+        $name = '';
+        $alias = '';
+        $isFunc = $isConst = false;
+
+        $startLine = $endLine = 0;
+        $structType = $structName = '';
+        $structIgnore = false;
+
+        $hasTraitSupport = defined('T_TRAIT');
+
+        foreach ($tokens as $token) {
+            $is_array = is_array($token);
+
+            switch ($state) {
+                case 'start':
+                    if ($is_array) {
+                        switch ($token[0]) {
+                            case T_CLASS:
+                            case T_INTERFACE:
+                                $state = 'before_structure';
+                                $startLine = $token[2];
+                                $structType = $token[0] == T_CLASS ? 'class' : 'interface';
+                                break;
+                            case T_USE:
+                                $state = 'use';
+                                $prefix = $name = $alias = '';
+                                $isFunc = $isConst = false;
+                                break;
+                            case T_FUNCTION:
+                                $state = 'structure';
+                                $structIgnore = true;
+                                break;
+                            default:
+                                if ($hasTraitSupport && $token[0] == T_TRAIT) {
+                                    $state = 'before_structure';
+                                    $startLine = $token[2];
+                                    $structType = 'trait';
+                                }
+                                break;
+                        }
+                    }
+                    break;
+                case 'use':
+                    if ($is_array) {
+                        switch ($token[0]) {
+                            case T_FUNCTION:
+                                $isFunc = true;
+                                break;
+                            case T_CONST:
+                                $isConst = true;
+                                break;
+                            case T_NS_SEPARATOR:
+                                $name .= $token[1];
+                                break;
+                            case T_STRING:
+                                $name .= $token[1];
+                                $alias = $token[1];
+                                break;
+                            case T_AS:
+                                if ($name[0] !== '\\' && $prefix === '') {
+                                    $name = '\\' . $name;
+                                }
+                                $state = 'alias';
+                                break;
+                        }
+                    } else {
+                        if ($name[0] !== '\\' && $prefix === '') {
+                            $name = '\\' . $name;
+                        }
+
+                        if($token == '{') {
+                            $prefix = $name;
+                            $name = '';
+                        } else {
+                            if($isFunc){
+                                $functions[strtolower($alias)] = $prefix . $name;
+                            } elseif ($isConst){
+                                $constants[$alias] = $prefix . $name;
+                            } else {
+                                $classes[strtolower($alias)] = $prefix . $name;
+                            }
+                            $name = '';
+                            $state = $token == ',' ? 'use' : 'start';
+                        }
+                    }
+                    break;
+                case 'alias':
+                    if ($is_array) {
+                        if($token[0] == T_STRING){
+                            $alias = $token[1];
+                        }
+                    } else {
+                        if($isFunc){
+                            $functions[strtolower($alias)] = $prefix . $name;
+                        } elseif ($isConst){
+                            $constants[$alias] = $prefix . $name;
+                        } else {
+                            $classes[strtolower($alias)] = $prefix . $name;
+                        }
+                        $name = '';
+                        $state = $token == ',' ? 'use' : 'start';
+                    }
+                    break;
+                case 'before_structure':
+                    if ($is_array && $token[0] == T_STRING) {
+                        $structName = $token[1];
+                        $state = 'structure';
+                    }
+                    break;
+                case 'structure':
+                    if (!$is_array) {
+                        if ($token === '{') {
+                            $open++;
+                        } elseif ($token === '}') {
+                            if (--$open == 0) {
+                                if(!$structIgnore){
+                                    $structures[] = array(
+                                        'type' => $structType,
+                                        'name' => $structName,
+                                        'start' => $startLine,
+                                        'end' => $endLine,
+                                    );
+                                }
+                                $structIgnore = false;
+                                $state = 'start';
+                            }
+                        }
+                    } else {
+                        if($token[0] === T_CURLY_OPEN ||
+                            $token[0] === T_DOLLAR_OPEN_CURLY_BRACES ||
+                            $token[0] === T_STRING_VARNAME){
+                            $open++;
+                        }
+                        $endLine = $token[2];
+                    }
+                    break;
+            }
+        }
+
+        static::$classes[$key] = $classes;
+        static::$functions[$key] = $functions;
+        static::$constants[$key] = $constants;
+        static::$structures[$key] = $structures;
+    }
+
+}
diff --git a/vendor/opis/closure/src/SecurityException.php b/vendor/opis/closure/src/SecurityException.php
new file mode 100644
index 00000000..7767a259
--- /dev/null
+++ b/vendor/opis/closure/src/SecurityException.php
@@ -0,0 +1,18 @@
+<?php
+/* ===========================================================================
+ * Copyright (c) 2018 Zindex Software
+ *
+ * Licensed under the MIT License
+ * =========================================================================== */
+
+namespace Opis\Closure;
+
+use Exception;
+
+/**
+ * Security exception class
+ */
+class SecurityException extends Exception
+{
+
+}
\ No newline at end of file
diff --git a/vendor/opis/closure/src/SecurityProvider.php b/vendor/opis/closure/src/SecurityProvider.php
new file mode 100644
index 00000000..7563c47c
--- /dev/null
+++ b/vendor/opis/closure/src/SecurityProvider.php
@@ -0,0 +1,42 @@
+<?php
+/* ===========================================================================
+ * Copyright (c) 2018 Zindex Software
+ *
+ * Licensed under the MIT License
+ * =========================================================================== */
+
+namespace Opis\Closure;
+
+class SecurityProvider implements ISecurityProvider
+{
+    /** @var  string */
+    protected $secret;
+
+    /**
+     * SecurityProvider constructor.
+     * @param string $secret
+     */
+    public function __construct($secret)
+    {
+        $this->secret = $secret;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function sign($closure)
+    {
+        return array(
+            'closure' => $closure,
+            'hash' => base64_encode(hash_hmac('sha256', $closure, $this->secret, true)),
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function verify(array $data)
+    {
+        return base64_encode(hash_hmac('sha256', $data['closure'], $this->secret, true)) === $data['hash'];
+    }
+}
\ No newline at end of file
diff --git a/vendor/opis/closure/src/SelfReference.php b/vendor/opis/closure/src/SelfReference.php
new file mode 100644
index 00000000..16b683da
--- /dev/null
+++ b/vendor/opis/closure/src/SelfReference.php
@@ -0,0 +1,30 @@
+<?php
+/* ===========================================================================
+ * Copyright (c) 2018 Zindex Software
+ *
+ * Licensed under the MIT License
+ * =========================================================================== */
+
+namespace Opis\Closure;
+
+
+/**
+ * Helper class used to indicate a reference to an object
+ */
+class SelfReference
+{
+    /**
+     * @var string An unique hash representing the object
+     */
+    public $hash;
+
+    /**
+     * Constructor
+     *
+     * @param string $hash
+     */
+    public function __construct($hash)
+    {
+        $this->hash = $hash;
+    }
+}
\ No newline at end of file
diff --git a/vendor/opis/closure/src/SerializableClosure.php b/vendor/opis/closure/src/SerializableClosure.php
new file mode 100644
index 00000000..72872cbc
--- /dev/null
+++ b/vendor/opis/closure/src/SerializableClosure.php
@@ -0,0 +1,622 @@
+<?php
+/* ===========================================================================
+ * Copyright (c) 2018 Zindex Software
+ *
+ * Licensed under the MIT License
+ * =========================================================================== */
+
+namespace Opis\Closure;
+
+use Closure;
+use Serializable;
+use SplObjectStorage;
+use ReflectionObject;
+
+/**
+ * Provides a wrapper for serialization of closures
+ */
+class SerializableClosure implements Serializable
+{
+    /**
+     * @var Closure Wrapped closure
+     *
+     * @see \Opis\Closure\SerializableClosure::getClosure()
+     */
+    protected $closure;
+
+    /**
+     * @var ReflectionClosure A reflection instance for closure
+     *
+     * @see \Opis\Closure\SerializableClosure::getReflector()
+     */
+    protected $reflector;
+
+    /**
+     * @var mixed Used at deserialization to hold variables
+     *
+     * @see \Opis\Closure\SerializableClosure::unserialize()
+     * @see \Opis\Closure\SerializableClosure::getReflector()
+     */
+    protected $code;
+
+    /**
+     * @var string Closure's ID
+     */
+    protected $reference;
+
+    /**
+     * @var string Closure scope
+     */
+    protected $scope;
+
+    /**
+     * @var ClosureContext Context of closure, used in serialization
+     */
+    protected static $context;
+
+    /**
+     * @var ISecurityProvider|null
+     */
+    protected static $securityProvider;
+
+    /** Array recursive constant*/
+    const ARRAY_RECURSIVE_KEY = '¯\_(ツ)_/¯';
+
+    /**
+     * Constructor
+     *
+     * @param   Closure $closure Closure you want to serialize
+     */
+    public function __construct(Closure $closure)
+    {
+        $this->closure = $closure;
+        if (static::$context !== null) {
+            $this->scope = static::$context->scope;
+            $this->scope->toserialize++;
+        }
+    }
+
+    /**
+     * Get the Closure object
+     *
+     * @return  Closure The wrapped closure
+     */
+    public function getClosure()
+    {
+        return $this->closure;
+    }
+
+    /**
+     * Get the reflector for closure
+     *
+     * @return  ReflectionClosure
+     */
+    public function getReflector()
+    {
+        if ($this->reflector === null) {
+            $this->reflector = new ReflectionClosure($this->closure, $this->code);
+            $this->code = null;
+        }
+
+        return $this->reflector;
+    }
+
+    /**
+     * Implementation of magic method __invoke()
+     */
+    public function __invoke()
+    {
+        return call_user_func_array($this->closure, func_get_args());
+    }
+
+    /**
+     * Implementation of Serializable::serialize()
+     *
+     * @return  string  The serialized closure
+     */
+    public function serialize()
+    {
+        if ($this->scope === null) {
+            $this->scope = new ClosureScope();
+            $this->scope->toserialize++;
+        }
+
+        $this->scope->serializations++;
+
+        $scope = $object = null;
+        $reflector = $this->getReflector();
+
+        if($reflector->isBindingRequired()){
+            $object = $reflector->getClosureThis();
+            static::wrapClosures($object, $this->scope);
+            if($scope = $reflector->getClosureScopeClass()){
+                $scope = $scope->name;
+            }
+        } elseif($reflector->isScopeRequired()) {
+            if($scope = $reflector->getClosureScopeClass()){
+                $scope = $scope->name;
+            }
+        }
+
+        $this->reference = spl_object_hash($this->closure);
+
+        $this->scope[$this->closure] = $this;
+
+        $use = $this->transformUseVariables($reflector->getUseVariables());
+        $code = $reflector->getCode();
+
+        $this->mapByReference($use);
+
+        $ret = \serialize(array(
+            'use' => $use,
+            'function' => $code,
+            'scope' => $scope,
+            'this' => $object,
+            'self' => $this->reference,
+        ));
+
+        if(static::$securityProvider !== null){
+            $ret =  '@' . json_encode(static::$securityProvider->sign($ret));
+        }
+
+        if (!--$this->scope->serializations && !--$this->scope->toserialize) {
+            $this->scope = null;
+        }
+
+        return $ret;
+    }
+
+    /**
+     * Transform the use variables before serialization.
+     *
+     * @param  array  $data The Closure's use variables
+     * @return array
+     */
+    protected function transformUseVariables($data)
+    {
+        return $data;
+    }
+
+    /**
+     * Implementation of Serializable::unserialize()
+     *
+     * @param   string $data Serialized data
+     * @throws SecurityException
+     */
+    public function unserialize($data)
+    {
+        ClosureStream::register();
+
+        if (static::$securityProvider !== null) {
+            if ($data[0] !== '@') {
+                throw new SecurityException("The serialized closure is not signed. ".
+                    "Make sure you use a security provider for both serialization and unserialization.");
+            }
+
+            $data = json_decode(substr($data, 1), true);
+
+            if (!is_array($data) || !static::$securityProvider->verify($data)) {
+                throw new SecurityException("Your serialized closure might have been modified and it's unsafe to be unserialized. " .
+                    "Make sure you use the same security provider, with the same settings, " .
+                    "both for serialization and unserialization.");
+            }
+
+            $data = $data['closure'];
+        } elseif ($data[0] === '@') {
+            throw new SecurityException("The serialized closure is signed. ".
+                "Make sure you use a security provider for both serialization and unserialization.");
+        }
+
+        $this->code = \unserialize($data);
+
+        // unset data
+        unset($data);
+
+        $this->code['objects'] = array();
+
+        if ($this->code['use']) {
+            $this->scope = new ClosureScope();
+            $this->code['use'] = $this->resolveUseVariables($this->code['use']);
+            $this->mapPointers($this->code['use']);
+            extract($this->code['use'], EXTR_OVERWRITE | EXTR_REFS);
+            $this->scope = null;
+        }
+
+        $this->closure = include(ClosureStream::STREAM_PROTO . '://' . $this->code['function']);
+
+        if($this->code['this'] === $this){
+            $this->code['this'] = null;
+        }
+
+        if ($this->code['scope'] !== null || $this->code['this'] !== null) {
+            $this->closure = $this->closure->bindTo($this->code['this'], $this->code['scope']);
+        }
+
+        if(!empty($this->code['objects'])){
+            foreach ($this->code['objects'] as $item){
+                $item['property']->setValue($item['instance'], $item['object']->getClosure());
+            }
+        }
+
+        $this->code = $this->code['function'];
+    }
+
+    /**
+     * Resolve the use variables after unserialization.
+     *
+     * @param  array  $data The Closure's transformed use variables
+     * @return array
+     */
+    protected function resolveUseVariables($data)
+    {
+        return $data;
+    }
+
+    /**
+     * Wraps a closure and sets the serialization context (if any)
+     *
+     * @param   Closure $closure Closure to be wrapped
+     *
+     * @return  self    The wrapped closure
+     */
+    public static function from(Closure $closure)
+    {
+        if (static::$context === null) {
+            $instance = new static($closure);
+        } elseif (isset(static::$context->scope[$closure])) {
+            $instance = static::$context->scope[$closure];
+        } else {
+            $instance = new static($closure);
+            static::$context->scope[$closure] = $instance;
+        }
+
+        return $instance;
+    }
+
+    /**
+     * Increments the context lock counter or creates a new context if none exist
+     */
+    public static function enterContext()
+    {
+        if (static::$context === null) {
+            static::$context = new ClosureContext();
+        }
+
+        static::$context->locks++;
+    }
+
+    /**
+     * Decrements the context lock counter and destroy the context when it reaches to 0
+     */
+    public static function exitContext()
+    {
+        if (static::$context !== null && !--static::$context->locks) {
+            static::$context = null;
+        }
+    }
+
+    /**
+     * @param string $secret
+     */
+    public static function setSecretKey($secret)
+    {
+        if(static::$securityProvider === null){
+            static::$securityProvider = new SecurityProvider($secret);
+        }
+    }
+
+    /**
+     * @param ISecurityProvider $securityProvider
+     */
+    public static function addSecurityProvider(ISecurityProvider $securityProvider)
+    {
+        static::$securityProvider = $securityProvider;
+    }
+
+    /**
+     * Remove security provider
+     */
+    public static function removeSecurityProvider()
+    {
+        static::$securityProvider = null;
+    }
+
+    /**
+     * @return null|ISecurityProvider
+     */
+    public static function getSecurityProvider()
+    {
+        return static::$securityProvider;
+    }
+
+    /**
+     * Wrap closures
+     *
+     * @param $data
+     * @param ClosureScope|SplObjectStorage|null $storage
+     */
+    public static function wrapClosures(&$data, SplObjectStorage $storage = null)
+    {
+        static::enterContext();
+
+        if($storage === null){
+            $storage = static::$context->scope;
+        }
+
+        if($data instanceof Closure){
+            $data = static::from($data);
+        } elseif (is_array($data)){
+            if(isset($data[self::ARRAY_RECURSIVE_KEY])){
+                return;
+            }
+            $data[self::ARRAY_RECURSIVE_KEY] = true;
+            foreach ($data as $key => &$value){
+                if($key === self::ARRAY_RECURSIVE_KEY){
+                    continue;
+                }
+                static::wrapClosures($value, $storage);
+            }
+            unset($value);
+            unset($data[self::ARRAY_RECURSIVE_KEY]);
+        } elseif($data instanceof \stdClass){
+            if(isset($storage[$data])){
+                $data = $storage[$data];
+                return;
+            }
+            $data = $storage[$data] = clone($data);
+            foreach ($data as &$value){
+                static::wrapClosures($value, $storage);
+            }
+            unset($value);
+        } elseif (is_object($data) && ! $data instanceof static){
+            if(isset($storage[$data])){
+                $data = $storage[$data];
+                return;
+            }
+            $instance = $data;
+            $reflection = new ReflectionObject($instance);
+            if(!$reflection->isUserDefined()){
+                $storage[$instance] = $data;
+                return;
+            }
+            $storage[$instance] = $data = $reflection->newInstanceWithoutConstructor();
+
+            do{
+                if(!$reflection->isUserDefined()){
+                    break;
+                }
+                foreach ($reflection->getProperties() as $property){
+                    if($property->isStatic()){
+                        continue;
+                    }
+                    $property->setAccessible(true);
+                    $value = $property->getValue($instance);
+                    if(is_array($value) || is_object($value)){
+                        static::wrapClosures($value, $storage);
+                    }
+                    $property->setValue($data, $value);
+                };
+            } while($reflection = $reflection->getParentClass());
+        }
+
+        static::exitContext();
+    }
+
+    /**
+     * Unwrap closures
+     *
+     * @param $data
+     * @param SplObjectStorage|null $storage
+     */
+    public static function unwrapClosures(&$data, SplObjectStorage $storage = null)
+    {
+        if($storage === null){
+            $storage = static::$context->scope;
+        }
+
+        if($data instanceof static){
+            $data = $data->getClosure();
+        } elseif (is_array($data)){
+            if(isset($data[self::ARRAY_RECURSIVE_KEY])){
+                return;
+            }
+            $data[self::ARRAY_RECURSIVE_KEY] = true;
+            foreach ($data as $key => &$value){
+                if($key === self::ARRAY_RECURSIVE_KEY){
+                    continue;
+                }
+                static::unwrapClosures($value, $storage);
+            }
+            unset($data[self::ARRAY_RECURSIVE_KEY]);
+        }elseif ($data instanceof \stdClass){
+            if(isset($storage[$data])){
+                return;
+            }
+            $storage[$data] = true;
+            foreach ($data as &$property){
+                static::unwrapClosures($property, $storage);
+            }
+        } elseif (is_object($data) && !($data instanceof Closure)){
+            if(isset($storage[$data])){
+                return;
+            }
+            $storage[$data] = true;
+            $reflection = new ReflectionObject($data);
+
+            do{
+                if(!$reflection->isUserDefined()){
+                    break;
+                }
+                foreach ($reflection->getProperties() as $property){
+                    if($property->isStatic()){
+                        continue;
+                    }
+                    $property->setAccessible(true);
+                    $value = $property->getValue($data);
+                    if(is_array($value) || is_object($value)){
+                        static::unwrapClosures($value, $storage);
+                        $property->setValue($data, $value);
+                    }
+                };
+            } while($reflection = $reflection->getParentClass());
+        }
+    }
+
+    /**
+     * Internal method used to map closure pointers
+     * @param $data
+     */
+    protected function mapPointers(&$data)
+    {
+        $scope = $this->scope;
+
+        if ($data instanceof static) {
+            $data = &$data->closure;
+        } elseif (is_array($data)) {
+            if(isset($data[self::ARRAY_RECURSIVE_KEY])){
+                return;
+            }
+            $data[self::ARRAY_RECURSIVE_KEY] = true;
+            foreach ($data as $key => &$value){
+                if($key === self::ARRAY_RECURSIVE_KEY){
+                    continue;
+                } elseif ($value instanceof static) {
+                    $data[$key] = &$value->closure;
+                } elseif ($value instanceof SelfReference && $value->hash === $this->code['self']){
+                    $data[$key] = &$this->closure;
+                } else {
+                    $this->mapPointers($value);
+                }
+            }
+            unset($value);
+            unset($data[self::ARRAY_RECURSIVE_KEY]);
+        } elseif ($data instanceof \stdClass) {
+            if(isset($scope[$data])){
+                return;
+            }
+            $scope[$data] = true;
+            foreach ($data as $key => &$value){
+                if ($value instanceof SelfReference && $value->hash === $this->code['self']){
+                    $data->{$key} = &$this->closure;
+                } elseif(is_array($value) || is_object($value)) {
+                    $this->mapPointers($value);
+                }
+            }
+            unset($value);
+        } elseif (is_object($data) && !($data instanceof Closure)){
+            if(isset($scope[$data])){
+                return;
+            }
+            $scope[$data] = true;
+            $reflection = new ReflectionObject($data);
+            do{
+                if(!$reflection->isUserDefined()){
+                    break;
+                }
+                foreach ($reflection->getProperties() as $property){
+                    if($property->isStatic()){
+                        continue;
+                    }
+                    $property->setAccessible(true);
+                    $item = $property->getValue($data);
+                    if ($item instanceof SerializableClosure || ($item instanceof SelfReference && $item->hash === $this->code['self'])) {
+                        $this->code['objects'][] = array(
+                            'instance' => $data,
+                            'property' => $property,
+                            'object' => $item instanceof SelfReference ? $this : $item,
+                        );
+                    } elseif (is_array($item) || is_object($item)) {
+                        $this->mapPointers($item);
+                        $property->setValue($data, $item);
+                    }
+                }
+            } while($reflection = $reflection->getParentClass());
+        }
+    }
+
+    /**
+     * Internal method used to map closures by reference
+     *
+     * @param   mixed &$data
+     */
+    protected function mapByReference(&$data)
+    {
+        if ($data instanceof Closure) {
+            if($data === $this->closure){
+                $data = new SelfReference($this->reference);
+                return;
+            }
+
+            if (isset($this->scope[$data])) {
+                $data = $this->scope[$data];
+                return;
+            }
+
+            $instance = new static($data);
+
+            if (static::$context !== null) {
+                static::$context->scope->toserialize--;
+            } else {
+                $instance->scope = $this->scope;
+            }
+
+            $data = $this->scope[$data] = $instance;
+        } elseif (is_array($data)) {
+            if(isset($data[self::ARRAY_RECURSIVE_KEY])){
+                return;
+            }
+            $data[self::ARRAY_RECURSIVE_KEY] = true;
+            foreach ($data as $key => &$value){
+                if($key === self::ARRAY_RECURSIVE_KEY){
+                    continue;
+                }
+                $this->mapByReference($value);
+            }
+            unset($value);
+            unset($data[self::ARRAY_RECURSIVE_KEY]);
+        } elseif ($data instanceof \stdClass) {
+            if(isset($this->scope[$data])){
+                $data = $this->scope[$data];
+                return;
+            }
+            $instance = $data;
+            $this->scope[$instance] = $data = clone($data);
+
+            foreach ($data as &$value){
+                $this->mapByReference($value);
+            }
+            unset($value);
+        } elseif (is_object($data) && !$data instanceof SerializableClosure){
+            if(isset($this->scope[$data])){
+                $data = $this->scope[$data];
+                return;
+            }
+
+            $instance = $data;
+            $reflection = new ReflectionObject($data);
+            if(!$reflection->isUserDefined()){
+                $this->scope[$instance] = $data;
+                return;
+            }
+            $this->scope[$instance] = $data = $reflection->newInstanceWithoutConstructor();
+
+            do{
+                if(!$reflection->isUserDefined()){
+                    break;
+                }
+                foreach ($reflection->getProperties() as $property){
+                    if($property->isStatic()){
+                        continue;
+                    }
+                    $property->setAccessible(true);
+                    $value = $property->getValue($instance);
+                    if(is_array($value) || is_object($value)){
+                        $this->mapByReference($value);
+                    }
+                    $property->setValue($data, $value);
+                }
+            } while($reflection = $reflection->getParentClass());
+        }
+    }
+
+}
diff --git a/vendor/paragonie/random_compat/composer.json b/vendor/paragonie/random_compat/composer.json
index 34f1381d..1fa8de9f 100644
--- a/vendor/paragonie/random_compat/composer.json
+++ b/vendor/paragonie/random_compat/composer.json
@@ -22,17 +22,13 @@
     "source":     "https://github.com/paragonie/random_compat"
   },
   "require": {
-    "php": ">=5.2.0"
+    "php": "^7"
   },
   "require-dev": {
+    "vimeo/psalm": "^1",
     "phpunit/phpunit": "4.*|5.*"
   },
   "suggest": {
     "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
-  },
-  "autoload": {
-    "files": [
-      "lib/random.php"
-    ]
   }
 }
diff --git a/vendor/paragonie/random_compat/lib/byte_safe_strings.php b/vendor/paragonie/random_compat/lib/byte_safe_strings.php
deleted file mode 100644
index 2a7335dd..00000000
--- a/vendor/paragonie/random_compat/lib/byte_safe_strings.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-/**
- * Random_* Compatibility Library
- * for using the new PHP 7 random_* API in PHP 5 projects
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-if (!is_callable('RandomCompat_strlen')) {
-    if (
-        defined('MB_OVERLOAD_STRING') &&
-        ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
-    ) {
-        /**
-         * strlen() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version uses mb_strlen() in '8bit' mode to treat strings as raw
-         * binary rather than UTF-8, ISO-8859-1, etc
-         *
-         * @param string $binary_string
-         *
-         * @throws TypeError
-         *
-         * @return int
-         */
-        function RandomCompat_strlen($binary_string)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_strlen() expects a string'
-                );
-            }
-
-            return (int) mb_strlen($binary_string, '8bit');
-        }
-
-    } else {
-        /**
-         * strlen() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version just used the default strlen()
-         *
-         * @param string $binary_string
-         *
-         * @throws TypeError
-         *
-         * @return int
-         */
-        function RandomCompat_strlen($binary_string)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_strlen() expects a string'
-                );
-            }
-            return (int) strlen($binary_string);
-        }
-    }
-}
-
-if (!is_callable('RandomCompat_substr')) {
-
-    if (
-        defined('MB_OVERLOAD_STRING')
-        &&
-        ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
-    ) {
-        /**
-         * substr() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version uses mb_substr() in '8bit' mode to treat strings as raw
-         * binary rather than UTF-8, ISO-8859-1, etc
-         *
-         * @param string $binary_string
-         * @param int $start
-         * @param int $length (optional)
-         *
-         * @throws TypeError
-         *
-         * @return string
-         */
-        function RandomCompat_substr($binary_string, $start, $length = null)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): First argument should be a string'
-                );
-            }
-
-            if (!is_int($start)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): Second argument should be an integer'
-                );
-            }
-
-            if ($length === null) {
-                /**
-                 * mb_substr($str, 0, NULL, '8bit') returns an empty string on
-                 * PHP 5.3, so we have to find the length ourselves.
-                 */
-                $length = RandomCompat_strlen($binary_string) - $start;
-            } elseif (!is_int($length)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): Third argument should be an integer, or omitted'
-                );
-            }
-
-            // Consistency with PHP's behavior
-            if ($start === RandomCompat_strlen($binary_string) && $length === 0) {
-                return '';
-            }
-            if ($start > RandomCompat_strlen($binary_string)) {
-                return '';
-            }
-
-            return (string) mb_substr($binary_string, $start, $length, '8bit');
-        }
-
-    } else {
-
-        /**
-         * substr() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version just uses the default substr()
-         *
-         * @param string $binary_string
-         * @param int $start
-         * @param int $length (optional)
-         *
-         * @throws TypeError
-         *
-         * @return string
-         */
-        function RandomCompat_substr($binary_string, $start, $length = null)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): First argument should be a string'
-                );
-            }
-
-            if (!is_int($start)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): Second argument should be an integer'
-                );
-            }
-
-            if ($length !== null) {
-                if (!is_int($length)) {
-                    throw new TypeError(
-                        'RandomCompat_substr(): Third argument should be an integer, or omitted'
-                    );
-                }
-
-                return (string) substr($binary_string, $start, $length);
-            }
-
-            return (string) substr($binary_string, $start);
-        }
-    }
-}
diff --git a/vendor/paragonie/random_compat/lib/cast_to_int.php b/vendor/paragonie/random_compat/lib/cast_to_int.php
deleted file mode 100644
index 14b4b348..00000000
--- a/vendor/paragonie/random_compat/lib/cast_to_int.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Random_* Compatibility Library
- * for using the new PHP 7 random_* API in PHP 5 projects
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-if (!is_callable('RandomCompat_intval')) {
-    
-    /**
-     * Cast to an integer if we can, safely.
-     * 
-     * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
-     * (non-inclusive), it will sanely cast it to an int. If you it's equal to
-     * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats 
-     * lose precision, so the <= and => operators might accidentally let a float
-     * through.
-     * 
-     * @param int|float $number    The number we want to convert to an int
-     * @param bool      $fail_open Set to true to not throw an exception
-     * 
-     * @return float|int
-     * @psalm-suppress InvalidReturnType
-     *
-     * @throws TypeError
-     */
-    function RandomCompat_intval($number, $fail_open = false)
-    {
-        if (is_int($number) || is_float($number)) {
-            $number += 0;
-        } elseif (is_numeric($number)) {
-            $number += 0;
-        }
-
-        if (
-            is_float($number)
-            &&
-            $number > ~PHP_INT_MAX
-            &&
-            $number < PHP_INT_MAX
-        ) {
-            $number = (int) $number;
-        }
-
-        if (is_int($number)) {
-            return (int) $number;
-        } elseif (!$fail_open) {
-            throw new TypeError(
-                'Expected an integer.'
-            );
-        }
-        return $number;
-    }
-}
diff --git a/vendor/paragonie/random_compat/lib/error_polyfill.php b/vendor/paragonie/random_compat/lib/error_polyfill.php
deleted file mode 100644
index 6d4a19ac..00000000
--- a/vendor/paragonie/random_compat/lib/error_polyfill.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Random_* Compatibility Library 
- * for using the new PHP 7 random_* API in PHP 5 projects
- * 
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-if (!class_exists('Error', false)) {
-    // We can't really avoid making this extend Exception in PHP 5.
-    class Error extends Exception
-    {
-        
-    }
-}
-
-if (!class_exists('TypeError', false)) {
-    if (is_subclass_of('Error', 'Exception')) {
-        class TypeError extends Error
-        {
-            
-        }
-    } else {
-        class TypeError extends Exception
-        {
-            
-        }
-    }
-}
diff --git a/vendor/paragonie/random_compat/lib/random.php b/vendor/paragonie/random_compat/lib/random.php
index d5391882..c7731a56 100644
--- a/vendor/paragonie/random_compat/lib/random.php
+++ b/vendor/paragonie/random_compat/lib/random.php
@@ -3,8 +3,8 @@
  * Random_* Compatibility Library
  * for using the new PHP 7 random_* API in PHP 5 projects
  *
- * @version 2.0.15
- * @released 2018-06-08
+ * @version 2.99.99
+ * @released 2018-06-06
  *
  * The MIT License (MIT)
  *
@@ -29,198 +29,4 @@
  * SOFTWARE.
  */
 
-if (!defined('PHP_VERSION_ID')) {
-    // This constant was introduced in PHP 5.2.7
-    $RandomCompatversion = array_map('intval', explode('.', PHP_VERSION));
-    define(
-        'PHP_VERSION_ID',
-        $RandomCompatversion[0] * 10000
-        + $RandomCompatversion[1] * 100
-        + $RandomCompatversion[2]
-    );
-    $RandomCompatversion = null;
-}
-
-/**
- * PHP 7.0.0 and newer have these functions natively.
- */
-if (PHP_VERSION_ID >= 70000) {
-    return;
-}
-
-if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
-    define('RANDOM_COMPAT_READ_BUFFER', 8);
-}
-
-$RandomCompatDIR = dirname(__FILE__);
-
-require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'byte_safe_strings.php';
-require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'cast_to_int.php';
-require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'error_polyfill.php';
-
-if (!is_callable('random_bytes')) {
-    /**
-     * PHP 5.2.0 - 5.6.x way to implement random_bytes()
-     *
-     * We use conditional statements here to define the function in accordance
-     * to the operating environment. It's a micro-optimization.
-     *
-     * In order of preference:
-     *   1. Use libsodium if available.
-     *   2. fread() /dev/urandom if available (never on Windows)
-     *   3. mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM)
-     *   4. COM('CAPICOM.Utilities.1')->GetRandom()
-     *
-     * See RATIONALE.md for our reasoning behind this particular order
-     */
-    if (extension_loaded('libsodium')) {
-        // See random_bytes_libsodium.php
-        if (PHP_VERSION_ID >= 50300 && is_callable('\\Sodium\\randombytes_buf')) {
-            require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_libsodium.php';
-        } elseif (method_exists('Sodium', 'randombytes_buf')) {
-            require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_libsodium_legacy.php';
-        }
-    }
-
-    /**
-     * Reading directly from /dev/urandom:
-     */
-    if (DIRECTORY_SEPARATOR === '/') {
-        // DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast
-        // way to exclude Windows.
-        $RandomCompatUrandom = true;
-        $RandomCompat_basedir = ini_get('open_basedir');
-
-        if (!empty($RandomCompat_basedir)) {
-            $RandomCompat_open_basedir = explode(
-                PATH_SEPARATOR,
-                strtolower($RandomCompat_basedir)
-            );
-            $RandomCompatUrandom = (array() !== array_intersect(
-                array('/dev', '/dev/', '/dev/urandom'),
-                $RandomCompat_open_basedir
-            ));
-            $RandomCompat_open_basedir = null;
-        }
-
-        if (
-            !is_callable('random_bytes')
-            &&
-            $RandomCompatUrandom
-            &&
-            @is_readable('/dev/urandom')
-        ) {
-            // Error suppression on is_readable() in case of an open_basedir
-            // or safe_mode failure. All we care about is whether or not we
-            // can read it at this point. If the PHP environment is going to
-            // panic over trying to see if the file can be read in the first
-            // place, that is not helpful to us here.
-
-            // See random_bytes_dev_urandom.php
-            require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_dev_urandom.php';
-        }
-        // Unset variables after use
-        $RandomCompat_basedir = null;
-    } else {
-        $RandomCompatUrandom = false;
-    }
-
-    /**
-     * mcrypt_create_iv()
-     *
-     * We only want to use mcypt_create_iv() if:
-     *
-     * - random_bytes() hasn't already been defined
-     * - the mcrypt extensions is loaded
-     * - One of these two conditions is true:
-     *   - We're on Windows (DIRECTORY_SEPARATOR !== '/')
-     *   - We're not on Windows and /dev/urandom is readabale
-     *     (i.e. we're not in a chroot jail)
-     * - Special case:
-     *   - If we're not on Windows, but the PHP version is between
-     *     5.6.10 and 5.6.12, we don't want to use mcrypt. It will
-     *     hang indefinitely. This is bad.
-     *   - If we're on Windows, we want to use PHP >= 5.3.7 or else
-     *     we get insufficient entropy errors.
-     */
-    if (
-        !is_callable('random_bytes')
-        &&
-        // Windows on PHP < 5.3.7 is broken, but non-Windows is not known to be.
-        (DIRECTORY_SEPARATOR === '/' || PHP_VERSION_ID >= 50307)
-        &&
-        // Prevent this code from hanging indefinitely on non-Windows;
-        // see https://bugs.php.net/bug.php?id=69833
-        (
-            DIRECTORY_SEPARATOR !== '/' ||
-            (PHP_VERSION_ID <= 50609 || PHP_VERSION_ID >= 50613)
-        )
-        &&
-        extension_loaded('mcrypt')
-    ) {
-        // See random_bytes_mcrypt.php
-        require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_mcrypt.php';
-    }
-    $RandomCompatUrandom = null;
-
-    /**
-     * This is a Windows-specific fallback, for when the mcrypt extension
-     * isn't loaded.
-     */
-    if (
-        !is_callable('random_bytes')
-        &&
-        extension_loaded('com_dotnet')
-        &&
-        class_exists('COM')
-    ) {
-        $RandomCompat_disabled_classes = preg_split(
-            '#\s*,\s*#',
-            strtolower(ini_get('disable_classes'))
-        );
-
-        if (!in_array('com', $RandomCompat_disabled_classes)) {
-            try {
-                $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
-                if (method_exists($RandomCompatCOMtest, 'GetRandom')) {
-                    // See random_bytes_com_dotnet.php
-                    require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_com_dotnet.php';
-                }
-            } catch (com_exception $e) {
-                // Don't try to use it.
-            }
-        }
-        $RandomCompat_disabled_classes = null;
-        $RandomCompatCOMtest = null;
-    }
-
-    /**
-     * throw new Exception
-     */
-    if (!is_callable('random_bytes')) {
-        /**
-         * We don't have any more options, so let's throw an exception right now
-         * and hope the developer won't let it fail silently.
-         *
-         * @param mixed $length
-         * @psalm-suppress MissingReturnType
-         * @psalm-suppress InvalidReturnType
-         * @throws Exception
-         * @return string
-         */
-        function random_bytes($length)
-        {
-            unset($length); // Suppress "variable not used" warnings.
-            throw new Exception(
-                'There is no suitable CSPRNG installed on your system'
-            );
-            return '';
-        }
-    }
-}
-
-if (!is_callable('random_int')) {
-    require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_int.php';
-}
-
-$RandomCompatDIR = null;
+// NOP
diff --git a/vendor/paragonie/random_compat/lib/random_bytes_com_dotnet.php b/vendor/paragonie/random_compat/lib/random_bytes_com_dotnet.php
deleted file mode 100644
index 2b83369e..00000000
--- a/vendor/paragonie/random_compat/lib/random_bytes_com_dotnet.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Random_* Compatibility Library 
- * for using the new PHP 7 random_* API in PHP 5 projects
- * 
- * The MIT License (MIT)
- * 
- * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-if (!is_callable('random_bytes')) {
-    /**
-     * Windows with PHP < 5.3.0 will not have the function
-     * openssl_random_pseudo_bytes() available, so let's use
-     * CAPICOM to work around this deficiency.
-     *
-     * @param int $bytes
-     *
-     * @throws Exception
-     *
-     * @return string
-     */
-    function random_bytes($bytes)
-    {
-        try {
-            $bytes = RandomCompat_intval($bytes);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_bytes(): $bytes must be an integer'
-            );
-        }
-
-        if ($bytes < 1) {
-            throw new Error(
-                'Length must be greater than 0'
-            );
-        }
-
-        $buf = '';
-        if (!class_exists('COM')) {
-            throw new Error(
-                'COM does not exist'
-            );
-        }
-        $util = new COM('CAPICOM.Utilities.1');
-        $execCount = 0;
-
-        /**
-         * Let's not let it loop forever. If we run N times and fail to
-         * get N bytes of random data, then CAPICOM has failed us.
-         */
-        do {
-            $buf .= base64_decode($util->GetRandom($bytes, 0));
-            if (RandomCompat_strlen($buf) >= $bytes) {
-                /**
-                 * Return our random entropy buffer here:
-                 */
-                return RandomCompat_substr($buf, 0, $bytes);
-            }
-            ++$execCount;
-        } while ($execCount < $bytes);
-
-        /**
-         * If we reach here, PHP has failed us.
-         */
-        throw new Exception(
-            'Could not gather sufficient random data'
-        );
-    }
-}
\ No newline at end of file
diff --git a/vendor/paragonie/random_compat/lib/random_bytes_dev_urandom.php b/vendor/paragonie/random_compat/lib/random_bytes_dev_urandom.php
deleted file mode 100644
index ac36034a..00000000
--- a/vendor/paragonie/random_compat/lib/random_bytes_dev_urandom.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-/**
- * Random_* Compatibility Library 
- * for using the new PHP 7 random_* API in PHP 5 projects
- * 
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
-    define('RANDOM_COMPAT_READ_BUFFER', 8);
-}
-
-if (!is_callable('random_bytes')) {
-    /**
-     * Unless open_basedir is enabled, use /dev/urandom for
-     * random numbers in accordance with best practices
-     *
-     * Why we use /dev/urandom and not /dev/random
-     * @ref http://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers
-     *
-     * @param int $bytes
-     *
-     * @throws Exception
-     *
-     * @return string
-     */
-    function random_bytes($bytes)
-    {
-        static $fp = null;
-        /**
-         * This block should only be run once
-         */
-        if (empty($fp)) {
-            /**
-             * We use /dev/urandom if it is a char device.
-             * We never fall back to /dev/random
-             */
-            $fp = fopen('/dev/urandom', 'rb');
-            if (!empty($fp)) {
-                $st = fstat($fp);
-                if (($st['mode'] & 0170000) !== 020000) {
-                    fclose($fp);
-                    $fp = false;
-                }
-            }
-
-            if (!empty($fp)) {
-                /**
-                 * stream_set_read_buffer() does not exist in HHVM
-                 *
-                 * If we don't set the stream's read buffer to 0, PHP will
-                 * internally buffer 8192 bytes, which can waste entropy
-                 *
-                 * stream_set_read_buffer returns 0 on success
-                 */
-                if (is_callable('stream_set_read_buffer')) {
-                    stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER);
-                }
-                if (is_callable('stream_set_chunk_size')) {
-                    stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER);
-                }
-            }
-        }
-
-        try {
-            $bytes = RandomCompat_intval($bytes);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_bytes(): $bytes must be an integer'
-            );
-        }
-
-        if ($bytes < 1) {
-            throw new Error(
-                'Length must be greater than 0'
-            );
-        }
-
-        /**
-         * This if() block only runs if we managed to open a file handle
-         *
-         * It does not belong in an else {} block, because the above
-         * if (empty($fp)) line is logic that should only be run once per
-         * page load.
-         */
-        if (!empty($fp)) {
-            /**
-             * @var int
-             */
-            $remaining = $bytes;
-
-            /**
-             * @var string|bool
-             */
-            $buf = '';
-
-            /**
-             * We use fread() in a loop to protect against partial reads
-             */
-            do {
-                /**
-                 * @var string|bool
-                 */
-                $read = fread($fp, $remaining);
-                if (!is_string($read)) {
-                    if ($read === false) {
-                        /**
-                         * We cannot safely read from the file. Exit the
-                         * do-while loop and trigger the exception condition
-                         *
-                         * @var string|bool
-                         */
-                        $buf = false;
-                        break;
-                    }
-                }
-                /**
-                 * Decrease the number of bytes returned from remaining
-                 */
-                $remaining -= RandomCompat_strlen($read);
-                /**
-                 * @var string|bool
-                 */
-                $buf = $buf . $read;
-            } while ($remaining > 0);
-
-            /**
-             * Is our result valid?
-             */
-            if (is_string($buf)) {
-                if (RandomCompat_strlen($buf) === $bytes) {
-                    /**
-                     * Return our random entropy buffer here:
-                     */
-                    return $buf;
-                }
-            }
-        }
-
-        /**
-         * If we reach here, PHP has failed us.
-         */
-        throw new Exception(
-            'Error reading from source device'
-        );
-    }
-}
diff --git a/vendor/paragonie/random_compat/lib/random_bytes_libsodium.php b/vendor/paragonie/random_compat/lib/random_bytes_libsodium.php
deleted file mode 100644
index 1e017c14..00000000
--- a/vendor/paragonie/random_compat/lib/random_bytes_libsodium.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Random_* Compatibility Library 
- * for using the new PHP 7 random_* API in PHP 5 projects
- * 
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-if (!is_callable('random_bytes')) {
-    /**
-     * If the libsodium PHP extension is loaded, we'll use it above any other
-     * solution.
-     *
-     * libsodium-php project:
-     * @ref https://github.com/jedisct1/libsodium-php
-     *
-     * @param int $bytes
-     *
-     * @throws Exception
-     *
-     * @return string
-     */
-    function random_bytes($bytes)
-    {
-        try {
-            $bytes = RandomCompat_intval($bytes);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_bytes(): $bytes must be an integer'
-            );
-        }
-
-        if ($bytes < 1) {
-            throw new Error(
-                'Length must be greater than 0'
-            );
-        }
-
-        /**
-         * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be
-         * generated in one invocation.
-         */
-        if ($bytes > 2147483647) {
-            $buf = '';
-            for ($i = 0; $i < $bytes; $i += 1073741824) {
-                $n = ($bytes - $i) > 1073741824
-                    ? 1073741824
-                    : $bytes - $i;
-                $buf .= \Sodium\randombytes_buf($n);
-            }
-        } else {
-            $buf = \Sodium\randombytes_buf($bytes);
-        }
-
-        if ($buf !== false) {
-            if (RandomCompat_strlen($buf) === $bytes) {
-                return $buf;
-            }
-        }
-
-        /**
-         * If we reach here, PHP has failed us.
-         */
-        throw new Exception(
-            'Could not gather sufficient random data'
-        );
-    }
-}
diff --git a/vendor/paragonie/random_compat/lib/random_bytes_libsodium_legacy.php b/vendor/paragonie/random_compat/lib/random_bytes_libsodium_legacy.php
deleted file mode 100644
index 388da4dc..00000000
--- a/vendor/paragonie/random_compat/lib/random_bytes_libsodium_legacy.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Random_* Compatibility Library 
- * for using the new PHP 7 random_* API in PHP 5 projects
- * 
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-if (!is_callable('random_bytes')) {
-    /**
-     * If the libsodium PHP extension is loaded, we'll use it above any other
-     * solution.
-     *
-     * libsodium-php project:
-     * @ref https://github.com/jedisct1/libsodium-php
-     *
-     * @param int $bytes
-     *
-     * @throws Exception
-     *
-     * @return string
-     */
-    function random_bytes($bytes)
-    {
-        try {
-            $bytes = RandomCompat_intval($bytes);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_bytes(): $bytes must be an integer'
-            );
-        }
-
-        if ($bytes < 1) {
-            throw new Error(
-                'Length must be greater than 0'
-            );
-        }
-
-        /**
-         * @var string
-         */
-        $buf = '';
-
-        /**
-         * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be
-         * generated in one invocation.
-         */
-        if ($bytes > 2147483647) {
-            for ($i = 0; $i < $bytes; $i += 1073741824) {
-                $n = ($bytes - $i) > 1073741824
-                    ? 1073741824
-                    : $bytes - $i;
-                $buf .= Sodium::randombytes_buf((int) $n);
-            }
-        } else {
-            $buf .= Sodium::randombytes_buf((int) $bytes);
-        }
-
-        if (is_string($buf)) {
-            if (RandomCompat_strlen($buf) === $bytes) {
-                return $buf;
-            }
-        }
-
-        /**
-         * If we reach here, PHP has failed us.
-         */
-        throw new Exception(
-            'Could not gather sufficient random data'
-        );
-    }
-}
diff --git a/vendor/paragonie/random_compat/lib/random_bytes_mcrypt.php b/vendor/paragonie/random_compat/lib/random_bytes_mcrypt.php
deleted file mode 100644
index 879450c9..00000000
--- a/vendor/paragonie/random_compat/lib/random_bytes_mcrypt.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Random_* Compatibility Library 
- * for using the new PHP 7 random_* API in PHP 5 projects
- * 
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-if (!is_callable('random_bytes')) {
-    /**
-     * Powered by ext/mcrypt (and thankfully NOT libmcrypt)
-     *
-     * @ref https://bugs.php.net/bug.php?id=55169
-     * @ref https://github.com/php/php-src/blob/c568ffe5171d942161fc8dda066bce844bdef676/ext/mcrypt/mcrypt.c#L1321-L1386
-     *
-     * @param int $bytes
-     *
-     * @throws Exception
-     *
-     * @return string
-     */
-    function random_bytes($bytes)
-    {
-        try {
-            $bytes = RandomCompat_intval($bytes);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_bytes(): $bytes must be an integer'
-            );
-        }
-
-        if ($bytes < 1) {
-            throw new Error(
-                'Length must be greater than 0'
-            );
-        }
-
-        $buf = @mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM);
-        if (
-            $buf !== false
-            &&
-            RandomCompat_strlen($buf) === $bytes
-        ) {
-            /**
-             * Return our random entropy buffer here:
-             */
-            return $buf;
-        }
-
-        /**
-         * If we reach here, PHP has failed us.
-         */
-        throw new Exception(
-            'Could not gather sufficient random data'
-        );
-    }
-}
diff --git a/vendor/paragonie/random_compat/lib/random_int.php b/vendor/paragonie/random_compat/lib/random_int.php
deleted file mode 100644
index 81bb725a..00000000
--- a/vendor/paragonie/random_compat/lib/random_int.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-
-if (!is_callable('random_int')) {
-    /**
-     * Random_* Compatibility Library
-     * for using the new PHP 7 random_* API in PHP 5 projects
-     *
-     * The MIT License (MIT)
-     *
-     * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
-     *
-     * Permission is hereby granted, free of charge, to any person obtaining a copy
-     * of this software and associated documentation files (the "Software"), to deal
-     * in the Software without restriction, including without limitation the rights
-     * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-     * copies of the Software, and to permit persons to whom the Software is
-     * furnished to do so, subject to the following conditions:
-     *
-     * The above copyright notice and this permission notice shall be included in
-     * all copies or substantial portions of the Software.
-     *
-     * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-     * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-     * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-     * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-     * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-     * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-     * SOFTWARE.
-     */
-
-    /**
-     * Fetch a random integer between $min and $max inclusive
-     *
-     * @param int $min
-     * @param int $max
-     *
-     * @throws Exception
-     *
-     * @return int
-     */
-    function random_int($min, $max)
-    {
-        /**
-         * Type and input logic checks
-         *
-         * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
-         * (non-inclusive), it will sanely cast it to an int. If you it's equal to
-         * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats
-         * lose precision, so the <= and => operators might accidentally let a float
-         * through.
-         */
-
-        try {
-            $min = RandomCompat_intval($min);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_int(): $min must be an integer'
-            );
-        }
-
-        try {
-            $max = RandomCompat_intval($max);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_int(): $max must be an integer'
-            );
-        }
-
-        /**
-         * Now that we've verified our weak typing system has given us an integer,
-         * let's validate the logic then we can move forward with generating random
-         * integers along a given range.
-         */
-        if ($min > $max) {
-            throw new Error(
-                'Minimum value must be less than or equal to the maximum value'
-            );
-        }
-
-        if ($max === $min) {
-            return (int) $min;
-        }
-
-        /**
-         * Initialize variables to 0
-         *
-         * We want to store:
-         * $bytes => the number of random bytes we need
-         * $mask => an integer bitmask (for use with the &) operator
-         *          so we can minimize the number of discards
-         */
-        $attempts = $bits = $bytes = $mask = $valueShift = 0;
-
-        /**
-         * At this point, $range is a positive number greater than 0. It might
-         * overflow, however, if $max - $min > PHP_INT_MAX. PHP will cast it to
-         * a float and we will lose some precision.
-         */
-        $range = $max - $min;
-
-        /**
-         * Test for integer overflow:
-         */
-        if (!is_int($range)) {
-
-            /**
-             * Still safely calculate wider ranges.
-             * Provided by @CodesInChaos, @oittaa
-             *
-             * @ref https://gist.github.com/CodesInChaos/03f9ea0b58e8b2b8d435
-             *
-             * We use ~0 as a mask in this case because it generates all 1s
-             *
-             * @ref https://eval.in/400356 (32-bit)
-             * @ref http://3v4l.org/XX9r5  (64-bit)
-             */
-            $bytes = PHP_INT_SIZE;
-            $mask = ~0;
-
-        } else {
-
-            /**
-             * $bits is effectively ceil(log($range, 2)) without dealing with
-             * type juggling
-             */
-            while ($range > 0) {
-                if ($bits % 8 === 0) {
-                    ++$bytes;
-                }
-                ++$bits;
-                $range >>= 1;
-                $mask = $mask << 1 | 1;
-            }
-            $valueShift = $min;
-        }
-
-        $val = 0;
-        /**
-         * Now that we have our parameters set up, let's begin generating
-         * random integers until one falls between $min and $max
-         */
-        do {
-            /**
-             * The rejection probability is at most 0.5, so this corresponds
-             * to a failure probability of 2^-128 for a working RNG
-             */
-            if ($attempts > 128) {
-                throw new Exception(
-                    'random_int: RNG is broken - too many rejections'
-                );
-            }
-
-            /**
-             * Let's grab the necessary number of random bytes
-             */
-            $randomByteString = random_bytes($bytes);
-
-            /**
-             * Let's turn $randomByteString into an integer
-             *
-             * This uses bitwise operators (<< and |) to build an integer
-             * out of the values extracted from ord()
-             *
-             * Example: [9F] | [6D] | [32] | [0C] =>
-             *   159 + 27904 + 3276800 + 201326592 =>
-             *   204631455
-             */
-            $val &= 0;
-            for ($i = 0; $i < $bytes; ++$i) {
-                $val |= ord($randomByteString[$i]) << ($i * 8);
-            }
-
-            /**
-             * Apply mask
-             */
-            $val &= $mask;
-            $val += $valueShift;
-
-            ++$attempts;
-            /**
-             * If $val overflows to a floating point number,
-             * ... or is larger than $max,
-             * ... or smaller than $min,
-             * then try again.
-             */
-        } while (!is_int($val) || $val > $max || $val < $min);
-
-        return (int) $val;
-    }
-}
diff --git a/vendor/phpspec/prophecy/CHANGES.md b/vendor/phpspec/prophecy/CHANGES.md
index 0dadd52a..fddfc412 100644
--- a/vendor/phpspec/prophecy/CHANGES.md
+++ b/vendor/phpspec/prophecy/CHANGES.md
@@ -1,8 +1,27 @@
-1.7.5 / 2018/04/18
+1.8.0 / 2018/08/05
+==================
+
+* Support for void return types without explicit will (@crellbar)
+* Clearer error message for unexpected method calls (@meridius)
+* Clearer error message for aggregate exceptions (@meridius)
+* More verbose `shouldBeCalledOnce` expectation (@olvlvl)
+* Ability to double Throwable, or methods that extend it (@ciaranmcnulty)
+* [fixed] Doubling methods where class has additional arguments to interface (@webimpress)
+* [fixed] Doubling methods where arguments are nullable but default is not null (@webimpress)
+* [fixed] Doubling magic methods on parent class (@dsnopek)
+* [fixed] Check method predictions only once (@dontub)
+* [fixed] Argument::containingString throwing error when called with non-string (@dcabrejas)
+
+1.7.6 / 2018/04/18
 ==================
 
 * Allow sebastian/comparator ^3.0 (@sebastianbergmann)
 
+1.7.5 / 2018/02/11
+==================
+
+* Support for object return type hints (thanks @greg0ire)
+
 1.7.4 / 2018/02/11
 ==================
 
diff --git a/vendor/phpspec/prophecy/composer.json b/vendor/phpspec/prophecy/composer.json
index bb3d3726..816f147e 100644
--- a/vendor/phpspec/prophecy/composer.json
+++ b/vendor/phpspec/prophecy/composer.json
@@ -27,7 +27,7 @@
 
     "require-dev": {
         "phpspec/phpspec": "^2.5|^3.2",
-        "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+        "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
     },
 
     "autoload": {
@@ -44,7 +44,7 @@
 
     "extra": {
         "branch-alias": {
-            "dev-master": "1.7.x-dev"
+            "dev-master": "1.8.x-dev"
         }
     }
 }
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/StringContainsToken.php b/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/StringContainsToken.php
index 24ff8c2e..bd8d423f 100644
--- a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/StringContainsToken.php
+++ b/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/StringContainsToken.php
@@ -32,7 +32,7 @@ class StringContainsToken implements TokenInterface
 
     public function scoreArgument($argument)
     {
-        return strpos($argument, $this->value) !== false ? 6 : false;
+        return is_string($argument) && strpos($argument, $this->value) !== false ? 6 : false;
     }
 
     /**
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Call/Call.php b/vendor/phpspec/prophecy/src/Prophecy/Call/Call.php
index 2f3fbadb..26522354 100644
--- a/vendor/phpspec/prophecy/src/Prophecy/Call/Call.php
+++ b/vendor/phpspec/prophecy/src/Prophecy/Call/Call.php
@@ -12,6 +12,7 @@
 namespace Prophecy\Call;
 
 use Exception;
+use Prophecy\Argument\ArgumentsWildcard;
 
 /**
  * Call object.
@@ -26,6 +27,7 @@ class Call
     private $exception;
     private $file;
     private $line;
+    private $scores;
 
     /**
      * Initializes call.
@@ -44,6 +46,7 @@ class Call
         $this->arguments   = $arguments;
         $this->returnValue = $returnValue;
         $this->exception   = $exception;
+        $this->scores      = new \SplObjectStorage();
 
         if ($file) {
             $this->file = $file;
@@ -124,4 +127,36 @@ class Call
 
         return sprintf('%s:%d', $this->file, $this->line);
     }
+
+    /**
+     * Adds the wildcard match score for the provided wildcard.
+     *
+     * @param ArgumentsWildcard $wildcard
+     * @param false|int $score
+     *
+     * @return $this
+     */
+    public function addScore(ArgumentsWildcard $wildcard, $score)
+    {
+        $this->scores[$wildcard] = $score;
+
+        return $this;
+    }
+
+    /**
+     * Returns wildcard match score for the provided wildcard. The score is
+     * calculated if not already done.
+     *
+     * @param ArgumentsWildcard $wildcard
+     *
+     * @return false|int False OR integer score (higher - better)
+     */
+    public function getScore(ArgumentsWildcard $wildcard)
+    {
+        if (isset($this->scores[$wildcard])) {
+            return $this->scores[$wildcard];
+        }
+
+        return $this->scores[$wildcard] = $wildcard->scoreArguments($this->getArguments());
+    }
 }
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Call/CallCenter.php b/vendor/phpspec/prophecy/src/Prophecy/Call/CallCenter.php
index 53b80f05..bc936c8f 100644
--- a/vendor/phpspec/prophecy/src/Prophecy/Call/CallCenter.php
+++ b/vendor/phpspec/prophecy/src/Prophecy/Call/CallCenter.php
@@ -96,6 +96,7 @@ class CallCenter
         // Sort matches by their score value
         @usort($matches, function ($match1, $match2) { return $match2[0] - $match1[0]; });
 
+        $score = $matches[0][0];
         // If Highest rated method prophecy has a promise - execute it or return null instead
         $methodProphecy = $matches[0][1];
         $returnValue = null;
@@ -115,9 +116,10 @@ class CallCenter
             );
         }
 
-        $this->recordedCalls[] = new Call(
+        $this->recordedCalls[] = $call = new Call(
             $methodName, $arguments, $returnValue, $exception, $file, $line
         );
+        $call->addScore($methodProphecy->getArgumentsWildcard(), $score);
 
         if (null !== $exception) {
             throw $exception;
@@ -139,7 +141,7 @@ class CallCenter
         return array_values(
             array_filter($this->recordedCalls, function (Call $call) use ($methodName, $wildcard) {
                 return $methodName === $call->getMethodName()
-                    && 0 < $wildcard->scoreArguments($call->getArguments())
+                    && 0 < $call->getScore($wildcard)
                 ;
             })
         );
@@ -149,23 +151,79 @@ class CallCenter
                                                    array $arguments)
     {
         $classname = get_class($prophecy->reveal());
-        $argstring = implode(', ', array_map(array($this->util, 'stringify'), $arguments));
-        $expected  = implode("\n", array_map(function (MethodProphecy $methodProphecy) {
-            return sprintf('  - %s(%s)',
+        $indentationLength = 8; // looks good
+        $argstring = implode(
+            ",\n",
+            $this->indentArguments(
+                array_map(array($this->util, 'stringify'), $arguments),
+                $indentationLength
+            )
+        );
+
+        $expected = array();
+
+        foreach (call_user_func_array('array_merge', $prophecy->getMethodProphecies()) as $methodProphecy) {
+            $expected[] = sprintf(
+                "  - %s(\n" .
+                "%s\n" .
+                "    )",
                 $methodProphecy->getMethodName(),
-                $methodProphecy->getArgumentsWildcard()
+                implode(
+                    ",\n",
+                    $this->indentArguments(
+                        array_map('strval', $methodProphecy->getArgumentsWildcard()->getTokens()),
+                        $indentationLength
+                    )
+                )
             );
-        }, call_user_func_array('array_merge', $prophecy->getMethodProphecies())));
+        }
 
         return new UnexpectedCallException(
             sprintf(
-                "Method call:\n".
-                "  - %s(%s)\n".
-                "on %s was not expected, expected calls were:\n%s",
-
-                $methodName, $argstring, $classname, $expected
+                "Unexpected method call on %s:\n".
+                "  - %s(\n".
+                "%s\n".
+                "    )\n".
+                "expected calls were:\n".
+                "%s",
+
+                $classname, $methodName, $argstring, implode("\n", $expected)
             ),
             $prophecy, $methodName, $arguments
+
+        );
+    }
+
+    private function formatExceptionMessage(MethodProphecy $methodProphecy)
+    {
+        return sprintf(
+            "  - %s(\n".
+            "%s\n".
+            "    )",
+            $methodProphecy->getMethodName(),
+            implode(
+                ",\n",
+                $this->indentArguments(
+                    array_map(
+                        function ($token) {
+                            return (string) $token;
+                        },
+                        $methodProphecy->getArgumentsWildcard()->getTokens()
+                    ),
+                    $indentationLength
+                )
+            )
+        );
+    }
+
+    private function indentArguments(array $arguments, $indentationLength)
+    {
+        return preg_replace_callback(
+            '/^/m',
+            function () use ($indentationLength) {
+                return str_repeat(' ', $indentationLength);
+            },
+            $arguments
         );
     }
 }
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/MagicCallPatch.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/MagicCallPatch.php
index 5f2c6077..9ff49cd7 100644
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/MagicCallPatch.php
+++ b/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/MagicCallPatch.php
@@ -58,20 +58,25 @@ class MagicCallPatch implements ClassPatchInterface
 
         foreach ($types as $type) {
             $reflectionClass = new \ReflectionClass($type);
-            $tagList = $this->tagRetriever->getTagList($reflectionClass);
 
-            foreach($tagList as $tag) {
-                $methodName = $tag->getMethodName();
+            while ($reflectionClass) {
+                $tagList = $this->tagRetriever->getTagList($reflectionClass);
 
-                if (empty($methodName)) {
-                    continue;
-                }
+                foreach ($tagList as $tag) {
+                    $methodName = $tag->getMethodName();
+
+                    if (empty($methodName)) {
+                        continue;
+                    }
 
-                if (!$reflectionClass->hasMethod($methodName)) {
-                    $methodNode = new MethodNode($methodName);
-                    $methodNode->setStatic($tag->isStatic());
-                    $node->addMethod($methodNode);
+                    if (!$reflectionClass->hasMethod($methodName)) {
+                        $methodNode = new MethodNode($methodName);
+                        $methodNode->setStatic($tag->isStatic());
+                        $node->addMethod($methodNode);
+                    }
                 }
+
+                $reflectionClass = $reflectionClass->getParentClass();
             }
         }
     }
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/ProphecySubjectPatch.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/ProphecySubjectPatch.php
index fc2cc4de..081dea82 100644
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/ProphecySubjectPatch.php
+++ b/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/ProphecySubjectPatch.php
@@ -77,7 +77,7 @@ class ProphecySubjectPatch implements ClassPatchInterface
             $__call->addArgument(new ArgumentNode('name'));
             $__call->addArgument(new ArgumentNode('arguments'));
 
-            $node->addMethod($__call);
+            $node->addMethod($__call, true);
         }
 
         $__call->setCode(<<<PHP
@@ -88,8 +88,8 @@ throw new \Prophecy\Exception\Doubler\MethodNotFoundException(
 PHP
         );
 
-        $node->addMethod($prophecySetter);
-        $node->addMethod($prophecyGetter);
+        $node->addMethod($prophecySetter, true);
+        $node->addMethod($prophecyGetter, true);
     }
 
     /**
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/ThrowablePatch.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/ThrowablePatch.php
new file mode 100644
index 00000000..b98e9432
--- /dev/null
+++ b/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/ThrowablePatch.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace Prophecy\Doubler\ClassPatch;
+
+use Prophecy\Doubler\Generator\Node\ClassNode;
+use Prophecy\Exception\Doubler\ClassCreatorException;
+
+class ThrowablePatch implements ClassPatchInterface
+{
+    /**
+     * Checks if patch supports specific class node.
+     *
+     * @param ClassNode $node
+     * @return bool
+     */
+    public function supports(ClassNode $node)
+    {
+        return $this->implementsAThrowableInterface($node) && $this->doesNotExtendAThrowableClass($node);
+    }
+
+    /**
+     * @param ClassNode $node
+     * @return bool
+     */
+    private function implementsAThrowableInterface(ClassNode $node)
+    {
+        foreach ($node->getInterfaces() as $type) {
+            if (is_a($type, 'Throwable', true)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param ClassNode $node
+     * @return bool
+     */
+    private function doesNotExtendAThrowableClass(ClassNode $node)
+    {
+        return !is_a($node->getParentClass(), 'Throwable', true);
+    }
+
+    /**
+     * Applies patch to the specific class node.
+     *
+     * @param ClassNode $node
+     *
+     * @return void
+     */
+    public function apply(ClassNode $node)
+    {
+        $this->checkItCanBeDoubled($node);
+        $this->setParentClassToException($node);
+    }
+
+    private function checkItCanBeDoubled(ClassNode $node)
+    {
+        $className = $node->getParentClass();
+        if ($className !== 'stdClass') {
+            throw new ClassCreatorException(
+                sprintf(
+                    'Cannot double concrete class %s as well as implement Traversable',
+                    $className
+                ),
+                $node
+            );
+        }
+    }
+
+    private function setParentClassToException(ClassNode $node)
+    {
+        $node->setParentClass('Exception');
+
+        $node->removeMethod('getMessage');
+        $node->removeMethod('getCode');
+        $node->removeMethod('getFile');
+        $node->removeMethod('getLine');
+        $node->removeMethod('getTrace');
+        $node->removeMethod('getPrevious');
+        $node->removeMethod('getNext');
+        $node->removeMethod('getTraceAsString');
+    }
+
+    /**
+     * Returns patch priority, which determines when patch will be applied.
+     *
+     * @return int Priority number (higher - earlier)
+     */
+    public function getPriority()
+    {
+        return 100;
+    }
+}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/ClassMirror.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/ClassMirror.php
index 9f99239f..c5f9a5c7 100644
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/ClassMirror.php
+++ b/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/ClassMirror.php
@@ -189,6 +189,8 @@ class ClassMirror
             $node->setAsPassedByReference();
         }
 
+        $node->setAsNullable($this->isNullable($parameter));
+
         $methodNode->addArgument($node);
     }
 
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/Node/ClassNode.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/Node/ClassNode.php
index 1499a1d3..f7bd2857 100644
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/Node/ClassNode.php
+++ b/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/Node/ClassNode.php
@@ -100,7 +100,7 @@ class ClassNode
         return $this->methods;
     }
 
-    public function addMethod(MethodNode $method)
+    public function addMethod(MethodNode $method, $force = false)
     {
         if (!$this->isExtendable($method->getName())){
             $message = sprintf(
@@ -108,7 +108,10 @@ class ClassNode
             );
             throw new MethodNotExtendableException($message, $this->getParentClass(), $method->getName());
         }
-        $this->methods[$method->getName()] = $method;
+
+        if ($force || !isset($this->methods[$method->getName()])) {
+            $this->methods[$method->getName()] = $method;
+        }
     }
 
     public function removeMethod($name)
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Exception/Prediction/AggregateException.php b/vendor/phpspec/prophecy/src/Prophecy/Exception/Prediction/AggregateException.php
index 44b598a4..a00dfb03 100644
--- a/vendor/phpspec/prophecy/src/Prophecy/Exception/Prediction/AggregateException.php
+++ b/vendor/phpspec/prophecy/src/Prophecy/Exception/Prediction/AggregateException.php
@@ -21,7 +21,8 @@ class AggregateException extends \RuntimeException implements PredictionExceptio
     public function append(PredictionException $exception)
     {
         $message = $exception->getMessage();
-        $message = '  '.strtr($message, array("\n" => "\n  "))."\n";
+        $message = strtr($message, array("\n" => "\n  "))."\n";
+        $message = empty($this->exceptions) ? $message : "\n" . $message;
 
         $this->message      = rtrim($this->message.$message);
         $this->exceptions[] = $exception;
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Prophecy/MethodProphecy.php b/vendor/phpspec/prophecy/src/Prophecy/Prophecy/MethodProphecy.php
index 90df1efc..7084ed6f 100644
--- a/vendor/phpspec/prophecy/src/Prophecy/Prophecy/MethodProphecy.php
+++ b/vendor/phpspec/prophecy/src/Prophecy/Prophecy/MethodProphecy.php
@@ -75,11 +75,11 @@ class MethodProphecy
 
             if ('void' === $type) {
                 $this->voidReturnType = true;
-                return;
             }
 
             $this->will(function () use ($type) {
                 switch ($type) {
+                    case 'void': return;
                     case 'string': return '';
                     case 'float':  return 0.0;
                     case 'int':    return 0;
@@ -278,6 +278,18 @@ class MethodProphecy
         return $this->should(new Prediction\CallTimesPrediction($count));
     }
 
+    /**
+     * Sets call times prediction to the prophecy.
+     *
+     * @see \Prophecy\Prediction\CallTimesPrediction
+     *
+     * @return $this
+     */
+    public function shouldBeCalledOnce()
+    {
+        return $this->shouldBeCalledTimes(1);
+    }
+
     /**
      * Checks provided prediction immediately.
      *
@@ -372,6 +384,18 @@ class MethodProphecy
         return $this->shouldHave(new Prediction\CallTimesPrediction($count));
     }
 
+    /**
+     * Checks call times prediction.
+     *
+     * @see \Prophecy\Prediction\CallTimesPrediction
+     *
+     * @return $this
+     */
+    public function shouldHaveBeenCalledOnce()
+    {
+        return $this->shouldHaveBeenCalledTimes(1);
+    }
+
     /**
      * Checks currently registered [with should(...)] prediction.
      */
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Prophet.php b/vendor/phpspec/prophecy/src/Prophecy/Prophet.php
index ac649234..a4fe4b0d 100644
--- a/vendor/phpspec/prophecy/src/Prophecy/Prophet.php
+++ b/vendor/phpspec/prophecy/src/Prophecy/Prophet.php
@@ -52,6 +52,7 @@ class Prophet
             $doubler = new Doubler;
             $doubler->registerClassPatch(new ClassPatch\SplFileInfoPatch);
             $doubler->registerClassPatch(new ClassPatch\TraversablePatch);
+            $doubler->registerClassPatch(new ClassPatch\ThrowablePatch);
             $doubler->registerClassPatch(new ClassPatch\DisableConstructorPatch);
             $doubler->registerClassPatch(new ClassPatch\ProphecySubjectPatch);
             $doubler->registerClassPatch(new ClassPatch\ReflectionClassNewInstancePatch);
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Util/StringUtil.php b/vendor/phpspec/prophecy/src/Prophecy/Util/StringUtil.php
index bb90156a..ba4faff5 100644
--- a/vendor/phpspec/prophecy/src/Prophecy/Util/StringUtil.php
+++ b/vendor/phpspec/prophecy/src/Prophecy/Util/StringUtil.php
@@ -20,6 +20,16 @@ use Prophecy\Call\Call;
  */
 class StringUtil
 {
+    private $verbose;
+
+    /**
+     * @param bool $verbose
+     */
+    public function __construct($verbose = true)
+    {
+        $this->verbose = $verbose;
+    }
+
     /**
      * Stringifies any provided value.
      *
@@ -54,7 +64,7 @@ class StringUtil
         if (is_string($value)) {
             $str = sprintf('"%s"', str_replace("\n", '\\n', $value));
 
-            if (50 <= strlen($str)) {
+            if (!$this->verbose && 50 <= strlen($str)) {
                 return substr($str, 0, 50).'"...';
             }
 
diff --git a/vendor/phpunit/phpunit-mock-objects/composer.json b/vendor/phpunit/phpunit-mock-objects/composer.json
index 31718067..a188204d 100644
--- a/vendor/phpunit/phpunit-mock-objects/composer.json
+++ b/vendor/phpunit/phpunit-mock-objects/composer.json
@@ -26,7 +26,7 @@
         "sebastian/exporter": "^3.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.5"
+        "phpunit/phpunit": "^6.5.11"
     },
     "conflict": {
         "phpunit/phpunit": "<6.0"
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Generator.php b/vendor/phpunit/phpunit-mock-objects/src/Generator.php
index cb742ba3..28a05b1e 100644
--- a/vendor/phpunit/phpunit-mock-objects/src/Generator.php
+++ b/vendor/phpunit/phpunit-mock-objects/src/Generator.php
@@ -1119,6 +1119,9 @@ private function getMethodParameters(ReflectionMethod $method, $forCall = false)
 
                         if ($value === null) {
                             $value = \var_export($parameter->getDefaultValue(), true);
+                        } elseif (!\defined($value)) {
+                            $rootValue = \preg_replace('/^.*\\\\/', '', $value);
+                            $value = \defined($rootValue) ? $rootValue : $value;
                         }
 
                         $default = ' = ' . $value;
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/Generator/3154_namespaced_constant_resolving.phpt b/vendor/phpunit/phpunit-mock-objects/tests/Generator/3154_namespaced_constant_resolving.phpt
new file mode 100644
index 00000000..302ba9da
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/Generator/3154_namespaced_constant_resolving.phpt
@@ -0,0 +1,112 @@
+--TEST--
+https://github.com/sebastianbergmann/phpunit-mock-objects/issues/420
+https://github.com/sebastianbergmann/phpunit/issues/3154
+--FILE--
+<?php
+namespace Is\Namespaced;
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+const A_CONSTANT = 17;
+const PHP_VERSION = "0.0.0";
+
+class Issue3154
+{
+    public function a(int $i = PHP_INT_MAX, int $j = A_CONSTANT, string $v = \PHP_VERSION, string $z = '#'): string
+    {
+        return $z."sum: ".($i+$j).$v;
+    }
+}
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new \PHPUnit\Framework\MockObject\Generator;
+
+$mock = $generator->generate(
+    Issue3154::class,
+    [],
+    'Issue3154Mock',
+    true,
+    true
+);
+
+print $mock['code'];
+--EXPECT--
+class Issue3154Mock extends Is\Namespaced\Issue3154 implements PHPUnit\Framework\MockObject\MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+    private $__phpunit_configurable = ['a'];
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function a(int $i = PHP_INT_MAX, int $j = Is\Namespaced\A_CONSTANT, string $v = PHP_VERSION, string $z = '#'): string
+    {
+        $arguments = array($i, $j, $v, $z);
+        $count     = func_num_args();
+
+        if ($count > 4) {
+            $_arguments = func_get_args();
+
+            for ($i = 4; $i < $count; $i++) {
+                $arguments[] = $_arguments[$i];
+            }
+        }
+
+        $result = $this->__phpunit_getInvocationMocker()->invoke(
+            new \PHPUnit\Framework\MockObject\Invocation\ObjectInvocation(
+                'Is\Namespaced\Issue3154', 'a', $arguments, 'string', $this, true
+            )
+        );
+
+        return $result;
+    }
+
+    public function expects(\PHPUnit\Framework\MockObject\Matcher\Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new \PHPUnit\Framework\MockObject\Matcher\AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === null) {
+            $this->__phpunit_invocationMocker = new \PHPUnit\Framework\MockObject\InvocationMocker($this->__phpunit_configurable);
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify($unsetInvocationMocker = true)
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+
+        if ($unsetInvocationMocker) {
+            $this->__phpunit_invocationMocker = null;
+        }
+    }
+}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObjectTest.php b/vendor/phpunit/phpunit-mock-objects/tests/MockObjectTest.php
index 7cb7eb97..790451da 100644
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObjectTest.php
+++ b/vendor/phpunit/phpunit-mock-objects/tests/MockObjectTest.php
@@ -941,6 +941,16 @@ public function testCreateTwoMocksOfOneWsdlFile()
         $this->assertEquals(get_class($a), get_class($b));
     }
 
+    /**
+     * @requires extension soap
+     */
+    public function testCreateMockOfWsdlFileWithSpecialChars()
+    {
+        $mock = $this->getMockFromWsdl(__DIR__ . '/_fixture/Go ogle-Sea.rch.wsdl');
+
+        $this->assertStringStartsWith('Mock_GoogleSearch_', get_class($mock));
+    }
+
     /**
      * @see    https://github.com/sebastianbergmann/phpunit-mock-objects/issues/156
      * @ticket 156
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Go ogle-Sea.rch.wsdl b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Go ogle-Sea.rch.wsdl
new file mode 100644
index 00000000..e448501d
--- /dev/null
+++ b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Go ogle-Sea.rch.wsdl	
@@ -0,0 +1,198 @@
+<?xml version="1.0"?>
+
+<!-- WSDL description of the Google Web APIs.
+     The Google Web APIs are in beta release. All interfaces are subject to
+     change as we refine and extend our APIs. Please see the terms of use
+     for more information. -->
+
+<!-- Revision 2002-08-16 -->
+
+<definitions name="GoogleSearch"
+             targetNamespace="urn:GoogleSearch"
+             xmlns:typens="urn:GoogleSearch"
+             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+             xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+             xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+             xmlns="http://schemas.xmlsoap.org/wsdl/">
+
+  <!-- Types for search - result elements, directory categories -->
+
+  <types>
+    <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+                targetNamespace="urn:GoogleSearch">
+
+      <xsd:complexType name="GoogleSearchResult">
+        <xsd:all>
+          <xsd:element name="documentFiltering"           type="xsd:boolean"/>
+          <xsd:element name="searchComments"              type="xsd:string"/>
+          <xsd:element name="estimatedTotalResultsCount"  type="xsd:int"/>
+          <xsd:element name="estimateIsExact"             type="xsd:boolean"/>
+          <xsd:element name="resultElements"              type="typens:ResultElementArray"/>
+          <xsd:element name="searchQuery"                 type="xsd:string"/>
+          <xsd:element name="startIndex"                  type="xsd:int"/>
+          <xsd:element name="endIndex"                    type="xsd:int"/>
+          <xsd:element name="searchTips"                  type="xsd:string"/>
+          <xsd:element name="directoryCategories"         type="typens:DirectoryCategoryArray"/>
+          <xsd:element name="searchTime"                  type="xsd:double"/>
+        </xsd:all>
+      </xsd:complexType>
+
+      <xsd:complexType name="ResultElement">
+        <xsd:all>
+          <xsd:element name="summary" type="xsd:string"/>
+          <xsd:element name="URL" type="xsd:string"/>
+          <xsd:element name="snippet" type="xsd:string"/>
+          <xsd:element name="title" type="xsd:string"/>
+          <xsd:element name="cachedSize" type="xsd:string"/>
+          <xsd:element name="relatedInformationPresent" type="xsd:boolean"/>
+          <xsd:element name="hostName" type="xsd:string"/>
+          <xsd:element name="directoryCategory" type="typens:DirectoryCategory"/>
+          <xsd:element name="directoryTitle" type="xsd:string"/>
+        </xsd:all>
+      </xsd:complexType>
+
+      <xsd:complexType name="ResultElementArray">
+        <xsd:complexContent>
+          <xsd:restriction base="soapenc:Array">
+             <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="typens:ResultElement[]"/>
+          </xsd:restriction>
+        </xsd:complexContent>
+      </xsd:complexType>
+
+      <xsd:complexType name="DirectoryCategoryArray">
+        <xsd:complexContent>
+          <xsd:restriction base="soapenc:Array">
+             <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="typens:DirectoryCategory[]"/>
+          </xsd:restriction>
+        </xsd:complexContent>
+      </xsd:complexType>
+
+      <xsd:complexType name="DirectoryCategory">
+        <xsd:all>
+          <xsd:element name="fullViewableName" type="xsd:string"/>
+          <xsd:element name="specialEncoding" type="xsd:string"/>
+        </xsd:all>
+      </xsd:complexType>
+
+    </xsd:schema>
+  </types>
+
+  <!-- Messages for Google Web APIs - cached page, search, spelling. -->
+
+  <message name="doGetCachedPage">
+    <part name="key"            type="xsd:string"/>
+    <part name="url"            type="xsd:string"/>
+  </message>
+
+  <message name="doGetCachedPageResponse">
+    <part name="return"         type="xsd:base64Binary"/>
+  </message>
+
+  <message name="doSpellingSuggestion">
+    <part name="key"            type="xsd:string"/>
+    <part name="phrase"         type="xsd:string"/>
+  </message>
+
+  <message name="doSpellingSuggestionResponse">
+    <part name="return"         type="xsd:string"/>
+  </message>
+
+  <!-- note, ie and oe are ignored by server; all traffic is UTF-8. -->
+
+  <message name="doGoogleSearch">
+    <part name="key"            type="xsd:string"/>
+    <part name="q"              type="xsd:string"/>
+    <part name="start"          type="xsd:int"/>
+    <part name="maxResults"     type="xsd:int"/>
+    <part name="filter"         type="xsd:boolean"/>
+    <part name="restrict"       type="xsd:string"/>
+    <part name="safeSearch"     type="xsd:boolean"/>
+    <part name="lr"             type="xsd:string"/>
+    <part name="ie"             type="xsd:string"/>
+    <part name="oe"             type="xsd:string"/>
+  </message>
+
+  <message name="doGoogleSearchResponse">
+    <part name="return"         type="typens:GoogleSearchResult"/>
+  </message>
+
+  <!-- Port for Google Web APIs, "GoogleSearch" -->
+
+  <portType name="GoogleSearchPort">
+
+    <operation name="doGetCachedPage">
+      <input message="typens:doGetCachedPage"/>
+      <output message="typens:doGetCachedPageResponse"/>
+    </operation>
+
+    <operation name="doSpellingSuggestion">
+      <input message="typens:doSpellingSuggestion"/>
+      <output message="typens:doSpellingSuggestionResponse"/>
+    </operation>
+
+    <operation name="doGoogleSearch">
+      <input message="typens:doGoogleSearch"/>
+      <output message="typens:doGoogleSearchResponse"/>
+    </operation>
+
+  </portType>
+
+
+  <!-- Binding for Google Web APIs - RPC, SOAP over HTTP -->
+
+  <binding name="GoogleSearchBinding" type="typens:GoogleSearchPort">
+    <soap:binding style="rpc"
+                  transport="http://schemas.xmlsoap.org/soap/http"/>
+
+    <operation name="doGetCachedPage">
+      <soap:operation soapAction="urn:GoogleSearchAction"/>
+      <input>
+        <soap:body use="encoded"
+                   namespace="urn:GoogleSearch"
+                   encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded"
+                   namespace="urn:GoogleSearch"
+                   encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+
+    <operation name="doSpellingSuggestion">
+      <soap:operation soapAction="urn:GoogleSearchAction"/>
+      <input>
+        <soap:body use="encoded"
+                   namespace="urn:GoogleSearch"
+                   encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded"
+                   namespace="urn:GoogleSearch"
+                   encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+
+    <operation name="doGoogleSearch">
+      <soap:operation soapAction="urn:GoogleSearchAction"/>
+      <input>
+        <soap:body use="encoded"
+                   namespace="urn:GoogleSearch"
+                   encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded"
+                   namespace="urn:GoogleSearch"
+                   encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+  </binding>
+
+  <!-- Endpoint for Google Web APIs -->
+  <service name="GoogleSearchService">
+    <port name="GoogleSearchPort" binding="typens:GoogleSearchBinding">
+      <soap:address location="http://api.google.com/search/beta2"/>
+    </port>
+  </service>
+
+</definitions>
diff --git a/vendor/phpunit/phpunit/.gitignore b/vendor/phpunit/phpunit/.gitignore
index bf333231..75496776 100644
--- a/vendor/phpunit/phpunit/.gitignore
+++ b/vendor/phpunit/phpunit/.gitignore
@@ -2,6 +2,7 @@
 /.idea
 /.php_cs
 /.php_cs.cache
+/.phpunit.result.cache
 /build/documentation
 /build/logfiles
 /build/phar
@@ -11,10 +12,10 @@
 /build/binary-phar-autoload.php
 /cache.properties
 /composer.lock
-/tests/TextUI/*.diff
-/tests/TextUI/*.exp
-/tests/TextUI/*.log
-/tests/TextUI/*.out
-/tests/TextUI/*.php
+/tests/end-to-end/*.diff
+/tests/end-to-end/*.exp
+/tests/end-to-end/*.log
+/tests/end-to-end/*.out
+/tests/end-to-end/*.php
 /vendor
 
diff --git a/vendor/phpunit/phpunit/.php_cs.dist b/vendor/phpunit/phpunit/.php_cs.dist
index e866c0f1..3c71a791 100644
--- a/vendor/phpunit/phpunit/.php_cs.dist
+++ b/vendor/phpunit/phpunit/.php_cs.dist
@@ -84,8 +84,6 @@ return PhpCsFixer\Config::create()
         ->files()
         ->in(__DIR__ . '/build')
         ->in(__DIR__ . '/src')
-        ->in(__DIR__ . '/tests/Framework')
-        ->in(__DIR__ . '/tests/Runner')
-        ->in(__DIR__ . '/tests/Util')
+        ->in(__DIR__ . '/tests/unit')
         ->name('*.php')
     );
diff --git a/vendor/phpunit/phpunit/ChangeLog-6.5.md b/vendor/phpunit/phpunit/ChangeLog-6.5.md
index 8a703bc0..0875178f 100644
--- a/vendor/phpunit/phpunit/ChangeLog-6.5.md
+++ b/vendor/phpunit/phpunit/ChangeLog-6.5.md
@@ -2,6 +2,35 @@
 
 All notable changes of the PHPUnit 6.5 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [6.5.13] - 2018-09-08
+
+* Fixed [#3181](https://github.com/sebastianbergmann/phpunit/issues/3181): `--filter` should be case-insensitive
+* Fixed [#3234](https://github.com/sebastianbergmann/phpunit/issues/3234): `assertArraySubset()` with `$strict=true` does not display differences properly
+* Fixed [#3254](https://github.com/sebastianbergmann/phpunit/issues/3254): TextUI test runner cannot run a `Test` instance that is not a `TestSuite`
+
+## [6.5.12] - 2018-08-22
+
+* Fixed [#3248](https://github.com/sebastianbergmann/phpunit/issues/3248) and [#3233](https://github.com/sebastianbergmann/phpunit/issues/3233): `phpunit.xsd` dictates element order where it should not
+* Fixed [#3251](https://github.com/sebastianbergmann/phpunit/issues/3251): TeamCity result logger is missing test duration information
+
+## [6.5.11] - 2018-08-07
+
+* Fixed [#3219](https://github.com/sebastianbergmann/phpunit/issues/3219): `getMockFromWsdl()` generates invalid PHP code when WSDL filename contains special characters
+
+## [6.5.10] - 2018-08-03
+
+### Fixed
+
+* Fixed [#3209](https://github.com/sebastianbergmann/phpunit/issues/3209): `Test::run()` and `TestCase::run()` interface contradiction
+* Fixed [#3218](https://github.com/sebastianbergmann/phpunit/issues/3218): `prefix` attribute for `directory` node missing from `phpunit.xml` XSD
+* Fixed [#3225](https://github.com/sebastianbergmann/phpunit/issues/3225): `coverage-php` missing from `phpunit.xsd`
+
+## [6.5.9] - 2018-07-03
+
+### Fixed
+
+* Fixed [#3142](https://github.com/sebastianbergmann/phpunit/issues/3142): Method-level annotations (`@backupGlobals`, `@backupStaticAttributes`, `@errorHandler`, `@preserveGlobalState`) do not override class-level annotations
+
 ## [6.5.8] - 2018-04-10
 
 ### Fixed
@@ -62,6 +91,11 @@ All notable changes of the PHPUnit 6.5 release series are documented in this fil
 * Fixed [#2654](https://github.com/sebastianbergmann/phpunit/issues/2654): Problems with `assertJsonStringEqualsJsonString()`
 * Fixed [#2810](https://github.com/sebastianbergmann/phpunit/pull/2810): Code Coverage for PHPT tests does not work
 
+[6.5.13]: https://github.com/sebastianbergmann/phpunit/compare/6.5.12...6.5.13
+[6.5.12]: https://github.com/sebastianbergmann/phpunit/compare/6.5.11...6.5.12
+[6.5.11]: https://github.com/sebastianbergmann/phpunit/compare/6.5.10...6.5.11
+[6.5.10]: https://github.com/sebastianbergmann/phpunit/compare/6.5.9...6.5.10
+[6.5.9]: https://github.com/sebastianbergmann/phpunit/compare/6.5.8...6.5.9
 [6.5.8]: https://github.com/sebastianbergmann/phpunit/compare/6.5.7...6.5.8
 [6.5.7]: https://github.com/sebastianbergmann/phpunit/compare/6.5.6...6.5.7
 [6.5.6]: https://github.com/sebastianbergmann/phpunit/compare/6.5.5...6.5.6
diff --git a/vendor/phpunit/phpunit/README.md b/vendor/phpunit/phpunit/README.md
index 34769fa1..59775324 100644
--- a/vendor/phpunit/phpunit/README.md
+++ b/vendor/phpunit/phpunit/README.md
@@ -8,25 +8,15 @@ PHPUnit is a programmer-oriented testing framework for PHP. It is an instance of
 
 ## Installation
 
-We distribute a [PHP Archive (PHAR)](https://php.net/phar) that has all required (as well as some optional) dependencies of PHPUnit bundled in a single file:
+We distribute a [PHP Archive (PHAR)](https://php.net/phar) that has all required (as well as some optional) dependencies of PHPUnit 6.5 bundled in a single file:
 
 ```bash
-$ wget https://phar.phpunit.de/phpunit.phar
+$ wget https://phar.phpunit.de/phpunit-6.5.phar
 
-$ chmod +x phpunit.phar
-
-$ mv phpunit.phar /usr/local/bin/phpunit
-```
-
-You can also immediately use the PHAR after you have downloaded it, of course:
-
-```bash
-$ wget https://phar.phpunit.de/phpunit.phar
-
-$ php phpunit.phar
+$ php phpunit-6.5.phar --version
 ```
 
-Alternatively, you may use [Composer](https://getcomposer.org/) to download and install PHPUnit as well as its dependencies. Please refer to the [documentation](https://phpunit.de/documentation.html) for details on how to do this.
+Alternatively, you may use [Composer](https://getcomposer.org/) to download and install PHPUnit as well as its dependencies. Please refer to the "[Getting Started](https://phpunit.de/getting-started-with-phpunit.html)" guide for details on how to install PHPUnit.
 
 ## Contribute
 
@@ -37,10 +27,15 @@ Please refer to [CONTRIBUTING.md](https://github.com/sebastianbergmann/phpunit/b
 Thanks to everyone who has contributed to PHPUnit! You can find a detailed list of contributors on every PHPUnit related package on GitHub. This list shows only the major components:
 
 * [PHPUnit](https://github.com/sebastianbergmann/phpunit/graphs/contributors)
-* [PHP_CodeCoverage](https://github.com/sebastianbergmann/php-code-coverage/graphs/contributors)
-* [PHPUnit_MockObject](https://github.com/sebastianbergmann/phpunit-mock-objects/graphs/contributors)
+* [php-code-coverage](https://github.com/sebastianbergmann/php-code-coverage/graphs/contributors)
+* [phpunit-mock-objects](https://github.com/sebastianbergmann/phpunit-mock-objects/graphs/contributors)
 
 A very special thanks to everyone who has contributed to the documentation and helps maintain the translations:
 
-* [PHPUnit Documentation](https://github.com/sebastianbergmann/phpunit-documentation/graphs/contributors)
+* [English](https://github.com/sebastianbergmann/phpunit-documentation-english/graphs/contributors)
+* [Spanish](https://github.com/sebastianbergmann/phpunit-documentation-spanish/graphs/contributors)
+* [French](https://github.com/sebastianbergmann/phpunit-documentation-french/graphs/contributors)
+* [Japanese](https://github.com/sebastianbergmann/phpunit-documentation-japanese/graphs/contributors)
+* [Brazilian Portuguese](https://github.com/sebastianbergmann/phpunit-documentation-brazilian-portuguese/graphs/contributors)
+* [Simplified Chinese](https://github.com/sebastianbergmann/phpunit-documentation-chinese/graphs/contributors)
 
diff --git a/vendor/phpunit/phpunit/appveyor.yml b/vendor/phpunit/phpunit/appveyor.yml
index cdae2964..40c8cd06 100644
--- a/vendor/phpunit/phpunit/appveyor.yml
+++ b/vendor/phpunit/phpunit/appveyor.yml
@@ -37,7 +37,7 @@ install:
   - IF NOT EXIST c:\php mkdir c:\php
   - IF NOT EXIST c:\php\%PHP_VERSION% mkdir c:\php\%PHP_VERSION%
   - cd c:\php\%PHP_VERSION%
-  - IF NOT EXIST php-installed.txt appveyor DownloadFile http://windows.php.net/downloads/releases/archives/php-%PHP_VERSION%-Win32-VC14-x86.zip
+  - IF NOT EXIST php-installed.txt curl -fsS -o php-%PHP_VERSION%-Win32-VC14-x86.zip https://windows.php.net/downloads/releases/archives/php-%PHP_VERSION%-Win32-VC14-x86.zip
   - IF NOT EXIST php-installed.txt 7z x php-%PHP_VERSION%-Win32-VC14-x86.zip -y >nul
   - IF NOT EXIST php-installed.txt del /Q *.zip
   - IF NOT EXIST php-installed.txt copy /Y php.ini-development php.ini
@@ -52,9 +52,9 @@ install:
   - IF NOT EXIST php-installed.txt echo extension=php_pdo_sqlite.dll >> php.ini
   - IF NOT EXIST php-installed.txt echo zend.assertions=1 >> php.ini
   - IF NOT EXIST php-installed.txt echo assert.exception=On >> php.ini
-  - IF NOT EXIST php-installed.txt appveyor DownloadFile https://getcomposer.org/composer.phar
+  - IF NOT EXIST php-installed.txt curl -fsS -o composer.phar https://getcomposer.org/composer.phar
   - IF NOT EXIST php-installed.txt echo @php %%~dp0composer.phar %%* > composer.bat
-  - IF NOT EXIST php-installed.txt appveyor DownloadFile https://xdebug.org/files/php_xdebug-%XDEBUG_VERSION%-vc14.dll -FileName c:\php\%PHP_VERSION%\ext\php_xdebug-%XDEBUG_VERSION%-vc14.dll
+  - IF NOT EXIST php-installed.txt curl -fsS -o c:\php\%PHP_VERSION%\ext\php_xdebug-%XDEBUG_VERSION%-vc14.dll https://xdebug.org/files/php_xdebug-%XDEBUG_VERSION%-vc14.dll
   - IF NOT EXIST php-installed.txt echo zend_extension=php_xdebug-%XDEBUG_VERSION%-vc14.dll >> php.ini
   - IF NOT EXIST php-installed.txt type nul >> php-installed.txt
   - cd c:\phpunit
diff --git a/vendor/phpunit/phpunit/build.xml b/vendor/phpunit/phpunit/build.xml
index 957e2b9b..af03dffa 100644
--- a/vendor/phpunit/phpunit/build.xml
+++ b/vendor/phpunit/phpunit/build.xml
@@ -116,15 +116,14 @@
         <mkdir dir="${basedir}/build/phar"/>
         <copy file="${basedir}/composer.json" tofile="${basedir}/composer.json.bak"/>
 
-        <exec executable="${basedir}/build/tools/composer">
+        <exec executable="${basedir}/build/tools/composer" failonerror="true">
             <arg value="require"/>
             <arg value="phpunit/php-invoker:~1.1"/>
         </exec>
 
         <move file="${basedir}/composer.json.bak" tofile="${basedir}/composer.json"/>
 
-        <exec executable="${basedir}/build/phar-manifest.php" output="${basedir}/build/phar/manifest.txt"/>
-        <copy todir="${basedir}/build/phar" file="${basedir}/build/ca.pem" />
+        <exec executable="${basedir}/build/phar-manifest.php" output="${basedir}/build/phar/manifest.txt" failonerror="true"/>
 
         <copy file="${basedir}/vendor/phpunit/php-code-coverage/LICENSE" tofile="${basedir}/build/phar/php-code-coverage/LICENSE"/>
         <copy todir="${basedir}/build/phar/php-code-coverage">
@@ -330,12 +329,12 @@
             </fileset>
         </copy>
 
-        <exec executable="${basedir}/build/phar-version.php" outputproperty="_version">
+        <exec executable="${basedir}/build/phar-version.php" outputproperty="_version" failonerror="true">
             <arg value="${version}"/>
             <arg value="${type}"/>
         </exec>
 
-        <exec executable="${basedir}/build/tools/phpab" taskname="phpab">
+        <exec executable="${basedir}/build/tools/phpab" taskname="phpab" failonerror="true">
             <arg value="--all" />
             <arg value="--static" />
             <arg value="--once" />
@@ -352,7 +351,7 @@
         <copy file="${basedir}/build/binary-phar-autoload.php.in" tofile="${basedir}/build/binary-phar-autoload.php"/>
         <replace file="${basedir}/build/binary-phar-autoload.php" token="X.Y.Z" value="${_version}"/>
 
-        <exec executable="${basedir}/build/tools/phpab" taskname="phpab">
+        <exec executable="${basedir}/build/tools/phpab" taskname="phpab" failonerror="true">
             <arg value="--all" />
             <arg value="--nolower" />
             <arg value="--static" />
@@ -373,13 +372,24 @@
     </target>
 
     <target name="-phar-determine-version">
-        <exec executable="${basedir}/build/version.php" outputproperty="version" />
+        <exec executable="${basedir}/build/version.php" outputproperty="version" failonerror="true" />
     </target>
 
-    <target name="generate-project-documentation" depends="-phploc,-checkstyle,-phpmd,-phpunit">
+    <target name="generate-project-documentation" depends="-phploc,-checkstyle,-phpunit">
         <exec executable="${basedir}/build/tools/phpdox" dir="${basedir}/build" taskname="phpdox"/>
     </target>
 
+    <target name="update-tools">
+        <exec executable="phive">
+            <arg value="--no-progress"/>
+            <arg value="update"/>
+        </exec>
+
+        <exec executable="${basedir}/build/tools/composer">
+            <arg value="self-update"/>
+        </exec>
+    </target>
+
     <target name="-phploc" depends="prepare">
         <exec executable="${basedir}/build/tools/phploc" output="/dev/null" taskname="phploc">
             <arg value="--count-tests"/>
@@ -399,16 +409,6 @@
         </exec>
     </target>
 
-    <target name="-phpmd" depends="prepare">
-        <exec executable="${basedir}/build/tools/phpmd" taskname="phpmd">
-            <arg path="${basedir}/src"/>
-            <arg value="xml"/>
-            <arg path="${basedir}/build/phpmd.xml"/>
-            <arg value="--reportfile"/>
-            <arg path="${basedir}/build/logfiles/pmd.xml"/>
-        </exec>
-    </target>
-
     <target name="-phpunit" depends="setup">
         <exec executable="${basedir}/phpunit" taskname="phpunit">
             <arg value="--coverage-xml"/>
diff --git a/vendor/phpunit/phpunit/composer.json b/vendor/phpunit/phpunit/composer.json
index 707b8427..d12782e8 100644
--- a/vendor/phpunit/phpunit/composer.json
+++ b/vendor/phpunit/phpunit/composer.json
@@ -35,7 +35,7 @@
         "phpunit/php-file-iterator": "^1.4.3",
         "phpunit/php-text-template": "^1.2.1",
         "phpunit/php-timer": "^1.0.9",
-        "phpunit/phpunit-mock-objects": "^5.0.5",
+        "phpunit/phpunit-mock-objects": "^5.0.9",
         "sebastian/comparator": "^2.1",
         "sebastian/diff": "^2.0",
         "sebastian/environment": "^3.1",
diff --git a/vendor/phpunit/phpunit/phive.xml b/vendor/phpunit/phpunit/phive.xml
new file mode 100644
index 00000000..d5bff01a
--- /dev/null
+++ b/vendor/phpunit/phpunit/phive.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phive xmlns="https://phar.io/phive">
+  <phar name="phpab" version="^1.24.1" installed="1.25.0" location="./build/tools/phpab" copy="true"/>
+  <phar name="php-cs-fixer" version="^2.12.0" installed="2.13.0" location="./build/tools/php-cs-fixer" copy="true"/>
+  <phar name="phpdox" version="^0.11.2" installed="0.11.2" location="./build/tools/phpdox" copy="true"/>
+  <phar name="phploc" version="^4.0.1" installed="4.0.1" location="./build/tools/phploc" copy="true"/>
+</phive>
diff --git a/vendor/phpunit/phpunit/phpunit.xml b/vendor/phpunit/phpunit/phpunit.xml
index 03ad7b99..cb615b8a 100644
--- a/vendor/phpunit/phpunit/phpunit.xml
+++ b/vendor/phpunit/phpunit/phpunit.xml
@@ -4,15 +4,12 @@
          bootstrap="tests/bootstrap.php"
          verbose="true">
     <testsuites>
-        <testsuite name="small">
-            <directory suffix="Test.php">tests/Framework</directory>
-            <directory suffix="Test.php">tests/Runner</directory>
-            <directory suffix="Test.php">tests/Util</directory>
+        <testsuite name="unit">
+            <directory suffix="Test.php">tests/unit</directory>
         </testsuite>
 
-        <testsuite name="large">
-            <directory suffix=".phpt">tests/TextUI</directory>
-            <directory suffix=".phpt">tests/Regression</directory>
+        <testsuite name="end-to-end">
+            <directory suffix=".phpt">tests/end-to-end</directory>
         </testsuite>
     </testsuites>
 
diff --git a/vendor/phpunit/phpunit/phpunit.xsd b/vendor/phpunit/phpunit/phpunit.xsd
index b2a2a818..3e9884ba 100644
--- a/vendor/phpunit/phpunit/phpunit.xsd
+++ b/vendor/phpunit/phpunit/phpunit.xsd
@@ -1,270 +1,279 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:annotation>
-    <xs:documentation source="https://phpunit.de/manual/6.5/en/appendixes.configuration.html">
-      This Schema file defines the rules by which the XML configuration file of PHPUnit 6.5 may be structured.
-    </xs:documentation>
-    <xs:appinfo source="https://phpunit.de/manual/6.5/en/appendixes.configuration.html"/>
-  </xs:annotation>
-  <xs:element name="phpunit" type="phpUnitType">
     <xs:annotation>
-      <xs:documentation>Root Element</xs:documentation>
+        <xs:documentation source="https://phpunit.de/manual/6.5/en/appendixes.configuration.html">
+            This Schema file defines the rules by which the XML configuration file of PHPUnit 6.5 may be structured.
+        </xs:documentation>
+        <xs:appinfo source="https://phpunit.de/manual/6.5/en/appendixes.configuration.html"/>
     </xs:annotation>
-  </xs:element>
-  <xs:complexType name="filtersType">
-    <xs:sequence>
-      <xs:element name="whitelist" type="whiteListType" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="filterType">
-    <xs:sequence>
-      <xs:group ref="pathGroup"/>
-      <xs:element name="exclude" maxOccurs="unbounded" minOccurs="0">
-        <xs:complexType>
-          <xs:group ref="pathGroup"/>
-        </xs:complexType>
-      </xs:element>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="whiteListType">
-    <xs:complexContent>
-      <xs:extension base="filterType">
-        <xs:attribute name="addUncoveredFilesFromWhitelist" default="true" type="xs:boolean"/>
-        <xs:attribute name="processUncoveredFilesFromWhitelist" default="false" type="xs:boolean"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="groupsType">
-    <xs:choice>
-      <xs:sequence>
-        <xs:element name="include" type="groupType"/>
-        <xs:element name="exclude" type="groupType" minOccurs="0"/>
-      </xs:sequence>
-      <xs:sequence>
-        <xs:element name="exclude" type="groupType"/>
-      </xs:sequence>
-    </xs:choice>
-  </xs:complexType>
-  <xs:complexType name="groupType">
-    <xs:sequence>
-      <xs:element name="group" type="xs:string" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="listenersType">
-    <xs:sequence>
-      <xs:element name="listener" type="objectType" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="objectType">
-    <xs:sequence>
-      <xs:element name="arguments" minOccurs="0">
-        <xs:complexType>
-          <xs:group ref="argumentsGroup"/>
-        </xs:complexType>
-      </xs:element>
-    </xs:sequence>
-    <xs:attribute name="class" type="xs:string" use="required"/>
-    <xs:attribute name="file" type="xs:anyURI"/>
-  </xs:complexType>
-  <xs:complexType name="arrayType">
-    <xs:sequence>
-      <xs:element name="element" type="argumentType" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="argumentType">
-    <xs:group ref="argumentChoice"/>
-    <xs:attribute name="key" use="required"/>
-  </xs:complexType>
-  <xs:group name="argumentsGroup">
-    <xs:sequence>
-      <xs:element name="array" type="arrayType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="integer" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="string" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="double" type="xs:double" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="null" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="object" type="objectType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="file" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="directory" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:group>
-  <xs:group name="argumentChoice">
-    <xs:choice>
-      <xs:element name="array" type="arrayType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="integer" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="string" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="double" type="xs:double" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="null" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="object" type="objectType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="file" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="directory" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:choice>
-  </xs:group>
-  <xs:simpleType name="columnsType">
-    <xs:union>
-      <xs:simpleType>
-        <xs:restriction base="xs:integer"/>
-      </xs:simpleType>
-      <xs:simpleType>
-        <xs:restriction base="xs:string">
-          <xs:enumeration value="max"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:union>
-  </xs:simpleType>
-  <xs:complexType name="loggersType">
-    <xs:sequence>
-      <xs:element name="log" type="loggerType" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="loggerType">
-    <xs:attribute name="type">
-      <xs:simpleType>
-        <xs:restriction base="xs:string">
-          <xs:enumeration value="coverage-html"/>
-          <xs:enumeration value="coverage-text"/>
-          <xs:enumeration value="coverage-clover"/>
-          <xs:enumeration value="coverage-crap4j"/>
-          <xs:enumeration value="coverage-xml"/>
-          <xs:enumeration value="json"/>
-          <xs:enumeration value="plain"/>
-          <xs:enumeration value="tap"/>
-          <xs:enumeration value="teamcity"/>
-          <xs:enumeration value="junit"/>
-          <xs:enumeration value="testdox-html"/>
-          <xs:enumeration value="testdox-text"/>
-          <xs:enumeration value="testdox-xml"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="target" type="xs:anyURI"/>
-    <xs:attribute name="lowUpperBound" type="xs:nonNegativeInteger" default="35"/>
-    <xs:attribute name="highLowerBound" type="xs:nonNegativeInteger" default="70"/>
-    <xs:attribute name="showUncoveredFiles" type="xs:boolean" default="false"/>
-    <xs:attribute name="showOnlySummary" type="xs:boolean" default="false"/>
-    <xs:attribute name="threshold" type="xs:nonNegativeInteger" default="30"/>
-  </xs:complexType>
-  <xs:group name="pathGroup">
-    <xs:sequence>
-      <xs:element name="directory" type="directoryFilterType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="file" type="fileFilterType" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:group>
-  <xs:complexType name="directoryFilterType">
-    <xs:simpleContent>
-      <xs:extension base="xs:anyURI">
-        <xs:attribute type="xs:string" name="suffix" default="Test.php"/>
-        <xs:attributeGroup ref="phpVersionGroup"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="fileFilterType">
-    <xs:simpleContent>
-      <xs:extension base="xs:anyURI">
-        <xs:attributeGroup ref="phpVersionGroup"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:attributeGroup name="phpVersionGroup">
-    <xs:attribute name="phpVersion" type="xs:string" default="5.3.0"/>
-    <xs:attribute name="phpVersionOperator" type="xs:string" default="&gt;="/>
-  </xs:attributeGroup>
-  <xs:complexType name="phpType">
-    <xs:sequence>
-      <xs:choice maxOccurs="unbounded">
-        <xs:element name="includePath" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="ini" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="const" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="var" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="env" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="post" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="get" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="cookie" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="server" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="files" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element name="request" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:choice>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="namedValueType">
-    <xs:attribute name="name" use="required" type="xs:string"/>
-    <xs:attribute name="value" use="required" type="xs:anySimpleType"/>
-    <xs:attribute name="verbatim" use="optional" type="xs:boolean"/>
-    <xs:attribute name="force" use="optional" type="xs:boolean"/>
-  </xs:complexType>
-  <xs:complexType name="phpUnitType">
-    <xs:annotation>
-      <xs:documentation>The main type specifying the document structure</xs:documentation>
-    </xs:annotation>
-    <xs:group ref="configGroup"/>
-    <xs:attributeGroup ref="configAttributeGroup"/>
-  </xs:complexType>
-  <xs:attributeGroup name="configAttributeGroup">
-    <xs:attribute name="backupGlobals" type="xs:boolean" default="false"/>
-    <xs:attribute name="backupStaticAttributes" type="xs:boolean" default="false"/>
-    <xs:attribute name="bootstrap" type="xs:anyURI"/>
-    <xs:attribute name="cacheTokens" type="xs:boolean"/>
-    <xs:attribute name="colors" type="xs:boolean" default="false"/>
-    <xs:attribute name="columns" type="columnsType" default="80"/>
-    <xs:attribute name="convertDeprecationsToExceptions" type="xs:boolean" default="true"/>
-    <xs:attribute name="convertErrorsToExceptions" type="xs:boolean" default="true"/>
-    <xs:attribute name="convertNoticesToExceptions" type="xs:boolean" default="true"/>
-    <xs:attribute name="convertWarningsToExceptions" type="xs:boolean" default="true"/>
-    <xs:attribute name="forceCoversAnnotation" type="xs:boolean" default="false"/>
-    <xs:attribute name="printerClass" type="xs:string" default="PHPUnit_TextUI_ResultPrinter"/>
-    <xs:attribute name="printerFile" type="xs:anyURI"/>
-    <xs:attribute name="processIsolation" type="xs:boolean" default="false"/>
-    <xs:attribute name="stopOnError" type="xs:boolean" default="false"/>
-    <xs:attribute name="stopOnFailure" type="xs:boolean" default="false"/>
-    <xs:attribute name="stopOnWarning" type="xs:boolean" default="false"/>
-    <xs:attribute name="stopOnIncomplete" type="xs:boolean" default="false"/>
-    <xs:attribute name="stopOnRisky" type="xs:boolean" default="false"/>
-    <xs:attribute name="stopOnSkipped" type="xs:boolean" default="false"/>
-    <xs:attribute name="failOnRisky" type="xs:boolean" default="false"/>
-    <xs:attribute name="failOnWarning" type="xs:boolean" default="false"/>
-    <xs:attribute name="beStrictAboutChangesToGlobalState" type="xs:boolean" default="false"/>
-    <xs:attribute name="beStrictAboutOutputDuringTests" type="xs:boolean" default="false"/>
-    <xs:attribute name="beStrictAboutResourceUsageDuringSmallTests" type="xs:boolean" default="false"/>
-    <xs:attribute name="beStrictAboutTestsThatDoNotTestAnything" type="xs:boolean" default="true"/>
-    <xs:attribute name="beStrictAboutTodoAnnotatedTests" type="xs:boolean" default="false"/>
-    <xs:attribute name="beStrictAboutCoversAnnotation" type="xs:boolean" default="false"/>
-    <xs:attribute name="enforceTimeLimit" type="xs:boolean" default="false"/>
-    <xs:attribute name="ignoreDeprecatedCodeUnitsFromCodeCoverage" type="xs:boolean" default="false"/>
-    <xs:attribute name="timeoutForSmallTests" type="xs:integer" default="1"/>
-    <xs:attribute name="timeoutForMediumTests" type="xs:integer" default="10"/>
-    <xs:attribute name="timeoutForLargeTests" type="xs:integer" default="60"/>
-    <xs:attribute name="testSuiteLoaderClass" type="xs:string" default="PHPUnit_Runner_StandardTestSuiteLoader"/>
-    <xs:attribute name="testSuiteLoaderFile" type="xs:anyURI"/>
-    <xs:attribute name="defaultTestSuite" type="xs:string" default=""/>
-    <xs:attribute name="verbose" type="xs:boolean" default="false"/>
-    <xs:attribute name="stderr" type="xs:boolean" default="false"/>
-    <xs:attribute name="reverseDefectList" type="xs:boolean" default="false"/>
-    <xs:attribute name="registerMockObjectsFromTestArgumentsRecursively" type="xs:boolean" default="false"/>
-    <xs:attribute name="extensionsDirectory" type="xs:string"/>
-  </xs:attributeGroup>
-  <xs:group name="configGroup">
-    <xs:all>
-      <xs:element ref="testSuiteFacet" minOccurs="0"/>
-      <xs:element name="groups" type="groupsType" minOccurs="0"/>
-      <xs:element name="testdoxGroups" type="groupsType" minOccurs="0"/>
-      <xs:element name="filter" type="filtersType" minOccurs="0"/>
-      <xs:element name="logging" type="loggersType" minOccurs="0"/>
-      <xs:element name="listeners" type="listenersType" minOccurs="0"/>
-      <xs:element name="php" type="phpType" minOccurs="0"/>
-    </xs:all>
-  </xs:group>
-  <xs:element name="testSuiteFacet" abstract="true"/>
-  <xs:element name="testsuite" type="testSuiteType" substitutionGroup="testSuiteFacet"/>
-  <xs:element name="testsuites" type="testSuitesType" substitutionGroup="testSuiteFacet"/>
-  <xs:complexType name="testSuitesType">
-    <xs:sequence>
-      <xs:element name="testsuite" type="testSuiteType" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="testSuiteType">
-    <xs:sequence>
-      <xs:group ref="pathGroup"/>
-      <xs:element name="exclude" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="name" type="xs:string" use="required"/>
-  </xs:complexType>
+    <xs:element name="phpunit" type="phpUnitType">
+        <xs:annotation>
+            <xs:documentation>Root Element</xs:documentation>
+        </xs:annotation>
+    </xs:element>
+    <xs:complexType name="filtersType">
+        <xs:sequence>
+            <xs:element name="whitelist" type="whiteListType" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="filterType">
+        <xs:sequence>
+            <xs:choice maxOccurs="unbounded" minOccurs="0">
+                <xs:group ref="pathGroup"/>
+                <xs:element name="exclude">
+                    <xs:complexType>
+                        <xs:group ref="pathGroup"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:choice>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="whiteListType">
+        <xs:complexContent>
+            <xs:extension base="filterType">
+                <xs:attribute name="addUncoveredFilesFromWhitelist" default="true" type="xs:boolean"/>
+                <xs:attribute name="processUncoveredFilesFromWhitelist" default="false" type="xs:boolean"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="groupsType">
+        <xs:choice>
+            <xs:sequence>
+                <xs:element name="include" type="groupType"/>
+                <xs:element name="exclude" type="groupType" minOccurs="0"/>
+            </xs:sequence>
+            <xs:sequence>
+                <xs:element name="exclude" type="groupType"/>
+            </xs:sequence>
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="groupType">
+        <xs:sequence>
+            <xs:element name="group" type="xs:string" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="listenersType">
+        <xs:sequence>
+            <xs:element name="listener" type="objectType" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="objectType">
+        <xs:sequence>
+            <xs:element name="arguments" minOccurs="0">
+                <xs:complexType>
+                    <xs:group ref="argumentsGroup"/>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="class" type="xs:string" use="required"/>
+        <xs:attribute name="file" type="xs:anyURI"/>
+    </xs:complexType>
+    <xs:complexType name="arrayType">
+        <xs:sequence>
+            <xs:element name="element" type="argumentType" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="argumentType">
+        <xs:group ref="argumentChoice"/>
+        <xs:attribute name="key" use="required"/>
+    </xs:complexType>
+    <xs:group name="argumentsGroup">
+        <xs:sequence>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element name="array" type="arrayType" />
+                <xs:element name="integer" type="xs:integer" />
+                <xs:element name="string" type="xs:string" />
+                <xs:element name="double" type="xs:double" />
+                <xs:element name="null" />
+                <xs:element name="object" type="objectType" />
+                <xs:element name="file" type="xs:anyURI" />
+                <xs:element name="directory" type="xs:anyURI" />
+                <xs:element name="boolean" type="xs:boolean" />
+            </xs:choice>
+        </xs:sequence>
+    </xs:group>
+    <xs:group name="argumentChoice">
+        <xs:choice>
+            <xs:element name="array" type="arrayType" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="integer" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="string" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="double" type="xs:double" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="null" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="object" type="objectType" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="file" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="directory" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:choice>
+    </xs:group>
+    <xs:simpleType name="columnsType">
+        <xs:union>
+            <xs:simpleType>
+                <xs:restriction base="xs:integer"/>
+            </xs:simpleType>
+            <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="max"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:union>
+    </xs:simpleType>
+    <xs:complexType name="loggersType">
+        <xs:sequence>
+            <xs:element name="log" type="loggerType" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="loggerType">
+        <xs:attribute name="type">
+            <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="coverage-html"/>
+                    <xs:enumeration value="coverage-text"/>
+                    <xs:enumeration value="coverage-clover"/>
+                    <xs:enumeration value="coverage-crap4j"/>
+                    <xs:enumeration value="coverage-xml"/>
+                    <xs:enumeration value="coverage-php"/>
+                    <xs:enumeration value="json"/>
+                    <xs:enumeration value="plain"/>
+                    <xs:enumeration value="tap"/>
+                    <xs:enumeration value="teamcity"/>
+                    <xs:enumeration value="junit"/>
+                    <xs:enumeration value="testdox-html"/>
+                    <xs:enumeration value="testdox-text"/>
+                    <xs:enumeration value="testdox-xml"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="target" type="xs:anyURI"/>
+        <xs:attribute name="lowUpperBound" type="xs:nonNegativeInteger" default="35"/>
+        <xs:attribute name="highLowerBound" type="xs:nonNegativeInteger" default="70"/>
+        <xs:attribute name="showUncoveredFiles" type="xs:boolean" default="false"/>
+        <xs:attribute name="showOnlySummary" type="xs:boolean" default="false"/>
+        <xs:attribute name="threshold" type="xs:nonNegativeInteger" default="30"/>
+    </xs:complexType>
+    <xs:group name="pathGroup">
+        <xs:sequence>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element name="directory" type="directoryFilterType"/>
+                <xs:element name="file" type="fileFilterType"/>
+            </xs:choice>
+        </xs:sequence>
+    </xs:group>
+    <xs:complexType name="directoryFilterType">
+        <xs:simpleContent>
+            <xs:extension base="xs:anyURI">
+                <xs:attribute type="xs:string" name="prefix" default=""/>
+                <xs:attribute type="xs:string" name="suffix" default="Test.php"/>
+                <xs:attributeGroup ref="phpVersionGroup"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:complexType name="fileFilterType">
+        <xs:simpleContent>
+            <xs:extension base="xs:anyURI">
+                <xs:attributeGroup ref="phpVersionGroup"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:attributeGroup name="phpVersionGroup">
+        <xs:attribute name="phpVersion" type="xs:string" default="5.3.0"/>
+        <xs:attribute name="phpVersionOperator" type="xs:string" default="&gt;="/>
+    </xs:attributeGroup>
+    <xs:complexType name="phpType">
+        <xs:sequence>
+            <xs:choice maxOccurs="unbounded">
+                <xs:element name="includePath" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="ini" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="const" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="var" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="env" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="post" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="get" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="cookie" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="server" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="files" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="request" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:choice>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="namedValueType">
+        <xs:attribute name="name" use="required" type="xs:string"/>
+        <xs:attribute name="value" use="required" type="xs:anySimpleType"/>
+        <xs:attribute name="verbatim" use="optional" type="xs:boolean"/>
+        <xs:attribute name="force" use="optional" type="xs:boolean"/>
+    </xs:complexType>
+    <xs:complexType name="phpUnitType">
+        <xs:annotation>
+            <xs:documentation>The main type specifying the document structure</xs:documentation>
+        </xs:annotation>
+        <xs:group ref="configGroup"/>
+        <xs:attributeGroup ref="configAttributeGroup"/>
+    </xs:complexType>
+    <xs:attributeGroup name="configAttributeGroup">
+        <xs:attribute name="backupGlobals" type="xs:boolean" default="false"/>
+        <xs:attribute name="backupStaticAttributes" type="xs:boolean" default="false"/>
+        <xs:attribute name="bootstrap" type="xs:anyURI"/>
+        <xs:attribute name="cacheTokens" type="xs:boolean"/>
+        <xs:attribute name="colors" type="xs:boolean" default="false"/>
+        <xs:attribute name="columns" type="columnsType" default="80"/>
+        <xs:attribute name="convertDeprecationsToExceptions" type="xs:boolean" default="true"/>
+        <xs:attribute name="convertErrorsToExceptions" type="xs:boolean" default="true"/>
+        <xs:attribute name="convertNoticesToExceptions" type="xs:boolean" default="true"/>
+        <xs:attribute name="convertWarningsToExceptions" type="xs:boolean" default="true"/>
+        <xs:attribute name="forceCoversAnnotation" type="xs:boolean" default="false"/>
+        <xs:attribute name="printerClass" type="xs:string" default="PHPUnit_TextUI_ResultPrinter"/>
+        <xs:attribute name="printerFile" type="xs:anyURI"/>
+        <xs:attribute name="processIsolation" type="xs:boolean" default="false"/>
+        <xs:attribute name="stopOnError" type="xs:boolean" default="false"/>
+        <xs:attribute name="stopOnFailure" type="xs:boolean" default="false"/>
+        <xs:attribute name="stopOnWarning" type="xs:boolean" default="false"/>
+        <xs:attribute name="stopOnIncomplete" type="xs:boolean" default="false"/>
+        <xs:attribute name="stopOnRisky" type="xs:boolean" default="false"/>
+        <xs:attribute name="stopOnSkipped" type="xs:boolean" default="false"/>
+        <xs:attribute name="failOnRisky" type="xs:boolean" default="false"/>
+        <xs:attribute name="failOnWarning" type="xs:boolean" default="false"/>
+        <xs:attribute name="beStrictAboutChangesToGlobalState" type="xs:boolean" default="false"/>
+        <xs:attribute name="beStrictAboutOutputDuringTests" type="xs:boolean" default="false"/>
+        <xs:attribute name="beStrictAboutResourceUsageDuringSmallTests" type="xs:boolean" default="false"/>
+        <xs:attribute name="beStrictAboutTestsThatDoNotTestAnything" type="xs:boolean" default="true"/>
+        <xs:attribute name="beStrictAboutTodoAnnotatedTests" type="xs:boolean" default="false"/>
+        <xs:attribute name="beStrictAboutCoversAnnotation" type="xs:boolean" default="false"/>
+        <xs:attribute name="enforceTimeLimit" type="xs:boolean" default="false"/>
+        <xs:attribute name="ignoreDeprecatedCodeUnitsFromCodeCoverage" type="xs:boolean" default="false"/>
+        <xs:attribute name="timeoutForSmallTests" type="xs:integer" default="1"/>
+        <xs:attribute name="timeoutForMediumTests" type="xs:integer" default="10"/>
+        <xs:attribute name="timeoutForLargeTests" type="xs:integer" default="60"/>
+        <xs:attribute name="testSuiteLoaderClass" type="xs:string" default="PHPUnit_Runner_StandardTestSuiteLoader"/>
+        <xs:attribute name="testSuiteLoaderFile" type="xs:anyURI"/>
+        <xs:attribute name="defaultTestSuite" type="xs:string" default=""/>
+        <xs:attribute name="verbose" type="xs:boolean" default="false"/>
+        <xs:attribute name="stderr" type="xs:boolean" default="false"/>
+        <xs:attribute name="reverseDefectList" type="xs:boolean" default="false"/>
+        <xs:attribute name="registerMockObjectsFromTestArgumentsRecursively" type="xs:boolean" default="false"/>
+        <xs:attribute name="extensionsDirectory" type="xs:string"/>
+    </xs:attributeGroup>
+    <xs:group name="configGroup">
+        <xs:all>
+            <xs:element ref="testSuiteFacet" minOccurs="0"/>
+            <xs:element name="groups" type="groupsType" minOccurs="0"/>
+            <xs:element name="testdoxGroups" type="groupsType" minOccurs="0"/>
+            <xs:element name="filter" type="filtersType" minOccurs="0"/>
+            <xs:element name="logging" type="loggersType" minOccurs="0"/>
+            <xs:element name="listeners" type="listenersType" minOccurs="0"/>
+            <xs:element name="php" type="phpType" minOccurs="0"/>
+        </xs:all>
+    </xs:group>
+    <xs:element name="testSuiteFacet" abstract="true"/>
+    <xs:element name="testsuite" type="testSuiteType" substitutionGroup="testSuiteFacet"/>
+    <xs:element name="testsuites" type="testSuitesType" substitutionGroup="testSuiteFacet"/>
+    <xs:complexType name="testSuitesType">
+        <xs:sequence>
+            <xs:element name="testsuite" type="testSuiteType" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="testSuiteType">
+        <xs:sequence>
+            <xs:group ref="pathGroup"/>
+            <xs:element name="exclude" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:string" use="required"/>
+    </xs:complexType>
 </xs:schema>
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/ArraySubset.php b/vendor/phpunit/phpunit/src/Framework/Constraint/ArraySubset.php
index 52493727..3135e516 100644
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/ArraySubset.php
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/ArraySubset.php
@@ -83,8 +83,8 @@ public function evaluate($other, $description = '', $returnResult = false)
             $f = new ComparisonFailure(
                 $patched,
                 $other,
-                \print_r($patched, true),
-                \print_r($other, true)
+                \var_export($patched, true),
+                \var_export($other, true)
             );
 
             $this->fail($other, $description, $f);
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php
index 484e5fe5..768f677b 100644
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php
@@ -11,7 +11,8 @@
 
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Util\InvalidArgumentHelper;
-use SebastianBergmann;
+use SebastianBergmann\Comparator\ComparisonFailure;
+use SebastianBergmann\Comparator\Factory as ComparatorFactory;
 
 /**
  * Constraint that checks if one value is equal to another.
@@ -49,11 +50,6 @@ class IsEqual extends Constraint
      */
     protected $ignoreCase = false;
 
-    /**
-     * @var SebastianBergmann\Comparator\ComparisonFailure
-     */
-    protected $lastFailure;
-
     /**
      * @param mixed $value
      * @param float $delta
@@ -117,7 +113,7 @@ public function evaluate($other, $description = '', $returnResult = false)
             return true;
         }
 
-        $comparatorFactory = SebastianBergmann\Comparator\Factory::getInstance();
+        $comparatorFactory = ComparatorFactory::getInstance();
 
         try {
             $comparator = $comparatorFactory->getComparatorFor(
@@ -132,7 +128,7 @@ public function evaluate($other, $description = '', $returnResult = false)
                 $this->canonicalize,
                 $this->ignoreCase
             );
-        } catch (SebastianBergmann\Comparator\ComparisonFailure $f) {
+        } catch (ComparisonFailure $f) {
             if ($returnResult) {
                 return false;
             }
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php
index fcfb1938..782928ac 100644
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php
+++ b/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php
@@ -10,7 +10,7 @@
 namespace PHPUnit\Framework\Constraint;
 
 use PHPUnit\Framework\ExpectationFailedException;
-use SebastianBergmann;
+use SebastianBergmann\Comparator\ComparisonFailure;
 
 /**
  * Constraint that asserts that one value is identical to another.
@@ -81,7 +81,7 @@ public function evaluate($other, $description = '', $returnResult = false)
 
             // if both values are strings, make sure a diff is generated
             if (\is_string($this->value) && \is_string($other)) {
-                $f = new SebastianBergmann\Comparator\ComparisonFailure(
+                $f = new ComparisonFailure(
                     $this->value,
                     $other,
                     \sprintf("'%s'", $this->value),
diff --git a/vendor/phpunit/phpunit/src/Framework/TestCase.php b/vendor/phpunit/phpunit/src/Framework/TestCase.php
index 8bcd401f..278d6508 100644
--- a/vendor/phpunit/phpunit/src/Framework/TestCase.php
+++ b/vendor/phpunit/phpunit/src/Framework/TestCase.php
@@ -42,7 +42,6 @@
 use ReflectionClass;
 use ReflectionException;
 use ReflectionObject;
-use SebastianBergmann;
 use SebastianBergmann\Comparator\Comparator;
 use SebastianBergmann\Comparator\Factory as ComparatorFactory;
 use SebastianBergmann\Diff\Differ;
@@ -293,7 +292,7 @@ abstract class TestCase extends Assert implements Test, SelfDescribing
     private $outputBufferingLevel;
 
     /**
-     * @var SebastianBergmann\GlobalState\Snapshot
+     * @var Snapshot
      */
     private $snapshot;
 
@@ -756,7 +755,7 @@ public function hasFailed()
      *
      * @param TestResult $result
      *
-     * @return TestResult|null
+     * @return TestResult
      *
      * @throws Exception
      */
@@ -779,7 +778,7 @@ public function run(TestResult $result = null)
         if (!$this instanceof WarningTestCase &&
             !$this instanceof SkippedTestCase &&
             !$this->handleDependencies()) {
-            return;
+            return $result;
         }
 
         $runEntireClass =  $this->runClassInSeparateProcess && !$this->runTestInSeparateProcess;
@@ -1641,7 +1640,8 @@ protected function getMockForAbstractClass($originalClassName, array $arguments
     protected function getMockFromWsdl($wsdlFile, $originalClassName = '', $mockClassName = '', array $methods = [], $callOriginalConstructor = true, array $options = [])
     {
         if ($originalClassName === '') {
-            $originalClassName = \pathinfo(\basename(\parse_url($wsdlFile)['path']), PATHINFO_FILENAME);
+            $fileName          = \pathinfo(\basename(\parse_url($wsdlFile)['path']), PATHINFO_FILENAME);
+            $originalClassName = \preg_replace('/[^a-zA-Z0-9_]/', '', $fileName);
         }
 
         if (!\class_exists($originalClassName)) {
diff --git a/vendor/phpunit/phpunit/src/Runner/Filter/NameFilterIterator.php b/vendor/phpunit/phpunit/src/Runner/Filter/NameFilterIterator.php
index af0a37c0..7d3bec6a 100644
--- a/vendor/phpunit/phpunit/src/Runner/Filter/NameFilterIterator.php
+++ b/vendor/phpunit/phpunit/src/Runner/Filter/NameFilterIterator.php
@@ -79,7 +79,7 @@ protected function setFilter($filter)
 
             // Escape delimiters in regular expression. Do NOT use preg_quote,
             // to keep magic characters.
-            $filter = \sprintf('/%s/', \str_replace(
+            $filter = \sprintf('/%s/i', \str_replace(
                 '/',
                 '\\/',
                 $filter
@@ -89,10 +89,7 @@ protected function setFilter($filter)
         $this->filter = $filter;
     }
 
-    /**
-     * @return bool
-     */
-    public function accept()
+    public function accept(): bool
     {
         $test = $this->getInnerIterator()->current();
 
@@ -105,7 +102,7 @@ public function accept()
         if ($test instanceof WarningTestCase) {
             $name = $test->getMessage();
         } else {
-            if ($tmp[0] != '') {
+            if ($tmp[0] !== '') {
                 $name = \implode('::', $tmp);
             } else {
                 $name = $tmp[1];
@@ -119,6 +116,6 @@ public function accept()
             $accepted = $set >= $this->filterMin && $set <= $this->filterMax;
         }
 
-        return $accepted;
+        return (bool) $accepted;
     }
 }
diff --git a/vendor/phpunit/phpunit/src/Runner/Version.php b/vendor/phpunit/phpunit/src/Runner/Version.php
index 387fcf13..ad98c050 100644
--- a/vendor/phpunit/phpunit/src/Runner/Version.php
+++ b/vendor/phpunit/phpunit/src/Runner/Version.php
@@ -32,7 +32,7 @@ public static function id()
         }
 
         if (self::$version === null) {
-            $version       = new VersionId('6.5.8', \dirname(\dirname(__DIR__)));
+            $version       = new VersionId('6.5.13', \dirname(\dirname(__DIR__)));
             self::$version = $version->getVersion();
         }
 
diff --git a/vendor/phpunit/phpunit/src/TextUI/Command.php b/vendor/phpunit/phpunit/src/TextUI/Command.php
index a99272ad..77866f5b 100644
--- a/vendor/phpunit/phpunit/src/TextUI/Command.php
+++ b/vendor/phpunit/phpunit/src/TextUI/Command.php
@@ -1036,6 +1036,7 @@ protected function showHelp()
   --coverage-xml <dir>        Generate code coverage report in PHPUnit XML format.
   --whitelist <dir>           Whitelist <dir> for code coverage analysis.
   --disable-coverage-ignore   Disable annotations for ignoring code coverage.
+  --no-coverage               Ignore code coverage configuration.
 
 Logging Options:
 
@@ -1101,7 +1102,6 @@ protected function showHelp()
   --bootstrap <file>          A "bootstrap" PHP file that is run before the tests.
   -c|--configuration <file>   Read configuration from XML file.
   --no-configuration          Ignore default configuration file (phpunit.xml).
-  --no-coverage               Ignore code coverage configuration.
   --no-logging                Ignore logging configuration.
   --no-extensions             Do not load PHPUnit extensions.
   --include-path <path(s)>    Prepend PHP's include_path with given path(s).
diff --git a/vendor/phpunit/phpunit/src/TextUI/TestRunner.php b/vendor/phpunit/phpunit/src/TextUI/TestRunner.php
index b378de11..f6719eca 100644
--- a/vendor/phpunit/phpunit/src/TextUI/TestRunner.php
+++ b/vendor/phpunit/phpunit/src/TextUI/TestRunner.php
@@ -34,7 +34,6 @@
 use PHPUnit\Util\TestDox\TextResultPrinter;
 use PHPUnit\Util\TestDox\XmlResultPrinter;
 use ReflectionClass;
-use SebastianBergmann;
 use SebastianBergmann\CodeCoverage\CodeCoverage;
 use SebastianBergmann\CodeCoverage\Exception as CodeCoverageException;
 use SebastianBergmann\CodeCoverage\Filter as CodeCoverageFilter;
@@ -44,6 +43,7 @@
 use SebastianBergmann\CodeCoverage\Report\PHP as PhpReport;
 use SebastianBergmann\CodeCoverage\Report\Text as TextReport;
 use SebastianBergmann\CodeCoverage\Report\Xml\Facade as XmlReport;
+use SebastianBergmann\Comparator\Comparator;
 use SebastianBergmann\Environment\Runtime;
 
 /**
@@ -190,8 +190,6 @@ public function doRun(Test $suite, array $arguments = [], $exit = true)
 
         $this->handleConfiguration($arguments);
 
-        $this->processSuiteFilters($suite, $arguments);
-
         if (isset($arguments['bootstrap'])) {
             $GLOBALS['__PHPUNIT_BOOTSTRAP'] = $arguments['bootstrap'];
         }
@@ -429,7 +427,7 @@ public function doRun(Test $suite, array $arguments = [], $exit = true)
             );
 
             $codeCoverage->setUnintentionallyCoveredSubclassesWhitelist(
-                [SebastianBergmann\Comparator\Comparator::class]
+                [Comparator::class]
             );
 
             $codeCoverage->setCheckForUnintentionallyCoveredCode(
@@ -540,6 +538,7 @@ public function doRun(Test $suite, array $arguments = [], $exit = true)
         $result->setTimeoutForLargeTests($arguments['timeoutForLargeTests']);
 
         if ($suite instanceof TestSuite) {
+            $this->processSuiteFilters($suite, $arguments);
             $suite->setRunTestInSeparateProcess($arguments['processIsolation']);
         }
 
diff --git a/vendor/phpunit/phpunit/src/Util/Configuration.php b/vendor/phpunit/phpunit/src/Util/Configuration.php
index 2137f269..2dd07d34 100644
--- a/vendor/phpunit/phpunit/src/Util/Configuration.php
+++ b/vendor/phpunit/phpunit/src/Util/Configuration.php
@@ -568,6 +568,8 @@ public function handlePHPConfiguration()
                 \putenv("{$name}={$value}");
             }
 
+            $value = \getenv($name);
+
             if (!isset($_ENV[$name])) {
                 $_ENV[$name] = $value;
             }
diff --git a/vendor/phpunit/phpunit/src/Util/Log/TeamCity.php b/vendor/phpunit/phpunit/src/Util/Log/TeamCity.php
index 1ff3ae94..0508b94d 100644
--- a/vendor/phpunit/phpunit/src/Util/Log/TeamCity.php
+++ b/vendor/phpunit/phpunit/src/Util/Log/TeamCity.php
@@ -73,9 +73,10 @@ public function addError(Test $test, \Exception $e, $time)
         $this->printEvent(
             'testFailed',
             [
-                'name'    => $test->getName(),
-                'message' => self::getMessage($e),
-                'details' => self::getDetails($e),
+                'name'     => $test->getName(),
+                'message'  => self::getMessage($e),
+                'details'  => self::getDetails($e),
+                'duration' => self::toMilliseconds($time),
             ]
         );
     }
@@ -92,9 +93,10 @@ public function addWarning(Test $test, Warning $e, $time)
         $this->printEvent(
             'testFailed',
             [
-                'name'    => $test->getName(),
-                'message' => self::getMessage($e),
-                'details' => self::getDetails($e)
+                'name'     => $test->getName(),
+                'message'  => self::getMessage($e),
+                'details'  => self::getDetails($e),
+                'duration' => self::toMilliseconds($time),
             ]
         );
     }
@@ -109,9 +111,10 @@ public function addWarning(Test $test, Warning $e, $time)
     public function addFailure(Test $test, AssertionFailedError $e, $time)
     {
         $parameters = [
-            'name'    => $test->getName(),
-            'message' => self::getMessage($e),
-            'details' => self::getDetails($e),
+            'name'     => $test->getName(),
+            'message'  => self::getMessage($e),
+            'details'  => self::getDetails($e),
+            'duration' => self::toMilliseconds($time),
         ];
 
         if ($e instanceof ExpectationFailedException) {
@@ -150,7 +153,7 @@ public function addFailure(Test $test, AssertionFailedError $e, $time)
      */
     public function addIncompleteTest(Test $test, \Exception $e, $time)
     {
-        $this->printIgnoredTest($test->getName(), $e);
+        $this->printIgnoredTest($test->getName(), $e, $time);
     }
 
     /**
@@ -177,21 +180,22 @@ public function addSkippedTest(Test $test, \Exception $e, $time)
         $testName = $test->getName();
         if ($this->startedTestName != $testName) {
             $this->startTest($test);
-            $this->printIgnoredTest($testName, $e);
+            $this->printIgnoredTest($testName, $e, $time);
             $this->endTest($test, $time);
         } else {
-            $this->printIgnoredTest($testName, $e);
+            $this->printIgnoredTest($testName, $e, $time);
         }
     }
 
-    public function printIgnoredTest($testName, \Exception $e)
+    public function printIgnoredTest($testName, \Exception $e, $time)
     {
         $this->printEvent(
             'testIgnored',
             [
-                'name'    => $testName,
-                'message' => self::getMessage($e),
-                'details' => self::getDetails($e),
+                'name'     => $testName,
+                'message'  => self::getMessage($e),
+                'details'  => self::getDetails($e),
+                'duration' => self::toMilliseconds($time),
             ]
         );
     }
@@ -302,7 +306,7 @@ public function endTest(Test $test, $time)
             'testFinished',
             [
                 'name'     => $test->getName(),
-                'duration' => (int) (\round($time, 2) * 1000)
+                'duration' => self::toMilliseconds($time),
             ]
         );
     }
@@ -420,4 +424,14 @@ private static function getFileName($className)
 
         return $reflectionClass->getFileName();
     }
+
+    /**
+     * @param float $time microseconds
+     *
+     * @return int
+     */
+    private static function toMilliseconds($time)
+    {
+        return \round($time * 1000);
+    }
 }
diff --git a/vendor/phpunit/phpunit/src/Util/Printer.php b/vendor/phpunit/phpunit/src/Util/Printer.php
index d0e8a70f..d5c6c18d 100644
--- a/vendor/phpunit/phpunit/src/Util/Printer.php
+++ b/vendor/phpunit/phpunit/src/Util/Printer.php
@@ -54,7 +54,7 @@ public function __construct($out = null)
                     $this->out = \fsockopen($out[0], $out[1]);
                 } else {
                     if (\strpos($out, 'php://') === false && !\is_dir(\dirname($out))) {
-                        \mkdir(\dirname($out), 0777, true);
+                        $this->createDirectory(\dirname($out));
                     }
 
                     $this->out = \fopen($out, 'wt');
@@ -143,4 +143,9 @@ public function setAutoFlush($autoFlush)
             throw InvalidArgumentHelper::factory(1, 'boolean');
         }
     }
+
+    private function createDirectory(string $directory): bool
+    {
+        return !(!\is_dir($directory) && !@\mkdir($directory, 0777, true) && !\is_dir($directory));
+    }
 }
diff --git a/vendor/phpunit/phpunit/src/Util/Test.php b/vendor/phpunit/phpunit/src/Util/Test.php
index 552786b2..1e16bf18 100644
--- a/vendor/phpunit/phpunit/src/Util/Test.php
+++ b/vendor/phpunit/phpunit/src/Util/Test.php
@@ -967,22 +967,22 @@ private static function getBooleanAnnotationSetting($className, $methodName, $se
             $methodName
         );
 
-        if (isset($annotations['class'][$settingName])) {
-            if ($annotations['class'][$settingName][0] == 'enabled') {
+        if (isset($annotations['method'][$settingName])) {
+            if ($annotations['method'][$settingName][0] === 'enabled') {
                 return true;
             }
 
-            if ($annotations['class'][$settingName][0] == 'disabled') {
+            if ($annotations['method'][$settingName][0] === 'disabled') {
                 return false;
             }
         }
 
-        if (isset($annotations['method'][$settingName])) {
-            if ($annotations['method'][$settingName][0] == 'enabled') {
+        if (isset($annotations['class'][$settingName])) {
+            if ($annotations['class'][$settingName][0] === 'enabled') {
                 return true;
             }
 
-            if ($annotations['method'][$settingName][0] == 'disabled') {
+            if ($annotations['class'][$settingName][0] === 'disabled') {
                 return false;
             }
         }
diff --git a/vendor/phpunit/phpunit/tests/_files/configuration.one-file-suite.xml b/vendor/phpunit/phpunit/tests/_files/configuration.one-file-suite.xml
index bc8dfa12..4eddce62 100644
--- a/vendor/phpunit/phpunit/tests/_files/configuration.one-file-suite.xml
+++ b/vendor/phpunit/phpunit/tests/_files/configuration.one-file-suite.xml
@@ -1,7 +1,7 @@
 <phpunit>
     <testsuites>
         <testsuite name="One File Suite">
-            <file>../../tests/TextUI/debug.phpt</file>
+            <file>../../tests/end-to-end/debug.phpt</file>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/vendor/phpunit/phpunit/tests/TextUI/_files/expect_external.txt b/vendor/phpunit/phpunit/tests/end-to-end/_files/expect_external.txt
similarity index 100%
rename from vendor/phpunit/phpunit/tests/TextUI/_files/expect_external.txt
rename to vendor/phpunit/phpunit/tests/end-to-end/_files/expect_external.txt
diff --git a/vendor/phpunit/phpunit/tests/TextUI/_files/phpt-env.expected.txt b/vendor/phpunit/phpunit/tests/end-to-end/_files/phpt-env.expected.txt
similarity index 100%
rename from vendor/phpunit/phpunit/tests/TextUI/_files/phpt-env.expected.txt
rename to vendor/phpunit/phpunit/tests/end-to-end/_files/phpt-env.expected.txt
diff --git a/vendor/phpunit/phpunit/tests/TextUI/_files/phpt_external.php b/vendor/phpunit/phpunit/tests/end-to-end/_files/phpt_external.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/TextUI/_files/phpt_external.php
rename to vendor/phpunit/phpunit/tests/end-to-end/_files/phpt_external.php
diff --git a/vendor/phpunit/phpunit/tests/TextUI/abstract-test-class.phpt b/vendor/phpunit/phpunit/tests/end-to-end/abstract-test-class.phpt
similarity index 91%
rename from vendor/phpunit/phpunit/tests/TextUI/abstract-test-class.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/abstract-test-class.phpt
index 41535e64..bc61c8e9 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/abstract-test-class.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/abstract-test-class.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit AbstractTest ../_files/AbstractTest.php
+phpunit AbstractTest ../../_files/AbstractTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/assertion.phpt b/vendor/phpunit/phpunit/tests/end-to-end/assertion.phpt
similarity index 92%
rename from vendor/phpunit/phpunit/tests/TextUI/assertion.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/assertion.phpt
index f9306fb8..8e40be21 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/assertion.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/assertion.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit AssertionExampleTest ../_files/AssertionExampleTest.php
+phpunit AssertionExampleTest ../../_files/AssertionExampleTest.php
 --SKIPIF--
 <?php
 if (PHP_MAJOR_VERSION < 7) {
diff --git a/vendor/phpunit/phpunit/tests/TextUI/code-coverage-ignore.phpt b/vendor/phpunit/phpunit/tests/end-to-end/code-coverage-ignore.phpt
similarity index 86%
rename from vendor/phpunit/phpunit/tests/TextUI/code-coverage-ignore.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/code-coverage-ignore.phpt
index f6ca35a5..25541c2e 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/code-coverage-ignore.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/code-coverage-ignore.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --colors=never --coverage-text=php://stdout IgnoreCodeCoverageClassTest ../_files/IgnoreCodeCoverageClassTest.php --whitelist ../../tests/_files/IgnoreCodeCoverageClass.php
+phpunit --colors=never --coverage-text=php://stdout IgnoreCodeCoverageClassTest ../../_files/IgnoreCodeCoverageClassTest.php --whitelist ../../../tests/_files/IgnoreCodeCoverageClass.php
 --SKIPIF--
 <?php
 if (!extension_loaded('xdebug')) {
diff --git a/vendor/phpunit/phpunit/tests/TextUI/code-coverage-phpt.phpt b/vendor/phpunit/phpunit/tests/end-to-end/code-coverage-phpt.phpt
similarity index 89%
rename from vendor/phpunit/phpunit/tests/TextUI/code-coverage-phpt.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/code-coverage-phpt.phpt
index f1d577e5..52711c2a 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/code-coverage-phpt.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/code-coverage-phpt.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --colors=never --coverage-text=php://stdout ../_files/phpt-for-coverage.phpt --whitelist ../_files/CoveredClass.php
+phpunit --colors=never --coverage-text=php://stdout ../../_files/phpt-for-coverage.phpt --whitelist ../../_files/CoveredClass.php
 --SKIPIF--
 <?php
 if (!extension_loaded('xdebug')) {
diff --git a/vendor/phpunit/phpunit/tests/TextUI/colors-always.phpt b/vendor/phpunit/phpunit/tests/end-to-end/colors-always.phpt
similarity index 86%
rename from vendor/phpunit/phpunit/tests/TextUI/colors-always.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/colors-always.phpt
index 792824d7..ba8c74b8 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/colors-always.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/colors-always.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --colors=always BankAccountTest ../_files/BankAccountTest.php
+phpunit --colors=always BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/concrete-test-class.phpt b/vendor/phpunit/phpunit/tests/end-to-end/concrete-test-class.phpt
similarity index 89%
rename from vendor/phpunit/phpunit/tests/TextUI/concrete-test-class.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/concrete-test-class.phpt
index ffbb6abf..fa310965 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/concrete-test-class.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/concrete-test-class.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit ConcreteTest ../_files/ConcreteTest.php
+phpunit ConcreteTest ../../_files/ConcreteTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/custom-printer-debug.phpt b/vendor/phpunit/phpunit/tests/end-to-end/custom-printer-debug.phpt
similarity index 87%
rename from vendor/phpunit/phpunit/tests/TextUI/custom-printer-debug.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/custom-printer-debug.phpt
index 86e8988d..e30227a5 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/custom-printer-debug.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/custom-printer-debug.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit -c ../_files/configuration.custom-printer.xml --debug BankAccountTest ../_files/BankAccountTest.php
+phpunit -c ../../_files/configuration.custom-printer.xml --debug BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '-c';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/custom-printer-verbose.phpt b/vendor/phpunit/phpunit/tests/end-to-end/custom-printer-verbose.phpt
similarity index 86%
rename from vendor/phpunit/phpunit/tests/TextUI/custom-printer-verbose.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/custom-printer-verbose.phpt
index 06ed19d8..32c7d57b 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/custom-printer-verbose.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/custom-printer-verbose.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit -c ../_files/configuration.custom-printer.xml --verbose IncompleteTest ../_files/IncompleteTest.php
+phpunit -c ../../_files/configuration.custom-printer.xml --verbose IncompleteTest ../../_files/IncompleteTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '-c';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/dataprovider-debug.phpt b/vendor/phpunit/phpunit/tests/end-to-end/dataprovider-debug.phpt
similarity index 96%
rename from vendor/phpunit/phpunit/tests/TextUI/dataprovider-debug.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/dataprovider-debug.phpt
index 72e573a1..d7ec8f88 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/dataprovider-debug.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/dataprovider-debug.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --debug DataProviderDebugTest ../_files/DataProviderDebugTest.php
+phpunit --debug DataProviderDebugTest ../../_files/DataProviderDebugTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/dataprovider-issue-2833.phpt b/vendor/phpunit/phpunit/tests/end-to-end/dataprovider-issue-2833.phpt
similarity index 90%
rename from vendor/phpunit/phpunit/tests/TextUI/dataprovider-issue-2833.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/dataprovider-issue-2833.phpt
index e1d55b1a..5b680f28 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/dataprovider-issue-2833.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/dataprovider-issue-2833.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit ../_files/DataProviderIssue2833
+phpunit ../../_files/DataProviderIssue2833
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/dataprovider-issue-2859.phpt b/vendor/phpunit/phpunit/tests/end-to-end/dataprovider-issue-2859.phpt
similarity index 87%
rename from vendor/phpunit/phpunit/tests/TextUI/dataprovider-issue-2859.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/dataprovider-issue-2859.phpt
index c6e8ed66..e784c776 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/dataprovider-issue-2859.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/dataprovider-issue-2859.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit -c ../_files/DataProviderIssue2859/phpunit.xml
+phpunit -c ../../_files/DataProviderIssue2859/phpunit.xml
 --FILE--
 <?php
 $_SERVER['argv'][1] = '-c';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/dataprovider-issue-2922.phpt b/vendor/phpunit/phpunit/tests/end-to-end/dataprovider-issue-2922.phpt
similarity index 87%
rename from vendor/phpunit/phpunit/tests/TextUI/dataprovider-issue-2922.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/dataprovider-issue-2922.phpt
index 2a864fbf..c724b0ac 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/dataprovider-issue-2922.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/dataprovider-issue-2922.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --exclude-group=foo ../_files/DataProviderIssue2922
+phpunit --exclude-group=foo ../../_files/DataProviderIssue2922
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml-isolation.phpt b/vendor/phpunit/phpunit/tests/end-to-end/dataprovider-log-xml-isolation.phpt
similarity index 98%
rename from vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml-isolation.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/dataprovider-log-xml-isolation.phpt
index a1a49769..5fbd3a88 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml-isolation.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/dataprovider-log-xml-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --log-junit php://stdout DataProviderTest ../_files/DataProviderTest.php
+phpunit --process-isolation --log-junit php://stdout DataProviderTest ../../_files/DataProviderTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml.phpt b/vendor/phpunit/phpunit/tests/end-to-end/dataprovider-log-xml.phpt
similarity index 95%
rename from vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/dataprovider-log-xml.phpt
index 64223600..9b30eacb 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/dataprovider-log-xml.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --log-junit php://stdout DataProviderTest ../_files/DataProviderTest.php
+phpunit --log-junit php://stdout DataProviderTest ../../_files/DataProviderTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/dataprovider-testdox.phpt b/vendor/phpunit/phpunit/tests/end-to-end/dataprovider-testdox.phpt
similarity index 87%
rename from vendor/phpunit/phpunit/tests/TextUI/dataprovider-testdox.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/dataprovider-testdox.phpt
index eb7c2315..529bffe1 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/dataprovider-testdox.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/dataprovider-testdox.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit DataProviderTestDoxTest ../_files/DataProviderTestDoxTest.php
+phpunit DataProviderTestDoxTest ../../_files/DataProviderTestDoxTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/debug.phpt b/vendor/phpunit/phpunit/tests/end-to-end/debug.phpt
similarity index 92%
rename from vendor/phpunit/phpunit/tests/TextUI/debug.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/debug.phpt
index 50af3c72..f343edd7 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/debug.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/debug.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --debug BankAccountTest ../_files/BankAccountTest.php
+phpunit --debug BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/default-isolation.phpt b/vendor/phpunit/phpunit/tests/end-to-end/default-isolation.phpt
similarity index 86%
rename from vendor/phpunit/phpunit/tests/TextUI/default-isolation.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/default-isolation.phpt
index 49084f49..88805405 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/default-isolation.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/default-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation BankAccountTest ../_files/BankAccountTest.php
+phpunit --process-isolation BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/default.phpt b/vendor/phpunit/phpunit/tests/end-to-end/default.phpt
similarity index 88%
rename from vendor/phpunit/phpunit/tests/TextUI/default.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/default.phpt
index cf4c9d34..01389dc8 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/default.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/default.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit BankAccountTest ../_files/BankAccountTest.php
+phpunit BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/defaulttestsuite-using-testsuite.phpt b/vendor/phpunit/phpunit/tests/end-to-end/defaulttestsuite-using-testsuite.phpt
similarity index 100%
rename from vendor/phpunit/phpunit/tests/TextUI/defaulttestsuite-using-testsuite.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/defaulttestsuite-using-testsuite.phpt
diff --git a/vendor/phpunit/phpunit/tests/TextUI/defaulttestsuite.phpt b/vendor/phpunit/phpunit/tests/end-to-end/defaulttestsuite.phpt
similarity index 100%
rename from vendor/phpunit/phpunit/tests/TextUI/defaulttestsuite.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/defaulttestsuite.phpt
diff --git a/vendor/phpunit/phpunit/tests/TextUI/dependencies-clone.phpt b/vendor/phpunit/phpunit/tests/end-to-end/dependencies-clone.phpt
similarity index 86%
rename from vendor/phpunit/phpunit/tests/TextUI/dependencies-clone.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/dependencies-clone.phpt
index ed3e862e..f62801bf 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/dependencies-clone.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/dependencies-clone.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --verbose ClonedDependencyTest ../_files/ClonedDependencyTest.php
+phpunit --verbose ClonedDependencyTest ../../_files/ClonedDependencyTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/dependencies-isolation.phpt b/vendor/phpunit/phpunit/tests/end-to-end/dependencies-isolation.phpt
similarity index 91%
rename from vendor/phpunit/phpunit/tests/TextUI/dependencies-isolation.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/dependencies-isolation.phpt
index 331204e6..88c0808b 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/dependencies-isolation.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/dependencies-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --verbose DependencyTestSuite ../_files/DependencyTestSuite.php
+phpunit --process-isolation --verbose DependencyTestSuite ../../_files/DependencyTestSuite.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/dependencies.phpt b/vendor/phpunit/phpunit/tests/end-to-end/dependencies.phpt
similarity index 92%
rename from vendor/phpunit/phpunit/tests/TextUI/dependencies.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/dependencies.phpt
index f495cd76..8fab9884 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/dependencies.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/dependencies.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --verbose DependencyTestSuite ../_files/DependencyTestSuite.php
+phpunit --verbose DependencyTestSuite ../../_files/DependencyTestSuite.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/dependencies2-isolation.phpt b/vendor/phpunit/phpunit/tests/end-to-end/dependencies2-isolation.phpt
similarity index 87%
rename from vendor/phpunit/phpunit/tests/TextUI/dependencies2-isolation.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/dependencies2-isolation.phpt
index 87af2379..2c7240eb 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/dependencies2-isolation.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/dependencies2-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation StackTest ../_files/StackTest.php
+phpunit --process-isolation StackTest ../../_files/StackTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/dependencies2.phpt b/vendor/phpunit/phpunit/tests/end-to-end/dependencies2.phpt
similarity index 90%
rename from vendor/phpunit/phpunit/tests/TextUI/dependencies2.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/dependencies2.phpt
index 92dd403f..cbff0f90 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/dependencies2.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/dependencies2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit StackTest ../_files/StackTest.php
+phpunit StackTest ../../_files/StackTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/dependencies3-isolation.phpt b/vendor/phpunit/phpunit/tests/end-to-end/dependencies3-isolation.phpt
similarity index 85%
rename from vendor/phpunit/phpunit/tests/TextUI/dependencies3-isolation.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/dependencies3-isolation.phpt
index 624f792d..66c5ca6b 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/dependencies3-isolation.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/dependencies3-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation MultiDependencyTest ../_files/MultiDependencyTest.php
+phpunit --process-isolation MultiDependencyTest ../../_files/MultiDependencyTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/dependencies3.phpt b/vendor/phpunit/phpunit/tests/end-to-end/dependencies3.phpt
similarity index 87%
rename from vendor/phpunit/phpunit/tests/TextUI/dependencies3.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/dependencies3.phpt
index f041f233..cbc5fd50 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/dependencies3.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/dependencies3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit MultiDependencyTest ../_files/MultiDependencyTest.php
+phpunit MultiDependencyTest ../../_files/MultiDependencyTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/disable-code-coverage-ignore.phpt b/vendor/phpunit/phpunit/tests/end-to-end/disable-code-coverage-ignore.phpt
similarity index 88%
rename from vendor/phpunit/phpunit/tests/TextUI/disable-code-coverage-ignore.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/disable-code-coverage-ignore.phpt
index 391a0453..bf75260a 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/disable-code-coverage-ignore.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/disable-code-coverage-ignore.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --colors=never --coverage-text=php://stdout --disable-coverage-ignore IgnoreCodeCoverageClassTest tests/_files/IgnoreCodeCoverageClassTest.php --whitelist ../../tests/_files/IgnoreCodeCoverageClass.php
+phpunit --colors=never --coverage-text=php://stdout --disable-coverage-ignore IgnoreCodeCoverageClassTest tests/_files/IgnoreCodeCoverageClassTest.php --whitelist ../../../tests/_files/IgnoreCodeCoverageClass.php
 --SKIPIF--
 <?php
 if (!extension_loaded('xdebug')) {
diff --git a/vendor/phpunit/phpunit/tests/TextUI/empty-testcase.phpt b/vendor/phpunit/phpunit/tests/end-to-end/empty-testcase.phpt
similarity index 90%
rename from vendor/phpunit/phpunit/tests/TextUI/empty-testcase.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/empty-testcase.phpt
index afc10080..05a43207 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/empty-testcase.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/empty-testcase.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit EmptyTestCaseTest ../_files/EmptyTestCaseTest.php
+phpunit EmptyTestCaseTest ../../_files/EmptyTestCaseTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/exception-stack.phpt b/vendor/phpunit/phpunit/tests/end-to-end/exception-stack.phpt
similarity index 94%
rename from vendor/phpunit/phpunit/tests/TextUI/exception-stack.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/exception-stack.phpt
index a2652551..0d17079f 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/exception-stack.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/exception-stack.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit ExceptionStackTest ../_files/ExceptionStackTest.php
+phpunit ExceptionStackTest ../../_files/ExceptionStackTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/exclude-group-isolation.phpt b/vendor/phpunit/phpunit/tests/end-to-end/exclude-group-isolation.phpt
similarity index 92%
rename from vendor/phpunit/phpunit/tests/TextUI/exclude-group-isolation.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/exclude-group-isolation.phpt
index 0f8bb808..e5453952 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/exclude-group-isolation.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/exclude-group-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --exclude-group balanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
+phpunit --process-isolation --exclude-group balanceIsInitiallyZero BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/exclude-group.phpt b/vendor/phpunit/phpunit/tests/end-to-end/exclude-group.phpt
similarity index 94%
rename from vendor/phpunit/phpunit/tests/TextUI/exclude-group.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/exclude-group.phpt
index 90667489..c7c37545 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/exclude-group.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/exclude-group.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --exclude-group balanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
+phpunit --exclude-group balanceIsInitiallyZero BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/failure-isolation.phpt b/vendor/phpunit/phpunit/tests/end-to-end/failure-isolation.phpt
similarity index 97%
rename from vendor/phpunit/phpunit/tests/TextUI/failure-isolation.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/failure-isolation.phpt
index c6709022..3f2da80e 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/failure-isolation.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/failure-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation FailureTest ../_files/FailureTest.php
+phpunit --process-isolation FailureTest ../../_files/FailureTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/failure-reverse-list.phpt b/vendor/phpunit/phpunit/tests/end-to-end/failure-reverse-list.phpt
similarity index 97%
rename from vendor/phpunit/phpunit/tests/TextUI/failure-reverse-list.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/failure-reverse-list.phpt
index 9988fe7b..d2aa7936 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/failure-reverse-list.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/failure-reverse-list.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --reverse-list FailureTest ../_files/FailureTest.php
+phpunit --reverse-list FailureTest ../../_files/FailureTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/failure.phpt b/vendor/phpunit/phpunit/tests/end-to-end/failure.phpt
similarity index 97%
rename from vendor/phpunit/phpunit/tests/TextUI/failure.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/failure.phpt
index d455d25b..de5f1cf5 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/failure.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/failure.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit FailureTest ../_files/FailureTest.php
+phpunit FailureTest ../../_files/FailureTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/fatal-isolation.phpt b/vendor/phpunit/phpunit/tests/end-to-end/fatal-isolation.phpt
similarity index 89%
rename from vendor/phpunit/phpunit/tests/TextUI/fatal-isolation.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/fatal-isolation.phpt
index 4aa908a6..ed7c56b6 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/fatal-isolation.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/fatal-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit FatalTest --process-isolation ../_files/FatalTest.php
+phpunit FatalTest --process-isolation ../../_files/FatalTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-class-isolation.phpt b/vendor/phpunit/phpunit/tests/end-to-end/filter-class-isolation.phpt
similarity index 94%
rename from vendor/phpunit/phpunit/tests/TextUI/filter-class-isolation.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/filter-class-isolation.phpt
index 1bc2ba3b..7bf042f5 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/filter-class-isolation.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/filter-class-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter BankAccountTest BankAccountTest ../_files/BankAccountTest.php
+phpunit --process-isolation --filter BankAccountTest BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-class.phpt b/vendor/phpunit/phpunit/tests/end-to-end/filter-class.phpt
similarity index 86%
rename from vendor/phpunit/phpunit/tests/TextUI/filter-class.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/filter-class.phpt
index 5477c0b7..cb1d5f2b 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/filter-class.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/filter-class.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter BankAccountTest BankAccountTest ../_files/BankAccountTest.php
+phpunit --filter BankAccountTest BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-classname-and-range-isolation.phpt b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-classname-and-range-isolation.phpt
similarity index 91%
rename from vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-classname-and-range-isolation.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-classname-and-range-isolation.phpt
index 27fe0098..0cd26e7a 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-classname-and-range-isolation.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-classname-and-range-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter DataProviderFilterTest#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --process-isolation --filter DataProviderFilterTest#1-3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-classname-and-range.phpt b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-classname-and-range.phpt
similarity index 93%
rename from vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-classname-and-range.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-classname-and-range.phpt
index 8984681f..161ba6a4 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-classname-and-range.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-classname-and-range.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter DataProviderFilterTest#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --filter DataProviderFilterTest#1-3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-number-isolation.phpt b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-number-isolation.phpt
similarity index 93%
rename from vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-number-isolation.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-number-isolation.phpt
index 6f141e65..fd66786e 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-number-isolation.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-number-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter testTrue#3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --process-isolation --filter testTrue#3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-number.phpt b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-number.phpt
similarity index 85%
rename from vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-number.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-number.phpt
index 90a1fb65..1bcaed84 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-number.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-number.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter testTrue#3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --filter testTrue#3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-range-isolation.phpt b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-only-range-isolation.phpt
similarity index 93%
rename from vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-range-isolation.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-only-range-isolation.phpt
index bb007c08..7aef1342 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-range-isolation.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-only-range-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter \#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --process-isolation --filter \#1-3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-range.phpt b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-only-range.phpt
similarity index 85%
rename from vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-range.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-only-range.phpt
index fa677f0e..f843f5fc 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-range.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-only-range.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter \#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --filter \#1-3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-regexp-isolation.phpt b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-only-regexp-isolation.phpt
similarity index 93%
rename from vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-regexp-isolation.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-only-regexp-isolation.phpt
index 04c10e42..f5c05e34 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-regexp-isolation.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-only-regexp-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter @false.* DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --process-isolation --filter @false.* DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-regexp.phpt b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-only-regexp.phpt
similarity index 85%
rename from vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-regexp.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-only-regexp.phpt
index 0fea03b7..aefce778 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-regexp.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-only-regexp.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter @false.* DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --filter @false.* DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-string-isolation.phpt b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-only-string-isolation.phpt
similarity index 92%
rename from vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-string-isolation.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-only-string-isolation.phpt
index 95c344c1..ee4f9026 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-string-isolation.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-only-string-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter @false\ test DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --process-isolation --filter @false\ test DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-string.phpt b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-only-string.phpt
similarity index 84%
rename from vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-string.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-only-string.phpt
index 2dac9ecd..1fdc959e 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-string.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-only-string.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter @false\ test DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --filter @false\ test DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-range-isolation.phpt b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-range-isolation.phpt
similarity index 92%
rename from vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-range-isolation.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-range-isolation.phpt
index 90335caf..49217b80 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-range-isolation.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-range-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter testTrue#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --process-isolation --filter testTrue#1-3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-range.phpt b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-range.phpt
similarity index 85%
rename from vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-range.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-range.phpt
index b028a669..02d9bc65 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-range.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-range.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter testTrue#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --filter testTrue#1-3 DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-regexp-isolation.phpt b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-regexp-isolation.phpt
similarity index 92%
rename from vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-regexp-isolation.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-regexp-isolation.phpt
index 18b933c0..114a2017 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-regexp-isolation.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-regexp-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter testFalse@false.* DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --process-isolation --filter testFalse@false.* DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-regexp.phpt b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-regexp.phpt
similarity index 84%
rename from vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-regexp.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-regexp.phpt
index 006a4600..b0a7ab9a 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-regexp.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-regexp.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter testFalse@false.* DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --filter testFalse@false.* DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-string-isolation.phpt b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-string-isolation.phpt
similarity index 91%
rename from vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-string-isolation.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-string-isolation.phpt
index e88a17db..c93096f0 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-string-isolation.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-string-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter testFalse@false\ test DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --process-isolation --filter testFalse@false\ test DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-string.phpt b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-string.phpt
similarity index 94%
rename from vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-string.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-string.phpt
index 6dc88ddb..2e9715cf 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-string.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/filter-dataprovider-by-string.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter testFalse@false\ test DataProviderFilterTest ../_files/DataProviderFilterTest.php
+phpunit --filter testFalse@false\ test DataProviderFilterTest ../../_files/DataProviderFilterTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-method-case-insensitive.phpt b/vendor/phpunit/phpunit/tests/end-to-end/filter-method-case-insensitive.phpt
similarity index 85%
rename from vendor/phpunit/phpunit/tests/TextUI/filter-method-case-insensitive.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/filter-method-case-insensitive.phpt
index a2151f7c..fe8d0d4a 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/filter-method-case-insensitive.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/filter-method-case-insensitive.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter /balanceIsInitiallyZero/i BankAccountTest ../_files/BankAccountTest.php
+phpunit --filter /balanceIsInitiallyZero/i BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-method-case-sensitive-no-result.phpt b/vendor/phpunit/phpunit/tests/end-to-end/filter-method-case-sensitive-no-result.phpt
similarity index 83%
rename from vendor/phpunit/phpunit/tests/TextUI/filter-method-case-sensitive-no-result.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/filter-method-case-sensitive-no-result.phpt
index 4dbfa139..5b26dbd6 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/filter-method-case-sensitive-no-result.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/filter-method-case-sensitive-no-result.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter balanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
+phpunit --filter balanceIsInitiallyZero BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-method-isolation.phpt b/vendor/phpunit/phpunit/tests/end-to-end/filter-method-isolation.phpt
similarity index 92%
rename from vendor/phpunit/phpunit/tests/TextUI/filter-method-isolation.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/filter-method-isolation.phpt
index 542dff44..a324db79 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/filter-method-isolation.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/filter-method-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter testBalanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
+phpunit --process-isolation --filter testBalanceIsInitiallyZero BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-method.phpt b/vendor/phpunit/phpunit/tests/end-to-end/filter-method.phpt
similarity index 84%
rename from vendor/phpunit/phpunit/tests/TextUI/filter-method.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/filter-method.phpt
index d63101e9..13bea6da 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/filter-method.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/filter-method.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter testBalanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
+phpunit --filter testBalanceIsInitiallyZero BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/filter-no-results.phpt b/vendor/phpunit/phpunit/tests/end-to-end/filter-no-results.phpt
similarity index 84%
rename from vendor/phpunit/phpunit/tests/TextUI/filter-no-results.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/filter-no-results.phpt
index 2999fefa..1107a259 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/filter-no-results.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/filter-no-results.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --filter doesNotExist BankAccountTest ../_files/BankAccountTest.php
+phpunit --filter doesNotExist BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/forward-compatibility.phpt b/vendor/phpunit/phpunit/tests/end-to-end/forward-compatibility.phpt
similarity index 88%
rename from vendor/phpunit/phpunit/tests/TextUI/forward-compatibility.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/forward-compatibility.phpt
index cf4c9d34..01389dc8 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/forward-compatibility.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/forward-compatibility.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit BankAccountTest ../_files/BankAccountTest.php
+phpunit BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/group-isolation.phpt b/vendor/phpunit/phpunit/tests/end-to-end/group-isolation.phpt
similarity index 93%
rename from vendor/phpunit/phpunit/tests/TextUI/group-isolation.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/group-isolation.phpt
index c0ca940b..f6b694fc 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/group-isolation.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/group-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --group balanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
+phpunit --process-isolation --group balanceIsInitiallyZero BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/group.phpt b/vendor/phpunit/phpunit/tests/end-to-end/group.phpt
similarity index 85%
rename from vendor/phpunit/phpunit/tests/TextUI/group.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/group.phpt
index a7f862f2..0e452a8c 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/group.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/group.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --group balanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
+phpunit --group balanceIsInitiallyZero BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/help.phpt b/vendor/phpunit/phpunit/tests/end-to-end/help.phpt
similarity index 100%
rename from vendor/phpunit/phpunit/tests/TextUI/help.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/help.phpt
index 233d6858..e4dae316 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/help.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/help.phpt
@@ -23,6 +23,7 @@ Code Coverage Options:
   --coverage-xml <dir>        Generate code coverage report in PHPUnit XML format.
   --whitelist <dir>           Whitelist <dir> for code coverage analysis.
   --disable-coverage-ignore   Disable annotations for ignoring code coverage.
+  --no-coverage               Ignore code coverage configuration.
 
 Logging Options:
 
@@ -88,7 +89,6 @@ Configuration Options:
   --bootstrap <file>          A "bootstrap" PHP file that is run before the tests.
   -c|--configuration <file>   Read configuration from XML file.
   --no-configuration          Ignore default configuration file (phpunit.xml).
-  --no-coverage               Ignore code coverage configuration.
   --no-logging                Ignore logging configuration.
   --no-extensions             Do not load PHPUnit extensions.
   --include-path <path(s)>    Prepend PHP's include_path with given path(s).
diff --git a/vendor/phpunit/phpunit/tests/TextUI/help2.phpt b/vendor/phpunit/phpunit/tests/end-to-end/help2.phpt
similarity index 100%
rename from vendor/phpunit/phpunit/tests/TextUI/help2.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/help2.phpt
index f453b068..f24bc1ac 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/help2.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/help2.phpt
@@ -24,6 +24,7 @@ Code Coverage Options:
   --coverage-xml <dir>        Generate code coverage report in PHPUnit XML format.
   --whitelist <dir>           Whitelist <dir> for code coverage analysis.
   --disable-coverage-ignore   Disable annotations for ignoring code coverage.
+  --no-coverage               Ignore code coverage configuration.
 
 Logging Options:
 
@@ -89,7 +90,6 @@ Configuration Options:
   --bootstrap <file>          A "bootstrap" PHP file that is run before the tests.
   -c|--configuration <file>   Read configuration from XML file.
   --no-configuration          Ignore default configuration file (phpunit.xml).
-  --no-coverage               Ignore code coverage configuration.
   --no-logging                Ignore logging configuration.
   --no-extensions             Do not load PHPUnit extensions.
   --include-path <path(s)>    Prepend PHP's include_path with given path(s).
diff --git a/vendor/phpunit/phpunit/tests/TextUI/ini-isolation.phpt b/vendor/phpunit/phpunit/tests/end-to-end/ini-isolation.phpt
similarity index 94%
rename from vendor/phpunit/phpunit/tests/TextUI/ini-isolation.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/ini-isolation.phpt
index 284ecb20..f1e5fffe 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/ini-isolation.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/ini-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation -d default_mimetype=application/x-test IniTest ../_files/IniTest.php
+phpunit --process-isolation -d default_mimetype=application/x-test IniTest ../../_files/IniTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/list-groups.phpt b/vendor/phpunit/phpunit/tests/end-to-end/list-groups.phpt
similarity index 86%
rename from vendor/phpunit/phpunit/tests/TextUI/list-groups.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/list-groups.phpt
index ca97b453..c0411e76 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/list-groups.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/list-groups.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --list-groups BankAccountTest ../_files/BankAccountTest.php
+phpunit --list-groups BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/list-suites.phpt b/vendor/phpunit/phpunit/tests/end-to-end/list-suites.phpt
similarity index 100%
rename from vendor/phpunit/phpunit/tests/TextUI/list-suites.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/list-suites.phpt
diff --git a/vendor/phpunit/phpunit/tests/TextUI/list-tests-dataprovider.phpt b/vendor/phpunit/phpunit/tests/end-to-end/list-tests-dataprovider.phpt
similarity index 87%
rename from vendor/phpunit/phpunit/tests/TextUI/list-tests-dataprovider.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/list-tests-dataprovider.phpt
index 5474b75c..6a555c03 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/list-tests-dataprovider.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/list-tests-dataprovider.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --list-tests DataProviderTest ../_files/DataProviderTest.php
+phpunit --list-tests DataProviderTest ../../_files/DataProviderTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/list-tests-xml-dataprovider.phpt b/vendor/phpunit/phpunit/tests/end-to-end/list-tests-xml-dataprovider.phpt
similarity index 91%
rename from vendor/phpunit/phpunit/tests/TextUI/list-tests-xml-dataprovider.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/list-tests-xml-dataprovider.phpt
index 055dc5cc..804fda5b 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/list-tests-xml-dataprovider.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/list-tests-xml-dataprovider.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --list-tests-xml DataProviderTest ../_files/DataProviderTest.php
+phpunit --list-tests-xml DataProviderTest ../../_files/DataProviderTest.php
 --FILE--
 <?php
 $target = tempnam(sys_get_temp_dir(), __FILE__);
diff --git a/vendor/phpunit/phpunit/tests/TextUI/log-junit.phpt b/vendor/phpunit/phpunit/tests/end-to-end/log-junit.phpt
similarity index 97%
rename from vendor/phpunit/phpunit/tests/TextUI/log-junit.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/log-junit.phpt
index da82cb4d..d8c2ccfd 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/log-junit.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/log-junit.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --log-junit php://stdout StatusTest ../_files/StatusTest.php
+phpunit --log-junit php://stdout StatusTest ../../_files/StatusTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/log-teamcity.phpt b/vendor/phpunit/phpunit/tests/end-to-end/log-teamcity.phpt
similarity index 94%
rename from vendor/phpunit/phpunit/tests/TextUI/log-teamcity.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/log-teamcity.phpt
index db919a88..cd18d068 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/log-teamcity.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/log-teamcity.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --log-teamcity php://stdout BankAccountTest ../_files/BankAccountTest.php
+phpunit --log-teamcity php://stdout BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/mycommand.phpt b/vendor/phpunit/phpunit/tests/end-to-end/mycommand.phpt
similarity index 91%
rename from vendor/phpunit/phpunit/tests/TextUI/mycommand.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/mycommand.phpt
index ca8c8c7a..5ec7e5e5 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/mycommand.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/mycommand.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit BankAccountTest ../_files/BankAccountTest.php
+phpunit BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/options-after-arguments.phpt b/vendor/phpunit/phpunit/tests/end-to-end/options-after-arguments.phpt
similarity index 87%
rename from vendor/phpunit/phpunit/tests/TextUI/options-after-arguments.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/options-after-arguments.phpt
index dabd8e42..43fd5ecf 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/options-after-arguments.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/options-after-arguments.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit BankAccountTest ../_files/BankAccountTest.php --colors
+phpunit BankAccountTest ../../_files/BankAccountTest.php --colors
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/output-isolation.phpt b/vendor/phpunit/phpunit/tests/end-to-end/output-isolation.phpt
similarity index 93%
rename from vendor/phpunit/phpunit/tests/TextUI/output-isolation.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/output-isolation.phpt
index 15a87db0..424f5d0f 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/output-isolation.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/output-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation --filter testExpectOutputStringFooActualFoo ../_files/OutputTestCase.php
+phpunit --process-isolation --filter testExpectOutputStringFooActualFoo ../../_files/OutputTestCase.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/phar-extension-suppressed.phpt b/vendor/phpunit/phpunit/tests/end-to-end/phar-extension-suppressed.phpt
similarity index 100%
rename from vendor/phpunit/phpunit/tests/TextUI/phar-extension-suppressed.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/phar-extension-suppressed.phpt
diff --git a/vendor/phpunit/phpunit/tests/TextUI/phar-extension.phpt b/vendor/phpunit/phpunit/tests/end-to-end/phar-extension.phpt
similarity index 100%
rename from vendor/phpunit/phpunit/tests/TextUI/phar-extension.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/phar-extension.phpt
diff --git a/vendor/phpunit/phpunit/tests/TextUI/phpt-args.phpt b/vendor/phpunit/phpunit/tests/end-to-end/phpt-args.phpt
similarity index 100%
rename from vendor/phpunit/phpunit/tests/TextUI/phpt-args.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/phpt-args.phpt
diff --git a/vendor/phpunit/phpunit/tests/TextUI/phpt-env.phpt b/vendor/phpunit/phpunit/tests/end-to-end/phpt-env.phpt
similarity index 100%
rename from vendor/phpunit/phpunit/tests/TextUI/phpt-env.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/phpt-env.phpt
diff --git a/vendor/phpunit/phpunit/tests/TextUI/phpt-external.phpt b/vendor/phpunit/phpunit/tests/end-to-end/phpt-external.phpt
similarity index 100%
rename from vendor/phpunit/phpunit/tests/TextUI/phpt-external.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/phpt-external.phpt
diff --git a/vendor/phpunit/phpunit/tests/TextUI/phpt-stderr.phpt b/vendor/phpunit/phpunit/tests/end-to-end/phpt-stderr.phpt
similarity index 100%
rename from vendor/phpunit/phpunit/tests/TextUI/phpt-stderr.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/phpt-stderr.phpt
diff --git a/vendor/phpunit/phpunit/tests/TextUI/phpt-stdin.phpt b/vendor/phpunit/phpunit/tests/end-to-end/phpt-stdin.phpt
similarity index 100%
rename from vendor/phpunit/phpunit/tests/TextUI/phpt-stdin.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/phpt-stdin.phpt
diff --git a/vendor/phpunit/phpunit/tests/TextUI/phpt-xfail.phpt b/vendor/phpunit/phpunit/tests/end-to-end/phpt-xfail.phpt
similarity index 100%
rename from vendor/phpunit/phpunit/tests/TextUI/phpt-xfail.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/phpt-xfail.phpt
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1149.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1149.phpt
similarity index 91%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1149.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1149.phpt
index bd4b60a5..5846e750 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/1149.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1149.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue1149Test';
 $_SERVER['argv'][3] = __DIR__ . '/1149/Issue1149Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1149/Issue1149Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1149/Issue1149Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1149/Issue1149Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1149/Issue1149Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1216.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1216.phpt
similarity index 93%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1216.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1216.phpt
index 932ad0d3..89796bf8 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/1216.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1216.phpt
@@ -10,7 +10,7 @@ $_SERVER['argv'][4] = '--bootstrap';
 $_SERVER['argv'][5] = __DIR__ . '/1216/bootstrap1216.php';
 $_SERVER['argv'][6] = __DIR__ . '/1216/Issue1216Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1216/Issue1216Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1216/Issue1216Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1216/Issue1216Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1216/Issue1216Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1216/bootstrap1216.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1216/bootstrap1216.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1216/bootstrap1216.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1216/bootstrap1216.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1216/phpunit1216.xml b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1216/phpunit1216.xml
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1216/phpunit1216.xml
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1216/phpunit1216.xml
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1265.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1265.phpt
similarity index 92%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1265.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1265.phpt
index ed66d809..6964f5d8 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/1265.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1265.phpt
@@ -8,7 +8,7 @@ $_SERVER['argv'][2] = __DIR__ . '/1265/phpunit1265.xml';
 $_SERVER['argv'][3] = 'Issue1265Test';
 $_SERVER['argv'][4] = __DIR__ . '/1265/Issue1265Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1265/Issue1265Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1265/Issue1265Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1265/Issue1265Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1265/Issue1265Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1265/phpunit1265.xml b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1265/phpunit1265.xml
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1265/phpunit1265.xml
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1265/phpunit1265.xml
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1330.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1330.phpt
similarity index 92%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1330.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1330.phpt
index ecc1bce8..898f7a35 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/1330.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1330.phpt
@@ -9,7 +9,7 @@ $_SERVER['argv'][3] = __DIR__ . '/1330/phpunit1330.xml';
 $_SERVER['argv'][4] = 'Issue1330Test';
 $_SERVER['argv'][5] = __DIR__ . '/1330/Issue1330Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1330/Issue1330Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1330/Issue1330Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1330/Issue1330Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1330/Issue1330Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1330/phpunit1330.xml b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1330/phpunit1330.xml
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1330/phpunit1330.xml
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1330/phpunit1330.xml
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1335.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1335.phpt
similarity index 91%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1335.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1335.phpt
index afb94f9b..15045507 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/1335.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1335.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][2] = '--bootstrap';
 $_SERVER['argv'][3] = __DIR__ . '/1335/bootstrap1335.php';
 $_SERVER['argv'][4] = __DIR__ . '/1335/Issue1335Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1335/Issue1335Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1335/Issue1335Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1335/Issue1335Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1335/Issue1335Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1335/bootstrap1335.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1335/bootstrap1335.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1335/bootstrap1335.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1335/bootstrap1335.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1337.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1337.phpt
similarity index 91%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1337.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1337.phpt
index c9b1512e..4bef341b 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/1337.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1337.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = 'Issue1337Test';
 $_SERVER['argv'][4] = __DIR__ . '/1337/Issue1337Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1337/Issue1337Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1337/Issue1337Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1337/Issue1337Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1337/Issue1337Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1348.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1348.phpt
similarity index 94%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1348.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1348.phpt
index 1df41a25..5387f472 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/1348.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1348.phpt
@@ -13,7 +13,7 @@ $_SERVER['argv'][]  = '--process-isolation';
 $_SERVER['argv'][]  = 'Issue1348Test';
 $_SERVER['argv'][]  = __DIR__ . '/1348/Issue1348Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1348/Issue1348Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1348/Issue1348Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1348/Issue1348Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1348/Issue1348Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1351.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1351.phpt
similarity index 95%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1351.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1351.phpt
index 71dd26b3..66859043 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/1351.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1351.phpt
@@ -13,7 +13,7 @@ $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = 'Issue1351Test';
 $_SERVER['argv'][4] = __DIR__ . '/1351/Issue1351Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1351/ChildProcessClass1351.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1351/ChildProcessClass1351.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1351/ChildProcessClass1351.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1351/ChildProcessClass1351.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1351/Issue1351Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1351/Issue1351Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1351/Issue1351Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1351/Issue1351Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1374.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1374.phpt
similarity index 91%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1374.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1374.phpt
index 3f7c80e5..73751e18 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/1374.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1374.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue1374Test';
 $_SERVER['argv'][3] = __DIR__ . '/1374/Issue1374Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1374/Issue1374Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1374/Issue1374Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1374/Issue1374Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1374/Issue1374Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1437.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1437.phpt
similarity index 92%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1437.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1437.phpt
index de7077ef..b107cd0a 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/1437.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1437.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue1437Test';
 $_SERVER['argv'][3] = __DIR__ . '/1437/Issue1437Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1437/Issue1437Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1437/Issue1437Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1437/Issue1437Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1437/Issue1437Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1468.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1468.phpt
similarity index 92%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1468.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1468.phpt
index 73c9d73b..16e38348 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/1468.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1468.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][2] = '--disallow-todo-tests';
 $_SERVER['argv'][3] = 'Issue1468Test';
 $_SERVER['argv'][4] = __DIR__ . '/1468/Issue1468Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1468/Issue1468Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1468/Issue1468Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1468/Issue1468Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1468/Issue1468Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1471.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1471.phpt
similarity index 92%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1471.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1471.phpt
index ee3d6752..b3263612 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/1471.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1471.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue1471Test';
 $_SERVER['argv'][3] = __DIR__ . '/1471/Issue1471Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1471/Issue1471Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1471/Issue1471Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1471/Issue1471Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1471/Issue1471Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1472.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1472.phpt
similarity index 90%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1472.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1472.phpt
index a255176f..e243bf7e 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/1472.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1472.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue1472Test';
 $_SERVER['argv'][3] = __DIR__ . '/1472/Issue1472Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1472/Issue1472Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1472/Issue1472Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1472/Issue1472Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1472/Issue1472Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1570.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1570.phpt
similarity index 93%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1570.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1570.phpt
index 654d70f8..ce04cceb 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/1570.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1570.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][2] = '--disallow-test-output';
 $_SERVER['argv'][3] = 'Issue1570Test';
 $_SERVER['argv'][4] = __DIR__ . '/1570/Issue1570Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/1570/Issue1570Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1570/Issue1570Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/1570/Issue1570Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/1570/Issue1570Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2137-filter.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2137-filter.phpt
similarity index 93%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2137-filter.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2137-filter.phpt
index 7ca92652..bb79708a 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2137-filter.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2137-filter.phpt
@@ -8,7 +8,7 @@ $_SERVER['argv'][3] = __DIR__ . '/2137/Issue2137Test.php';
 $_SERVER['argv'][4] = '--filter';
 $_SERVER['argv'][5] = 'BrandService';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2137-no_filter.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2137-no_filter.phpt
similarity index 94%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2137-no_filter.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2137-no_filter.phpt
index d068472f..02105e46 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2137-no_filter.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2137-no_filter.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue2137Test';
 $_SERVER['argv'][3] = __DIR__ . '/2137/Issue2137Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2137/Issue2137Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2137/Issue2137Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2137/Issue2137Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2137/Issue2137Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2145.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2145.phpt
similarity index 91%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2145.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2145.phpt
index f06b88a1..477acce9 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2145.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2145.phpt
@@ -8,7 +8,7 @@ $_SERVER['argv'][2] = 'Issue2145Test';
 $_SERVER['argv'][3] = '--stop-on-error';
 $_SERVER['argv'][4] = __DIR__ . '/2145/Issue2145Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2145/Issue2145Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2145/Issue2145Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2145/Issue2145Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2145/Issue2145Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2158.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2158.phpt
similarity index 91%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2158.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2158.phpt
index 9ce0b4b5..daedfef1 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2158.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2158.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue2158Test';
 $_SERVER['argv'][3] = __DIR__ . '/2158/Issue2158Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2158/Issue2158Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2158/Issue2158Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2158/Issue2158Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2158/Issue2158Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2158/constant.inc b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2158/constant.inc
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2158/constant.inc
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2158/constant.inc
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2366.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2366.phpt
similarity index 91%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2366.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2366.phpt
index c75e212b..3d8808dd 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2366.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2366.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue2366Test';
 $_SERVER['argv'][3] = __DIR__ . '/2366/Issue2366Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2366/Issue2366Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2366/Issue2366Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2366/Issue2366Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2366/Issue2366Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2380.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2380.phpt
similarity index 90%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2380.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2380.phpt
index 4defaeeb..1e6ec765 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2380.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2380.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue2380Test';
 $_SERVER['argv'][3] = __DIR__ . '/2380/Issue2380Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2380/Issue2380Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2380/Issue2380Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2380/Issue2380Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2380/Issue2380Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2382.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2382.phpt
similarity index 90%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2382.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2382.phpt
index 969b25e0..706926e7 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2382.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2382.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue2382Test';
 $_SERVER['argv'][3] = __DIR__ . '/2382/Issue2382Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2382/Issue2382Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2382/Issue2382Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2382/Issue2382Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2382/Issue2382Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2435.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2435.phpt
similarity index 90%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2435.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2435.phpt
index f4cabef4..a80da995 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2435.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2435.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue2435Test';
 $_SERVER['argv'][3] = __DIR__ . '/2435/Issue2435Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2435/Issue2435Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2435/Issue2435Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2435/Issue2435Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2435/Issue2435Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/244.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/244.phpt
similarity index 95%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/244.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/244.phpt
index 6624e641..2b5f2698 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/244.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/244.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = 'Issue244Test';
 $_SERVER['argv'][4] = __DIR__ . '/244/Issue244Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/244/Issue244Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/244/Issue244Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/244/Issue244Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/244/Issue244Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2448-existing-test.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2448-existing-test.phpt
similarity index 90%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2448-existing-test.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2448-existing-test.phpt
index 5b27253d..06960b0e 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2448-existing-test.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2448-existing-test.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][2] = 'Test';
 
 chdir(__DIR__.'/2448');
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2448-not-existing-test.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2448-not-existing-test.phpt
similarity index 85%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2448-not-existing-test.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2448-not-existing-test.phpt
index e66d59ba..887f491e 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2448-not-existing-test.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2448-not-existing-test.phpt
@@ -5,7 +5,7 @@
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Test';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2448/Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2448/Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2448/Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2448/Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2591-separate-class-preserve-no-bootstrap.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591-separate-class-preserve-no-bootstrap.phpt
similarity index 95%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2591-separate-class-preserve-no-bootstrap.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591-separate-class-preserve-no-bootstrap.phpt
index 7443e30a..fbf20efd 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2591-separate-class-preserve-no-bootstrap.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591-separate-class-preserve-no-bootstrap.phpt
@@ -9,7 +9,7 @@ $_SERVER['argv'][2] = '--bootstrap';
 $_SERVER['argv'][3] = __DIR__ . '/2591/bootstrapWithBootstrapNoGlobal.php';
 $_SERVER['argv'][4] = __DIR__ . '/2591/SeparateClassPreserveTest.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2591-separate-class-preserve.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591-separate-class-preserve.phpt
similarity index 93%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2591-separate-class-preserve.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591-separate-class-preserve.phpt
index 9594b7f0..f8161dd4 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2591-separate-class-preserve.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591-separate-class-preserve.phpt
@@ -9,7 +9,7 @@ $_SERVER['argv'][2] = '--bootstrap';
 $_SERVER['argv'][3] = __DIR__ . '/2591/bootstrapWithBootstrap.php';
 $_SERVER['argv'][4] = __DIR__ . '/2591/SeparateClassPreserveTest.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-xdebug.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-xdebug.phpt
similarity index 96%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-xdebug.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-xdebug.phpt
index 3182f878..30ec53cc 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-xdebug.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve-no-bootstrap-xdebug.phpt
@@ -14,7 +14,7 @@ $_SERVER['argv'][2] = '--bootstrap';
 $_SERVER['argv'][3] = __DIR__ . '/2591/bootstrapNoBootstrap.php';
 $_SERVER['argv'][4] = __DIR__ . '/2591/SeparateFunctionNoPreserveTest.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve-no-bootstrap.phpt
similarity index 96%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve-no-bootstrap.phpt
index 82c3e981..dcab71a4 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2591-separate-function-no-preserve-no-bootstrap.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve-no-bootstrap.phpt
@@ -14,7 +14,7 @@ $_SERVER['argv'][2] = '--bootstrap';
 $_SERVER['argv'][3] = __DIR__ . '/2591/bootstrapNoBootstrap.php';
 $_SERVER['argv'][4] = __DIR__ . '/2591/SeparateFunctionNoPreserveTest.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2591-separate-function-no-preserve.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve.phpt
similarity index 92%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2591-separate-function-no-preserve.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve.phpt
index 44aee685..639992b4 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2591-separate-function-no-preserve.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591-separate-function-no-preserve.phpt
@@ -8,7 +8,7 @@ $_SERVER['argv'][2] = '--bootstrap';
 $_SERVER['argv'][3] = __DIR__ . '/2591/bootstrapWithBootstrap.php';
 $_SERVER['argv'][4] = __DIR__ . '/2591/SeparateFunctionNoPreserveTest.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2591-separate-function-preserve.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591-separate-function-preserve.phpt
similarity index 92%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2591-separate-function-preserve.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591-separate-function-preserve.phpt
index 8bc9c504..e086149a 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2591-separate-function-preserve.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591-separate-function-preserve.phpt
@@ -8,7 +8,7 @@ $_SERVER['argv'][2] = '--bootstrap';
 $_SERVER['argv'][3] = __DIR__ . '/2591/bootstrapWithBootstrap.php';
 $_SERVER['argv'][4] = __DIR__ . '/2591/SeparateFunctionPreserveTest.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2591/SeparateClassPreserveTest.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591/SeparateClassPreserveTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2591/SeparateClassPreserveTest.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591/SeparateClassPreserveTest.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2591/SeparateFunctionNoPreserveTest.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591/SeparateFunctionNoPreserveTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2591/SeparateFunctionNoPreserveTest.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591/SeparateFunctionNoPreserveTest.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2591/SeparateFunctionPreserveTest.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591/SeparateFunctionPreserveTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2591/SeparateFunctionPreserveTest.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591/SeparateFunctionPreserveTest.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2591/bootstrapNoBootstrap.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591/bootstrapNoBootstrap.php
similarity index 69%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2591/bootstrapNoBootstrap.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591/bootstrapNoBootstrap.php
index ba308f2a..32df2e3f 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2591/bootstrapNoBootstrap.php
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591/bootstrapNoBootstrap.php
@@ -4,4 +4,4 @@
 
 $globalString                          = 'Hello';
 
-// require __DIR__ . '/../../../bootstrap.php';
+// require __DIR__ . '/../../../../bootstrap.php';
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2591/bootstrapWithBootstrap.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591/bootstrapWithBootstrap.php
similarity index 54%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2591/bootstrapWithBootstrap.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591/bootstrapWithBootstrap.php
index 656f7dcb..545498a4 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2591/bootstrapWithBootstrap.php
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591/bootstrapWithBootstrap.php
@@ -1,4 +1,4 @@
 <?php
 $globalString                          = 'Hello';
 
-require __DIR__ . '/../../../bootstrap.php';
\ No newline at end of file
+require __DIR__ . '/../../../../bootstrap.php';
\ No newline at end of file
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2591/bootstrapWithBootstrapNoGlobal.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591/bootstrapWithBootstrapNoGlobal.php
similarity index 56%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2591/bootstrapWithBootstrapNoGlobal.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591/bootstrapWithBootstrapNoGlobal.php
index 2907ee56..973b65b0 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2591/bootstrapWithBootstrapNoGlobal.php
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2591/bootstrapWithBootstrapNoGlobal.php
@@ -1,4 +1,4 @@
 <?php
 // $globalString                          = 'Hello';
 
-require __DIR__ . '/../../../bootstrap.php';
\ No newline at end of file
+require __DIR__ . '/../../../../bootstrap.php';
\ No newline at end of file
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2725-separate-class-before-after-pid.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2725-separate-class-before-after-pid.phpt
similarity index 92%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2725-separate-class-before-after-pid.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2725-separate-class-before-after-pid.phpt
index c86131f9..bb16b542 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2725-separate-class-before-after-pid.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2725-separate-class-before-after-pid.phpt
@@ -6,7 +6,7 @@ GH-2725: Verify that @runClassInSeparateProcess runs @beforeclass and @afterclas
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = __DIR__ . '/2725/BeforeAfterClassPidTest.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2725/BeforeAfterClassPidTest.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2725/BeforeAfterClassPidTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2725/BeforeAfterClassPidTest.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2725/BeforeAfterClassPidTest.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2731.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2731.phpt
similarity index 92%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2731.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2731.phpt
index 681d3c28..1b5e130f 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2731.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2731.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue2731Test';
 $_SERVER['argv'][3] = __DIR__ . '/2731/Issue2731Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 
 PHPUnit\TextUI\Command::main();
 ?>
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2731/Issue2731Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2731/Issue2731Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2731/Issue2731Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2731/Issue2731Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2811.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2811.phpt
similarity index 91%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2811.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2811.phpt
index 7d442dc2..bb7afe0f 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2811.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2811.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue2811Test';
 $_SERVER['argv'][3] = __DIR__ . '/2811/Issue2811Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 
 PHPUnit\TextUI\Command::main();
 ?>
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2811/Issue2811Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2811/Issue2811Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2811/Issue2811Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2811/Issue2811Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2830.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2830.phpt
similarity index 91%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2830.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2830.phpt
index f46079da..9bee2aa2 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2830.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2830.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue2830';
 $_SERVER['argv'][3] = __DIR__ . '/2830/Issue2830Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 
 PHPUnit\TextUI\Command::main();
 ?>
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2830/Issue2830Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2830/Issue2830Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2830/Issue2830Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2830/Issue2830Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2972.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2972.phpt
similarity index 90%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2972.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2972.phpt
index db9e5696..04d15aee 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/2972.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2972.phpt
@@ -5,7 +5,7 @@ GH-2972: Test suite shouldn't fail when it contains both *.phpt files and unconv
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = __DIR__ . '/2972/';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2972/issue-2972-test.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2972/issue-2972-test.phpt
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2972/issue-2972-test.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2972/issue-2972-test.phpt
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/2972/unconventiallyNamedIssue2972Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2972/unconventiallyNamedIssue2972Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/2972/unconventiallyNamedIssue2972Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/2972/unconventiallyNamedIssue2972Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/322.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/322.phpt
similarity index 93%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/322.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/322.phpt
index 818d01bb..9c761467 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/322.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/322.phpt
@@ -11,7 +11,7 @@ $_SERVER['argv'][5] = 'one';
 $_SERVER['argv'][6] = 'Issue322Test';
 $_SERVER['argv'][7] = __DIR__ . '/322/Issue322Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/322/Issue322Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/322/Issue322Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/322/Issue322Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/322/Issue322Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/322/phpunit322.xml b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/322/phpunit322.xml
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/322/phpunit322.xml
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/322/phpunit322.xml
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/433.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/433.phpt
similarity index 93%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/433.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/433.phpt
index f64a29a1..ffbde4bc 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/433.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/433.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue433Test';
 $_SERVER['argv'][3] = __DIR__ . '/433/Issue433Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/433/Issue433Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/433/Issue433Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/433/Issue433Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/433/Issue433Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/445.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/445.phpt
similarity index 93%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/445.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/445.phpt
index a49768c6..9ad1b447 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/445.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/445.phpt
@@ -8,7 +8,7 @@ $_SERVER['argv'][2] = '--disallow-test-output';
 $_SERVER['argv'][3] = 'Issue445Test';
 $_SERVER['argv'][4] = __DIR__ . '/445/Issue445Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/445/Issue445Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/445/Issue445Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/445/Issue445Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/445/Issue445Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/498.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/498.phpt
similarity index 94%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/498.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/498.phpt
index e231889b..84d70f74 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/498.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/498.phpt
@@ -9,7 +9,7 @@ $_SERVER['argv'][3] = 'trueOnly';
 $_SERVER['argv'][4] = 'Issue498Test';
 $_SERVER['argv'][5] = __DIR__ . '/498/Issue498Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/498/Issue498Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/498/Issue498Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/498/Issue498Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/498/Issue498Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/503.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/503.phpt
similarity index 93%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/503.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/503.phpt
index bbb20aed..551ef863 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/503.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/503.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue503Test';
 $_SERVER['argv'][3] = __DIR__ . '/503/Issue503Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/503/Issue503Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/503/Issue503Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/503/Issue503Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/503/Issue503Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/581.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/581.phpt
similarity index 94%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/581.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/581.phpt
index e0c956fe..2d382a04 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/581.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/581.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue581Test';
 $_SERVER['argv'][3] = __DIR__ . '/581/Issue581Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/581/Issue581Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/581/Issue581Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/581/Issue581Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/581/Issue581Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/74.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/74.phpt
similarity index 93%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/74.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/74.phpt
index 4f7fa293..920c740f 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/74.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/74.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = 'Issue74Test';
 $_SERVER['argv'][4] = __DIR__ . '/74/Issue74Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/74/Issue74Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/74/Issue74Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/74/Issue74Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/74/Issue74Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/74/NewException.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/74/NewException.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/74/NewException.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/74/NewException.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/765.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/765.phpt
similarity index 93%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/765.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/765.phpt
index 507eff91..dc58e7d4 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/765.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/765.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue765Test';
 $_SERVER['argv'][3] = __DIR__ . '/765/Issue765Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/765/Issue765Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/765/Issue765Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/765/Issue765Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/765/Issue765Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/797.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/797.phpt
similarity index 92%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/797.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/797.phpt
index cff94bdd..6ee44306 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/797.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/797.phpt
@@ -9,7 +9,7 @@ $_SERVER['argv'][]  = '--bootstrap';
 $_SERVER['argv'][]  = __DIR__ . '/797/bootstrap797.php';
 $_SERVER['argv'][]  = __DIR__ . '/797/Issue797Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/797/Issue797Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/797/Issue797Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/797/Issue797Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/797/Issue797Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/797/bootstrap797.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/797/bootstrap797.php
similarity index 75%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/797/bootstrap797.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/797/bootstrap797.php
index 03890a35..b4a26afd 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/797/bootstrap797.php
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/797/bootstrap797.php
@@ -1,6 +1,6 @@
 <?php
 // If process isolation fails to include this file, then
 // PHPUnit_Framework_TestCase itself does not exist. :-)
-require __DIR__ . '/../../../bootstrap.php';
+require __DIR__ . '/../../../../bootstrap.php';
 
 const GITHUB_ISSUE = 797;
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/863.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/863.phpt
similarity index 82%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/863.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/863.phpt
index ef04db1b..ee4806c6 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/863.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/863.phpt
@@ -7,9 +7,9 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--repeat';
 $_SERVER['argv'][3] = '50';
 $_SERVER['argv'][4] = 'BankAccountTest';
-$_SERVER['argv'][5] = dirname(dirname(__DIR__)) . '/_files/BankAccountTest.php';
+$_SERVER['argv'][5] = dirname(dirname(dirname(__DIR__))) . '/_files/BankAccountTest.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/873.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/873.phpt
similarity index 91%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/873.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/873.phpt
index 96ea6b54..e886c673 100644
--- a/vendor/phpunit/phpunit/tests/Regression/GitHub/873.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/873.phpt
@@ -12,7 +12,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue873Test';
 $_SERVER['argv'][3] = __DIR__ . '/873/Issue873Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/GitHub/873/Issue873Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/873/Issue873Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/GitHub/873/Issue873Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/GitHub/873/Issue873Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/Trac/1021.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/1021.phpt
similarity index 91%
rename from vendor/phpunit/phpunit/tests/Regression/Trac/1021.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/1021.phpt
index be084675..19029b8b 100644
--- a/vendor/phpunit/phpunit/tests/Regression/Trac/1021.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/1021.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue1021Test';
 $_SERVER['argv'][3] = __DIR__ . '/1021/Issue1021Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/Trac/1021/Issue1021Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/1021/Issue1021Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/Trac/1021/Issue1021Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/1021/Issue1021Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/Trac/523.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/523.phpt
similarity index 91%
rename from vendor/phpunit/phpunit/tests/Regression/Trac/523.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/523.phpt
index 6ee85b62..84184294 100644
--- a/vendor/phpunit/phpunit/tests/Regression/Trac/523.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/523.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue523Test';
 $_SERVER['argv'][3] = __DIR__ . '/523/Issue523Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/Trac/523/Issue523Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/523/Issue523Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/Trac/523/Issue523Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/523/Issue523Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/Trac/578.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/578.phpt
similarity index 94%
rename from vendor/phpunit/phpunit/tests/Regression/Trac/578.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/578.phpt
index 111e3a01..165d5398 100644
--- a/vendor/phpunit/phpunit/tests/Regression/Trac/578.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/578.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue578Test';
 $_SERVER['argv'][3] = __DIR__ . '/578/Issue578Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/Trac/578/Issue578Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/578/Issue578Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/Trac/578/Issue578Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/578/Issue578Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/Trac/684.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/684.phpt
similarity index 92%
rename from vendor/phpunit/phpunit/tests/Regression/Trac/684.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/684.phpt
index 33eda07c..ec168894 100644
--- a/vendor/phpunit/phpunit/tests/Regression/Trac/684.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/684.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue684Test';
 $_SERVER['argv'][3] = __DIR__ . '/684/Issue684Test.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/Trac/684/Issue684Test.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/684/Issue684Test.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/Trac/684/Issue684Test.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/684/Issue684Test.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/Trac/783.phpt b/vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/783.phpt
similarity index 92%
rename from vendor/phpunit/phpunit/tests/Regression/Trac/783.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/783.phpt
index b902d36d..d1a40b74 100644
--- a/vendor/phpunit/phpunit/tests/Regression/Trac/783.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/783.phpt
@@ -8,7 +8,7 @@ $_SERVER['argv'][3] = 'foo,bar';
 $_SERVER['argv'][4] = 'ParentSuite';
 $_SERVER['argv'][5] = __DIR__ . '/783/ParentSuite.php';
 
-require __DIR__ . '/../../bootstrap.php';
+require __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--
diff --git a/vendor/phpunit/phpunit/tests/Regression/Trac/783/ChildSuite.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/783/ChildSuite.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/Trac/783/ChildSuite.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/783/ChildSuite.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/Trac/783/OneTest.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/783/OneTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/Trac/783/OneTest.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/783/OneTest.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/Trac/783/ParentSuite.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/783/ParentSuite.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/Trac/783/ParentSuite.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/783/ParentSuite.php
diff --git a/vendor/phpunit/phpunit/tests/Regression/Trac/783/TwoTest.php b/vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/783/TwoTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Regression/Trac/783/TwoTest.php
rename to vendor/phpunit/phpunit/tests/end-to-end/regression/Trac/783/TwoTest.php
diff --git a/vendor/phpunit/phpunit/tests/TextUI/repeat.phpt b/vendor/phpunit/phpunit/tests/end-to-end/repeat.phpt
similarity index 88%
rename from vendor/phpunit/phpunit/tests/TextUI/repeat.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/repeat.phpt
index ae7eb3f5..6ff980d9 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/repeat.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/repeat.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --repeat 3 BankAccountTest ../_files/BankAccountTest.php
+phpunit --repeat 3 BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/report-useless-tests-incomplete.phpt b/vendor/phpunit/phpunit/tests/end-to-end/report-useless-tests-incomplete.phpt
similarity index 90%
rename from vendor/phpunit/phpunit/tests/TextUI/report-useless-tests-incomplete.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/report-useless-tests-incomplete.phpt
index e00af36e..320e6530 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/report-useless-tests-incomplete.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/report-useless-tests-incomplete.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit IncompleteTest ../_files/IncompleteTest.php
+phpunit IncompleteTest ../../_files/IncompleteTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/report-useless-tests-isolation.phpt b/vendor/phpunit/phpunit/tests/end-to-end/report-useless-tests-isolation.phpt
similarity index 89%
rename from vendor/phpunit/phpunit/tests/TextUI/report-useless-tests-isolation.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/report-useless-tests-isolation.phpt
index c4dc4560..0d5b0fe5 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/report-useless-tests-isolation.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/report-useless-tests-isolation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --process-isolation IncompleteTest ../_files/IncompleteTest.php
+phpunit --process-isolation IncompleteTest ../../_files/IncompleteTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/report-useless-tests.phpt b/vendor/phpunit/phpunit/tests/end-to-end/report-useless-tests.phpt
similarity index 92%
rename from vendor/phpunit/phpunit/tests/TextUI/report-useless-tests.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/report-useless-tests.phpt
index 0f9a5439..7c888cf2 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/report-useless-tests.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/report-useless-tests.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit NothingTest ../_files/NothingTest.php
+phpunit NothingTest ../../_files/NothingTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/stop-on-warning-via-cli.phpt b/vendor/phpunit/phpunit/tests/end-to-end/stop-on-warning-via-cli.phpt
similarity index 100%
rename from vendor/phpunit/phpunit/tests/TextUI/stop-on-warning-via-cli.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/stop-on-warning-via-cli.phpt
diff --git a/vendor/phpunit/phpunit/tests/TextUI/stop-on-warning-via-config.phpt b/vendor/phpunit/phpunit/tests/end-to-end/stop-on-warning-via-config.phpt
similarity index 75%
rename from vendor/phpunit/phpunit/tests/TextUI/stop-on-warning-via-config.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/stop-on-warning-via-config.phpt
index 150b8566..84b56339 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/stop-on-warning-via-config.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/stop-on-warning-via-config.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit -c ../_files/configuration_stop_on_warning.xml --stop-on-warning StopOnWarningTestSuite ./tests/_files/StopOnWarningTestSuite.php
+phpunit -c ../../_files/configuration_stop_on_warning.xml --stop-on-warning StopOnWarningTestSuite ./tests/_files/StopOnWarningTestSuite.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '-c';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/teamcity-inner-exceptions.phpt b/vendor/phpunit/phpunit/tests/end-to-end/teamcity-inner-exceptions.phpt
similarity index 88%
rename from vendor/phpunit/phpunit/tests/TextUI/teamcity-inner-exceptions.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/teamcity-inner-exceptions.phpt
index 0b245f8a..b1872ed1 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/teamcity-inner-exceptions.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/teamcity-inner-exceptions.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --teamcity ExceptionStackTest ../_files/ExceptionStackTest.php
+phpunit --teamcity ExceptionStackTest ../../_files/ExceptionStackTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
@@ -19,13 +19,13 @@ PHPUnit %s by Sebastian Bergmann and contributors.
 
 ##teamcity[testStarted name='testPrintingChildException' locationHint='php_qn://%s%etests%e_files%eExceptionStackTest.php::\ExceptionStackTest::testPrintingChildException' flowId='%d']
 
-##teamcity[testFailed name='testPrintingChildException' message='Child exception|nmessage|nFailed asserting that two arrays are equal.|n--- Expected|n+++ Actual|n@@ @@|n Array (|n-    0 => 1|n+    0 => 2|n' details=' %s%eExceptionStackTest.php:14|n |n Caused by|n message|n Failed asserting that two arrays are equal.|n --- Expected|n +++ Actual|n @@ @@|n  Array (|n -    0 => 1|n +    0 => 2|n |n %s%eExceptionStackTest.php:10|n ' flowId='%d']
+##teamcity[testFailed name='testPrintingChildException' message='Child exception|nmessage|nFailed asserting that two arrays are equal.|n--- Expected|n+++ Actual|n@@ @@|n Array (|n-    0 => 1|n+    0 => 2|n' details=' %s%eExceptionStackTest.php:14|n |n Caused by|n message|n Failed asserting that two arrays are equal.|n --- Expected|n +++ Actual|n @@ @@|n  Array (|n -    0 => 1|n +    0 => 2|n |n %s%eExceptionStackTest.php:10|n ' duration='%d' flowId='%d']
 
 ##teamcity[testFinished name='testPrintingChildException' duration='%d' flowId='%d']
 
 ##teamcity[testStarted name='testNestedExceptions' locationHint='php_qn://%s%etests%e_files%eExceptionStackTest.php::\ExceptionStackTest::testNestedExceptions' flowId='%d']
 
-##teamcity[testFailed name='testNestedExceptions' message='Exception : One' details=' %s%etests%e_files%eExceptionStackTest.php:22|n |n Caused by|n InvalidArgumentException: Two|n |n %s%etests%e_files%eExceptionStackTest.php:21|n |n Caused by|n Exception: Three|n |n %s%etests%e_files%eExceptionStackTest.php:20|n ' flowId='%d']
+##teamcity[testFailed name='testNestedExceptions' message='Exception : One' details=' %s%etests%e_files%eExceptionStackTest.php:22|n |n Caused by|n InvalidArgumentException: Two|n |n %s%etests%e_files%eExceptionStackTest.php:21|n |n Caused by|n Exception: Three|n |n %s%etests%e_files%eExceptionStackTest.php:20|n ' duration='%d' flowId='%d']
 
 ##teamcity[testFinished name='testNestedExceptions' duration='%d' flowId='%d']
 
diff --git a/vendor/phpunit/phpunit/tests/TextUI/teamcity.phpt b/vendor/phpunit/phpunit/tests/end-to-end/teamcity.phpt
similarity index 95%
rename from vendor/phpunit/phpunit/tests/TextUI/teamcity.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/teamcity.phpt
index bb0f8f49..81b0ea77 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/teamcity.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/teamcity.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --teamcity BankAccountTest ../_files/BankAccountTest.php
+phpunit --teamcity BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/test-suffix-multiple.phpt b/vendor/phpunit/phpunit/tests/end-to-end/test-suffix-multiple.phpt
similarity index 89%
rename from vendor/phpunit/phpunit/tests/TextUI/test-suffix-multiple.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/test-suffix-multiple.phpt
index e5184196..5d6a6b0a 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/test-suffix-multiple.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/test-suffix-multiple.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --test-suffix .test.php,.my.php ../_files/
+phpunit --test-suffix .test.php,.my.php ../../_files/
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/test-suffix-single.phpt b/vendor/phpunit/phpunit/tests/end-to-end/test-suffix-single.phpt
similarity index 90%
rename from vendor/phpunit/phpunit/tests/TextUI/test-suffix-single.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/test-suffix-single.phpt
index dad2c4da..4780864b 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/test-suffix-single.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/test-suffix-single.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --test-suffix .test.php ../_files/
+phpunit --test-suffix .test.php ../../_files/
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/testdox-exclude-group.phpt b/vendor/phpunit/phpunit/tests/end-to-end/testdox-exclude-group.phpt
similarity index 93%
rename from vendor/phpunit/phpunit/tests/TextUI/testdox-exclude-group.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/testdox-exclude-group.phpt
index af82dfa7..53c0c5b4 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/testdox-exclude-group.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/testdox-exclude-group.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --testdox-text php://stdout --testdox-exclude-group one TestDoxGroupTest ../_files/TestDoxGroupTest.php
+phpunit --testdox-text php://stdout --testdox-exclude-group one TestDoxGroupTest ../../_files/TestDoxGroupTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/testdox-group.phpt b/vendor/phpunit/phpunit/tests/end-to-end/testdox-group.phpt
similarity index 94%
rename from vendor/phpunit/phpunit/tests/TextUI/testdox-group.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/testdox-group.phpt
index 3f74d573..39bb161a 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/testdox-group.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/testdox-group.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --testdox-text php://stdout --testdox-group one TestDoxGroupTest ../_files/TestDoxGroupTest.php
+phpunit --testdox-text php://stdout --testdox-group one TestDoxGroupTest ../../_files/TestDoxGroupTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/testdox-html.phpt b/vendor/phpunit/phpunit/tests/end-to-end/testdox-html.phpt
similarity index 94%
rename from vendor/phpunit/phpunit/tests/TextUI/testdox-html.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/testdox-html.phpt
index b2dd9a20..83f7551f 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/testdox-html.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/testdox-html.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --testdox-html php://stdout BankAccountTest ../_files/BankAccountTest.php
+phpunit --testdox-html php://stdout BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/testdox-text.phpt b/vendor/phpunit/phpunit/tests/end-to-end/testdox-text.phpt
similarity index 87%
rename from vendor/phpunit/phpunit/tests/TextUI/testdox-text.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/testdox-text.phpt
index 090d1da8..6965ea99 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/testdox-text.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/testdox-text.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --testdox-text php://stdout BankAccountTest ../_files/BankAccountTest.php
+phpunit --testdox-text php://stdout BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/testdox-xml.phpt b/vendor/phpunit/phpunit/tests/end-to-end/testdox-xml.phpt
similarity index 97%
rename from vendor/phpunit/phpunit/tests/TextUI/testdox-xml.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/testdox-xml.phpt
index cde0e4ad..53a2ba48 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/testdox-xml.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/testdox-xml.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --testdox-xml php://stdout StatusTest ../_files/StatusTest.php
+phpunit --testdox-xml php://stdout StatusTest ../../_files/StatusTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/TextUI/testdox.phpt b/vendor/phpunit/phpunit/tests/end-to-end/testdox.phpt
similarity index 84%
rename from vendor/phpunit/phpunit/tests/TextUI/testdox.phpt
rename to vendor/phpunit/phpunit/tests/end-to-end/testdox.phpt
index 6addd331..01c783a3 100644
--- a/vendor/phpunit/phpunit/tests/TextUI/testdox.phpt
+++ b/vendor/phpunit/phpunit/tests/end-to-end/testdox.phpt
@@ -1,5 +1,5 @@
 --TEST--
-phpunit --testdox php://stdout BankAccountTest ../_files/BankAccountTest.php
+phpunit --testdox php://stdout BankAccountTest ../../_files/BankAccountTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
diff --git a/vendor/phpunit/phpunit/tests/Framework/AssertTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/AssertTest.php
similarity index 95%
rename from vendor/phpunit/phpunit/tests/Framework/AssertTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/AssertTest.php
index 76691c59..f373c2bd 100644
--- a/vendor/phpunit/phpunit/tests/Framework/AssertTest.php
+++ b/vendor/phpunit/phpunit/tests/unit/Framework/AssertTest.php
@@ -14,16 +14,6 @@
 
 class AssertTest extends TestCase
 {
-    /**
-     * @var string
-     */
-    private $filesDirectory;
-
-    protected function setUp()
-    {
-        $this->filesDirectory = \dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR;
-    }
-
     public function testFail()
     {
         try {
@@ -506,7 +496,8 @@ protected function sameValues()
         $object = new \SampleClass(4, 8, 15);
         // cannot use $filesDirectory, because neither setUp() nor
         // setUpBeforeClass() are executed before the data providers
-        $file     = \dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'foo.xml';
+        $file     = TEST_FILES_PATH . 'foo.xml';
+
         $resource = \fopen($file, 'r');
 
         return [
@@ -555,9 +546,7 @@ protected function notEqualValues()
         $storage2 = new \SplObjectStorage;
         $storage2->attach($object3); // same content, different object
 
-        // cannot use $filesDirectory, because neither setUp() nor
-        // setUpBeforeClass() are executed before the data providers
-        $file = \dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'foo.xml';
+        $file = TEST_FILES_PATH . 'foo.xml';
 
         return [
             // strings
@@ -885,60 +874,60 @@ public function testAssertNotSameFails($a, $b)
     public function testAssertXmlFileEqualsXmlFile()
     {
         $this->assertXmlFileEqualsXmlFile(
-            $this->filesDirectory . 'foo.xml',
-            $this->filesDirectory . 'foo.xml'
+            TEST_FILES_PATH . 'foo.xml',
+            TEST_FILES_PATH . 'foo.xml'
         );
 
         $this->expectException(AssertionFailedError::class);
 
         $this->assertXmlFileEqualsXmlFile(
-            $this->filesDirectory . 'foo.xml',
-            $this->filesDirectory . 'bar.xml'
+            TEST_FILES_PATH . 'foo.xml',
+            TEST_FILES_PATH . 'bar.xml'
         );
     }
 
     public function testAssertXmlFileNotEqualsXmlFile()
     {
         $this->assertXmlFileNotEqualsXmlFile(
-            $this->filesDirectory . 'foo.xml',
-            $this->filesDirectory . 'bar.xml'
+            TEST_FILES_PATH . 'foo.xml',
+            TEST_FILES_PATH . 'bar.xml'
         );
 
         $this->expectException(AssertionFailedError::class);
 
         $this->assertXmlFileNotEqualsXmlFile(
-            $this->filesDirectory . 'foo.xml',
-            $this->filesDirectory . 'foo.xml'
+            TEST_FILES_PATH . 'foo.xml',
+            TEST_FILES_PATH . 'foo.xml'
         );
     }
 
     public function testAssertXmlStringEqualsXmlFile()
     {
         $this->assertXmlStringEqualsXmlFile(
-            $this->filesDirectory . 'foo.xml',
-            \file_get_contents($this->filesDirectory . 'foo.xml')
+            TEST_FILES_PATH . 'foo.xml',
+            \file_get_contents(TEST_FILES_PATH . 'foo.xml')
         );
 
         $this->expectException(AssertionFailedError::class);
 
         $this->assertXmlStringEqualsXmlFile(
-            $this->filesDirectory . 'foo.xml',
-            \file_get_contents($this->filesDirectory . 'bar.xml')
+            TEST_FILES_PATH . 'foo.xml',
+            \file_get_contents(TEST_FILES_PATH . 'bar.xml')
         );
     }
 
     public function testXmlStringNotEqualsXmlFile()
     {
         $this->assertXmlStringNotEqualsXmlFile(
-            $this->filesDirectory . 'foo.xml',
-            \file_get_contents($this->filesDirectory . 'bar.xml')
+            TEST_FILES_PATH . 'foo.xml',
+            \file_get_contents(TEST_FILES_PATH . 'bar.xml')
         );
 
         $this->expectException(AssertionFailedError::class);
 
         $this->assertXmlStringNotEqualsXmlFile(
-            $this->filesDirectory . 'foo.xml',
-            \file_get_contents($this->filesDirectory . 'foo.xml')
+            TEST_FILES_PATH . 'foo.xml',
+            \file_get_contents(TEST_FILES_PATH . 'foo.xml')
         );
     }
 
@@ -995,10 +984,10 @@ public function testAssertXmlStringNotEqualsXmlString()
     public function testXMLStructureIsSame()
     {
         $expected = new \DOMDocument;
-        $expected->load($this->filesDirectory . 'structureExpected.xml');
+        $expected->load(TEST_FILES_PATH . 'structureExpected.xml');
 
         $actual = new \DOMDocument;
-        $actual->load($this->filesDirectory . 'structureExpected.xml');
+        $actual->load(TEST_FILES_PATH . 'structureExpected.xml');
 
         $this->assertEqualXMLStructure(
             $expected->firstChild,
@@ -1010,10 +999,10 @@ public function testXMLStructureIsSame()
     public function testXMLStructureWrongNumberOfAttributes()
     {
         $expected = new \DOMDocument;
-        $expected->load($this->filesDirectory . 'structureExpected.xml');
+        $expected->load(TEST_FILES_PATH . 'structureExpected.xml');
 
         $actual = new \DOMDocument;
-        $actual->load($this->filesDirectory . 'structureWrongNumberOfAttributes.xml');
+        $actual->load(TEST_FILES_PATH . 'structureWrongNumberOfAttributes.xml');
 
         $this->expectException(ExpectationFailedException::class);
 
@@ -1027,10 +1016,10 @@ public function testXMLStructureWrongNumberOfAttributes()
     public function testXMLStructureWrongNumberOfNodes()
     {
         $expected = new \DOMDocument;
-        $expected->load($this->filesDirectory . 'structureExpected.xml');
+        $expected->load(TEST_FILES_PATH . 'structureExpected.xml');
 
         $actual = new \DOMDocument;
-        $actual->load($this->filesDirectory . 'structureWrongNumberOfNodes.xml');
+        $actual->load(TEST_FILES_PATH . 'structureWrongNumberOfNodes.xml');
 
         $this->expectException(ExpectationFailedException::class);
 
@@ -1044,10 +1033,10 @@ public function testXMLStructureWrongNumberOfNodes()
     public function testXMLStructureIsSameButDataIsNot()
     {
         $expected = new \DOMDocument;
-        $expected->load($this->filesDirectory . 'structureExpected.xml');
+        $expected->load(TEST_FILES_PATH . 'structureExpected.xml');
 
         $actual = new \DOMDocument;
-        $actual->load($this->filesDirectory . 'structureIsSameButDataIsNot.xml');
+        $actual->load(TEST_FILES_PATH . 'structureIsSameButDataIsNot.xml');
 
         $this->assertEqualXMLStructure(
             $expected->firstChild,
@@ -1059,10 +1048,10 @@ public function testXMLStructureIsSameButDataIsNot()
     public function testXMLStructureAttributesAreSameButValuesAreNot()
     {
         $expected = new \DOMDocument;
-        $expected->load($this->filesDirectory . 'structureExpected.xml');
+        $expected->load(TEST_FILES_PATH . 'structureExpected.xml');
 
         $actual = new \DOMDocument;
-        $actual->load($this->filesDirectory . 'structureAttributesAreSameButValuesAreNot.xml');
+        $actual->load(TEST_FILES_PATH . 'structureAttributesAreSameButValuesAreNot.xml');
 
         $this->assertEqualXMLStructure(
             $expected->firstChild,
@@ -1074,10 +1063,10 @@ public function testXMLStructureAttributesAreSameButValuesAreNot()
     public function testXMLStructureIgnoreTextNodes()
     {
         $expected = new \DOMDocument;
-        $expected->load($this->filesDirectory . 'structureExpected.xml');
+        $expected->load(TEST_FILES_PATH . 'structureExpected.xml');
 
         $actual = new \DOMDocument;
-        $actual->load($this->filesDirectory . 'structureIgnoreTextNodes.xml');
+        $actual->load(TEST_FILES_PATH . 'structureIgnoreTextNodes.xml');
 
         $this->assertEqualXMLStructure(
             $expected->firstChild,
@@ -2484,60 +2473,60 @@ public function testAssertThatCountOf()
     public function testAssertFileEquals()
     {
         $this->assertFileEquals(
-            $this->filesDirectory . 'foo.xml',
-            $this->filesDirectory . 'foo.xml'
+            TEST_FILES_PATH . 'foo.xml',
+            TEST_FILES_PATH . 'foo.xml'
         );
 
         $this->expectException(AssertionFailedError::class);
 
         $this->assertFileEquals(
-            $this->filesDirectory . 'foo.xml',
-            $this->filesDirectory . 'bar.xml'
+            TEST_FILES_PATH . 'foo.xml',
+            TEST_FILES_PATH . 'bar.xml'
         );
     }
 
     public function testAssertFileNotEquals()
     {
         $this->assertFileNotEquals(
-            $this->filesDirectory . 'foo.xml',
-            $this->filesDirectory . 'bar.xml'
+            TEST_FILES_PATH . 'foo.xml',
+            TEST_FILES_PATH . 'bar.xml'
         );
 
         $this->expectException(AssertionFailedError::class);
 
         $this->assertFileNotEquals(
-            $this->filesDirectory . 'foo.xml',
-            $this->filesDirectory . 'foo.xml'
+            TEST_FILES_PATH . 'foo.xml',
+            TEST_FILES_PATH . 'foo.xml'
         );
     }
 
     public function testAssertStringEqualsFile()
     {
         $this->assertStringEqualsFile(
-            $this->filesDirectory . 'foo.xml',
-            \file_get_contents($this->filesDirectory . 'foo.xml')
+            TEST_FILES_PATH . 'foo.xml',
+            \file_get_contents(TEST_FILES_PATH . 'foo.xml')
         );
 
         $this->expectException(AssertionFailedError::class);
 
         $this->assertStringEqualsFile(
-            $this->filesDirectory . 'foo.xml',
-            \file_get_contents($this->filesDirectory . 'bar.xml')
+            TEST_FILES_PATH . 'foo.xml',
+            \file_get_contents(TEST_FILES_PATH . 'bar.xml')
         );
     }
 
     public function testAssertStringNotEqualsFile()
     {
         $this->assertStringNotEqualsFile(
-            $this->filesDirectory . 'foo.xml',
-            \file_get_contents($this->filesDirectory . 'bar.xml')
+            TEST_FILES_PATH . 'foo.xml',
+            \file_get_contents(TEST_FILES_PATH . 'bar.xml')
         );
 
         $this->expectException(AssertionFailedError::class);
 
         $this->assertStringNotEqualsFile(
-            $this->filesDirectory . 'foo.xml',
-            \file_get_contents($this->filesDirectory . 'foo.xml')
+            TEST_FILES_PATH . 'foo.xml',
+            \file_get_contents(TEST_FILES_PATH . 'foo.xml')
         );
     }
 
@@ -2947,7 +2936,7 @@ public function testAssertJsonStringNotEqualsJsonStringErrorRaised($expected, $a
 
     public function testAssertJsonStringEqualsJsonFile()
     {
-        $file    = __DIR__ . '/../_files/JsonData/simpleObject.json';
+        $file    = TEST_FILES_PATH . '/JsonData/simpleObject.json';
         $actual  = \json_encode(['Mascott' => 'Tux']);
         $message = '';
 
@@ -2956,7 +2945,7 @@ public function testAssertJsonStringEqualsJsonFile()
 
     public function testAssertJsonStringEqualsJsonFileExpectingExpectationFailedException()
     {
-        $file    = __DIR__ . '/../_files/JsonData/simpleObject.json';
+        $file    = TEST_FILES_PATH . '/JsonData/simpleObject.json';
         $actual  = \json_encode(['Mascott' => 'Beastie']);
         $message = '';
 
@@ -2976,7 +2965,7 @@ public function testAssertJsonStringEqualsJsonFileExpectingExpectationFailedExce
 
     public function testAssertJsonStringEqualsJsonFileExpectingException()
     {
-        $file = __DIR__ . '/../_files/JsonData/simpleObject.json';
+        $file = TEST_FILES_PATH . '/JsonData/simpleObject.json';
 
         try {
             $this->assertJsonStringEqualsJsonFile($file, null);
@@ -2989,7 +2978,7 @@ public function testAssertJsonStringEqualsJsonFileExpectingException()
 
     public function testAssertJsonStringNotEqualsJsonFile()
     {
-        $file    = __DIR__ . '/../_files/JsonData/simpleObject.json';
+        $file    = TEST_FILES_PATH . '/JsonData/simpleObject.json';
         $actual  = \json_encode(['Mascott' => 'Beastie']);
         $message = '';
 
@@ -2998,7 +2987,7 @@ public function testAssertJsonStringNotEqualsJsonFile()
 
     public function testAssertJsonStringNotEqualsJsonFileExpectingException()
     {
-        $file = __DIR__ . '/../_files/JsonData/simpleObject.json';
+        $file = TEST_FILES_PATH . '/JsonData/simpleObject.json';
 
         try {
             $this->assertJsonStringNotEqualsJsonFile($file, null);
@@ -3011,8 +3000,8 @@ public function testAssertJsonStringNotEqualsJsonFileExpectingException()
 
     public function testAssertJsonFileNotEqualsJsonFile()
     {
-        $fileExpected = __DIR__ . '/../_files/JsonData/simpleObject.json';
-        $fileActual   = __DIR__ . '/../_files/JsonData/arrayObject.json';
+        $fileExpected = TEST_FILES_PATH . '/JsonData/simpleObject.json';
+        $fileActual   = TEST_FILES_PATH . '/JsonData/arrayObject.json';
         $message      = '';
 
         $this->assertJsonFileNotEqualsJsonFile($fileExpected, $fileActual, $message);
@@ -3020,7 +3009,7 @@ public function testAssertJsonFileNotEqualsJsonFile()
 
     public function testAssertJsonFileEqualsJsonFile()
     {
-        $file    = __DIR__ . '/../_files/JsonData/simpleObject.json';
+        $file    = TEST_FILES_PATH . '/JsonData/simpleObject.json';
         $message = '';
 
         $this->assertJsonFileEqualsJsonFile($file, $file, $message);
@@ -3142,16 +3131,16 @@ public function testAssertStringMatchesFormatFileThrowsExceptionForInvalidArgume
     {
         $this->expectException(Exception::class);
 
-        $this->assertStringMatchesFormatFile($this->filesDirectory . 'expectedFileFormat.txt', null);
+        $this->assertStringMatchesFormatFile(TEST_FILES_PATH . 'expectedFileFormat.txt', null);
     }
 
     public function testAssertStringMatchesFormatFile()
     {
-        $this->assertStringMatchesFormatFile($this->filesDirectory . 'expectedFileFormat.txt', "FOO\n");
+        $this->assertStringMatchesFormatFile(TEST_FILES_PATH . 'expectedFileFormat.txt', "FOO\n");
 
         $this->expectException(AssertionFailedError::class);
 
-        $this->assertStringMatchesFormatFile($this->filesDirectory . 'expectedFileFormat.txt', "BAR\n");
+        $this->assertStringMatchesFormatFile(TEST_FILES_PATH . 'expectedFileFormat.txt', "BAR\n");
     }
 
     public function testAssertStringNotMatchesFormatFileThrowsExceptionForInvalidArgument()
@@ -3165,16 +3154,16 @@ public function testAssertStringNotMatchesFormatFileThrowsExceptionForInvalidArg
     {
         $this->expectException(Exception::class);
 
-        $this->assertStringNotMatchesFormatFile($this->filesDirectory . 'expectedFileFormat.txt', null);
+        $this->assertStringNotMatchesFormatFile(TEST_FILES_PATH . 'expectedFileFormat.txt', null);
     }
 
     public function testAssertStringNotMatchesFormatFile()
     {
-        $this->assertStringNotMatchesFormatFile($this->filesDirectory . 'expectedFileFormat.txt', "BAR\n");
+        $this->assertStringNotMatchesFormatFile(TEST_FILES_PATH . 'expectedFileFormat.txt', "BAR\n");
 
         $this->expectException(AssertionFailedError::class);
 
-        $this->assertStringNotMatchesFormatFile($this->filesDirectory . 'expectedFileFormat.txt', "FOO\n");
+        $this->assertStringNotMatchesFormatFile(TEST_FILES_PATH . 'expectedFileFormat.txt', "FOO\n");
     }
 
     /**
diff --git a/vendor/phpunit/phpunit/tests/Framework/BaseTestListenerTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/BaseTestListenerTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/BaseTestListenerTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/BaseTestListenerTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/ArrayHasKeyTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/ArrayHasKeyTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/ArrayHasKeyTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/ArrayHasKeyTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/ArraySubsetTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/ArraySubsetTest.php
similarity index 93%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/ArraySubsetTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/ArraySubsetTest.php
index f48dd3ec..2d35b367 100644
--- a/vendor/phpunit/phpunit/tests/Framework/Constraint/ArraySubsetTest.php
+++ b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/ArraySubsetTest.php
@@ -77,8 +77,8 @@ public function testEvaluateFailMessage()
         } catch (ExpectationFailedException $expectedException) {
             $comparisonFailure = $expectedException->getComparisonFailure();
             $this->assertNotNull($comparisonFailure);
-            $this->assertContains('[foo] => bar', $comparisonFailure->getExpectedAsString());
-            $this->assertContains('[baz] => bar', $comparisonFailure->getActualAsString());
+            $this->assertContains("'foo' => 'bar'", $comparisonFailure->getExpectedAsString());
+            $this->assertContains("'baz' => 'bar'", $comparisonFailure->getActualAsString());
         }
     }
 }
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/AttributeTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/AttributeTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/AttributeTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/AttributeTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/CallbackTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/CallbackTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/CallbackTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/CallbackTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/ClassHasAttributeTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/ClassHasAttributeTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/ClassHasAttributeTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/ClassHasAttributeTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/ClassHasStaticAttributeTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/ClassHasStaticAttributeTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/ClassHasStaticAttributeTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/ClassHasStaticAttributeTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/ConstraintTestCase.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/ConstraintTestCase.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/ConstraintTestCase.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/ConstraintTestCase.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/CountTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/CountTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/CountTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/CountTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/DirectoryExistsTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/DirectoryExistsTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/DirectoryExistsTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/DirectoryExistsTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/ExceptionMessageRegExpTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/ExceptionMessageRegExpTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/ExceptionMessageRegExpTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/ExceptionMessageRegExpTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/ExceptionMessageTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/ExceptionMessageTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/ExceptionMessageTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/ExceptionMessageTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/FileExistsTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/FileExistsTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/FileExistsTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/FileExistsTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/GreaterThanTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/GreaterThanTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/GreaterThanTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/GreaterThanTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/IsEmptyTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/IsEmptyTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/IsEmptyTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/IsEmptyTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/IsEqualTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/IsEqualTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/IsEqualTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/IsEqualTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/IsIdenticalTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/IsIdenticalTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/IsIdenticalTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/IsIdenticalTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/IsJsonTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/IsJsonTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/IsJsonTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/IsJsonTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/IsNullTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/IsNullTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/IsNullTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/IsNullTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/IsReadableTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/IsReadableTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/IsReadableTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/IsReadableTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/IsTypeTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/IsTypeTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/IsTypeTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/IsTypeTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/IsWritableTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/IsWritableTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/IsWritableTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/IsWritableTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatchesErrorMessageProviderTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/JsonMatchesErrorMessageProviderTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatchesErrorMessageProviderTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/JsonMatchesErrorMessageProviderTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatchesTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/JsonMatchesTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatchesTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/JsonMatchesTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/LessThanTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/LessThanTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/LessThanTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/LessThanTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/LogicalAndTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/LogicalAndTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/LogicalAndTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/LogicalAndTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/LogicalOrTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/LogicalOrTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/LogicalOrTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/LogicalOrTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/LogicalXorTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/LogicalXorTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/LogicalXorTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/LogicalXorTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/ObjectHasAttributeTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/ObjectHasAttributeTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/ObjectHasAttributeTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/ObjectHasAttributeTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/RegularExpressionTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/RegularExpressionTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/RegularExpressionTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/RegularExpressionTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/SameSizeTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/SameSizeTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/SameSizeTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/SameSizeTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/StringContainsTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/StringContainsTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/StringContainsTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/StringContainsTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/StringEndsWithTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/StringEndsWithTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/StringEndsWithTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/StringEndsWithTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/StringMatchesFormatDescriptionTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/StringMatchesFormatDescriptionTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/StringMatchesFormatDescriptionTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/StringMatchesFormatDescriptionTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/StringStartsWithTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/StringStartsWithTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/StringStartsWithTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/StringStartsWithTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/Constraint/TraversableContainsTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/Constraint/TraversableContainsTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/Constraint/TraversableContainsTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/Constraint/TraversableContainsTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/ConstraintTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/ConstraintTest.php
similarity index 99%
rename from vendor/phpunit/phpunit/tests/Framework/ConstraintTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/ConstraintTest.php
index 706ba199..53fde455 100644
--- a/vendor/phpunit/phpunit/tests/Framework/ConstraintTest.php
+++ b/vendor/phpunit/phpunit/tests/unit/Framework/ConstraintTest.php
@@ -72,7 +72,7 @@ public function testConstraintArrayNotHasKey2()
 
     public function testConstraintFileNotExists()
     {
-        $file = \dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'ClassWithNonPublicAttributes.php';
+        $file = TEST_FILES_PATH . 'ClassWithNonPublicAttributes.php';
 
         $constraint = Assert::logicalNot(
             Assert::fileExists()
@@ -102,7 +102,7 @@ public function testConstraintFileNotExists()
 
     public function testConstraintFileNotExists2()
     {
-        $file = \dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'ClassWithNonPublicAttributes.php';
+        $file = TEST_FILES_PATH . 'ClassWithNonPublicAttributes.php';
 
         $constraint = Assert::logicalNot(
             Assert::fileExists()
diff --git a/vendor/phpunit/phpunit/tests/Framework/SuiteTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/SuiteTest.php
similarity index 98%
rename from vendor/phpunit/phpunit/tests/Framework/SuiteTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/SuiteTest.php
index fc71536f..96453655 100644
--- a/vendor/phpunit/phpunit/tests/Framework/SuiteTest.php
+++ b/vendor/phpunit/phpunit/tests/unit/Framework/SuiteTest.php
@@ -224,7 +224,7 @@ public function testDoNotSkipInheritedClass()
             'DontSkipInheritedClass'
         );
 
-        $dir = \dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'Inheritance' . DIRECTORY_SEPARATOR;
+        $dir = TEST_FILES_PATH . 'Inheritance' . DIRECTORY_SEPARATOR;
 
         $suite->addTestFile($dir . 'InheritanceA.php');
         $suite->addTestFile($dir . 'InheritanceB.php');
diff --git a/vendor/phpunit/phpunit/tests/Framework/TestCaseTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/TestCaseTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/TestCaseTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/TestCaseTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/TestFailureTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/TestFailureTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/TestFailureTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/TestFailureTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/TestImplementorTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/TestImplementorTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/TestImplementorTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/TestImplementorTest.php
diff --git a/vendor/phpunit/phpunit/tests/Framework/TestListenerTest.php b/vendor/phpunit/phpunit/tests/unit/Framework/TestListenerTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Framework/TestListenerTest.php
rename to vendor/phpunit/phpunit/tests/unit/Framework/TestListenerTest.php
diff --git a/vendor/phpunit/phpunit/tests/unit/Runner/Filter/NameFilterIteratorTest.php b/vendor/phpunit/phpunit/tests/unit/Runner/Filter/NameFilterIteratorTest.php
new file mode 100644
index 00000000..d832851d
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/unit/Runner/Filter/NameFilterIteratorTest.php
@@ -0,0 +1,38 @@
+<?php
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\Runner\Filter;
+
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\TestSuite;
+
+class NameFilterIteratorTest extends TestCase
+{
+    public function testCaseSensitiveMatch()
+    {
+        $this->assertTrue($this->createFilter('BankAccountTest')->accept());
+    }
+
+    public function testCaseInsensitiveMatch()
+    {
+        $this->assertTrue($this->createFilter('bankaccounttest')->accept());
+    }
+
+    private function createFilter(string $filter): NameFilterIterator
+    {
+        $suite = new TestSuite;
+        $suite->addTest(new \BankAccountTest('testBalanceIsInitiallyZero'));
+
+        $iterator = new NameFilterIterator($suite->getIterator(), $filter);
+
+        $iterator->rewind();
+
+        return $iterator;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Runner/PhptTestCaseTest.php b/vendor/phpunit/phpunit/tests/unit/Runner/PhptTestCaseTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Runner/PhptTestCaseTest.php
rename to vendor/phpunit/phpunit/tests/unit/Runner/PhptTestCaseTest.php
diff --git a/vendor/phpunit/phpunit/tests/unit/TextUI/TestRunnerTest.php b/vendor/phpunit/phpunit/tests/unit/TextUI/TestRunnerTest.php
new file mode 100644
index 00000000..b2f8bdf0
--- /dev/null
+++ b/vendor/phpunit/phpunit/tests/unit/TextUI/TestRunnerTest.php
@@ -0,0 +1,49 @@
+<?php
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TextUI;
+
+use PHPUnit\Framework\TestCase;
+
+class TestRunnerTest extends TestCase
+{
+    public function testTestIsRunnable()
+    {
+        $runner = new TestRunner();
+        $runner->setPrinter($this->getResultPrinterMock());
+        $runner->doRun(new \Success(), ['filter' => 'foo'], false);
+    }
+
+    public function testSuiteIsRunnable()
+    {
+        $runner = new TestRunner();
+        $runner->setPrinter($this->getResultPrinterMock());
+        $runner->doRun($this->getSuiteMock(), ['filter' => 'foo'], false);
+    }
+
+    /**
+     * @return \PHPUnit\TextUI\ResultPrinter
+     */
+    private function getResultPrinterMock()
+    {
+        return $this->createMock(\PHPUnit\TextUI\ResultPrinter::class);
+    }
+
+    /**
+     * @return \PHPUnit\Framework\TestSuite
+     */
+    private function getSuiteMock()
+    {
+        $suite = $this->createMock(\PHPUnit\Framework\TestSuite::class);
+        $suite->expects($this->once())->method('injectFilter');
+        $suite->expects($this->once())->method('run');
+
+        return $suite;
+    }
+}
diff --git a/vendor/phpunit/phpunit/tests/Util/ConfigurationGeneratorTest.php b/vendor/phpunit/phpunit/tests/unit/Util/ConfigurationGeneratorTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Util/ConfigurationGeneratorTest.php
rename to vendor/phpunit/phpunit/tests/unit/Util/ConfigurationGeneratorTest.php
diff --git a/vendor/phpunit/phpunit/tests/Util/ConfigurationTest.php b/vendor/phpunit/phpunit/tests/unit/Util/ConfigurationTest.php
similarity index 90%
rename from vendor/phpunit/phpunit/tests/Util/ConfigurationTest.php
rename to vendor/phpunit/phpunit/tests/unit/Util/ConfigurationTest.php
index 8500946f..ce2d124f 100644
--- a/vendor/phpunit/phpunit/tests/Util/ConfigurationTest.php
+++ b/vendor/phpunit/phpunit/tests/unit/Util/ConfigurationTest.php
@@ -24,7 +24,7 @@ class ConfigurationTest extends TestCase
     protected function setUp()
     {
         $this->configuration = Configuration::getInstance(
-            \dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'configuration.xml'
+            TEST_FILES_PATH . 'configuration.xml'
         );
     }
 
@@ -37,7 +37,7 @@ public function testExceptionIsThrownForNotExistingConfigurationFile()
 
     public function testShouldReadColorsWhenTrueInConfigurationFile()
     {
-        $configurationFilename =  \dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'configuration.colors.true.xml';
+        $configurationFilename =  TEST_FILES_PATH . 'configuration.colors.true.xml';
         $configurationInstance = Configuration::getInstance($configurationFilename);
         $configurationValues   = $configurationInstance->getPHPUnitConfiguration();
 
@@ -46,7 +46,7 @@ public function testShouldReadColorsWhenTrueInConfigurationFile()
 
     public function testShouldReadColorsWhenFalseInConfigurationFile()
     {
-        $configurationFilename =  \dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'configuration.colors.false.xml';
+        $configurationFilename =  TEST_FILES_PATH . 'configuration.colors.false.xml';
         $configurationInstance = Configuration::getInstance($configurationFilename);
         $configurationValues   = $configurationInstance->getPHPUnitConfiguration();
 
@@ -55,7 +55,7 @@ public function testShouldReadColorsWhenFalseInConfigurationFile()
 
     public function testShouldReadColorsWhenEmptyInConfigurationFile()
     {
-        $configurationFilename =  \dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'configuration.colors.empty.xml';
+        $configurationFilename =  TEST_FILES_PATH . 'configuration.colors.empty.xml';
         $configurationInstance = Configuration::getInstance($configurationFilename);
         $configurationValues   = $configurationInstance->getPHPUnitConfiguration();
 
@@ -64,7 +64,7 @@ public function testShouldReadColorsWhenEmptyInConfigurationFile()
 
     public function testShouldReadColorsWhenInvalidInConfigurationFile()
     {
-        $configurationFilename =  \dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'configuration.colors.invalid.xml';
+        $configurationFilename =  TEST_FILES_PATH . 'configuration.colors.invalid.xml';
         $configurationInstance = Configuration::getInstance($configurationFilename);
         $configurationValues   = $configurationInstance->getPHPUnitConfiguration();
 
@@ -178,8 +178,8 @@ public function testListenerConfigurationIsReadCorrectly()
                                 3 => 19.78,
                                 4 => null,
                                 5 => new \stdClass,
-                                6 => \dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'MyTestFile.php',
-                                7 => \dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'MyRelativePath',
+                                6 => TEST_FILES_PATH . 'MyTestFile.php',
+                                7 => TEST_FILES_PATH . 'MyRelativePath',
                             ],
                     ],
                 [
@@ -233,7 +233,7 @@ public function testPHPConfigurationIsReadCorrectly()
             [
                 'include_path' =>
                     [
-                        \dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . '.',
+                        TEST_FILES_PATH . '.',
                         '/path/to/lib'
                     ],
                 'ini'    => ['foo' => ['value' => 'bar']],
@@ -258,12 +258,12 @@ public function testPHPConfigurationIsHandledCorrectly()
     {
         $this->configuration->handlePHPConfiguration();
 
-        $path = \dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . '.' . PATH_SEPARATOR . '/path/to/lib';
+        $path = TEST_FILES_PATH . '.' . PATH_SEPARATOR . '/path/to/lib';
         $this->assertStringStartsWith($path, \ini_get('include_path'));
         $this->assertFalse(\FOO);
         $this->assertTrue(\BAR);
         $this->assertFalse($GLOBALS['foo']);
-        $this->assertTrue($_ENV['foo']);
+        $this->assertTrue((bool) $_ENV['foo']);
         $this->assertEquals(1, \getenv('foo'));
         $this->assertEquals('bar', $_POST['foo']);
         $this->assertEquals('bar', $_GET['foo']);
@@ -311,7 +311,7 @@ public function testHandlePHPConfigurationDoesNotOverriteVariablesFromPutEnv()
         \putenv('foo=putenv');
         $this->configuration->handlePHPConfiguration();
 
-        $this->assertTrue($_ENV['foo']);
+        $this->assertEquals('putenv', $_ENV['foo']);
         $this->assertEquals('putenv', \getenv('foo'));
     }
 
@@ -373,7 +373,7 @@ public function testPHPUnitConfigurationIsReadCorrectly()
     public function testXincludeInConfiguration()
     {
         $configurationWithXinclude = Configuration::getInstance(
-            \dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'configuration_xinclude.xml'
+            TEST_FILES_PATH . 'configuration_xinclude.xml'
         );
 
         $this->assertConfigurationEquals(
@@ -388,7 +388,7 @@ public function testXincludeInConfiguration()
     public function testWithEmptyConfigurations()
     {
         $emptyConfiguration = Configuration::getInstance(
-            \dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'configuration_empty.xml'
+            TEST_FILES_PATH . 'configuration_empty.xml'
         );
 
         $logging = $emptyConfiguration->getLoggingConfiguration();
@@ -451,15 +451,15 @@ protected function assertConfigurationEquals(Configuration $expectedConfiguratio
         );
 
         $this->assertEquals(
-            $expectedConfiguration->getTestSuiteConfiguration(),
-            $actualConfiguration->getTestSuiteConfiguration()
+            $expectedConfiguration->getTestSuiteConfiguration()->tests(),
+            $actualConfiguration->getTestSuiteConfiguration()->tests()
         );
     }
 
     public function testGetTestSuiteNamesReturnsTheNamesIfDefined()
     {
         $configuration = Configuration::getInstance(
-            \dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'configuration.suites.xml'
+            TEST_FILES_PATH . 'configuration.suites.xml'
         );
 
         $names = $configuration->getTestSuiteNames();
@@ -470,7 +470,7 @@ public function testGetTestSuiteNamesReturnsTheNamesIfDefined()
     public function testTestSuiteConfigurationForASingleFileInASuite()
     {
         $configuration = Configuration::getInstance(
-            \dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'configuration.one-file-suite.xml'
+            TEST_FILES_PATH . 'configuration.one-file-suite.xml'
         );
 
         $config = $configuration->getTestSuiteConfiguration();
diff --git a/vendor/phpunit/phpunit/tests/Util/GetoptTest.php b/vendor/phpunit/phpunit/tests/unit/Util/GetoptTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Util/GetoptTest.php
rename to vendor/phpunit/phpunit/tests/unit/Util/GetoptTest.php
diff --git a/vendor/phpunit/phpunit/tests/Util/GlobalStateTest.php b/vendor/phpunit/phpunit/tests/unit/Util/GlobalStateTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Util/GlobalStateTest.php
rename to vendor/phpunit/phpunit/tests/unit/Util/GlobalStateTest.php
diff --git a/vendor/phpunit/phpunit/tests/Util/JsonTest.php b/vendor/phpunit/phpunit/tests/unit/Util/JsonTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Util/JsonTest.php
rename to vendor/phpunit/phpunit/tests/unit/Util/JsonTest.php
diff --git a/vendor/phpunit/phpunit/tests/Util/PHP/AbstractPhpProcessTest.php b/vendor/phpunit/phpunit/tests/unit/Util/PHP/AbstractPhpProcessTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Util/PHP/AbstractPhpProcessTest.php
rename to vendor/phpunit/phpunit/tests/unit/Util/PHP/AbstractPhpProcessTest.php
diff --git a/vendor/phpunit/phpunit/tests/Util/RegularExpressionTest.php b/vendor/phpunit/phpunit/tests/unit/Util/RegularExpressionTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Util/RegularExpressionTest.php
rename to vendor/phpunit/phpunit/tests/unit/Util/RegularExpressionTest.php
diff --git a/vendor/phpunit/phpunit/tests/Util/TestDox/NamePrettifierTest.php b/vendor/phpunit/phpunit/tests/unit/Util/TestDox/NamePrettifierTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Util/TestDox/NamePrettifierTest.php
rename to vendor/phpunit/phpunit/tests/unit/Util/TestDox/NamePrettifierTest.php
diff --git a/vendor/phpunit/phpunit/tests/Util/TestTest.php b/vendor/phpunit/phpunit/tests/unit/Util/TestTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Util/TestTest.php
rename to vendor/phpunit/phpunit/tests/unit/Util/TestTest.php
diff --git a/vendor/phpunit/phpunit/tests/Util/XmlTest.php b/vendor/phpunit/phpunit/tests/unit/Util/XmlTest.php
similarity index 100%
rename from vendor/phpunit/phpunit/tests/Util/XmlTest.php
rename to vendor/phpunit/phpunit/tests/unit/Util/XmlTest.php
diff --git a/vendor/psy/psysh/box.json.dist b/vendor/psy/psysh/box.json.dist
index 32305a52..e302f265 100644
--- a/vendor/psy/psysh/box.json.dist
+++ b/vendor/psy/psysh/box.json.dist
@@ -4,7 +4,6 @@
     "compactors": [
         "KevinGH\\Box\\Compactor\\Php"
     ],
-    "chmod": "0755",
     "blacklist": [
         "grammar",
         "test_old",
diff --git a/vendor/psy/psysh/composer.json b/vendor/psy/psysh/composer.json
index 3e169be9..4588ba60 100644
--- a/vendor/psy/psysh/composer.json
+++ b/vendor/psy/psysh/composer.json
@@ -14,11 +14,13 @@
     ],
     "require": {
         "php": ">=5.4.0",
+        "ext-json": "*",
+        "ext-tokenizer": "*",
         "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0",
         "symfony/var-dumper": "~2.7|~3.0|~4.0",
         "nikic/php-parser": "~1.3|~2.0|~3.0|~4.0",
         "dnoegel/php-xdg-base-dir": "0.1",
-        "jakub-onderka/php-console-highlighter": "0.3.*"
+        "jakub-onderka/php-console-highlighter": "0.3.*|0.4.*"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0",
diff --git a/vendor/psy/psysh/src/CodeCleaner.php b/vendor/psy/psysh/src/CodeCleaner.php
index 0f0d378f..e44c2c18 100644
--- a/vendor/psy/psysh/src/CodeCleaner.php
+++ b/vendor/psy/psysh/src/CodeCleaner.php
@@ -138,7 +138,7 @@ class CodeCleaner
         }
 
         try {
-            $code = @file_get_contents($file);
+            $code = @\file_get_contents($file);
             if (!$code) {
                 return;
             }
@@ -169,15 +169,15 @@ class CodeCleaner
      */
     private static function getDebugFile()
     {
-        $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+        $trace = \debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
 
-        foreach (array_reverse($trace) as $stackFrame) {
+        foreach (\array_reverse($trace) as $stackFrame) {
             if (!self::isDebugCall($stackFrame)) {
                 continue;
             }
 
-            if (preg_match('/eval\(/', $stackFrame['file'])) {
-                preg_match_all('/([^\(]+)\((\d+)/', $stackFrame['file'], $matches);
+            if (\preg_match('/eval\(/', $stackFrame['file'])) {
+                \preg_match_all('/([^\(]+)\((\d+)/', $stackFrame['file'], $matches);
 
                 return $matches[1][0];
             }
@@ -214,7 +214,7 @@ class CodeCleaner
      */
     public function clean(array $codeLines, $requireSemicolons = false)
     {
-        $stmts = $this->parse('<?php ' . implode(PHP_EOL, $codeLines) . PHP_EOL, $requireSemicolons);
+        $stmts = $this->parse('<?php ' . \implode(PHP_EOL, $codeLines) . PHP_EOL, $requireSemicolons);
         if ($stmts === false) {
             return false;
         }
@@ -223,13 +223,13 @@ class CodeCleaner
         $stmts = $this->traverser->traverse($stmts);
 
         // Work around https://github.com/nikic/PHP-Parser/issues/399
-        $oldLocale = setlocale(LC_NUMERIC, 0);
-        setlocale(LC_NUMERIC, 'C');
+        $oldLocale = \setlocale(LC_NUMERIC, 0);
+        \setlocale(LC_NUMERIC, 'C');
 
         $code = $this->printer->prettyPrint($stmts);
 
         // Now put the locale back
-        setlocale(LC_NUMERIC, $oldLocale);
+        \setlocale(LC_NUMERIC, $oldLocale);
 
         return $code;
     }
@@ -307,7 +307,7 @@ class CodeCleaner
     {
         $msg = $e->getRawMessage();
 
-        return ($msg === 'Unexpected token EOF') || (strpos($msg, 'Syntax error, unexpected EOF') !== false);
+        return ($msg === 'Unexpected token EOF') || (\strpos($msg, 'Syntax error, unexpected EOF') !== false);
     }
 
     /**
@@ -344,6 +344,6 @@ class CodeCleaner
 
     private function parseErrorIsTrailingComma(\PhpParser\Error $e, $code)
     {
-        return ($e->getRawMessage() === 'A trailing comma is not allowed here') && (substr(rtrim($code), -1) === ',');
+        return ($e->getRawMessage() === 'A trailing comma is not allowed here') && (\substr(\rtrim($code), -1) === ',');
     }
 }
diff --git a/vendor/psy/psysh/src/CodeCleaner/AbstractClassPass.php b/vendor/psy/psysh/src/CodeCleaner/AbstractClassPass.php
index 66eaf42c..81d12b6a 100644
--- a/vendor/psy/psysh/src/CodeCleaner/AbstractClassPass.php
+++ b/vendor/psy/psysh/src/CodeCleaner/AbstractClassPass.php
@@ -36,11 +36,11 @@ class AbstractClassPass extends CodeCleanerPass
             $this->abstractMethods = [];
         } elseif ($node instanceof ClassMethod) {
             if ($node->isAbstract()) {
-                $name = sprintf('%s::%s', $this->class->name, $node->name);
+                $name = \sprintf('%s::%s', $this->class->name, $node->name);
                 $this->abstractMethods[] = $name;
 
                 if ($node->stmts !== null) {
-                    $msg = sprintf('Abstract function %s cannot contain body', $name);
+                    $msg = \sprintf('Abstract function %s cannot contain body', $name);
                     throw new FatalErrorException($msg, 0, E_ERROR, null, $node->getLine());
                 }
             }
@@ -55,14 +55,14 @@ class AbstractClassPass extends CodeCleanerPass
     public function leaveNode(Node $node)
     {
         if ($node instanceof Class_) {
-            $count = count($this->abstractMethods);
+            $count = \count($this->abstractMethods);
             if ($count > 0 && !$node->isAbstract()) {
-                $msg = sprintf(
+                $msg = \sprintf(
                     'Class %s contains %d abstract method%s must therefore be declared abstract or implement the remaining methods (%s)',
                     $node->name,
                     $count,
                     ($count === 1) ? '' : 's',
-                    implode(', ', $this->abstractMethods)
+                    \implode(', ', $this->abstractMethods)
                 );
                 throw new FatalErrorException($msg, 0, E_ERROR, null, $node->getLine());
             }
diff --git a/vendor/psy/psysh/src/CodeCleaner/CalledClassPass.php b/vendor/psy/psysh/src/CodeCleaner/CalledClassPass.php
index 280be3b7..e78f08d0 100644
--- a/vendor/psy/psysh/src/CodeCleaner/CalledClassPass.php
+++ b/vendor/psy/psysh/src/CodeCleaner/CalledClassPass.php
@@ -58,9 +58,9 @@ class CalledClassPass extends CodeCleanerPass
                 return;
             }
 
-            $name = strtolower($node->name);
-            if (in_array($name, ['get_class', 'get_called_class'])) {
-                $msg = sprintf('%s() called without object from outside a class', $name);
+            $name = \strtolower($node->name);
+            if (\in_array($name, ['get_class', 'get_called_class'])) {
+                $msg = \sprintf('%s() called without object from outside a class', $name);
                 throw new ErrorException($msg, 0, E_USER_WARNING, null, $node->getLine());
             }
         }
@@ -78,6 +78,6 @@ class CalledClassPass extends CodeCleanerPass
 
     private function isNull(Node $node)
     {
-        return $node->value instanceof ConstFetch && strtolower($node->value->name) === 'null';
+        return $node->value instanceof ConstFetch && \strtolower($node->value->name) === 'null';
     }
 }
diff --git a/vendor/psy/psysh/src/CodeCleaner/FinalClassPass.php b/vendor/psy/psysh/src/CodeCleaner/FinalClassPass.php
index bf1063fd..23f143be 100644
--- a/vendor/psy/psysh/src/CodeCleaner/FinalClassPass.php
+++ b/vendor/psy/psysh/src/CodeCleaner/FinalClassPass.php
@@ -41,13 +41,13 @@ class FinalClassPass extends CodeCleanerPass
             if ($node->extends) {
                 $extends = (string) $node->extends;
                 if ($this->isFinalClass($extends)) {
-                    $msg = sprintf('Class %s may not inherit from final class (%s)', $node->name, $extends);
+                    $msg = \sprintf('Class %s may not inherit from final class (%s)', $node->name, $extends);
                     throw new FatalErrorException($msg, 0, E_ERROR, null, $node->getLine());
                 }
             }
 
             if ($node->isFinal()) {
-                $this->finalClasses[strtolower($node->name)] = true;
+                $this->finalClasses[\strtolower($node->name)] = true;
             }
         }
     }
@@ -59,8 +59,8 @@ class FinalClassPass extends CodeCleanerPass
      */
     private function isFinalClass($name)
     {
-        if (!class_exists($name)) {
-            return isset($this->finalClasses[strtolower($name)]);
+        if (!\class_exists($name)) {
+            return isset($this->finalClasses[\strtolower($name)]);
         }
 
         $refl = new \ReflectionClass($name);
diff --git a/vendor/psy/psysh/src/CodeCleaner/FunctionReturnInWriteContextPass.php b/vendor/psy/psysh/src/CodeCleaner/FunctionReturnInWriteContextPass.php
index c3aad342..87e5e7ab 100644
--- a/vendor/psy/psysh/src/CodeCleaner/FunctionReturnInWriteContextPass.php
+++ b/vendor/psy/psysh/src/CodeCleaner/FunctionReturnInWriteContextPass.php
@@ -36,7 +36,7 @@ class FunctionReturnInWriteContextPass extends CodeCleanerPass
 
     public function __construct()
     {
-        $this->atLeastPhp55 = version_compare(PHP_VERSION, '5.5', '>=');
+        $this->atLeastPhp55 = \version_compare(PHP_VERSION, '5.5', '>=');
     }
 
     /**
diff --git a/vendor/psy/psysh/src/CodeCleaner/ImplicitReturnPass.php b/vendor/psy/psysh/src/CodeCleaner/ImplicitReturnPass.php
index 971a9804..06b06978 100644
--- a/vendor/psy/psysh/src/CodeCleaner/ImplicitReturnPass.php
+++ b/vendor/psy/psysh/src/CodeCleaner/ImplicitReturnPass.php
@@ -49,7 +49,7 @@ class ImplicitReturnPass extends CodeCleanerPass
             return [new Return_(NoReturnValue::create())];
         }
 
-        $last = end($nodes);
+        $last = \end($nodes);
 
         // Special case a few types of statements to add an implicit return
         // value (even though they technically don't have any return value)
@@ -68,22 +68,22 @@ class ImplicitReturnPass extends CodeCleanerPass
         } elseif ($last instanceof Switch_) {
             foreach ($last->cases as $case) {
                 // only add an implicit return to cases which end in break
-                $caseLast = end($case->stmts);
+                $caseLast = \end($case->stmts);
                 if ($caseLast instanceof Break_) {
-                    $case->stmts = $this->addImplicitReturn(array_slice($case->stmts, 0, -1));
+                    $case->stmts = $this->addImplicitReturn(\array_slice($case->stmts, 0, -1));
                     $case->stmts[] = $caseLast;
                 }
             }
         } elseif ($last instanceof Expr && !($last instanceof Exit_)) {
             // @codeCoverageIgnoreStart
-            $nodes[count($nodes) - 1] = new Return_($last, [
+            $nodes[\count($nodes) - 1] = new Return_($last, [
                 'startLine' => $last->getLine(),
                 'endLine'   => $last->getLine(),
             ]);
         // @codeCoverageIgnoreEnd
         } elseif ($last instanceof Expression && !($last->expr instanceof Exit_)) {
             // For PHP Parser 4.x
-            $nodes[count($nodes) - 1] = new Return_($last->expr, [
+            $nodes[\count($nodes) - 1] = new Return_($last->expr, [
                 'startLine' => $last->getLine(),
                 'endLine'   => $last->getLine(),
             ]);
diff --git a/vendor/psy/psysh/src/CodeCleaner/LegacyEmptyPass.php b/vendor/psy/psysh/src/CodeCleaner/LegacyEmptyPass.php
index a298c849..9793d8c4 100644
--- a/vendor/psy/psysh/src/CodeCleaner/LegacyEmptyPass.php
+++ b/vendor/psy/psysh/src/CodeCleaner/LegacyEmptyPass.php
@@ -28,7 +28,7 @@ class LegacyEmptyPass extends CodeCleanerPass
 
     public function __construct()
     {
-        $this->atLeastPhp55 = version_compare(PHP_VERSION, '5.5', '>=');
+        $this->atLeastPhp55 = \version_compare(PHP_VERSION, '5.5', '>=');
     }
 
     /**
@@ -49,7 +49,7 @@ class LegacyEmptyPass extends CodeCleanerPass
         }
 
         if (!$node->expr instanceof Variable) {
-            $msg = sprintf('syntax error, unexpected %s', $this->getUnexpectedThing($node->expr));
+            $msg = \sprintf('syntax error, unexpected %s', $this->getUnexpectedThing($node->expr));
 
             throw new ParseErrorException($msg, $node->expr->getLine());
         }
@@ -61,7 +61,7 @@ class LegacyEmptyPass extends CodeCleanerPass
             case 'Scalar_String':
             case 'Scalar_LNumber':
             case 'Scalar_DNumber':
-                return json_encode($node->value);
+                return \json_encode($node->value);
 
             case 'Expr_ConstFetch':
                 return (string) $node->name;
diff --git a/vendor/psy/psysh/src/CodeCleaner/ListPass.php b/vendor/psy/psysh/src/CodeCleaner/ListPass.php
index 04d32e9f..b0d1d73e 100644
--- a/vendor/psy/psysh/src/CodeCleaner/ListPass.php
+++ b/vendor/psy/psysh/src/CodeCleaner/ListPass.php
@@ -12,10 +12,15 @@
 namespace Psy\CodeCleaner;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
+use PhpParser\Node\Expr\ArrayDimFetch;
 use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Expr\Assign;
+use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\List_;
+use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Expr\PropertyFetch;
 use PhpParser\Node\Expr\Variable;
 use Psy\Exception\ParseErrorException;
 
@@ -28,7 +33,7 @@ class ListPass extends CodeCleanerPass
 
     public function __construct()
     {
-        $this->atLeastPhp71 = version_compare(PHP_VERSION, '7.1', '>=');
+        $this->atLeastPhp71 = \version_compare(PHP_VERSION, '7.1', '>=');
     }
 
     /**
@@ -74,9 +79,7 @@ class ListPass extends CodeCleanerPass
                 throw new ParseErrorException($msg, $item->key->getLine());
             }
 
-            $value = ($item instanceof ArrayItem) ? $item->value : $item;
-
-            if (!$value instanceof Variable) {
+            if (!self::isValidArrayItem($item)) {
                 $msg = 'Assignments can only happen to writable values';
                 throw new ParseErrorException($msg, $item->getLine());
             }
@@ -86,4 +89,24 @@ class ListPass extends CodeCleanerPass
             throw new ParseErrorException('Cannot use empty list');
         }
     }
+
+    /**
+     * Validate whether a given item in an array is valid for short assignment.
+     *
+     * @param Expr $item
+     *
+     * @return bool
+     */
+    private static function isValidArrayItem(Expr $item)
+    {
+        $value = ($item instanceof ArrayItem) ? $item->value : $item;
+
+        while ($value instanceof ArrayDimFetch || $value instanceof PropertyFetch) {
+            $value = $value->var;
+        }
+
+        // We just kind of give up if it's a method call. We can't tell if it's
+        // valid via static analysis.
+        return $value instanceof Variable || $value instanceof MethodCall || $value instanceof FuncCall;
+    }
 }
diff --git a/vendor/psy/psysh/src/CodeCleaner/LoopContextPass.php b/vendor/psy/psysh/src/CodeCleaner/LoopContextPass.php
index 9744fcb6..933278e7 100644
--- a/vendor/psy/psysh/src/CodeCleaner/LoopContextPass.php
+++ b/vendor/psy/psysh/src/CodeCleaner/LoopContextPass.php
@@ -62,23 +62,23 @@ class LoopContextPass extends CodeCleanerPass
                 $operator = $node instanceof Break_ ? 'break' : 'continue';
 
                 if ($this->loopDepth === 0) {
-                    $msg = sprintf("'%s' not in the 'loop' or 'switch' context", $operator);
+                    $msg = \sprintf("'%s' not in the 'loop' or 'switch' context", $operator);
                     throw new FatalErrorException($msg, 0, E_ERROR, null, $node->getLine());
                 }
 
                 if ($node->num instanceof LNumber || $node->num instanceof DNumber) {
                     $num = $node->num->value;
                     if ($node->num instanceof DNumber || $num < 1) {
-                        $msg = sprintf("'%s' operator accepts only positive numbers", $operator);
+                        $msg = \sprintf("'%s' operator accepts only positive numbers", $operator);
                         throw new FatalErrorException($msg, 0, E_ERROR, null, $node->getLine());
                     }
 
                     if ($num > $this->loopDepth) {
-                        $msg = sprintf("Cannot '%s' %d levels", $operator, $num);
+                        $msg = \sprintf("Cannot '%s' %d levels", $operator, $num);
                         throw new FatalErrorException($msg, 0, E_ERROR, null, $node->getLine());
                     }
                 } elseif ($node->num) {
-                    $msg = sprintf("'%s' operator with non-constant operand is no longer supported", $operator);
+                    $msg = \sprintf("'%s' operator with non-constant operand is no longer supported", $operator);
                     throw new FatalErrorException($msg, 0, E_ERROR, null, $node->getLine());
                 }
                 break;
diff --git a/vendor/psy/psysh/src/CodeCleaner/NamespaceAwarePass.php b/vendor/psy/psysh/src/CodeCleaner/NamespaceAwarePass.php
index 9b404450..6679206d 100644
--- a/vendor/psy/psysh/src/CodeCleaner/NamespaceAwarePass.php
+++ b/vendor/psy/psysh/src/CodeCleaner/NamespaceAwarePass.php
@@ -59,13 +59,13 @@ abstract class NamespaceAwarePass extends CodeCleanerPass
     protected function getFullyQualifiedName($name)
     {
         if ($name instanceof FullyQualifiedName) {
-            return implode('\\', $name->parts);
+            return \implode('\\', $name->parts);
         } elseif ($name instanceof Name) {
             $name = $name->parts;
-        } elseif (!is_array($name)) {
+        } elseif (!\is_array($name)) {
             $name = [$name];
         }
 
-        return implode('\\', array_merge($this->namespace, $name));
+        return \implode('\\', \array_merge($this->namespace, $name));
     }
 }
diff --git a/vendor/psy/psysh/src/CodeCleaner/NamespacePass.php b/vendor/psy/psysh/src/CodeCleaner/NamespacePass.php
index af825376..d26f07cc 100644
--- a/vendor/psy/psysh/src/CodeCleaner/NamespacePass.php
+++ b/vendor/psy/psysh/src/CodeCleaner/NamespacePass.php
@@ -53,7 +53,7 @@ class NamespacePass extends CodeCleanerPass
             return $nodes;
         }
 
-        $last = end($nodes);
+        $last = \end($nodes);
 
         if ($last instanceof Namespace_) {
             $kind = $last->getAttribute('kind');
diff --git a/vendor/psy/psysh/src/CodeCleaner/PassableByReferencePass.php b/vendor/psy/psysh/src/CodeCleaner/PassableByReferencePass.php
index 4380eef2..5b5dc086 100644
--- a/vendor/psy/psysh/src/CodeCleaner/PassableByReferencePass.php
+++ b/vendor/psy/psysh/src/CodeCleaner/PassableByReferencePass.php
@@ -56,7 +56,7 @@ class PassableByReferencePass extends CodeCleanerPass
             }
 
             foreach ($refl->getParameters() as $key => $param) {
-                if (array_key_exists($key, $node->args)) {
+                if (\array_key_exists($key, $node->args)) {
                     $arg = $node->args[$key];
                     if ($param->isPassedByReference() && !$this->isPassableByReference($arg)) {
                         throw new FatalErrorException(self::EXCEPTION_MESSAGE, 0, E_ERROR, null, $node->getLine());
diff --git a/vendor/psy/psysh/src/CodeCleaner/RequirePass.php b/vendor/psy/psysh/src/CodeCleaner/RequirePass.php
index 0e805611..31c156a3 100644
--- a/vendor/psy/psysh/src/CodeCleaner/RequirePass.php
+++ b/vendor/psy/psysh/src/CodeCleaner/RequirePass.php
@@ -79,16 +79,15 @@ class RequirePass extends CodeCleanerPass
             // @todo Shell::handleError would be better here, because we could
             // fake the file and line number, but we can't call it statically.
             // So we're duplicating some of the logics here.
-            if (E_WARNING & error_reporting()) {
+            if (E_WARNING & \error_reporting()) {
                 ErrorException::throwException(E_WARNING, 'Filename cannot be empty', null, $lineNumber);
-            } else {
-                // @todo trigger an error as fallback? this is pretty ugly…
-                // trigger_error('Filename cannot be empty', E_USER_WARNING);
             }
+            // @todo trigger an error as fallback? this is pretty ugly…
+            // trigger_error('Filename cannot be empty', E_USER_WARNING);
         }
 
-        if ($file === '' || !stream_resolve_include_path($file)) {
-            $msg = sprintf("Failed opening required '%s'", $file);
+        if ($file === '' || !\stream_resolve_include_path($file)) {
+            $msg = \sprintf("Failed opening required '%s'", $file);
             throw new FatalErrorException($msg, 0, E_ERROR, null, $lineNumber);
         }
 
@@ -97,6 +96,6 @@ class RequirePass extends CodeCleanerPass
 
     private function isRequireNode(Node $node)
     {
-        return $node instanceof Include_ && in_array($node->type, self::$requireTypes);
+        return $node instanceof Include_ && \in_array($node->type, self::$requireTypes);
     }
 }
diff --git a/vendor/psy/psysh/src/CodeCleaner/StrictTypesPass.php b/vendor/psy/psysh/src/CodeCleaner/StrictTypesPass.php
index a63fe75e..058a5a82 100644
--- a/vendor/psy/psysh/src/CodeCleaner/StrictTypesPass.php
+++ b/vendor/psy/psysh/src/CodeCleaner/StrictTypesPass.php
@@ -36,7 +36,7 @@ class StrictTypesPass extends CodeCleanerPass
 
     public function __construct()
     {
-        $this->atLeastPhp7 = version_compare(PHP_VERSION, '7.0', '>=');
+        $this->atLeastPhp7 = \version_compare(PHP_VERSION, '7.0', '>=');
     }
 
     /**
@@ -75,10 +75,10 @@ class StrictTypesPass extends CodeCleanerPass
         }
 
         if ($prependStrictTypes) {
-            $first = reset($nodes);
+            $first = \reset($nodes);
             if (!$first instanceof Declare_) {
                 $declare = new Declare_([new DeclareDeclare('strict_types', new LNumber(1))]);
-                array_unshift($nodes, $declare);
+                \array_unshift($nodes, $declare);
             }
         }
 
diff --git a/vendor/psy/psysh/src/CodeCleaner/UseStatementPass.php b/vendor/psy/psysh/src/CodeCleaner/UseStatementPass.php
index d6ca878c..64ac5be6 100644
--- a/vendor/psy/psysh/src/CodeCleaner/UseStatementPass.php
+++ b/vendor/psy/psysh/src/CodeCleaner/UseStatementPass.php
@@ -49,7 +49,7 @@ class UseStatementPass extends CodeCleanerPass
         if ($node instanceof Namespace_) {
             // If this is the same namespace as last namespace, let's do ourselves
             // a favor and reload all the aliases...
-            if (strtolower($node->name) === strtolower($this->lastNamespace)) {
+            if (\strtolower($node->name) === \strtolower($this->lastNamespace)) {
                 $this->aliases = $this->lastAliases;
             }
         }
@@ -69,8 +69,8 @@ class UseStatementPass extends CodeCleanerPass
             // Store a reference to every "use" statement, because we'll need
             // them in a bit.
             foreach ($node->uses as $use) {
-                $alias = $use->alias ?: end($use->name->parts);
-                $this->aliases[strtolower($alias)] = $use->name;
+                $alias = $use->alias ?: \end($use->name->parts);
+                $this->aliases[\strtolower($alias)] = $use->name;
             }
 
             return NodeTraverser::REMOVE_NODE;
@@ -78,8 +78,8 @@ class UseStatementPass extends CodeCleanerPass
             // Expand every "use" statement in the group into a full, standalone
             // "use" and store 'em with the others.
             foreach ($node->uses as $use) {
-                $alias = $use->alias ?: end($use->name->parts);
-                $this->aliases[strtolower($alias)] = Name::concat($node->prefix, $use->name, [
+                $alias = $use->alias ?: \end($use->name->parts);
+                $this->aliases[\strtolower($alias)] = Name::concat($node->prefix, $use->name, [
                     'startLine' => $node->prefix->getAttribute('startLine'),
                     'endLine'   => $use->name->getAttribute('endLine'),
                 ]);
@@ -114,12 +114,12 @@ class UseStatementPass extends CodeCleanerPass
      */
     private function findAlias(Name $name)
     {
-        $that = strtolower($name);
+        $that = \strtolower($name);
         foreach ($this->aliases as $alias => $prefix) {
             if ($that === $alias) {
                 return new FullyQualifiedName($prefix->toString());
-            } elseif (substr($that, 0, strlen($alias) + 1) === $alias . '\\') {
-                return new FullyQualifiedName($prefix->toString() . substr($name, strlen($alias)));
+            } elseif (\substr($that, 0, \strlen($alias) + 1) === $alias . '\\') {
+                return new FullyQualifiedName($prefix->toString() . \substr($name, \strlen($alias)));
             }
         }
     }
diff --git a/vendor/psy/psysh/src/CodeCleaner/ValidClassNamePass.php b/vendor/psy/psysh/src/CodeCleaner/ValidClassNamePass.php
index 682399bf..9578c9a8 100644
--- a/vendor/psy/psysh/src/CodeCleaner/ValidClassNamePass.php
+++ b/vendor/psy/psysh/src/CodeCleaner/ValidClassNamePass.php
@@ -43,7 +43,7 @@ class ValidClassNamePass extends NamespaceAwarePass
 
     public function __construct()
     {
-        $this->atLeastPhp55 = version_compare(PHP_VERSION, '5.5', '>=');
+        $this->atLeastPhp55 = \version_compare(PHP_VERSION, '5.5', '>=');
     }
 
     /**
@@ -164,7 +164,7 @@ class ValidClassNamePass extends NamespaceAwarePass
     protected function validateClassConstFetchExpression(ClassConstFetch $stmt)
     {
         // there is no need to check exists for ::class const for php 5.5 or newer
-        if (strtolower($stmt->name) === 'class' && $this->atLeastPhp55) {
+        if (\strtolower($stmt->name) === 'class' && $this->atLeastPhp55) {
             return;
         }
 
@@ -210,12 +210,12 @@ class ValidClassNamePass extends NamespaceAwarePass
         }
 
         if ($errorType !== null) {
-            throw $this->createError(sprintf('%s named %s already exists', ucfirst($errorType), $name), $stmt);
+            throw $this->createError(\sprintf('%s named %s already exists', \ucfirst($errorType), $name), $stmt);
         }
 
         // Store creation for the rest of this code snippet so we can find local
         // issue too
-        $this->currentScope[strtolower($name)] = $scopeType;
+        $this->currentScope[\strtolower($name)] = $scopeType;
     }
 
     /**
@@ -229,7 +229,7 @@ class ValidClassNamePass extends NamespaceAwarePass
     protected function ensureClassExists($name, $stmt)
     {
         if (!$this->classExists($name)) {
-            throw $this->createError(sprintf('Class \'%s\' not found', $name), $stmt);
+            throw $this->createError(\sprintf('Class \'%s\' not found', $name), $stmt);
         }
     }
 
@@ -244,7 +244,22 @@ class ValidClassNamePass extends NamespaceAwarePass
     protected function ensureClassOrInterfaceExists($name, $stmt)
     {
         if (!$this->classExists($name) && !$this->interfaceExists($name)) {
-            throw $this->createError(sprintf('Class \'%s\' not found', $name), $stmt);
+            throw $this->createError(\sprintf('Class \'%s\' not found', $name), $stmt);
+        }
+    }
+
+    /**
+     * Ensure that a referenced class _or trait_ exists.
+     *
+     * @throws FatalErrorException
+     *
+     * @param string $name
+     * @param Stmt   $stmt
+     */
+    protected function ensureClassOrTraitExists($name, $stmt)
+    {
+        if (!$this->classExists($name) && !$this->traitExists($name)) {
+            throw $this->createError(\sprintf('Class \'%s\' not found', $name), $stmt);
         }
     }
 
@@ -259,10 +274,10 @@ class ValidClassNamePass extends NamespaceAwarePass
      */
     protected function ensureMethodExists($class, $name, $stmt)
     {
-        $this->ensureClassExists($class, $stmt);
+        $this->ensureClassOrTraitExists($class, $stmt);
 
         // let's pretend all calls to self, parent and static are valid
-        if (in_array(strtolower($class), ['self', 'parent', 'static'])) {
+        if (\in_array(\strtolower($class), ['self', 'parent', 'static'])) {
             return;
         }
 
@@ -276,8 +291,8 @@ class ValidClassNamePass extends NamespaceAwarePass
             return;
         }
 
-        if (!method_exists($class, $name) && !method_exists($class, '__callStatic')) {
-            throw $this->createError(sprintf('Call to undefined method %s::%s()', $class, $name), $stmt);
+        if (!\method_exists($class, $name) && !\method_exists($class, '__callStatic')) {
+            throw $this->createError(\sprintf('Call to undefined method %s::%s()', $class, $name), $stmt);
         }
     }
 
@@ -295,7 +310,7 @@ class ValidClassNamePass extends NamespaceAwarePass
             /** @var string $name */
             $name = $this->getFullyQualifiedName($interface);
             if (!$this->interfaceExists($name)) {
-                throw $this->createError(sprintf('Interface \'%s\' not found', $name), $stmt);
+                throw $this->createError(\sprintf('Interface \'%s\' not found', $name), $stmt);
             }
         }
     }
@@ -335,11 +350,11 @@ class ValidClassNamePass extends NamespaceAwarePass
         // Give `self`, `static` and `parent` a pass. This will actually let
         // some errors through, since we're not checking whether the keyword is
         // being used in a class scope.
-        if (in_array(strtolower($name), ['self', 'static', 'parent'])) {
+        if (\in_array(\strtolower($name), ['self', 'static', 'parent'])) {
             return true;
         }
 
-        return class_exists($name) || $this->findInScope($name) === self::CLASS_TYPE;
+        return \class_exists($name) || $this->findInScope($name) === self::CLASS_TYPE;
     }
 
     /**
@@ -351,7 +366,7 @@ class ValidClassNamePass extends NamespaceAwarePass
      */
     protected function interfaceExists($name)
     {
-        return interface_exists($name) || $this->findInScope($name) === self::INTERFACE_TYPE;
+        return \interface_exists($name) || $this->findInScope($name) === self::INTERFACE_TYPE;
     }
 
     /**
@@ -363,7 +378,7 @@ class ValidClassNamePass extends NamespaceAwarePass
      */
     protected function traitExists($name)
     {
-        return trait_exists($name) || $this->findInScope($name) === self::TRAIT_TYPE;
+        return \trait_exists($name) || $this->findInScope($name) === self::TRAIT_TYPE;
     }
 
     /**
@@ -375,7 +390,7 @@ class ValidClassNamePass extends NamespaceAwarePass
      */
     protected function findInScope($name)
     {
-        $name = strtolower($name);
+        $name = \strtolower($name);
         if (isset($this->currentScope[$name])) {
             return $this->currentScope[$name];
         }
diff --git a/vendor/psy/psysh/src/CodeCleaner/ValidConstantPass.php b/vendor/psy/psysh/src/CodeCleaner/ValidConstantPass.php
index 7134bb28..2d5e3e6d 100644
--- a/vendor/psy/psysh/src/CodeCleaner/ValidConstantPass.php
+++ b/vendor/psy/psysh/src/CodeCleaner/ValidConstantPass.php
@@ -43,10 +43,10 @@ class ValidConstantPass extends NamespaceAwarePass
      */
     public function leaveNode(Node $node)
     {
-        if ($node instanceof ConstFetch && count($node->name->parts) > 1) {
+        if ($node instanceof ConstFetch && \count($node->name->parts) > 1) {
             $name = $this->getFullyQualifiedName($node->name);
-            if (!defined($name)) {
-                $msg = sprintf('Undefined constant %s', $name);
+            if (!\defined($name)) {
+                $msg = \sprintf('Undefined constant %s', $name);
                 throw new FatalErrorException($msg, 0, E_ERROR, null, $node->getLine());
             }
         } elseif ($node instanceof ClassConstFetch) {
@@ -77,11 +77,11 @@ class ValidConstantPass extends NamespaceAwarePass
 
             // if the class doesn't exist, don't throw an exception… it might be
             // defined in the same line it's used or something stupid like that.
-            if (class_exists($className) || interface_exists($className)) {
+            if (\class_exists($className) || \interface_exists($className)) {
                 $refl = new \ReflectionClass($className);
                 if (!$refl->hasConstant($constName)) {
-                    $constType = class_exists($className) ? 'Class' : 'Interface';
-                    $msg = sprintf('%s constant \'%s::%s\' not found', $constType, $className, $constName);
+                    $constType = \class_exists($className) ? 'Class' : 'Interface';
+                    $msg = \sprintf('%s constant \'%s::%s\' not found', $constType, $className, $constName);
                     throw new FatalErrorException($msg, 0, E_ERROR, null, $stmt->getLine());
                 }
             }
diff --git a/vendor/psy/psysh/src/CodeCleaner/ValidConstructorPass.php b/vendor/psy/psysh/src/CodeCleaner/ValidConstructorPass.php
index b049dbc0..a079e26c 100644
--- a/vendor/psy/psysh/src/CodeCleaner/ValidConstructorPass.php
+++ b/vendor/psy/psysh/src/CodeCleaner/ValidConstructorPass.php
@@ -57,14 +57,14 @@ class ValidConstructorPass extends CodeCleanerPass
             foreach ($node->stmts as $stmt) {
                 if ($stmt instanceof ClassMethod) {
                     // If we find a new-style constructor, no need to look for the old-style
-                    if ('__construct' === strtolower($stmt->name)) {
+                    if ('__construct' === \strtolower($stmt->name)) {
                         $this->validateConstructor($stmt, $node);
 
                         return;
                     }
 
                     // We found a possible old-style constructor (unless there is also a __construct method)
-                    if (empty($this->namespace) && strtolower($node->name) === strtolower($stmt->name)) {
+                    if (empty($this->namespace) && \strtolower($node->name) === \strtolower($stmt->name)) {
                         $constructor = $stmt;
                     }
                 }
@@ -89,21 +89,21 @@ class ValidConstructorPass extends CodeCleanerPass
             // For PHP Parser 4.x
             $className = $classNode->name instanceof Identifier ? $classNode->name->toString() : $classNode->name;
 
-            $msg = sprintf(
+            $msg = \sprintf(
                 'Constructor %s::%s() cannot be static',
-                implode('\\', array_merge($this->namespace, (array) $className)),
+                \implode('\\', \array_merge($this->namespace, (array) $className)),
                 $constructor->name
             );
             throw new FatalErrorException($msg, 0, E_ERROR, null, $classNode->getLine());
         }
 
-        if (method_exists($constructor, 'getReturnType') && $constructor->getReturnType()) {
+        if (\method_exists($constructor, 'getReturnType') && $constructor->getReturnType()) {
             // For PHP Parser 4.x
             $className = $classNode->name instanceof Identifier ? $classNode->name->toString() : $classNode->name;
 
-            $msg = sprintf(
+            $msg = \sprintf(
                 'Constructor %s::%s() cannot declare a return type',
-                implode('\\', array_merge($this->namespace, (array) $className)),
+                \implode('\\', \array_merge($this->namespace, (array) $className)),
                 $constructor->name
             );
             throw new FatalErrorException($msg, 0, E_ERROR, null, $classNode->getLine());
diff --git a/vendor/psy/psysh/src/CodeCleaner/ValidFunctionNamePass.php b/vendor/psy/psysh/src/CodeCleaner/ValidFunctionNamePass.php
index a6bf01e7..dd1e0576 100644
--- a/vendor/psy/psysh/src/CodeCleaner/ValidFunctionNamePass.php
+++ b/vendor/psy/psysh/src/CodeCleaner/ValidFunctionNamePass.php
@@ -49,14 +49,14 @@ class ValidFunctionNamePass extends NamespaceAwarePass
             // @todo add an "else" here which adds a runtime check for instances where we can't tell
             // whether a function is being redefined by static analysis alone.
             if ($this->conditionalScopes === 0) {
-                if (function_exists($name) ||
-                    isset($this->currentScope[strtolower($name)])) {
-                    $msg = sprintf('Cannot redeclare %s()', $name);
+                if (\function_exists($name) ||
+                    isset($this->currentScope[\strtolower($name)])) {
+                    $msg = \sprintf('Cannot redeclare %s()', $name);
                     throw new FatalErrorException($msg, 0, E_ERROR, null, $node->getLine());
                 }
             }
 
-            $this->currentScope[strtolower($name)] = true;
+            $this->currentScope[\strtolower($name)] = true;
         }
     }
 
@@ -76,11 +76,11 @@ class ValidFunctionNamePass extends NamespaceAwarePass
             // if function name is an expression or a variable, give it a pass for now.
             $name = $node->name;
             if (!$name instanceof Expr && !$name instanceof Variable) {
-                $shortName = implode('\\', $name->parts);
+                $shortName = \implode('\\', $name->parts);
                 $fullName  = $this->getFullyQualifiedName($name);
-                $inScope   = isset($this->currentScope[strtolower($fullName)]);
-                if (!$inScope && !function_exists($shortName) && !function_exists($fullName)) {
-                    $message = sprintf('Call to undefined function %s()', $name);
+                $inScope   = isset($this->currentScope[\strtolower($fullName)]);
+                if (!$inScope && !\function_exists($shortName) && !\function_exists($fullName)) {
+                    $message = \sprintf('Call to undefined function %s()', $name);
                     throw new FatalErrorException($message, 0, E_ERROR, null, $node->getLine());
                 }
             }
diff --git a/vendor/psy/psysh/src/Command/BufferCommand.php b/vendor/psy/psysh/src/Command/BufferCommand.php
index 6319ccf8..83ba34a8 100644
--- a/vendor/psy/psysh/src/Command/BufferCommand.php
+++ b/vendor/psy/psysh/src/Command/BufferCommand.php
@@ -68,10 +68,10 @@ HELP
      */
     protected function formatLines(array $lines, $type = 'return')
     {
-        $template = sprintf('<%s>%%s</%s>', $type, $type);
+        $template = \sprintf('<%s>%%s</%s>', $type, $type);
 
-        return array_map(function ($line) use ($template) {
-            return sprintf($template, $line);
+        return \array_map(function ($line) use ($template) {
+            return \sprintf($template, $line);
         }, $lines);
     }
 }
diff --git a/vendor/psy/psysh/src/Command/ClearCommand.php b/vendor/psy/psysh/src/Command/ClearCommand.php
index 1a5b845d..6b12048a 100644
--- a/vendor/psy/psysh/src/Command/ClearCommand.php
+++ b/vendor/psy/psysh/src/Command/ClearCommand.php
@@ -44,6 +44,6 @@ HELP
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $output->write(sprintf('%c[2J%c[0;0f', 27, 27));
+        $output->write(\sprintf('%c[2J%c[0;0f', 27, 27));
     }
 }
diff --git a/vendor/psy/psysh/src/Command/Command.php b/vendor/psy/psysh/src/Command/Command.php
index 83e1dcea..be013a1b 100644
--- a/vendor/psy/psysh/src/Command/Command.php
+++ b/vendor/psy/psysh/src/Command/Command.php
@@ -65,10 +65,10 @@ abstract class Command extends BaseCommand
 
         if ($help = $this->getProcessedHelp()) {
             $messages[] = '<comment>Help:</comment>';
-            $messages[] = ' ' . str_replace("\n", "\n ", $help) . "\n";
+            $messages[] = ' ' . \str_replace("\n", "\n ", $help) . "\n";
         }
 
-        return implode("\n", $messages);
+        return \implode("\n", $messages);
     }
 
     /**
@@ -78,8 +78,8 @@ abstract class Command extends BaseCommand
     {
         $hidden = $this->getHiddenArguments();
 
-        return array_filter($this->getNativeDefinition()->getArguments(), function ($argument) use ($hidden) {
-            return !in_array($argument->getName(), $hidden);
+        return \array_filter($this->getNativeDefinition()->getArguments(), function ($argument) use ($hidden) {
+            return !\in_array($argument->getName(), $hidden);
         });
     }
 
@@ -100,8 +100,8 @@ abstract class Command extends BaseCommand
     {
         $hidden = $this->getHiddenOptions();
 
-        return array_filter($this->getNativeDefinition()->getOptions(), function ($option) use ($hidden) {
-            return !in_array($option->getName(), $hidden);
+        return \array_filter($this->getNativeDefinition()->getOptions(), function ($option) use ($hidden) {
+            return !\in_array($option->getName(), $hidden);
         });
     }
 
@@ -122,7 +122,7 @@ abstract class Command extends BaseCommand
      */
     private function aliasesAsText()
     {
-        return '<comment>Aliases:</comment> <info>' . implode(', ', $this->getAliases()) . '</info>' . PHP_EOL;
+        return '<comment>Aliases:</comment> <info>' . \implode(', ', $this->getAliases()) . '</info>' . PHP_EOL;
     }
 
     /**
@@ -139,21 +139,21 @@ abstract class Command extends BaseCommand
         if (!empty($arguments)) {
             $messages[] = '<comment>Arguments:</comment>';
             foreach ($arguments as $argument) {
-                if (null !== $argument->getDefault() && (!is_array($argument->getDefault()) || count($argument->getDefault()))) {
-                    $default = sprintf('<comment> (default: %s)</comment>', $this->formatDefaultValue($argument->getDefault()));
+                if (null !== $argument->getDefault() && (!\is_array($argument->getDefault()) || \count($argument->getDefault()))) {
+                    $default = \sprintf('<comment> (default: %s)</comment>', $this->formatDefaultValue($argument->getDefault()));
                 } else {
                     $default = '';
                 }
 
-                $description = str_replace("\n", "\n" . str_pad('', $max + 2, ' '), $argument->getDescription());
+                $description = \str_replace("\n", "\n" . \str_pad('', $max + 2, ' '), $argument->getDescription());
 
-                $messages[] = sprintf(" <info>%-${max}s</info> %s%s", $argument->getName(), $description, $default);
+                $messages[] = \sprintf(" <info>%-${max}s</info> %s%s", $argument->getName(), $description, $default);
             }
 
             $messages[] = '';
         }
 
-        return implode(PHP_EOL, $messages);
+        return \implode(PHP_EOL, $messages);
     }
 
     /**
@@ -171,20 +171,20 @@ abstract class Command extends BaseCommand
             $messages[] = '<comment>Options:</comment>';
 
             foreach ($options as $option) {
-                if ($option->acceptValue() && null !== $option->getDefault() && (!is_array($option->getDefault()) || count($option->getDefault()))) {
-                    $default = sprintf('<comment> (default: %s)</comment>', $this->formatDefaultValue($option->getDefault()));
+                if ($option->acceptValue() && null !== $option->getDefault() && (!\is_array($option->getDefault()) || \count($option->getDefault()))) {
+                    $default = \sprintf('<comment> (default: %s)</comment>', $this->formatDefaultValue($option->getDefault()));
                 } else {
                     $default = '';
                 }
 
                 $multiple = $option->isArray() ? '<comment> (multiple values allowed)</comment>' : '';
-                $description = str_replace("\n", "\n" . str_pad('', $max + 2, ' '), $option->getDescription());
+                $description = \str_replace("\n", "\n" . \str_pad('', $max + 2, ' '), $option->getDescription());
 
-                $optionMax = $max - strlen($option->getName()) - 2;
-                $messages[] = sprintf(
+                $optionMax = $max - \strlen($option->getName()) - 2;
+                $messages[] = \sprintf(
                     " <info>%s</info> %-${optionMax}s%s%s%s",
                     '--' . $option->getName(),
-                    $option->getShortcut() ? sprintf('(-%s) ', $option->getShortcut()) : '',
+                    $option->getShortcut() ? \sprintf('(-%s) ', $option->getShortcut()) : '',
                     $description,
                     $default,
                     $multiple
@@ -194,7 +194,7 @@ abstract class Command extends BaseCommand
             $messages[] = '';
         }
 
-        return implode(PHP_EOL, $messages);
+        return \implode(PHP_EOL, $messages);
     }
 
     /**
@@ -207,16 +207,16 @@ abstract class Command extends BaseCommand
         $max = 0;
 
         foreach ($this->getOptions() as $option) {
-            $nameLength = strlen($option->getName()) + 2;
+            $nameLength = \strlen($option->getName()) + 2;
             if ($option->getShortcut()) {
-                $nameLength += strlen($option->getShortcut()) + 3;
+                $nameLength += \strlen($option->getShortcut()) + 3;
             }
 
-            $max = max($max, $nameLength);
+            $max = \max($max, $nameLength);
         }
 
         foreach ($this->getArguments() as $argument) {
-            $max = max($max, strlen($argument->getName()));
+            $max = \max($max, \strlen($argument->getName()));
         }
 
         return ++$max;
@@ -231,11 +231,11 @@ abstract class Command extends BaseCommand
      */
     private function formatDefaultValue($default)
     {
-        if (is_array($default) && $default === array_values($default)) {
-            return sprintf("array('%s')", implode("', '", $default));
+        if (\is_array($default) && $default === \array_values($default)) {
+            return \sprintf("array('%s')", \implode("', '", $default));
         }
 
-        return str_replace("\n", '', var_export($default, true));
+        return \str_replace("\n", '', \var_export($default, true));
     }
 
     /**
@@ -247,7 +247,7 @@ abstract class Command extends BaseCommand
      */
     protected function getTable(OutputInterface $output)
     {
-        if (!class_exists('Symfony\Component\Console\Helper\Table')) {
+        if (!\class_exists('Symfony\Component\Console\Helper\Table')) {
             return $this->getTableHelper();
         }
 
diff --git a/vendor/psy/psysh/src/Command/DocCommand.php b/vendor/psy/psysh/src/Command/DocCommand.php
index fe202869..913634a0 100644
--- a/vendor/psy/psysh/src/Command/DocCommand.php
+++ b/vendor/psy/psysh/src/Command/DocCommand.php
@@ -14,7 +14,6 @@ namespace Psy\Command;
 use Psy\Formatter\DocblockFormatter;
 use Psy\Formatter\SignatureFormatter;
 use Psy\Input\CodeArgument;
-use Psy\Reflection\ReflectionClassConstant;
 use Psy\Reflection\ReflectionLanguageConstruct;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -87,7 +86,7 @@ HELP
 
     private function getManualDoc($reflector)
     {
-        switch (get_class($reflector)) {
+        switch (\get_class($reflector)) {
             case 'ReflectionClass':
             case 'ReflectionObject':
             case 'ReflectionFunction':
@@ -125,7 +124,7 @@ HELP
     {
         if ($db = $this->getApplication()->getManualDb()) {
             return $db
-                ->query(sprintf('SELECT doc FROM php_manual WHERE id = %s', $db->quote($id)))
+                ->query(\sprintf('SELECT doc FROM php_manual WHERE id = %s', $db->quote($id)))
                 ->fetchColumn(0);
         }
     }
diff --git a/vendor/psy/psysh/src/Command/DumpCommand.php b/vendor/psy/psysh/src/Command/DumpCommand.php
index 77bd0e2d..9a8aad82 100644
--- a/vendor/psy/psysh/src/Command/DumpCommand.php
+++ b/vendor/psy/psysh/src/Command/DumpCommand.php
@@ -73,7 +73,7 @@ HELP
         $target = $this->resolveCode($input->getArgument('target'));
         $output->page($this->presenter->present($target, $depth, $input->getOption('all') ? Presenter::VERBOSE : 0));
 
-        if (is_object($target)) {
+        if (\is_object($target)) {
             $this->setCommandScopeVariables(new \ReflectionObject($target));
         }
     }
@@ -87,7 +87,7 @@ HELP
      */
     protected function resolveTarget($name)
     {
-        @trigger_error('`resolveTarget` is deprecated; use `resolveCode` instead.', E_USER_DEPRECATED);
+        @\trigger_error('`resolveTarget` is deprecated; use `resolveCode` instead.', E_USER_DEPRECATED);
 
         return $this->resolveCode($name);
     }
diff --git a/vendor/psy/psysh/src/Command/EditCommand.php b/vendor/psy/psysh/src/Command/EditCommand.php
index 7d955692..05714149 100644
--- a/vendor/psy/psysh/src/Command/EditCommand.php
+++ b/vendor/psy/psysh/src/Command/EditCommand.php
@@ -95,7 +95,7 @@ class EditCommand extends Command implements ContextAware
         $shouldRemoveFile = false;
 
         if ($filePath === null) {
-            $filePath = tempnam($this->runtimeDir, 'psysh-edit-command');
+            $filePath = \tempnam($this->runtimeDir, 'psysh-edit-command');
             $shouldRemoveFile = true;
         }
 
@@ -138,9 +138,9 @@ class EditCommand extends Command implements ContextAware
     {
         // If the file argument was a variable, get it from the context
         if ($fileArgument !== null &&
-            strlen($fileArgument) > 0 &&
+            \strlen($fileArgument) > 0 &&
             $fileArgument[0] === '$') {
-            $fileArgument = $this->context->get(preg_replace('/^\$/', '', $fileArgument));
+            $fileArgument = $this->context->get(\preg_replace('/^\$/', '', $fileArgument));
         }
 
         return $fileArgument;
@@ -156,16 +156,16 @@ class EditCommand extends Command implements ContextAware
      */
     private function editFile($filePath, $shouldRemoveFile)
     {
-        $escapedFilePath = escapeshellarg($filePath);
+        $escapedFilePath = \escapeshellarg($filePath);
 
         $pipes = [];
-        $proc = proc_open((getenv('EDITOR') ?: 'nano') . " {$escapedFilePath}", [STDIN, STDOUT, STDERR], $pipes);
-        proc_close($proc);
+        $proc = \proc_open((\getenv('EDITOR') ?: 'nano') . " {$escapedFilePath}", [STDIN, STDOUT, STDERR], $pipes);
+        \proc_close($proc);
 
-        $editedContent = @file_get_contents($filePath);
+        $editedContent = @\file_get_contents($filePath);
 
         if ($shouldRemoveFile) {
-            @unlink($filePath);
+            @\unlink($filePath);
         }
 
         if ($editedContent === false) {
diff --git a/vendor/psy/psysh/src/Command/HelpCommand.php b/vendor/psy/psysh/src/Command/HelpCommand.php
index a50f2562..82ec3a83 100644
--- a/vendor/psy/psysh/src/Command/HelpCommand.php
+++ b/vendor/psy/psysh/src/Command/HelpCommand.php
@@ -74,13 +74,13 @@ class HelpCommand extends Command
                 }
 
                 if ($command->getAliases()) {
-                    $aliases = sprintf('<comment>Aliases:</comment> %s', implode(', ', $command->getAliases()));
+                    $aliases = \sprintf('<comment>Aliases:</comment> %s', \implode(', ', $command->getAliases()));
                 } else {
                     $aliases = '';
                 }
 
                 $table->addRow([
-                    sprintf('<info>%s</info>', $name),
+                    \sprintf('<info>%s</info>', $name),
                     $command->getDescription(),
                     $aliases,
                 ]);
diff --git a/vendor/psy/psysh/src/Command/HistoryCommand.php b/vendor/psy/psysh/src/Command/HistoryCommand.php
index eef8ef9d..23f6899e 100644
--- a/vendor/psy/psysh/src/Command/HistoryCommand.php
+++ b/vendor/psy/psysh/src/Command/HistoryCommand.php
@@ -110,11 +110,11 @@ HELP
             foreach ($history as $i => $line) {
                 if ($this->filter->match($line, $matches)) {
                     if (isset($matches[0])) {
-                        $chunks = explode($matches[0], $history[$i]);
-                        $chunks = array_map([__CLASS__, 'escape'], $chunks);
-                        $glue   = sprintf('<urgent>%s</urgent>', self::escape($matches[0]));
+                        $chunks = \explode($matches[0], $history[$i]);
+                        $chunks = \array_map([__CLASS__, 'escape'], $chunks);
+                        $glue   = \sprintf('<urgent>%s</urgent>', self::escape($matches[0]));
 
-                        $highlighted[$i] = implode($glue, $chunks);
+                        $highlighted[$i] = \implode($glue, $chunks);
                     }
                 } else {
                     unset($history[$i]);
@@ -123,16 +123,16 @@ HELP
         }
 
         if ($save = $input->getOption('save')) {
-            $output->writeln(sprintf('Saving history in %s...', $save));
-            file_put_contents($save, implode(PHP_EOL, $history) . PHP_EOL);
+            $output->writeln(\sprintf('Saving history in %s...', $save));
+            \file_put_contents($save, \implode(PHP_EOL, $history) . PHP_EOL);
             $output->writeln('<info>History saved.</info>');
         } elseif ($input->getOption('replay')) {
             if (!($input->getOption('show') || $input->getOption('head') || $input->getOption('tail'))) {
                 throw new \InvalidArgumentException('You must limit history via --head, --tail or --show before replaying');
             }
 
-            $count = count($history);
-            $output->writeln(sprintf('Replaying %d line%s of history', $count, ($count !== 1) ? 's' : ''));
+            $count = \count($history);
+            $output->writeln(\sprintf('Replaying %d line%s of history', $count, ($count !== 1) ? 's' : ''));
             $this->getApplication()->addInput($history);
         } elseif ($input->getOption('clear')) {
             $this->clearHistory();
@@ -156,14 +156,14 @@ HELP
      */
     private function extractRange($range)
     {
-        if (preg_match('/^\d+$/', $range)) {
+        if (\preg_match('/^\d+$/', $range)) {
             return [$range, $range + 1];
         }
 
         $matches = [];
-        if ($range !== '..' && preg_match('/^(\d*)\.\.(\d*)$/', $range, $matches)) {
-            $start = $matches[1] ? intval($matches[1]) : 0;
-            $end   = $matches[2] ? intval($matches[2]) + 1 : PHP_INT_MAX;
+        if ($range !== '..' && \preg_match('/^(\d*)\.\.(\d*)$/', $range, $matches)) {
+            $start = $matches[1] ? \intval($matches[1]) : 0;
+            $end   = $matches[2] ? \intval($matches[2]) + 1 : PHP_INT_MAX;
 
             return [$start, $end];
         }
@@ -185,30 +185,30 @@ HELP
         $history = $this->readline->listHistory();
 
         // don't show the current `history` invocation
-        array_pop($history);
+        \array_pop($history);
 
         if ($show) {
             list($start, $end) = $this->extractRange($show);
             $length = $end - $start;
         } elseif ($head) {
-            if (!preg_match('/^\d+$/', $head)) {
+            if (!\preg_match('/^\d+$/', $head)) {
                 throw new \InvalidArgumentException('Please specify an integer argument for --head');
             }
 
             $start  = 0;
-            $length = intval($head);
+            $length = \intval($head);
         } elseif ($tail) {
-            if (!preg_match('/^\d+$/', $tail)) {
+            if (!\preg_match('/^\d+$/', $tail)) {
                 throw new \InvalidArgumentException('Please specify an integer argument for --tail');
             }
 
-            $start  = count($history) - $tail;
-            $length = intval($tail) + 1;
+            $start  = \count($history) - $tail;
+            $length = \intval($tail) + 1;
         } else {
             return $history;
         }
 
-        return array_slice($history, $start, $length, true);
+        return \array_slice($history, $start, $length, true);
     }
 
     /**
@@ -227,7 +227,7 @@ HELP
         }
 
         if ($count > 1) {
-            throw new \InvalidArgumentException('Please specify only one of --' . implode(', --', $options));
+            throw new \InvalidArgumentException('Please specify only one of --' . \implode(', --', $options));
         }
     }
 
diff --git a/vendor/psy/psysh/src/Command/ListCommand.php b/vendor/psy/psysh/src/Command/ListCommand.php
index 2e65895e..67f4e041 100644
--- a/vendor/psy/psysh/src/Command/ListCommand.php
+++ b/vendor/psy/psysh/src/Command/ListCommand.php
@@ -178,8 +178,8 @@ HELP
         }
 
         foreach ($result as $label => $items) {
-            $names = array_map([$this, 'formatItemName'], $items);
-            $output->writeln(sprintf('<strong>%s</strong>: %s', $label, implode(', ', $names)));
+            $names = \array_map([$this, 'formatItemName'], $items);
+            $output->writeln(\sprintf('<strong>%s</strong>: %s', $label, \implode(', ', $names)));
         }
     }
 
@@ -201,7 +201,7 @@ HELP
 
         foreach ($result as $label => $items) {
             $output->writeln('');
-            $output->writeln(sprintf('<strong>%s:</strong>', $label));
+            $output->writeln(\sprintf('<strong>%s:</strong>', $label));
 
             $table->setRows([]);
             foreach ($items as $item) {
@@ -225,7 +225,7 @@ HELP
      */
     private function formatItemName($item)
     {
-        return sprintf('<%s>%s</%s>', $item['style'], OutputFormatter::escape($item['name']), $item['style']);
+        return \sprintf('<%s>%s</%s>', $item['style'], OutputFormatter::escape($item['name']), $item['style']);
     }
 
     /**
diff --git a/vendor/psy/psysh/src/Command/ListCommand/ClassConstantEnumerator.php b/vendor/psy/psysh/src/Command/ListCommand/ClassConstantEnumerator.php
index 0b099270..a1d82ead 100644
--- a/vendor/psy/psysh/src/Command/ListCommand/ClassConstantEnumerator.php
+++ b/vendor/psy/psysh/src/Command/ListCommand/ClassConstantEnumerator.php
@@ -68,7 +68,7 @@ class ClassConstantEnumerator extends Enumerator
 
         $constants = [];
         foreach ($reflector->getConstants() as $name => $constant) {
-            $constReflector = ReflectionClassConstant::create($reflector, $name);
+            $constReflector = ReflectionClassConstant::create($reflector->name, $name);
 
             if ($noInherit && $constReflector->getDeclaringClass()->getName() !== $className) {
                 continue;
@@ -77,7 +77,7 @@ class ClassConstantEnumerator extends Enumerator
             $constants[$name] = $constReflector;
         }
 
-        ksort($constants, SORT_NATURAL | SORT_FLAG_CASE);
+        \ksort($constants, SORT_NATURAL | SORT_FLAG_CASE);
 
         return $constants;
     }
@@ -118,7 +118,7 @@ class ClassConstantEnumerator extends Enumerator
     {
         if ($reflector->isInterface()) {
             return 'Interface Constants';
-        } elseif (method_exists($reflector, 'isTrait') && $reflector->isTrait()) {
+        } elseif (\method_exists($reflector, 'isTrait') && $reflector->isTrait()) {
             return 'Trait Constants';
         } else {
             return 'Class Constants';
diff --git a/vendor/psy/psysh/src/Command/ListCommand/ClassEnumerator.php b/vendor/psy/psysh/src/Command/ListCommand/ClassEnumerator.php
index 858f5a2e..8ab6d7a9 100644
--- a/vendor/psy/psysh/src/Command/ListCommand/ClassEnumerator.php
+++ b/vendor/psy/psysh/src/Command/ListCommand/ClassEnumerator.php
@@ -43,18 +43,18 @@ class ClassEnumerator extends Enumerator
         // only list classes, interfaces and traits if we are specifically asked
 
         if ($input->getOption('classes')) {
-            $ret = array_merge($ret, $this->filterClasses('Classes', get_declared_classes(), $internal, $user));
+            $ret = \array_merge($ret, $this->filterClasses('Classes', \get_declared_classes(), $internal, $user));
         }
 
         if ($input->getOption('interfaces')) {
-            $ret = array_merge($ret, $this->filterClasses('Interfaces', get_declared_interfaces(), $internal, $user));
+            $ret = \array_merge($ret, $this->filterClasses('Interfaces', \get_declared_interfaces(), $internal, $user));
         }
 
         if ($input->getOption('traits')) {
-            $ret = array_merge($ret, $this->filterClasses('Traits', get_declared_traits(), $internal, $user));
+            $ret = \array_merge($ret, $this->filterClasses('Traits', \get_declared_traits(), $internal, $user));
         }
 
-        return array_map([$this, 'prepareClasses'], array_filter($ret));
+        return \array_map([$this, 'prepareClasses'], \array_filter($ret));
     }
 
     /**
@@ -75,7 +75,7 @@ class ClassEnumerator extends Enumerator
         $ret = [];
 
         if ($internal) {
-            $ret['Internal ' . $key] = array_filter($classes, function ($class) {
+            $ret['Internal ' . $key] = \array_filter($classes, function ($class) {
                 $refl = new \ReflectionClass($class);
 
                 return $refl->isInternal();
@@ -83,7 +83,7 @@ class ClassEnumerator extends Enumerator
         }
 
         if ($user) {
-            $ret['User ' . $key] = array_filter($classes, function ($class) {
+            $ret['User ' . $key] = \array_filter($classes, function ($class) {
                 $refl = new \ReflectionClass($class);
 
                 return !$refl->isInternal();
@@ -106,7 +106,7 @@ class ClassEnumerator extends Enumerator
      */
     protected function prepareClasses(array $classes)
     {
-        natcasesort($classes);
+        \natcasesort($classes);
 
         // My kingdom for a generator.
         $ret = [];
diff --git a/vendor/psy/psysh/src/Command/ListCommand/ConstantEnumerator.php b/vendor/psy/psysh/src/Command/ListCommand/ConstantEnumerator.php
index e17d42a0..ad4ce0d1 100644
--- a/vendor/psy/psysh/src/Command/ListCommand/ConstantEnumerator.php
+++ b/vendor/psy/psysh/src/Command/ListCommand/ConstantEnumerator.php
@@ -54,7 +54,7 @@ class ConstantEnumerator extends Enumerator
         }
 
         if ($category) {
-            $label = ucfirst($category) . ' Constants';
+            $label = \ucfirst($category) . ' Constants';
             $ret[$label] = $this->getConstants($category);
         }
 
@@ -62,7 +62,7 @@ class ConstantEnumerator extends Enumerator
             $ret['Constants'] = $this->getConstants();
         }
 
-        return array_map([$this, 'prepareConstants'], array_filter($ret));
+        return \array_map([$this, 'prepareConstants'], \array_filter($ret));
     }
 
     /**
@@ -78,15 +78,15 @@ class ConstantEnumerator extends Enumerator
     protected function getConstants($category = null)
     {
         if (!$category) {
-            return get_defined_constants();
+            return \get_defined_constants();
         }
 
-        $consts = get_defined_constants(true);
+        $consts = \get_defined_constants(true);
 
         if ($category === 'internal') {
             unset($consts['user']);
 
-            return call_user_func_array('array_merge', $consts);
+            return \call_user_func_array('array_merge', $consts);
         }
 
         return isset($consts[$category]) ? $consts[$category] : [];
@@ -104,8 +104,8 @@ class ConstantEnumerator extends Enumerator
         // My kingdom for a generator.
         $ret = [];
 
-        $names = array_keys($constants);
-        natcasesort($names);
+        $names = \array_keys($constants);
+        \natcasesort($names);
 
         foreach ($names as $name) {
             if ($this->showItem($name)) {
diff --git a/vendor/psy/psysh/src/Command/ListCommand/FunctionEnumerator.php b/vendor/psy/psysh/src/Command/ListCommand/FunctionEnumerator.php
index 733055a6..6c3fa5ea 100644
--- a/vendor/psy/psysh/src/Command/ListCommand/FunctionEnumerator.php
+++ b/vendor/psy/psysh/src/Command/ListCommand/FunctionEnumerator.php
@@ -74,12 +74,12 @@ class FunctionEnumerator extends Enumerator
      */
     protected function getFunctions($type = null)
     {
-        $funcs = get_defined_functions();
+        $funcs = \get_defined_functions();
 
         if ($type) {
             return $funcs[$type];
         } else {
-            return array_merge($funcs['internal'], $funcs['user']);
+            return \array_merge($funcs['internal'], $funcs['user']);
         }
     }
 
@@ -92,7 +92,7 @@ class FunctionEnumerator extends Enumerator
      */
     protected function prepareFunctions(array $functions)
     {
-        natcasesort($functions);
+        \natcasesort($functions);
 
         // My kingdom for a generator.
         $ret = [];
diff --git a/vendor/psy/psysh/src/Command/ListCommand/GlobalVariableEnumerator.php b/vendor/psy/psysh/src/Command/ListCommand/GlobalVariableEnumerator.php
index 8e58af8b..f51791cb 100644
--- a/vendor/psy/psysh/src/Command/ListCommand/GlobalVariableEnumerator.php
+++ b/vendor/psy/psysh/src/Command/ListCommand/GlobalVariableEnumerator.php
@@ -53,8 +53,8 @@ class GlobalVariableEnumerator extends Enumerator
     {
         global $GLOBALS;
 
-        $names = array_keys($GLOBALS);
-        natcasesort($names);
+        $names = \array_keys($GLOBALS);
+        \natcasesort($names);
 
         $ret = [];
         foreach ($names as $name) {
diff --git a/vendor/psy/psysh/src/Command/ListCommand/InterfaceEnumerator.php b/vendor/psy/psysh/src/Command/ListCommand/InterfaceEnumerator.php
index dae0dace..4531fce8 100644
--- a/vendor/psy/psysh/src/Command/ListCommand/InterfaceEnumerator.php
+++ b/vendor/psy/psysh/src/Command/ListCommand/InterfaceEnumerator.php
@@ -23,7 +23,7 @@ class InterfaceEnumerator extends Enumerator
 {
     public function __construct(Presenter $presenter)
     {
-        @trigger_error('InterfaceEnumerator is no longer used', E_USER_DEPRECATED);
+        @\trigger_error('InterfaceEnumerator is no longer used', E_USER_DEPRECATED);
         parent::__construct($presenter);
     }
 
@@ -49,7 +49,7 @@ class InterfaceEnumerator extends Enumerator
             return;
         }
 
-        $interfaces = $this->prepareInterfaces(get_declared_interfaces());
+        $interfaces = $this->prepareInterfaces(\get_declared_interfaces());
 
         if (empty($interfaces)) {
             return;
@@ -69,7 +69,7 @@ class InterfaceEnumerator extends Enumerator
      */
     protected function prepareInterfaces(array $interfaces)
     {
-        natcasesort($interfaces);
+        \natcasesort($interfaces);
 
         // My kingdom for a generator.
         $ret = [];
diff --git a/vendor/psy/psysh/src/Command/ListCommand/MethodEnumerator.php b/vendor/psy/psysh/src/Command/ListCommand/MethodEnumerator.php
index ebe43afa..49d7e104 100644
--- a/vendor/psy/psysh/src/Command/ListCommand/MethodEnumerator.php
+++ b/vendor/psy/psysh/src/Command/ListCommand/MethodEnumerator.php
@@ -77,7 +77,7 @@ class MethodEnumerator extends Enumerator
             }
         }
 
-        ksort($methods, SORT_NATURAL | SORT_FLAG_CASE);
+        \ksort($methods, SORT_NATURAL | SORT_FLAG_CASE);
 
         return $methods;
     }
@@ -118,7 +118,7 @@ class MethodEnumerator extends Enumerator
     {
         if ($reflector->isInterface()) {
             return 'Interface Methods';
-        } elseif (method_exists($reflector, 'isTrait') && $reflector->isTrait()) {
+        } elseif (\method_exists($reflector, 'isTrait') && $reflector->isTrait()) {
             return 'Trait Methods';
         } else {
             return 'Class Methods';
diff --git a/vendor/psy/psysh/src/Command/ListCommand/PropertyEnumerator.php b/vendor/psy/psysh/src/Command/ListCommand/PropertyEnumerator.php
index 15ce45db..d56caded 100644
--- a/vendor/psy/psysh/src/Command/ListCommand/PropertyEnumerator.php
+++ b/vendor/psy/psysh/src/Command/ListCommand/PropertyEnumerator.php
@@ -77,7 +77,7 @@ class PropertyEnumerator extends Enumerator
             }
         }
 
-        ksort($properties, SORT_NATURAL | SORT_FLAG_CASE);
+        \ksort($properties, SORT_NATURAL | SORT_FLAG_CASE);
 
         return $properties;
     }
@@ -119,7 +119,7 @@ class PropertyEnumerator extends Enumerator
     {
         if ($reflector->isInterface()) {
             return 'Interface Properties';
-        } elseif (method_exists($reflector, 'isTrait') && $reflector->isTrait()) {
+        } elseif (\method_exists($reflector, 'isTrait') && $reflector->isTrait()) {
             return 'Trait Properties';
         } else {
             return 'Class Properties';
@@ -156,11 +156,11 @@ class PropertyEnumerator extends Enumerator
     {
         // If $target is a class, trait or interface (try to) get the default
         // value for the property.
-        if (!is_object($target)) {
+        if (!\is_object($target)) {
             try {
                 $refl = new \ReflectionClass($target);
                 $props = $refl->getDefaultProperties();
-                if (array_key_exists($property->name, $props)) {
+                if (\array_key_exists($property->name, $props)) {
                     $suffix = $property->isStatic() ? '' : ' <aside>(default)</aside>';
 
                     return $this->presentRef($props[$property->name]) . $suffix;
diff --git a/vendor/psy/psysh/src/Command/ListCommand/TraitEnumerator.php b/vendor/psy/psysh/src/Command/ListCommand/TraitEnumerator.php
index c4c74da7..3ee60155 100644
--- a/vendor/psy/psysh/src/Command/ListCommand/TraitEnumerator.php
+++ b/vendor/psy/psysh/src/Command/ListCommand/TraitEnumerator.php
@@ -23,7 +23,7 @@ class TraitEnumerator extends Enumerator
 {
     public function __construct(Presenter $presenter)
     {
-        @trigger_error('TraitEnumerator is no longer used', E_USER_DEPRECATED);
+        @\trigger_error('TraitEnumerator is no longer used', E_USER_DEPRECATED);
         parent::__construct($presenter);
     }
 
@@ -49,7 +49,7 @@ class TraitEnumerator extends Enumerator
             return;
         }
 
-        $traits = $this->prepareTraits(get_declared_traits());
+        $traits = $this->prepareTraits(\get_declared_traits());
 
         if (empty($traits)) {
             return;
@@ -69,7 +69,7 @@ class TraitEnumerator extends Enumerator
      */
     protected function prepareTraits(array $traits)
     {
-        natcasesort($traits);
+        \natcasesort($traits);
 
         // My kingdom for a generator.
         $ret = [];
diff --git a/vendor/psy/psysh/src/Command/ListCommand/VariableEnumerator.php b/vendor/psy/psysh/src/Command/ListCommand/VariableEnumerator.php
index 257ceac5..0586c203 100644
--- a/vendor/psy/psysh/src/Command/ListCommand/VariableEnumerator.php
+++ b/vendor/psy/psysh/src/Command/ListCommand/VariableEnumerator.php
@@ -79,9 +79,9 @@ class VariableEnumerator extends Enumerator
     protected function getVariables($showAll)
     {
         $scopeVars = $this->context->getAll();
-        uksort($scopeVars, function ($a, $b) {
-            $aIndex = array_search($a, self::$specialNames);
-            $bIndex = array_search($b, self::$specialNames);
+        \uksort($scopeVars, function ($a, $b) {
+            $aIndex = \array_search($a, self::$specialNames);
+            $bIndex = \array_search($b, self::$specialNames);
 
             if ($aIndex !== false) {
                 if ($bIndex !== false) {
@@ -95,12 +95,12 @@ class VariableEnumerator extends Enumerator
                 return -1;
             }
 
-            return strnatcasecmp($a, $b);
+            return \strnatcasecmp($a, $b);
         });
 
         $ret = [];
         foreach ($scopeVars as $name => $val) {
-            if (!$showAll && in_array($name, self::$specialNames)) {
+            if (!$showAll && \in_array($name, self::$specialNames)) {
                 continue;
             }
 
@@ -126,7 +126,7 @@ class VariableEnumerator extends Enumerator
                 $fname = '$' . $name;
                 $ret[$fname] = [
                     'name'  => $fname,
-                    'style' => in_array($name, self::$specialNames) ? self::IS_PRIVATE : self::IS_PUBLIC,
+                    'style' => \in_array($name, self::$specialNames) ? self::IS_PRIVATE : self::IS_PUBLIC,
                     'value' => $this->presentRef($val),
                 ];
             }
diff --git a/vendor/psy/psysh/src/Command/ParseCommand.php b/vendor/psy/psysh/src/Command/ParseCommand.php
index 5fe36d12..3f3286e8 100644
--- a/vendor/psy/psysh/src/Command/ParseCommand.php
+++ b/vendor/psy/psysh/src/Command/ParseCommand.php
@@ -97,7 +97,7 @@ class ParseCommand extends Command implements ContextAware, PresenterAware
 
         if ($this->parserFactory->hasKindsSupport()) {
             $msg = 'One of PhpParser\\ParserFactory constants: '
-                . implode(', ', ParserFactory::getPossibleKinds())
+                . \implode(', ', ParserFactory::getPossibleKinds())
                 . " (default is based on current interpreter's version).";
             $defaultKind = $this->parserFactory->getDefaultKind();
 
@@ -128,7 +128,7 @@ HELP
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $code = $input->getArgument('code');
-        if (strpos('<?', $code) === false) {
+        if (\strpos('<?', $code) === false) {
             $code = '<?php ' . $code;
         }
 
@@ -153,7 +153,7 @@ HELP
         try {
             return $parser->parse($code);
         } catch (\PhpParser\Error $e) {
-            if (strpos($e->getMessage(), 'unexpected EOF') === false) {
+            if (\strpos($e->getMessage(), 'unexpected EOF') === false) {
                 throw $e;
             }
 
@@ -171,7 +171,7 @@ HELP
      */
     private function getParser($kind = null)
     {
-        if (!array_key_exists($kind, $this->parsers)) {
+        if (!\array_key_exists($kind, $this->parsers)) {
             $this->parsers[$kind] = $this->parserFactory->createParser($kind);
         }
 
diff --git a/vendor/psy/psysh/src/Command/ReflectingCommand.php b/vendor/psy/psysh/src/Command/ReflectingCommand.php
index 8bc56f6f..32863280 100644
--- a/vendor/psy/psysh/src/Command/ReflectingCommand.php
+++ b/vendor/psy/psysh/src/Command/ReflectingCommand.php
@@ -56,19 +56,19 @@ abstract class ReflectingCommand extends Command implements ContextAware
      */
     protected function getTarget($valueName)
     {
-        $valueName = trim($valueName);
+        $valueName = \trim($valueName);
         $matches   = [];
         switch (true) {
-            case preg_match(self::CLASS_OR_FUNC, $valueName, $matches):
+            case \preg_match(self::CLASS_OR_FUNC, $valueName, $matches):
                 return [$this->resolveName($matches[0], true), null, 0];
 
-            case preg_match(self::CLASS_MEMBER, $valueName, $matches):
+            case \preg_match(self::CLASS_MEMBER, $valueName, $matches):
                 return [$this->resolveName($matches[1]), $matches[2], Mirror::CONSTANT | Mirror::METHOD];
 
-            case preg_match(self::CLASS_STATIC, $valueName, $matches):
+            case \preg_match(self::CLASS_STATIC, $valueName, $matches):
                 return [$this->resolveName($matches[1]), $matches[2], Mirror::STATIC_PROPERTY | Mirror::PROPERTY];
 
-            case preg_match(self::INSTANCE_MEMBER, $valueName, $matches):
+            case \preg_match(self::INSTANCE_MEMBER, $valueName, $matches):
                 if ($matches[2] === '->') {
                     $kind = Mirror::METHOD | Mirror::PROPERTY;
                 } else {
@@ -97,27 +97,27 @@ abstract class ReflectingCommand extends Command implements ContextAware
         $shell = $this->getApplication();
 
         // While not *technically* 100% accurate, let's treat `self` and `static` as equivalent.
-        if (in_array(strtolower($name), ['self', 'static'])) {
+        if (\in_array(\strtolower($name), ['self', 'static'])) {
             if ($boundClass = $shell->getBoundClass()) {
                 return $boundClass;
             }
 
             if ($boundObject = $shell->getBoundObject()) {
-                return get_class($boundObject);
+                return \get_class($boundObject);
             }
 
-            $msg = sprintf('Cannot use "%s" when no class scope is active', strtolower($name));
+            $msg = \sprintf('Cannot use "%s" when no class scope is active', \strtolower($name));
             throw new ErrorException($msg, 0, E_USER_ERROR, "eval()'d code", 1);
         }
 
-        if (substr($name, 0, 1) === '\\') {
+        if (\substr($name, 0, 1) === '\\') {
             return $name;
         }
 
         if ($namespace = $shell->getNamespace()) {
             $fullName = $namespace . '\\' . $name;
 
-            if (class_exists($fullName) || interface_exists($fullName) || ($includeFunctions && function_exists($fullName))) {
+            if (\class_exists($fullName) || \interface_exists($fullName) || ($includeFunctions && \function_exists($fullName))) {
                 return $fullName;
             }
         }
@@ -176,7 +176,7 @@ abstract class ReflectingCommand extends Command implements ContextAware
     {
         $value = $this->resolveCode($code);
 
-        if (!is_object($value)) {
+        if (!\is_object($value)) {
             throw new RuntimeException('Unable to inspect a non-object');
         }
 
@@ -192,7 +192,7 @@ abstract class ReflectingCommand extends Command implements ContextAware
      */
     protected function resolveInstance($name)
     {
-        @trigger_error('`resolveInstance` is deprecated; use `resolveCode` instead.', E_USER_DEPRECATED);
+        @\trigger_error('`resolveInstance` is deprecated; use `resolveCode` instead.', E_USER_DEPRECATED);
 
         return $this->resolveCode($name);
     }
@@ -230,7 +230,7 @@ abstract class ReflectingCommand extends Command implements ContextAware
     {
         $vars = [];
 
-        switch (get_class($reflector)) {
+        switch (\get_class($reflector)) {
             case 'ReflectionClass':
             case 'ReflectionObject':
                 $vars['__class'] = $reflector->name;
@@ -240,7 +240,7 @@ abstract class ReflectingCommand extends Command implements ContextAware
                 break;
 
             case 'ReflectionMethod':
-                $vars['__method'] = sprintf('%s::%s', $reflector->class, $reflector->name);
+                $vars['__method'] = \sprintf('%s::%s', $reflector->class, $reflector->name);
                 $vars['__class'] = $reflector->class;
                 $classReflector = $reflector->getDeclaringClass();
                 if ($classReflector->inNamespace()) {
@@ -264,7 +264,7 @@ abstract class ReflectingCommand extends Command implements ContextAware
                 if ($fileName = $reflector->getExecutingFile()) {
                     $vars['__file'] = $fileName;
                     $vars['__line'] = $reflector->getExecutingLine();
-                    $vars['__dir']  = dirname($fileName);
+                    $vars['__dir']  = \dirname($fileName);
                 }
                 break;
 
@@ -279,7 +279,7 @@ abstract class ReflectingCommand extends Command implements ContextAware
                 // no line for these, but this'll do
                 if ($fileName = $reflector->getDeclaringClass()->getFileName()) {
                     $vars['__file'] = $fileName;
-                    $vars['__dir']  = dirname($fileName);
+                    $vars['__dir']  = \dirname($fileName);
                 }
                 break;
 
@@ -294,7 +294,7 @@ abstract class ReflectingCommand extends Command implements ContextAware
             if ($fileName = $reflector->getFileName()) {
                 $vars['__file'] = $fileName;
                 $vars['__line'] = $reflector->getStartLine();
-                $vars['__dir']  = dirname($fileName);
+                $vars['__dir']  = \dirname($fileName);
             }
         }
 
diff --git a/vendor/psy/psysh/src/Command/ShowCommand.php b/vendor/psy/psysh/src/Command/ShowCommand.php
index cae86e59..47d18654 100644
--- a/vendor/psy/psysh/src/Command/ShowCommand.php
+++ b/vendor/psy/psysh/src/Command/ShowCommand.php
@@ -140,16 +140,16 @@ HELP
                 $index = 0;
             }
         } else {
-            $index = max(0, intval($input->getOption('ex')) - 1);
+            $index = \max(0, \intval($input->getOption('ex')) - 1);
         }
 
         $trace = $exception->getTrace();
-        array_unshift($trace, [
+        \array_unshift($trace, [
             'file' => $exception->getFile(),
             'line' => $exception->getLine(),
         ]);
 
-        if ($index >= count($trace)) {
+        if ($index >= \count($trace)) {
             $index = 0;
         }
 
@@ -169,25 +169,25 @@ HELP
         $file = isset($trace[$index]['file']) ? $this->replaceCwd($trace[$index]['file']) : 'n/a';
         $line = isset($trace[$index]['line']) ? $trace[$index]['line'] : 'n/a';
 
-        $output->writeln(sprintf(
+        $output->writeln(\sprintf(
             'From <info>%s:%d</info> at <strong>level %d</strong> of backtrace (of %d).',
             OutputFormatter::escape($file),
             OutputFormatter::escape($line),
             $index + 1,
-            count($trace)
+            \count($trace)
         ));
     }
 
     private function replaceCwd($file)
     {
-        if ($cwd = getcwd()) {
-            $cwd = rtrim($cwd, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        if ($cwd = \getcwd()) {
+            $cwd = \rtrim($cwd, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
         }
 
         if ($cwd === false) {
             return $file;
         } else {
-            return preg_replace('/^' . preg_quote($cwd, '/') . '/', '', $file);
+            return \preg_replace('/^' . \preg_quote($cwd, '/') . '/', '', $file);
         }
     }
 
@@ -208,8 +208,8 @@ HELP
             $line = $trace[$index]['line'];
         }
 
-        if (is_file($file)) {
-            $code = @file_get_contents($file);
+        if (\is_file($file)) {
+            $code = @\file_get_contents($file);
         }
 
         if (empty($code)) {
@@ -268,12 +268,12 @@ HELP
                 $line = $context['line'];
             }
 
-            if (is_file($file)) {
+            if (\is_file($file)) {
                 $vars['__file'] = $file;
                 if (isset($line)) {
                     $vars['__line'] = $line;
                 }
-                $vars['__dir'] = dirname($file);
+                $vars['__dir'] = \dirname($file);
             }
         }
 
@@ -282,7 +282,7 @@ HELP
 
     private function extractEvalFileAndLine($file)
     {
-        if (preg_match('/(.*)\\((\\d+)\\) : eval\\(\\)\'d code$/', $file, $matches)) {
+        if (\preg_match('/(.*)\\((\\d+)\\) : eval\\(\\)\'d code$/', $file, $matches)) {
             return [$matches[1], $matches[2]];
         }
     }
diff --git a/vendor/psy/psysh/src/Command/SudoCommand.php b/vendor/psy/psysh/src/Command/SudoCommand.php
index 44cc2c0e..9d5afbf0 100644
--- a/vendor/psy/psysh/src/Command/SudoCommand.php
+++ b/vendor/psy/psysh/src/Command/SudoCommand.php
@@ -103,13 +103,13 @@ HELP
         // special case for !!
         if ($code === '!!') {
             $history = $this->readline->listHistory();
-            if (count($history) < 2) {
+            if (\count($history) < 2) {
                 throw new \InvalidArgumentException('No previous command to replay');
             }
-            $code = $history[count($history) - 2];
+            $code = $history[\count($history) - 2];
         }
 
-        if (strpos('<?', $code) === false) {
+        if (\strpos('<?', $code) === false) {
             $code = '<?php ' . $code;
         }
 
@@ -132,7 +132,7 @@ HELP
         try {
             return $this->parser->parse($code);
         } catch (\PhpParser\Error $e) {
-            if (strpos($e->getMessage(), 'unexpected EOF') === false) {
+            if (\strpos($e->getMessage(), 'unexpected EOF') === false) {
                 throw $e;
             }
 
diff --git a/vendor/psy/psysh/src/Command/ThrowUpCommand.php b/vendor/psy/psysh/src/Command/ThrowUpCommand.php
index 99af9a8a..b37f7573 100644
--- a/vendor/psy/psysh/src/Command/ThrowUpCommand.php
+++ b/vendor/psy/psysh/src/Command/ThrowUpCommand.php
@@ -125,12 +125,12 @@ HELP
             return [new Arg(new Variable('_e'))];
         }
 
-        if (strpos('<?', $code) === false) {
+        if (\strpos('<?', $code) === false) {
             $code = '<?php ' . $code;
         }
 
         $nodes = $this->parse($code);
-        if (count($nodes) !== 1) {
+        if (\count($nodes) !== 1) {
             throw new \InvalidArgumentException('No idea how to throw this');
         }
 
@@ -161,7 +161,7 @@ HELP
         try {
             return $this->parser->parse($code);
         } catch (\PhpParser\Error $e) {
-            if (strpos($e->getMessage(), 'unexpected EOF') === false) {
+            if (\strpos($e->getMessage(), 'unexpected EOF') === false) {
                 throw $e;
             }
 
diff --git a/vendor/psy/psysh/src/Command/TimeitCommand.php b/vendor/psy/psysh/src/Command/TimeitCommand.php
index 70d70c0e..c5966313 100644
--- a/vendor/psy/psysh/src/Command/TimeitCommand.php
+++ b/vendor/psy/psysh/src/Command/TimeitCommand.php
@@ -16,7 +16,6 @@ use PhpParser\PrettyPrinter\Standard as Printer;
 use Psy\Command\TimeitCommand\TimeitVisitor;
 use Psy\Input\CodeArgument;
 use Psy\ParserFactory;
-use Psy\Shell;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -99,13 +98,13 @@ HELP
         self::$times = [];
 
         if ($num === 1) {
-            $output->writeln(sprintf(self::RESULT_MSG, $times[0]));
+            $output->writeln(\sprintf(self::RESULT_MSG, $times[0]));
         } else {
-            $total = array_sum($times);
-            rsort($times);
-            $median = $times[round($num / 2)];
+            $total = \array_sum($times);
+            \rsort($times);
+            $median = $times[\round($num / 2)];
 
-            $output->writeln(sprintf(self::AVG_RESULT_MSG, $total / $num, $median, $total));
+            $output->writeln(\sprintf(self::AVG_RESULT_MSG, $total / $num, $median, $total));
         }
     }
 
@@ -118,7 +117,7 @@ HELP
      */
     public static function markStart()
     {
-        self::$start = microtime(true);
+        self::$start = \microtime(true);
     }
 
     /**
@@ -137,7 +136,7 @@ HELP
      */
     public static function markEnd($ret = null)
     {
-        self::$times[] = microtime(true) - self::$start;
+        self::$times[] = \microtime(true) - self::$start;
         self::$start = null;
 
         return $ret;
@@ -185,7 +184,7 @@ HELP
         try {
             return $this->parser->parse($code);
         } catch (\PhpParser\Error $e) {
-            if (strpos($e->getMessage(), 'unexpected EOF') === false) {
+            if (\strpos($e->getMessage(), 'unexpected EOF') === false) {
                 throw $e;
             }
 
diff --git a/vendor/psy/psysh/src/Command/TimeitCommand/TimeitVisitor.php b/vendor/psy/psysh/src/Command/TimeitCommand/TimeitVisitor.php
index 6ee66994..841ba135 100644
--- a/vendor/psy/psysh/src/Command/TimeitCommand/TimeitVisitor.php
+++ b/vendor/psy/psysh/src/Command/TimeitCommand/TimeitVisitor.php
@@ -75,15 +75,15 @@ class TimeitVisitor extends NodeVisitorAbstract
     public function afterTraverse(array $nodes)
     {
         // prepend a `markStart` call
-        array_unshift($nodes, $this->maybeExpression($this->getStartCall()));
+        \array_unshift($nodes, $this->maybeExpression($this->getStartCall()));
 
         // append a `markEnd` call (wrapping the final node, if it's an expression)
-        $last = $nodes[count($nodes) - 1];
+        $last = $nodes[\count($nodes) - 1];
         if ($last instanceof Expr) {
-            array_pop($nodes);
+            \array_pop($nodes);
             $nodes[] = $this->getEndCall($last);
         } elseif ($last instanceof Expression) {
-            array_pop($nodes);
+            \array_pop($nodes);
             $nodes[] = new Expression($this->getEndCall($last->expr), $last->getAttributes());
         } elseif ($last instanceof Return_) {
             // nothing to do here, we're already ending with a return call
@@ -134,6 +134,6 @@ class TimeitVisitor extends NodeVisitorAbstract
      */
     private function maybeExpression($expr, $attrs = [])
     {
-        return class_exists('PhpParser\Node\Stmt\Expression') ? new Expression($expr, $attrs) : $expr;
+        return \class_exists('PhpParser\Node\Stmt\Expression') ? new Expression($expr, $attrs) : $expr;
     }
 }
diff --git a/vendor/psy/psysh/src/Command/TraceCommand.php b/vendor/psy/psysh/src/Command/TraceCommand.php
index becc5831..c28b0e72 100644
--- a/vendor/psy/psysh/src/Command/TraceCommand.php
+++ b/vendor/psy/psysh/src/Command/TraceCommand.php
@@ -90,8 +90,8 @@ HELP
      */
     protected function getBacktrace(\Exception $e, $count = null, $includePsy = true)
     {
-        if ($cwd = getcwd()) {
-            $cwd = rtrim($cwd, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        if ($cwd = \getcwd()) {
+            $cwd = \rtrim($cwd, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
         }
 
         if ($count === null) {
@@ -101,7 +101,7 @@ HELP
         $lines = [];
 
         $trace = $e->getTrace();
-        array_unshift($trace, [
+        \array_unshift($trace, [
             'function' => '',
             'file'     => $e->getFile() !== null ? $e->getFile() : 'n/a',
             'line'     => $e->getLine() !== null ? $e->getLine() : 'n/a',
@@ -109,16 +109,16 @@ HELP
         ]);
 
         if (!$includePsy) {
-            for ($i = count($trace) - 1; $i >= 0; $i--) {
+            for ($i = \count($trace) - 1; $i >= 0; $i--) {
                 $thing = isset($trace[$i]['class']) ? $trace[$i]['class'] : $trace[$i]['function'];
-                if (preg_match('/\\\\?Psy\\\\/', $thing)) {
-                    $trace = array_slice($trace, $i + 1);
+                if (\preg_match('/\\\\?Psy\\\\/', $thing)) {
+                    $trace = \array_slice($trace, $i + 1);
                     break;
                 }
             }
         }
 
-        for ($i = 0, $count = min($count, count($trace)); $i < $count; $i++) {
+        for ($i = 0, $count = \min($count, \count($trace)); $i < $count; $i++) {
             $class    = isset($trace[$i]['class']) ? $trace[$i]['class'] : '';
             $type     = isset($trace[$i]['type']) ? $trace[$i]['type'] : '';
             $function = $trace[$i]['function'];
@@ -126,16 +126,16 @@ HELP
             $line     = isset($trace[$i]['line']) ? $trace[$i]['line'] : 'n/a';
 
             // Leave execution loop out of the `eval()'d code` lines
-            if (preg_match("#/src/Execution(?:Loop)?Closure.php\(\d+\) : eval\(\)'d code$#", str_replace('\\', '/', $file))) {
+            if (\preg_match("#/src/Execution(?:Loop)?Closure.php\(\d+\) : eval\(\)'d code$#", \str_replace('\\', '/', $file))) {
                 $file = "eval()'d code";
             }
 
             // Skip any lines that don't match our filter options
-            if (!$this->filter->match(sprintf('%s%s%s() at %s:%s', $class, $type, $function, $file, $line))) {
+            if (!$this->filter->match(\sprintf('%s%s%s() at %s:%s', $class, $type, $function, $file, $line))) {
                 continue;
             }
 
-            $lines[] = sprintf(
+            $lines[] = \sprintf(
                 ' <class>%s</class>%s%s() at <info>%s:%s</info>',
                 OutputFormatter::escape($class),
                 OutputFormatter::escape($type),
@@ -161,7 +161,7 @@ HELP
         if ($cwd === false) {
             return $file;
         } else {
-            return preg_replace('/^' . preg_quote($cwd, '/') . '/', '', $file);
+            return \preg_replace('/^' . \preg_quote($cwd, '/') . '/', '', $file);
         }
     }
 }
diff --git a/vendor/psy/psysh/src/Command/WhereamiCommand.php b/vendor/psy/psysh/src/Command/WhereamiCommand.php
index c2b27843..98593d13 100644
--- a/vendor/psy/psysh/src/Command/WhereamiCommand.php
+++ b/vendor/psy/psysh/src/Command/WhereamiCommand.php
@@ -33,7 +33,7 @@ class WhereamiCommand extends Command
     public function __construct($colorMode = null)
     {
         $this->colorMode = $colorMode ?: Configuration::COLOR_MODE_AUTO;
-        $this->backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+        $this->backtrace = \debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
 
         parent::__construct();
     }
@@ -69,13 +69,13 @@ HELP
      */
     protected function trace()
     {
-        foreach (array_reverse($this->backtrace) as $stackFrame) {
+        foreach (\array_reverse($this->backtrace) as $stackFrame) {
             if ($this->isDebugCall($stackFrame)) {
                 return $stackFrame;
             }
         }
 
-        return end($this->backtrace);
+        return \end($this->backtrace);
     }
 
     private static function isDebugCall(array $stackFrame)
@@ -84,7 +84,7 @@ HELP
         $function = isset($stackFrame['function']) ? $stackFrame['function'] : null;
 
         return ($class === null && $function === 'Psy\debug') ||
-            ($class === 'Psy\Shell' && in_array($function, ['__construct', 'debug']));
+            ($class === 'Psy\Shell' && \in_array($function, ['__construct', 'debug']));
     }
 
     /**
@@ -95,8 +95,8 @@ HELP
     protected function fileInfo()
     {
         $stackFrame = $this->trace();
-        if (preg_match('/eval\(/', $stackFrame['file'])) {
-            preg_match_all('/([^\(]+)\((\d+)/', $stackFrame['file'], $matches);
+        if (\preg_match('/eval\(/', $stackFrame['file'])) {
+            \preg_match_all('/([^\(]+)\((\d+)/', $stackFrame['file'], $matches);
             $file = $matches[1][0];
             $line = (int) $matches[2][0];
         } else {
@@ -104,7 +104,7 @@ HELP
             $line = $stackFrame['line'];
         }
 
-        return compact('file', 'line');
+        return \compact('file', 'line');
     }
 
     /**
@@ -117,11 +117,11 @@ HELP
         $factory     = new ConsoleColorFactory($this->colorMode);
         $colors      = $factory->getConsoleColor();
         $highlighter = new Highlighter($colors);
-        $contents    = file_get_contents($info['file']);
+        $contents    = \file_get_contents($info['file']);
 
         $output->startPaging();
         $output->writeln('');
-        $output->writeln(sprintf('From <info>%s:%s</info>:', $this->replaceCwd($info['file']), $info['line']));
+        $output->writeln(\sprintf('From <info>%s:%s</info>:', $this->replaceCwd($info['file']), $info['line']));
         $output->writeln('');
         $output->write($highlighter->getCodeSnippet($contents, $info['line'], $num, $num), ShellOutput::OUTPUT_RAW);
         $output->stopPaging();
@@ -136,13 +136,13 @@ HELP
      */
     private function replaceCwd($file)
     {
-        $cwd = getcwd();
+        $cwd = \getcwd();
         if ($cwd === false) {
             return $file;
         }
 
-        $cwd = rtrim($cwd, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        $cwd = \rtrim($cwd, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
 
-        return preg_replace('/^' . preg_quote($cwd, '/') . '/', '', $file);
+        return \preg_replace('/^' . \preg_quote($cwd, '/') . '/', '', $file);
     }
 }
diff --git a/vendor/psy/psysh/src/Command/WtfCommand.php b/vendor/psy/psysh/src/Command/WtfCommand.php
index 68ba0f3f..c6d53000 100644
--- a/vendor/psy/psysh/src/Command/WtfCommand.php
+++ b/vendor/psy/psysh/src/Command/WtfCommand.php
@@ -86,26 +86,26 @@ HELP
     {
         $this->filter->bind($input);
 
-        $incredulity = implode('', $input->getArgument('incredulity'));
-        if (strlen(preg_replace('/[\\?!]/', '', $incredulity))) {
+        $incredulity = \implode('', $input->getArgument('incredulity'));
+        if (\strlen(\preg_replace('/[\\?!]/', '', $incredulity))) {
             throw new \InvalidArgumentException('Incredulity must include only "?" and "!"');
         }
 
         $exception = $this->context->getLastException();
-        $count     = $input->getOption('all') ? PHP_INT_MAX : max(3, pow(2, strlen($incredulity) + 1));
+        $count     = $input->getOption('all') ? PHP_INT_MAX : \max(3, \pow(2, \strlen($incredulity) + 1));
 
         $shell = $this->getApplication();
         $output->startPaging();
         do {
-            $traceCount = count($exception->getTrace());
+            $traceCount = \count($exception->getTrace());
             $showLines  = $count;
             // Show the whole trace if we'd only be hiding a few lines
-            if ($traceCount < max($count * 1.2, $count + 2)) {
+            if ($traceCount < \max($count * 1.2, $count + 2)) {
                 $showLines = PHP_INT_MAX;
             }
 
             $trace     = $this->getBacktrace($exception, $showLines);
-            $moreLines = $traceCount - count($trace);
+            $moreLines = $traceCount - \count($trace);
 
             $output->writeln($shell->formatException($exception));
             $output->writeln('--');
@@ -113,7 +113,7 @@ HELP
             $output->writeln('');
 
             if ($moreLines > 0) {
-                $output->writeln(sprintf(
+                $output->writeln(\sprintf(
                     '<aside>Use <return>wtf -a</return> to see %d more lines</aside>',
                     $moreLines
                 ));
diff --git a/vendor/psy/psysh/src/ConfigPaths.php b/vendor/psy/psysh/src/ConfigPaths.php
index 0c9c78a4..c4de2d57 100644
--- a/vendor/psy/psysh/src/ConfigPaths.php
+++ b/vendor/psy/psysh/src/ConfigPaths.php
@@ -68,7 +68,7 @@ class ConfigPaths
     {
         $configDirs = self::getHomeConfigDirs();
         foreach ($configDirs as $configDir) {
-            if (@is_dir($configDir)) {
+            if (@\is_dir($configDir)) {
                 return $configDir;
             }
         }
@@ -136,7 +136,7 @@ class ConfigPaths
     {
         $xdg = new Xdg();
 
-        set_error_handler(['Psy\Exception\ErrorException', 'throwException']);
+        \set_error_handler(['Psy\Exception\ErrorException', 'throwException']);
 
         try {
             // XDG doesn't really work on Windows, sometimes complains about
@@ -146,34 +146,34 @@ class ConfigPaths
         } catch (\Exception $e) {
             // Well. That didn't work. Fall back to a boring old folder in the
             // system temp dir.
-            $runtimeDir = sys_get_temp_dir();
+            $runtimeDir = \sys_get_temp_dir();
         }
 
-        restore_error_handler();
+        \restore_error_handler();
 
-        return strtr($runtimeDir, '\\', '/') . '/psysh';
+        return \strtr($runtimeDir, '\\', '/') . '/psysh';
     }
 
     private static function getDirNames(array $baseDirs)
     {
-        $dirs = array_map(function ($dir) {
-            return strtr($dir, '\\', '/') . '/psysh';
+        $dirs = \array_map(function ($dir) {
+            return \strtr($dir, '\\', '/') . '/psysh';
         }, $baseDirs);
 
         // Add ~/.psysh
-        if ($home = getenv('HOME')) {
-            $dirs[] = strtr($home, '\\', '/') . '/.psysh';
+        if ($home = \getenv('HOME')) {
+            $dirs[] = \strtr($home, '\\', '/') . '/.psysh';
         }
 
         // Add some Windows specific ones :)
-        if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
-            if ($appData = getenv('APPDATA')) {
+        if (\defined('PHP_WINDOWS_VERSION_MAJOR')) {
+            if ($appData = \getenv('APPDATA')) {
                 // AppData gets preference
-                array_unshift($dirs, strtr($appData, '\\', '/') . '/PsySH');
+                \array_unshift($dirs, \strtr($appData, '\\', '/') . '/PsySH');
             }
 
-            $dir = strtr(getenv('HOMEDRIVE') . '/' . getenv('HOMEPATH'), '\\', '/') . '/.psysh';
-            if (!in_array($dir, $dirs)) {
+            $dir = \strtr(\getenv('HOMEDRIVE') . '/' . \getenv('HOMEPATH'), '\\', '/') . '/.psysh';
+            if (!\in_array($dir, $dirs)) {
                 $dirs[] = $dir;
             }
         }
@@ -187,7 +187,7 @@ class ConfigPaths
         foreach ($dirNames as $dir) {
             foreach ($fileNames as $name) {
                 $file = $dir . '/' . $name;
-                if (@is_file($file)) {
+                if (@\is_file($file)) {
                     $files[] = $file;
                 }
             }
@@ -207,30 +207,30 @@ class ConfigPaths
      */
     public static function touchFileWithMkdir($file)
     {
-        if (file_exists($file)) {
-            if (is_writable($file)) {
+        if (\file_exists($file)) {
+            if (\is_writable($file)) {
                 return $file;
             }
 
-            trigger_error(sprintf('Writing to %s is not allowed.', $file), E_USER_NOTICE);
+            \trigger_error(\sprintf('Writing to %s is not allowed.', $file), E_USER_NOTICE);
 
             return false;
         }
 
-        $dir = dirname($file);
+        $dir = \dirname($file);
 
-        if (!is_dir($dir)) {
+        if (!\is_dir($dir)) {
             // Just try making it and see if it works
-            @mkdir($dir, 0700, true);
+            @\mkdir($dir, 0700, true);
         }
 
-        if (!is_dir($dir) || !is_writable($dir)) {
-            trigger_error(sprintf('Writing to %s is not allowed.', $dir), E_USER_NOTICE);
+        if (!\is_dir($dir) || !\is_writable($dir)) {
+            \trigger_error(\sprintf('Writing to %s is not allowed.', $dir), E_USER_NOTICE);
 
             return false;
         }
 
-        touch($file);
+        \touch($file);
 
         return $file;
     }
diff --git a/vendor/psy/psysh/src/Configuration.php b/vendor/psy/psysh/src/Configuration.php
index b37f2e57..67c76e7b 100644
--- a/vendor/psy/psysh/src/Configuration.php
+++ b/vendor/psy/psysh/src/Configuration.php
@@ -114,7 +114,7 @@ class Configuration
         // explicit configFile option
         if (isset($config['configFile'])) {
             $this->configFile = $config['configFile'];
-        } elseif ($configFile = getenv('PSYSH_CONFIG')) {
+        } elseif ($configFile = \getenv('PSYSH_CONFIG')) {
             $this->configFile = $configFile;
         }
 
@@ -145,8 +145,8 @@ class Configuration
     public function init()
     {
         // feature detection
-        $this->hasReadline = function_exists('readline');
-        $this->hasPcntl    = function_exists('pcntl_signal') && function_exists('posix_getpid');
+        $this->hasReadline = \function_exists('readline');
+        $this->hasPcntl    = \function_exists('pcntl_signal') && \function_exists('posix_getpid');
 
         if ($configFile = $this->getConfigFile()) {
             $this->loadConfigFile($configFile);
@@ -180,9 +180,9 @@ class Configuration
         $files = ConfigPaths::getConfigFiles(['config.php', 'rc.php'], $this->configDir);
 
         if (!empty($files)) {
-            if ($this->warnOnMultipleConfigs && count($files) > 1) {
-                $msg = sprintf('Multiple configuration files found: %s. Using %s', implode($files, ', '), $files[0]);
-                trigger_error($msg, E_USER_NOTICE);
+            if ($this->warnOnMultipleConfigs && \count($files) > 1) {
+                $msg = \sprintf('Multiple configuration files found: %s. Using %s', \implode($files, ', '), $files[0]);
+                \trigger_error($msg, E_USER_NOTICE);
             }
 
             return $files[0];
@@ -199,9 +199,9 @@ class Configuration
      */
     public function getLocalConfigFile()
     {
-        $localConfig = getcwd() . '/.psysh.php';
+        $localConfig = \getcwd() . '/.psysh.php';
 
-        if (@is_file($localConfig)) {
+        if (@\is_file($localConfig)) {
             return $localConfig;
         }
     }
@@ -215,7 +215,7 @@ class Configuration
     {
         foreach (self::$AVAILABLE_OPTIONS as $option) {
             if (isset($options[$option])) {
-                $method = 'set' . ucfirst($option);
+                $method = 'set' . \ucfirst($option);
                 $this->$method($options[$option]);
             }
         }
@@ -223,14 +223,14 @@ class Configuration
         // legacy `tabCompletion` option
         if (isset($options['tabCompletion'])) {
             $msg = '`tabCompletion` is deprecated; use `useTabCompletion` instead.';
-            @trigger_error($msg, E_USER_DEPRECATED);
+            @\trigger_error($msg, E_USER_DEPRECATED);
 
             $this->setUseTabCompletion($options['tabCompletion']);
         }
 
         foreach (['commands', 'matchers', 'casters'] as $option) {
             if (isset($options[$option])) {
-                $method = 'add' . ucfirst($option);
+                $method = 'add' . \ucfirst($option);
                 $this->$method($options[$option]);
             }
         }
@@ -238,7 +238,7 @@ class Configuration
         // legacy `tabCompletionMatchers` option
         if (isset($options['tabCompletionMatchers'])) {
             $msg = '`tabCompletionMatchers` is deprecated; use `matchers` instead.';
-            @trigger_error($msg, E_USER_DEPRECATED);
+            @\trigger_error($msg, E_USER_DEPRECATED);
 
             $this->addMatchers($options['tabCompletionMatchers']);
         }
@@ -267,7 +267,7 @@ class Configuration
         $result = $load($this);
 
         if (!empty($result)) {
-            if (is_array($result)) {
+            if (\is_array($result)) {
                 $this->loadConfig($result);
             } else {
                 throw new \InvalidArgumentException('Psy Shell configuration must return an array of options');
@@ -359,8 +359,8 @@ class Configuration
             $this->runtimeDir = ConfigPaths::getRuntimeDir();
         }
 
-        if (!is_dir($this->runtimeDir)) {
-            mkdir($this->runtimeDir, 0700, true);
+        if (!\is_dir($this->runtimeDir)) {
+            \mkdir($this->runtimeDir, 0700, true);
         }
 
         return $this->runtimeDir;
@@ -393,9 +393,9 @@ class Configuration
         $files = ConfigPaths::getConfigFiles(['psysh_history', 'history'], $this->configDir);
 
         if (!empty($files)) {
-            if ($this->warnOnMultipleConfigs && count($files) > 1) {
-                $msg = sprintf('Multiple history files found: %s. Using %s', implode($files, ', '), $files[0]);
-                trigger_error($msg, E_USER_NOTICE);
+            if ($this->warnOnMultipleConfigs && \count($files) > 1) {
+                $msg = \sprintf('Multiple history files found: %s. Using %s', \implode($files, ', '), $files[0]);
+                \trigger_error($msg, E_USER_NOTICE);
             }
 
             $this->setHistoryFile($files[0]);
@@ -462,7 +462,7 @@ class Configuration
      */
     public function getTempFile($type, $pid)
     {
-        return tempnam($this->getRuntimeDir(), $type . '_' . $pid . '_');
+        return \tempnam($this->getRuntimeDir(), $type . '_' . $pid . '_');
     }
 
     /**
@@ -477,7 +477,7 @@ class Configuration
      */
     public function getPipe($type, $pid)
     {
-        return sprintf('%s/%s_%s', $this->getRuntimeDir(), $type, $pid);
+        return \sprintf('%s/%s_%s', $this->getRuntimeDir(), $type, $pid);
     }
 
     /**
@@ -861,7 +861,7 @@ class Configuration
      */
     public function setPager($pager)
     {
-        if ($pager && !is_string($pager) && !$pager instanceof OutputPager) {
+        if ($pager && !\is_string($pager) && !$pager instanceof OutputPager) {
             throw new \InvalidArgumentException('Unexpected pager instance');
         }
 
@@ -879,10 +879,10 @@ class Configuration
     public function getPager()
     {
         if (!isset($this->pager) && $this->usePcntl()) {
-            if ($pager = ini_get('cli.pager')) {
+            if ($pager = \ini_get('cli.pager')) {
                 // use the default pager
                 $this->pager = $pager;
-            } elseif ($less = exec('which less 2>/dev/null')) {
+            } elseif ($less = \exec('which less 2>/dev/null')) {
                 // check for the presence of less...
                 $this->pager = $less . ' -R -S -F -X';
             }
@@ -937,7 +937,7 @@ class Configuration
      */
     public function addMatchers(array $matchers)
     {
-        $this->newMatchers = array_merge($this->newMatchers, $matchers);
+        $this->newMatchers = \array_merge($this->newMatchers, $matchers);
         if (isset($this->shell)) {
             $this->doAddMatchers();
         }
@@ -977,7 +977,7 @@ class Configuration
      */
     public function addCommands(array $commands)
     {
-        $this->newCommands = array_merge($this->newCommands, $commands);
+        $this->newCommands = \array_merge($this->newCommands, $commands);
         if (isset($this->shell)) {
             $this->doAddCommands();
         }
@@ -1033,9 +1033,9 @@ class Configuration
 
         $files = ConfigPaths::getDataFiles(['php_manual.sqlite'], $this->dataDir);
         if (!empty($files)) {
-            if ($this->warnOnMultipleConfigs && count($files) > 1) {
-                $msg = sprintf('Multiple manual database files found: %s. Using %s', implode($files, ', '), $files[0]);
-                trigger_error($msg, E_USER_NOTICE);
+            if ($this->warnOnMultipleConfigs && \count($files) > 1) {
+                $msg = \sprintf('Multiple manual database files found: %s. Using %s', \implode($files, ', '), $files[0]);
+                \trigger_error($msg, E_USER_NOTICE);
             }
 
             return $this->manualDbFile = $files[0];
@@ -1051,7 +1051,7 @@ class Configuration
     {
         if (!isset($this->manualDb)) {
             $dbFile = $this->getManualDbFile();
-            if (is_file($dbFile)) {
+            if (\is_file($dbFile)) {
                 try {
                     $this->manualDb = new \PDO('sqlite:' . $dbFile);
                 } catch (\PDOException $e) {
@@ -1133,7 +1133,7 @@ class Configuration
             self::COLOR_MODE_DISABLED,
         ];
 
-        if (in_array($colorMode, $validColorModes)) {
+        if (\in_array($colorMode, $validColorModes)) {
             $this->colorMode = $colorMode;
         } else {
             throw new \InvalidArgumentException('invalid color mode: ' . $colorMode);
@@ -1226,7 +1226,7 @@ class Configuration
             Checker::NEVER,
         ];
 
-        if (!in_array($interval, $validIntervals)) {
+        if (!\in_array($interval, $validIntervals)) {
             throw new \InvalidArgumentException('invalid update check interval: ' . $interval);
         }
 
diff --git a/vendor/psy/psysh/src/Context.php b/vendor/psy/psysh/src/Context.php
index c0e58e89..104dc8ff 100644
--- a/vendor/psy/psysh/src/Context.php
+++ b/vendor/psy/psysh/src/Context.php
@@ -75,13 +75,13 @@ class Context
             case '__file':
             case '__line':
             case '__dir':
-                if (array_key_exists($name, $this->commandScopeVariables)) {
+                if (\array_key_exists($name, $this->commandScopeVariables)) {
                     return $this->commandScopeVariables[$name];
                 }
                 break;
 
             default:
-                if (array_key_exists($name, $this->scopeVariables)) {
+                if (\array_key_exists($name, $this->scopeVariables)) {
                     return $this->scopeVariables[$name];
                 }
                 break;
@@ -97,7 +97,7 @@ class Context
      */
     public function getAll()
     {
-        return array_merge($this->scopeVariables, $this->getSpecialVariables());
+        return \array_merge($this->scopeVariables, $this->getSpecialVariables());
     }
 
     /**
@@ -123,7 +123,7 @@ class Context
             $vars['this'] = $this->boundObject;
         }
 
-        return array_merge($vars, $this->commandScopeVariables);
+        return \array_merge($vars, $this->commandScopeVariables);
     }
 
     /**
@@ -228,7 +228,7 @@ class Context
      */
     public function setBoundObject($boundObject)
     {
-        $this->boundObject = is_object($boundObject) ? $boundObject : null;
+        $this->boundObject = \is_object($boundObject) ? $boundObject : null;
         $this->boundClass = null;
     }
 
@@ -251,7 +251,7 @@ class Context
      */
     public function setBoundClass($boundClass)
     {
-        $this->boundClass = (is_string($boundClass) && $boundClass !== '') ? $boundClass : null;
+        $this->boundClass = (\is_string($boundClass) && $boundClass !== '') ? $boundClass : null;
         $this->boundObject = null;
     }
 
@@ -275,7 +275,7 @@ class Context
         $vars = [];
         foreach ($commandScopeVariables as $key => $value) {
             // kind of type check
-            if (is_scalar($value) && in_array($key, self::$commandScopeNames)) {
+            if (\is_scalar($value) && \in_array($key, self::$commandScopeNames)) {
                 $vars[$key] = $value;
             }
         }
@@ -303,7 +303,7 @@ class Context
      */
     public function getUnusedCommandScopeVariableNames()
     {
-        return array_diff(self::$commandScopeNames, array_keys($this->commandScopeVariables));
+        return \array_diff(self::$commandScopeNames, \array_keys($this->commandScopeVariables));
     }
 
     /**
@@ -315,6 +315,6 @@ class Context
      */
     public static function isSpecialVariableName($name)
     {
-        return in_array($name, self::$specialNames) || in_array($name, self::$commandScopeNames);
+        return \in_array($name, self::$specialNames) || \in_array($name, self::$commandScopeNames);
     }
 }
diff --git a/vendor/psy/psysh/src/Exception/BreakException.php b/vendor/psy/psysh/src/Exception/BreakException.php
index 1436d56a..2200e78d 100644
--- a/vendor/psy/psysh/src/Exception/BreakException.php
+++ b/vendor/psy/psysh/src/Exception/BreakException.php
@@ -24,7 +24,7 @@ class BreakException extends \Exception implements Exception
     public function __construct($message = '', $code = 0, \Exception $previous = null)
     {
         $this->rawMessage = $message;
-        parent::__construct(sprintf('Exit:  %s', $message), $code, $previous);
+        parent::__construct(\sprintf('Exit:  %s', $message), $code, $previous);
     }
 
     /**
diff --git a/vendor/psy/psysh/src/Exception/ErrorException.php b/vendor/psy/psysh/src/Exception/ErrorException.php
index 2cd7e95f..822fa927 100644
--- a/vendor/psy/psysh/src/Exception/ErrorException.php
+++ b/vendor/psy/psysh/src/Exception/ErrorException.php
@@ -32,7 +32,7 @@ class ErrorException extends \ErrorException implements Exception
     {
         $this->rawMessage = $message;
 
-        if (!empty($filename) && preg_match('{Psy[/\\\\]ExecutionLoop}', $filename)) {
+        if (!empty($filename) && \preg_match('{Psy[/\\\\]ExecutionLoop}', $filename)) {
             $filename = '';
         }
 
@@ -67,7 +67,7 @@ class ErrorException extends \ErrorException implements Exception
                 break;
         }
 
-        $message = sprintf('PHP %s:  %s%s on line %d', $type, $message, $filename ? ' in ' . $filename : '', $lineno);
+        $message = \sprintf('PHP %s:  %s%s on line %d', $type, $message, $filename ? ' in ' . $filename : '', $lineno);
         parent::__construct($message, $code, $severity, $filename, $lineno, $previous);
     }
 
diff --git a/vendor/psy/psysh/src/Exception/FatalErrorException.php b/vendor/psy/psysh/src/Exception/FatalErrorException.php
index 08b56c0b..48a4e2b8 100644
--- a/vendor/psy/psysh/src/Exception/FatalErrorException.php
+++ b/vendor/psy/psysh/src/Exception/FatalErrorException.php
@@ -36,7 +36,7 @@ class FatalErrorException extends \ErrorException implements Exception
         }
 
         $this->rawMessage = $message;
-        $message = sprintf('PHP Fatal error:  %s in %s on line %d', $message, $filename ?: "eval()'d code", $lineno);
+        $message = \sprintf('PHP Fatal error:  %s in %s on line %d', $message, $filename ?: "eval()'d code", $lineno);
         parent::__construct($message, $code, $severity, $filename, $lineno, $previous);
     }
 
diff --git a/vendor/psy/psysh/src/Exception/ParseErrorException.php b/vendor/psy/psysh/src/Exception/ParseErrorException.php
index 93d0d3c9..cb6380e6 100644
--- a/vendor/psy/psysh/src/Exception/ParseErrorException.php
+++ b/vendor/psy/psysh/src/Exception/ParseErrorException.php
@@ -24,7 +24,7 @@ class ParseErrorException extends \PhpParser\Error implements Exception
      */
     public function __construct($message = '', $line = -1)
     {
-        $message = sprintf('PHP Parse error: %s', $message);
+        $message = \sprintf('PHP Parse error: %s', $message);
         parent::__construct($message, $line);
     }
 
diff --git a/vendor/psy/psysh/src/Exception/ThrowUpException.php b/vendor/psy/psysh/src/Exception/ThrowUpException.php
index 8c3eb06c..b0ca490a 100644
--- a/vendor/psy/psysh/src/Exception/ThrowUpException.php
+++ b/vendor/psy/psysh/src/Exception/ThrowUpException.php
@@ -21,7 +21,7 @@ class ThrowUpException extends \Exception implements Exception
      */
     public function __construct(\Exception $exception)
     {
-        $message = sprintf("Throwing %s with message '%s'", get_class($exception), $exception->getMessage());
+        $message = \sprintf("Throwing %s with message '%s'", \get_class($exception), $exception->getMessage());
         parent::__construct($message, $exception->getCode(), $exception);
     }
 
diff --git a/vendor/psy/psysh/src/Exception/TypeErrorException.php b/vendor/psy/psysh/src/Exception/TypeErrorException.php
index 9dbdb936..b6894983 100644
--- a/vendor/psy/psysh/src/Exception/TypeErrorException.php
+++ b/vendor/psy/psysh/src/Exception/TypeErrorException.php
@@ -27,8 +27,8 @@ class TypeErrorException extends \Exception implements Exception
     public function __construct($message = '', $code = 0)
     {
         $this->rawMessage = $message;
-        $message = preg_replace('/, called in .*?: eval\\(\\)\'d code/', '', $message);
-        parent::__construct(sprintf('TypeError: %s', $message), $code);
+        $message = \preg_replace('/, called in .*?: eval\\(\\)\'d code/', '', $message);
+        parent::__construct(\sprintf('TypeError: %s', $message), $code);
     }
 
     /**
diff --git a/vendor/psy/psysh/src/ExecutionClosure.php b/vendor/psy/psysh/src/ExecutionClosure.php
index 29a3bcc6..5c7cd25a 100644
--- a/vendor/psy/psysh/src/ExecutionClosure.php
+++ b/vendor/psy/psysh/src/ExecutionClosure.php
@@ -28,42 +28,42 @@ class ExecutionClosure
         $this->setClosure($__psysh__, function () use ($__psysh__) {
             try {
                 // Restore execution scope variables
-                extract($__psysh__->getScopeVariables(false));
+                \extract($__psysh__->getScopeVariables(false));
 
                 // Buffer stdout; we'll need it later
-                ob_start([$__psysh__, 'writeStdout'], 1);
+                \ob_start([$__psysh__, 'writeStdout'], 1);
 
                 // Convert all errors to exceptions
-                set_error_handler([$__psysh__, 'handleError']);
+                \set_error_handler([$__psysh__, 'handleError']);
 
                 // Evaluate the current code buffer
                 $_ = eval($__psysh__->onExecute($__psysh__->flushCode() ?: ExecutionClosure::NOOP_INPUT));
             } catch (\Throwable $_e) {
                 // Clean up on our way out.
-                restore_error_handler();
-                if (ob_get_level() > 0) {
-                    ob_end_clean();
+                \restore_error_handler();
+                if (\ob_get_level() > 0) {
+                    \ob_end_clean();
                 }
 
                 throw $_e;
             } catch (\Exception $_e) {
                 // Clean up on our way out.
-                restore_error_handler();
-                if (ob_get_level() > 0) {
-                    ob_end_clean();
+                \restore_error_handler();
+                if (\ob_get_level() > 0) {
+                    \ob_end_clean();
                 }
 
                 throw $_e;
             }
 
             // Won't be needing this anymore
-            restore_error_handler();
+            \restore_error_handler();
 
             // Flush stdout (write to shell output, plus save to magic variable)
-            ob_end_flush();
+            \ob_end_flush();
 
             // Save execution scope variables for next time
-            $__psysh__->setScopeVariables(get_defined_vars());
+            $__psysh__->setScopeVariables(\get_defined_vars());
 
             return $_;
         });
@@ -79,8 +79,8 @@ class ExecutionClosure
     {
         if (self::shouldBindClosure()) {
             $that = $shell->getBoundObject();
-            if (is_object($that)) {
-                $closure = $closure->bindTo($that, get_class($that));
+            if (\is_object($that)) {
+                $closure = $closure->bindTo($that, \get_class($that));
             } else {
                 $closure = $closure->bindTo(null, $shell->getBoundClass());
             }
@@ -110,8 +110,8 @@ class ExecutionClosure
     {
         // skip binding on HHVM < 3.5.0
         // see https://github.com/facebook/hhvm/issues/1203
-        if (defined('HHVM_VERSION')) {
-            return version_compare(HHVM_VERSION, '3.5.0', '>=');
+        if (\defined('HHVM_VERSION')) {
+            return \version_compare(HHVM_VERSION, '3.5.0', '>=');
         }
 
         return true;
diff --git a/vendor/psy/psysh/src/ExecutionLoop.php b/vendor/psy/psysh/src/ExecutionLoop.php
index eacd1d3c..2e4307cb 100644
--- a/vendor/psy/psysh/src/ExecutionLoop.php
+++ b/vendor/psy/psysh/src/ExecutionLoop.php
@@ -42,7 +42,7 @@ class ExecutionLoop
     {
         // Load user-defined includes
         $load = function (Shell $__psysh__) {
-            set_error_handler([$__psysh__, 'handleError']);
+            \set_error_handler([$__psysh__, 'handleError']);
             foreach ($__psysh__->getIncludes() as $__psysh_include__) {
                 try {
                     include $__psysh_include__;
@@ -52,14 +52,14 @@ class ExecutionLoop
                     $__psysh__->writeException($_e);
                 }
             }
-            restore_error_handler();
+            \restore_error_handler();
             unset($__psysh_include__);
 
             // Override any new local variables with pre-defined scope variables
-            extract($__psysh__->getScopeVariables(false));
+            \extract($__psysh__->getScopeVariables(false));
 
             // ... then add the whole mess of variables back.
-            $__psysh__->setScopeVariables(get_defined_vars());
+            $__psysh__->setScopeVariables(\get_defined_vars());
         };
 
         $load($shell);
diff --git a/vendor/psy/psysh/src/ExecutionLoop/ProcessForker.php b/vendor/psy/psysh/src/ExecutionLoop/ProcessForker.php
index 2e645032..47047959 100644
--- a/vendor/psy/psysh/src/ExecutionLoop/ProcessForker.php
+++ b/vendor/psy/psysh/src/ExecutionLoop/ProcessForker.php
@@ -33,7 +33,7 @@ class ProcessForker extends AbstractListener
      */
     public static function isSupported()
     {
-        return function_exists('pcntl_signal') && function_exists('posix_getpid');
+        return \function_exists('pcntl_signal') && \function_exists('posix_getpid');
     }
 
     /**
@@ -46,20 +46,20 @@ class ProcessForker extends AbstractListener
      */
     public function beforeRun(Shell $shell)
     {
-        list($up, $down) = stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, STREAM_IPPROTO_IP);
+        list($up, $down) = \stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, STREAM_IPPROTO_IP);
 
         if (!$up) {
             throw new \RuntimeException('Unable to create socket pair');
         }
 
-        $pid = pcntl_fork();
+        $pid = \pcntl_fork();
         if ($pid < 0) {
             throw new \RuntimeException('Unable to start execution loop');
         } elseif ($pid > 0) {
             // This is the main thread. We'll just wait for a while.
 
             // We won't be needing this one.
-            fclose($up);
+            \fclose($up);
 
             // Wait for a return value from the loop process.
             $read   = [$down];
@@ -67,40 +67,40 @@ class ProcessForker extends AbstractListener
             $except = null;
 
             do {
-                $n = @stream_select($read, $write, $except, null);
+                $n = @\stream_select($read, $write, $except, null);
 
                 if ($n === 0) {
                     throw new \RuntimeException('Process timed out waiting for execution loop');
                 }
 
                 if ($n === false) {
-                    $err = error_get_last();
-                    if (!isset($err['message']) || stripos($err['message'], 'interrupted system call') === false) {
+                    $err = \error_get_last();
+                    if (!isset($err['message']) || \stripos($err['message'], 'interrupted system call') === false) {
                         $msg = $err['message'] ?
-                            sprintf('Error waiting for execution loop: %s', $err['message']) :
+                            \sprintf('Error waiting for execution loop: %s', $err['message']) :
                             'Error waiting for execution loop';
                         throw new \RuntimeException($msg);
                     }
                 }
             } while ($n < 1);
 
-            $content = stream_get_contents($down);
-            fclose($down);
+            $content = \stream_get_contents($down);
+            \fclose($down);
 
             if ($content) {
-                $shell->setScopeVariables(@unserialize($content));
+                $shell->setScopeVariables(@\unserialize($content));
             }
 
             throw new BreakException('Exiting main thread');
         }
 
         // This is the child process. It's going to do all the work.
-        if (function_exists('setproctitle')) {
+        if (\function_exists('setproctitle')) {
             setproctitle('psysh (loop)');
         }
 
         // We won't be needing this one.
-        fclose($down);
+        \fclose($down);
 
         // Save this; we'll need to close it in `afterRun`
         $this->up = $up;
@@ -125,8 +125,8 @@ class ProcessForker extends AbstractListener
     {
         // if there's an old savegame hanging around, let's kill it.
         if (isset($this->savegame)) {
-            posix_kill($this->savegame, SIGKILL);
-            pcntl_signal_dispatch();
+            \posix_kill($this->savegame, SIGKILL);
+            \pcntl_signal_dispatch();
         }
     }
 
@@ -140,10 +140,10 @@ class ProcessForker extends AbstractListener
     {
         // We're a child thread. Send the scope variables back up to the main thread.
         if (isset($this->up)) {
-            fwrite($this->up, $this->serializeReturn($shell->getScopeVariables(false)));
-            fclose($this->up);
+            \fwrite($this->up, $this->serializeReturn($shell->getScopeVariables(false)));
+            \fclose($this->up);
 
-            posix_kill(posix_getpid(), SIGKILL);
+            \posix_kill(\posix_getpid(), SIGKILL);
         }
     }
 
@@ -157,18 +157,18 @@ class ProcessForker extends AbstractListener
     private function createSavegame()
     {
         // the current process will become the savegame
-        $this->savegame = posix_getpid();
+        $this->savegame = \posix_getpid();
 
-        $pid = pcntl_fork();
+        $pid = \pcntl_fork();
         if ($pid < 0) {
             throw new \RuntimeException('Unable to create savegame fork');
         } elseif ($pid > 0) {
             // we're the savegame now... let's wait and see what happens
-            pcntl_waitpid($pid, $status);
+            \pcntl_waitpid($pid, $status);
 
             // worker exited cleanly, let's bail
-            if (!pcntl_wexitstatus($status)) {
-                posix_kill(posix_getpid(), SIGKILL);
+            if (!\pcntl_wexitstatus($status)) {
+                \posix_kill(\posix_getpid(), SIGKILL);
             }
 
             // worker didn't exit cleanly, we'll need to have another go
@@ -199,12 +199,12 @@ class ProcessForker extends AbstractListener
             }
 
             // Resources and Closures don't error, but they don't serialize well either.
-            if (is_resource($value) || $value instanceof \Closure) {
+            if (\is_resource($value) || $value instanceof \Closure) {
                 continue;
             }
 
             try {
-                @serialize($value);
+                @\serialize($value);
                 $serializable[$key] = $value;
             } catch (\Throwable $e) {
                 // we'll just ignore this one...
@@ -214,6 +214,6 @@ class ProcessForker extends AbstractListener
             }
         }
 
-        return @serialize($serializable);
+        return @\serialize($serializable);
     }
 }
diff --git a/vendor/psy/psysh/src/ExecutionLoop/RunkitReloader.php b/vendor/psy/psysh/src/ExecutionLoop/RunkitReloader.php
index 5706b79a..d80480b0 100644
--- a/vendor/psy/psysh/src/ExecutionLoop/RunkitReloader.php
+++ b/vendor/psy/psysh/src/ExecutionLoop/RunkitReloader.php
@@ -30,7 +30,7 @@ class RunkitReloader extends AbstractListener
      */
     public static function isSupported()
     {
-        return extension_loaded('runkit');
+        return \extension_loaded('runkit');
     }
 
     /**
@@ -62,11 +62,11 @@ class RunkitReloader extends AbstractListener
      */
     private function reload(Shell $shell)
     {
-        clearstatcache();
+        \clearstatcache();
         $modified = [];
 
-        foreach (get_included_files() as $file) {
-            $timestamp = filemtime($file);
+        foreach (\get_included_files() as $file) {
+            $timestamp = \filemtime($file);
 
             if (!isset($this->timestamps[$file])) {
                 $this->timestamps[$file] = $timestamp;
@@ -78,7 +78,7 @@ class RunkitReloader extends AbstractListener
             }
 
             if (!$this->lintFile($file)) {
-                $msg = sprintf('Modified file "%s" could not be reloaded', $file);
+                $msg = \sprintf('Modified file "%s" could not be reloaded', $file);
                 $shell->writeException(new ParseErrorException($msg));
                 continue;
             }
@@ -125,7 +125,7 @@ class RunkitReloader extends AbstractListener
     {
         // first try to parse it
         try {
-            $this->parser->parse(file_get_contents($file));
+            $this->parser->parse(\file_get_contents($file));
         } catch (\Exception $e) {
             return false;
         }
diff --git a/vendor/psy/psysh/src/ExecutionLoopClosure.php b/vendor/psy/psysh/src/ExecutionLoopClosure.php
index e34848ed..5b8238cf 100644
--- a/vendor/psy/psysh/src/ExecutionLoopClosure.php
+++ b/vendor/psy/psysh/src/ExecutionLoopClosure.php
@@ -31,7 +31,7 @@ class ExecutionLoopClosure extends ExecutionClosure
     {
         $this->setClosure($__psysh__, function () use ($__psysh__) {
             // Restore execution scope variables
-            extract($__psysh__->getScopeVariables(false));
+            \extract($__psysh__->getScopeVariables(false));
 
             do {
                 $__psysh__->beforeLoop();
@@ -40,40 +40,45 @@ class ExecutionLoopClosure extends ExecutionClosure
                     $__psysh__->getInput();
 
                     try {
+                        // Pull in any new execution scope variables
+                        if ($__psysh__->getLastExecSuccess()) {
+                            \extract($__psysh__->getScopeVariablesDiff(\get_defined_vars()));
+                        }
+
                         // Buffer stdout; we'll need it later
-                        ob_start([$__psysh__, 'writeStdout'], 1);
+                        \ob_start([$__psysh__, 'writeStdout'], 1);
 
                         // Convert all errors to exceptions
-                        set_error_handler([$__psysh__, 'handleError']);
+                        \set_error_handler([$__psysh__, 'handleError']);
 
                         // Evaluate the current code buffer
                         $_ = eval($__psysh__->onExecute($__psysh__->flushCode() ?: ExecutionClosure::NOOP_INPUT));
                     } catch (\Throwable $_e) {
                         // Clean up on our way out.
-                        restore_error_handler();
-                        if (ob_get_level() > 0) {
-                            ob_end_clean();
+                        \restore_error_handler();
+                        if (\ob_get_level() > 0) {
+                            \ob_end_clean();
                         }
 
                         throw $_e;
                     } catch (\Exception $_e) {
                         // Clean up on our way out.
-                        restore_error_handler();
-                        if (ob_get_level() > 0) {
-                            ob_end_clean();
+                        \restore_error_handler();
+                        if (\ob_get_level() > 0) {
+                            \ob_end_clean();
                         }
 
                         throw $_e;
                     }
 
                     // Won't be needing this anymore
-                    restore_error_handler();
+                    \restore_error_handler();
 
                     // Flush stdout (write to shell output, plus save to magic variable)
-                    ob_end_flush();
+                    \ob_end_flush();
 
                     // Save execution scope variables for next time
-                    $__psysh__->setScopeVariables(get_defined_vars());
+                    $__psysh__->setScopeVariables(\get_defined_vars());
 
                     $__psysh__->writeReturnValue($_);
                 } catch (BreakException $_e) {
diff --git a/vendor/psy/psysh/src/Formatter/CodeFormatter.php b/vendor/psy/psysh/src/Formatter/CodeFormatter.php
index 5ef195df..2ac37cc9 100644
--- a/vendor/psy/psysh/src/Formatter/CodeFormatter.php
+++ b/vendor/psy/psysh/src/Formatter/CodeFormatter.php
@@ -38,11 +38,11 @@ class CodeFormatter implements Formatter
         $colorMode = $colorMode ?: Configuration::COLOR_MODE_AUTO;
 
         if ($fileName = $reflector->getFileName()) {
-            if (!is_file($fileName)) {
+            if (!\is_file($fileName)) {
                 throw new RuntimeException('Source code unavailable');
             }
 
-            $file  = file_get_contents($fileName);
+            $file  = \file_get_contents($fileName);
             $start = $reflector->getStartLine();
             $end   = $reflector->getEndLine() - $start;
 
diff --git a/vendor/psy/psysh/src/Formatter/DocblockFormatter.php b/vendor/psy/psysh/src/Formatter/DocblockFormatter.php
index 33f450e1..39ea60e5 100644
--- a/vendor/psy/psysh/src/Formatter/DocblockFormatter.php
+++ b/vendor/psy/psysh/src/Formatter/DocblockFormatter.php
@@ -45,20 +45,20 @@ class DocblockFormatter implements Formatter
         if (!empty($docblock->tags)) {
             foreach ($docblock::$vectors as $name => $vector) {
                 if (isset($docblock->tags[$name])) {
-                    $chunks[] = sprintf('<comment>%s:</comment>', self::inflect($name));
+                    $chunks[] = \sprintf('<comment>%s:</comment>', self::inflect($name));
                     $chunks[] = self::formatVector($vector, $docblock->tags[$name]);
                     $chunks[] = '';
                 }
             }
 
-            $tags = self::formatTags(array_keys($docblock::$vectors), $docblock->tags);
+            $tags = self::formatTags(\array_keys($docblock::$vectors), $docblock->tags);
             if (!empty($tags)) {
                 $chunks[] = $tags;
                 $chunks[] = '';
             }
         }
 
-        return rtrim(implode("\n", $chunks));
+        return \rtrim(\implode("\n", $chunks));
     }
 
     /**
@@ -78,7 +78,7 @@ class DocblockFormatter implements Formatter
             $max = 0;
             foreach ($lines as $line) {
                 $chunk = $line[$type];
-                $cur = empty($chunk) ? 0 : strlen($chunk) + 1;
+                $cur = empty($chunk) ? 0 : \strlen($chunk) + 1;
                 if ($cur > $max) {
                     $max = $cur;
                 }
@@ -86,12 +86,12 @@ class DocblockFormatter implements Formatter
 
             $template[] = self::getVectorParamTemplate($type, $max);
         }
-        $template = implode(' ', $template);
+        $template = \implode(' ', $template);
 
-        return implode("\n", array_map(function ($line) use ($template) {
-            $escaped = array_map(['Symfony\Component\Console\Formatter\OutputFormatter', 'escape'], $line);
+        return \implode("\n", \array_map(function ($line) use ($template) {
+            $escaped = \array_map(['Symfony\Component\Console\Formatter\OutputFormatter', 'escape'], $line);
 
-            return rtrim(vsprintf($template, $escaped));
+            return \rtrim(\vsprintf($template, $escaped));
         }, $lines));
     }
 
@@ -108,18 +108,18 @@ class DocblockFormatter implements Formatter
         $chunks = [];
 
         foreach ($tags as $name => $values) {
-            if (in_array($name, $skip)) {
+            if (\in_array($name, $skip)) {
                 continue;
             }
 
             foreach ($values as $value) {
-                $chunks[] = sprintf('<comment>%s%s</comment> %s', self::inflect($name), empty($value) ? '' : ':', OutputFormatter::escape($value));
+                $chunks[] = \sprintf('<comment>%s%s</comment> %s', self::inflect($name), empty($value) ? '' : ':', OutputFormatter::escape($value));
             }
 
             $chunks[] = '';
         }
 
-        return implode("\n", $chunks);
+        return \implode("\n", $chunks);
     }
 
     /**
@@ -133,10 +133,10 @@ class DocblockFormatter implements Formatter
     private static function getVectorParamTemplate($type, $max)
     {
         if (!isset(self::$vectorParamTemplates[$type])) {
-            return sprintf('%%-%ds', $max);
+            return \sprintf('%%-%ds', $max);
         }
 
-        return sprintf('<%s>%%-%ds</%s>', self::$vectorParamTemplates[$type], $max, self::$vectorParamTemplates[$type]);
+        return \sprintf('<%s>%%-%ds</%s>', self::$vectorParamTemplates[$type], $max, self::$vectorParamTemplates[$type]);
     }
 
     /**
@@ -149,7 +149,7 @@ class DocblockFormatter implements Formatter
      */
     private static function indent($text, $indent = '  ')
     {
-        return $indent . str_replace("\n", "\n" . $indent, $text);
+        return $indent . \str_replace("\n", "\n" . $indent, $text);
     }
 
     /**
@@ -161,8 +161,8 @@ class DocblockFormatter implements Formatter
      */
     private static function inflect($text)
     {
-        $words = trim(preg_replace('/[\s_-]+/', ' ', preg_replace('/([a-z])([A-Z])/', '$1 $2', $text)));
+        $words = \trim(\preg_replace('/[\s_-]+/', ' ', \preg_replace('/([a-z])([A-Z])/', '$1 $2', $text)));
 
-        return implode(' ', array_map('ucfirst', explode(' ', $words)));
+        return \implode(' ', \array_map('ucfirst', \explode(' ', $words)));
     }
 }
diff --git a/vendor/psy/psysh/src/Formatter/SignatureFormatter.php b/vendor/psy/psysh/src/Formatter/SignatureFormatter.php
index 2a83ad1c..ec8725d9 100644
--- a/vendor/psy/psysh/src/Formatter/SignatureFormatter.php
+++ b/vendor/psy/psysh/src/Formatter/SignatureFormatter.php
@@ -56,7 +56,7 @@ class SignatureFormatter implements Formatter
                 return self::formatConstant($reflector);
 
             default:
-                throw new \InvalidArgumentException('Unexpected Reflector class: ' . get_class($reflector));
+                throw new \InvalidArgumentException('Unexpected Reflector class: ' . \get_class($reflector));
         }
     }
 
@@ -84,13 +84,13 @@ class SignatureFormatter implements Formatter
         if ($reflector instanceof \ReflectionClass && $reflector->isTrait()) {
             // For some reason, PHP 5.x returns `abstract public` modifiers for
             // traits. Let's just ignore that business entirely.
-            if (version_compare(PHP_VERSION, '7.0.0', '<')) {
+            if (\version_compare(PHP_VERSION, '7.0.0', '<')) {
                 return [];
             }
         }
 
-        return implode(' ', array_map(function ($modifier) {
-            return sprintf('<keyword>%s</keyword>', $modifier);
+        return \implode(' ', \array_map(function ($modifier) {
+            return \sprintf('<keyword>%s</keyword>', $modifier);
         }, \Reflection::getModifierNames($reflector->getModifiers())));
     }
 
@@ -115,24 +115,24 @@ class SignatureFormatter implements Formatter
             $chunks[] = $reflector->isInterface() ? 'interface' : 'class';
         }
 
-        $chunks[] = sprintf('<class>%s</class>', self::formatName($reflector));
+        $chunks[] = \sprintf('<class>%s</class>', self::formatName($reflector));
 
         if ($parent = $reflector->getParentClass()) {
             $chunks[] = 'extends';
-            $chunks[] = sprintf('<class>%s</class>', $parent->getName());
+            $chunks[] = \sprintf('<class>%s</class>', $parent->getName());
         }
 
         $interfaces = $reflector->getInterfaceNames();
         if (!empty($interfaces)) {
-            sort($interfaces);
+            \sort($interfaces);
 
             $chunks[] = 'implements';
-            $chunks[] = implode(', ', array_map(function ($name) {
-                return sprintf('<class>%s</class>', $name);
+            $chunks[] = \implode(', ', \array_map(function ($name) {
+                return \sprintf('<class>%s</class>', $name);
             }, $interfaces));
         }
 
-        return implode(' ', $chunks);
+        return \implode(' ', $chunks);
     }
 
     /**
@@ -147,7 +147,7 @@ class SignatureFormatter implements Formatter
         $value = $reflector->getValue();
         $style = self::getTypeStyle($value);
 
-        return sprintf(
+        return \sprintf(
             '<keyword>const</keyword> <const>%s</const> = <%s>%s</%s>',
             self::formatName($reflector),
             $style,
@@ -168,7 +168,7 @@ class SignatureFormatter implements Formatter
         $value = $reflector->getValue();
         $style = self::getTypeStyle($value);
 
-        return sprintf(
+        return \sprintf(
             '<keyword>define</keyword>(<string>%s</string>, <%s>%s</%s>)',
             OutputFormatter::escape(Json::encode($reflector->getName())),
             $style,
@@ -186,11 +186,11 @@ class SignatureFormatter implements Formatter
      */
     private static function getTypeStyle($value)
     {
-        if (is_int($value) || is_float($value)) {
+        if (\is_int($value) || \is_float($value)) {
             return 'number';
-        } elseif (is_string($value)) {
+        } elseif (\is_string($value)) {
             return 'string';
-        } elseif (is_bool($value) || is_null($value)) {
+        } elseif (\is_bool($value) || \is_null($value)) {
             return 'bool';
         } else {
             return 'strong'; // @codeCoverageIgnore
@@ -206,7 +206,7 @@ class SignatureFormatter implements Formatter
      */
     private static function formatProperty(\ReflectionProperty $reflector)
     {
-        return sprintf(
+        return \sprintf(
             '%s <strong>$%s</strong>',
             self::formatModifiers($reflector),
             $reflector->getName()
@@ -222,11 +222,11 @@ class SignatureFormatter implements Formatter
      */
     private static function formatFunction(\ReflectionFunctionAbstract $reflector)
     {
-        return sprintf(
+        return \sprintf(
             '<keyword>function</keyword> %s<function>%s</function>(%s)',
             $reflector->returnsReference() ? '&' : '',
             self::formatName($reflector),
-            implode(', ', self::formatFunctionParams($reflector))
+            \implode(', ', self::formatFunctionParams($reflector))
         );
     }
 
@@ -239,7 +239,7 @@ class SignatureFormatter implements Formatter
      */
     private static function formatMethod(\ReflectionMethod $reflector)
     {
-        return sprintf(
+        return \sprintf(
             '%s %s',
             self::formatModifiers($reflector),
             self::formatFunction($reflector)
@@ -262,7 +262,7 @@ class SignatureFormatter implements Formatter
                 if ($param->isArray()) {
                     $hint = '<keyword>array</keyword> ';
                 } elseif ($class = $param->getClass()) {
-                    $hint = sprintf('<class>%s</class> ', $class->getName());
+                    $hint = \sprintf('<class>%s</class> ', $class->getName());
                 }
             } catch (\Exception $e) {
                 // sometimes we just don't know...
@@ -272,11 +272,11 @@ class SignatureFormatter implements Formatter
                 // Hax: we'll try to extract it :P
 
                 // @codeCoverageIgnoreStart
-                $chunks = explode('$' . $param->getName(), (string) $param);
-                $chunks = explode(' ', trim($chunks[0]));
-                $guess  = end($chunks);
+                $chunks = \explode('$' . $param->getName(), (string) $param);
+                $chunks = \explode(' ', \trim($chunks[0]));
+                $guess  = \end($chunks);
 
-                $hint = sprintf('<urgent>%s</urgent> ', $guess);
+                $hint = \sprintf('<urgent>%s</urgent> ', $guess);
                 // @codeCoverageIgnoreEnd
             }
 
@@ -287,14 +287,14 @@ class SignatureFormatter implements Formatter
                 } else {
                     $value     = $param->getDefaultValue();
                     $typeStyle = self::getTypeStyle($value);
-                    $value     = is_array($value) ? 'array()' : is_null($value) ? 'null' : var_export($value, true);
+                    $value     = \is_array($value) ? 'array()' : \is_null($value) ? 'null' : \var_export($value, true);
                 }
-                $default = sprintf(' = <%s>%s</%s>', $typeStyle, OutputFormatter::escape($value), $typeStyle);
+                $default = \sprintf(' = <%s>%s</%s>', $typeStyle, OutputFormatter::escape($value), $typeStyle);
             } else {
                 $default = '';
             }
 
-            $params[] = sprintf(
+            $params[] = \sprintf(
                 '%s%s<strong>$%s</strong>%s',
                 $param->isPassedByReference() ? '&' : '',
                 $hint,
diff --git a/vendor/psy/psysh/src/Input/FilterOptions.php b/vendor/psy/psysh/src/Input/FilterOptions.php
index a2ed49d0..d77a04fb 100644
--- a/vendor/psy/psysh/src/Input/FilterOptions.php
+++ b/vendor/psy/psysh/src/Input/FilterOptions.php
@@ -56,7 +56,7 @@ class FilterOptions
         }
 
         if (!$this->stringIsRegex($pattern)) {
-            $pattern = '/' . preg_quote($pattern, '/') . '/';
+            $pattern = '/' . \preg_quote($pattern, '/') . '/';
         }
 
         if ($insensitive = $input->getOption('insensitive')) {
@@ -91,7 +91,7 @@ class FilterOptions
      */
     public function match($string, array &$matches = null)
     {
-        return $this->filter === false || (preg_match($this->pattern, $string, $matches) xor $this->invert);
+        return $this->filter === false || (\preg_match($this->pattern, $string, $matches) xor $this->invert);
     }
 
     /**
@@ -121,7 +121,7 @@ class FilterOptions
      */
     private function stringIsRegex($string)
     {
-        return substr($string, 0, 1) === '/' && substr($string, -1) === '/' && strlen($string) >= 3;
+        return \substr($string, 0, 1) === '/' && \substr($string, -1) === '/' && \strlen($string) >= 3;
     }
 
     /**
@@ -133,13 +133,13 @@ class FilterOptions
      */
     private function validateRegex($pattern)
     {
-        set_error_handler(['Psy\Exception\ErrorException', 'throwException']);
+        \set_error_handler(['Psy\Exception\ErrorException', 'throwException']);
         try {
-            preg_match($pattern, '');
+            \preg_match($pattern, '');
         } catch (ErrorException $e) {
-            restore_error_handler();
-            throw new RuntimeException(str_replace('preg_match(): ', 'Invalid regular expression: ', $e->getRawMessage()));
+            \restore_error_handler();
+            throw new RuntimeException(\str_replace('preg_match(): ', 'Invalid regular expression: ', $e->getRawMessage()));
         }
-        restore_error_handler();
+        \restore_error_handler();
     }
 }
diff --git a/vendor/psy/psysh/src/Input/ShellInput.php b/vendor/psy/psysh/src/Input/ShellInput.php
index 7141d2d4..8675f4d1 100644
--- a/vendor/psy/psysh/src/Input/ShellInput.php
+++ b/vendor/psy/psysh/src/Input/ShellInput.php
@@ -51,10 +51,10 @@ class ShellInput extends StringInput
 
         if ($definition->getArgumentCount() > 0) {
             $args    = $definition->getArguments();
-            $lastArg = array_pop($args);
+            $lastArg = \array_pop($args);
             foreach ($args as $arg) {
                 if ($arg instanceof CodeArgument) {
-                    $msg = sprintf('Unexpected CodeArgument before the final position: %s', $arg->getName());
+                    $msg = \sprintf('Unexpected CodeArgument before the final position: %s', $arg->getName());
                     throw new \InvalidArgumentException($msg);
                 }
             }
@@ -84,33 +84,33 @@ class ShellInput extends StringInput
     private function tokenize($input)
     {
         $tokens = [];
-        $length = strlen($input);
+        $length = \strlen($input);
         $cursor = 0;
         while ($cursor < $length) {
-            if (preg_match('/\s+/A', $input, $match, null, $cursor)) {
-            } elseif (preg_match('/([^="\'\s]+?)(=?)(' . StringInput::REGEX_QUOTED_STRING . '+)/A', $input, $match, null, $cursor)) {
+            if (\preg_match('/\s+/A', $input, $match, null, $cursor)) {
+            } elseif (\preg_match('/([^="\'\s]+?)(=?)(' . StringInput::REGEX_QUOTED_STRING . '+)/A', $input, $match, null, $cursor)) {
                 $tokens[] = [
-                    $match[1] . $match[2] . stripcslashes(str_replace(['"\'', '\'"', '\'\'', '""'], '', substr($match[3], 1, strlen($match[3]) - 2))),
-                    stripcslashes(substr($input, $cursor)),
+                    $match[1] . $match[2] . \stripcslashes(\str_replace(['"\'', '\'"', '\'\'', '""'], '', \substr($match[3], 1, \strlen($match[3]) - 2))),
+                    \stripcslashes(\substr($input, $cursor)),
                 ];
-            } elseif (preg_match('/' . StringInput::REGEX_QUOTED_STRING . '/A', $input, $match, null, $cursor)) {
+            } elseif (\preg_match('/' . StringInput::REGEX_QUOTED_STRING . '/A', $input, $match, null, $cursor)) {
                 $tokens[] = [
-                    stripcslashes(substr($match[0], 1, strlen($match[0]) - 2)),
-                    stripcslashes(substr($input, $cursor)),
+                    \stripcslashes(\substr($match[0], 1, \strlen($match[0]) - 2)),
+                    \stripcslashes(\substr($input, $cursor)),
                 ];
-            } elseif (preg_match('/' . StringInput::REGEX_STRING . '/A', $input, $match, null, $cursor)) {
+            } elseif (\preg_match('/' . StringInput::REGEX_STRING . '/A', $input, $match, null, $cursor)) {
                 $tokens[] = [
-                    stripcslashes($match[1]),
-                    stripcslashes(substr($input, $cursor)),
+                    \stripcslashes($match[1]),
+                    \stripcslashes(\substr($input, $cursor)),
                 ];
             } else {
                 // should never happen
                 // @codeCoverageIgnoreStart
-                throw new \InvalidArgumentException(sprintf('Unable to parse input near "... %s ..."', substr($input, $cursor, 10)));
+                throw new \InvalidArgumentException(\sprintf('Unable to parse input near "... %s ..."', \substr($input, $cursor, 10)));
                 // @codeCoverageIgnoreEnd
             }
 
-            $cursor += strlen($match[0]);
+            $cursor += \strlen($match[0]);
         }
 
         return $tokens;
@@ -123,7 +123,7 @@ class ShellInput extends StringInput
     {
         $parseOptions = true;
         $this->parsed = $this->tokenPairs;
-        while (null !== $tokenPair = array_shift($this->parsed)) {
+        while (null !== $tokenPair = \array_shift($this->parsed)) {
             // token is what you'd expect. rest is the remainder of the input
             // string, including token, and will be used if this is a code arg.
             list($token, $rest) = $tokenPair;
@@ -132,7 +132,7 @@ class ShellInput extends StringInput
                 $this->parseShellArgument($token, $rest);
             } elseif ($parseOptions && '--' === $token) {
                 $parseOptions = false;
-            } elseif ($parseOptions && 0 === strpos($token, '--')) {
+            } elseif ($parseOptions && 0 === \strpos($token, '--')) {
                 $this->parseLongOption($token);
             } elseif ($parseOptions && '-' === $token[0] && '-' !== $token) {
                 $this->parseShortOption($token);
@@ -152,7 +152,7 @@ class ShellInput extends StringInput
      */
     private function parseShellArgument($token, $rest)
     {
-        $c = count($this->arguments);
+        $c = \count($this->arguments);
 
         // if input is expecting another argument, add it
         if ($this->definition->hasArgument($c)) {
@@ -184,11 +184,11 @@ class ShellInput extends StringInput
 
         // unexpected argument
         $all = $this->definition->getArguments();
-        if (count($all)) {
-            throw new \RuntimeException(sprintf('Too many arguments, expected arguments "%s".', implode('" "', array_keys($all))));
+        if (\count($all)) {
+            throw new \RuntimeException(\sprintf('Too many arguments, expected arguments "%s".', \implode('" "', \array_keys($all))));
         }
 
-        throw new \RuntimeException(sprintf('No arguments expected, got "%s".', $token));
+        throw new \RuntimeException(\sprintf('No arguments expected, got "%s".', $token));
         // @codeCoverageIgnoreEnd
     }
 
@@ -202,12 +202,12 @@ class ShellInput extends StringInput
      */
     private function parseShortOption($token)
     {
-        $name = substr($token, 1);
+        $name = \substr($token, 1);
 
-        if (strlen($name) > 1) {
+        if (\strlen($name) > 1) {
             if ($this->definition->hasShortcut($name[0]) && $this->definition->getOptionForShortcut($name[0])->acceptValue()) {
                 // an option with a value (with no space)
-                $this->addShortOption($name[0], substr($name, 1));
+                $this->addShortOption($name[0], \substr($name, 1));
             } else {
                 $this->parseShortOptionSet($name);
             }
@@ -225,15 +225,15 @@ class ShellInput extends StringInput
      */
     private function parseShortOptionSet($name)
     {
-        $len = strlen($name);
+        $len = \strlen($name);
         for ($i = 0; $i < $len; $i++) {
             if (!$this->definition->hasShortcut($name[$i])) {
-                throw new \RuntimeException(sprintf('The "-%s" option does not exist.', $name[$i]));
+                throw new \RuntimeException(\sprintf('The "-%s" option does not exist.', $name[$i]));
             }
 
             $option = $this->definition->getOptionForShortcut($name[$i]);
             if ($option->acceptValue()) {
-                $this->addLongOption($option->getName(), $i === $len - 1 ? null : substr($name, $i + 1));
+                $this->addLongOption($option->getName(), $i === $len - 1 ? null : \substr($name, $i + 1));
 
                 break;
             } else {
@@ -249,18 +249,18 @@ class ShellInput extends StringInput
      */
     private function parseLongOption($token)
     {
-        $name = substr($token, 2);
+        $name = \substr($token, 2);
 
-        if (false !== $pos = strpos($name, '=')) {
-            if (0 === strlen($value = substr($name, $pos + 1))) {
+        if (false !== $pos = \strpos($name, '=')) {
+            if (0 === \strlen($value = \substr($name, $pos + 1))) {
                 // if no value after "=" then substr() returns "" since php7 only, false before
                 // see http://php.net/manual/fr/migration70.incompatible.php#119151
                 if (PHP_VERSION_ID < 70000 && false === $value) {
                     $value = '';
                 }
-                array_unshift($this->parsed, [$value, null]);
+                \array_unshift($this->parsed, [$value, null]);
             }
-            $this->addLongOption(substr($name, 0, $pos), $value);
+            $this->addLongOption(\substr($name, 0, $pos), $value);
         } else {
             $this->addLongOption($name, null);
         }
@@ -277,7 +277,7 @@ class ShellInput extends StringInput
     private function addShortOption($shortcut, $value)
     {
         if (!$this->definition->hasShortcut($shortcut)) {
-            throw new \RuntimeException(sprintf('The "-%s" option does not exist.', $shortcut));
+            throw new \RuntimeException(\sprintf('The "-%s" option does not exist.', $shortcut));
         }
 
         $this->addLongOption($this->definition->getOptionForShortcut($shortcut)->getName(), $value);
@@ -294,30 +294,30 @@ class ShellInput extends StringInput
     private function addLongOption($name, $value)
     {
         if (!$this->definition->hasOption($name)) {
-            throw new \RuntimeException(sprintf('The "--%s" option does not exist.', $name));
+            throw new \RuntimeException(\sprintf('The "--%s" option does not exist.', $name));
         }
 
         $option = $this->definition->getOption($name);
 
         if (null !== $value && !$option->acceptValue()) {
-            throw new \RuntimeException(sprintf('The "--%s" option does not accept a value.', $name));
+            throw new \RuntimeException(\sprintf('The "--%s" option does not accept a value.', $name));
         }
 
-        if (in_array($value, ['', null], true) && $option->acceptValue() && count($this->parsed)) {
+        if (\in_array($value, ['', null], true) && $option->acceptValue() && \count($this->parsed)) {
             // if option accepts an optional or mandatory argument
             // let's see if there is one provided
-            $next = array_shift($this->parsed);
+            $next = \array_shift($this->parsed);
             $nextToken = $next[0];
-            if ((isset($nextToken[0]) && '-' !== $nextToken[0]) || in_array($nextToken, ['', null], true)) {
+            if ((isset($nextToken[0]) && '-' !== $nextToken[0]) || \in_array($nextToken, ['', null], true)) {
                 $value = $nextToken;
             } else {
-                array_unshift($this->parsed, $next);
+                \array_unshift($this->parsed, $next);
             }
         }
 
         if (null === $value) {
             if ($option->isValueRequired()) {
-                throw new \RuntimeException(sprintf('The "--%s" option requires a value.', $name));
+                throw new \RuntimeException(\sprintf('The "--%s" option requires a value.', $name));
             }
 
             if (!$option->isArray() && !$option->isValueOptional()) {
diff --git a/vendor/psy/psysh/src/Output/ProcOutputPager.php b/vendor/psy/psysh/src/Output/ProcOutputPager.php
index d8c03028..a047b1c3 100644
--- a/vendor/psy/psysh/src/Output/ProcOutputPager.php
+++ b/vendor/psy/psysh/src/Output/ProcOutputPager.php
@@ -51,14 +51,14 @@ class ProcOutputPager extends StreamOutput implements OutputPager
     public function doWrite($message, $newline)
     {
         $pipe = $this->getPipe();
-        if (false === @fwrite($pipe, $message . ($newline ? PHP_EOL : ''))) {
+        if (false === @\fwrite($pipe, $message . ($newline ? PHP_EOL : ''))) {
             // @codeCoverageIgnoreStart
             // should never happen
             throw new \RuntimeException('Unable to write output');
             // @codeCoverageIgnoreEnd
         }
 
-        fflush($pipe);
+        \fflush($pipe);
     }
 
     /**
@@ -67,11 +67,11 @@ class ProcOutputPager extends StreamOutput implements OutputPager
     public function close()
     {
         if (isset($this->pipe)) {
-            fclose($this->pipe);
+            \fclose($this->pipe);
         }
 
         if (isset($this->proc)) {
-            $exit = proc_close($this->proc);
+            $exit = \proc_close($this->proc);
             if ($exit !== 0) {
                 throw new \RuntimeException('Error closing output stream');
             }
@@ -88,10 +88,10 @@ class ProcOutputPager extends StreamOutput implements OutputPager
     private function getPipe()
     {
         if (!isset($this->pipe) || !isset($this->proc)) {
-            $desc = [['pipe', 'r'], $this->stream, fopen('php://stderr', 'w')];
-            $this->proc = proc_open($this->cmd, $desc, $pipes);
+            $desc = [['pipe', 'r'], $this->stream, \fopen('php://stderr', 'w')];
+            $this->proc = \proc_open($this->cmd, $desc, $pipes);
 
-            if (!is_resource($this->proc)) {
+            if (!\is_resource($this->proc)) {
                 throw new \RuntimeException('Error opening output stream');
             }
 
diff --git a/vendor/psy/psysh/src/Output/ShellOutput.php b/vendor/psy/psysh/src/Output/ShellOutput.php
index e980d387..5881a5c2 100644
--- a/vendor/psy/psysh/src/Output/ShellOutput.php
+++ b/vendor/psy/psysh/src/Output/ShellOutput.php
@@ -41,7 +41,7 @@ class ShellOutput extends ConsoleOutput
 
         if ($pager === null) {
             $this->pager = new PassthruPager($this);
-        } elseif (is_string($pager)) {
+        } elseif (\is_string($pager)) {
             $this->pager = new ProcOutputPager($this, $pager);
         } elseif ($pager instanceof OutputPager) {
             $this->pager = $pager;
@@ -65,17 +65,17 @@ class ShellOutput extends ConsoleOutput
      */
     public function page($messages, $type = 0)
     {
-        if (is_string($messages)) {
+        if (\is_string($messages)) {
             $messages = (array) $messages;
         }
 
-        if (!is_array($messages) && !is_callable($messages)) {
+        if (!\is_array($messages) && !\is_callable($messages)) {
             throw new \InvalidArgumentException('Paged output requires a string, array or callback');
         }
 
         $this->startPaging();
 
-        if (is_callable($messages)) {
+        if (\is_callable($messages)) {
             $messages($this);
         } else {
             $this->write($messages, true, $type);
@@ -122,15 +122,15 @@ class ShellOutput extends ConsoleOutput
         $messages = (array) $messages;
 
         if ($type & self::NUMBER_LINES) {
-            $pad = strlen((string) count($messages));
+            $pad = \strlen((string) \count($messages));
             $template = $this->isDecorated() ? "<aside>%{$pad}s</aside>: %s" : "%{$pad}s: %s";
 
             if ($type & self::OUTPUT_RAW) {
-                $messages = array_map(['Symfony\Component\Console\Formatter\OutputFormatter', 'escape'], $messages);
+                $messages = \array_map(['Symfony\Component\Console\Formatter\OutputFormatter', 'escape'], $messages);
             }
 
             foreach ($messages as $i => $line) {
-                $messages[$i] = sprintf($template, $i, $line);
+                $messages[$i] = \sprintf($template, $i, $line);
             }
 
             // clean this up for super.
diff --git a/vendor/psy/psysh/src/ParserFactory.php b/vendor/psy/psysh/src/ParserFactory.php
index 21427483..263da202 100644
--- a/vendor/psy/psysh/src/ParserFactory.php
+++ b/vendor/psy/psysh/src/ParserFactory.php
@@ -44,7 +44,7 @@ class ParserFactory
      */
     public function hasKindsSupport()
     {
-        return class_exists('PhpParser\ParserFactory');
+        return \class_exists('PhpParser\ParserFactory');
     }
 
     /**
@@ -55,7 +55,7 @@ class ParserFactory
     public function getDefaultKind()
     {
         if ($this->hasKindsSupport()) {
-            return version_compare(PHP_VERSION, '7.0', '>=') ? static::ONLY_PHP7 : static::ONLY_PHP5;
+            return \version_compare(PHP_VERSION, '7.0', '>=') ? static::ONLY_PHP7 : static::ONLY_PHP5;
         }
     }
 
@@ -73,11 +73,11 @@ class ParserFactory
 
             $kind = $kind ?: $this->getDefaultKind();
 
-            if (!in_array($kind, static::getPossibleKinds())) {
+            if (!\in_array($kind, static::getPossibleKinds())) {
                 throw new \InvalidArgumentException('Unknown parser kind');
             }
 
-            $parser = $originalFactory->create(constant('PhpParser\ParserFactory::' . $kind));
+            $parser = $originalFactory->create(\constant('PhpParser\ParserFactory::' . $kind));
         } else {
             if ($kind !== null) {
                 throw new \InvalidArgumentException('Install PHP Parser v2.x to specify parser kind');
diff --git a/vendor/psy/psysh/src/Readline/GNUReadline.php b/vendor/psy/psysh/src/Readline/GNUReadline.php
index e1041220..1cec3c63 100644
--- a/vendor/psy/psysh/src/Readline/GNUReadline.php
+++ b/vendor/psy/psysh/src/Readline/GNUReadline.php
@@ -36,7 +36,7 @@ class GNUReadline implements Readline
      */
     public static function isSupported()
     {
-        return function_exists('readline_list_history');
+        return \function_exists('readline_list_history');
     }
 
     /**
@@ -58,7 +58,7 @@ class GNUReadline implements Readline
      */
     public function addHistory($line)
     {
-        if ($res = readline_add_history($line)) {
+        if ($res = \readline_add_history($line)) {
             $this->writeHistory();
         }
 
@@ -70,7 +70,7 @@ class GNUReadline implements Readline
      */
     public function clearHistory()
     {
-        if ($res = readline_clear_history()) {
+        if ($res = \readline_clear_history()) {
             $this->writeHistory();
         }
 
@@ -96,12 +96,12 @@ class GNUReadline implements Readline
         //
         //     https://github.com/php/php-src/blob/423a057023ef3c00d2ffc16a6b43ba01d0f71796/NEWS#L19-L21
         //
-        if (version_compare(PHP_VERSION, '5.6.7', '>=') || !ini_get('open_basedir')) {
-            readline_read_history();
+        if (\version_compare(PHP_VERSION, '5.6.7', '>=') || !\ini_get('open_basedir')) {
+            \readline_read_history();
         }
-        readline_clear_history();
+        \readline_clear_history();
 
-        return readline_read_history($this->historyFile);
+        return \readline_read_history($this->historyFile);
     }
 
     /**
@@ -109,7 +109,7 @@ class GNUReadline implements Readline
      */
     public function readline($prompt = null)
     {
-        return readline($prompt);
+        return \readline($prompt);
     }
 
     /**
@@ -117,7 +117,7 @@ class GNUReadline implements Readline
      */
     public function redisplay()
     {
-        readline_redisplay();
+        \readline_redisplay();
     }
 
     /**
@@ -128,7 +128,7 @@ class GNUReadline implements Readline
         // We have to write history first, since it is used
         // by Libedit to list history
         if ($this->historyFile !== false) {
-            $res = readline_write_history($this->historyFile);
+            $res = \readline_write_history($this->historyFile);
         } else {
             $res = true;
         }
@@ -144,25 +144,25 @@ class GNUReadline implements Readline
 
         if ($this->eraseDups) {
             // flip-flip technique: removes duplicates, latest entries win.
-            $hist = array_flip(array_flip($hist));
+            $hist = \array_flip(\array_flip($hist));
             // sort on keys to get the order back
-            ksort($hist);
+            \ksort($hist);
         }
 
         if ($this->historySize > 0) {
-            $histsize = count($hist);
+            $histsize = \count($hist);
             if ($histsize > $this->historySize) {
-                $hist = array_slice($hist, $histsize - $this->historySize);
+                $hist = \array_slice($hist, $histsize - $this->historySize);
             }
         }
 
-        readline_clear_history();
+        \readline_clear_history();
         foreach ($hist as $line) {
-            readline_add_history($line);
+            \readline_add_history($line);
         }
 
         if ($this->historyFile !== false) {
-            return readline_write_history($this->historyFile);
+            return \readline_write_history($this->historyFile);
         }
 
         return true;
diff --git a/vendor/psy/psysh/src/Readline/HoaConsole.php b/vendor/psy/psysh/src/Readline/HoaConsole.php
index 9330d259..a49b5928 100644
--- a/vendor/psy/psysh/src/Readline/HoaConsole.php
+++ b/vendor/psy/psysh/src/Readline/HoaConsole.php
@@ -27,7 +27,7 @@ class HoaConsole implements Readline
      */
     public static function isSupported()
     {
-        return class_exists('\Hoa\Console\Console', true);
+        return \class_exists('\Hoa\Console\Console', true);
     }
 
     public function __construct()
diff --git a/vendor/psy/psysh/src/Readline/Libedit.php b/vendor/psy/psysh/src/Readline/Libedit.php
index 008affea..d1dc002f 100644
--- a/vendor/psy/psysh/src/Readline/Libedit.php
+++ b/vendor/psy/psysh/src/Readline/Libedit.php
@@ -29,7 +29,7 @@ class Libedit extends GNUReadline
      */
     public static function isSupported()
     {
-        return function_exists('readline') && !function_exists('readline_list_history');
+        return \function_exists('readline') && !\function_exists('readline_list_history');
     }
 
     /**
@@ -37,23 +37,23 @@ class Libedit extends GNUReadline
      */
     public function listHistory()
     {
-        $history = file_get_contents($this->historyFile);
+        $history = \file_get_contents($this->historyFile);
         if (!$history) {
             return [];
         }
 
         // libedit doesn't seem to support non-unix line separators.
-        $history = explode("\n", $history);
+        $history = \explode("\n", $history);
 
         // shift the history signature, ensure it's valid
-        if (array_shift($history) !== '_HiStOrY_V2_') {
+        if (\array_shift($history) !== '_HiStOrY_V2_') {
             return [];
         }
 
         // decode the line
-        $history = array_map([$this, 'parseHistoryLine'], $history);
+        $history = \array_map([$this, 'parseHistoryLine'], $history);
         // filter empty lines & comments
-        return array_values(array_filter($history));
+        return \array_values(\array_filter($history));
     }
 
     /**
@@ -74,8 +74,8 @@ class Libedit extends GNUReadline
         }
         // if "\0" is found in an entry, then
         // everything from it until the end of line is a comment.
-        if (($pos = strpos($line, "\0")) !== false) {
-            $line = substr($line, 0, $pos);
+        if (($pos = \strpos($line, "\0")) !== false) {
+            $line = \substr($line, 0, $pos);
         }
 
         return ($line !== '') ? Str::unvis($line) : null;
diff --git a/vendor/psy/psysh/src/Readline/Transient.php b/vendor/psy/psysh/src/Readline/Transient.php
index 58518947..6623bd98 100644
--- a/vendor/psy/psysh/src/Readline/Transient.php
+++ b/vendor/psy/psysh/src/Readline/Transient.php
@@ -50,7 +50,7 @@ class Transient implements Readline
     public function addHistory($line)
     {
         if ($this->eraseDups) {
-            if (($key = array_search($line, $this->history)) !== false) {
+            if (($key = \array_search($line, $this->history)) !== false) {
                 unset($this->history[$key]);
             }
         }
@@ -58,13 +58,13 @@ class Transient implements Readline
         $this->history[] = $line;
 
         if ($this->historySize > 0) {
-            $histsize = count($this->history);
+            $histsize = \count($this->history);
             if ($histsize > $this->historySize) {
-                $this->history = array_slice($this->history, $histsize - $this->historySize);
+                $this->history = \array_slice($this->history, $histsize - $this->historySize);
             }
         }
 
-        $this->history = array_values($this->history);
+        $this->history = \array_values($this->history);
 
         return true;
     }
@@ -106,7 +106,7 @@ class Transient implements Readline
     {
         echo $prompt;
 
-        return rtrim(fgets($this->getStdin(), 1024));
+        return \rtrim(\fgets($this->getStdin()), "\n\r");
     }
 
     /**
@@ -135,10 +135,10 @@ class Transient implements Readline
     private function getStdin()
     {
         if (!isset($this->stdin)) {
-            $this->stdin = fopen('php://stdin', 'r');
+            $this->stdin = \fopen('php://stdin', 'r');
         }
 
-        if (feof($this->stdin)) {
+        if (\feof($this->stdin)) {
             throw new BreakException('Ctrl+D');
         }
 
diff --git a/vendor/psy/psysh/src/Reflection/ReflectionClassConstant.php b/vendor/psy/psysh/src/Reflection/ReflectionClassConstant.php
index ab686bbe..019ad21d 100644
--- a/vendor/psy/psysh/src/Reflection/ReflectionClassConstant.php
+++ b/vendor/psy/psysh/src/Reflection/ReflectionClassConstant.php
@@ -38,7 +38,7 @@ class ReflectionClassConstant implements \Reflector
         $this->name  = $name;
 
         $constants = $class->getConstants();
-        if (!array_key_exists($name, $constants)) {
+        if (!\array_key_exists($name, $constants)) {
             throw new \InvalidArgumentException('Unknown constant: ' . $name);
         }
 
@@ -59,7 +59,7 @@ class ReflectionClassConstant implements \Reflector
         $refl = new self($class, $name);
         $value = $refl->getValue();
 
-        $str = sprintf('Constant [ public %s %s ] { %s }', gettype($value), $refl->getName(), $value);
+        $str = \sprintf('Constant [ public %s %s ] { %s }', \gettype($value), $refl->getName(), $value);
 
         if ($return) {
             return $str;
@@ -219,7 +219,7 @@ class ReflectionClassConstant implements \Reflector
      */
     public static function create($class, $name)
     {
-        if (class_exists('\\ReflectionClassConstant')) {
+        if (\class_exists('\\ReflectionClassConstant')) {
             return new \ReflectionClassConstant($class, $name);
         }
 
diff --git a/vendor/psy/psysh/src/Reflection/ReflectionConstant.php b/vendor/psy/psysh/src/Reflection/ReflectionConstant.php
index 7fa9b8a6..a813fc57 100644
--- a/vendor/psy/psysh/src/Reflection/ReflectionConstant.php
+++ b/vendor/psy/psysh/src/Reflection/ReflectionConstant.php
@@ -23,7 +23,7 @@ class ReflectionConstant extends ReflectionClassConstant
      */
     public function __construct($class, $name)
     {
-        @trigger_error('ReflectionConstant is now ReflectionClassConstant', E_USER_DEPRECATED);
+        @\trigger_error('ReflectionConstant is now ReflectionClassConstant', E_USER_DEPRECATED);
 
         parent::__construct($class, $name);
     }
diff --git a/vendor/psy/psysh/src/Reflection/ReflectionConstant_.php b/vendor/psy/psysh/src/Reflection/ReflectionConstant_.php
index 91f96b6f..b355e350 100644
--- a/vendor/psy/psysh/src/Reflection/ReflectionConstant_.php
+++ b/vendor/psy/psysh/src/Reflection/ReflectionConstant_.php
@@ -46,12 +46,12 @@ class ReflectionConstant_ implements \Reflector
     {
         $this->name = $name;
 
-        if (!defined($name) && !self::isMagicConstant($name)) {
+        if (!\defined($name) && !self::isMagicConstant($name)) {
             throw new \InvalidArgumentException('Unknown constant: ' . $name);
         }
 
         if (!self::isMagicConstant($name)) {
-            $this->value = @constant($name);
+            $this->value = @\constant($name);
         }
     }
 
@@ -68,7 +68,7 @@ class ReflectionConstant_ implements \Reflector
         $refl = new self($name);
         $value = $refl->getValue();
 
-        $str = sprintf('Constant [ %s %s ] { %s }', gettype($value), $refl->getName(), $value);
+        $str = \sprintf('Constant [ %s %s ] { %s }', \gettype($value), $refl->getName(), $value);
 
         if ($return) {
             return $str;
@@ -79,7 +79,7 @@ class ReflectionConstant_ implements \Reflector
 
     public static function isMagicConstant($name)
     {
-        return in_array($name, self::$magicConstants);
+        return \in_array($name, self::$magicConstants);
     }
 
     /**
@@ -115,7 +115,7 @@ class ReflectionConstant_ implements \Reflector
             return '';
         }
 
-        return preg_replace('/\\\\[^\\\\]+$/', '', $this->name);
+        return \preg_replace('/\\\\[^\\\\]+$/', '', $this->name);
     }
 
     /**
@@ -135,7 +135,7 @@ class ReflectionConstant_ implements \Reflector
      */
     public function inNamespace()
     {
-        return strpos($this->name, '\\') !== false;
+        return \strpos($this->name, '\\') !== false;
     }
 
     /**
diff --git a/vendor/psy/psysh/src/Reflection/ReflectionLanguageConstruct.php b/vendor/psy/psysh/src/Reflection/ReflectionLanguageConstruct.php
index bda08194..9b8eefc1 100644
--- a/vendor/psy/psysh/src/Reflection/ReflectionLanguageConstruct.php
+++ b/vendor/psy/psysh/src/Reflection/ReflectionLanguageConstruct.php
@@ -122,7 +122,7 @@ class ReflectionLanguageConstruct extends \ReflectionFunctionAbstract
     {
         $params = [];
         foreach (self::$languageConstructs[$this->keyword] as $parameter => $opts) {
-            array_push($params, new ReflectionLanguageConstructParameter($this->keyword, $parameter, $opts));
+            \array_push($params, new ReflectionLanguageConstructParameter($this->keyword, $parameter, $opts));
         }
 
         return $params;
@@ -159,6 +159,6 @@ class ReflectionLanguageConstruct extends \ReflectionFunctionAbstract
      */
     public static function isLanguageConstruct($keyword)
     {
-        return array_key_exists($keyword, self::$languageConstructs);
+        return \array_key_exists($keyword, self::$languageConstructs);
     }
 }
diff --git a/vendor/psy/psysh/src/Reflection/ReflectionLanguageConstructParameter.php b/vendor/psy/psysh/src/Reflection/ReflectionLanguageConstructParameter.php
index af1f4cb4..9161aa78 100644
--- a/vendor/psy/psysh/src/Reflection/ReflectionLanguageConstructParameter.php
+++ b/vendor/psy/psysh/src/Reflection/ReflectionLanguageConstructParameter.php
@@ -44,7 +44,7 @@ class ReflectionLanguageConstructParameter extends \ReflectionParameter
      */
     public function isArray()
     {
-        return array_key_exists('isArray', $this->opts) && $this->opts['isArray'];
+        return \array_key_exists('isArray', $this->opts) && $this->opts['isArray'];
     }
 
     /**
@@ -76,7 +76,7 @@ class ReflectionLanguageConstructParameter extends \ReflectionParameter
      */
     public function isOptional()
     {
-        return array_key_exists('isOptional', $this->opts) && $this->opts['isOptional'];
+        return \array_key_exists('isOptional', $this->opts) && $this->opts['isOptional'];
     }
 
     /**
@@ -86,7 +86,7 @@ class ReflectionLanguageConstructParameter extends \ReflectionParameter
      */
     public function isDefaultValueAvailable()
     {
-        return array_key_exists('defaultValue', $this->opts);
+        return \array_key_exists('defaultValue', $this->opts);
     }
 
     /**
@@ -98,6 +98,6 @@ class ReflectionLanguageConstructParameter extends \ReflectionParameter
      */
     public function isPassedByReference()
     {
-        return array_key_exists('isPassedByReference', $this->opts) && $this->opts['isPassedByReference'];
+        return \array_key_exists('isPassedByReference', $this->opts) && $this->opts['isPassedByReference'];
     }
 }
diff --git a/vendor/psy/psysh/src/Shell.php b/vendor/psy/psysh/src/Shell.php
index 3fe0b761..7a0fbac2 100644
--- a/vendor/psy/psysh/src/Shell.php
+++ b/vendor/psy/psysh/src/Shell.php
@@ -47,7 +47,7 @@ use Symfony\Component\Console\Output\OutputInterface;
  */
 class Shell extends Application
 {
-    const VERSION = 'v0.9.6';
+    const VERSION = 'v0.9.9';
 
     const PROMPT      = '>>> ';
     const BUFF_PROMPT = '... ';
@@ -73,6 +73,7 @@ class Shell extends Application
     private $autoCompleter;
     private $matchers = [];
     private $commandsMatcher;
+    private $lastExecSuccess = true;
 
     /**
      * Create a new Psy Shell.
@@ -109,7 +110,7 @@ class Shell extends Application
     public static function isIncluded(array $trace)
     {
         return isset($trace[0]['function']) &&
-          in_array($trace[0]['function'], ['require', 'include', 'require_once', 'include_once']);
+          \in_array($trace[0]['function'], ['require', 'include', 'require_once', 'include_once']);
     }
 
     /**
@@ -234,7 +235,7 @@ class Shell extends Application
      */
     protected function getTabCompletionMatchers()
     {
-        @trigger_error('getTabCompletionMatchers is no longer used', E_USER_DEPRECATED);
+        @\trigger_error('getTabCompletionMatchers is no longer used', E_USER_DEPRECATED);
     }
 
     /**
@@ -264,7 +265,7 @@ class Shell extends Application
      */
     public function addMatchers(array $matchers)
     {
-        $this->matchers = array_merge($this->matchers, $matchers);
+        $this->matchers = \array_merge($this->matchers, $matchers);
 
         if (isset($this->autoCompleter)) {
             $this->addMatchersToAutoCompleter($matchers);
@@ -392,7 +393,7 @@ class Shell extends Application
             }
 
             // handle empty input
-            if (trim($input) === '' && !$this->codeBufferOpen) {
+            if (\trim($input) === '' && !$this->codeBufferOpen) {
                 continue;
             }
 
@@ -424,12 +425,12 @@ class Shell extends Application
         }
 
         $code = $this->codeBuffer;
-        array_push($code, $input);
-        $tokens = @token_get_all('<?php ' . implode("\n", $code));
-        $last = array_pop($tokens);
+        \array_push($code, $input);
+        $tokens = @\token_get_all('<?php ' . \implode("\n", $code));
+        $last = \array_pop($tokens);
 
         return $last === '"' || $last === '`' ||
-            (is_array($last) && in_array($last[0], [T_ENCAPSED_AND_WHITESPACE, T_START_HEREDOC, T_COMMENT]));
+            (\is_array($last) && \in_array($last[0], [T_ENCAPSED_AND_WHITESPACE, T_START_HEREDOC, T_COMMENT]));
     }
 
     /**
@@ -558,6 +559,30 @@ class Shell extends Application
         return $vars;
     }
 
+    /**
+     * Return the set of variables currently in scope which differ from the
+     * values passed as $currentVars.
+     *
+     * This is used inside the Execution Loop Closure to pick up scope variable
+     * changes made by commands while the loop is running.
+     *
+     * @param array $currentVars
+     *
+     * @return array Associative array of scope variables which differ from $currentVars
+     */
+    public function getScopeVariablesDiff(array $currentVars)
+    {
+        $newVars = [];
+
+        foreach ($this->getScopeVariables(false) as $key => $value) {
+            if (!array_key_exists($key, $currentVars) || $currentVars[$key] !== $value) {
+                $newVars[$key] = $value;
+            }
+        }
+
+        return $newVars;
+    }
+
     /**
      * Get the set of unused command-scope variable names.
      *
@@ -575,7 +600,7 @@ class Shell extends Application
      */
     public function getScopeVariableNames()
     {
-        return array_keys($this->context->getAll());
+        return \array_keys($this->context->getAll());
     }
 
     /**
@@ -647,7 +672,7 @@ class Shell extends Application
      */
     public function getIncludes()
     {
-        return array_merge($this->config->getDefaultIncludes(), $this->includes);
+        return \array_merge($this->config->getDefaultIncludes(), $this->includes);
     }
 
     /**
@@ -682,9 +707,9 @@ class Shell extends Application
     {
         try {
             // Code lines ending in \ keep the buffer open
-            if (substr(rtrim($code), -1) === '\\') {
+            if (\substr(\rtrim($code), -1) === '\\') {
                 $this->codeBufferOpen = true;
-                $code = substr(rtrim($code), 0, -1);
+                $code = \substr(\rtrim($code), 0, -1);
             } else {
                 $this->codeBufferOpen = false;
             }
@@ -766,7 +791,7 @@ class Shell extends Application
             throw new \InvalidArgumentException('Command not found: ' . $input);
         }
 
-        $input = new ShellInput(str_replace('\\', '\\\\', rtrim($input, " \t\n\r\0\x0B;")));
+        $input = new ShellInput(\str_replace('\\', '\\\\', \rtrim($input, " \t\n\r\0\x0B;")));
 
         if ($input->hasParameterOption(['--help', '-h'])) {
             $helpCommand = $this->get('help');
@@ -835,7 +860,7 @@ class Shell extends Application
             return;
         }
 
-        list($codeBuffer, $codeBufferOpen, $code) = array_pop($this->codeStack);
+        list($codeBuffer, $codeBufferOpen, $code) = \array_pop($this->codeStack);
 
         $this->codeBuffer     = $codeBuffer;
         $this->codeBufferOpen = $codeBufferOpen;
@@ -861,7 +886,7 @@ class Shell extends Application
         }
 
         // Skip empty lines and lines starting with a space
-        if (trim($line) !== '' && substr($line, 0, 1) !== ' ') {
+        if (\trim($line) !== '' && \substr($line, 0, 1) !== ' ') {
             $this->readline->addHistory($line);
         }
     }
@@ -871,11 +896,11 @@ class Shell extends Application
      */
     private function addCodeBufferToHistory()
     {
-        $codeBuffer = array_filter($this->codeBuffer, function ($line) {
+        $codeBuffer = \array_filter($this->codeBuffer, function ($line) {
             return !$line instanceof SilentInput;
         });
 
-        $this->addHistory(implode("\n", $codeBuffer));
+        $this->addHistory(\implode("\n", $codeBuffer));
     }
 
     /**
@@ -888,7 +913,7 @@ class Shell extends Application
     public function getNamespace()
     {
         if ($namespace = $this->cleaner->getNamespace()) {
-            return implode('\\', $namespace);
+            return \implode('\\', $namespace);
         }
     }
 
@@ -907,7 +932,7 @@ class Shell extends Application
         // Incremental flush
         if ($out !== '' && !$isCleaning) {
             $this->output->write($out, false, ShellOutput::OUTPUT_RAW);
-            $this->outputWantsNewline = (substr($out, -1) !== "\n");
+            $this->outputWantsNewline = (\substr($out, -1) !== "\n");
             $this->stdoutBuffer .= $out;
         }
 
@@ -915,7 +940,7 @@ class Shell extends Application
         if ($phase & PHP_OUTPUT_HANDLER_END) {
             // Write an extra newline if stdout didn't end with one
             if ($this->outputWantsNewline) {
-                $this->output->writeln(sprintf('<aside>%s</aside>', $this->config->useUnicode() ? '⏎' : '\\n'));
+                $this->output->writeln(\sprintf('<aside>%s</aside>', $this->config->useUnicode() ? '⏎' : '\\n'));
                 $this->outputWantsNewline = false;
             }
 
@@ -939,15 +964,17 @@ class Shell extends Application
      */
     public function writeReturnValue($ret)
     {
+        $this->lastExecSuccess = true;
+
         if ($ret instanceof NoReturnValue) {
             return;
         }
 
         $this->context->setReturnValue($ret);
         $ret    = $this->presentValue($ret);
-        $indent = str_repeat(' ', strlen(static::RETVAL));
+        $indent = \str_repeat(' ', \strlen(static::RETVAL));
 
-        $this->output->writeln(static::RETVAL . str_replace(PHP_EOL, PHP_EOL . $indent, $ret));
+        $this->output->writeln(static::RETVAL . \str_replace(PHP_EOL, PHP_EOL . $indent, $ret));
     }
 
     /**
@@ -962,11 +989,24 @@ class Shell extends Application
      */
     public function writeException(\Exception $e)
     {
+        $this->lastExecSuccess = false;
         $this->context->setLastException($e);
         $this->output->writeln($this->formatException($e));
         $this->resetCodeBuffer();
     }
 
+    /**
+     * Check whether the last exec was successful.
+     *
+     * Returns true if a return value was logged rather than an exception.
+     *
+     * @return bool
+     */
+    public function getLastExecSuccess()
+    {
+        return $this->lastExecSuccess;
+    }
+
     /**
      * Helper for formatting an exception for writeException().
      *
@@ -981,23 +1021,23 @@ class Shell extends Application
         $message = $e->getMessage();
         if (!$e instanceof PsyException) {
             if ($message === '') {
-                $message = get_class($e);
+                $message = \get_class($e);
             } else {
-                $message = sprintf('%s with message \'%s\'', get_class($e), $message);
+                $message = \sprintf('%s with message \'%s\'', \get_class($e), $message);
             }
         }
 
-        $message = preg_replace(
+        $message = \preg_replace(
             "#(\\w:)?(/\\w+)*/src/Execution(?:Loop)?Closure.php\(\d+\) : eval\(\)'d code#",
             "eval()'d code",
-            str_replace('\\', '/', $message)
+            \str_replace('\\', '/', $message)
         );
 
-        $message = str_replace(" in eval()'d code", ' in Psy Shell code', $message);
+        $message = \str_replace(" in eval()'d code", ' in Psy Shell code', $message);
 
         $severity = ($e instanceof \ErrorException) ? $this->getSeverity($e) : 'error';
 
-        return sprintf('<%s>%s</%s>', $severity, OutputFormatter::escape($message), $severity);
+        return \sprintf('<%s>%s</%s>', $severity, OutputFormatter::escape($message), $severity);
     }
 
     /**
@@ -1010,7 +1050,7 @@ class Shell extends Application
     protected function getSeverity(\ErrorException $e)
     {
         $severity = $e->getSeverity();
-        if ($severity & error_reporting()) {
+        if ($severity & \error_reporting()) {
             switch ($severity) {
                 case E_WARNING:
                 case E_NOTICE:
@@ -1086,7 +1126,7 @@ class Shell extends Application
      */
     public function handleError($errno, $errstr, $errfile, $errline)
     {
-        if ($errno & error_reporting()) {
+        if ($errno & \error_reporting()) {
             ErrorException::throwException($errno, $errstr, $errfile, $errline);
         } elseif ($errno & $this->config->errorLoggingLevel()) {
             // log it and continue...
@@ -1132,7 +1172,7 @@ class Shell extends Application
      */
     protected function hasCommand($input)
     {
-        if (preg_match('/([^\s]+?)(?:\s|$)/A', ltrim($input), $match)) {
+        if (\preg_match('/([^\s]+?)(?:\s|$)/A', \ltrim($input), $match)) {
             return $this->has($match[1]);
         }
 
@@ -1167,22 +1207,22 @@ class Shell extends Application
     protected function readline()
     {
         if (!empty($this->inputBuffer)) {
-            $line = array_shift($this->inputBuffer);
+            $line = \array_shift($this->inputBuffer);
             if (!$line instanceof SilentInput) {
-                $this->output->writeln(sprintf('<aside>%s %s</aside>', static::REPLAY, OutputFormatter::escape($line)));
+                $this->output->writeln(\sprintf('<aside>%s %s</aside>', static::REPLAY, OutputFormatter::escape($line)));
             }
 
             return $line;
         }
 
         if ($bracketedPaste = $this->config->useBracketedPaste()) {
-            printf("\e[?2004h"); // Enable bracketed paste
+            \printf("\e[?2004h"); // Enable bracketed paste
         }
 
         $line = $this->readline->readline($this->getPrompt());
 
         if ($bracketedPaste) {
-            printf("\e[?2004l"); // ... and disable it again
+            \printf("\e[?2004l"); // ... and disable it again
         }
 
         return $line;
@@ -1195,7 +1235,7 @@ class Shell extends Application
      */
     protected function getHeader()
     {
-        return sprintf('<aside>%s by Justin Hileman</aside>', $this->getVersion());
+        return \sprintf('<aside>%s by Justin Hileman</aside>', $this->getVersion());
     }
 
     /**
@@ -1207,7 +1247,7 @@ class Shell extends Application
     {
         $separator = $this->config->useUnicode() ? '—' : '-';
 
-        return sprintf('Psy Shell %s (PHP %s %s %s)', self::VERSION, phpversion(), $separator, php_sapi_name());
+        return \sprintf('Psy Shell %s (PHP %s %s %s)', self::VERSION, PHP_VERSION, $separator, PHP_SAPI);
     }
 
     /**
@@ -1225,7 +1265,7 @@ class Shell extends Application
      */
     protected function autocomplete($text)
     {
-        @trigger_error('Tab completion is provided by the AutoCompleter service', E_USER_DEPRECATED);
+        @\trigger_error('Tab completion is provided by the AutoCompleter service', E_USER_DEPRECATED);
     }
 
     /**
@@ -1280,7 +1320,7 @@ class Shell extends Application
         try {
             $client = $this->config->getChecker();
             if (!$client->isLatest()) {
-                $this->output->writeln(sprintf('New version is available (current: %s, latest: %s)', self::VERSION, $client->getLatest()));
+                $this->output->writeln(\sprintf('New version is available (current: %s, latest: %s)', self::VERSION, $client->getLatest()));
             }
         } catch (\InvalidArgumentException $e) {
             $this->output->writeln($e->getMessage());
diff --git a/vendor/psy/psysh/src/Sudo.php b/vendor/psy/psysh/src/Sudo.php
index 3c085239..be354bef 100644
--- a/vendor/psy/psysh/src/Sudo.php
+++ b/vendor/psy/psysh/src/Sudo.php
@@ -64,9 +64,9 @@ class Sudo
      */
     public static function callMethod($object, $method, $args = null)
     {
-        $args   = func_get_args();
-        $object = array_shift($args);
-        $method = array_shift($args);
+        $args   = \func_get_args();
+        $object = \array_shift($args);
+        $method = \array_shift($args);
 
         $refl = new \ReflectionObject($object);
         $reflMethod = $refl->getMethod($method);
@@ -122,9 +122,9 @@ class Sudo
      */
     public static function callStatic($class, $method, $args = null)
     {
-        $args   = func_get_args();
-        $class  = array_shift($args);
-        $method = array_shift($args);
+        $args   = \func_get_args();
+        $class  = \array_shift($args);
+        $method = \array_shift($args);
 
         $refl = new \ReflectionClass($class);
         $reflMethod = $refl->getMethod($method);
diff --git a/vendor/psy/psysh/src/Sudo/SudoVisitor.php b/vendor/psy/psysh/src/Sudo/SudoVisitor.php
index 31fe6bfb..2b78a423 100644
--- a/vendor/psy/psysh/src/Sudo/SudoVisitor.php
+++ b/vendor/psy/psysh/src/Sudo/SudoVisitor.php
@@ -52,7 +52,7 @@ class SudoVisitor extends NodeVisitorAbstract
             $name = $node->name instanceof Identifier ? $node->name->toString() : $node->name;
             $args = [
                 $node->var,
-                is_string($name) ? new String_($name) : $name,
+                \is_string($name) ? new String_($name) : $name,
             ];
 
             return $this->prepareCall(self::PROPERTY_FETCH, $args);
@@ -61,7 +61,7 @@ class SudoVisitor extends NodeVisitorAbstract
             $name   = $target->name instanceof Identifier ? $target->name->toString() : $target->name;
             $args   = [
                 $target->var,
-                is_string($name) ? new String_($name) : $name,
+                \is_string($name) ? new String_($name) : $name,
                 $node->expr,
             ];
 
@@ -69,8 +69,8 @@ class SudoVisitor extends NodeVisitorAbstract
         } elseif ($node instanceof MethodCall) {
             $name = $node->name instanceof Identifier ? $node->name->toString() : $node->name;
             $args = $node->args;
-            array_unshift($args, new Arg(is_string($name) ? new String_($name) : $name));
-            array_unshift($args, new Arg($node->var));
+            \array_unshift($args, new Arg(\is_string($name) ? new String_($name) : $name));
+            \array_unshift($args, new Arg($node->var));
 
             // not using prepareCall because the $node->args we started with are already Arg instances
             return new StaticCall(new FullyQualifiedName(self::SUDO_CLASS), self::METHOD_CALL, $args);
@@ -78,8 +78,8 @@ class SudoVisitor extends NodeVisitorAbstract
             $class = $node->class instanceof Name ? $node->class->toString() : $node->class;
             $name = $node->name instanceof Identifier ? $node->name->toString() : $node->name;
             $args  = [
-                is_string($class) ? new String_($class) : $class,
-                is_string($name) ? new String_($name) : $name,
+                \is_string($class) ? new String_($class) : $class,
+                \is_string($name) ? new String_($name) : $name,
             ];
 
             return $this->prepareCall(self::STATIC_PROPERTY_FETCH, $args);
@@ -88,8 +88,8 @@ class SudoVisitor extends NodeVisitorAbstract
             $class  = $target->class instanceof Name ? $target->class->toString() : $target->class;
             $name   = $target->name instanceof Identifier ? $target->name->toString() : $target->name;
             $args   = [
-                is_string($class) ? new String_($class) : $class,
-                is_string($name) ? new String_($name) : $name,
+                \is_string($class) ? new String_($class) : $class,
+                \is_string($name) ? new String_($name) : $name,
                 $node->expr,
             ];
 
@@ -98,8 +98,8 @@ class SudoVisitor extends NodeVisitorAbstract
             $args  = $node->args;
             $class = $node->class instanceof Name ? $node->class->toString() : $node->class;
             $name  = $node->name instanceof Identifier ? $node->name->toString() : $node->name;
-            array_unshift($args, new Arg(is_string($name) ? new String_($name) : $name));
-            array_unshift($args, new Arg(is_string($class) ? new String_($class) : $class));
+            \array_unshift($args, new Arg(\is_string($name) ? new String_($name) : $name));
+            \array_unshift($args, new Arg(\is_string($class) ? new String_($class) : $class));
 
             // not using prepareCall because the $node->args we started with are already Arg instances
             return new StaticCall(new FullyQualifiedName(self::SUDO_CLASS), self::STATIC_CALL, $args);
@@ -107,8 +107,8 @@ class SudoVisitor extends NodeVisitorAbstract
             $class = $node->class instanceof Name ? $node->class->toString() : $node->class;
             $name  = $node->name instanceof Identifier ? $node->name->toString() : $node->name;
             $args  = [
-                is_string($class) ? new String_($class) : $class,
-                is_string($name) ? new String_($name) : $name,
+                \is_string($class) ? new String_($class) : $class,
+                \is_string($name) ? new String_($name) : $name,
             ];
 
             return $this->prepareCall(self::CLASS_CONST_FETCH, $args);
@@ -117,7 +117,7 @@ class SudoVisitor extends NodeVisitorAbstract
 
     private function prepareCall($method, $args)
     {
-        return new StaticCall(new FullyQualifiedName(self::SUDO_CLASS), $method, array_map(function ($arg) {
+        return new StaticCall(new FullyQualifiedName(self::SUDO_CLASS), $method, \array_map(function ($arg) {
             return new Arg($arg);
         }, $args));
     }
diff --git a/vendor/psy/psysh/src/TabCompletion/AutoCompleter.php b/vendor/psy/psysh/src/TabCompletion/AutoCompleter.php
index 8b316445..0751aa78 100644
--- a/vendor/psy/psysh/src/TabCompletion/AutoCompleter.php
+++ b/vendor/psy/psysh/src/TabCompletion/AutoCompleter.php
@@ -38,7 +38,7 @@ class AutoCompleter
      */
     public function activate()
     {
-        readline_completion_function([&$this, 'callback']);
+        \readline_completion_function([&$this, 'callback']);
     }
 
     /**
@@ -56,27 +56,27 @@ class AutoCompleter
         // try to work around it.
         $line = $info['line_buffer'];
         if (isset($info['end'])) {
-            $line = substr($line, 0, $info['end']);
+            $line = \substr($line, 0, $info['end']);
         }
         if ($line === '' && $input !== '') {
             $line = $input;
         }
 
-        $tokens = token_get_all('<?php ' . $line);
+        $tokens = \token_get_all('<?php ' . $line);
 
         // remove whitespaces
-        $tokens = array_filter($tokens, function ($token) {
+        $tokens = \array_filter($tokens, function ($token) {
             return !AbstractMatcher::tokenIs($token, AbstractMatcher::T_WHITESPACE);
         });
 
         $matches = [];
         foreach ($this->matchers as $matcher) {
             if ($matcher->hasMatched($tokens)) {
-                $matches = array_merge($matcher->getMatches($tokens), $matches);
+                $matches = \array_merge($matcher->getMatches($tokens), $matches);
             }
         }
 
-        $matches = array_unique($matches);
+        $matches = \array_unique($matches);
 
         return !empty($matches) ? $matches : [''];
     }
@@ -93,7 +93,7 @@ class AutoCompleter
      */
     public function callback($input, $index)
     {
-        return $this->processCallback($input, $index, readline_info());
+        return $this->processCallback($input, $index, \readline_info());
     }
 
     /**
@@ -103,8 +103,8 @@ class AutoCompleter
     {
         // PHP didn't implement the whole readline API when they first switched
         // to libedit. And they still haven't.
-        if (function_exists('readline_callback_handler_remove')) {
-            readline_callback_handler_remove();
+        if (\function_exists('readline_callback_handler_remove')) {
+            \readline_callback_handler_remove();
         }
     }
 }
diff --git a/vendor/psy/psysh/src/TabCompletion/Matcher/AbstractDefaultParametersMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/AbstractDefaultParametersMatcher.php
index 1dc0765a..c44af36a 100644
--- a/vendor/psy/psysh/src/TabCompletion/Matcher/AbstractDefaultParametersMatcher.php
+++ b/vendor/psy/psysh/src/TabCompletion/Matcher/AbstractDefaultParametersMatcher.php
@@ -36,7 +36,7 @@ abstract class AbstractDefaultParametersMatcher extends AbstractContextAwareMatc
             return [];
         }
 
-        return [implode(', ', $parametersProcessed) . ')'];
+        return [\implode(', ', $parametersProcessed) . ')'];
     }
 
     /**
@@ -50,8 +50,8 @@ abstract class AbstractDefaultParametersMatcher extends AbstractContextAwareMatc
      */
     private function valueToShortString($value)
     {
-        if (!is_array($value)) {
-            return json_encode($value);
+        if (!\is_array($value)) {
+            return \json_encode($value);
         }
 
         $chunks = [];
@@ -60,7 +60,7 @@ abstract class AbstractDefaultParametersMatcher extends AbstractContextAwareMatc
         $allSequential = true;
 
         foreach ($value as $key => $item) {
-            $allSequential = $allSequential && is_numeric($key) && $key === count($chunksSequential);
+            $allSequential = $allSequential && \is_numeric($key) && $key === \count($chunksSequential);
 
             $keyString  = $this->valueToShortString($key);
             $itemString = $this->valueToShortString($item);
@@ -71,6 +71,6 @@ abstract class AbstractDefaultParametersMatcher extends AbstractContextAwareMatc
 
         $chunksToImplode = $allSequential ? $chunksSequential : $chunks;
 
-        return '[' . implode(', ', $chunksToImplode) . ']';
+        return '[' . \implode(', ', $chunksToImplode) . ']';
     }
 }
diff --git a/vendor/psy/psysh/src/TabCompletion/Matcher/AbstractMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/AbstractMatcher.php
index efa9e57e..63b71547 100644
--- a/vendor/psy/psysh/src/TabCompletion/Matcher/AbstractMatcher.php
+++ b/vendor/psy/psysh/src/TabCompletion/Matcher/AbstractMatcher.php
@@ -64,7 +64,7 @@ abstract class AbstractMatcher
     protected function getInput(array $tokens)
     {
         $var = '';
-        $firstToken = array_pop($tokens);
+        $firstToken = \array_pop($tokens);
         if (self::tokenIs($firstToken, self::T_STRING)) {
             $var = $firstToken[1];
         }
@@ -84,7 +84,7 @@ abstract class AbstractMatcher
         $class = '';
         while (self::hasToken(
             [self::T_NS_SEPARATOR, self::T_STRING],
-            $token = array_pop($tokens)
+            $token = \array_pop($tokens)
         )) {
             if (self::needCompleteClass($token)) {
                 continue;
@@ -116,7 +116,7 @@ abstract class AbstractMatcher
      */
     public static function startsWith($prefix, $word)
     {
-        return preg_match(sprintf('#^%s#', $prefix), $word);
+        return \preg_match(\sprintf('#^%s#', $prefix), $word);
     }
 
     /**
@@ -129,13 +129,13 @@ abstract class AbstractMatcher
      */
     public static function hasSyntax($token, $syntax = self::VAR_SYNTAX)
     {
-        if (!is_array($token)) {
+        if (!\is_array($token)) {
             return false;
         }
 
-        $regexp = sprintf('#%s#', $syntax);
+        $regexp = \sprintf('#%s#', $syntax);
 
-        return (bool) preg_match($regexp, $token[1]);
+        return (bool) \preg_match($regexp, $token[1]);
     }
 
     /**
@@ -148,11 +148,11 @@ abstract class AbstractMatcher
      */
     public static function tokenIs($token, $which)
     {
-        if (!is_array($token)) {
+        if (!\is_array($token)) {
             return false;
         }
 
-        return token_name($token[0]) === $which;
+        return \token_name($token[0]) === $which;
     }
 
     /**
@@ -164,16 +164,16 @@ abstract class AbstractMatcher
      */
     public static function isOperator($token)
     {
-        if (!is_string($token)) {
+        if (!\is_string($token)) {
             return false;
         }
 
-        return strpos(self::MISC_OPERATORS, $token) !== false;
+        return \strpos(self::MISC_OPERATORS, $token) !== false;
     }
 
     public static function needCompleteClass($token)
     {
-        return in_array($token[1], ['doc', 'ls', 'show']);
+        return \in_array($token[1], ['doc', 'ls', 'show']);
     }
 
     /**
@@ -186,10 +186,10 @@ abstract class AbstractMatcher
      */
     public static function hasToken(array $coll, $token)
     {
-        if (!is_array($token)) {
+        if (!\is_array($token)) {
             return false;
         }
 
-        return in_array(token_name($token[0]), $coll);
+        return \in_array(\token_name($token[0]), $coll);
     }
 }
diff --git a/vendor/psy/psysh/src/TabCompletion/Matcher/ClassAttributesMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/ClassAttributesMatcher.php
index b26df778..8e976b0a 100644
--- a/vendor/psy/psysh/src/TabCompletion/Matcher/ClassAttributesMatcher.php
+++ b/vendor/psy/psysh/src/TabCompletion/Matcher/ClassAttributesMatcher.php
@@ -28,10 +28,10 @@ class ClassAttributesMatcher extends AbstractMatcher
     {
         $input = $this->getInput($tokens);
 
-        $firstToken = array_pop($tokens);
+        $firstToken = \array_pop($tokens);
         if (self::tokenIs($firstToken, self::T_STRING)) {
             // second token is the nekudotayim operator
-            array_pop($tokens);
+            \array_pop($tokens);
         }
 
         $class = $this->getNamespaceAndClass($tokens);
@@ -42,24 +42,24 @@ class ClassAttributesMatcher extends AbstractMatcher
             return [];
         }
 
-        $vars = array_merge(
-            array_map(
+        $vars = \array_merge(
+            \array_map(
                 function ($var) {
                     return '$' . $var;
                 },
-                array_keys($reflection->getStaticProperties())
+                \array_keys($reflection->getStaticProperties())
             ),
-            array_keys($reflection->getConstants())
+            \array_keys($reflection->getConstants())
         );
 
-        return array_map(
+        return \array_map(
             function ($name) use ($class) {
-                $chunks = explode('\\', $class);
-                $className = array_pop($chunks);
+                $chunks = \explode('\\', $class);
+                $className = \array_pop($chunks);
 
                 return $className . '::' . $name;
             },
-            array_filter(
+            \array_filter(
                 $vars,
                 function ($var) use ($input) {
                     return AbstractMatcher::startsWith($input, $var);
@@ -73,8 +73,8 @@ class ClassAttributesMatcher extends AbstractMatcher
      */
     public function hasMatched(array $tokens)
     {
-        $token     = array_pop($tokens);
-        $prevToken = array_pop($tokens);
+        $token     = \array_pop($tokens);
+        $prevToken = \array_pop($tokens);
 
         switch (true) {
             case self::tokenIs($prevToken, self::T_DOUBLE_COLON) && self::tokenIs($token, self::T_STRING):
diff --git a/vendor/psy/psysh/src/TabCompletion/Matcher/ClassMethodDefaultParametersMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/ClassMethodDefaultParametersMatcher.php
index 4e6025bb..3a269a35 100644
--- a/vendor/psy/psysh/src/TabCompletion/Matcher/ClassMethodDefaultParametersMatcher.php
+++ b/vendor/psy/psysh/src/TabCompletion/Matcher/ClassMethodDefaultParametersMatcher.php
@@ -15,9 +15,9 @@ class ClassMethodDefaultParametersMatcher extends AbstractDefaultParametersMatch
 {
     public function getMatches(array $tokens, array $info = [])
     {
-        $openBracket    = array_pop($tokens);
-        $functionName   = array_pop($tokens);
-        $methodOperator = array_pop($tokens);
+        $openBracket    = \array_pop($tokens);
+        $functionName   = \array_pop($tokens);
+        $methodOperator = \array_pop($tokens);
 
         $class = $this->getNamespaceAndClass($tokens);
 
@@ -41,19 +41,19 @@ class ClassMethodDefaultParametersMatcher extends AbstractDefaultParametersMatch
 
     public function hasMatched(array $tokens)
     {
-        $openBracket = array_pop($tokens);
+        $openBracket = \array_pop($tokens);
 
         if ($openBracket !== '(') {
             return false;
         }
 
-        $functionName = array_pop($tokens);
+        $functionName = \array_pop($tokens);
 
         if (!self::tokenIs($functionName, self::T_STRING)) {
             return false;
         }
 
-        $operator = array_pop($tokens);
+        $operator = \array_pop($tokens);
 
         if (!self::tokenIs($operator, self::T_DOUBLE_COLON)) {
             return false;
diff --git a/vendor/psy/psysh/src/TabCompletion/Matcher/ClassMethodsMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/ClassMethodsMatcher.php
index 2aba6dc1..d278c18b 100644
--- a/vendor/psy/psysh/src/TabCompletion/Matcher/ClassMethodsMatcher.php
+++ b/vendor/psy/psysh/src/TabCompletion/Matcher/ClassMethodsMatcher.php
@@ -28,10 +28,10 @@ class ClassMethodsMatcher extends AbstractMatcher
     {
         $input = $this->getInput($tokens);
 
-        $firstToken = array_pop($tokens);
+        $firstToken = \array_pop($tokens);
         if (self::tokenIs($firstToken, self::T_STRING)) {
             // second token is the nekudotayim operator
-            array_pop($tokens);
+            \array_pop($tokens);
         }
 
         $class = $this->getNamespaceAndClass($tokens);
@@ -48,18 +48,18 @@ class ClassMethodsMatcher extends AbstractMatcher
             $methods = $reflection->getMethods(\ReflectionMethod::IS_STATIC);
         }
 
-        $methods = array_map(function (\ReflectionMethod $method) {
+        $methods = \array_map(function (\ReflectionMethod $method) {
             return $method->getName();
         }, $methods);
 
-        return array_map(
+        return \array_map(
             function ($name) use ($class) {
-                $chunks = explode('\\', $class);
-                $className = array_pop($chunks);
+                $chunks = \explode('\\', $class);
+                $className = \array_pop($chunks);
 
                 return $className . '::' . $name;
             },
-            array_filter($methods, function ($method) use ($input) {
+            \array_filter($methods, function ($method) use ($input) {
                 return AbstractMatcher::startsWith($input, $method);
             })
         );
@@ -70,8 +70,8 @@ class ClassMethodsMatcher extends AbstractMatcher
      */
     public function hasMatched(array $tokens)
     {
-        $token     = array_pop($tokens);
-        $prevToken = array_pop($tokens);
+        $token     = \array_pop($tokens);
+        $prevToken = \array_pop($tokens);
 
         switch (true) {
             case self::tokenIs($prevToken, self::T_DOUBLE_COLON) && self::tokenIs($token, self::T_STRING):
diff --git a/vendor/psy/psysh/src/TabCompletion/Matcher/ClassNamesMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/ClassNamesMatcher.php
index 8c35094f..844b3d2a 100644
--- a/vendor/psy/psysh/src/TabCompletion/Matcher/ClassNamesMatcher.php
+++ b/vendor/psy/psysh/src/TabCompletion/Matcher/ClassNamesMatcher.php
@@ -26,21 +26,21 @@ class ClassNamesMatcher extends AbstractMatcher
     public function getMatches(array $tokens, array $info = [])
     {
         $class = $this->getNamespaceAndClass($tokens);
-        if (strlen($class) > 0 && $class[0] === '\\') {
-            $class = substr($class, 1, strlen($class));
+        if (\strlen($class) > 0 && $class[0] === '\\') {
+            $class = \substr($class, 1, \strlen($class));
         }
-        $quotedClass = preg_quote($class);
+        $quotedClass = \preg_quote($class);
 
-        return array_map(
+        return \array_map(
             function ($className) use ($class) {
                 // get the number of namespace separators
-                $nsPos = substr_count($class, '\\');
-                $pieces = explode('\\', $className);
+                $nsPos = \substr_count($class, '\\');
+                $pieces = \explode('\\', $className);
                 //$methods = Mirror::get($class);
-                return implode('\\', array_slice($pieces, $nsPos, count($pieces)));
+                return \implode('\\', \array_slice($pieces, $nsPos, \count($pieces)));
             },
-            array_filter(
-                get_declared_classes(),
+            \array_filter(
+                \get_declared_classes(),
                 function ($className) use ($quotedClass) {
                     return AbstractMatcher::startsWith($quotedClass, $className);
                 }
@@ -53,8 +53,8 @@ class ClassNamesMatcher extends AbstractMatcher
      */
     public function hasMatched(array $tokens)
     {
-        $token     = array_pop($tokens);
-        $prevToken = array_pop($tokens);
+        $token     = \array_pop($tokens);
+        $prevToken = \array_pop($tokens);
 
         $blacklistedTokens = [
             self::T_INCLUDE, self::T_INCLUDE_ONCE, self::T_REQUIRE, self::T_REQUIRE_ONCE,
@@ -63,7 +63,7 @@ class ClassNamesMatcher extends AbstractMatcher
         switch (true) {
             case self::hasToken([$blacklistedTokens], $token):
             case self::hasToken([$blacklistedTokens], $prevToken):
-            case is_string($token) && $token === '$':
+            case \is_string($token) && $token === '$':
                 return false;
             case self::hasToken([self::T_NEW, self::T_OPEN_TAG, self::T_NS_SEPARATOR, self::T_STRING], $prevToken):
             case self::hasToken([self::T_NEW, self::T_OPEN_TAG, self::T_NS_SEPARATOR], $token):
diff --git a/vendor/psy/psysh/src/TabCompletion/Matcher/CommandsMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/CommandsMatcher.php
index eddcef98..e3d8423a 100644
--- a/vendor/psy/psysh/src/TabCompletion/Matcher/CommandsMatcher.php
+++ b/vendor/psy/psysh/src/TabCompletion/Matcher/CommandsMatcher.php
@@ -45,8 +45,8 @@ class CommandsMatcher extends AbstractMatcher
     {
         $names = [];
         foreach ($commands as $command) {
-            $names = array_merge([$command->getName()], $names);
-            $names = array_merge($command->getAliases(), $names);
+            $names = \array_merge([$command->getName()], $names);
+            $names = \array_merge($command->getAliases(), $names);
         }
         $this->commands = $names;
     }
@@ -60,7 +60,7 @@ class CommandsMatcher extends AbstractMatcher
      */
     protected function isCommand($name)
     {
-        return in_array($name, $this->commands);
+        return \in_array($name, $this->commands);
     }
 
     /**
@@ -88,7 +88,7 @@ class CommandsMatcher extends AbstractMatcher
     {
         $input = $this->getInput($tokens);
 
-        return array_filter($this->commands, function ($command) use ($input) {
+        return \array_filter($this->commands, function ($command) use ($input) {
             return AbstractMatcher::startsWith($input, $command);
         });
     }
@@ -98,8 +98,8 @@ class CommandsMatcher extends AbstractMatcher
      */
     public function hasMatched(array $tokens)
     {
-        /* $openTag */ array_shift($tokens);
-        $command = array_shift($tokens);
+        /* $openTag */ \array_shift($tokens);
+        $command = \array_shift($tokens);
 
         switch (true) {
             case self::tokenIs($command, self::T_STRING) &&
diff --git a/vendor/psy/psysh/src/TabCompletion/Matcher/ConstantsMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/ConstantsMatcher.php
index ddd8bcb0..71be18f5 100644
--- a/vendor/psy/psysh/src/TabCompletion/Matcher/ConstantsMatcher.php
+++ b/vendor/psy/psysh/src/TabCompletion/Matcher/ConstantsMatcher.php
@@ -27,7 +27,7 @@ class ConstantsMatcher extends AbstractMatcher
     {
         $const = $this->getInput($tokens);
 
-        return array_filter(array_keys(get_defined_constants()), function ($constant) use ($const) {
+        return \array_filter(\array_keys(\get_defined_constants()), function ($constant) use ($const) {
             return AbstractMatcher::startsWith($const, $constant);
         });
     }
@@ -37,8 +37,8 @@ class ConstantsMatcher extends AbstractMatcher
      */
     public function hasMatched(array $tokens)
     {
-        $token     = array_pop($tokens);
-        $prevToken = array_pop($tokens);
+        $token     = \array_pop($tokens);
+        $prevToken = \array_pop($tokens);
 
         switch (true) {
             case self::tokenIs($prevToken, self::T_NEW):
diff --git a/vendor/psy/psysh/src/TabCompletion/Matcher/FunctionDefaultParametersMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/FunctionDefaultParametersMatcher.php
index 14c568e1..66d9ea1d 100644
--- a/vendor/psy/psysh/src/TabCompletion/Matcher/FunctionDefaultParametersMatcher.php
+++ b/vendor/psy/psysh/src/TabCompletion/Matcher/FunctionDefaultParametersMatcher.php
@@ -15,9 +15,9 @@ class FunctionDefaultParametersMatcher extends AbstractDefaultParametersMatcher
 {
     public function getMatches(array $tokens, array $info = [])
     {
-        array_pop($tokens); // open bracket
+        \array_pop($tokens); // open bracket
 
-        $functionName = array_pop($tokens);
+        $functionName = \array_pop($tokens);
 
         try {
             $reflection = new \ReflectionFunction($functionName[1]);
@@ -32,19 +32,19 @@ class FunctionDefaultParametersMatcher extends AbstractDefaultParametersMatcher
 
     public function hasMatched(array $tokens)
     {
-        $openBracket = array_pop($tokens);
+        $openBracket = \array_pop($tokens);
 
         if ($openBracket !== '(') {
             return false;
         }
 
-        $functionName = array_pop($tokens);
+        $functionName = \array_pop($tokens);
 
         if (!self::tokenIs($functionName, self::T_STRING)) {
             return false;
         }
 
-        if (!function_exists($functionName[1])) {
+        if (!\function_exists($functionName[1])) {
             return false;
         }
 
diff --git a/vendor/psy/psysh/src/TabCompletion/Matcher/FunctionsMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/FunctionsMatcher.php
index 8bf16856..3aa12a1f 100644
--- a/vendor/psy/psysh/src/TabCompletion/Matcher/FunctionsMatcher.php
+++ b/vendor/psy/psysh/src/TabCompletion/Matcher/FunctionsMatcher.php
@@ -27,10 +27,10 @@ class FunctionsMatcher extends AbstractMatcher
     {
         $func = $this->getInput($tokens);
 
-        $functions    = get_defined_functions();
-        $allFunctions = array_merge($functions['user'], $functions['internal']);
+        $functions    = \get_defined_functions();
+        $allFunctions = \array_merge($functions['user'], $functions['internal']);
 
-        return array_filter($allFunctions, function ($function) use ($func) {
+        return \array_filter($allFunctions, function ($function) use ($func) {
             return AbstractMatcher::startsWith($func, $function);
         });
     }
@@ -40,8 +40,8 @@ class FunctionsMatcher extends AbstractMatcher
      */
     public function hasMatched(array $tokens)
     {
-        $token     = array_pop($tokens);
-        $prevToken = array_pop($tokens);
+        $token     = \array_pop($tokens);
+        $prevToken = \array_pop($tokens);
 
         switch (true) {
             case self::tokenIs($prevToken, self::T_NEW):
diff --git a/vendor/psy/psysh/src/TabCompletion/Matcher/KeywordsMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/KeywordsMatcher.php
index b576f82b..9d0deeee 100644
--- a/vendor/psy/psysh/src/TabCompletion/Matcher/KeywordsMatcher.php
+++ b/vendor/psy/psysh/src/TabCompletion/Matcher/KeywordsMatcher.php
@@ -48,7 +48,7 @@ class KeywordsMatcher extends AbstractMatcher
      */
     public function isKeyword($keyword)
     {
-        return in_array($keyword, $this->keywords);
+        return \in_array($keyword, $this->keywords);
     }
 
     /**
@@ -58,7 +58,7 @@ class KeywordsMatcher extends AbstractMatcher
     {
         $input = $this->getInput($tokens);
 
-        return array_filter($this->keywords, function ($keyword) use ($input) {
+        return \array_filter($this->keywords, function ($keyword) use ($input) {
             return AbstractMatcher::startsWith($input, $keyword);
         });
     }
@@ -68,8 +68,8 @@ class KeywordsMatcher extends AbstractMatcher
      */
     public function hasMatched(array $tokens)
     {
-        $token     = array_pop($tokens);
-        $prevToken = array_pop($tokens);
+        $token     = \array_pop($tokens);
+        $prevToken = \array_pop($tokens);
 
         switch (true) {
             case self::hasToken([self::T_OPEN_TAG, self::T_VARIABLE], $token):
diff --git a/vendor/psy/psysh/src/TabCompletion/Matcher/MongoClientMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/MongoClientMatcher.php
index eb15f15c..fb51bf7d 100644
--- a/vendor/psy/psysh/src/TabCompletion/Matcher/MongoClientMatcher.php
+++ b/vendor/psy/psysh/src/TabCompletion/Matcher/MongoClientMatcher.php
@@ -27,13 +27,13 @@ class MongoClientMatcher extends AbstractContextAwareMatcher
     {
         $input = $this->getInput($tokens);
 
-        $firstToken = array_pop($tokens);
+        $firstToken = \array_pop($tokens);
         if (self::tokenIs($firstToken, self::T_STRING)) {
             // second token is the object operator
-            array_pop($tokens);
+            \array_pop($tokens);
         }
-        $objectToken = array_pop($tokens);
-        $objectName  = str_replace('$', '', $objectToken[1]);
+        $objectToken = \array_pop($tokens);
+        $objectName  = \str_replace('$', '', $objectToken[1]);
         $object      = $this->getVariable($objectName);
 
         if (!$object instanceof \MongoClient) {
@@ -42,8 +42,8 @@ class MongoClientMatcher extends AbstractContextAwareMatcher
 
         $list = $object->listDBs();
 
-        return array_filter(
-            array_map(function ($info) {
+        return \array_filter(
+            \array_map(function ($info) {
                 return $info['name'];
             }, $list['databases']),
             function ($var) use ($input) {
@@ -57,8 +57,8 @@ class MongoClientMatcher extends AbstractContextAwareMatcher
      */
     public function hasMatched(array $tokens)
     {
-        $token     = array_pop($tokens);
-        $prevToken = array_pop($tokens);
+        $token     = \array_pop($tokens);
+        $prevToken = \array_pop($tokens);
 
         switch (true) {
             case self::tokenIs($token, self::T_OBJECT_OPERATOR):
diff --git a/vendor/psy/psysh/src/TabCompletion/Matcher/MongoDatabaseMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/MongoDatabaseMatcher.php
index 26e2337a..fb1b9bbf 100644
--- a/vendor/psy/psysh/src/TabCompletion/Matcher/MongoDatabaseMatcher.php
+++ b/vendor/psy/psysh/src/TabCompletion/Matcher/MongoDatabaseMatcher.php
@@ -27,20 +27,20 @@ class MongoDatabaseMatcher extends AbstractContextAwareMatcher
     {
         $input = $this->getInput($tokens);
 
-        $firstToken = array_pop($tokens);
+        $firstToken = \array_pop($tokens);
         if (self::tokenIs($firstToken, self::T_STRING)) {
             // second token is the object operator
-            array_pop($tokens);
+            \array_pop($tokens);
         }
-        $objectToken = array_pop($tokens);
-        $objectName  = str_replace('$', '', $objectToken[1]);
+        $objectToken = \array_pop($tokens);
+        $objectName  = \str_replace('$', '', $objectToken[1]);
         $object      = $this->getVariable($objectName);
 
         if (!$object instanceof \MongoDB) {
             return [];
         }
 
-        return array_filter(
+        return \array_filter(
             $object->getCollectionNames(),
             function ($var) use ($input) {
                 return AbstractMatcher::startsWith($input, $var);
@@ -53,8 +53,8 @@ class MongoDatabaseMatcher extends AbstractContextAwareMatcher
      */
     public function hasMatched(array $tokens)
     {
-        $token     = array_pop($tokens);
-        $prevToken = array_pop($tokens);
+        $token     = \array_pop($tokens);
+        $prevToken = \array_pop($tokens);
 
         switch (true) {
             case self::tokenIs($token, self::T_OBJECT_OPERATOR):
diff --git a/vendor/psy/psysh/src/TabCompletion/Matcher/ObjectAttributesMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/ObjectAttributesMatcher.php
index bed365a8..ff44f5ac 100644
--- a/vendor/psy/psysh/src/TabCompletion/Matcher/ObjectAttributesMatcher.php
+++ b/vendor/psy/psysh/src/TabCompletion/Matcher/ObjectAttributesMatcher.php
@@ -30,16 +30,16 @@ class ObjectAttributesMatcher extends AbstractContextAwareMatcher
     {
         $input = $this->getInput($tokens);
 
-        $firstToken = array_pop($tokens);
+        $firstToken = \array_pop($tokens);
         if (self::tokenIs($firstToken, self::T_STRING)) {
             // second token is the object operator
-            array_pop($tokens);
+            \array_pop($tokens);
         }
-        $objectToken = array_pop($tokens);
-        if (!is_array($objectToken)) {
+        $objectToken = \array_pop($tokens);
+        if (!\is_array($objectToken)) {
             return [];
         }
-        $objectName = str_replace('$', '', $objectToken[1]);
+        $objectName = \str_replace('$', '', $objectToken[1]);
 
         try {
             $object = $this->getVariable($objectName);
@@ -47,12 +47,12 @@ class ObjectAttributesMatcher extends AbstractContextAwareMatcher
             return [];
         }
 
-        if (!is_object($object)) {
+        if (!\is_object($object)) {
             return [];
         }
 
-        return array_filter(
-            array_keys(get_class_vars(get_class($object))),
+        return \array_filter(
+            \array_keys(\get_class_vars(\get_class($object))),
             function ($var) use ($input) {
                 return AbstractMatcher::startsWith($input, $var);
             }
@@ -64,8 +64,8 @@ class ObjectAttributesMatcher extends AbstractContextAwareMatcher
      */
     public function hasMatched(array $tokens)
     {
-        $token     = array_pop($tokens);
-        $prevToken = array_pop($tokens);
+        $token     = \array_pop($tokens);
+        $prevToken = \array_pop($tokens);
 
         switch (true) {
             case self::tokenIs($token, self::T_OBJECT_OPERATOR):
diff --git a/vendor/psy/psysh/src/TabCompletion/Matcher/ObjectMethodDefaultParametersMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/ObjectMethodDefaultParametersMatcher.php
index cb95ae7e..16fa0189 100644
--- a/vendor/psy/psysh/src/TabCompletion/Matcher/ObjectMethodDefaultParametersMatcher.php
+++ b/vendor/psy/psysh/src/TabCompletion/Matcher/ObjectMethodDefaultParametersMatcher.php
@@ -15,16 +15,16 @@ class ObjectMethodDefaultParametersMatcher extends AbstractDefaultParametersMatc
 {
     public function getMatches(array $tokens, array $info = [])
     {
-        $openBracket    = array_pop($tokens);
-        $functionName   = array_pop($tokens);
-        $methodOperator = array_pop($tokens);
+        $openBracket    = \array_pop($tokens);
+        $functionName   = \array_pop($tokens);
+        $methodOperator = \array_pop($tokens);
 
-        $objectToken = array_pop($tokens);
-        if (!is_array($objectToken)) {
+        $objectToken = \array_pop($tokens);
+        if (!\is_array($objectToken)) {
             return [];
         }
 
-        $objectName = str_replace('$', '', $objectToken[1]);
+        $objectName = \str_replace('$', '', $objectToken[1]);
 
         try {
             $object = $this->getVariable($objectName);
@@ -48,19 +48,19 @@ class ObjectMethodDefaultParametersMatcher extends AbstractDefaultParametersMatc
 
     public function hasMatched(array $tokens)
     {
-        $openBracket = array_pop($tokens);
+        $openBracket = \array_pop($tokens);
 
         if ($openBracket !== '(') {
             return false;
         }
 
-        $functionName = array_pop($tokens);
+        $functionName = \array_pop($tokens);
 
         if (!self::tokenIs($functionName, self::T_STRING)) {
             return false;
         }
 
-        $operator = array_pop($tokens);
+        $operator = \array_pop($tokens);
 
         if (!self::tokenIs($operator, self::T_OBJECT_OPERATOR)) {
             return false;
diff --git a/vendor/psy/psysh/src/TabCompletion/Matcher/ObjectMethodsMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/ObjectMethodsMatcher.php
index cc45b1d9..23c751c7 100644
--- a/vendor/psy/psysh/src/TabCompletion/Matcher/ObjectMethodsMatcher.php
+++ b/vendor/psy/psysh/src/TabCompletion/Matcher/ObjectMethodsMatcher.php
@@ -30,16 +30,16 @@ class ObjectMethodsMatcher extends AbstractContextAwareMatcher
     {
         $input = $this->getInput($tokens);
 
-        $firstToken = array_pop($tokens);
+        $firstToken = \array_pop($tokens);
         if (self::tokenIs($firstToken, self::T_STRING)) {
             // second token is the object operator
-            array_pop($tokens);
+            \array_pop($tokens);
         }
-        $objectToken = array_pop($tokens);
-        if (!is_array($objectToken)) {
+        $objectToken = \array_pop($tokens);
+        if (!\is_array($objectToken)) {
             return [];
         }
-        $objectName = str_replace('$', '', $objectToken[1]);
+        $objectName = \str_replace('$', '', $objectToken[1]);
 
         try {
             $object = $this->getVariable($objectName);
@@ -47,12 +47,12 @@ class ObjectMethodsMatcher extends AbstractContextAwareMatcher
             return [];
         }
 
-        if (!is_object($object)) {
+        if (!\is_object($object)) {
             return [];
         }
 
-        return array_filter(
-            get_class_methods($object),
+        return \array_filter(
+            \get_class_methods($object),
             function ($var) use ($input) {
                 return AbstractMatcher::startsWith($input, $var) &&
                     // also check that we do not suggest invoking a super method(__construct, __wakeup, …)
@@ -66,8 +66,8 @@ class ObjectMethodsMatcher extends AbstractContextAwareMatcher
      */
     public function hasMatched(array $tokens)
     {
-        $token     = array_pop($tokens);
-        $prevToken = array_pop($tokens);
+        $token     = \array_pop($tokens);
+        $prevToken = \array_pop($tokens);
 
         switch (true) {
             case self::tokenIs($token, self::T_OBJECT_OPERATOR):
diff --git a/vendor/psy/psysh/src/TabCompletion/Matcher/VariablesMatcher.php b/vendor/psy/psysh/src/TabCompletion/Matcher/VariablesMatcher.php
index 28685259..a142b7b2 100644
--- a/vendor/psy/psysh/src/TabCompletion/Matcher/VariablesMatcher.php
+++ b/vendor/psy/psysh/src/TabCompletion/Matcher/VariablesMatcher.php
@@ -25,9 +25,9 @@ class VariablesMatcher extends AbstractContextAwareMatcher
      */
     public function getMatches(array $tokens, array $info = [])
     {
-        $var = str_replace('$', '', $this->getInput($tokens));
+        $var = \str_replace('$', '', $this->getInput($tokens));
 
-        return array_filter(array_keys($this->getVariables()), function ($variable) use ($var) {
+        return \array_filter(\array_keys($this->getVariables()), function ($variable) use ($var) {
             return AbstractMatcher::startsWith($var, $variable);
         });
     }
@@ -37,11 +37,11 @@ class VariablesMatcher extends AbstractContextAwareMatcher
      */
     public function hasMatched(array $tokens)
     {
-        $token = array_pop($tokens);
+        $token = \array_pop($tokens);
 
         switch (true) {
             case self::hasToken([self::T_OPEN_TAG, self::T_VARIABLE], $token):
-            case is_string($token) && $token === '$':
+            case \is_string($token) && $token === '$':
             case self::isOperator($token):
                 return true;
         }
diff --git a/vendor/psy/psysh/src/Util/Docblock.php b/vendor/psy/psysh/src/Util/Docblock.php
index c7989471..750210ba 100644
--- a/vendor/psy/psysh/src/Util/Docblock.php
+++ b/vendor/psy/psysh/src/Util/Docblock.php
@@ -101,18 +101,18 @@ class Docblock
     protected static function prefixLength(array $lines)
     {
         // find only lines with interesting things
-        $lines = array_filter($lines, function ($line) {
-            return substr($line, strspn($line, "* \t\n\r\0\x0B"));
+        $lines = \array_filter($lines, function ($line) {
+            return \substr($line, \strspn($line, "* \t\n\r\0\x0B"));
         });
 
         // if we sort the lines, we only have to compare two items
-        sort($lines);
+        \sort($lines);
 
-        $first = reset($lines);
-        $last  = end($lines);
+        $first = \reset($lines);
+        $last  = \end($lines);
 
         // find the longest common substring
-        $count = min(strlen($first), strlen($last));
+        $count = \min(\strlen($first), \strlen($last));
         for ($i = 0; $i < $count; $i++) {
             if ($first[$i] !== $last[$i]) {
                 return $i;
@@ -130,15 +130,15 @@ class Docblock
     protected function parseComment($comment)
     {
         // Strip the opening and closing tags of the docblock
-        $comment = substr($comment, 3, -2);
+        $comment = \substr($comment, 3, -2);
 
         // Split into arrays of lines
-        $comment = array_filter(preg_split('/\r?\n\r?/', $comment));
+        $comment = \array_filter(\preg_split('/\r?\n\r?/', $comment));
 
         // Trim asterisks and whitespace from the beginning and whitespace from the end of lines
         $prefixLength = self::prefixLength($comment);
-        $comment = array_map(function ($line) use ($prefixLength) {
-            return rtrim(substr($line, $prefixLength));
+        $comment = \array_map(function ($line) use ($prefixLength) {
+            return \rtrim(\substr($line, $prefixLength));
         }, $comment);
 
         // Group the lines together by @tags
@@ -157,30 +157,30 @@ class Docblock
 
         // Parse the blocks
         foreach ($blocks as $block => $body) {
-            $body = trim(implode("\n", $body));
+            $body = \trim(\implode("\n", $body));
 
             if ($block === 0 && !self::isTagged($body)) {
                 // This is the description block
                 $this->desc = $body;
             } else {
                 // This block is tagged
-                $tag  = substr(self::strTag($body), 1);
-                $body = ltrim(substr($body, strlen($tag) + 2));
+                $tag  = \substr(self::strTag($body), 1);
+                $body = \ltrim(\substr($body, \strlen($tag) + 2));
 
                 if (isset(self::$vectors[$tag])) {
                     // The tagged block is a vector
-                    $count = count(self::$vectors[$tag]);
+                    $count = \count(self::$vectors[$tag]);
                     if ($body) {
-                        $parts = preg_split('/\s+/', $body, $count);
+                        $parts = \preg_split('/\s+/', $body, $count);
                     } else {
                         $parts = [];
                     }
 
                     // Default the trailing values
-                    $parts = array_pad($parts, $count, null);
+                    $parts = \array_pad($parts, $count, null);
 
                     // Store as a mapped array
-                    $this->tags[$tag][] = array_combine(self::$vectors[$tag], $parts);
+                    $this->tags[$tag][] = \array_combine(self::$vectors[$tag], $parts);
                 } else {
                     // The tagged block is only text
                     $this->tags[$tag][] = $body;
@@ -198,7 +198,7 @@ class Docblock
      */
     public function hasTag($tag)
     {
-        return is_array($this->tags) && array_key_exists($tag, $this->tags);
+        return \is_array($this->tags) && \array_key_exists($tag, $this->tags);
     }
 
     /**
@@ -222,7 +222,7 @@ class Docblock
      */
     public static function isTagged($str)
     {
-        return isset($str[1]) && $str[0] === '@' && ctype_alpha($str[1]);
+        return isset($str[1]) && $str[0] === '@' && !\preg_match('/[^A-Za-z]/', $str[1]);
     }
 
     /**
@@ -234,7 +234,7 @@ class Docblock
      */
     public static function strTag($str)
     {
-        if (preg_match('/^@[a-z0-9_]+/', $str, $matches)) {
+        if (\preg_match('/^@[a-z0-9_]+/', $str, $matches)) {
             return $matches[0];
         }
     }
diff --git a/vendor/psy/psysh/src/Util/Json.php b/vendor/psy/psysh/src/Util/Json.php
index 54ccf313..471f10e7 100644
--- a/vendor/psy/psysh/src/Util/Json.php
+++ b/vendor/psy/psysh/src/Util/Json.php
@@ -28,6 +28,6 @@ class Json
     {
         $opt |= JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
 
-        return json_encode($val, $opt);
+        return \json_encode($val, $opt);
     }
 }
diff --git a/vendor/psy/psysh/src/Util/Mirror.php b/vendor/psy/psysh/src/Util/Mirror.php
index 862d0bed..09c0b5b9 100644
--- a/vendor/psy/psysh/src/Util/Mirror.php
+++ b/vendor/psy/psysh/src/Util/Mirror.php
@@ -44,10 +44,10 @@ class Mirror
      */
     public static function get($value, $member = null, $filter = 15)
     {
-        if ($member === null && is_string($value)) {
-            if (function_exists($value)) {
+        if ($member === null && \is_string($value)) {
+            if (\function_exists($value)) {
                 return new \ReflectionFunction($value);
-            } elseif (defined($value) || ReflectionConstant_::isMagicConstant($value)) {
+            } elseif (\defined($value) || ReflectionConstant_::isMagicConstant($value)) {
                 return new ReflectionConstant_($value);
             }
         }
@@ -65,10 +65,10 @@ class Mirror
         } elseif ($filter & self::STATIC_PROPERTY && $class->hasProperty($member) && $class->getProperty($member)->isStatic()) {
             return $class->getProperty($member);
         } else {
-            throw new RuntimeException(sprintf(
+            throw new RuntimeException(\sprintf(
                 'Unknown member %s on class %s',
                 $member,
-                is_object($value) ? get_class($value) : $value
+                \is_object($value) ? \get_class($value) : $value
             ));
         }
     }
@@ -84,13 +84,13 @@ class Mirror
      */
     private static function getClass($value)
     {
-        if (is_object($value)) {
+        if (\is_object($value)) {
             return new \ReflectionObject($value);
         }
 
-        if (!is_string($value)) {
+        if (!\is_string($value)) {
             throw new \InvalidArgumentException('Mirror expects an object or class');
-        } elseif (!class_exists($value) && !interface_exists($value) && !trait_exists($value)) {
+        } elseif (!\class_exists($value) && !\interface_exists($value) && !\trait_exists($value)) {
             throw new \InvalidArgumentException('Unknown class or function: ' . $value);
         }
 
diff --git a/vendor/psy/psysh/src/Util/Str.php b/vendor/psy/psysh/src/Util/Str.php
index 88c052af..47d52399 100644
--- a/vendor/psy/psysh/src/Util/Str.php
+++ b/vendor/psy/psysh/src/Util/Str.php
@@ -61,9 +61,9 @@ EOS;
      */
     public static function unvis($input)
     {
-        $output = preg_replace_callback(self::UNVIS_RX, 'self::unvisReplace', $input);
+        $output = \preg_replace_callback(self::UNVIS_RX, 'self::unvisReplace', $input);
         // other escapes & octal are handled by stripcslashes
-        return stripcslashes($output);
+        return \stripcslashes($output);
     }
 
     /**
@@ -88,27 +88,27 @@ EOS;
             $chr = $match[3];
             // unvis S_META1
             $cp = 0200;
-            $cp |= ord($chr);
+            $cp |= \ord($chr);
 
-            return chr($cp);
+            return \chr($cp);
         }
         // \M^(.)
         if (isset($match[4]) && $match[4] !== '') {
             $chr = $match[4];
             // unvis S_META | S_CTRL
             $cp = 0200;
-            $cp |= ($chr === '?') ? 0177 : ord($chr) & 037;
+            $cp |= ($chr === '?') ? 0177 : \ord($chr) & 037;
 
-            return chr($cp);
+            return \chr($cp);
         }
         // \^(.)
         if (isset($match[5]) && $match[5] !== '') {
             $chr = $match[5];
             // unvis S_CTRL
             $cp = 0;
-            $cp |= ($chr === '?') ? 0177 : ord($chr) & 037;
+            $cp |= ($chr === '?') ? 0177 : \ord($chr) & 037;
 
-            return chr($cp);
+            return \chr($cp);
         }
     }
 }
diff --git a/vendor/psy/psysh/src/VarDumper/Dumper.php b/vendor/psy/psysh/src/VarDumper/Dumper.php
index a6e9e875..cc13b265 100644
--- a/vendor/psy/psysh/src/VarDumper/Dumper.php
+++ b/vendor/psy/psysh/src/VarDumper/Dumper.php
@@ -67,20 +67,20 @@ class Dumper extends CliDumper
     protected function style($style, $value, $attr = [])
     {
         if ('ref' === $style) {
-            $value = strtr($value, '@', '#');
+            $value = \strtr($value, '@', '#');
         }
 
         $styled = '';
         $map = self::$controlCharsMap;
         $cchr = $this->styles['cchr'];
 
-        $chunks = preg_split(self::$controlCharsRx, $value, null, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+        $chunks = \preg_split(self::$controlCharsRx, $value, null, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
         foreach ($chunks as $chunk) {
-            if (preg_match(self::$onlyControlCharsRx, $chunk)) {
+            if (\preg_match(self::$onlyControlCharsRx, $chunk)) {
                 $chars = '';
                 $i = 0;
                 do {
-                    $chars .= isset($map[$chunk[$i]]) ? $map[$chunk[$i]] : sprintf('\x%02X', ord($chunk[$i]));
+                    $chars .= isset($map[$chunk[$i]]) ? $map[$chunk[$i]] : \sprintf('\x%02X', \ord($chunk[$i]));
                 } while (isset($chunk[++$i]));
 
                 $chars = $this->formatter->escape($chars);
diff --git a/vendor/psy/psysh/src/VarDumper/Presenter.php b/vendor/psy/psysh/src/VarDumper/Presenter.php
index 400778ab..4f821e0c 100644
--- a/vendor/psy/psysh/src/VarDumper/Presenter.php
+++ b/vendor/psy/psysh/src/VarDumper/Presenter.php
@@ -49,14 +49,14 @@ class Presenter
     public function __construct(OutputFormatter $formatter, $forceArrayIndexes = false)
     {
         // Work around https://github.com/symfony/symfony/issues/23572
-        $oldLocale = setlocale(LC_NUMERIC, 0);
-        setlocale(LC_NUMERIC, 'C');
+        $oldLocale = \setlocale(LC_NUMERIC, 0);
+        \setlocale(LC_NUMERIC, 'C');
 
         $this->dumper = new Dumper($formatter, $forceArrayIndexes);
         $this->dumper->setStyles($this->styles);
 
         // Now put the locale back
-        setlocale(LC_NUMERIC, $oldLocale);
+        \setlocale(LC_NUMERIC, $oldLocale);
 
         $this->cloner = new Cloner();
         $this->cloner->addCasters(['*' => function ($obj, array $a, Stub $stub, $isNested, $filter = 0) {
@@ -116,8 +116,8 @@ class Presenter
         }
 
         // Work around https://github.com/symfony/symfony/issues/23572
-        $oldLocale = setlocale(LC_NUMERIC, 0);
-        setlocale(LC_NUMERIC, 'C');
+        $oldLocale = \setlocale(LC_NUMERIC, 0);
+        \setlocale(LC_NUMERIC, 'C');
 
         $output = '';
         $this->dumper->dump($data, function ($line, $depth) use (&$output) {
@@ -125,12 +125,12 @@ class Presenter
                 if ('' !== $output) {
                     $output .= PHP_EOL;
                 }
-                $output .= str_repeat('  ', $depth) . $line;
+                $output .= \str_repeat('  ', $depth) . $line;
             }
         });
 
         // Now put the locale back
-        setlocale(LC_NUMERIC, $oldLocale);
+        \setlocale(LC_NUMERIC, $oldLocale);
 
         return OutputFormatter::escape($output);
     }
diff --git a/vendor/psy/psysh/src/VersionUpdater/GitHubChecker.php b/vendor/psy/psysh/src/VersionUpdater/GitHubChecker.php
index e62a4d27..40cfc2e2 100644
--- a/vendor/psy/psysh/src/VersionUpdater/GitHubChecker.php
+++ b/vendor/psy/psysh/src/VersionUpdater/GitHubChecker.php
@@ -24,7 +24,7 @@ class GitHubChecker implements Checker
      */
     public function isLatest()
     {
-        return version_compare(Shell::VERSION, $this->getLatest(), '>=');
+        return \version_compare(Shell::VERSION, $this->getLatest(), '>=');
     }
 
     /**
@@ -68,22 +68,22 @@ class GitHubChecker implements Checker
      */
     public function fetchLatestRelease()
     {
-        $context = stream_context_create([
+        $context = \stream_context_create([
             'http' => [
                 'user_agent' => 'PsySH/' . Shell::VERSION,
                 'timeout'    => 3,
             ],
         ]);
 
-        set_error_handler(function () {
+        \set_error_handler(function () {
             // Just ignore all errors with this. The checker will throw an exception
             // if it doesn't work :)
         });
 
-        $result = @file_get_contents(self::URL, false, $context);
+        $result = @\file_get_contents(self::URL, false, $context);
 
-        restore_error_handler();
+        \restore_error_handler();
 
-        return json_decode($result);
+        return \json_decode($result);
     }
 }
diff --git a/vendor/psy/psysh/src/VersionUpdater/IntervalChecker.php b/vendor/psy/psysh/src/VersionUpdater/IntervalChecker.php
index 712f2758..7e0da432 100644
--- a/vendor/psy/psysh/src/VersionUpdater/IntervalChecker.php
+++ b/vendor/psy/psysh/src/VersionUpdater/IntervalChecker.php
@@ -11,8 +11,6 @@
 
 namespace Psy\VersionUpdater;
 
-use Psy\Shell;
-
 class IntervalChecker extends GitHubChecker
 {
     private $cacheFile;
@@ -27,7 +25,7 @@ class IntervalChecker extends GitHubChecker
     public function fetchLatestRelease()
     {
         // Read the cached file
-        $cached = json_decode(@file_get_contents($this->cacheFile, false));
+        $cached = \json_decode(@\file_get_contents($this->cacheFile, false));
         if ($cached && isset($cached->last_check) && isset($cached->release)) {
             $now = new \DateTime();
             $lastCheck = new \DateTime($cached->last_check);
@@ -60,10 +58,10 @@ class IntervalChecker extends GitHubChecker
     private function updateCache($release)
     {
         $data = [
-            'last_check' => date(DATE_ATOM),
+            'last_check' => \date(DATE_ATOM),
             'release'    => $release,
         ];
 
-        file_put_contents($this->cacheFile, json_encode($data));
+        \file_put_contents($this->cacheFile, \json_encode($data));
     }
 }
diff --git a/vendor/psy/psysh/src/functions.php b/vendor/psy/psysh/src/functions.php
index b07c4920..4e875bba 100644
--- a/vendor/psy/psysh/src/functions.php
+++ b/vendor/psy/psysh/src/functions.php
@@ -18,7 +18,7 @@ use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputOption;
 use XdgBaseDir\Xdg;
 
-if (!function_exists('Psy\sh')) {
+if (!\function_exists('Psy\sh')) {
     /**
      * Command to return the eval-able code to startup PsySH.
      *
@@ -32,7 +32,7 @@ if (!function_exists('Psy\sh')) {
     }
 }
 
-if (!function_exists('Psy\debug')) {
+if (!\function_exists('Psy\debug')) {
     /**
      * Invoke a Psy Shell from the current context.
      *
@@ -89,7 +89,7 @@ if (!function_exists('Psy\debug')) {
             $sh->addInput('whereami -n2', true);
         }
 
-        if (is_string($bindTo)) {
+        if (\is_string($bindTo)) {
             $sh->setBoundClass($bindTo);
         } elseif ($bindTo !== null) {
             $sh->setBoundObject($bindTo);
@@ -101,7 +101,7 @@ if (!function_exists('Psy\debug')) {
     }
 }
 
-if (!function_exists('Psy\info')) {
+if (!\function_exists('Psy\info')) {
     /**
      * Get a bunch of debugging info about the current PsySH environment and
      * configuration.
@@ -123,12 +123,12 @@ if (!function_exists('Psy\info')) {
         }
 
         $xdg = new Xdg();
-        $home = rtrim(str_replace('\\', '/', $xdg->getHomeDir()), '/');
-        $homePattern = '#^' . preg_quote($home, '#') . '/#';
+        $home = \rtrim(\str_replace('\\', '/', $xdg->getHomeDir()), '/');
+        $homePattern = '#^' . \preg_quote($home, '#') . '/#';
 
         $prettyPath = function ($path) use ($homePattern) {
-            if (is_string($path)) {
-                return preg_replace($homePattern, '~/', $path);
+            if (\is_string($path)) {
+                return \preg_replace($homePattern, '~/', $path);
             } else {
                 return $path;
             }
@@ -146,7 +146,7 @@ if (!function_exists('Psy\info')) {
             'config file'         => [
                 'default config file' => $prettyPath($config->getConfigFile()),
                 'local config file'   => $prettyPath($config->getLocalConfigFile()),
-                'PSYSH_CONFIG env'    => $prettyPath(getenv('PSYSH_CONFIG')),
+                'PSYSH_CONFIG env'    => $prettyPath(\getenv('PSYSH_CONFIG')),
             ],
             // 'config dir'  => $config->getConfigDir(),
             // 'data dir'    => $config->getDataDir(),
@@ -171,12 +171,12 @@ if (!function_exists('Psy\info')) {
         ];
 
         if ($config->hasReadline()) {
-            $info = readline_info();
+            $info = \readline_info();
 
             $readline = [
                 'readline available' => true,
                 'readline enabled'   => $config->useReadline(),
-                'readline service'   => get_class($config->getReadline()),
+                'readline service'   => \get_class($config->getReadline()),
             ];
 
             if (isset($info['library_version'])) {
@@ -193,12 +193,12 @@ if (!function_exists('Psy\info')) {
         }
 
         $pcntl = [
-            'pcntl available' => function_exists('pcntl_signal'),
-            'posix available' => function_exists('posix_getpid'),
+            'pcntl available' => \function_exists('pcntl_signal'),
+            'posix available' => \function_exists('posix_getpid'),
         ];
 
-        $disabledFuncs = array_map('trim', explode(',', ini_get('disable_functions')));
-        if (in_array('pcntl_signal', $disabledFuncs) || in_array('pcntl_fork', $disabledFuncs)) {
+        $disabledFuncs = \array_map('trim', \explode(',', \ini_get('disable_functions')));
+        if (\in_array('pcntl_signal', $disabledFuncs) || \in_array('pcntl_fork', $disabledFuncs)) {
             $pcntl['pcntl disabled'] = true;
         }
 
@@ -226,7 +226,7 @@ if (!function_exists('Psy\info')) {
                                 $val = $d->format(\DateTime::RFC2822);
                                 break;
                         }
-                        $key = 'db ' . str_replace('_', ' ', $key);
+                        $key = 'db ' . \str_replace('_', ' ', $key);
                         $docs[$key] = $val;
                     }
                 } else {
@@ -243,25 +243,25 @@ if (!function_exists('Psy\info')) {
 
         $autocomplete = [
             'tab completion enabled' => $config->useTabCompletion(),
-            'custom matchers'        => array_map('get_class', $config->getTabCompletionMatchers()),
+            'custom matchers'        => \array_map('get_class', $config->getTabCompletionMatchers()),
             'bracketed paste'        => $config->useBracketedPaste(),
         ];
 
         // Shenanigans, but totally justified.
         if ($shell = Sudo::fetchProperty($config, 'shell')) {
-            $core['loop listeners'] = array_map('get_class', Sudo::fetchProperty($shell, 'loopListeners'));
-            $core['commands']       = array_map('get_class', $shell->all());
+            $core['loop listeners'] = \array_map('get_class', Sudo::fetchProperty($shell, 'loopListeners'));
+            $core['commands']       = \array_map('get_class', $shell->all());
 
-            $autocomplete['custom matchers'] = array_map('get_class', Sudo::fetchProperty($shell, 'matchers'));
+            $autocomplete['custom matchers'] = \array_map('get_class', Sudo::fetchProperty($shell, 'matchers'));
         }
 
         // @todo Show Presenter / custom casters.
 
-        return array_merge($core, compact('updates', 'pcntl', 'readline', 'history', 'docs', 'autocomplete'));
+        return \array_merge($core, \compact('updates', 'pcntl', 'readline', 'history', 'docs', 'autocomplete'));
     }
 }
 
-if (!function_exists('Psy\bin')) {
+if (!\function_exists('Psy\bin')) {
     /**
      * `psysh` command line executable.
      *
@@ -313,7 +313,7 @@ if (!function_exists('Psy\bin')) {
                 }
 
                 $version = $shell->getVersion();
-                $name    = basename(reset($_SERVER['argv']));
+                $name    = \basename(\reset($_SERVER['argv']));
                 echo <<<EOL
 $version
 
diff --git a/vendor/psy/psysh/test/ClassWithSecrets.php b/vendor/psy/psysh/test/ClassWithSecrets.php
index 92eaf76d..adf27e3f 100644
--- a/vendor/psy/psysh/test/ClassWithSecrets.php
+++ b/vendor/psy/psysh/test/ClassWithSecrets.php
@@ -20,7 +20,7 @@ class ClassWithSecrets
     private static function privateStaticMethod($extra = null)
     {
         if ($extra !== null) {
-            return 'private and static and method with ' . json_encode($extra);
+            return 'private and static and method with ' . \json_encode($extra);
         }
 
         return 'private and static and method';
@@ -29,7 +29,7 @@ class ClassWithSecrets
     private function privateMethod($extra = null)
     {
         if ($extra !== null) {
-            return 'private and method with ' . json_encode($extra);
+            return 'private and method with ' . \json_encode($extra);
         }
 
         return 'private and method';
diff --git a/vendor/psy/psysh/test/CodeCleaner/FinalClassPassTest.php b/vendor/psy/psysh/test/CodeCleaner/FinalClassPassTest.php
index ef6eae66..1808d11f 100644
--- a/vendor/psy/psysh/test/CodeCleaner/FinalClassPassTest.php
+++ b/vendor/psy/psysh/test/CodeCleaner/FinalClassPassTest.php
@@ -37,7 +37,7 @@ class FinalClassPassTest extends CodeCleanerTestCase
             // array('namespace A { final class B {} } namespace C { class D extends \\A\\B {} }'),
         ];
 
-        if (!defined('HHVM_VERSION')) {
+        if (!\defined('HHVM_VERSION')) {
             // For some reason Closure isn't final in HHVM?
             $data[] = ['class A extends \\Closure {}'];
         }
diff --git a/vendor/psy/psysh/test/CodeCleaner/Fixtures/TraitWithStatic.php b/vendor/psy/psysh/test/CodeCleaner/Fixtures/TraitWithStatic.php
new file mode 100644
index 00000000..132dc061
--- /dev/null
+++ b/vendor/psy/psysh/test/CodeCleaner/Fixtures/TraitWithStatic.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of Psy Shell.
+ *
+ * (c) 2012-2018 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Psy\Test\CodeCleaner\Fixtures;
+
+trait TraitWithStatic
+{
+    public static function doStuff()
+    {
+        // Don't actually do stuff.
+    }
+}
diff --git a/vendor/psy/psysh/test/CodeCleaner/FunctionReturnInWriteContextPassTest.php b/vendor/psy/psysh/test/CodeCleaner/FunctionReturnInWriteContextPassTest.php
index fb323ab5..85f6a04c 100644
--- a/vendor/psy/psysh/test/CodeCleaner/FunctionReturnInWriteContextPassTest.php
+++ b/vendor/psy/psysh/test/CodeCleaner/FunctionReturnInWriteContextPassTest.php
@@ -49,7 +49,7 @@ class FunctionReturnInWriteContextPassTest extends CodeCleanerTestCase
             $this->traverser->traverse($this->parse('isset(strtolower("A"))'));
             $this->fail();
         } catch (FatalErrorException $e) {
-            if (version_compare(PHP_VERSION, '5.5', '>=')) {
+            if (\version_compare(PHP_VERSION, '5.5', '>=')) {
                 $this->assertContains(
                     'Cannot use isset() on the result of a function call (you can use "null !== func()" instead)',
                     $e->getMessage()
@@ -66,7 +66,7 @@ class FunctionReturnInWriteContextPassTest extends CodeCleanerTestCase
      */
     public function testEmpty()
     {
-        if (version_compare(PHP_VERSION, '5.5', '>=')) {
+        if (\version_compare(PHP_VERSION, '5.5', '>=')) {
             $this->markTestSkipped();
         }
 
diff --git a/vendor/psy/psysh/test/CodeCleaner/LegacyEmptyPassTest.php b/vendor/psy/psysh/test/CodeCleaner/LegacyEmptyPassTest.php
index 5afb5759..5c4c7b05 100644
--- a/vendor/psy/psysh/test/CodeCleaner/LegacyEmptyPassTest.php
+++ b/vendor/psy/psysh/test/CodeCleaner/LegacyEmptyPassTest.php
@@ -31,7 +31,7 @@ class LegacyEmptyPassTest extends CodeCleanerTestCase
 
     public function invalidStatements()
     {
-        if (version_compare(PHP_VERSION, '5.5', '>=')) {
+        if (\version_compare(PHP_VERSION, '5.5', '>=')) {
             return [
                 ['empty()'],
             ];
@@ -58,7 +58,7 @@ class LegacyEmptyPassTest extends CodeCleanerTestCase
 
     public function validStatements()
     {
-        if (version_compare(PHP_VERSION, '5.5', '<')) {
+        if (\version_compare(PHP_VERSION, '5.5', '<')) {
             return [
                 ['empty($foo)'],
             ];
diff --git a/vendor/psy/psysh/test/CodeCleaner/ListPassTest.php b/vendor/psy/psysh/test/CodeCleaner/ListPassTest.php
index 95cf3a74..b7a360d6 100644
--- a/vendor/psy/psysh/test/CodeCleaner/ListPassTest.php
+++ b/vendor/psy/psysh/test/CodeCleaner/ListPassTest.php
@@ -26,7 +26,7 @@ class ListPassTest extends CodeCleanerTestCase
      */
     public function testProcessInvalidStatement($code, $expectedMessage)
     {
-        if (method_exists($this, 'setExpectedException')) {
+        if (\method_exists($this, 'setExpectedException')) {
             $this->setExpectedException('Psy\Exception\ParseErrorException', $expectedMessage);
         } else {
             $this->expectExceptionMessage($expectedMessage);
@@ -50,20 +50,23 @@ class ListPassTest extends CodeCleanerTestCase
             ['list("a") = array(1)', $errorPhpParserSyntax],
         ];
 
-        if (version_compare(PHP_VERSION, '7.1', '<')) {
-            return array_merge($invalidExpr, [
+        if (\version_compare(PHP_VERSION, '7.1', '<')) {
+            return \array_merge($invalidExpr, [
                 ['list("a" => _) = array("a" => 1)', $errorPhpParserSyntax],
                 ['[] = []', $errorShortListAssign],
                 ['[$a] = [1]', $errorShortListAssign],
                 ['list("a" => $a) = array("a" => 1)', $errorAssocListAssign],
+                ['[$a[0], $a[1]] = [1, 2]', $errorShortListAssign],
+                ['[$a->b, $a->c] = [1, 2]', $errorShortListAssign],
             ]);
         }
 
-        return array_merge($invalidExpr, [
+        return \array_merge($invalidExpr, [
             ['list("a" => _) = array("a" => 1)', $errorPhpParserSyntax],
             ['["a"] = [1]', $errorNonVariableAssign],
             ['[] = []', $errorEmptyList],
             ['[,] = [1,2]', $errorEmptyList],
+            ['[,,] = [1,2,3]', $errorEmptyList],
         ]);
     }
 
@@ -84,8 +87,8 @@ class ListPassTest extends CodeCleanerTestCase
             ['list($x, $y) = array(1, 2)'],
         ];
 
-        if (version_compare(PHP_VERSION, '7.1', '>=')) {
-            return array_merge($validExpr, [
+        if (\version_compare(PHP_VERSION, '7.1', '>=')) {
+            return \array_merge($validExpr, [
                 ['[$a] = array(1)'],
                 ['list($b) = [2]'],
                 ['[$x, $y] = array(1, 2)'],
@@ -96,6 +99,14 @@ class ListPassTest extends CodeCleanerTestCase
                 ['[,$b] = [1,2,3]'],
                 ['[$a,,$c] = [1,2,3]'],
                 ['[$a,,,] = [1,2,3]'],
+                ['[$a[0], $a[1]] = [1, 2]'],
+                ['[$a[0][0][0], $a[0][0][1]] = [1, 2]'],
+                ['[$a->b, $a->c] = [1, 2]'],
+                ['[$a->b[0], $a->c[1]] = [1, 2]'],
+                ['[$a[0]->b[0], $a[0]->c[1]] = [1, 2]'],
+                ['[$a[$b->c + $b->d]] = [1]'],
+                ['[$a->c()->d, $a->c()->e] = [1, 2]'],
+                ['[x()->a, x()->b] = [1, 2]'],
             ]);
         }
 
diff --git a/vendor/psy/psysh/test/CodeCleaner/NamespacePassTest.php b/vendor/psy/psysh/test/CodeCleaner/NamespacePassTest.php
index 0c28dc6e..e8f01396 100644
--- a/vendor/psy/psysh/test/CodeCleaner/NamespacePassTest.php
+++ b/vendor/psy/psysh/test/CodeCleaner/NamespacePassTest.php
@@ -43,7 +43,7 @@ class NamespacePassTest extends CodeCleanerTestCase
         // A new block namespace clears out the current namespace...
         $this->parseAndTraverse('namespace Gamma { array_merge(); }');
 
-        if (defined('PhpParser\\Node\\Stmt\\Namespace_::KIND_SEMICOLON')) {
+        if (\defined('PhpParser\\Node\\Stmt\\Namespace_::KIND_SEMICOLON')) {
             $this->assertNull($this->cleaner->getNamespace());
         } else {
             // But not for PHP-Parser < v3.1.2 :(
diff --git a/vendor/psy/psysh/test/CodeCleaner/NoReturnValueTest.php b/vendor/psy/psysh/test/CodeCleaner/NoReturnValueTest.php
index 6a7d009a..11e9d013 100644
--- a/vendor/psy/psysh/test/CodeCleaner/NoReturnValueTest.php
+++ b/vendor/psy/psysh/test/CodeCleaner/NoReturnValueTest.php
@@ -20,7 +20,7 @@ class NoReturnValueTest extends ParserTestCase
     public function testCreate()
     {
         $stmt = NoReturnValue::create();
-        if (class_exists('PhpParser\Node\Stmt\Expression')) {
+        if (\class_exists('PhpParser\Node\Stmt\Expression')) {
             $stmt = new Expression($stmt);
         }
 
diff --git a/vendor/psy/psysh/test/CodeCleaner/RequirePassTest.php b/vendor/psy/psysh/test/CodeCleaner/RequirePassTest.php
index 0b7b3bc3..6640e639 100644
--- a/vendor/psy/psysh/test/CodeCleaner/RequirePassTest.php
+++ b/vendor/psy/psysh/test/CodeCleaner/RequirePassTest.php
@@ -70,7 +70,7 @@ class RequirePassTest extends CodeCleanerTestCase
      */
     public function testResolveEmptyWarnings($file)
     {
-        if (!E_WARNING & error_reporting()) {
+        if (!E_WARNING & \error_reporting()) {
             $this->markTestSkipped();
         }
 
diff --git a/vendor/psy/psysh/test/CodeCleaner/StrictTypesPassTest.php b/vendor/psy/psysh/test/CodeCleaner/StrictTypesPassTest.php
index ee147824..54186190 100644
--- a/vendor/psy/psysh/test/CodeCleaner/StrictTypesPassTest.php
+++ b/vendor/psy/psysh/test/CodeCleaner/StrictTypesPassTest.php
@@ -17,7 +17,7 @@ class StrictTypesPassTest extends CodeCleanerTestCase
 {
     public function setUp()
     {
-        if (version_compare(PHP_VERSION, '7.0', '<')) {
+        if (\version_compare(PHP_VERSION, '7.0', '<')) {
             $this->markTestSkipped();
         }
 
diff --git a/vendor/psy/psysh/test/CodeCleaner/UseStatementPassTest.php b/vendor/psy/psysh/test/CodeCleaner/UseStatementPassTest.php
index aedfd499..4d5ac342 100644
--- a/vendor/psy/psysh/test/CodeCleaner/UseStatementPassTest.php
+++ b/vendor/psy/psysh/test/CodeCleaner/UseStatementPassTest.php
@@ -80,7 +80,7 @@ class UseStatementPassTest extends CodeCleanerTestCase
 
     public function groupUseStatements()
     {
-        if (version_compare(PHP_VERSION, '7.0', '<')) {
+        if (\version_compare(PHP_VERSION, '7.0', '<')) {
             $this->markTestSkipped();
         }
 
diff --git a/vendor/psy/psysh/test/CodeCleaner/ValidClassNamePassTest.php b/vendor/psy/psysh/test/CodeCleaner/ValidClassNamePassTest.php
index 67b15750..2d9ed60b 100644
--- a/vendor/psy/psysh/test/CodeCleaner/ValidClassNamePassTest.php
+++ b/vendor/psy/psysh/test/CodeCleaner/ValidClassNamePassTest.php
@@ -172,6 +172,7 @@ class ValidClassNamePassTest extends CodeCleanerTestCase
             ['DateTime::$someMethod()'],
             ['Psy\Test\CodeCleaner\Fixtures\ClassWithStatic::doStuff()'],
             ['Psy\Test\CodeCleaner\Fixtures\ClassWithCallStatic::doStuff()'],
+            ['Psy\Test\CodeCleaner\Fixtures\TraitWithStatic::doStuff()'],
 
             // Allow `self` and `static` as class names.
             ['
@@ -305,12 +306,12 @@ class ValidClassNamePassTest extends CodeCleanerTestCase
         ];
 
         // Ugh. There's gotta be a better way to test for this.
-        if (class_exists('PhpParser\ParserFactory')) {
+        if (\class_exists('PhpParser\ParserFactory')) {
             // PHP 7.0 anonymous classes, only supported by PHP Parser v2.x
             $valid[] = ['$obj = new class() {}'];
         }
 
-        if (version_compare(PHP_VERSION, '5.5', '>=')) {
+        if (\version_compare(PHP_VERSION, '5.5', '>=')) {
             $valid[] = ['interface A {} A::class'];
             $valid[] = ['interface A {} A::CLASS'];
             $valid[] = ['class A {} A::class'];
diff --git a/vendor/psy/psysh/test/CodeCleaner/ValidConstructorPassTest.php b/vendor/psy/psysh/test/CodeCleaner/ValidConstructorPassTest.php
index c0379b26..4f7e40c4 100644
--- a/vendor/psy/psysh/test/CodeCleaner/ValidConstructorPassTest.php
+++ b/vendor/psy/psysh/test/CodeCleaner/ValidConstructorPassTest.php
@@ -47,7 +47,7 @@ class ValidConstructorPassTest extends CodeCleanerTestCase
             ['class A { private static function a() {}}'],
         ];
 
-        if (version_compare(PHP_VERSION, '7.0', '>=')) {
+        if (\version_compare(PHP_VERSION, '7.0', '>=')) {
             $data[] = ['class A { public function A(): ?array {}}'];
             $data[] = ['class A { public function a(): ?array {}}'];
         }
@@ -82,7 +82,7 @@ class ValidConstructorPassTest extends CodeCleanerTestCase
             ['namespace B; class A { private static function A() {}}'],
         ];
 
-        if (version_compare(PHP_VERSION, '7.0', '>=')) {
+        if (\version_compare(PHP_VERSION, '7.0', '>=')) {
             $data[] = ['class A { public static function A() {} public function __construct() {}}'];
             $data[] = ['class A { private function __construct() {} public static function A(): ?array {}}'];
             $data[] = ['namespace B; class A { private static function A(): ?array {}}'];
diff --git a/vendor/psy/psysh/test/CodeCleanerTest.php b/vendor/psy/psysh/test/CodeCleanerTest.php
index 40ec6b42..2195a4ff 100644
--- a/vendor/psy/psysh/test/CodeCleanerTest.php
+++ b/vendor/psy/psysh/test/CodeCleanerTest.php
@@ -79,7 +79,7 @@ class CodeCleanerTest extends \PHPUnit\Framework\TestCase
      */
     public function testMoreUnclosedStatements(array $lines)
     {
-        if (defined('HHVM_VERSION')) {
+        if (\defined('HHVM_VERSION')) {
             $this->markTestSkipped('HHVM not supported.');
         }
 
diff --git a/vendor/psy/psysh/test/ConfigurationTest.php b/vendor/psy/psysh/test/ConfigurationTest.php
index a250d834..b7b6c0c0 100644
--- a/vendor/psy/psysh/test/ConfigurationTest.php
+++ b/vendor/psy/psysh/test/ConfigurationTest.php
@@ -30,10 +30,10 @@ class ConfigurationTest extends \PHPUnit\Framework\TestCase
     {
         $config = $this->getConfig();
 
-        $this->assertSame(function_exists('readline'), $config->hasReadline());
-        $this->assertSame(function_exists('readline'), $config->useReadline());
-        $this->assertSame(function_exists('pcntl_signal'), $config->hasPcntl());
-        $this->assertSame(function_exists('pcntl_signal'), $config->usePcntl());
+        $this->assertSame(\function_exists('readline'), $config->hasReadline());
+        $this->assertSame(\function_exists('readline'), $config->useReadline());
+        $this->assertSame(\function_exists('pcntl_signal'), $config->hasPcntl());
+        $this->assertSame(\function_exists('pcntl_signal'), $config->usePcntl());
         $this->assertFalse($config->requireSemicolons());
         $this->assertSame(Configuration::COLOR_MODE_AUTO, $config->colorMode());
         $this->assertNull($config->getStartupMessage());
@@ -57,20 +57,20 @@ class ConfigurationTest extends \PHPUnit\Framework\TestCase
      */
     public function testFilesAndDirectories($home, $configFile, $historyFile, $manualDbFile)
     {
-        $oldHome = getenv('HOME');
-        putenv("HOME=$home");
+        $oldHome = \getenv('HOME');
+        \putenv("HOME=$home");
 
         $config = new Configuration();
-        $this->assertSame(realpath($configFile),   realpath($config->getConfigFile()));
-        $this->assertSame(realpath($historyFile),  realpath($config->getHistoryFile()));
-        $this->assertSame(realpath($manualDbFile), realpath($config->getManualDbFile()));
+        $this->assertSame(\realpath($configFile),   \realpath($config->getConfigFile()));
+        $this->assertSame(\realpath($historyFile),  \realpath($config->getHistoryFile()));
+        $this->assertSame(\realpath($manualDbFile), \realpath($config->getManualDbFile()));
 
-        putenv("HOME=$oldHome");
+        \putenv("HOME=$oldHome");
     }
 
     public function directories()
     {
-        $base = realpath(__DIR__ . '/fixtures');
+        $base = \realpath(__DIR__ . '/fixtures');
 
         return [
             [
@@ -125,21 +125,21 @@ class ConfigurationTest extends \PHPUnit\Framework\TestCase
     {
         $config = $this->getConfig(__DIR__ . '/fixtures/config.php');
 
-        $runtimeDir = $this->joinPath(realpath(sys_get_temp_dir()), 'psysh_test', 'withconfig', 'temp');
+        $runtimeDir = $this->joinPath(\realpath(\sys_get_temp_dir()), 'psysh_test', 'withconfig', 'temp');
 
-        $this->assertStringStartsWith($runtimeDir, realpath($config->getTempFile('foo', 123)));
-        $this->assertStringStartsWith($runtimeDir, realpath(dirname($config->getPipe('pipe', 123))));
-        $this->assertStringStartsWith($runtimeDir, realpath($config->getRuntimeDir()));
+        $this->assertStringStartsWith($runtimeDir, \realpath($config->getTempFile('foo', 123)));
+        $this->assertStringStartsWith($runtimeDir, \realpath(\dirname($config->getPipe('pipe', 123))));
+        $this->assertStringStartsWith($runtimeDir, \realpath($config->getRuntimeDir()));
 
-        $this->assertSame(function_exists('readline'), $config->useReadline());
+        $this->assertSame(\function_exists('readline'), $config->useReadline());
         $this->assertFalse($config->usePcntl());
         $this->assertSame(E_ALL & ~E_NOTICE, $config->errorLoggingLevel());
     }
 
     public function testLoadLocalConfigFile()
     {
-        $oldPwd = getcwd();
-        chdir(realpath(__DIR__ . '/fixtures/project/'));
+        $oldPwd = \getcwd();
+        \chdir(\realpath(__DIR__ . '/fixtures/project/'));
 
         $config = new Configuration();
 
@@ -153,7 +153,7 @@ class ConfigurationTest extends \PHPUnit\Framework\TestCase
         $this->assertFalse($config->requireSemicolons());
         $this->assertTrue($config->useUnicode());
 
-        chdir($oldPwd);
+        \chdir($oldPwd);
     }
 
     /**
@@ -166,7 +166,7 @@ class ConfigurationTest extends \PHPUnit\Framework\TestCase
 
     private function joinPath()
     {
-        return implode(DIRECTORY_SEPARATOR, func_get_args());
+        return \implode(DIRECTORY_SEPARATOR, \func_get_args());
     }
 
     public function testConfigIncludes()
diff --git a/vendor/psy/psysh/test/ContextTest.php b/vendor/psy/psysh/test/ContextTest.php
index 0b8b6dc8..d1937036 100644
--- a/vendor/psy/psysh/test/ContextTest.php
+++ b/vendor/psy/psysh/test/ContextTest.php
@@ -244,7 +244,7 @@ class ContextTest extends \PHPUnit\Framework\TestCase
         $__line      = 'dixie';
         $__dir       = 'wrinkly';
 
-        $vars = compact('__function', '__method', '__class', '__namespace', '__file', '__line', '__dir');
+        $vars = \compact('__function', '__method', '__class', '__namespace', '__file', '__line', '__dir');
 
         $context = new Context();
         $context->setCommandScopeVariables($vars);
@@ -259,7 +259,7 @@ class ContextTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals($__line, $context->get('__line'));
         $this->assertEquals($__dir, $context->get('__dir'));
 
-        $someVars = compact('__function', '__namespace', '__file', '__line', '__dir');
+        $someVars = \compact('__function', '__namespace', '__file', '__line', '__dir');
         $context->setCommandScopeVariables($someVars);
     }
 
@@ -282,7 +282,7 @@ class ContextTest extends \PHPUnit\Framework\TestCase
 
         $this->assertEquals(
             ['__method', '__class'],
-            array_values($context->getUnusedCommandScopeVariableNames())
+            \array_values($context->getUnusedCommandScopeVariableNames())
         );
     }
 
diff --git a/vendor/psy/psysh/test/Exception/ErrorExceptionTest.php b/vendor/psy/psysh/test/Exception/ErrorExceptionTest.php
index e66319b9..ef9fb9ab 100644
--- a/vendor/psy/psysh/test/Exception/ErrorExceptionTest.php
+++ b/vendor/psy/psysh/test/Exception/ErrorExceptionTest.php
@@ -76,14 +76,14 @@ class ErrorExceptionTest extends \PHPUnit\Framework\TestCase
      */
     public function testThrowExceptionAsErrorHandler($level, $type)
     {
-        set_error_handler(['Psy\Exception\ErrorException', 'throwException']);
+        \set_error_handler(['Psy\Exception\ErrorException', 'throwException']);
         try {
-            trigger_error('{whot}', $level);
+            \trigger_error('{whot}', $level);
         } catch (ErrorException $e) {
             $this->assertContains('PHP ' . $type, $e->getMessage());
             $this->assertContains('{whot}', $e->getMessage());
         }
-        restore_error_handler();
+        \restore_error_handler();
     }
 
     public function getUserLevels()
@@ -110,7 +110,7 @@ class ErrorExceptionTest extends \PHPUnit\Framework\TestCase
 
     public function testFromError()
     {
-        if (version_compare(PHP_VERSION, '7.0.0', '<')) {
+        if (\version_compare(PHP_VERSION, '7.0.0', '<')) {
             $this->markTestSkipped();
         }
 
diff --git a/vendor/psy/psysh/test/Exception/ThrowUpExceptionTest.php b/vendor/psy/psysh/test/Exception/ThrowUpExceptionTest.php
index f44ab873..09c33732 100644
--- a/vendor/psy/psysh/test/Exception/ThrowUpExceptionTest.php
+++ b/vendor/psy/psysh/test/Exception/ThrowUpExceptionTest.php
@@ -40,7 +40,7 @@ class ThrowUpExceptionTest extends \PHPUnit\Framework\TestCase
 
     public function testFromThrowableWithError()
     {
-        if (version_compare(PHP_VERSION, '7.0.0', '<')) {
+        if (\version_compare(PHP_VERSION, '7.0.0', '<')) {
             $this->markTestSkipped();
         }
 
diff --git a/vendor/psy/psysh/test/Exception/TypeErrorExceptionTest.php b/vendor/psy/psysh/test/Exception/TypeErrorExceptionTest.php
index 7bf27af9..01f251bb 100644
--- a/vendor/psy/psysh/test/Exception/TypeErrorExceptionTest.php
+++ b/vendor/psy/psysh/test/Exception/TypeErrorExceptionTest.php
@@ -37,7 +37,7 @@ class TypeErrorExceptionTest extends \PHPUnit\Framework\TestCase
 
     public function testFromTypeError()
     {
-        if (version_compare(PHP_VERSION, '7.0.0', '<')) {
+        if (\version_compare(PHP_VERSION, '7.0.0', '<')) {
             $this->markTestSkipped();
         }
 
diff --git a/vendor/psy/psysh/test/Formatter/CodeFormatterTest.php b/vendor/psy/psysh/test/Formatter/CodeFormatterTest.php
index ee213f1c..87f56dfd 100644
--- a/vendor/psy/psysh/test/Formatter/CodeFormatterTest.php
+++ b/vendor/psy/psysh/test/Formatter/CodeFormatterTest.php
@@ -22,7 +22,7 @@ class CodeFormatterTest extends \PHPUnit\Framework\TestCase
     public function testFormat($reflector, $expected)
     {
         $formatted = CodeFormatter::format($reflector);
-        $formattedWithoutColors = preg_replace('#' . chr(27) . '\[\d\d?m#', '', $formatted);
+        $formattedWithoutColors = \preg_replace('#' . \chr(27) . '\[\d\d?m#', '', $formatted);
 
         $this->assertEquals($expected, self::trimLines($formattedWithoutColors));
         $this->assertNotEquals($expected, self::trimLines($formatted));
@@ -88,7 +88,7 @@ EOS;
             [new \ReflectionProperty('Psy\Test\Formatter\Fixtures\SomeClass', 'someProp')],
         ];
 
-        if (version_compare(PHP_VERSION, '7.1.0', '>=')) {
+        if (\version_compare(PHP_VERSION, '7.1.0', '>=')) {
             $reflectors[] = [new \ReflectionClassConstant('Psy\Test\Formatter\Fixtures\SomeClass', 'SOME_CONST')];
         }
 
@@ -115,7 +115,7 @@ EOS;
 
     public function filenames()
     {
-        if (defined('HHVM_VERSION')) {
+        if (\defined('HHVM_VERSION')) {
             $this->markTestSkipped('We have issues with PHPUnit mocks on HHVM.');
         }
 
@@ -124,6 +124,6 @@ EOS;
 
     private static function trimLines($code)
     {
-        return rtrim(implode("\n", array_map('rtrim', explode("\n", $code))));
+        return \rtrim(\implode("\n", \array_map('rtrim', \explode("\n", $code))));
     }
 }
diff --git a/vendor/psy/psysh/test/Formatter/SignatureFormatterTest.php b/vendor/psy/psysh/test/Formatter/SignatureFormatterTest.php
index 7d4938d0..096e6ae7 100644
--- a/vendor/psy/psysh/test/Formatter/SignatureFormatterTest.php
+++ b/vendor/psy/psysh/test/Formatter/SignatureFormatterTest.php
@@ -29,7 +29,7 @@ class SignatureFormatterTest extends \PHPUnit\Framework\TestCase
      */
     public function testFormat($reflector, $expected)
     {
-        $this->assertSame($expected, strip_tags(SignatureFormatter::format($reflector)));
+        $this->assertSame($expected, \strip_tags(SignatureFormatter::format($reflector)));
     }
 
     public function signatureReflectors()
@@ -37,7 +37,7 @@ class SignatureFormatterTest extends \PHPUnit\Framework\TestCase
         return [
             [
                 new \ReflectionFunction('implode'),
-                defined('HHVM_VERSION') ? 'function implode($arg1, $arg2 = null)' : 'function implode($glue, $pieces)',
+                \defined('HHVM_VERSION') ? 'function implode($arg1, $arg2 = null)' : 'function implode($glue, $pieces)',
             ],
             [
                 ReflectionClassConstant::create($this, 'FOO'),
diff --git a/vendor/psy/psysh/test/ParserTestCase.php b/vendor/psy/psysh/test/ParserTestCase.php
index 78055206..a0740b66 100644
--- a/vendor/psy/psysh/test/ParserTestCase.php
+++ b/vendor/psy/psysh/test/ParserTestCase.php
@@ -92,6 +92,6 @@ class ParserTestCase extends \PHPUnit\Framework\TestCase
     {
         $msg = $e->getRawMessage();
 
-        return ($msg === 'Unexpected token EOF') || (strpos($msg, 'Syntax error, unexpected EOF') !== false);
+        return ($msg === 'Unexpected token EOF') || (\strpos($msg, 'Syntax error, unexpected EOF') !== false);
     }
 }
diff --git a/vendor/psy/psysh/test/Readline/GNUReadlineTest.php b/vendor/psy/psysh/test/Readline/GNUReadlineTest.php
index 7f39197e..406377fc 100644
--- a/vendor/psy/psysh/test/Readline/GNUReadlineTest.php
+++ b/vendor/psy/psysh/test/Readline/GNUReadlineTest.php
@@ -23,8 +23,8 @@ class GNUReadlineTest extends \PHPUnit\Framework\TestCase
             $this->markTestSkipped('GNUReadline not enabled');
         }
 
-        $this->historyFile = tempnam(sys_get_temp_dir(), 'psysh_test_history');
-        file_put_contents($this->historyFile, "_HiStOrY_V2_\n");
+        $this->historyFile = \tempnam(\sys_get_temp_dir(), 'psysh_test_history');
+        \file_put_contents($this->historyFile, "_HiStOrY_V2_\n");
     }
 
     public function testHistory()
diff --git a/vendor/psy/psysh/test/Readline/LibeditTest.php b/vendor/psy/psysh/test/Readline/LibeditTest.php
index 44a06c61..2d7be288 100644
--- a/vendor/psy/psysh/test/Readline/LibeditTest.php
+++ b/vendor/psy/psysh/test/Readline/LibeditTest.php
@@ -23,20 +23,20 @@ class LibeditTest extends \PHPUnit\Framework\TestCase
             $this->markTestSkipped('Libedit not enabled');
         }
 
-        $this->historyFile = tempnam(sys_get_temp_dir(), 'psysh_test_history');
-        if (false === file_put_contents($this->historyFile, "_HiStOrY_V2_\n")) {
+        $this->historyFile = \tempnam(\sys_get_temp_dir(), 'psysh_test_history');
+        if (false === \file_put_contents($this->historyFile, "_HiStOrY_V2_\n")) {
             $this->fail('Unable to write history file: ' . $this->historyFile);
         }
         // Calling readline_read_history before readline_clear_history
         // avoids segfault with PHP 5.5.7 & libedit v3.1
-        readline_read_history($this->historyFile);
-        readline_clear_history();
+        \readline_read_history($this->historyFile);
+        \readline_clear_history();
     }
 
     public function tearDown()
     {
-        if (is_file($this->historyFile)) {
-            unlink($this->historyFile);
+        if (\is_file($this->historyFile)) {
+            \unlink($this->historyFile);
         }
     }
 
@@ -94,7 +94,7 @@ class LibeditTest extends \PHPUnit\Framework\TestCase
     public function testListHistory()
     {
         $readline = new Libedit($this->historyFile);
-        file_put_contents(
+        \file_put_contents(
             $this->historyFile,
             "This is an entry\n\0This is a comment\nThis is an entry\0With a comment\n",
             FILE_APPEND
@@ -113,7 +113,7 @@ class LibeditTest extends \PHPUnit\Framework\TestCase
     public function testLinebreaksSupport()
     {
         $readline = new Libedit($this->historyFile);
-        file_put_contents(
+        \file_put_contents(
             $this->historyFile,
             "foo\rbar\nbaz\r\nw00t",
             FILE_APPEND
diff --git a/vendor/psy/psysh/test/Reflection/ReflectionConstantTest.php b/vendor/psy/psysh/test/Reflection/ReflectionConstantTest.php
index 95328ff8..02c1a844 100644
--- a/vendor/psy/psysh/test/Reflection/ReflectionConstantTest.php
+++ b/vendor/psy/psysh/test/Reflection/ReflectionConstantTest.php
@@ -13,7 +13,7 @@ namespace Psy\Test\Reflection;
 
 use Psy\Reflection\ReflectionConstant_;
 
-define('Psy\\Test\\Reflection\\SOME_CONSTANT', 'yep');
+\define('Psy\\Test\\Reflection\\SOME_CONSTANT', 'yep');
 
 class ReflectionConstantTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/vendor/psy/psysh/test/ShellTest.php b/vendor/psy/psysh/test/ShellTest.php
index 5b587d63..809af021 100644
--- a/vendor/psy/psysh/test/ShellTest.php
+++ b/vendor/psy/psysh/test/ShellTest.php
@@ -25,7 +25,7 @@ class ShellTest extends \PHPUnit\Framework\TestCase
     public function tearDown()
     {
         foreach ($this->streams as $stream) {
-            fclose($stream);
+            \fclose($stream);
         }
     }
 
@@ -39,7 +39,7 @@ class ShellTest extends \PHPUnit\Framework\TestCase
         $_e        = 'ignore this';
 
         $shell = new Shell($this->getConfig());
-        $shell->setScopeVariables(compact('one', 'two', 'three', '__psysh__', '_', '_e', 'this'));
+        $shell->setScopeVariables(\compact('one', 'two', 'three', '__psysh__', '_', '_e', 'this'));
 
         $this->assertNotContains('__psysh__', $shell->getScopeVariableNames());
         $this->assertSame(['one', 'two', 'three', '_'], $shell->getScopeVariableNames());
@@ -48,6 +48,9 @@ class ShellTest extends \PHPUnit\Framework\TestCase
         $this->assertSame($three, $shell->getScopeVariable('three'));
         $this->assertNull($shell->getScopeVariable('_'));
 
+        $diff = $shell->getScopeVariablesDiff(['one' => $one, 'two' => 'not two']);
+        $this->assertSame(['two' => $two, 'three' => $three, '_' => null], $diff);
+
         $shell->setScopeVariables([]);
         $this->assertSame(['_'], $shell->getScopeVariableNames());
 
@@ -80,7 +83,7 @@ class ShellTest extends \PHPUnit\Framework\TestCase
         $config = $this->getConfig(['usePcntl' => false]);
 
         $shell = new Shell($config);
-        $shell->setScopeVariables(compact('one', 'two', 'three', '__psysh__', '_', '_e', 'this'));
+        $shell->setScopeVariables(\compact('one', 'two', 'three', '__psysh__', '_', '_e', 'this'));
         $shell->addInput('exit', true);
 
         // This is super slow and we shouldn't do this :(
@@ -160,8 +163,8 @@ class ShellTest extends \PHPUnit\Framework\TestCase
         $this->assertFalse($shell->hasCode());
         $this->assertEmpty($shell->getCodeBuffer());
 
-        rewind($stream);
-        $streamContents = stream_get_contents($stream);
+        \rewind($stream);
+        $streamContents = \stream_get_contents($stream);
 
         $this->assertContains('PHP Parse error', $streamContents);
         $this->assertContains('message', $streamContents);
@@ -175,19 +178,19 @@ class ShellTest extends \PHPUnit\Framework\TestCase
         $stream = $output->getStream();
         $shell->setOutput($output);
 
-        $oldLevel = error_reporting();
-        error_reporting($oldLevel & ~E_USER_NOTICE);
+        $oldLevel = \error_reporting();
+        \error_reporting($oldLevel & ~E_USER_NOTICE);
 
         try {
             $shell->handleError(E_USER_NOTICE, 'wheee', null, 13);
         } catch (ErrorException $e) {
-            error_reporting($oldLevel);
+            \error_reporting($oldLevel);
             $this->fail('Unexpected error exception');
         }
-        error_reporting($oldLevel);
+        \error_reporting($oldLevel);
 
-        rewind($stream);
-        $streamContents = stream_get_contents($stream);
+        \rewind($stream);
+        $streamContents = \stream_get_contents($stream);
 
         $this->assertContains('PHP Notice:', $streamContents);
         $this->assertContains('wheee',       $streamContents);
@@ -200,13 +203,13 @@ class ShellTest extends \PHPUnit\Framework\TestCase
     public function testNotHandlingErrors()
     {
         $shell    = new Shell($this->getConfig());
-        $oldLevel = error_reporting();
-        error_reporting($oldLevel | E_USER_NOTICE);
+        $oldLevel = \error_reporting();
+        \error_reporting($oldLevel | E_USER_NOTICE);
 
         try {
             $shell->handleError(E_USER_NOTICE, 'wheee', null, 13);
         } catch (ErrorException $e) {
-            error_reporting($oldLevel);
+            \error_reporting($oldLevel);
             throw $e;
         }
     }
@@ -217,8 +220,8 @@ class ShellTest extends \PHPUnit\Framework\TestCase
 
         $this->assertInstanceOf('Symfony\Component\Console\Application', $shell);
         $this->assertContains(Shell::VERSION, $shell->getVersion());
-        $this->assertContains(phpversion(), $shell->getVersion());
-        $this->assertContains(php_sapi_name(), $shell->getVersion());
+        $this->assertContains(PHP_VERSION, $shell->getVersion());
+        $this->assertContains(PHP_SAPI, $shell->getVersion());
     }
 
     public function testCodeBuffer()
@@ -236,7 +239,7 @@ class ShellTest extends \PHPUnit\Framework\TestCase
         $shell->addCode('{}');
         $code = $shell->flushCode();
         $this->assertFalse($shell->hasCode());
-        $code = preg_replace('/\s+/', ' ', $code);
+        $code = \preg_replace('/\s+/', ' ', $code);
         $this->assertNotNull($code);
         $this->assertSame('class a { } return new \\Psy\\CodeCleaner\\NoReturnValue();', $code);
     }
@@ -256,7 +259,7 @@ class ShellTest extends \PHPUnit\Framework\TestCase
         $shell->addCode('+ 1');
         $code = $shell->flushCode();
         $this->assertFalse($shell->hasCode());
-        $code = preg_replace('/\s+/', ' ', $code);
+        $code = \preg_replace('/\s+/', ' ', $code);
         $this->assertNotNull($code);
         $this->assertSame('return 1 + 1 + 1;', $code);
     }
@@ -291,8 +294,8 @@ class ShellTest extends \PHPUnit\Framework\TestCase
 
         $shell->writeStdout("{{stdout}}\n");
 
-        rewind($stream);
-        $streamContents = stream_get_contents($stream);
+        \rewind($stream);
+        $streamContents = \stream_get_contents($stream);
 
         $this->assertSame('{{stdout}}' . PHP_EOL, $streamContents);
     }
@@ -306,8 +309,8 @@ class ShellTest extends \PHPUnit\Framework\TestCase
 
         $shell->writeStdout('{{stdout}}');
 
-        rewind($stream);
-        $streamContents = stream_get_contents($stream);
+        \rewind($stream);
+        $streamContents = \stream_get_contents($stream);
 
         $this->assertSame('{{stdout}}<aside>⏎</aside>' . PHP_EOL, $streamContents);
     }
@@ -323,8 +326,8 @@ class ShellTest extends \PHPUnit\Framework\TestCase
         $shell->setOutput($output);
 
         $shell->writeReturnValue($input);
-        rewind($stream);
-        $this->assertEquals($expected, stream_get_contents($stream));
+        \rewind($stream);
+        $this->assertEquals($expected, \stream_get_contents($stream));
     }
 
     public function getReturnValues()
@@ -346,8 +349,8 @@ class ShellTest extends \PHPUnit\Framework\TestCase
         $shell->setOutput($output);
 
         $shell->writeException($exception);
-        rewind($stream);
-        $this->assertSame($expected, stream_get_contents($stream));
+        \rewind($stream);
+        $this->assertSame($expected, \stream_get_contents($stream));
     }
 
     public function getRenderedExceptions()
@@ -367,8 +370,8 @@ class ShellTest extends \PHPUnit\Framework\TestCase
         $shell  = new Shell($this->getConfig());
         $shell->setOutput($output);
         $this->assertEquals($expected, $shell->execute($input));
-        rewind($stream);
-        $this->assertSame('', stream_get_contents($stream));
+        \rewind($stream);
+        $this->assertSame('', \stream_get_contents($stream));
     }
 
     public function getExecuteValues()
@@ -414,7 +417,7 @@ class ShellTest extends \PHPUnit\Framework\TestCase
 
     private function getOutput()
     {
-        $stream = fopen('php://memory', 'w+');
+        $stream = \fopen('php://memory', 'w+');
         $this->streams[] = $stream;
 
         $output = new StreamOutput($stream, StreamOutput::VERBOSITY_NORMAL, false);
@@ -425,8 +428,8 @@ class ShellTest extends \PHPUnit\Framework\TestCase
     private function getConfig(array $config = [])
     {
         // Mebbe there's a better way than this?
-        $dir = tempnam(sys_get_temp_dir(), 'psysh_shell_test_');
-        unlink($dir);
+        $dir = \tempnam(\sys_get_temp_dir(), 'psysh_shell_test_');
+        \unlink($dir);
 
         $defaults = [
             'configDir'  => $dir,
@@ -434,6 +437,6 @@ class ShellTest extends \PHPUnit\Framework\TestCase
             'runtimeDir' => $dir,
         ];
 
-        return new Configuration(array_merge($defaults, $config));
+        return new Configuration(\array_merge($defaults, $config));
     }
 }
diff --git a/vendor/psy/psysh/test/SudoTest.php b/vendor/psy/psysh/test/SudoTest.php
index 8ac07774..6123db04 100644
--- a/vendor/psy/psysh/test/SudoTest.php
+++ b/vendor/psy/psysh/test/SudoTest.php
@@ -17,7 +17,7 @@ class SudoTest extends \PHPUnit\Framework\TestCase
 {
     public function setUp()
     {
-        if (version_compare(PHP_VERSION, '7.1.0', '<')) {
+        if (\version_compare(PHP_VERSION, '7.1.0', '<')) {
             $this->markTestSkipped('YOLO');
         }
     }
diff --git a/vendor/psy/psysh/test/TabCompletion/AutoCompleterTest.php b/vendor/psy/psysh/test/TabCompletion/AutoCompleterTest.php
index 25878046..d98d452c 100644
--- a/vendor/psy/psysh/test/TabCompletion/AutoCompleterTest.php
+++ b/vendor/psy/psysh/test/TabCompletion/AutoCompleterTest.php
@@ -62,7 +62,7 @@ class AutoCompleterTest extends \PHPUnit\Framework\TestCase
         $code = $tabCompletion->processCallback('', 0, [
            'line_buffer' => $line,
            'point'       => 0,
-           'end'         => strlen($line),
+           'end'         => \strlen($line),
         ]);
 
         foreach ($mustContain as $mc) {
diff --git a/vendor/psy/psysh/test/Util/DocblockTest.php b/vendor/psy/psysh/test/Util/DocblockTest.php
index 6fa775d9..82e12fed 100644
--- a/vendor/psy/psysh/test/Util/DocblockTest.php
+++ b/vendor/psy/psysh/test/Util/DocblockTest.php
@@ -41,7 +41,7 @@ class DocblockTest extends \PHPUnit\Framework\TestCase
 
     public function comments()
     {
-        if (defined('HHVM_VERSION')) {
+        if (\defined('HHVM_VERSION')) {
             $this->markTestSkipped('We have issues with PHPUnit mocks on HHVM.');
         }
 
diff --git a/vendor/psy/psysh/test/Util/MirrorTest.php b/vendor/psy/psysh/test/Util/MirrorTest.php
index 09976bdf..585fffbb 100644
--- a/vendor/psy/psysh/test/Util/MirrorTest.php
+++ b/vendor/psy/psysh/test/Util/MirrorTest.php
@@ -36,7 +36,7 @@ class MirrorTest extends \PHPUnit\Framework\TestCase
         $this->assertInstanceOf('ReflectionObject', $refl);
 
         $refl = Mirror::get($this, 'FOO');
-        if (version_compare(PHP_VERSION, '7.1.0', '>=')) {
+        if (\version_compare(PHP_VERSION, '7.1.0', '>=')) {
             $this->assertInstanceOf('ReflectionClassConstant', $refl);
         } else {
             $this->assertInstanceOf('Psy\Reflection\ReflectionClassConstant', $refl);
diff --git a/vendor/psy/psysh/test/Util/StrTest.php b/vendor/psy/psysh/test/Util/StrTest.php
index 2a58d9f9..4f99a79b 100644
--- a/vendor/psy/psysh/test/Util/StrTest.php
+++ b/vendor/psy/psysh/test/Util/StrTest.php
@@ -26,6 +26,6 @@ class StrTest extends \PHPUnit\Framework\TestCase
     public function unvisProvider()
     {
         //return require_once(__DIR__.'/../fixtures/unvis_fixtures.php');
-        return json_decode(file_get_contents(__DIR__ . '/../fixtures/unvis_fixtures.json'));
+        return \json_decode(\file_get_contents(__DIR__ . '/../fixtures/unvis_fixtures.json'));
     }
 }
diff --git a/vendor/psy/psysh/test/VersionUpdater/GitHubCheckerTest.php b/vendor/psy/psysh/test/VersionUpdater/GitHubCheckerTest.php
index bbbd69cf..7d12d47d 100644
--- a/vendor/psy/psysh/test/VersionUpdater/GitHubCheckerTest.php
+++ b/vendor/psy/psysh/test/VersionUpdater/GitHubCheckerTest.php
@@ -52,13 +52,13 @@ class GitHubCheckerTest extends \PHPUnit\Framework\TestCase
     public function jsonResults()
     {
         return [
-            [false, json_decode('{"tag_name":"v9.0.0"}')],
-            [true, json_decode('{"tag_name":"v' . Shell::VERSION . '"}')],
-            [true, json_decode('{"tag_name":"v0.0.1"}')],
-            [true, json_decode('{"tag_name":"v0.4.1-alpha"}')],
-            [true, json_decode('{"tag_name":"v0.4.2-beta3"}')],
-            [true, json_decode('{"tag_name":"v0.0.1"}')],
-            [true, json_decode('{"tag_name":""}')],
+            [false, \json_decode('{"tag_name":"v9.0.0"}')],
+            [true, \json_decode('{"tag_name":"v' . Shell::VERSION . '"}')],
+            [true, \json_decode('{"tag_name":"v0.0.1"}')],
+            [true, \json_decode('{"tag_name":"v0.4.1-alpha"}')],
+            [true, \json_decode('{"tag_name":"v0.4.2-beta3"}')],
+            [true, \json_decode('{"tag_name":"v0.0.1"}')],
+            [true, \json_decode('{"tag_name":""}')],
         ];
     }
 
@@ -71,12 +71,12 @@ class GitHubCheckerTest extends \PHPUnit\Framework\TestCase
             [null],
             [false],
             [true],
-            [json_decode('{"foo":"bar"}')],
-            [json_decode('{}')],
-            [json_decode('[]')],
+            [\json_decode('{"foo":"bar"}')],
+            [\json_decode('{}')],
+            [\json_decode('[]')],
             [[]],
-            [json_decode('{"tag_name":false"}')],
-            [json_decode('{"tag_name":true"}')],
+            [\json_decode('{"tag_name":false"}')],
+            [\json_decode('{"tag_name":true"}')],
         ];
     }
 }
diff --git a/vendor/psy/psysh/test/fixtures/config.php b/vendor/psy/psysh/test/fixtures/config.php
index 4aa1f5fb..4c74b79d 100644
--- a/vendor/psy/psysh/test/fixtures/config.php
+++ b/vendor/psy/psysh/test/fixtures/config.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-$config->setRuntimeDir(sys_get_temp_dir() . '/psysh_test/withconfig/temp');
+$config->setRuntimeDir(\sys_get_temp_dir() . '/psysh_test/withconfig/temp');
 
 return [
     'useReadline'       => true,
diff --git a/vendor/psy/psysh/vendor-bin/box/composer.json b/vendor/psy/psysh/vendor-bin/box/composer.json
index a5ef2062..13b78794 100644
--- a/vendor/psy/psysh/vendor-bin/box/composer.json
+++ b/vendor/psy/psysh/vendor-bin/box/composer.json
@@ -2,6 +2,6 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "humbug/box": "^3.0@alpha"
+        "humbug/box": "^3.1"
     }
 }
diff --git a/vendor/ramsey/uuid/CHANGELOG.md b/vendor/ramsey/uuid/CHANGELOG.md
index 86633261..3965fff2 100644
--- a/vendor/ramsey/uuid/CHANGELOG.md
+++ b/vendor/ramsey/uuid/CHANGELOG.md
@@ -1,5 +1,15 @@
 # ramsey/uuid Changelog
 
+## 3.8.0
+
+_Released: 2018-07-19_
+
+  * Add support for determining MAC address on FreeBSD systems ([#212](https://github.com/ramsey/uuid/pull/212))
+  * Add a polyfill for PHP ctype functions to support systems where the ctype functions are not part of the PHP build ([#223](https://github.com/ramsey/uuid/pull/223))
+  * Improve validation to disallow UUIDs with a trailing newline character ([#225](https://github.com/ramsey/uuid/pull/225))
+  * Add annotations for thrown exceptions for improved IDE hinting ([#232](https://github.com/ramsey/uuid/pull/232))
+  * Improve documentation, testing, and project metadata (i.e. `.gitattributes`, etc.)
+
 ## 3.7.3
 
 _Released: 2018-01-19_
diff --git a/vendor/ramsey/uuid/composer.json b/vendor/ramsey/uuid/composer.json
index ac842c8d..952120cd 100644
--- a/vendor/ramsey/uuid/composer.json
+++ b/vendor/ramsey/uuid/composer.json
@@ -26,21 +26,23 @@
     },
     "require": {
         "php": "^5.4 || ^7.0",
-        "paragonie/random_compat": "^1.0|^2.0"
+        "paragonie/random_compat": "^1.0|^2.0|9.99.99",
+        "symfony/polyfill-ctype": "^1.8"
     },
     "require-dev": {
-        "moontoast/math": "^1.1",
+        "codeception/aspect-mock": "^1.0 | ~2.0.0",
+        "doctrine/annotations": "~1.2.0",
+        "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ~2.1.0",
         "ircmaxell/random-lib": "^1.1",
-        "phpunit/phpunit": "^4.7|^5.0",
-        "squizlabs/php_codesniffer": "^2.3",
         "jakub-onderka/php-parallel-lint": "^0.9.0",
         "mockery/mockery": "^0.9.9",
-        "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1",
-        "doctrine/annotations": "~1.2.0",
-        "codeception/aspect-mock": "^1.0 | ~2.0.0",
-        "php-mock/php-mock-phpunit": "^0.3|^1.1"
+        "moontoast/math": "^1.1",
+        "php-mock/php-mock-phpunit": "^0.3|^1.1",
+        "phpunit/phpunit": "^4.7|^5.0|^6.5",
+        "squizlabs/php_codesniffer": "^2.3"
     },
     "suggest": {
+        "ext-ctype": "Provides support for PHP Ctype functions",
         "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
         "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator",
         "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator",
@@ -71,5 +73,8 @@
             "@phpunit",
             "@phpcs"
         ]
+    },
+    "config": {
+        "sort-packages": true
     }
 }
diff --git a/vendor/ramsey/uuid/docs/.gitignore b/vendor/ramsey/uuid/docs/.gitignore
deleted file mode 100644
index 69fa449d..00000000
--- a/vendor/ramsey/uuid/docs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_build/
diff --git a/vendor/ramsey/uuid/docs/Makefile b/vendor/ramsey/uuid/docs/Makefile
deleted file mode 100644
index f4bd287a..00000000
--- a/vendor/ramsey/uuid/docs/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Minimal makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-SPHINXPROJ    = ramseyuuid
-SOURCEDIR     = .
-BUILDDIR      = _build
-
-# Put it first so that "make" without argument is like "make help".
-help:
-	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-
-.PHONY: help Makefile
-
-# Catch-all target: route all unknown targets to Sphinx using the new
-# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
-%: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
\ No newline at end of file
diff --git a/vendor/ramsey/uuid/docs/_static/.gitkeep b/vendor/ramsey/uuid/docs/_static/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/vendor/ramsey/uuid/docs/conf.py b/vendor/ramsey/uuid/docs/conf.py
deleted file mode 100644
index 48984599..00000000
--- a/vendor/ramsey/uuid/docs/conf.py
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-#
-# ramsey/uuid documentation build configuration file, created by
-# sphinx-quickstart on Tue Jan 16 20:01:49 2018.
-#
-# This file is execfile()d with the current directory set to its
-# containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#
-# import os
-# import sys
-# sys.path.insert(0, os.path.abspath('.'))
-
-
-# -- General configuration ------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#
-# needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = []
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix(es) of source filenames.
-# You can specify multiple suffix as a list of string:
-#
-# source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = 'ramsey/uuid'
-copyright = '2018, Ben Ramsey'
-author = 'Ben Ramsey'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '3.7'
-# The full version, including alpha/beta/rc tags.
-release = '3.7'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#
-# This is also used if you do content translation via gettext catalogs.
-# Usually you set "language" from the command line for these cases.
-language = None
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-# This patterns also effect to html_static_path and html_extra_path
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# If true, `todo` and `todoList` produce output, else they produce nothing.
-todo_include_todos = False
-
-
-# -- Options for HTML output ----------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-#
-html_theme = 'alabaster'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#
-# html_theme_options = {}
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-# Custom sidebar templates, must be a dictionary that maps document names
-# to template names.
-#
-# This is required for the alabaster theme
-# refs: http://alabaster.readthedocs.io/en/latest/installation.html#sidebars
-html_sidebars = {
-    '**': [
-        'relations.html',  # needs 'show_related': True theme option to display
-        'searchbox.html',
-    ]
-}
-
-
-# -- Options for HTMLHelp output ------------------------------------------
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'ramseyuuiddoc'
-
-
-# -- Options for LaTeX output ---------------------------------------------
-
-latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    #
-    # 'papersize': 'letterpaper',
-
-    # The font size ('10pt', '11pt' or '12pt').
-    #
-    # 'pointsize': '10pt',
-
-    # Additional stuff for the LaTeX preamble.
-    #
-    # 'preamble': '',
-
-    # Latex figure (float) alignment
-    #
-    # 'figure_align': 'htbp',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-#  author, documentclass [howto, manual, or own class]).
-latex_documents = [
-    (master_doc, 'ramseyuuid.tex', 'ramsey/uuid Documentation',
-     'Ben Ramsey', 'manual'),
-]
-
-
-# -- Options for manual page output ---------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'ramseyuuid', 'ramsey/uuid Documentation',
-     [author], 1)
-]
-
-
-# -- Options for Texinfo output -------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-    (master_doc, 'ramseyuuid', 'ramsey/uuid Documentation',
-     author, 'ramseyuuid', 'One line description of project.',
-     'Miscellaneous'),
-]
-
-
-
diff --git a/vendor/ramsey/uuid/docs/index.rst b/vendor/ramsey/uuid/docs/index.rst
deleted file mode 100644
index 0a3d176c..00000000
--- a/vendor/ramsey/uuid/docs/index.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-.. ramsey/uuid documentation master file, created by
-   sphinx-quickstart on Tue Jan 16 20:01:49 2018.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-ramsey/uuid
-===========
-
-.. toctree::
-   :maxdepth: 2
-   :caption: Contents:
-
-
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`search`
diff --git a/vendor/ramsey/uuid/src/Codec/CodecInterface.php b/vendor/ramsey/uuid/src/Codec/CodecInterface.php
index f0dde950..6ea20544 100644
--- a/vendor/ramsey/uuid/src/Codec/CodecInterface.php
+++ b/vendor/ramsey/uuid/src/Codec/CodecInterface.php
@@ -42,6 +42,7 @@ interface CodecInterface
      *
      * @param string $encodedUuid
      * @return UuidInterface
+     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
      */
     public function decode($encodedUuid);
 
@@ -50,6 +51,8 @@ interface CodecInterface
      *
      * @param string $bytes
      * @return UuidInterface
+     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
+     * @throws \InvalidArgumentException if string has not 16 characters
      */
     public function decodeBytes($bytes);
 }
diff --git a/vendor/ramsey/uuid/src/Codec/GuidStringCodec.php b/vendor/ramsey/uuid/src/Codec/GuidStringCodec.php
index 380d94ef..864980b3 100644
--- a/vendor/ramsey/uuid/src/Codec/GuidStringCodec.php
+++ b/vendor/ramsey/uuid/src/Codec/GuidStringCodec.php
@@ -60,6 +60,7 @@ class GuidStringCodec extends StringCodec
      *
      * @param string $encodedUuid
      * @return UuidInterface
+     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
      */
     public function decode($encodedUuid)
     {
@@ -75,6 +76,7 @@ class GuidStringCodec extends StringCodec
      *
      * @param string $bytes
      * @return UuidInterface
+     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
      */
     public function decodeBytes($bytes)
     {
diff --git a/vendor/ramsey/uuid/src/Codec/OrderedTimeCodec.php b/vendor/ramsey/uuid/src/Codec/OrderedTimeCodec.php
index cbbb75ea..3257759c 100644
--- a/vendor/ramsey/uuid/src/Codec/OrderedTimeCodec.php
+++ b/vendor/ramsey/uuid/src/Codec/OrderedTimeCodec.php
@@ -50,6 +50,7 @@ class OrderedTimeCodec extends StringCodec
      *
      * @param string $bytes
      * @return UuidInterface
+     * @throws \InvalidArgumentException if string has not 16 characters
      */
     public function decodeBytes($bytes)
     {
diff --git a/vendor/ramsey/uuid/src/Codec/StringCodec.php b/vendor/ramsey/uuid/src/Codec/StringCodec.php
index 46181964..7f352065 100644
--- a/vendor/ramsey/uuid/src/Codec/StringCodec.php
+++ b/vendor/ramsey/uuid/src/Codec/StringCodec.php
@@ -74,6 +74,7 @@ class StringCodec implements CodecInterface
      *
      * @param string $encodedUuid
      * @return UuidInterface
+     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
      */
     public function decode($encodedUuid)
     {
@@ -88,6 +89,7 @@ class StringCodec implements CodecInterface
      *
      * @param string $bytes
      * @return UuidInterface
+     * @throws \InvalidArgumentException if string has not 16 characters
      */
     public function decodeBytes($bytes)
     {
@@ -115,6 +117,7 @@ class StringCodec implements CodecInterface
      *
      * @param string $encodedUuid
      * @return array
+     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
      */
     protected function extractComponents($encodedUuid)
     {
diff --git a/vendor/ramsey/uuid/src/Codec/TimestampFirstCombCodec.php b/vendor/ramsey/uuid/src/Codec/TimestampFirstCombCodec.php
index c4434384..2c4ded89 100644
--- a/vendor/ramsey/uuid/src/Codec/TimestampFirstCombCodec.php
+++ b/vendor/ramsey/uuid/src/Codec/TimestampFirstCombCodec.php
@@ -60,6 +60,7 @@ class TimestampFirstCombCodec extends StringCodec
      * @param string $encodedUuid
      *
      * @return UuidInterface
+     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
      */
     public function decode($encodedUuid)
     {
@@ -76,6 +77,7 @@ class TimestampFirstCombCodec extends StringCodec
      * @param string $bytes
      *
      * @return UuidInterface
+     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
      */
     public function decodeBytes($bytes)
     {
diff --git a/vendor/ramsey/uuid/src/Converter/NumberConverterInterface.php b/vendor/ramsey/uuid/src/Converter/NumberConverterInterface.php
index 673c1df3..9505e8c6 100644
--- a/vendor/ramsey/uuid/src/Converter/NumberConverterInterface.php
+++ b/vendor/ramsey/uuid/src/Converter/NumberConverterInterface.php
@@ -28,6 +28,7 @@ interface NumberConverterInterface
      *
      * @param string $hex The hexadecimal string representation to convert
      * @return mixed
+     * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present
      */
     public function fromHex($hex);
 
@@ -39,6 +40,7 @@ interface NumberConverterInterface
      *     a true integer, a string integer, or a object representation that
      *     this converter can understand
      * @return string Hexadecimal string
+     * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present
      */
     public function toHex($integer);
 }
diff --git a/vendor/ramsey/uuid/src/Converter/Time/DegradedTimeConverter.php b/vendor/ramsey/uuid/src/Converter/Time/DegradedTimeConverter.php
index 46edbe78..b94589cd 100644
--- a/vendor/ramsey/uuid/src/Converter/Time/DegradedTimeConverter.php
+++ b/vendor/ramsey/uuid/src/Converter/Time/DegradedTimeConverter.php
@@ -30,7 +30,7 @@ class DegradedTimeConverter implements TimeConverterInterface
      * @param string $seconds
      * @param string $microSeconds
      * @return void
-     * @throws UnsatisfiedDependencyException
+     * @throws UnsatisfiedDependencyException if called on a 32-bit system and `Moontoast\Math\BigNumber` is not present
      */
     public function calculateTime($seconds, $microSeconds)
     {
diff --git a/vendor/ramsey/uuid/src/Converter/TimeConverterInterface.php b/vendor/ramsey/uuid/src/Converter/TimeConverterInterface.php
index f0688367..382008ac 100644
--- a/vendor/ramsey/uuid/src/Converter/TimeConverterInterface.php
+++ b/vendor/ramsey/uuid/src/Converter/TimeConverterInterface.php
@@ -27,6 +27,8 @@ interface TimeConverterInterface
      * @param string $seconds
      * @param string $microSeconds
      * @return string[] An array guaranteed to contain `low`, `mid`, and `high` keys
+     * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if called on a 32-bit system and
+     *     `Moontoast\Math\BigNumber` is not present
      * @link http://tools.ietf.org/html/rfc4122#section-4.2.2
      */
     public function calculateTime($seconds, $microSeconds);
diff --git a/vendor/ramsey/uuid/src/DegradedUuid.php b/vendor/ramsey/uuid/src/DegradedUuid.php
index b596c388..bcf0be80 100644
--- a/vendor/ramsey/uuid/src/DegradedUuid.php
+++ b/vendor/ramsey/uuid/src/DegradedUuid.php
@@ -24,6 +24,9 @@ use Ramsey\Uuid\Exception\UnsupportedOperationException;
  */
 class DegradedUuid extends Uuid
 {
+    /**
+     * @inheritdoc
+     */
     public function getDateTime()
     {
         if ($this->getVersion() != 1) {
diff --git a/vendor/ramsey/uuid/src/Generator/CombGenerator.php b/vendor/ramsey/uuid/src/Generator/CombGenerator.php
index 1a427767..7a948231 100644
--- a/vendor/ramsey/uuid/src/Generator/CombGenerator.php
+++ b/vendor/ramsey/uuid/src/Generator/CombGenerator.php
@@ -53,6 +53,9 @@ class CombGenerator implements RandomGeneratorInterface
      *
      * @param integer $length The number of bytes of random binary data to generate
      * @return string A binary string
+     * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present
+     * @throws \InvalidArgumentException if length is not a positive integer
+     * @throws \Exception
      */
     public function generate($length)
     {
diff --git a/vendor/ramsey/uuid/src/Generator/DefaultTimeGenerator.php b/vendor/ramsey/uuid/src/Generator/DefaultTimeGenerator.php
index f05d8183..c9969b3a 100644
--- a/vendor/ramsey/uuid/src/Generator/DefaultTimeGenerator.php
+++ b/vendor/ramsey/uuid/src/Generator/DefaultTimeGenerator.php
@@ -72,6 +72,10 @@ class DefaultTimeGenerator implements TimeGeneratorInterface
      *     could arise when the clock is set backwards in time or if the node ID
      *     changes.
      * @return string A binary string
+     * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if called on a 32-bit system and
+     *     `Moontoast\Math\BigNumber` is not present
+     * @throws \InvalidArgumentException
+     * @throws \Exception if it was not possible to gather sufficient entropy
      */
     public function generate($node = null, $clockSeq = null)
     {
@@ -111,6 +115,8 @@ class DefaultTimeGenerator implements TimeGeneratorInterface
      *
      * @param string|int $node A node value that may be used to override the node provider
      * @return string Hexadecimal representation of the node ID
+     * @throws \InvalidArgumentException
+     * @throws \Exception
      */
     protected function getValidNode($node)
     {
diff --git a/vendor/ramsey/uuid/src/Generator/RandomBytesGenerator.php b/vendor/ramsey/uuid/src/Generator/RandomBytesGenerator.php
index 1e8392ab..aaa285df 100644
--- a/vendor/ramsey/uuid/src/Generator/RandomBytesGenerator.php
+++ b/vendor/ramsey/uuid/src/Generator/RandomBytesGenerator.php
@@ -28,6 +28,7 @@ class RandomBytesGenerator implements RandomGeneratorInterface
      *
      * @param integer $length The number of bytes of random binary data to generate
      * @return string A binary string
+     * @throws \Exception if it was not possible to gather sufficient entropy
      */
     public function generate($length)
     {
diff --git a/vendor/ramsey/uuid/src/Generator/RandomGeneratorInterface.php b/vendor/ramsey/uuid/src/Generator/RandomGeneratorInterface.php
index 87ccbc95..3a1bcae7 100644
--- a/vendor/ramsey/uuid/src/Generator/RandomGeneratorInterface.php
+++ b/vendor/ramsey/uuid/src/Generator/RandomGeneratorInterface.php
@@ -25,6 +25,9 @@ interface RandomGeneratorInterface
      *
      * @param integer $length The number of bytes of random binary data to generate
      * @return string A binary string
+     * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present
+     * @throws \InvalidArgumentException
+     * @throws \Exception if it was not possible to gather sufficient entropy
      */
     public function generate($length);
 }
diff --git a/vendor/ramsey/uuid/src/Generator/TimeGeneratorInterface.php b/vendor/ramsey/uuid/src/Generator/TimeGeneratorInterface.php
index 1a56d513..cb182ea0 100644
--- a/vendor/ramsey/uuid/src/Generator/TimeGeneratorInterface.php
+++ b/vendor/ramsey/uuid/src/Generator/TimeGeneratorInterface.php
@@ -30,6 +30,10 @@ interface TimeGeneratorInterface
      *     could arise when the clock is set backwards in time or if the node ID
      *     changes.
      * @return string A binary string
+     * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if called on a 32-bit system and
+     *     `Moontoast\Math\BigNumber` is not present
+     * @throws \InvalidArgumentException
+     * @throws \Exception if it was not possible to gather sufficient entropy
      */
     public function generate($node = null, $clockSeq = null);
 }
diff --git a/vendor/ramsey/uuid/src/Provider/Node/FallbackNodeProvider.php b/vendor/ramsey/uuid/src/Provider/Node/FallbackNodeProvider.php
index e230e17a..289fddea 100644
--- a/vendor/ramsey/uuid/src/Provider/Node/FallbackNodeProvider.php
+++ b/vendor/ramsey/uuid/src/Provider/Node/FallbackNodeProvider.php
@@ -43,6 +43,7 @@ class FallbackNodeProvider implements NodeProviderInterface
      * and returning the first non-empty value found
      *
      * @return string System node ID as a hexadecimal string
+     * @throws \Exception
      */
     public function getNode()
     {
diff --git a/vendor/ramsey/uuid/src/Provider/Node/RandomNodeProvider.php b/vendor/ramsey/uuid/src/Provider/Node/RandomNodeProvider.php
index 1018554e..76c570d7 100644
--- a/vendor/ramsey/uuid/src/Provider/Node/RandomNodeProvider.php
+++ b/vendor/ramsey/uuid/src/Provider/Node/RandomNodeProvider.php
@@ -28,6 +28,7 @@ class RandomNodeProvider implements NodeProviderInterface
      * Returns the system node ID
      *
      * @return string System node ID as a hexadecimal string
+     * @throws \Exception if it was not possible to gather sufficient entropy
      */
     public function getNode()
     {
diff --git a/vendor/ramsey/uuid/src/Provider/Node/SystemNodeProvider.php b/vendor/ramsey/uuid/src/Provider/Node/SystemNodeProvider.php
index e1b28fcb..ae6a09ea 100644
--- a/vendor/ramsey/uuid/src/Provider/Node/SystemNodeProvider.php
+++ b/vendor/ramsey/uuid/src/Provider/Node/SystemNodeProvider.php
@@ -62,6 +62,10 @@ class SystemNodeProvider implements NodeProviderInterface
      */
     protected function getIfconfig()
     {
+        if (strpos(strtolower(ini_get('disable_functions')), 'passthru') !== false) {
+            return '';
+        }
+
         ob_start();
         switch (strtoupper(substr(php_uname('a'), 0, 3))) {
             case 'WIN':
@@ -70,6 +74,9 @@ class SystemNodeProvider implements NodeProviderInterface
             case 'DAR':
                 passthru('ifconfig 2>&1');
                 break;
+            case 'FRE':
+                passthru('netstat -i -f link 2>&1');
+                break;
             case 'LIN':
             default:
                 passthru('netstat -ie 2>&1');
@@ -88,17 +95,16 @@ class SystemNodeProvider implements NodeProviderInterface
     {
         $mac = false;
 
-        if (strtoupper(php_uname('s')) === "LINUX") {
+        if (strtoupper(php_uname('s')) === 'LINUX') {
             $addressPaths = glob('/sys/class/net/*/address', GLOB_NOSORT);
 
             if (empty($addressPaths)) {
                 return false;
             }
 
-            $macs = array_map(
-                'file_get_contents',
-                $addressPaths
-            );
+            array_walk($addressPaths, function ($addressPath) use (&$macs) {
+                $macs[] = file_get_contents($addressPath);
+            });
 
             $macs = array_map('trim', $macs);
 
diff --git a/vendor/ramsey/uuid/src/Provider/NodeProviderInterface.php b/vendor/ramsey/uuid/src/Provider/NodeProviderInterface.php
index 864e8404..14f747be 100644
--- a/vendor/ramsey/uuid/src/Provider/NodeProviderInterface.php
+++ b/vendor/ramsey/uuid/src/Provider/NodeProviderInterface.php
@@ -24,6 +24,7 @@ interface NodeProviderInterface
      * Returns the system node ID
      *
      * @return string System node ID as a hexadecimal string
+     * @throws \Exception if it was not possible to gather sufficient entropy
      */
     public function getNode();
 }
diff --git a/vendor/ramsey/uuid/src/Uuid.php b/vendor/ramsey/uuid/src/Uuid.php
index fa07aa54..45f9fa44 100644
--- a/vendor/ramsey/uuid/src/Uuid.php
+++ b/vendor/ramsey/uuid/src/Uuid.php
@@ -229,6 +229,7 @@ class Uuid implements UuidInterface
      *
      * @param string $serialized
      * @link http://php.net/manual/en/class.serializable.php
+     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
      */
     public function unserialize($serialized)
     {
@@ -332,6 +333,9 @@ class Uuid implements UuidInterface
         return $this->converter;
     }
 
+    /**
+     * @inheritdoc
+     */
     public function getDateTime()
     {
         if ($this->getVersion() != 1) {
@@ -384,6 +388,9 @@ class Uuid implements UuidInterface
         return str_replace('-', '', $this->toString());
     }
 
+    /**
+     * @inheritdoc
+     */
     public function getInteger()
     {
         return $this->converter->fromHex($this->getHex());
@@ -393,6 +400,7 @@ class Uuid implements UuidInterface
      * Returns the least significant 64 bits of this UUID's 128 bit value.
      *
      * @return mixed Converted representation of the unsigned 64-bit integer value
+     * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present
      */
     public function getLeastSignificantBits()
     {
@@ -413,6 +421,7 @@ class Uuid implements UuidInterface
      * Returns the most significant 64 bits of this UUID's 128 bit value.
      *
      * @return mixed Converted representation of the unsigned 64-bit integer value
+     * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present
      */
     public function getMostSignificantBits()
     {
@@ -534,6 +543,9 @@ class Uuid implements UuidInterface
         return hexdec($this->getTimestampHex());
     }
 
+    /**
+     * @inheritdoc
+     */
     public function getTimestampHex()
     {
         if ($this->getVersion() != 1) {
@@ -612,6 +624,8 @@ class Uuid implements UuidInterface
      *
      * @param string $bytes
      * @return UuidInterface
+     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
+     * @throws \InvalidArgumentException
      */
     public static function fromBytes($bytes)
     {
@@ -623,6 +637,7 @@ class Uuid implements UuidInterface
      *
      * @param string $name A string that specifies a UUID
      * @return UuidInterface
+     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
      */
     public static function fromString($name)
     {
@@ -634,6 +649,8 @@ class Uuid implements UuidInterface
      *
      * @param string $integer String representation of 128-bit integer
      * @return UuidInterface
+     * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present
+     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
      */
     public static function fromInteger($integer)
     {
@@ -654,7 +671,7 @@ class Uuid implements UuidInterface
             return true;
         }
 
-        if (!preg_match('/' . self::VALID_PATTERN . '/', $uuid)) {
+        if (!preg_match('/' . self::VALID_PATTERN . '/D', $uuid)) {
             return false;
         }
 
@@ -670,6 +687,10 @@ class Uuid implements UuidInterface
      *     could arise when the clock is set backwards in time or if the node ID
      *     changes.
      * @return UuidInterface
+     * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if called on a 32-bit system and
+     *     `Moontoast\Math\BigNumber` is not present
+     * @throws \InvalidArgumentException
+     * @throws \Exception if it was not possible to gather sufficient entropy
      */
     public static function uuid1($node = null, $clockSeq = null)
     {
@@ -683,6 +704,7 @@ class Uuid implements UuidInterface
      * @param string $ns The UUID namespace in which to create the named UUID
      * @param string $name The name to create a UUID for
      * @return UuidInterface
+     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
      */
     public static function uuid3($ns, $name)
     {
@@ -693,6 +715,9 @@ class Uuid implements UuidInterface
      * Generate a version 4 (random) UUID.
      *
      * @return UuidInterface
+     * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present
+     * @throws \InvalidArgumentException
+     * @throws \Exception
      */
     public static function uuid4()
     {
@@ -706,6 +731,7 @@ class Uuid implements UuidInterface
      * @param string $ns The UUID namespace in which to create the named UUID
      * @param string $name The name to create a UUID for
      * @return UuidInterface
+     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
      */
     public static function uuid5($ns, $name)
     {
diff --git a/vendor/ramsey/uuid/src/UuidFactory.php b/vendor/ramsey/uuid/src/UuidFactory.php
index 77d2383c..99644d4b 100644
--- a/vendor/ramsey/uuid/src/UuidFactory.php
+++ b/vendor/ramsey/uuid/src/UuidFactory.php
@@ -180,17 +180,26 @@ class UuidFactory implements UuidFactoryInterface
         $this->uuidBuilder = $builder;
     }
 
+    /**
+     * @inheritdoc
+     */
     public function fromBytes($bytes)
     {
         return $this->codec->decodeBytes($bytes);
     }
 
+    /**
+     * @inheritdoc
+     */
     public function fromString($uuid)
     {
         $uuid = strtolower($uuid);
         return $this->codec->decode($uuid);
     }
 
+    /**
+     * @inheritdoc
+     */
     public function fromInteger($integer)
     {
         $hex = $this->numberConverter->toHex($integer);
@@ -199,6 +208,9 @@ class UuidFactory implements UuidFactoryInterface
         return $this->fromString($hex);
     }
 
+    /**
+     * @inheritdoc
+     */
     public function uuid1($node = null, $clockSeq = null)
     {
         $bytes = $this->timeGenerator->generate($node, $clockSeq);
@@ -207,11 +219,17 @@ class UuidFactory implements UuidFactoryInterface
         return $this->uuidFromHashedName($hex, 1);
     }
 
+    /**
+     * @inheritdoc
+     */
     public function uuid3($ns, $name)
     {
         return $this->uuidFromNsAndName($ns, $name, 3, 'md5');
     }
 
+    /**
+     * @inheritdoc
+     */
     public function uuid4()
     {
         $bytes = $this->randomGenerator->generate(16);
@@ -224,6 +242,9 @@ class UuidFactory implements UuidFactoryInterface
         return $this->uuidFromHashedName($hex, 4);
     }
 
+    /**
+     * @inheritdoc
+     */
     public function uuid5($ns, $name)
     {
         return $this->uuidFromNsAndName($ns, $name, 5, 'sha1');
@@ -253,6 +274,7 @@ class UuidFactory implements UuidFactoryInterface
      * @param string $hashFunction The hash function to use when hashing together
      *     the namespace and name
      * @return UuidInterface
+     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
      */
     protected function uuidFromNsAndName($ns, $name, $version, $hashFunction)
     {
diff --git a/vendor/ramsey/uuid/src/UuidFactoryInterface.php b/vendor/ramsey/uuid/src/UuidFactoryInterface.php
index 6895ff2c..a228f5bc 100644
--- a/vendor/ramsey/uuid/src/UuidFactoryInterface.php
+++ b/vendor/ramsey/uuid/src/UuidFactoryInterface.php
@@ -23,12 +23,16 @@ interface UuidFactoryInterface
     /**
      * Generate a version 1 UUID from a host ID, sequence number, and the current time.
      *
-     * @param int|string $node A 48-bit number representing the hardware address
+     * @param int|string|null $node A 48-bit number representing the hardware address
      *     This number may be represented as an integer or a hexadecimal string.
-     * @param int $clockSeq A 14-bit number used to help avoid duplicates that
+     * @param int|null $clockSeq A 14-bit number used to help avoid duplicates that
      *     could arise when the clock is set backwards in time or if the node ID
      *     changes.
      * @return UuidInterface
+     * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if called on a 32-bit system and
+     *     `Moontoast\Math\BigNumber` is not present
+     * @throws \InvalidArgumentException
+     * @throws \Exception if it was not possible to gather sufficient entropy
      */
     public function uuid1($node = null, $clockSeq = null);
 
@@ -39,6 +43,7 @@ interface UuidFactoryInterface
      * @param string $ns The UUID namespace in which to create the named UUID
      * @param string $name The name to create a UUID for
      * @return UuidInterface
+     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
      */
     public function uuid3($ns, $name);
 
@@ -46,6 +51,9 @@ interface UuidFactoryInterface
      * Generate a version 4 (random) UUID.
      *
      * @return UuidInterface
+     * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present
+     * @throws \InvalidArgumentException
+     * @throws \Exception
      */
     public function uuid4();
 
@@ -56,6 +64,7 @@ interface UuidFactoryInterface
      * @param string $ns The UUID namespace in which to create the named UUID
      * @param string $name The name to create a UUID for
      * @return UuidInterface
+     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
      */
     public function uuid5($ns, $name);
 
@@ -64,6 +73,8 @@ interface UuidFactoryInterface
      *
      * @param string $bytes A 16-byte string representation of a UUID
      * @return UuidInterface
+     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
+     * @throws \InvalidArgumentException if string has not 16 characters
      */
     public function fromBytes($bytes);
 
@@ -72,6 +83,7 @@ interface UuidFactoryInterface
      *
      * @param string $uuid A string representation of a UUID
      * @return UuidInterface
+     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
      */
     public function fromString($uuid);
 
@@ -84,6 +96,8 @@ interface UuidFactoryInterface
      * @param mixed $integer The integer to use when creating a `Uuid` from an
      *     integer; may be of any type understood by the configured number converter
      * @return UuidInterface
+     * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present
+     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
      */
     public function fromInteger($integer);
 }
diff --git a/vendor/ramsey/uuid/src/UuidInterface.php b/vendor/ramsey/uuid/src/UuidInterface.php
index 792c32aa..ea3a46fb 100644
--- a/vendor/ramsey/uuid/src/UuidInterface.php
+++ b/vendor/ramsey/uuid/src/UuidInterface.php
@@ -123,6 +123,8 @@ interface UuidInterface extends \JsonSerializable, \Serializable
      *
      * @return \DateTime A PHP DateTime representation of the date
      * @throws UnsupportedOperationException If this UUID is not a version 1 UUID
+     * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if called in a 32-bit system and
+     *     `Moontoast\Math\BigNumber` is not present
      */
     public function getDateTime();
 
@@ -131,6 +133,7 @@ interface UuidInterface extends \JsonSerializable, \Serializable
      * representation.
      *
      * @return mixed Converted representation of the unsigned 128-bit integer value
+     * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present
      */
     public function getInteger();
 
diff --git a/vendor/swiftmailer/swiftmailer/.php_cs.dist b/vendor/swiftmailer/swiftmailer/.php_cs.dist
index f18d65d4..2c04e04b 100644
--- a/vendor/swiftmailer/swiftmailer/.php_cs.dist
+++ b/vendor/swiftmailer/swiftmailer/.php_cs.dist
@@ -1,15 +1,16 @@
 <?php
 
 return PhpCsFixer\Config::create()
-    ->setRules(array(
+    ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        'array_syntax' => array('syntax' => 'long'),
+        'array_syntax' => ['syntax' => 'short'],
         'no_unreachable_default_argument_value' => false,
-        'braces' => array('allow_single_line_closure' => true),
+        'braces' => ['allow_single_line_closure' => true],
         'heredoc_to_nowdoc' => false,
         'phpdoc_annotation_without_dot' => false,
-    ))
+        'ternary_to_null_coalescing' => true,
+    ])
     ->setRiskyAllowed(true)
     ->setFinder(PhpCsFixer\Finder::create()->in(__DIR__))
 ;
diff --git a/vendor/swiftmailer/swiftmailer/.travis.yml b/vendor/swiftmailer/swiftmailer/.travis.yml
index 60b25413..5ee2c0db 100644
--- a/vendor/swiftmailer/swiftmailer/.travis.yml
+++ b/vendor/swiftmailer/swiftmailer/.travis.yml
@@ -17,6 +17,7 @@ matrix:
     include:
         - php: 7.0
         - php: 7.1
+        - php: 7.2
     fast_finish: true
 
 cache:
diff --git a/vendor/swiftmailer/swiftmailer/CHANGES b/vendor/swiftmailer/swiftmailer/CHANGES
index 8ded49f8..1725a204 100644
--- a/vendor/swiftmailer/swiftmailer/CHANGES
+++ b/vendor/swiftmailer/swiftmailer/CHANGES
@@ -1,6 +1,39 @@
 Changelog
 =========
 
+6.1.3 (2018-XX-XX)
+------------------
+
+ * added auto-start to the SMTP transport when sending a message
+ * tweaked error message when the response from an SMTP server is empty
+ * fixed missing property in Swift_Mime_IdGenerator
+ * exposed original body content type with Swift_Mime_SimpleMimeEntity::getBodyContentType()
+ * fixed typo in variable name in Swift_AddressEncoder_IdnAddressEncoder
+ * fixed return type in MessageLogger
+ * fixed missing property addressEncoder in SimpleHeaderFactory class
+
+6.1.2 (2018-07-13)
+------------------
+
+ * handled recipient errors when pipelining
+
+6.1.1 (2018-07-04)
+------------------
+
+ * removed hard dependency on an IDN encoder
+
+6.1.0 (2018-07-02)
+------------------
+
+ * added address encoder exceptions during send
+ * added support for bubbling up authenticator error messages
+ * added support for non-ASCII email addresses
+ * introduced new dependencies: transport.smtphandlers and transport.authhandlers
+ * deprecated Swift_Signers_OpenDKIMSigner; use Swift_Signers_DKIMSigner instead
+ * added support for SMTP pipelining
+ * added Swift_Transport_Esmtp_EightBitMimeHandler
+ * fixed startTLS only allowed tls1.0, now allowed: tls1.0, tls1.1, tls1.2
+
 6.0.2 (2017-09-30)
 ------------------
 
@@ -28,10 +61,10 @@ Changelog
  * bumped minimum version to PHP 7.0
  * removed Swift_Validate and replaced by egulias/email-validator
 
-5.4.9 (2017-XX-XX)
+5.4.9 (2018-01-23)
 ------------------
 
- * n/a
+ * no changes, last version of the 5.x series
 
 5.4.8 (2017-05-01)
 ------------------
diff --git a/vendor/swiftmailer/swiftmailer/LICENSE b/vendor/swiftmailer/swiftmailer/LICENSE
index 485f1d6d..bb9c80f0 100644
--- a/vendor/swiftmailer/swiftmailer/LICENSE
+++ b/vendor/swiftmailer/swiftmailer/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2016 Fabien Potencier
+Copyright (c) 2013-2018 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/swiftmailer/swiftmailer/composer.json b/vendor/swiftmailer/swiftmailer/composer.json
index 40439830..9e5d360f 100644
--- a/vendor/swiftmailer/swiftmailer/composer.json
+++ b/vendor/swiftmailer/swiftmailer/composer.json
@@ -3,7 +3,7 @@
     "type": "library",
     "description": "Swiftmailer, free feature-rich PHP mailer",
     "keywords": ["mail","mailer","email"],
-    "homepage": "http://swiftmailer.symfony.com",
+    "homepage": "https://swiftmailer.symfony.com",
     "license": "MIT",
     "authors": [
         {
@@ -22,6 +22,10 @@
         "mockery/mockery": "~0.9.1",
         "symfony/phpunit-bridge": "~3.3@dev"
     },
+    "suggest": {
+        "ext-intl": "Needed to support internationalized email addresses",
+        "true/punycode": "Needed to support internationalized email addresses, if ext-intl is not installed"
+    },
     "autoload": {
         "files": ["lib/swift_required.php"]
     },
@@ -30,7 +34,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "6.0-dev"
+            "dev-master": "6.1-dev"
         }
     }
 }
diff --git a/vendor/swiftmailer/swiftmailer/doc/headers.rst b/vendor/swiftmailer/swiftmailer/doc/headers.rst
index 4f398c82..8b8bece2 100644
--- a/vendor/swiftmailer/swiftmailer/doc/headers.rst
+++ b/vendor/swiftmailer/swiftmailer/doc/headers.rst
@@ -383,6 +383,19 @@ following::
 
     */
 
+Internationalized domains are automatically converted to IDN encoding::
+
+    $to = $message->getHeaders()->get('To');
+    $to->setAddresses('joe@ëxämple.org');
+
+    echo $to->toString();
+
+    /*
+
+    To: joe@xn--xmple-gra1c.org
+
+    */
+
 ID Headers
 ~~~~~~~~~~
 
@@ -439,7 +452,6 @@ You add a new path header to a HeaderSet by calling the HeaderSet's
     $headers = $message->getHeaders();
     $headers->addPathHeader('Your-Header-Name', 'person@example.org');
 
-
 Changing the value of an existing path header is done by calling its
 ``setAddress()`` method::
 
diff --git a/vendor/swiftmailer/swiftmailer/doc/messages.rst b/vendor/swiftmailer/swiftmailer/doc/messages.rst
index 03232cf8..fac402c6 100644
--- a/vendor/swiftmailer/swiftmailer/doc/messages.rst
+++ b/vendor/swiftmailer/swiftmailer/doc/messages.rst
@@ -223,11 +223,9 @@ the same filename as the one you attached::
     // Attach it to the message
     $message->attach($attachment);
 
-
     // The two statements above could be written in one line instead
     $message->attach(Swift_Attachment::fromPath('/path/to/image.jpg'));
 
-
     // You can attach files from a URL if allow_url_fopen is on in php.ini
     $message->attach(Swift_Attachment::fromPath('http://site.tld/logo.png'));
 
@@ -245,7 +243,6 @@ the email will rename the file to something else::
     $attachment = Swift_Attachment::fromPath('/path/to/image.jpg')
       ->setFilename('cool.jpg');
 
-
     // Because there's a fluid interface, you can do this in one statement
     $message->attach(
       Swift_Attachment::fromPath('/path/to/image.jpg')->setFilename('cool.jpg')
@@ -631,6 +628,26 @@ the address::
         $message->addBcc('person1@example.org');
         $message->addBcc('person2@example.org', 'Person 2 Name');
 
+.. sidebar:: Internationalized Email Addresses
+
+    Traditionally only ASCII characters have been allowed in email addresses.
+    With the introduction of internationalized domain names (IDNs), non-ASCII
+    characters may appear in the domain name. By default, Swiftmailer encodes
+    such domain names in Punycode (e.g. xn--xample-ova.invalid). This is
+    compatible with all mail servers.
+
+    RFC 6531 introduced an SMTP extension, SMTPUTF8, that allows non-ASCII
+    characters in email addresses on both sides of the @ sign. To send to such
+    addresses, your outbound SMTP server must support the SMTPUTF8 extension.
+    You should use the ``Swift_AddressEncoder_Utf8AddressEncoder`` address
+    encoder and enable the ``Swift_Transport_Esmtp_SmtpUtf8Handler`` SMTP
+    extension handler::
+
+        $smtpUtf8 = new Swift_Transport_Esmtp_SmtpUtf8Handler();
+        $transport->setExtensionHandlers([$smtpUtf8]);
+        $utf8Encoder = new Swift_AddressEncoder_Utf8AddressEncoder();
+        $transport->setAddressEncoder($utf8Encoder);
+
 Specifying Sender Details
 -------------------------
 
@@ -789,7 +806,7 @@ Using both signing and encrypting is also possible::
 The used encryption cipher can be set as the second parameter of
 setEncryptCertificate()
 
-See http://php.net/manual/openssl.ciphers for a list of supported ciphers.
+See https://secure.php.net/manual/openssl.ciphers for a list of supported ciphers.
 
 By default the message is first signed and then encrypted, this can be changed
 by adding::
@@ -822,7 +839,7 @@ sent to this address.
 Setting the Character Set
 -------------------------
 
-The character set of the message (and it's MIME parts) is set with the
+The character set of the message (and its MIME parts) is set with the
 ``setCharset()`` method. You can also change the global default of UTF-8 by
 working with the ``Swift_Preferences`` class.
 
@@ -860,6 +877,31 @@ To set the character set of your Message:
     // Approach 4: Specify the charset for each part added
     $message->addPart('My part', 'text/plain', 'iso-8859-2');
 
+Setting the Encoding
+--------------------
+
+The body of each MIME part needs to be encoded. Binary attachments are encoded
+in base64 using the ``Swift_Mime_ContentEncoder_Base64ContentEncoder``. Text
+parts are traditionally encoded in quoted-printable using
+``Swift_Mime_ContentEncoder_QpContentEncoder`` or
+``Swift_Mime_ContentEncoder_NativeQpContentEncoder``.
+
+The encoder of the message or MIME part is set with the ``setEncoder()`` method.
+
+Quoted-printable is the safe choice, because it converts 8-bit text as 7-bit.
+Most modern SMTP servers support 8-bit text. This is advertised via the 8BITMIME
+SMTP extension. If your outbound SMTP server supports this SMTP extension, and
+it supports downgrading the message (e.g converting to quoted-printable on the
+fly) when delivering to a downstream server that does not support the extension,
+you may wish to use ``Swift_Mime_ContentEncoder_PlainContentEncoder`` in
+``8bit`` mode instead. This has the advantage that the source data is slightly
+more readable and compact, especially for non-Western languages.
+
+        $eightBitMime = new Swift_Transport_Esmtp_EightBitMimeHandler();
+        $transport->setExtensionHandlers([$eightBitMime]);
+        $plainEncoder = new Swift_Mime_ContentEncoder_PlainContentEncoder('8bit');
+        $message->setEncoder($plainEncoder);
+
 Setting the Line Length
 -----------------------
 
diff --git a/vendor/swiftmailer/swiftmailer/doc/sending.rst b/vendor/swiftmailer/swiftmailer/doc/sending.rst
index 908959e6..01042079 100644
--- a/vendor/swiftmailer/swiftmailer/doc/sending.rst
+++ b/vendor/swiftmailer/swiftmailer/doc/sending.rst
@@ -149,6 +149,10 @@ settings.
     "ssl" are present in your PHP installation by using the PHP function
     ``stream_get_transports()``.
 
+.. note::
+    If you are using Mailcatcher_, make sure you do not set the encryption
+    for the ``Swift_SmtpTransport``, since Mailcatcher does not support encryption.
+
 SMTP with a Username and Password
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -343,10 +347,11 @@ Mailer will throw a ``Swift_RfcComplianceException``.
 
 If you add recipients automatically based on a data source that may contain
 invalid email addresses, you can prevent possible exceptions by validating the
-addresses using ``Swift_Validate::email($email)`` and only adding addresses
-that validate. Another way would be to wrap your ``setTo()``, ``setCc()`` and
-``setBcc()`` calls in a try-catch block and handle the
-``Swift_RfcComplianceException`` in the catch block.
+addresses using ``Egulias\EmailValidator\EmailValidator`` (a dependency that is
+installed with Swift Mailer) and only adding addresses that validate. Another
+way would be to wrap your ``setTo()``, ``setCc()`` and ``setBcc()`` calls in a
+try-catch block and handle the ``Swift_RfcComplianceException`` in the catch
+block.
 
 Handling invalid addresses properly is especially important when sending emails
 in large batches since a single invalid address might cause an unhandled
@@ -444,3 +449,5 @@ added to the array provided by-reference.
     empty array and then failures will be added to that array. If the variable
     already exists it will be type-cast to an array and failures will be added
     to it.
+
+.. _Mailcatcher: https://mailcatcher.me/
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift.php
index e89703ea..93e596ce 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift.php
@@ -11,15 +11,14 @@
 /**
  * General utility class in Swift Mailer, not to be instantiated.
  *
- *
  * @author Chris Corbyn
  */
 abstract class Swift
 {
-    const VERSION = '6.0.2';
+    const VERSION = '6.1.3';
 
     public static $initialized = false;
-    public static $inits = array();
+    public static $inits = [];
 
     /**
      * Registers an initializer callable that will be called the first time
@@ -74,6 +73,6 @@ abstract class Swift
         if (null !== $callable) {
             self::$inits[] = $callable;
         }
-        spl_autoload_register(array('Swift', 'autoload'));
+        spl_autoload_register(['Swift', 'autoload']);
     }
 }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder.php
new file mode 100644
index 00000000..7ec3e90b
--- /dev/null
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Email address encoder.
+ *
+ * @author Christian Schmidt
+ */
+interface Swift_AddressEncoder
+{
+    /**
+     * Encodes an email address.
+     *
+     * @throws Swift_AddressEncoderException If the email cannot be represented in
+     *                                       the encoding implemented by this class.
+     */
+    public function encodeString(string $address): string;
+}
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/IdnAddressEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/IdnAddressEncoder.php
new file mode 100644
index 00000000..56935b13
--- /dev/null
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/IdnAddressEncoder.php
@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An IDN email address encoder.
+ *
+ * Encodes the domain part of an address using IDN. This is compatible will all
+ * SMTP servers.
+ *
+ * This encoder does not support email addresses with non-ASCII characters in
+ * local-part (the substring before @). To send to such addresses, use
+ * Swift_AddressEncoder_Utf8AddressEncoder together with
+ * Swift_Transport_Esmtp_SmtpUtf8Handler. Your outbound SMTP server must support
+ * the SMTPUTF8 extension.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_AddressEncoder_IdnAddressEncoder implements Swift_AddressEncoder
+{
+    /**
+     * Encodes the domain part of an address using IDN.
+     *
+     * @throws Swift_AddressEncoderException If local-part contains non-ASCII characters,
+     *                                       or if no suitable IDN encoder is installed.
+     */
+    public function encodeString(string $address): string
+    {
+        $i = strrpos($address, '@');
+        if (false !== $i) {
+            $local = substr($address, 0, $i);
+            $domain = substr($address, $i + 1);
+
+            if (preg_match('/[^\x00-\x7F]/', $local)) {
+                throw new Swift_AddressEncoderException('Non-ASCII characters not supported in local-part', $address);
+            }
+
+            if (preg_match('/[^\x00-\x7F]/', $domain)) {
+                $address = sprintf('%s@%s', $local, $this->idnToAscii($domain));
+            }
+        }
+
+        return $address;
+    }
+
+    /**
+     * IDN-encodes a UTF-8 string to ASCII.
+     */
+    protected function idnToAscii(string $string): string
+    {
+        if (function_exists('idn_to_ascii')) {
+            return idn_to_ascii($string, 0, INTL_IDNA_VARIANT_UTS46);
+        }
+
+        if (class_exists('TrueBV\Punycode')) {
+            $punycode = new \TrueBV\Punycode();
+
+            return $punycode->encode($string);
+        }
+
+        throw new Swift_AddressEncoderException('Non-ASCII characters in address, but no IDN encoder found (install the intl extension or the true/punycode package)', $string);
+    }
+}
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/Utf8AddressEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/Utf8AddressEncoder.php
new file mode 100644
index 00000000..1b454305
--- /dev/null
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/Utf8AddressEncoder.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A UTF-8 email address encoder.
+ *
+ * Returns the email address verbatimly in UTF-8 as permitted by RFC 6531 and
+ * RFC 6532. It supports addresses containing non-ASCII characters in both
+ * local-part and domain (i.e. on both sides of @).
+ *
+ * This encoder must be used together with Swift_Transport_Esmtp_SmtpUtf8Handler
+ * and requires that the outbound SMTP server supports the SMTPUTF8 extension.
+ *
+ * If your outbound SMTP server does not support SMTPUTF8, use
+ * Swift_AddressEncoder_IdnAddressEncoder instead. This allows sending to email
+ * addresses with non-ASCII characters in the domain, but not in local-part.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_AddressEncoder_Utf8AddressEncoder implements Swift_AddressEncoder
+{
+    /**
+     * Returns the address verbatimly.
+     */
+    public function encodeString(string $address): string
+    {
+        return $address;
+    }
+}
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoderException.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoderException.php
new file mode 100644
index 00000000..9b405476
--- /dev/null
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoderException.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * AddressEncoderException when the specified email address is in a format that
+ * cannot be encoded by a given address encoder.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_AddressEncoderException extends Swift_RfcComplianceException
+{
+    protected $address;
+
+    public function __construct(string $message, string $address)
+    {
+        parent::__construct($message);
+
+        $this->address = $address;
+    }
+
+    public function getAddress(): string
+    {
+        return $this->address;
+    }
+}
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Attachment.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Attachment.php
index 1fb232c9..79aac6a0 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Attachment.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Attachment.php
@@ -27,16 +27,13 @@ class Swift_Attachment extends Swift_Mime_Attachment
     public function __construct($data = null, $filename = null, $contentType = null)
     {
         call_user_func_array(
-            array($this, 'Swift_Mime_Attachment::__construct'),
+            [$this, 'Swift_Mime_Attachment::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('mime.attachment')
             );
 
-        $this->setBody($data);
+        $this->setBody($data, $contentType);
         $this->setFilename($filename);
-        if ($contentType) {
-            $this->setContentType($contentType);
-        }
     }
 
     /**
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
index bfd2c79b..3a69c15f 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
@@ -25,7 +25,7 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      *
      * @var Swift_StreamFilter[]
      */
-    private $filters = array();
+    private $filters = [];
 
     /**
      * A buffer for writing.
@@ -37,7 +37,7 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      *
      * @var Swift_InputByteStream[]
      */
-    private $mirrors = array();
+    private $mirrors = [];
 
     /**
      * Commit the given bytes to the storage medium immediately.
@@ -54,8 +54,7 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
     /**
      * Add a StreamFilter to this InputByteStream.
      *
-     * @param Swift_StreamFilter $filter
-     * @param string             $key
+     * @param string $key
      */
     public function addFilter(Swift_StreamFilter $filter, $key)
     {
@@ -110,8 +109,6 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function bind(Swift_InputByteStream $is)
     {
@@ -124,14 +121,12 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function unbind(Swift_InputByteStream $is)
     {
         foreach ($this->mirrors as $k => $stream) {
             if ($is === $stream) {
-                if ($this->writeBuffer !== '') {
+                if ('' !== $this->writeBuffer) {
                     $stream->write($this->writeBuffer);
                 }
                 unset($this->mirrors[$k]);
@@ -147,7 +142,7 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      */
     public function flushBuffers()
     {
-        if ($this->writeBuffer !== '') {
+        if ('' !== $this->writeBuffer) {
             $this->doWrite($this->writeBuffer);
         }
         $this->flush();
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
index 31b85e0e..68dc3b1e 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
@@ -20,7 +20,7 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      *
      * @var string[]
      */
-    private $array = array();
+    private $array = [];
 
     /**
      * The size of the stack.
@@ -41,7 +41,7 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      *
      * @var Swift_InputByteStream[]
      */
-    private $mirrors = array();
+    private $mirrors = [];
 
     /**
      * Create a new ArrayByteStream.
@@ -58,7 +58,7 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
         } elseif (is_string($stack)) {
             $this->write($stack);
         } else {
-            $this->array = array();
+            $this->array = [];
         }
     }
 
@@ -121,8 +121,6 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function bind(Swift_InputByteStream $is)
     {
@@ -135,8 +133,6 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function unbind(Swift_InputByteStream $is)
     {
@@ -172,7 +168,7 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
     public function flushBuffers()
     {
         $this->offset = 0;
-        $this->array = array();
+        $this->array = [];
         $this->arraySize = 0;
 
         foreach ($this->mirrors as $stream) {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
index 61f820e5..0c428f79 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
@@ -81,7 +81,7 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
 
             // If we read one byte after reaching the end of the file
             // feof() will return false and an empty string is returned
-            if ($bytes === '' && feof($fp)) {
+            if ('' === $bytes && feof($fp)) {
                 $this->resetReadHandle();
 
                 return false;
@@ -131,7 +131,7 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
                 throw new Swift_IoException('Unable to open file for reading ['.$this->path.']');
             }
             $this->reader = $pointer;
-            if ($this->offset != 0) {
+            if (0 != $this->offset) {
                 $this->getReadStreamSeekableStatus();
                 $this->seekReadStreamToPosition($this->offset);
             }
@@ -173,10 +173,10 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
     /** Streams in a readOnly stream ensuring copy if needed */
     private function seekReadStreamToPosition($offset)
     {
-        if ($this->seekable === null) {
+        if (null === $this->seekable) {
             $this->getReadStreamSeekableStatus();
         }
-        if ($this->seekable === false) {
+        if (false === $this->seekable) {
             $currentPos = ftell($this->reader);
             if ($currentPos < $offset) {
                 $toDiscard = $offset - $currentPos;
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
index 1c9a80c0..2d00b6a0 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
@@ -17,7 +17,7 @@ class Swift_ByteStream_TemporaryFileByteStream extends Swift_ByteStream_FileByte
     {
         $filePath = tempnam(sys_get_temp_dir(), 'FileByteStream');
 
-        if ($filePath === false) {
+        if (false === $filePath) {
             throw new Swift_IoException('Failed to retrieve temporary file name.');
         }
 
@@ -26,7 +26,7 @@ class Swift_ByteStream_TemporaryFileByteStream extends Swift_ByteStream_FileByte
 
     public function getContent()
     {
-        if (($content = file_get_contents($this->getPath())) === false) {
+        if (false === ($content = file_get_contents($this->getPath()))) {
             throw new Swift_IoException('Failed to get temporary file content.');
         }
 
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
index 22746bd8..4a2df31d 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
@@ -17,7 +17,7 @@
 class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
 {
     /** Pre-computed for optimization */
-    private static $length_map = array(
+    private static $length_map = [
         // N=0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F,
         1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x0N
         1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x1N
@@ -35,9 +35,9 @@ class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
         2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 0xDN
         3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 0xEN
         4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 0, 0,  // 0xFN
-    );
+    ];
 
-    private static $s_length_map = array(
+    private static $s_length_map = [
         "\x00" => 1, "\x01" => 1, "\x02" => 1, "\x03" => 1, "\x04" => 1, "\x05" => 1, "\x06" => 1, "\x07" => 1,
         "\x08" => 1, "\x09" => 1, "\x0a" => 1, "\x0b" => 1, "\x0c" => 1, "\x0d" => 1, "\x0e" => 1, "\x0f" => 1,
         "\x10" => 1, "\x11" => 1, "\x12" => 1, "\x13" => 1, "\x14" => 1, "\x15" => 1, "\x16" => 1, "\x17" => 1,
@@ -70,7 +70,7 @@ class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
         "\xe8" => 3, "\xe9" => 3, "\xea" => 3, "\xeb" => 3, "\xec" => 3, "\xed" => 3, "\xee" => 3, "\xef" => 3,
         "\xf0" => 4, "\xf1" => 4, "\xf2" => 4, "\xf3" => 4, "\xf4" => 4, "\xf5" => 4, "\xf6" => 4, "\xf7" => 4,
         "\xf8" => 5, "\xf9" => 5, "\xfa" => 5, "\xfb" => 5, "\xfc" => 6, "\xfd" => 6, "\xfe" => 0, "\xff" => 0,
-     );
+     ];
 
     /**
      * Returns the complete character map.
@@ -85,7 +85,7 @@ class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
     public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
     {
         if (!isset($currentMap['i']) || !isset($currentMap['p'])) {
-            $currentMap['p'] = $currentMap['i'] = array();
+            $currentMap['p'] = $currentMap['i'] = [];
         }
 
         $strlen = strlen($string);
@@ -95,12 +95,12 @@ class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
         for ($i = 0; $i < $strlen; ++$i) {
             $char = $string[$i];
             $size = self::$s_length_map[$char];
-            if ($size == 0) {
+            if (0 == $size) {
                 /* char is invalid, we must wait for a resync */
                 $invalid = true;
                 continue;
             } else {
-                if ($invalid == true) {
+                if (true === $invalid) {
                     /* We mark the chars as invalid and start a new char */
                     $currentMap['p'][$charPos + $foundChars] = $startOffset + $i;
                     $currentMap['i'][$charPos + $foundChars] = true;
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
index f3641f46..78fffa98 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
@@ -20,14 +20,14 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory implements Swift
      *
      * @var array
      */
-    private static $map = array();
+    private static $map = [];
 
     /**
      * Factories which have already been loaded.
      *
      * @var Swift_CharacterReaderFactory[]
      */
-    private static $loaded = array();
+    private static $loaded = [];
 
     /**
      * Creates a new CharacterReaderFactory.
@@ -50,26 +50,26 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory implements Swift
 
         $prefix = 'Swift_CharacterReader_';
 
-        $singleByte = array(
+        $singleByte = [
             'class' => $prefix.'GenericFixedWidthReader',
-            'constructor' => array(1),
-            );
+            'constructor' => [1],
+            ];
 
-        $doubleByte = array(
+        $doubleByte = [
             'class' => $prefix.'GenericFixedWidthReader',
-            'constructor' => array(2),
-            );
+            'constructor' => [2],
+            ];
 
-        $fourBytes = array(
+        $fourBytes = [
             'class' => $prefix.'GenericFixedWidthReader',
-            'constructor' => array(4),
-            );
+            'constructor' => [4],
+            ];
 
         // Utf-8
-        self::$map['utf-?8'] = array(
+        self::$map['utf-?8'] = [
             'class' => $prefix.'Utf8Reader',
-            'constructor' => array(),
-            );
+            'constructor' => [],
+            ];
 
         //7-8 bit charsets
         self::$map['(us-)?ascii'] = $singleByte;
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
index fbfbceb0..887658c5 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
@@ -31,10 +31,10 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
     private $charset;
 
     /** Array of characters */
-    private $array = array();
+    private $array = [];
 
     /** Size of the array of character */
-    private $array_size = array();
+    private $array_size = [];
 
     /** The current character offset in the stream */
     private $offset = 0;
@@ -65,8 +65,6 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
 
     /**
      * Set the CharacterReaderFactory for multi charset support.
-     *
-     * @param Swift_CharacterReaderFactory $factory
      */
     public function setCharacterReaderFactory(Swift_CharacterReaderFactory $factory)
     {
@@ -87,7 +85,7 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
 
         $startLength = $this->charReader->getInitialByteSize();
         while (false !== $bytes = $os->read($startLength)) {
-            $c = array();
+            $c = [];
             for ($i = 0, $len = strlen($bytes); $i < $len; ++$i) {
                 $c[] = self::$byteMap[$bytes[$i]];
             }
@@ -132,7 +130,7 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
         }
 
         // Don't use array slice
-        $arrays = array();
+        $arrays = [];
         $end = $length + $this->offset;
         for ($i = $this->offset; $i < $end; ++$i) {
             if (!isset($this->array[$i])) {
@@ -162,7 +160,7 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
         if ($this->offset == $this->array_size) {
             return false;
         }
-        $arrays = array();
+        $arrays = [];
         $end = $length + $this->offset;
         for ($i = $this->offset; $i < $end; ++$i) {
             if (!isset($this->array[$i])) {
@@ -194,12 +192,12 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
         unset($chars);
         fseek($fp, 0, SEEK_SET);
 
-        $buffer = array(0);
+        $buffer = [0];
         $buf_pos = 1;
         $buf_len = 1;
         $has_datas = true;
         do {
-            $bytes = array();
+            $bytes = [];
             // Buffer Filing
             if ($buf_len - $buf_pos < $startLength) {
                 $buf = array_splice($buffer, $buf_pos);
@@ -262,14 +260,14 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
     public function flushContents()
     {
         $this->offset = 0;
-        $this->array = array();
+        $this->array = [];
         $this->array_size = 0;
     }
 
     private function reloadBuffer($fp, $len)
     {
-        if (!feof($fp) && ($bytes = fread($fp, $len)) !== false) {
-            $buf = array();
+        if (!feof($fp) && false !== ($bytes = fread($fp, $len))) {
+            $buf = [];
             for ($i = 0, $len = strlen($bytes); $i < $len; ++$i) {
                 $buf[] = self::$byteMap[$bytes[$i]];
             }
@@ -283,7 +281,7 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
     private static function initializeMaps()
     {
         if (!isset(self::$charMap)) {
-            self::$charMap = array();
+            self::$charMap = [];
             for ($byte = 0; $byte < 256; ++$byte) {
                 self::$charMap[$byte] = chr($byte);
             }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
index 0d62fa68..a733063c 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
@@ -81,8 +81,7 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
     /**
      * Constructor.
      *
-     * @param Swift_CharacterReaderFactory $factory
-     * @param string                       $charset
+     * @param string $charset
      */
     public function __construct(Swift_CharacterReaderFactory $factory, $charset)
     {
@@ -106,8 +105,6 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
 
     /**
      * Set the CharacterReaderFactory for multi charset support.
-     *
-     * @param Swift_CharacterReaderFactory $factory
      */
     public function setCharacterReaderFactory(Swift_CharacterReaderFactory $factory)
     {
@@ -128,8 +125,6 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
 
     /**
      * @see Swift_CharacterStream::importByteStream()
-     *
-     * @param Swift_OutputByteStream $os
      */
     public function importByteStream(Swift_OutputByteStream $os)
     {
@@ -220,7 +215,7 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
     public function readBytes($length)
     {
         $read = $this->read($length);
-        if ($read !== false) {
+        if (false !== $read) {
             $ret = array_map('ord', str_split($read, 1));
 
             return $ret;
@@ -252,13 +247,13 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
         if (!isset($this->charReader)) {
             $this->charReader = $this->charReaderFactory->getReaderFor(
                 $this->charset);
-            $this->map = array();
+            $this->map = [];
             $this->mapType = $this->charReader->getMapType();
         }
         $ignored = '';
         $this->datas .= $chars;
         $this->charCount += $this->charReader->getCharPositions(substr($this->datas, $this->datasSize), $this->datasSize, $this->map, $ignored);
-        if ($ignored !== false) {
+        if (false !== $ignored) {
             $this->datasSize = strlen($this->datas) - strlen($ignored);
         } else {
             $this->datasSize = strlen($this->datas);
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php
index b1bc3306..b38f8ce5 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php
@@ -16,22 +16,25 @@
 class Swift_DependencyContainer
 {
     /** Constant for literal value types */
-    const TYPE_VALUE = 0x0001;
+    const TYPE_VALUE = 0x00001;
 
     /** Constant for new instance types */
-    const TYPE_INSTANCE = 0x0010;
+    const TYPE_INSTANCE = 0x00010;
 
     /** Constant for shared instance types */
-    const TYPE_SHARED = 0x0100;
+    const TYPE_SHARED = 0x00100;
 
     /** Constant for aliases */
-    const TYPE_ALIAS = 0x1000;
+    const TYPE_ALIAS = 0x01000;
+
+    /** Constant for arrays */
+    const TYPE_ARRAY = 0x10000;
 
     /** Singleton instance */
     private static $instance = null;
 
     /** The data container */
-    private $store = array();
+    private $store = [];
 
     /** The current endpoint in the data container */
     private $endPoint;
@@ -112,6 +115,8 @@ class Swift_DependencyContainer
                 return $this->createNewInstance($itemName);
             case self::TYPE_SHARED:
                 return $this->createSharedInstance($itemName);
+            case self::TYPE_ARRAY:
+                return $this->createDependenciesFor($itemName);
         }
     }
 
@@ -124,7 +129,7 @@ class Swift_DependencyContainer
      */
     public function createDependenciesFor($itemName)
     {
-        $args = array();
+        $args = [];
         if (isset($this->store[$itemName]['args'])) {
             $args = $this->resolveArgs($this->store[$itemName]['args']);
         }
@@ -147,7 +152,7 @@ class Swift_DependencyContainer
      */
     public function register($itemName)
     {
-        $this->store[$itemName] = array();
+        $this->store[$itemName] = [];
         $this->endPoint = &$this->store[$itemName];
 
         return $this;
@@ -227,6 +232,21 @@ class Swift_DependencyContainer
         return $this;
     }
 
+    /**
+     * Specify the previously registered item as array of dependencies.
+     *
+     * {@link register()} must be called before this will work.
+     *
+     * @return $this
+     */
+    public function asArray()
+    {
+        $endPoint = &$this->getEndPoint();
+        $endPoint['lookupType'] = self::TYPE_ARRAY;
+
+        return $this;
+    }
+
     /**
      * Specify a list of injected dependencies for the previously registered item.
      *
@@ -234,14 +254,12 @@ class Swift_DependencyContainer
      *
      * @see addConstructorValue(), addConstructorLookup()
      *
-     * @param array $lookups
-     *
      * @return $this
      */
     public function withDependencies(array $lookups)
     {
         $endPoint = &$this->getEndPoint();
-        $endPoint['args'] = array();
+        $endPoint['args'] = [];
         foreach ($lookups as $lookup) {
             $this->addConstructorLookup($lookup);
         }
@@ -263,9 +281,9 @@ class Swift_DependencyContainer
     {
         $endPoint = &$this->getEndPoint();
         if (!isset($endPoint['args'])) {
-            $endPoint['args'] = array();
+            $endPoint['args'] = [];
         }
-        $endPoint['args'][] = array('type' => 'value', 'item' => $value);
+        $endPoint['args'][] = ['type' => 'value', 'item' => $value];
 
         return $this;
     }
@@ -284,9 +302,9 @@ class Swift_DependencyContainer
     {
         $endPoint = &$this->getEndPoint();
         if (!isset($this->endPoint['args'])) {
-            $endPoint['args'] = array();
+            $endPoint['args'] = [];
         }
-        $endPoint['args'][] = array('type' => 'lookup', 'item' => $lookup);
+        $endPoint['args'][] = ['type' => 'lookup', 'item' => $lookup];
 
         return $this;
     }
@@ -341,7 +359,7 @@ class Swift_DependencyContainer
     /** Get an argument list with dependencies resolved */
     private function resolveArgs(array $args)
     {
-        $resolved = array();
+        $resolved = [];
         foreach ($args as $argDefinition) {
             switch ($argDefinition['type']) {
                 case 'lookup':
@@ -360,7 +378,7 @@ class Swift_DependencyContainer
     private function lookupRecursive($item)
     {
         if (is_array($item)) {
-            $collection = array();
+            $collection = [];
             foreach ($item as $k => $v) {
                 $collection[$k] = $this->lookupRecursive($v);
             }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/EmbeddedFile.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/EmbeddedFile.php
index 9755a88e..20b81412 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/EmbeddedFile.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/EmbeddedFile.php
@@ -27,7 +27,7 @@ class Swift_EmbeddedFile extends Swift_Mime_EmbeddedFile
     public function __construct($data = null, $filename = null, $contentType = null)
     {
         call_user_func_array(
-            array($this, 'Swift_Mime_EmbeddedFile::__construct'),
+            [$this, 'Swift_Mime_EmbeddedFile::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('mime.embeddedfile')
             );
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
index b23b0770..95b4ae97 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
@@ -36,7 +36,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      *
      * @var string[]
      */
-    protected static $qpMap = array(
+    protected static $qpMap = [
         0 => '=00', 1 => '=01', 2 => '=02', 3 => '=03', 4 => '=04',
         5 => '=05', 6 => '=06', 7 => '=07', 8 => '=08', 9 => '=09',
         10 => '=0A', 11 => '=0B', 12 => '=0C', 13 => '=0D', 14 => '=0E',
@@ -89,16 +89,16 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
         245 => '=F5', 246 => '=F6', 247 => '=F7', 248 => '=F8', 249 => '=F9',
         250 => '=FA', 251 => '=FB', 252 => '=FC', 253 => '=FD', 254 => '=FE',
         255 => '=FF',
-        );
+        ];
 
-    protected static $safeMapShare = array();
+    protected static $safeMapShare = [];
 
     /**
      * A map of non-encoded ascii characters.
      *
      * @var string[]
      */
-    protected $safeMap = array();
+    protected $safeMap = [];
 
     /**
      * Creates a new QpEncoder for the given CharacterStream.
@@ -120,7 +120,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
 
     public function __sleep()
     {
-        return array('charStream', 'filter');
+        return ['charStream', 'filter'];
     }
 
     public function __wakeup()
@@ -141,7 +141,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
     protected function initSafeMap()
     {
         foreach (array_merge(
-            array(0x09, 0x20), range(0x21, 0x3C), range(0x3E, 0x7E)) as $byte) {
+            [0x09, 0x20], range(0x21, 0x3C), range(0x3E, 0x7E)) as $byte) {
             $this->safeMap[$byte] = chr($byte);
         }
     }
@@ -153,9 +153,9 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      * If the first line needs to be shorter, indicate the difference with
      * $firstLineOffset.
      *
-     * @param string $string           to encode
-     * @param int    $firstLineOffset, optional
-     * @param int    $maxLineLength,   optional 0 indicates the default of 76 chars
+     * @param string $string          to encode
+     * @param int    $firstLineOffset optional
+     * @param int    $maxLineLength   optional 0 indicates the default of 76 chars
      *
      * @return string
      */
@@ -167,7 +167,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
 
         $thisLineLength = $maxLineLength - $firstLineOffset;
 
-        $lines = array();
+        $lines = [];
         $lNo = 0;
         $lines[$lNo] = '';
         $currentLine = &$lines[$lNo++];
@@ -200,7 +200,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
             $enc = $this->encodeByteSequence($bytes, $size);
 
             $i = strpos($enc, '=0D=0A');
-            $newLineLength = $lineLen + ($i === false ? $size : $i);
+            $newLineLength = $lineLen + (false === $i ? $size : $i);
 
             if ($currentLine && $newLineLength >= $thisLineLength) {
                 $lines[$lNo] = '';
@@ -211,7 +211,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
 
             $currentLine .= $enc;
 
-            if ($i === false) {
+            if (false === $i) {
                 $lineLen += $size;
             } else {
                 // 6 is the length of '=0D=0A'.
@@ -278,8 +278,8 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      */
     protected function standardize($string)
     {
-        $string = str_replace(array("\t=0D=0A", ' =0D=0A', '=0D=0A'),
-            array("=09\r\n", "=20\r\n", "\r\n"), $string
+        $string = str_replace(["\t=0D=0A", ' =0D=0A', '=0D=0A'],
+            ["=09\r\n", "=20\r\n", "\r\n"], $string
             );
         switch ($end = ord(substr($string, -1))) {
             case 0x09:
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
index bebb1349..2458515a 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
@@ -24,8 +24,6 @@ class Swift_Encoder_Rfc2231Encoder implements Swift_Encoder
 
     /**
      * Creates a new Rfc2231Encoder using the given character stream instance.
-     *
-     * @param Swift_CharacterStream
      */
     public function __construct(Swift_CharacterStream $charStream)
     {
@@ -44,7 +42,7 @@ class Swift_Encoder_Rfc2231Encoder implements Swift_Encoder
      */
     public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
     {
-        $lines = array();
+        $lines = [];
         $lineCount = 0;
         $lines[] = '';
         $currentLine = &$lines[$lineCount++];
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
index 9834aa95..18994c18 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
@@ -27,16 +27,15 @@ class Swift_Events_CommandEvent extends Swift_Events_EventObject
      *
      * @var int[]
      */
-    private $successCodes = array();
+    private $successCodes = [];
 
     /**
      * Create a new CommandEvent for $source with $command.
      *
-     * @param Swift_Transport $source
-     * @param string          $command
-     * @param array           $successCodes
+     * @param string $command
+     * @param array  $successCodes
      */
-    public function __construct(Swift_Transport $source, $command, $successCodes = array())
+    public function __construct(Swift_Transport $source, $command, $successCodes = [])
     {
         parent::__construct($source);
         $this->command = $command;
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
index f602608e..a01dfa26 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
@@ -34,7 +34,7 @@ interface Swift_Events_EventDispatcher
      *
      * @return Swift_Events_CommandEvent
      */
-    public function createCommandEvent(Swift_Transport $source, $command, $successCodes = array());
+    public function createCommandEvent(Swift_Transport $source, $command, $successCodes = []);
 
     /**
      * Create a new ResponseEvent for $source and $response.
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php
index 21e7c812..24a11f44 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php
@@ -43,8 +43,6 @@ class Swift_Events_EventObject implements Swift_Events_Event
 
     /**
      * Prevent this Event from bubbling any further up the stack.
-     *
-     * @param bool $cancel, optional
      */
     public function cancelBubble($cancel = true)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
index 5ae6c04b..ff7c3711 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
@@ -32,9 +32,8 @@ class Swift_Events_ResponseEvent extends Swift_Events_EventObject
     /**
      * Create a new ResponseEvent for $source and $response.
      *
-     * @param Swift_Transport $source
-     * @param string          $response
-     * @param bool            $valid
+     * @param string $response
+     * @param bool   $valid
      */
     public function __construct(Swift_Transport $source, $response, $valid = false)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendEvent.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendEvent.php
index 5dc8efb1..a435691e 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendEvent.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendEvent.php
@@ -42,7 +42,7 @@ class Swift_Events_SendEvent extends Swift_Events_EventObject
      *
      * @var string[]
      */
-    private $failedRecipients = array();
+    private $failedRecipients = [];
 
     /**
      * The overall result as a bitmask from the class constants.
@@ -53,9 +53,6 @@ class Swift_Events_SendEvent extends Swift_Events_EventObject
 
     /**
      * Create a new SendEvent for $source and $message.
-     *
-     * @param Swift_Transport          $source
-     * @param Swift_Mime_SimpleMessage $message
      */
     public function __construct(Swift_Transport $source, Swift_Mime_SimpleMessage $message)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
index 815fa4d9..1396f616 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
@@ -16,34 +16,31 @@
 class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
 {
     /** A map of event types to their associated listener types */
-    private $eventMap = array();
+    private $eventMap = [];
 
     /** Event listeners bound to this dispatcher */
-    private $listeners = array();
+    private $listeners = [];
 
     /** Listeners queued to have an Event bubbled up the stack to them */
-    private $bubbleQueue = array();
+    private $bubbleQueue = [];
 
     /**
      * Create a new EventDispatcher.
      */
     public function __construct()
     {
-        $this->eventMap = array(
+        $this->eventMap = [
             'Swift_Events_CommandEvent' => 'Swift_Events_CommandListener',
             'Swift_Events_ResponseEvent' => 'Swift_Events_ResponseListener',
             'Swift_Events_SendEvent' => 'Swift_Events_SendListener',
             'Swift_Events_TransportChangeEvent' => 'Swift_Events_TransportChangeListener',
             'Swift_Events_TransportExceptionEvent' => 'Swift_Events_TransportExceptionListener',
-            );
+            ];
     }
 
     /**
      * Create a new SendEvent for $source and $message.
      *
-     * @param Swift_Transport $source
-     * @param Swift_Mime_SimpleMessage
-     *
      * @return Swift_Events_SendEvent
      */
     public function createSendEvent(Swift_Transport $source, Swift_Mime_SimpleMessage $message)
@@ -54,13 +51,12 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /**
      * Create a new CommandEvent for $source and $command.
      *
-     * @param Swift_Transport $source
-     * @param string          $command      That will be executed
-     * @param array           $successCodes That are needed
+     * @param string $command      That will be executed
+     * @param array  $successCodes That are needed
      *
      * @return Swift_Events_CommandEvent
      */
-    public function createCommandEvent(Swift_Transport $source, $command, $successCodes = array())
+    public function createCommandEvent(Swift_Transport $source, $command, $successCodes = [])
     {
         return new Swift_Events_CommandEvent($source, $command, $successCodes);
     }
@@ -68,9 +64,8 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /**
      * Create a new ResponseEvent for $source and $response.
      *
-     * @param Swift_Transport $source
-     * @param string          $response
-     * @param bool            $valid    If the response is valid
+     * @param string $response
+     * @param bool   $valid    If the response is valid
      *
      * @return Swift_Events_ResponseEvent
      */
@@ -82,8 +77,6 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /**
      * Create a new TransportChangeEvent for $source.
      *
-     * @param Swift_Transport $source
-     *
      * @return Swift_Events_TransportChangeEvent
      */
     public function createTransportChangeEvent(Swift_Transport $source)
@@ -94,9 +87,6 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /**
      * Create a new TransportExceptionEvent for $source.
      *
-     * @param Swift_Transport          $source
-     * @param Swift_TransportException $ex
-     *
      * @return Swift_Events_TransportExceptionEvent
      */
     public function createTransportExceptionEvent(Swift_Transport $source, Swift_TransportException $ex)
@@ -106,8 +96,6 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
 
     /**
      * Bind an event listener to this dispatcher.
-     *
-     * @param Swift_Events_EventListener $listener
      */
     public function bindEventListener(Swift_Events_EventListener $listener)
     {
@@ -123,8 +111,7 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /**
      * Dispatch the given Event to all suitable listeners.
      *
-     * @param Swift_Events_EventObject $evt
-     * @param string                   $target method
+     * @param string $target method
      */
     public function dispatchEvent(Swift_Events_EventObject $evt, $target)
     {
@@ -135,7 +122,7 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /** Queue listeners on a stack ready for $evt to be bubbled up it */
     private function prepareBubbleQueue(Swift_Events_EventObject $evt)
     {
-        $this->bubbleQueue = array();
+        $this->bubbleQueue = [];
         $evtClass = get_class($evt);
         foreach ($this->listeners as $listener) {
             if (array_key_exists($evtClass, $this->eventMap)
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
index 77534e3e..df442cc7 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
@@ -24,9 +24,6 @@ class Swift_Events_TransportExceptionEvent extends Swift_Events_EventObject
 
     /**
      * Create a new TransportExceptionEvent for $transport.
-     *
-     * @param Swift_Transport          $transport
-     * @param Swift_TransportException $ex
      */
     public function __construct(Swift_Transport $transport, Swift_TransportException $ex)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FailoverTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FailoverTransport.php
index dc2859f7..0044be59 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FailoverTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FailoverTransport.php
@@ -20,10 +20,10 @@ class Swift_FailoverTransport extends Swift_Transport_FailoverTransport
      *
      * @param Swift_Transport[] $transports
      */
-    public function __construct($transports = array())
+    public function __construct($transports = [])
     {
         call_user_func_array(
-            array($this, 'Swift_Transport_FailoverTransport::__construct'),
+            [$this, 'Swift_Transport_FailoverTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.failover')
             );
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FileSpool.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FileSpool.php
index b0b9eb06..d16c47cd 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FileSpool.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/FileSpool.php
@@ -121,7 +121,7 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
         foreach (new DirectoryIterator($this->path) as $file) {
             $file = $file->getRealPath();
 
-            if (substr($file, -16) == '.message.sending') {
+            if ('.message.sending' == substr($file, -16)) {
                 $lockedtime = filectime($file);
                 if ((time() - $lockedtime) > $timeout) {
                     rename($file, substr($file, 0, -8));
@@ -145,7 +145,7 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
         /* Start the transport only if there are queued files to send */
         if (!$transport->isStarted()) {
             foreach ($directoryIterator as $file) {
-                if (substr($file->getRealPath(), -8) == '.message') {
+                if ('.message' == substr($file->getRealPath(), -8)) {
                     $transport->start();
                     break;
                 }
@@ -158,7 +158,7 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
         foreach ($directoryIterator as $file) {
             $file = $file->getRealPath();
 
-            if (substr($file, -8) != '.message') {
+            if ('.message' != substr($file, -8)) {
                 continue;
             }
 
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php
index 56efc759..379a5a17 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php
@@ -52,7 +52,7 @@ interface Swift_InputByteStream
      *
      * @param Swift_InputByteStream $is
      */
-    public function bind(Swift_InputByteStream $is);
+    public function bind(self $is);
 
     /**
      * Remove an already bound stream.
@@ -63,7 +63,7 @@ interface Swift_InputByteStream
      *
      * @param Swift_InputByteStream $is
      */
-    public function unbind(Swift_InputByteStream $is);
+    public function unbind(self $is);
 
     /**
      * Flush the contents of the stream (empty it) and set the internal pointer
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/IoException.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/IoException.php
index c405f352..5452bd41 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/IoException.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/IoException.php
@@ -18,9 +18,8 @@ class Swift_IoException extends Swift_SwiftException
     /**
      * Create a new IoException with $message.
      *
-     * @param string    $message
-     * @param int       $code
-     * @param Exception $previous
+     * @param string $message
+     * @param int    $code
      */
     public function __construct($message, $code = 0, Exception $previous = null)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
index cdd08503..76fafdfc 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
@@ -20,7 +20,7 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      *
      * @var array
      */
-    private $contents = array();
+    private $contents = [];
 
     /**
      * An InputStream for cloning.
@@ -32,8 +32,6 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
     /**
      * Create a new ArrayKeyCache with the given $stream for cloning to make
      * InputByteStreams.
-     *
-     * @param Swift_KeyCache_KeyCacheInputStream $stream
      */
     public function __construct(Swift_KeyCache_KeyCacheInputStream $stream)
     {
@@ -76,10 +74,9 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      *
      * @see MODE_WRITE, MODE_APPEND
      *
-     * @param string                 $nsKey
-     * @param string                 $itemKey
-     * @param Swift_OutputByteStream $os
-     * @param int                    $mode
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param int    $mode
      */
     public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode)
     {
@@ -87,6 +84,7 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
         switch ($mode) {
             case self::MODE_WRITE:
                 $this->clearKey($nsKey, $itemKey);
+                // no break
             case self::MODE_APPEND:
                 if (!$this->hasKey($nsKey, $itemKey)) {
                     $this->contents[$nsKey][$itemKey] = '';
@@ -108,9 +106,8 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      *
      * NOTE: The stream will always write in append mode.
      *
-     * @param string                $nsKey
-     * @param string                $itemKey
-     * @param Swift_InputByteStream $writeThrough
+     * @param string $nsKey
+     * @param string $itemKey
      *
      * @return Swift_InputByteStream
      */
@@ -200,7 +197,7 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
     private function prepareCache($nsKey)
     {
         if (!array_key_exists($nsKey, $this->contents)) {
-            $this->contents[$nsKey] = array();
+            $this->contents[$nsKey] = [];
         }
     }
 }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
index d6a633a1..7dc2886c 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
@@ -43,14 +43,13 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      *
      * @var array
      */
-    private $keys = array();
+    private $keys = [];
 
     /**
      * Create a new DiskKeyCache with the given $stream for cloning to make
      * InputByteStreams, and the given $path to save to.
      *
-     * @param Swift_KeyCache_KeyCacheInputStream $stream
-     * @param string                             $path   to save to
+     * @param string $path to save to
      */
     public function __construct(Swift_KeyCache_KeyCacheInputStream $stream, $path)
     {
@@ -96,10 +95,9 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      *
      * @see MODE_WRITE, MODE_APPEND
      *
-     * @param string                 $nsKey
-     * @param string                 $itemKey
-     * @param Swift_OutputByteStream $os
-     * @param int                    $mode
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param int    $mode
      *
      * @throws Swift_IoException
      */
@@ -131,9 +129,8 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      *
      * NOTE: The stream will always write in append mode.
      *
-     * @param string                $nsKey
-     * @param string                $itemKey
-     * @param Swift_InputByteStream $writeThrough
+     * @param string $nsKey
+     * @param string $itemKey
      *
      * @return Swift_InputByteStream
      */
@@ -250,7 +247,7 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
             if (!mkdir($cacheDir)) {
                 throw new Swift_IoException('Failed to create cache directory '.$cacheDir);
             }
-            $this->keys[$nsKey] = array();
+            $this->keys[$nsKey] = [];
         }
     }
 
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
index 4efe7856..957b1b2a 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
@@ -34,10 +34,9 @@ class Swift_KeyCache_NullKeyCache implements Swift_KeyCache
      *
      * @see MODE_WRITE, MODE_APPEND
      *
-     * @param string                 $nsKey
-     * @param string                 $itemKey
-     * @param Swift_OutputByteStream $os
-     * @param int                    $mode
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param int    $mode
      */
     public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode)
     {
@@ -48,9 +47,8 @@ class Swift_KeyCache_NullKeyCache implements Swift_KeyCache
      *
      * NOTE: The stream will always write in append mode.
      *
-     * @param string                $nsKey
-     * @param string                $itemKey
-     * @param Swift_InputByteStream $writeThrough
+     * @param string $nsKey
+     * @param string $itemKey
      *
      * @return Swift_InputByteStream
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
index a74df434..03bab481 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
@@ -29,8 +29,6 @@ class Swift_KeyCache_SimpleKeyCacheInputStream implements Swift_KeyCache_KeyCach
 
     /**
      * Set the KeyCache to wrap.
-     *
-     * @param Swift_KeyCache $keyCache
      */
     public function setKeyCache(Swift_KeyCache $keyCache)
     {
@@ -39,8 +37,6 @@ class Swift_KeyCache_SimpleKeyCacheInputStream implements Swift_KeyCache_KeyCach
 
     /**
      * Specify a stream to write through for each write().
-     *
-     * @param Swift_InputByteStream $is
      */
     public function setWriteThroughStream(Swift_InputByteStream $is)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
index 03106e55..ce732af5 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
@@ -20,10 +20,10 @@ class Swift_LoadBalancedTransport extends Swift_Transport_LoadBalancedTransport
      *
      * @param array $transports
      */
-    public function __construct($transports = array())
+    public function __construct($transports = [])
     {
         call_user_func_array(
-            array($this, 'Swift_Transport_LoadBalancedTransport::__construct'),
+            [$this, 'Swift_Transport_LoadBalancedTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.loadbalanced')
             );
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php
index 3561ec6e..57630074 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php
@@ -20,8 +20,6 @@ class Swift_Mailer
 
     /**
      * Create a new Mailer using $transport for delivery.
-     *
-     * @param Swift_Transport $transport
      */
     public function __construct(Swift_Transport $transport)
     {
@@ -54,8 +52,7 @@ class Swift_Mailer
      * The return value is the number of recipients who were accepted for
      * delivery.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param array                    $failedRecipients An array of failures by-reference
+     * @param array $failedRecipients An array of failures by-reference
      *
      * @return int The number of successful recipients. Can be 0 which indicates failure
      */
@@ -63,6 +60,7 @@ class Swift_Mailer
     {
         $failedRecipients = (array) $failedRecipients;
 
+        // FIXME: to be removed in 7.0 (as transport must now start itself on send)
         if (!$this->transport->isStarted()) {
             $this->transport->start();
         }
@@ -82,8 +80,6 @@ class Swift_Mailer
 
     /**
      * Register a plugin using a known unique key (e.g. myPlugin).
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
index 84dacb5f..19aa82a9 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
@@ -20,12 +20,10 @@ class Swift_Mailer_ArrayRecipientIterator implements Swift_Mailer_RecipientItera
      *
      * @var array
      */
-    private $recipients = array();
+    private $recipients = [];
 
     /**
      * Create a new ArrayRecipientIterator from $recipients.
-     *
-     * @param array $recipients
      */
     public function __construct(array $recipients)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MemorySpool.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MemorySpool.php
index 9aa62835..e3b0894d 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MemorySpool.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MemorySpool.php
@@ -15,7 +15,7 @@
  */
 class Swift_MemorySpool implements Swift_Spool
 {
-    protected $messages = array();
+    protected $messages = [];
     private $flushRetries = 3;
 
     /**
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php
index 00f6e160..42b861fc 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php
@@ -18,17 +18,17 @@ class Swift_Message extends Swift_Mime_SimpleMessage
     /**
      * @var Swift_Signers_HeaderSigner[]
      */
-    private $headerSigners = array();
+    private $headerSigners = [];
 
     /**
      * @var Swift_Signers_BodySigner[]
      */
-    private $bodySigners = array();
+    private $bodySigners = [];
 
     /**
      * @var array
      */
-    private $savedMessage = array();
+    private $savedMessage = [];
 
     /**
      * Create a new Message.
@@ -43,7 +43,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage
     public function __construct($subject = null, $body = null, $contentType = null, $charset = null)
     {
         call_user_func_array(
-            array($this, 'Swift_Mime_SimpleMessage::__construct'),
+            [$this, 'Swift_Mime_SimpleMessage::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('mime.message')
             );
@@ -75,9 +75,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage
     }
 
     /**
-     * Detach a signature handler from a message.
-     *
-     * @param Swift_Signer $signer
+     * Attach a new signature handler to the message.
      *
      * @return $this
      */
@@ -93,9 +91,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage
     }
 
     /**
-     * Attach a new signature handler to the message.
-     *
-     * @param Swift_Signer $signer
+     * Detach a signature handler from a message.
      *
      * @return $this
      */
@@ -122,6 +118,19 @@ class Swift_Message extends Swift_Mime_SimpleMessage
         return $this;
     }
 
+    /**
+     * Clear all signature handlers attached to the message.
+     *
+     * @return $this
+     */
+    public function clearSigners()
+    {
+        $this->headerSigners = [];
+        $this->bodySigners = [];
+
+        return $this;
+    }
+
     /**
      * Get this message as a complete string.
      *
@@ -146,8 +155,6 @@ class Swift_Message extends Swift_Mime_SimpleMessage
 
     /**
      * Write this message to a {@link Swift_InputByteStream}.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function toByteStream(Swift_InputByteStream $is)
     {
@@ -202,19 +209,17 @@ class Swift_Message extends Swift_Mime_SimpleMessage
      */
     protected function saveMessage()
     {
-        $this->savedMessage = array('headers' => array());
+        $this->savedMessage = ['headers' => []];
         $this->savedMessage['body'] = $this->getBody();
         $this->savedMessage['children'] = $this->getChildren();
-        if (count($this->savedMessage['children']) > 0 && $this->getBody() != '') {
-            $this->setChildren(array_merge(array($this->becomeMimePart()), $this->savedMessage['children']));
+        if (count($this->savedMessage['children']) > 0 && '' != $this->getBody()) {
+            $this->setChildren(array_merge([$this->becomeMimePart()], $this->savedMessage['children']));
             $this->setBody('');
         }
     }
 
     /**
      * save the original headers.
-     *
-     * @param array $altered
      */
     protected function saveHeaders(array $altered)
     {
@@ -252,7 +257,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage
         $this->setChildren($this->savedMessage['children']);
 
         $this->restoreHeaders();
-        $this->savedMessage = array();
+        $this->savedMessage = [];
     }
 
     /**
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php
index a36ce723..917007e4 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php
@@ -16,18 +16,14 @@
 class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
 {
     /** Recognized MIME types */
-    private $mimeTypes = array();
+    private $mimeTypes = [];
 
     /**
      * Create a new Attachment with $headers, $encoder and $cache.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     * @param Swift_Mime_ContentEncoder  $encoder
-     * @param Swift_KeyCache             $cache
-     * @param Swift_IdGenerator          $idGenerator
-     * @param array                      $mimeTypes
+     * @param array $mimeTypes
      */
-    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $mimeTypes = array())
+    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $mimeTypes = [])
     {
         parent::__construct($headers, $encoder, $cache, $idGenerator);
         $this->setDisposition('attachment');
@@ -127,8 +123,7 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
     /**
      * Set the file that this attachment is for.
      *
-     * @param Swift_FileStream $file
-     * @param string           $contentType optional
+     * @param string $contentType optional
      *
      * @return $this
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
index 8f76d70f..8c4e2266 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
@@ -18,10 +18,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
     /**
      * Encode stream $in to stream $out.
      *
-     * @param Swift_OutputByteStream $os
-     * @param Swift_InputByteStream  $is
-     * @param int                    $firstLineOffset
-     * @param int                    $maxLineLength,  optional, 0 indicates the default of 76 bytes
+     * @param int $firstLineOffset
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
     {
@@ -41,7 +38,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
         // When the OutputStream is empty, we must flush any remainder bytes.
         while (true) {
             $readBytes = $os->read(8192);
-            $atEOF = ($readBytes === false);
+            $atEOF = (false === $readBytes);
 
             if ($atEOF) {
                 $streamTheseBytes = $base64ReadBufferRemainderBytes;
@@ -51,7 +48,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
             $base64ReadBufferRemainderBytes = null;
             $bytesLength = strlen($streamTheseBytes);
 
-            if ($bytesLength === 0) { // no data left to encode
+            if (0 === $bytesLength) { // no data left to encode
                 break;
             }
 
@@ -59,7 +56,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
             // and carry over remainder 1-2 bytes to the next loop iteration
             if (!$atEOF) {
                 $excessBytes = $bytesLength % 3;
-                if ($excessBytes !== 0) {
+                if (0 !== $excessBytes) {
                     $base64ReadBufferRemainderBytes = substr($streamTheseBytes, -$excessBytes);
                     $streamTheseBytes = substr($streamTheseBytes, 0, $bytesLength - $excessBytes);
                 }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
index 34de4ef3..9aae4871 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
@@ -50,7 +50,7 @@ class Swift_Mime_ContentEncoder_NativeQpContentEncoder implements Swift_Mime_Con
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
     {
-        if ($this->charset !== 'utf-8') {
+        if ('utf-8' !== $this->charset) {
             throw new RuntimeException(
                 sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
         }
@@ -87,7 +87,7 @@ class Swift_Mime_ContentEncoder_NativeQpContentEncoder implements Swift_Mime_Con
      */
     public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
     {
-        if ($this->charset !== 'utf-8') {
+        if ('utf-8' !== $this->charset) {
             throw new RuntimeException(
                 sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
         }
@@ -107,9 +107,9 @@ class Swift_Mime_ContentEncoder_NativeQpContentEncoder implements Swift_Mime_Con
         // transform CR or LF to CRLF
         $string = preg_replace('~=0D(?!=0A)|(?<!=0D)=0A~', '=0D=0A', $string);
         // transform =0D=0A to CRLF
-        $string = str_replace(array("\t=0D=0A", ' =0D=0A', '=0D=0A'), array("=09\r\n", "=20\r\n", "\r\n"), $string);
+        $string = str_replace(["\t=0D=0A", ' =0D=0A', '=0D=0A'], ["=09\r\n", "=20\r\n", "\r\n"], $string);
 
-        switch ($end = ord(substr($string, -1))) {
+        switch (ord(substr($string, -1))) {
             case 0x09:
                 $string = substr_replace($string, '=09', -1);
                 break;
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NullContentEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NullContentEncoder.php
new file mode 100644
index 00000000..e2350733
--- /dev/null
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NullContentEncoder.php
@@ -0,0 +1,79 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Handles the case where the email body is already encoded and you just need specify the correct
+ * encoding without actually changing the encoding of the body.
+ *
+ * @author Jan Flora <jf@penneo.com>
+ */
+class Swift_Mime_ContentEncoder_NullContentEncoder implements Swift_Mime_ContentEncoder
+{
+    /**
+     * The name of this encoding scheme (probably 7bit or 8bit).
+     *
+     * @var string
+     */
+    private $_name;
+
+    /**
+     * Creates a new NullContentEncoder with $name (probably 7bit or 8bit).
+     *
+     * @param string $name
+     */
+    public function __construct($name)
+    {
+        $this->_name = $name;
+    }
+
+    /**
+     * Encode a given string to produce an encoded string.
+     *
+     * @param string $string
+     * @param int    $firstLineOffset ignored
+     * @param int    $maxLineLength   ignored
+     *
+     * @return string
+     */
+    public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        return $string;
+    }
+
+    /**
+     * Encode stream $in to stream $out.
+     *
+     * @param int $firstLineOffset ignored
+     * @param int $maxLineLength   ignored
+     */
+    public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        while (false !== ($bytes = $os->read(8192))) {
+            $is->write($bytes);
+        }
+    }
+
+    /**
+     * Get the name of this encoding scheme.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->_name;
+    }
+
+    /**
+     * Not used.
+     */
+    public function charsetChanged($charset)
+    {
+    }
+}
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
index 866b0c7c..aa634f54 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
@@ -11,6 +11,10 @@
 /**
  * Handles binary/7/8-bit Transfer Encoding in Swift Mailer.
  *
+ * When sending 8-bit content over SMTP, you should use
+ * Swift_Transport_Esmtp_EightBitMimeHandler to enable the 8BITMIME SMTP
+ * extension.
+ *
  * @author Chris Corbyn
  */
 class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_ContentEncoder
@@ -62,10 +66,8 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
     /**
      * Encode stream $in to stream $out.
      *
-     * @param Swift_OutputByteStream $os
-     * @param Swift_InputByteStream  $is
-     * @param int                    $firstLineOffset ignored
-     * @param int                    $maxLineLength   optional, 0 means no wrapping will occur
+     * @param int $firstLineOffset ignored
+     * @param int $maxLineLength   optional, 0 means no wrapping will occur
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
     {
@@ -121,7 +123,7 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
 
         $originalLines = explode($le, $string);
 
-        $lines = array();
+        $lines = [];
         $lineCount = 0;
 
         foreach ($originalLines as $originalLine) {
@@ -154,8 +156,8 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
     private function canonicalize($string)
     {
         return str_replace(
-            array("\r\n", "\r", "\n"),
-            array("\n", "\n", "\r\n"),
+            ["\r\n", "\r", "\n"],
+            ["\n", "\n", "\r\n"],
             $string
             );
     }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
index b3577dbe..84e3d247 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
@@ -32,7 +32,7 @@ class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder
 
     public function __sleep()
     {
-        return array('charStream', 'filter', 'dotEscape');
+        return ['charStream', 'filter', 'dotEscape'];
     }
 
     protected function getSafeMapShareId()
@@ -97,7 +97,7 @@ class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder
             $enc = $this->encodeByteSequence($bytes, $size);
 
             $i = strpos($enc, '=0D=0A');
-            $newLineLength = $lineLen + ($i === false ? $size : $i);
+            $newLineLength = $lineLen + (false === $i ? $size : $i);
 
             if ($currentLine && $newLineLength >= $thisLineLength) {
                 $is->write($prepend.$this->standardize($currentLine));
@@ -109,7 +109,7 @@ class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder
 
             $currentLine .= $enc;
 
-            if ($i === false) {
+            if (false === $i) {
                 $lineLen += $size;
             } else {
                 // 6 is the length of '=0D=0A'.
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
index 3214e1cf..1b06da8c 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
@@ -35,9 +35,7 @@ class Swift_Mime_ContentEncoder_QpContentEncoderProxy implements Swift_Mime_Cont
     /**
      * Constructor.
      *
-     * @param Swift_Mime_ContentEncoder_QpContentEncoder       $safeEncoder
-     * @param Swift_Mime_ContentEncoder_NativeQpContentEncoder $nativeEncoder
-     * @param string|null                                      $charset
+     * @param string|null $charset
      */
     public function __construct(Swift_Mime_ContentEncoder_QpContentEncoder $safeEncoder, Swift_Mime_ContentEncoder_NativeQpContentEncoder $nativeEncoder, $charset)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
index 0b8526e3..870e7f41 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
@@ -11,6 +11,9 @@
 /**
  * Handles raw Transfer Encoding in Swift Mailer.
  *
+ * When sending 8-bit content over SMTP, you should use
+ * Swift_Transport_Esmtp_EightBitMimeHandler to enable the 8BITMIME SMTP
+ * extension.
  *
  * @author Sebastiaan Stok <s.stok@rollerscapes.net>
  */
@@ -33,10 +36,8 @@ class Swift_Mime_ContentEncoder_RawContentEncoder implements Swift_Mime_ContentE
     /**
      * Encode stream $in to stream $out.
      *
-     * @param Swift_OutputByteStream $in
-     * @param Swift_InputByteStream  $out
-     * @param int                    $firstLineOffset ignored
-     * @param int                    $maxLineLength   ignored
+     * @param int $firstLineOffset ignored
+     * @param int $maxLineLength   ignored
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
index 7835a492..42a51770 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
@@ -18,13 +18,9 @@ class Swift_Mime_EmbeddedFile extends Swift_Mime_Attachment
     /**
      * Creates a new Attachment with $headers and $encoder.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     * @param Swift_Mime_ContentEncoder  $encoder
-     * @param Swift_KeyCache             $cache
-     * @param Swift_IdGenerator          $idGenerator
-     * @param array                      $mimeTypes   optional
+     * @param array $mimeTypes optional
      */
-    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $mimeTypes = array())
+    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $mimeTypes = [])
     {
         parent::__construct($headers, $encoder, $cache, $idGenerator, $mimeTypes);
         $this->setDisposition('inline');
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php
index a8ddd272..ca712f35 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php
@@ -85,7 +85,7 @@ interface Swift_Mime_Header
     public function getFieldBody();
 
     /**
-     * Get this Header rendered as a compliant string.
+     * Get this Header rendered as a compliant string, including trailing CRLF.
      *
      * @return string
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
index 83a4f2f3..c4403575 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
@@ -41,7 +41,7 @@ class Swift_Mime_HeaderEncoder_Base64HeaderEncoder extends Swift_Encoder_Base64E
      */
     public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0, $charset = 'utf-8')
     {
-        if (strtolower($charset) === 'iso-2022-jp') {
+        if ('iso-2022-jp' === strtolower($charset)) {
             $old = mb_internal_encoding();
             mb_internal_encoding('utf-8');
             $newstring = mb_encode_mimeheader($string, $charset, $this->getName(), "\r\n");
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
index 062be7d7..0eef3e1e 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
@@ -29,7 +29,7 @@ class Swift_Mime_HeaderEncoder_QpHeaderEncoder extends Swift_Encoder_QpEncoder i
     {
         foreach (array_merge(
             range(0x61, 0x7A), range(0x41, 0x5A),
-            range(0x30, 0x39), array(0x20, 0x21, 0x2A, 0x2B, 0x2D, 0x2F)
+            range(0x30, 0x39), [0x20, 0x21, 0x2A, 0x2B, 0x2D, 0x2F]
         ) as $byte) {
             $this->safeMap[$byte] = chr($byte);
         }
@@ -58,7 +58,7 @@ class Swift_Mime_HeaderEncoder_QpHeaderEncoder extends Swift_Encoder_QpEncoder i
      */
     public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
     {
-        return str_replace(array(' ', '=20', "=\r\n"), array('_', '_', "\r\n"),
+        return str_replace([' ', '=20', "=\r\n"], ['_', '_', "\r\n"],
             parent::encodeString($string, $firstLineOffset, $maxLineLength)
         );
     }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
index a569f816..3a19404a 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
@@ -109,8 +109,6 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
 
     /**
      * Set the encoder used for encoding the header.
-     *
-     * @param Swift_Mime_HeaderEncoder $encoder
      */
     public function setEncoder(Swift_Mime_HeaderEncoder $encoder)
     {
@@ -196,11 +194,9 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
     /**
      * Produces a compliant, formatted RFC 2822 'phrase' based on the string given.
      *
-     * @param Swift_Mime_Header        $header
-     * @param string                   $string  as displayed
-     * @param string                   $charset of the text
-     * @param Swift_Mime_HeaderEncoder $encoder
-     * @param bool                     $shorten the first line to make remove for header name
+     * @param string $string  as displayed
+     * @param string $charset of the text
+     * @param bool   $shorten the first line to make remove for header name
      *
      * @return string
      */
@@ -214,7 +210,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
             // .. but it is just ascii text, try escaping some characters
             // and make it a quoted-string
             if (preg_match('/^[\x00-\x08\x0B\x0C\x0E-\x7F]*$/D', $phraseStr)) {
-                $phraseStr = $this->escapeSpecials($phraseStr, array('"'));
+                $phraseStr = $this->escapeSpecials($phraseStr, ['"']);
                 $phraseStr = '"'.$phraseStr.'"';
             } else {
                 // ... otherwise it needs encoding
@@ -239,9 +235,9 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      *
      * @return string
      */
-    private function escapeSpecials($token, $include = array())
+    private function escapeSpecials($token, $include = [])
     {
-        foreach (array_merge(array('\\'), $include) as $char) {
+        foreach (array_merge(['\\'], $include) as $char) {
             $token = str_replace($char, '\\'.$char, $token);
         }
 
@@ -251,9 +247,8 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
     /**
      * Encode needed word tokens within a string of input.
      *
-     * @param Swift_Mime_Header $header
-     * @param string            $input
-     * @param string            $usedLength optional
+     * @param string $input
+     * @param string $usedLength optional
      *
      * @return string
      */
@@ -310,7 +305,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     protected function getEncodableWordTokens($string)
     {
-        $tokens = array();
+        $tokens = [];
 
         $encodedToken = '';
         // Split at all whitespace boundaries
@@ -362,7 +357,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
                 )
         );
 
-        if (strtolower($this->charset) !== 'iso-2022-jp') {
+        if ('iso-2022-jp' !== strtolower($this->charset)) {
             // special encoding for iso-2022-jp using mb_encode_mimeheader
             foreach ($encodedTextLines as $lineNum => $line) {
                 $encodedTextLines[$lineNum] = '=?'.$charsetDecl.
@@ -431,7 +426,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
             $string = $this->getFieldBody();
         }
 
-        $tokens = array();
+        $tokens = [];
 
         // Generate atoms; split at all invisible boundaries followed by WSP
         foreach (preg_split('~(?=[ \t])~', $string) as $token) {
@@ -455,7 +450,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
     private function tokensToString(array $tokens)
     {
         $lineCount = 0;
-        $headerLines = array();
+        $headerLines = [];
         $headerLines[] = $this->name.': ';
         $currentLine = &$headerLines[$lineCount++];
 
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
index 6dcc92bf..efe1dad6 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
@@ -79,8 +79,6 @@ class Swift_Mime_Headers_DateHeader extends Swift_Mime_Headers_AbstractHeader
      * Set the date-time of the Date in this Header.
      *
      * If a DateTime instance is provided, it is converted to DateTimeImmutable.
-     *
-     * @param DateTimeInterface $dateTime
      */
     public function setDateTime(DateTimeInterface $dateTime)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
index acf79447..cadc63f8 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
@@ -25,7 +25,7 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      *
      * @var string[]
      */
-    private $ids = array();
+    private $ids = [];
 
     /**
      * The strict EmailValidator.
@@ -34,16 +34,18 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      */
     private $emailValidator;
 
+    private $addressEncoder;
+
     /**
      * Creates a new IdentificationHeader with the given $name and $id.
      *
-     * @param string         $name
-     * @param EmailValidator $emailValidator
+     * @param string $name
      */
-    public function __construct($name, EmailValidator $emailValidator)
+    public function __construct($name, EmailValidator $emailValidator, Swift_AddressEncoder $addressEncoder = null)
     {
         $this->setFieldName($name);
         $this->emailValidator = $emailValidator;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
     }
 
     /**
@@ -94,7 +96,7 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      */
     public function setId($id)
     {
-        $this->setIds(is_array($id) ? $id : array($id));
+        $this->setIds(is_array($id) ? $id : [$id]);
     }
 
     /**
@@ -120,7 +122,7 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      */
     public function setIds(array $ids)
     {
-        $actualIds = array();
+        $actualIds = [];
 
         foreach ($ids as $id) {
             $this->assertValidId($id);
@@ -156,10 +158,10 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
     public function getFieldBody()
     {
         if (!$this->getCachedValue()) {
-            $angleAddrs = array();
+            $angleAddrs = [];
 
             foreach ($this->ids as $id) {
-                $angleAddrs[] = '<'.$id.'>';
+                $angleAddrs[] = '<'.$this->addressEncoder->encodeString($id).'>';
             }
 
             $this->setCachedValue(implode(' ', $angleAddrs));
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
index 450e0f25..9f1fe174 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
@@ -23,7 +23,7 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      *
      * @var string[]
      */
-    private $mailboxes = array();
+    private $mailboxes = [];
 
     /**
      * The strict EmailValidator.
@@ -32,18 +32,19 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      */
     private $emailValidator;
 
+    private $addressEncoder;
+
     /**
      * Creates a new MailboxHeader with $name.
      *
-     * @param string                   $name           of Header
-     * @param Swift_Mime_HeaderEncoder $encoder
-     * @param EmailValidator           $emailValidator
+     * @param string $name of Header
      */
-    public function __construct($name, Swift_Mime_HeaderEncoder $encoder, EmailValidator $emailValidator)
+    public function __construct($name, Swift_Mime_HeaderEncoder $encoder, EmailValidator $emailValidator, Swift_AddressEncoder $addressEncoder = null)
     {
         $this->setFieldName($name);
         $this->setEncoder($encoder);
         $this->emailValidator = $emailValidator;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
     }
 
     /**
@@ -257,7 +258,7 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      */
     protected function normalizeMailboxes(array $mailboxes)
     {
-        $actualMailboxes = array();
+        $actualMailboxes = [];
 
         foreach ($mailboxes as $key => $value) {
             if (is_string($key)) {
@@ -327,10 +328,10 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      */
     private function createNameAddressStrings(array $mailboxes)
     {
-        $strings = array();
+        $strings = [];
 
         foreach ($mailboxes as $email => $name) {
-            $mailboxStr = $email;
+            $mailboxStr = $this->addressEncoder->encodeString($email);
             if (null !== $name) {
                 $nameStr = $this->createDisplayNameString($name, empty($strings));
                 $mailboxStr = $nameStr.' <'.$mailboxStr.'>';
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
index 29277994..fafb5bae 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
@@ -12,6 +12,8 @@
  * An OpenDKIM Specific Header using only raw header datas without encoding.
  *
  * @author De Cock Xavier <xdecock@gmail.com>
+ *
+ * @deprecated since SwiftMailer 6.1.0; use Swift_Signers_DKIMSigner instead.
  */
 class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header
 {
@@ -111,7 +113,7 @@ class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header
      */
     public function toString()
     {
-        return $this->fieldName.': '.$this->value;
+        return $this->fieldName.': '.$this->value."\r\n";
     }
 
     /**
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
index b4a0ddf1..02933c41 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
@@ -34,14 +34,12 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
      *
      * @var string[]
      */
-    private $params = array();
+    private $params = [];
 
     /**
      * Creates a new ParameterizedHeader with $name.
      *
-     * @param string                   $name
-     * @param Swift_Mime_HeaderEncoder $encoder
-     * @param Swift_Encoder            $paramEncoder, optional
+     * @param string $name
      */
     public function __construct($name, Swift_Mime_HeaderEncoder $encoder, Swift_Encoder $paramEncoder = null)
     {
@@ -83,7 +81,7 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
      */
     public function setParameter($parameter, $value)
     {
-        $this->setParameters(array_merge($this->getParameters(), array($parameter => $value)));
+        $this->setParameters(array_merge($this->getParameters(), [$parameter => $value]));
     }
 
     /**
@@ -211,14 +209,14 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
             }
         }
 
-        $valueLines = isset($this->paramEncoder) ? explode("\r\n", $value) : array($value);
+        $valueLines = isset($this->paramEncoder) ? explode("\r\n", $value) : [$value];
 
         // Need to add indices
         if (count($valueLines) > 1) {
-            $paramLines = array();
+            $paramLines = [];
             foreach ($valueLines as $i => $line) {
                 $paramLines[] = $name.'*'.$i.
-                    $this->getEndOfParameterValue($line, true, $i == 0);
+                    $this->getEndOfParameterValue($line, true, 0 == $i);
             }
 
             return implode(";\r\n ", $paramLines);
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
index f79e19fd..d22afbfe 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
@@ -32,16 +32,18 @@ class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
      */
     private $emailValidator;
 
+    private $addressEncoder;
+
     /**
      * Creates a new PathHeader with the given $name.
      *
-     * @param string         $name
-     * @param EmailValidator $emailValidator
+     * @param string $name
      */
-    public function __construct($name, EmailValidator $emailValidator)
+    public function __construct($name, EmailValidator $emailValidator, Swift_AddressEncoder $addressEncoder = null)
     {
         $this->setFieldName($name);
         $this->emailValidator = $emailValidator;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
     }
 
     /**
@@ -127,7 +129,8 @@ class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
     {
         if (!$this->getCachedValue()) {
             if (isset($this->address)) {
-                $this->setCachedValue('<'.$this->address.'>');
+                $address = $this->addressEncoder->encodeString($this->address);
+                $this->setCachedValue('<'.$address.'>');
             }
         }
 
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
index d9d9f5e2..64f160de 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
@@ -25,8 +25,7 @@ class Swift_Mime_Headers_UnstructuredHeader extends Swift_Mime_Headers_AbstractH
     /**
      * Creates a new SimpleHeader with $name.
      *
-     * @param string                   $name
-     * @param Swift_Mime_HeaderEncoder $encoder
+     * @param string $name
      */
     public function __construct($name, Swift_Mime_HeaderEncoder $encoder)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/IdGenerator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/IdGenerator.php
index 6e98ee89..3ce35f27 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/IdGenerator.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/IdGenerator.php
@@ -13,6 +13,8 @@
  */
 class Swift_Mime_IdGenerator implements Swift_IdGenerator
 {
+    private $idRight;
+
     /**
      * @param string $idRight
      */
@@ -46,8 +48,7 @@ class Swift_Mime_IdGenerator implements Swift_IdGenerator
      */
     public function generateId()
     {
-        $idLeft = bin2hex(random_bytes(16)); // set 32 hex values
-
-        return $idLeft.'@'.$this->idRight;
+        // 32 hex values for the left part
+        return bin2hex(random_bytes(16)).'@'.$this->idRight;
     }
 }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php
index d49449fe..54c8b3ac 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php
@@ -30,11 +30,7 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
     /**
      * Create a new MimePart with $headers, $encoder and $cache.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     * @param Swift_Mime_ContentEncoder  $encoder
-     * @param Swift_KeyCache             $cache
-     * @param Swift_IdGenerator          $idGenerator
-     * @param string                     $charset
+     * @param string $charset
      */
     public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $charset = null)
     {
@@ -194,7 +190,7 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
     protected function convertString($string)
     {
         $charset = strtolower($this->getCharset());
-        if (!in_array($charset, array('utf-8', 'iso-8859-1', 'iso-8859-15', ''))) {
+        if (!in_array($charset, ['utf-8', 'iso-8859-1', 'iso-8859-15', ''])) {
             // mb_convert_encoding must be the first one to check, since iconv cannot convert some words.
             if (function_exists('mb_convert_encoding')) {
                 $string = mb_convert_encoding($string, $charset, 'utf-8');
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
index e14c9d6f..93af9963 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
@@ -23,29 +23,27 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_CharsetObserver
     /** The Encoder used by parameters */
     private $paramEncoder;
 
-    /** The Grammar */
-    private $grammar;
-
     /** Strict EmailValidator */
     private $emailValidator;
 
     /** The charset of created Headers */
     private $charset;
 
+    /** Swift_AddressEncoder */
+    private $addressEncoder;
+
     /**
      * Creates a new SimpleHeaderFactory using $encoder and $paramEncoder.
      *
-     * @param Swift_Mime_HeaderEncoder $encoder
-     * @param Swift_Encoder            $paramEncoder
-     * @param EmailValidator           $emailValidator
-     * @param string|null              $charset
+     * @param string|null $charset
      */
-    public function __construct(Swift_Mime_HeaderEncoder $encoder, Swift_Encoder $paramEncoder, EmailValidator $emailValidator, $charset = null)
+    public function __construct(Swift_Mime_HeaderEncoder $encoder, Swift_Encoder $paramEncoder, EmailValidator $emailValidator, $charset = null, Swift_AddressEncoder $addressEncoder = null)
     {
         $this->encoder = $encoder;
         $this->paramEncoder = $paramEncoder;
         $this->emailValidator = $emailValidator;
         $this->charset = $charset;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
     }
 
     /**
@@ -58,7 +56,7 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_CharsetObserver
      */
     public function createMailboxHeader($name, $addresses = null)
     {
-        $header = new Swift_Mime_Headers_MailboxHeader($name, $this->encoder, $this->emailValidator);
+        $header = new Swift_Mime_Headers_MailboxHeader($name, $this->encoder, $this->emailValidator, $this->addressEncoder);
         if (isset($addresses)) {
             $header->setFieldBodyModel($addresses);
         }
@@ -114,9 +112,9 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_CharsetObserver
      *
      * @return Swift_Mime_Headers_ParameterizedHeader
      */
-    public function createParameterizedHeader($name, $value = null, $params = array())
+    public function createParameterizedHeader($name, $value = null, $params = [])
     {
-        $header = new Swift_Mime_Headers_ParameterizedHeader($name, $this->encoder, (strtolower($name) == 'content-disposition') ? $this->paramEncoder : null);
+        $header = new Swift_Mime_Headers_ParameterizedHeader($name, $this->encoder, ('content-disposition' == strtolower($name)) ? $this->paramEncoder : null);
         if (isset($value)) {
             $header->setFieldBodyModel($value);
         }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
index 6f71fcac..a2c31913 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
@@ -19,13 +19,13 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
     private $factory;
 
     /** Collection of set Headers */
-    private $headers = array();
+    private $headers = [];
 
     /** Field ordering details */
-    private $order = array();
+    private $order = [];
 
     /** List of fields which are required to be displayed */
-    private $required = array();
+    private $required = [];
 
     /** The charset used by Headers */
     private $charset;
@@ -33,8 +33,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
     /**
      * Create a new SimpleHeaderSet with the given $factory.
      *
-     * @param Swift_Mime_SimpleHeaderFactory $factory
-     * @param string                         $charset
+     * @param string $charset
      */
     public function __construct(Swift_Mime_SimpleHeaderFactory $factory, $charset = null)
     {
@@ -69,20 +68,17 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      */
     public function addMailboxHeader($name, $addresses = null)
     {
-        $this->storeHeader($name,
-        $this->factory->createMailboxHeader($name, $addresses));
+        $this->storeHeader($name, $this->factory->createMailboxHeader($name, $addresses));
     }
 
     /**
      * Add a new Date header using $dateTime.
      *
-     * @param string            $name
-     * @param DateTimeInterface $dateTime
+     * @param string $name
      */
     public function addDateHeader($name, DateTimeInterface $dateTime = null)
     {
-        $this->storeHeader($name,
-        $this->factory->createDateHeader($name, $dateTime));
+        $this->storeHeader($name, $this->factory->createDateHeader($name, $dateTime));
     }
 
     /**
@@ -93,8 +89,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      */
     public function addTextHeader($name, $value = null)
     {
-        $this->storeHeader($name,
-        $this->factory->createTextHeader($name, $value));
+        $this->storeHeader($name, $this->factory->createTextHeader($name, $value));
     }
 
     /**
@@ -104,7 +99,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      * @param string $value
      * @param array  $params
      */
-    public function addParameterizedHeader($name, $value = null, $params = array())
+    public function addParameterizedHeader($name, $value = null, $params = [])
     {
         $this->storeHeader($name, $this->factory->createParameterizedHeader($name, $value, $params));
     }
@@ -166,8 +161,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      * If $index is specified, the header will be inserted into the set at this
      * offset.
      *
-     * @param Swift_Mime_Header $header
-     * @param int               $index
+     * @param int $index
      */
     public function set(Swift_Mime_Header $header, $index = 0)
     {
@@ -212,7 +206,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
     public function getAll($name = null)
     {
         if (!isset($name)) {
-            $headers = array();
+            $headers = [];
             foreach ($this->headers as $collection) {
                 $headers = array_merge($headers, $collection);
             }
@@ -222,7 +216,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
 
         $lowerName = strtolower($name);
         if (!array_key_exists($lowerName, $this->headers)) {
-            return array();
+            return [];
         }
 
         return $this->headers[$lowerName];
@@ -237,7 +231,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
     {
         $headers = $this->headers;
         if ($this->canSort()) {
-            uksort($headers, array($this, 'sortHeaders'));
+            uksort($headers, [$this, 'sortHeaders']);
         }
 
         return array_keys($headers);
@@ -272,8 +266,6 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      * Define a list of Header names as an array in the correct order.
      *
      * These Headers will be output in the given order where present.
-     *
-     * @param array $sequence
      */
     public function defineOrdering(array $sequence)
     {
@@ -284,8 +276,6 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      * Set a list of header names which must always be displayed when set.
      *
      * Usually headers without a field value won't be output unless set here.
-     *
-     * @param array $names
      */
     public function setAlwaysDisplayed(array $names)
     {
@@ -312,11 +302,11 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
         $string = '';
         $headers = $this->headers;
         if ($this->canSort()) {
-            uksort($headers, array($this, 'sortHeaders'));
+            uksort($headers, [$this, 'sortHeaders']);
         }
         foreach ($headers as $collection) {
             foreach ($collection as $header) {
-                if ($this->isDisplayed($header) || $header->getFieldBody() != '') {
+                if ($this->isDisplayed($header) || '' != $header->getFieldBody()) {
                     $string .= $header->toString();
                 }
             }
@@ -341,7 +331,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
     private function storeHeader($name, Swift_Mime_Header $header, $offset = null)
     {
         if (!isset($this->headers[strtolower($name)])) {
-            $this->headers[strtolower($name)] = array();
+            $this->headers[strtolower($name)] = [];
         }
         if (!isset($offset)) {
             $this->headers[strtolower($name)][] = $header;
@@ -369,9 +359,9 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
             return $a > $b ? -1 : 1;
         }
 
-        if ($aPos == -1) {
+        if (-1 == $aPos) {
             return 1;
-        } elseif ($bPos == -1) {
+        } elseif (-1 == $bPos) {
             return -1;
         }
 
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
index 768de07f..ab32f63f 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
@@ -24,16 +24,12 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
     /**
      * Create a new SimpleMessage with $headers, $encoder and $cache.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     * @param Swift_Mime_ContentEncoder  $encoder
-     * @param Swift_KeyCache             $cache
-     * @param Swift_IdGenerator          $idGenerator
-     * @param string                     $charset
+     * @param string $charset
      */
     public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $charset = null)
     {
         parent::__construct($headers, $encoder, $cache, $idGenerator, $charset);
-        $this->getHeaders()->defineOrdering(array(
+        $this->getHeaders()->defineOrdering([
             'Return-Path',
             'Received',
             'DKIM-Signature',
@@ -50,8 +46,8 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
             'MIME-Version',
             'Content-Type',
             'Content-Transfer-Encoding',
-            ));
-        $this->getHeaders()->setAlwaysDisplayed(array('Date', 'Message-ID', 'From'));
+            ]);
+        $this->getHeaders()->setAlwaysDisplayed(['Date', 'Message-ID', 'From']);
         $this->getHeaders()->addTextHeader('MIME-Version', '1.0');
         $this->setDate(new DateTimeImmutable());
         $this->setId($this->getId());
@@ -97,8 +93,6 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
     /**
      * Set the date at which this message was created.
      *
-     * @param DateTimeInterface $dateTime
-     *
      * @return $this
      */
     public function setDate(DateTimeInterface $dateTime)
@@ -159,7 +153,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
     public function setSender($address, $name = null)
     {
         if (!is_array($address) && isset($name)) {
-            $address = array($address => $name);
+            $address = [$address => $name];
         }
 
         if (!$this->setHeaderFieldModel('Sender', (array) $address)) {
@@ -213,7 +207,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
     public function setFrom($addresses, $name = null)
     {
         if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+            $addresses = [$addresses => $name];
         }
 
         if (!$this->setHeaderFieldModel('From', (array) $addresses)) {
@@ -267,7 +261,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
     public function setReplyTo($addresses, $name = null)
     {
         if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+            $addresses = [$addresses => $name];
         }
 
         if (!$this->setHeaderFieldModel('Reply-To', (array) $addresses)) {
@@ -322,7 +316,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
     public function setTo($addresses, $name = null)
     {
         if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+            $addresses = [$addresses => $name];
         }
 
         if (!$this->setHeaderFieldModel('To', (array) $addresses)) {
@@ -374,7 +368,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
     public function setCc($addresses, $name = null)
     {
         if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+            $addresses = [$addresses => $name];
         }
 
         if (!$this->setHeaderFieldModel('Cc', (array) $addresses)) {
@@ -426,7 +420,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
     public function setBcc($addresses, $name = null)
     {
         if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+            $addresses = [$addresses => $name];
         }
 
         if (!$this->setHeaderFieldModel('Bcc', (array) $addresses)) {
@@ -457,13 +451,13 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
      */
     public function setPriority($priority)
     {
-        $priorityMap = array(
+        $priorityMap = [
             self::PRIORITY_HIGHEST => 'Highest',
             self::PRIORITY_HIGH => 'High',
             self::PRIORITY_NORMAL => 'Normal',
             self::PRIORITY_LOW => 'Low',
             self::PRIORITY_LOWEST => 'Lowest',
-            );
+            ];
         $pMapKeys = array_keys($priorityMap);
         if ($priority > max($pMapKeys)) {
             $priority = max($pMapKeys);
@@ -526,13 +520,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
     /**
      * Attach a {@link Swift_Mime_SimpleMimeEntity} such as an Attachment or MimePart.
      *
-     * @param Swift_Mime_SimpleMimeEntity $entity
-     *
      * @return $this
      */
     public function attach(Swift_Mime_SimpleMimeEntity $entity)
     {
-        $this->setChildren(array_merge($this->getChildren(), array($entity)));
+        $this->setChildren(array_merge($this->getChildren(), [$entity]));
 
         return $this;
     }
@@ -540,13 +532,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
     /**
      * Remove an already attached entity.
      *
-     * @param Swift_Mime_SimpleMimeEntity $entity
-     *
      * @return $this
      */
     public function detach(Swift_Mime_SimpleMimeEntity $entity)
     {
-        $newChildren = array();
+        $newChildren = [];
         foreach ($this->getChildren() as $child) {
             if ($entity !== $child) {
                 $newChildren[] = $child;
@@ -559,9 +549,8 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
 
     /**
      * Attach a {@link Swift_Mime_SimpleMimeEntity} and return it's CID source.
-     * This method should be used when embedding images or other data in a message.
      *
-     * @param Swift_Mime_SimpleMimeEntity $entity
+     * This method should be used when embedding images or other data in a message.
      *
      * @return string
      */
@@ -579,8 +568,8 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
      */
     public function toString()
     {
-        if (count($children = $this->getChildren()) > 0 && $this->getBody() != '') {
-            $this->setChildren(array_merge(array($this->becomeMimePart()), $children));
+        if (count($children = $this->getChildren()) > 0 && '' != $this->getBody()) {
+            $this->setChildren(array_merge([$this->becomeMimePart()], $children));
             $string = parent::toString();
             $this->setChildren($children);
         } else {
@@ -604,13 +593,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
 
     /**
      * Write this message to a {@link Swift_InputByteStream}.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function toByteStream(Swift_InputByteStream $is)
     {
-        if (count($children = $this->getChildren()) > 0 && $this->getBody() != '') {
-            $this->setChildren(array_merge(array($this->becomeMimePart()), $children));
+        if (count($children = $this->getChildren()) > 0 && '' != $this->getBody()) {
+            $this->setChildren(array_merge([$this->becomeMimePart()], $children));
             parent::toByteStream($is);
             $this->setChildren($children);
         } else {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
index 2d1a9b47..63dda3d6 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
@@ -43,14 +43,14 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
     private $boundary;
 
     /** Mime types to be used based on the nesting level */
-    private $compositeRanges = array(
-        'multipart/mixed' => array(self::LEVEL_TOP, self::LEVEL_MIXED),
-        'multipart/alternative' => array(self::LEVEL_MIXED, self::LEVEL_ALTERNATIVE),
-        'multipart/related' => array(self::LEVEL_ALTERNATIVE, self::LEVEL_RELATED),
-    );
+    private $compositeRanges = [
+        'multipart/mixed' => [self::LEVEL_TOP, self::LEVEL_MIXED],
+        'multipart/alternative' => [self::LEVEL_MIXED, self::LEVEL_ALTERNATIVE],
+        'multipart/related' => [self::LEVEL_ALTERNATIVE, self::LEVEL_RELATED],
+    ];
 
     /** A set of filter rules to define what level an entity should be nested at */
-    private $compoundLevelFilters = array();
+    private $compoundLevelFilters = [];
 
     /** The nesting level of this entity */
     private $nestingLevel = self::LEVEL_ALTERNATIVE;
@@ -59,20 +59,20 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
     private $cache;
 
     /** Direct descendants of this entity */
-    private $immediateChildren = array();
+    private $immediateChildren = [];
 
     /** All descendants of this entity */
-    private $children = array();
+    private $children = [];
 
     /** The maximum line length of the body of this entity */
     private $maxLineLength = 78;
 
     /** The order in which alternative mime types should appear */
-    private $alternativePartOrder = array(
+    private $alternativePartOrder = [
         'text/plain' => 1,
         'text/html' => 2,
         'multipart/related' => 3,
-    );
+    ];
 
     /** The CID of this entity */
     private $id;
@@ -84,11 +84,6 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
 
     /**
      * Create a new SimpleMimeEntity with $headers, $encoder and $cache.
-     *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     * @param Swift_Mime_ContentEncoder  $encoder
-     * @param Swift_KeyCache             $cache
-     * @param Swift_IdGenerator          $idGenerator
      */
     public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator)
     {
@@ -97,7 +92,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
         $this->headers = $headers;
         $this->idGenerator = $idGenerator;
         $this->setEncoder($encoder);
-        $this->headers->defineOrdering(array('Content-Type', 'Content-Transfer-Encoding'));
+        $this->headers->defineOrdering(['Content-Type', 'Content-Transfer-Encoding']);
 
         // This array specifies that, when the entire MIME document contains
         // $compoundLevel, then for each child within $level, if its Content-Type
@@ -112,14 +107,14 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
         //   )
         // )
 
-        $this->compoundLevelFilters = array(
-            (self::LEVEL_ALTERNATIVE + self::LEVEL_RELATED) => array(
-                self::LEVEL_ALTERNATIVE => array(
+        $this->compoundLevelFilters = [
+            (self::LEVEL_ALTERNATIVE + self::LEVEL_RELATED) => [
+                self::LEVEL_ALTERNATIVE => [
                     'text/plain' => self::LEVEL_ALTERNATIVE,
                     'text/html' => self::LEVEL_RELATED,
-                    ),
-                ),
-            );
+                    ],
+                ],
+            ];
 
         $this->id = $this->idGenerator->generateId();
     }
@@ -168,6 +163,16 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
         return $this->getHeaderFieldModel('Content-Type');
     }
 
+    /**
+     * Get the Body Content-type of this entity.
+     *
+     * @return string
+     */
+    public function getBodyContentType()
+    {
+        return $this->userContentType;
+    }
+
     /**
      * Set the Content-type of this entity.
      *
@@ -294,15 +299,15 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
     {
         // TODO: Try to refactor this logic
         $compoundLevel = $compoundLevel ?? $this->getCompoundLevel($children);
-        $immediateChildren = array();
-        $grandchildren = array();
+        $immediateChildren = [];
+        $grandchildren = [];
         $newContentType = $this->userContentType;
 
         foreach ($children as $child) {
             $level = $this->getNeededChildLevel($child, $compoundLevel);
             if (empty($immediateChildren)) {
                 //first iteration
-                $immediateChildren = array($child);
+                $immediateChildren = [$child];
             } else {
                 $nextLevel = $this->getNeededChildLevel($immediateChildren[0], $compoundLevel);
                 if ($nextLevel == $level) {
@@ -311,7 +316,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
                     // Re-assign immediateChildren to grandchildren
                     $grandchildren = array_merge($grandchildren, $immediateChildren);
                     // Set new children
-                    $immediateChildren = array($child);
+                    $immediateChildren = [$child];
                 } else {
                     $grandchildren[] = $child;
                 }
@@ -375,7 +380,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
         }
 
         $this->body = $body;
-        if (isset($contentType)) {
+        if (null !== $contentType) {
             $this->setContentType($contentType);
         }
 
@@ -395,8 +400,6 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
     /**
      * Set the encoder used for the body of this entity.
      *
-     * @param Swift_Mime_ContentEncoder $encoder
-     *
      * @return $this
      */
     public function setEncoder(Swift_Mime_ContentEncoder $encoder)
@@ -457,8 +460,6 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
     /**
      * Receive notification that the encoder of this entity or a parent entity
      * has changed.
-     *
-     * @param Swift_Mime_ContentEncoder $encoder
      */
     public function encoderChanged(Swift_Mime_ContentEncoder $encoder)
     {
@@ -522,8 +523,6 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
 
     /**
      * Write this entire entity to a {@see Swift_InputByteStream}.
-     *
-     * @param Swift_InputByteStream
      */
     public function toByteStream(Swift_InputByteStream $is)
     {
@@ -535,8 +534,6 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
 
     /**
      * Write this entire entity to a {@link Swift_InputByteStream}.
-     *
-     * @param Swift_InputByteStream
      */
     protected function bodyToByteStream(Swift_InputByteStream $is)
     {
@@ -726,7 +723,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
 
     private function getNeededChildLevel($child, $compoundLevel)
     {
-        $filter = array();
+        $filter = [];
         foreach ($this->compoundLevelFilters as $bitmask => $rules) {
             if (($compoundLevel & $bitmask) === $bitmask) {
                 $filter = $rules + $filter;
@@ -769,7 +766,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
         $shouldSort = false;
         foreach ($this->immediateChildren as $child) {
             // NOTE: This include alternative parts moved into a related part
-            if ($child->getNestingLevel() == self::LEVEL_ALTERNATIVE) {
+            if (self::LEVEL_ALTERNATIVE == $child->getNestingLevel()) {
                 $shouldSort = true;
                 break;
             }
@@ -778,13 +775,13 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
         // Sort in order of preference, if there is one
         if ($shouldSort) {
             // Group the messages by order of preference
-            $sorted = array();
+            $sorted = [];
             foreach ($this->immediateChildren as $child) {
                 $type = $child->getContentType();
                 $level = array_key_exists($type, $this->alternativePartOrder) ? $this->alternativePartOrder[$type] : max($this->alternativePartOrder) + 1;
 
                 if (empty($sorted[$level])) {
-                    $sorted[$level] = array();
+                    $sorted[$level] = [];
                 }
 
                 $sorted[$level][] = $child;
@@ -792,7 +789,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
 
             ksort($sorted);
 
-            $this->immediateChildren = array_reduce($sorted, 'array_merge', array());
+            $this->immediateChildren = array_reduce($sorted, 'array_merge', []);
         }
     }
 
@@ -814,7 +811,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
         $this->headers = clone $this->headers;
         $this->encoder = clone $this->encoder;
         $this->cacheKey = bin2hex(random_bytes(16)); // set 32 hex values
-        $children = array();
+        $children = [];
         foreach ($this->children as $pos => $child) {
             $children[$pos] = clone $child;
         }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php
index 8fa0cbeb..14f84324 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php
@@ -27,7 +27,7 @@ class Swift_MimePart extends Swift_Mime_MimePart
     public function __construct($body = null, $contentType = null, $charset = null)
     {
         call_user_func_array(
-            array($this, 'Swift_Mime_MimePart::__construct'),
+            [$this, 'Swift_Mime_MimePart::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('mime.part')
             );
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/NullTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/NullTransport.php
index a580dfbe..eefb9a6f 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/NullTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/NullTransport.php
@@ -18,7 +18,7 @@ class Swift_NullTransport extends Swift_Transport_NullTransport
     public function __construct()
     {
         call_user_func_array(
-            array($this, 'Swift_Transport_NullTransport::__construct'),
+            [$this, 'Swift_Transport_NullTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.null')
         );
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
index 06b3109e..5b1d7dee 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
@@ -99,8 +99,6 @@ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -108,8 +106,6 @@ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
index af060a99..f7a24dd0 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
@@ -30,7 +30,7 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
     private $in = 0;
 
     /** Bound byte streams */
-    private $mirrors = array();
+    private $mirrors = [];
 
     /**
      * Not used.
@@ -41,8 +41,6 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -52,8 +50,6 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
 
     /**
      * Invoked immediately following a command being sent.
-     *
-     * @param Swift_Events_CommandEvent $evt
      */
     public function commandSent(Swift_Events_CommandEvent $evt)
     {
@@ -63,8 +59,6 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
 
     /**
      * Invoked immediately following a response coming back.
-     *
-     * @param Swift_Events_ResponseEvent $evt
      */
     public function responseReceived(Swift_Events_ResponseEvent $evt)
     {
@@ -97,8 +91,6 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function bind(Swift_InputByteStream $is)
     {
@@ -111,8 +103,6 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function unbind(Swift_InputByteStream $is)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
index 9d5feefb..c4b6ee12 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
@@ -23,10 +23,10 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
     private $originalBody;
 
     /** The original headers of the message, before replacements */
-    private $originalHeaders = array();
+    private $originalHeaders = [];
 
     /** Bodies of children before they are replaced */
-    private $originalChildBodies = array();
+    private $originalChildBodies = [];
 
     /** The Message that was last replaced */
     private $lastMessage;
@@ -74,8 +74,6 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -99,7 +97,7 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
                 $body = $header->getFieldBodyModel();
                 $count = 0;
                 if (is_array($body)) {
-                    $bodyReplaced = array();
+                    $bodyReplaced = [];
                     foreach ($body as $key => $value) {
                         $count1 = 0;
                         $count2 = 0;
@@ -164,8 +162,6 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -186,7 +182,7 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
                         $header->setFieldBodyModel($this->originalHeaders[$header->getFieldName()]);
                     }
                 }
-                $this->originalHeaders = array();
+                $this->originalHeaders = [];
             }
             if (!empty($this->originalChildBodies)) {
                 $children = (array) $message->getChildren();
@@ -196,7 +192,7 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
                         $child->setBody($this->originalChildBodies[$id]);
                     }
                 }
-                $this->originalChildBodies = array();
+                $this->originalChildBodies = [];
             }
             $this->lastMessage = null;
         }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
index b975d36b..3f4dbbfa 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
@@ -34,8 +34,6 @@ class Swift_Plugins_ImpersonatePlugin implements Swift_Events_SendListener
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -51,8 +49,6 @@ class Swift_Plugins_ImpersonatePlugin implements Swift_Events_SendListener
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
index 7ddf1fd1..c70a0382 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
@@ -20,8 +20,6 @@ class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_
 
     /**
      * Create a new LoggerPlugin using $logger.
-     *
-     * @param Swift_Plugins_Logger $logger
      */
     public function __construct(Swift_Plugins_Logger $logger)
     {
@@ -58,8 +56,6 @@ class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_
 
     /**
      * Invoked immediately following a command being sent.
-     *
-     * @param Swift_Events_CommandEvent $evt
      */
     public function commandSent(Swift_Events_CommandEvent $evt)
     {
@@ -69,8 +65,6 @@ class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_
 
     /**
      * Invoked immediately following a response coming back.
-     *
-     * @param Swift_Events_ResponseEvent $evt
      */
     public function responseReceived(Swift_Events_ResponseEvent $evt)
     {
@@ -80,8 +74,6 @@ class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_
 
     /**
      * Invoked just before a Transport is started.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt)
     {
@@ -91,8 +83,6 @@ class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_
 
     /**
      * Invoked immediately after the Transport is started.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function transportStarted(Swift_Events_TransportChangeEvent $evt)
     {
@@ -102,8 +92,6 @@ class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_
 
     /**
      * Invoked just before a Transport is stopped.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function beforeTransportStopped(Swift_Events_TransportChangeEvent $evt)
     {
@@ -113,8 +101,6 @@ class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_
 
     /**
      * Invoked immediately after the Transport is stopped.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function transportStopped(Swift_Events_TransportChangeEvent $evt)
     {
@@ -124,8 +110,6 @@ class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_
 
     /**
      * Invoked as a TransportException is thrown in the Transport system.
-     *
-     * @param Swift_Events_TransportExceptionEvent $evt
      */
     public function exceptionThrown(Swift_Events_TransportExceptionEvent $evt)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
index 186b6b41..b00bcaa1 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
@@ -20,7 +20,7 @@ class Swift_Plugins_Loggers_ArrayLogger implements Swift_Plugins_Logger
      *
      * @var array
      */
-    private $log = array();
+    private $log = [];
 
     /**
      * Max size of the log.
@@ -57,7 +57,7 @@ class Swift_Plugins_Loggers_ArrayLogger implements Swift_Plugins_Logger
      */
     public function clear()
     {
-        $this->log = array();
+        $this->log = [];
     }
 
     /**
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
index 5ff1d932..3b4de80e 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
@@ -16,19 +16,19 @@
 class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
 {
     /**
-     * @var Swift_Mime_Message[]
+     * @var Swift_Mime_SimpleMessage[]
      */
     private $messages;
 
     public function __construct()
     {
-        $this->messages = array();
+        $this->messages = [];
     }
 
     /**
      * Get the message list.
      *
-     * @return Swift_Mime_Message[]
+     * @return Swift_Mime_SimpleMessage[]
      */
     public function getMessages()
     {
@@ -50,13 +50,11 @@ class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
      */
     public function clear()
     {
-        $this->messages = array();
+        $this->messages = [];
     }
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -65,8 +63,6 @@ class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
index c19403ae..1d5da1c6 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
@@ -45,7 +45,8 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
     /**
      * Create a new PopBeforeSmtpPlugin for $host and $port.
      *
-     * @param string $host
+     * @param string $host   Hostname or IP. Literal IPv6 addresses should be
+     *                       wrapped in square brackets.
      * @param int    $port
      * @param string $crypto as "tls" or "ssl"
      */
@@ -59,8 +60,6 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
     /**
      * Set a Pop3Connection to delegate to instead of connecting directly.
      *
-     * @param Swift_Plugins_Pop_Pop3Connection $connection
-     *
      * @return $this
      */
     public function setConnection(Swift_Plugins_Pop_Pop3Connection $connection)
@@ -72,8 +71,6 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
 
     /**
      * Bind this plugin to a specific SMTP transport instance.
-     *
-     * @param Swift_Transport
      */
     public function bindSmtp(Swift_Transport $smtp)
     {
@@ -177,8 +174,6 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
 
     /**
      * Invoked just before a Transport is started.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt)
     {
@@ -234,7 +229,7 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
 
     private function assertOk($response)
     {
-        if (substr($response, 0, 3) != '+OK') {
+        if ('+OK' != substr($response, 0, 3)) {
             throw new Swift_Plugins_Pop_Pop3Exception(
                 sprintf('POP3 command failed [%s]', trim($response))
             );
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
index 8d797dd1..b0cb519e 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
@@ -27,15 +27,14 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
      *
      * @var array
      */
-    private $whitelist = array();
+    private $whitelist = [];
 
     /**
      * Create a new RedirectingPlugin.
      *
      * @param mixed $recipient
-     * @param array $whitelist
      */
-    public function __construct($recipient, array $whitelist = array())
+    public function __construct($recipient, array $whitelist = [])
     {
         $this->recipient = $recipient;
         $this->whitelist = $whitelist;
@@ -63,8 +62,6 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
 
     /**
      * Set a list of regular expressions to whitelist certain recipients.
-     *
-     * @param array $whitelist
      */
     public function setWhitelist(array $whitelist)
     {
@@ -83,8 +80,6 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -113,7 +108,7 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
         // Add each hard coded recipient
         $to = $message->getTo();
         if (null === $to) {
-            $to = array();
+            $to = [];
         }
 
         foreach ((array) $this->recipient as $recipient) {
@@ -126,8 +121,7 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
     /**
      * Filter header set against a whitelist of regular expressions.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headerSet
-     * @param string                     $type
+     * @param string $type
      */
     private function filterHeaderSet(Swift_Mime_SimpleHeaderSet $headerSet, $type)
     {
@@ -139,13 +133,11 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
     /**
      * Filtered list of addresses => name pairs.
      *
-     * @param array $recipients
-     *
      * @return array
      */
     private function filterNameAddresses(array $recipients)
     {
-        $filtered = array();
+        $filtered = [];
 
         foreach ($recipients as $address => $name) {
             if ($this->isWhitelisted($address)) {
@@ -159,8 +151,6 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
     /**
      * Matches address against whitelist of regular expressions.
      *
-     * @param $recipient
-     *
      * @return bool
      */
     protected function isWhitelisted($recipient)
@@ -180,8 +170,6 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
index 5ffca24c..ae070eb6 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
@@ -24,8 +24,6 @@ class Swift_Plugins_ReporterPlugin implements Swift_Events_SendListener
 
     /**
      * Create a new ReporterPlugin using $reporter.
-     *
-     * @param Swift_Plugins_Reporter $reporter
      */
     public function __construct(Swift_Plugins_Reporter $reporter)
     {
@@ -41,8 +39,6 @@ class Swift_Plugins_ReporterPlugin implements Swift_Events_SendListener
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
index 67c117ac..249cffbd 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
@@ -20,16 +20,15 @@ class Swift_Plugins_Reporters_HitReporter implements Swift_Plugins_Reporter
      *
      * @var array
      */
-    private $failures = array();
+    private $failures = [];
 
-    private $failures_cache = array();
+    private $failures_cache = [];
 
     /**
      * Notifies this ReportNotifier that $address failed or succeeded.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string                   $address
-     * @param int                      $result  from {@link RESULT_PASS, RESULT_FAIL}
+     * @param string $address
+     * @param int    $result  from {@link RESULT_PASS, RESULT_FAIL}
      */
     public function notify(Swift_Mime_SimpleMessage $message, $address, $result)
     {
@@ -54,6 +53,6 @@ class Swift_Plugins_Reporters_HitReporter implements Swift_Plugins_Reporter
      */
     public function clear()
     {
-        $this->failures = $this->failures_cache = array();
+        $this->failures = $this->failures_cache = [];
     }
 }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
index 525eef57..1cfc3f97 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
@@ -18,9 +18,8 @@ class Swift_Plugins_Reporters_HtmlReporter implements Swift_Plugins_Reporter
     /**
      * Notifies this ReportNotifier that $address failed or succeeded.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string                   $address
-     * @param int                      $result  from {@see RESULT_PASS, RESULT_FAIL}
+     * @param string $address
+     * @param int    $result  from {@see RESULT_PASS, RESULT_FAIL}
      */
     public function notify(Swift_Mime_SimpleMessage $message, $address, $result)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
index 77c2e8db..83d30449 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
@@ -72,7 +72,7 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
      * Create a new ThrottlerPlugin.
      *
      * @param int                   $rate
-     * @param int                   $mode,   defaults to {@link BYTES_PER_MINUTE}
+     * @param int                   $mode    defaults to {@link BYTES_PER_MINUTE}
      * @param Swift_Plugins_Sleeper $sleeper (only needed in testing)
      * @param Swift_Plugins_Timer   $timer   (only needed in testing)
      */
@@ -86,8 +86,6 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -119,8 +117,6 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
 
     /**
      * Invoked when a Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php
index 79eafde9..16103e11 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php
@@ -92,7 +92,7 @@ class Swift_Preferences
         Swift_DependencyContainer::getInstance()
             ->register('mime.qpcontentencoder')
             ->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoder')
-            ->withDependencies(array('mime.charstream', 'mime.bytecanonicalizer'))
+            ->withDependencies(['mime.charstream', 'mime.bytecanonicalizer'])
             ->addConstructorValue($dotEscape);
 
         return $this;
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SendmailTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SendmailTransport.php
index c129281b..2aa7e326 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SendmailTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SendmailTransport.php
@@ -23,7 +23,7 @@ class Swift_SendmailTransport extends Swift_Transport_SendmailTransport
     public function __construct($command = '/usr/sbin/sendmail -bs')
     {
         call_user_func_array(
-            array($this, 'Swift_Transport_SendmailTransport::__construct'),
+            [$this, 'Swift_Transport_SendmailTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.sendmail')
             );
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signer.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signer.php
index 2d8176d9..26c5e285 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signer.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signer.php
@@ -11,7 +11,6 @@
 /**
  * Base Class of Signer Infrastructure.
  *
- *
  * @author Xavier De Cock <xdecock@gmail.com>
  */
 interface Swift_Signer
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
index a88daa19..279f44c8 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
@@ -66,7 +66,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      *
      * @var array
      */
-    protected $ignoredHeaders = array('return-path' => true);
+    protected $ignoredHeaders = ['return-path' => true];
 
     /**
      * Signer identity.
@@ -124,7 +124,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      *
      * @var array
      */
-    protected $signedHeaders = array();
+    protected $signedHeaders = [];
 
     /**
      * If debugHeaders is set store debugData here.
@@ -163,7 +163,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
 
     private $bodyCanonLine = '';
 
-    private $bound = array();
+    private $bound = [];
 
     /**
      * Constructor.
@@ -190,7 +190,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     public function reset()
     {
         $this->headerHash = null;
-        $this->signedHeaders = array();
+        $this->signedHeaders = [];
         $this->bodyHash = null;
         $this->bodyHashHandler = null;
         $this->bodyCanonIgnoreStart = 2;
@@ -236,10 +236,9 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
 
     /**
      * Attach $is to this stream.
+     *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function bind(Swift_InputByteStream $is)
     {
@@ -251,11 +250,10 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
 
     /**
      * Remove an already bound stream.
+     *
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function unbind(Swift_InputByteStream $is)
     {
@@ -317,7 +315,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function setBodyCanon($canon)
     {
-        if ($canon == 'relaxed') {
+        if ('relaxed' == $canon) {
             $this->bodyCanon = 'relaxed';
         } else {
             $this->bodyCanon = 'simple';
@@ -335,7 +333,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function setHeaderCanon($canon)
     {
-        if ($canon == 'relaxed') {
+        if ('relaxed' == $canon) {
             $this->headerCanon = 'relaxed';
         } else {
             $this->headerCanon = 'simple';
@@ -367,10 +365,10 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function setBodySignedLen($len)
     {
-        if ($len === true) {
+        if (true === $len) {
             $this->showLen = true;
             $this->maxLen = PHP_INT_MAX;
-        } elseif ($len === false) {
+        } elseif (false === $len) {
             $this->showLen = false;
             $this->maxLen = PHP_INT_MAX;
         } else {
@@ -456,9 +454,9 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     public function getAlteredHeaders()
     {
         if ($this->debugHeaders) {
-            return array('DKIM-Signature', 'X-DebugHash');
+            return ['DKIM-Signature', 'X-DebugHash'];
         } else {
-            return array('DKIM-Signature');
+            return ['DKIM-Signature'];
         }
     }
 
@@ -479,8 +477,6 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     /**
      * Set the headers to sign.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     *
      * @return Swift_Signers_DKIMSigner
      */
     public function setHeaders(Swift_Mime_SimpleHeaderSet $headers)
@@ -494,7 +490,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
                 if ($headers->has($hName)) {
                     $tmp = $headers->getAll($hName);
                     foreach ($tmp as $header) {
-                        if ($header->getFieldBody() != '') {
+                        if ('' != $header->getFieldBody()) {
                             $this->addHeader($header->toString());
                             $this->signedHeaders[] = $header->getFieldName();
                         }
@@ -509,32 +505,30 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     /**
      * Add the signature to the given Headers.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     *
      * @return Swift_Signers_DKIMSigner
      */
     public function addSignature(Swift_Mime_SimpleHeaderSet $headers)
     {
         // Prepare the DKIM-Signature
-        $params = array('v' => '1', 'a' => $this->hashAlgorithm, 'bh' => base64_encode($this->bodyHash), 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'i' => $this->signerIdentity, 's' => $this->selector);
-        if ($this->bodyCanon != 'simple') {
+        $params = ['v' => '1', 'a' => $this->hashAlgorithm, 'bh' => base64_encode($this->bodyHash), 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'i' => $this->signerIdentity, 's' => $this->selector];
+        if ('simple' != $this->bodyCanon) {
             $params['c'] = $this->headerCanon.'/'.$this->bodyCanon;
-        } elseif ($this->headerCanon != 'simple') {
+        } elseif ('simple' != $this->headerCanon) {
             $params['c'] = $this->headerCanon;
         }
         if ($this->showLen) {
             $params['l'] = $this->bodyLen;
         }
-        if ($this->signatureTimestamp === true) {
+        if (true === $this->signatureTimestamp) {
             $params['t'] = time();
-            if ($this->signatureExpiration !== false) {
+            if (false !== $this->signatureExpiration) {
                 $params['x'] = $params['t'] + $this->signatureExpiration;
             }
         } else {
-            if ($this->signatureTimestamp !== false) {
+            if (false !== $this->signatureTimestamp) {
                 $params['t'] = $this->signatureTimestamp;
             }
-            if ($this->signatureExpiration !== false) {
+            if (false !== $this->signatureExpiration) {
                 $params['x'] = $this->signatureExpiration;
             }
         }
@@ -571,6 +565,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
                 $value = str_replace("\r\n", '', $exploded[1]);
                 $value = preg_replace("/[ \t][ \t]+/", ' ', $value);
                 $header = $name.':'.trim($value).($is_sig ? '' : "\r\n");
+                // no break
             case 'simple':
                 // Nothing to do
         }
@@ -581,7 +576,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     {
         $len = strlen($string);
         $canon = '';
-        $method = ($this->bodyCanon == 'relaxed');
+        $method = ('relaxed' == $this->bodyCanon);
         for ($i = 0; $i < $len; ++$i) {
             if ($this->bodyCanonIgnoreStart > 0) {
                 --$this->bodyCanonIgnoreStart;
@@ -592,11 +587,11 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
                     $this->bodyCanonLastChar = "\r";
                     break;
                 case "\n":
-                    if ($this->bodyCanonLastChar == "\r") {
+                    if ("\r" == $this->bodyCanonLastChar) {
                         if ($method) {
                             $this->bodyCanonSpace = false;
                         }
-                        if ($this->bodyCanonLine == '') {
+                        if ('' == $this->bodyCanonLine) {
                             ++$this->bodyCanonEmptyCounter;
                         } else {
                             $this->bodyCanonLine = '';
@@ -613,6 +608,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
                         $this->bodyCanonSpace = true;
                         break;
                     }
+                    // no break
                 default:
                     if ($this->bodyCanonEmptyCounter > 0) {
                         $canon .= str_repeat("\r\n", $this->bodyCanonEmptyCounter);
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
index 40654987..a24d2032 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
@@ -55,7 +55,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      *
      * @var array
      */
-    protected $ignoredHeaders = array();
+    protected $ignoredHeaders = [];
 
     /**
      * Signer identity.
@@ -77,7 +77,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      *
      * @var array
      */
-    private $signedHeaders = array();
+    private $signedHeaders = [];
 
     /**
      * Stores the signature header.
@@ -93,8 +93,6 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     private $hashHandler;
 
-    private $hash;
-
     private $canonData = '';
 
     private $bodyCanonEmptyCounter = 0;
@@ -107,7 +105,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
 
     private $bodyCanonLine = '';
 
-    private $bound = array();
+    private $bound = [];
 
     /**
      * Constructor.
@@ -131,7 +129,6 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function reset()
     {
-        $this->hash = null;
         $this->hashHandler = null;
         $this->bodyCanonIgnoreStart = 2;
         $this->bodyCanonEmptyCounter = 0;
@@ -185,11 +182,10 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
 
     /**
      * Attach $is to this stream.
+     *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
      *
-     * @param Swift_InputByteStream $is
-     *
      * @return $this
      */
     public function bind(Swift_InputByteStream $is)
@@ -202,12 +198,11 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
 
     /**
      * Remove an already bound stream.
+     *
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
      *
-     * @param Swift_InputByteStream $is
-     *
      * @return $this
      */
     public function unbind(Swift_InputByteStream $is)
@@ -262,7 +257,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function setCanon($canon)
     {
-        if ($canon == 'nofws') {
+        if ('nofws' == $canon) {
             $this->canon = 'nofws';
         } else {
             $this->canon = 'simple';
@@ -322,10 +317,10 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
     public function getAlteredHeaders()
     {
         if ($this->debugHeaders) {
-            return array('DomainKey-Signature', 'X-DebugHash');
+            return ['DomainKey-Signature', 'X-DebugHash'];
         }
 
-        return array('DomainKey-Signature');
+        return ['DomainKey-Signature'];
     }
 
     /**
@@ -345,8 +340,6 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
     /**
      * Set the headers to sign.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     *
      * @return $this
      */
     public function setHeaders(Swift_Mime_SimpleHeaderSet $headers)
@@ -361,7 +354,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
                 if ($headers->has($hName)) {
                     $tmp = $headers->getAll($hName);
                     foreach ($tmp as $header) {
-                        if ($header->getFieldBody() != '') {
+                        if ('' != $header->getFieldBody()) {
                             $this->addHeader($header->toString());
                             $this->signedHeaders[] = $header->getFieldName();
                         }
@@ -377,14 +370,12 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
     /**
      * Add the signature to the given Headers.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     *
      * @return $this
      */
     public function addSignature(Swift_Mime_SimpleHeaderSet $headers)
     {
         // Prepare the DomainKey-Signature Header
-        $params = array('a' => $this->hashAlgorithm, 'b' => chunk_split(base64_encode($this->getEncryptedHash()), 73, ' '), 'c' => $this->canon, 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'q' => 'dns', 's' => $this->selector);
+        $params = ['a' => $this->hashAlgorithm, 'b' => chunk_split(base64_encode($this->getEncryptedHash()), 73, ' '), 'c' => $this->canon, 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'q' => 'dns', 's' => $this->selector];
         $string = '';
         foreach ($params as $k => $v) {
             $string .= $k.'='.$v.'; ';
@@ -407,6 +398,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
                 $value = str_replace("\r\n", '', $exploded[1]);
                 $value = preg_replace("/[ \t][ \t]+/", ' ', $value);
                 $header = $name.':'.trim($value)."\r\n";
+                // no break
             case 'simple':
                 // Nothing to do
         }
@@ -422,7 +414,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
     {
         $len = strlen($string);
         $canon = '';
-        $nofws = ($this->canon == 'nofws');
+        $nofws = ('nofws' == $this->canon);
         for ($i = 0; $i < $len; ++$i) {
             if ($this->bodyCanonIgnoreStart > 0) {
                 --$this->bodyCanonIgnoreStart;
@@ -433,11 +425,11 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
                     $this->bodyCanonLastChar = "\r";
                     break;
                 case "\n":
-                    if ($this->bodyCanonLastChar == "\r") {
+                    if ("\r" == $this->bodyCanonLastChar) {
                         if ($nofws) {
                             $this->bodyCanonSpace = false;
                         }
-                        if ($this->bodyCanonLine == '') {
+                        if ('' == $this->bodyCanonLine) {
                             ++$this->bodyCanonEmptyCounter;
                         } else {
                             $this->bodyCanonLine = '';
@@ -455,6 +447,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
                         $this->bodyCanonSpace = true;
                         break;
                     }
+                    // no break
                 default:
                     if ($this->bodyCanonEmptyCounter > 0) {
                         $canon .= str_repeat("\r\n", $this->bodyCanonEmptyCounter);
@@ -472,7 +465,6 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
         if (strlen($this->bodyCanonLine) > 0) {
             $this->addToHash("\r\n");
         }
-        $this->hash = hash_final($this->hashHandler, true);
     }
 
     private function addToHash($string)
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
index deb29f57..7b50c51d 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
@@ -13,6 +13,8 @@
  * Takes advantage of pecl extension.
  *
  * @author     Xavier De Cock <xdecock@gmail.com>
+ *
+ * @deprecated since SwiftMailer 6.1.0; use Swift_Signers_DKIMSigner instead.
  */
 class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
 {
@@ -42,7 +44,7 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
     {
         $header = new Swift_Mime_Headers_OpenDKIMHeader('DKIM-Signature');
         $headerVal = $this->dkimHandler->getSignatureHeader();
-        if (!$headerVal) {
+        if (false === $headerVal || is_int($headerVal)) {
             throw new Swift_SwiftException('OpenDKIM Error: '.$this->dkimHandler->getError());
         }
         $header->setValue($headerVal);
@@ -53,14 +55,10 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
 
     public function setHeaders(Swift_Mime_SimpleHeaderSet $headers)
     {
-        $bodyLen = $this->bodyLen;
-        if (is_bool($bodyLen)) {
-            $bodyLen = -1;
-        }
-        $hash = $this->hashAlgorithm == 'rsa-sha1' ? OpenDKIMSign::ALG_RSASHA1 : OpenDKIMSign::ALG_RSASHA256;
-        $bodyCanon = $this->bodyCanon == 'simple' ? OpenDKIMSign::CANON_SIMPLE : OpenDKIMSign::CANON_RELAXED;
-        $headerCanon = $this->headerCanon == 'simple' ? OpenDKIMSign::CANON_SIMPLE : OpenDKIMSign::CANON_RELAXED;
-        $this->dkimHandler = new OpenDKIMSign($this->privateKey, $this->selector, $this->domainName, $headerCanon, $bodyCanon, $hash, $bodyLen);
+        $hash = 'rsa-sha1' == $this->hashAlgorithm ? OpenDKIMSign::ALG_RSASHA1 : OpenDKIMSign::ALG_RSASHA256;
+        $bodyCanon = 'simple' == $this->bodyCanon ? OpenDKIMSign::CANON_SIMPLE : OpenDKIMSign::CANON_RELAXED;
+        $headerCanon = 'simple' == $this->headerCanon ? OpenDKIMSign::CANON_SIMPLE : OpenDKIMSign::CANON_RELAXED;
+        $this->dkimHandler = new OpenDKIMSign($this->privateKey, $this->selector, $this->domainName, $headerCanon, $bodyCanon, $hash, -1);
         // Hardcode signature Margin for now
         $this->dkimHandler->setMargin(78);
 
@@ -81,7 +79,7 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
                 $tmp = $headers->getAll($hName);
                 if ($headers->has($hName)) {
                     foreach ($tmp as $header) {
-                        if ($header->getFieldBody() != '') {
+                        if ('' != $header->getFieldBody()) {
                             $htosign = $header->toString();
                             $this->dkimHandler->header($htosign);
                             $this->signedHeaders[] = $header->getFieldName();
@@ -172,8 +170,8 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
         if (!$this->peclLoaded) {
             return parent::canonicalizeBody($string);
         }
-        if (false && $this->dropFirstLF === true) {
-            if ($string[0] == "\r" && $string[1] == "\n") {
+        if (true === $this->dropFirstLF) {
+            if ("\r" == $string[0] && "\n" == $string[1]) {
                 $string = substr($string, 2);
             }
         }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
index eea2648c..84c53edb 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
@@ -11,9 +11,9 @@
 /**
  * MIME Message Signer used to apply S/MIME Signature/Encryption to a message.
  *
- *
  * @author Romain-Geissler
  * @author Sebastiaan Stok <s.stok@rollerscapes.net>
+ * @author Jan Flora <jf@penneo.com>
  */
 class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
 {
@@ -27,6 +27,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
     protected $encryptOptions;
     protected $encryptCipher;
     protected $extraCerts = null;
+    protected $wrapFullMessage = false;
 
     /**
      * @var Swift_StreamFilters_StringReplacementFilterFactory
@@ -65,7 +66,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
     /**
      * Set the certificate location to use for signing.
      *
-     * @see http://www.php.net/manual/en/openssl.pkcs7.flags.php
+     * @see https://secure.php.net/manual/en/openssl.pkcs7.flags.php
      *
      * @param string       $certificate
      * @param string|array $privateKey  If the key needs an passphrase use array('file-location', 'passphrase') instead
@@ -88,9 +89,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
         }
 
         $this->signOptions = $signOptions;
-        if (null !== $extraCerts) {
-            $this->extraCerts = str_replace('\\', '/', realpath($extraCerts));
-        }
+        $this->extraCerts = $extraCerts ? realpath($extraCerts) : null;
 
         return $this;
     }
@@ -98,8 +97,8 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
     /**
      * Set the certificate location to use for encryption.
      *
-     * @see http://www.php.net/manual/en/openssl.pkcs7.flags.php
-     * @see http://nl3.php.net/manual/en/openssl.ciphers.php
+     * @see https://secure.php.net/manual/en/openssl.pkcs7.flags.php
+     * @see https://secure.php.net/manual/en/openssl.ciphers.php
      *
      * @param string|array $recipientCerts Either an single X.509 certificate, or an assoc array of X.509 certificates.
      * @param int          $cipher
@@ -109,7 +108,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
     public function setEncryptCertificate($recipientCerts, $cipher = null)
     {
         if (is_array($recipientCerts)) {
-            $this->encryptCert = array();
+            $this->encryptCert = [];
 
             foreach ($recipientCerts as $cert) {
                 $this->encryptCert[] = 'file://'.str_replace('\\', '/', realpath($cert));
@@ -178,9 +177,27 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
     }
 
     /**
-     * Change the Swift_Message to apply the signing.
+     * Specify whether to wrap the entire MIME message in the S/MIME message.
+     *
+     * According to RFC5751 section 3.1:
+     * In order to protect outer, non-content-related message header fields
+     * (for instance, the "Subject", "To", "From", and "Cc" fields), the
+     * sending client MAY wrap a full MIME message in a message/rfc822
+     * wrapper in order to apply S/MIME security services to these header
+     * fields.  It is up to the receiving client to decide how to present
+     * this "inner" header along with the unprotected "outer" header.
      *
-     * @param Swift_Message $message
+     * @param bool $wrap
+     *
+     * @return $this
+     */
+    public function setWrapFullMessage($wrap)
+    {
+        $this->wrapFullMessage = $wrap;
+    }
+
+    /**
+     * Change the Swift_Message to apply the signing.
      *
      * @return $this
      */
@@ -190,17 +207,13 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
             return $this;
         }
 
-        // Store the message using ByteStream to a file{1}
-        // Remove all Children
-        // Sign file{1}, parse the new MIME headers and set them on the primary MimeEntity
-        // Set the singed-body as the new body (without boundary)
-
-        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
-        $this->toSMimeByteStream($messageStream, $message);
-        $message->setEncoder(Swift_DependencyContainer::getInstance()->lookup('mime.rawcontentencoder'));
-
-        $message->setChildren(array());
-        $this->streamToMime($messageStream, $message);
+        if ($this->signThenEncrypt) {
+            $this->smimeSignMessage($message);
+            $this->smimeEncryptMessage($message);
+        } else {
+            $this->smimeEncryptMessage($message);
+            $this->smimeSignMessage($message);
+        }
     }
 
     /**
@@ -210,155 +223,279 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
      */
     public function getAlteredHeaders()
     {
-        return array('Content-Type', 'Content-Transfer-Encoding', 'Content-Disposition');
+        return ['Content-Type', 'Content-Transfer-Encoding', 'Content-Disposition'];
     }
 
     /**
-     * @param Swift_InputByteStream $inputStream
-     * @param Swift_Message         $mimeEntity
+     * Sign a Swift message.
      */
-    protected function toSMimeByteStream(Swift_InputByteStream $inputStream, Swift_Message $message)
+    protected function smimeSignMessage(Swift_Message $message)
     {
-        $mimeEntity = $this->createMessage($message);
-        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        // If we don't have a certificate we can't sign the message
+        if (null === $this->signCertificate) {
+            return;
+        }
+
+        // Work on a clone of the original message
+        $signMessage = clone $message;
+        $signMessage->clearSigners();
+
+        if ($this->wrapFullMessage) {
+            // The original message essentially becomes the body of the new
+            // wrapped message
+            $signMessage = $this->wrapMimeMessage($signMessage);
+        } else {
+            // Only keep header needed to parse the body correctly
+            $this->clearAllHeaders($signMessage);
+            $this->copyHeaders(
+                $message,
+                $signMessage,
+                [
+                    'Content-Type',
+                    'Content-Transfer-Encoding',
+                    'Content-Disposition',
+                ]
+            );
+        }
 
-        $mimeEntity->toByteStream($messageStream);
+        // Copy the cloned message into a temporary file stream
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $signMessage->toByteStream($messageStream);
         $messageStream->commit();
+        $signedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
 
-        if (null !== $this->signCertificate && null !== $this->encryptCert) {
-            $temporaryStream = new Swift_ByteStream_TemporaryFileByteStream();
+        // Sign the message using openssl
+        if (!openssl_pkcs7_sign(
+                $messageStream->getPath(),
+                $signedMessageStream->getPath(),
+                $this->signCertificate,
+                $this->signPrivateKey,
+                [],
+                $this->signOptions,
+                $this->extraCerts
+            )
+        ) {
+            throw new Swift_IoException(sprintf('Failed to sign S/Mime message. Error: "%s".', openssl_error_string()));
+        }
 
-            if ($this->signThenEncrypt) {
-                $this->messageStreamToSignedByteStream($messageStream, $temporaryStream);
-                $this->messageStreamToEncryptedByteStream($temporaryStream, $inputStream);
-            } else {
-                $this->messageStreamToEncryptedByteStream($messageStream, $temporaryStream);
-                $this->messageStreamToSignedByteStream($temporaryStream, $inputStream);
-            }
-        } elseif ($this->signCertificate !== null) {
-            $this->messageStreamToSignedByteStream($messageStream, $inputStream);
+        // Parse the resulting signed message content back into the Swift message
+        // preserving the original headers
+        $this->parseSSLOutput($signedMessageStream, $message);
+    }
+
+    /**
+     * Encrypt a Swift message.
+     */
+    protected function smimeEncryptMessage(Swift_Message $message)
+    {
+        // If we don't have a certificate we can't encrypt the message
+        if (null === $this->encryptCert) {
+            return;
+        }
+
+        // Work on a clone of the original message
+        $encryptMessage = clone $message;
+        $encryptMessage->clearSigners();
+
+        if ($this->wrapFullMessage) {
+            // The original message essentially becomes the body of the new
+            // wrapped message
+            $encryptMessage = $this->wrapMimeMessage($encryptMessage);
         } else {
-            $this->messageStreamToEncryptedByteStream($messageStream, $inputStream);
+            // Only keep header needed to parse the body correctly
+            $this->clearAllHeaders($encryptMessage);
+            $this->copyHeaders(
+                $message,
+                $encryptMessage,
+                [
+                    'Content-Type',
+                    'Content-Transfer-Encoding',
+                    'Content-Disposition',
+                ]
+            );
+        }
+
+        // Convert the message content (including headers) to a string
+        // and place it in a temporary file
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $encryptMessage->toByteStream($messageStream);
+        $messageStream->commit();
+        $encryptedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
+
+        // Encrypt the message
+        if (!openssl_pkcs7_encrypt(
+                $messageStream->getPath(),
+                $encryptedMessageStream->getPath(),
+                $this->encryptCert,
+                [],
+                0,
+                $this->encryptCipher
+            )
+        ) {
+            throw new Swift_IoException(sprintf('Failed to encrypt S/Mime message. Error: "%s".', openssl_error_string()));
         }
+
+        // Parse the resulting signed message content back into the Swift message
+        // preserving the original headers
+        $this->parseSSLOutput($encryptedMessageStream, $message);
     }
 
     /**
-     * @param Swift_Message $message
-     *
-     * @return Swift_Message
+     * Copy named headers from one Swift message to another.
      */
-    protected function createMessage(Swift_Message $message)
-    {
-        $mimeEntity = new Swift_Message('', $message->getBody(), $message->getContentType(), $message->getCharset());
-        $mimeEntity->setChildren($message->getChildren());
-
-        $messageHeaders = $mimeEntity->getHeaders();
-        $messageHeaders->remove('Message-ID');
-        $messageHeaders->remove('Date');
-        $messageHeaders->remove('Subject');
-        $messageHeaders->remove('MIME-Version');
-        $messageHeaders->remove('To');
-        $messageHeaders->remove('From');
-
-        return $mimeEntity;
+    protected function copyHeaders(
+        Swift_Message $fromMessage,
+        Swift_Message $toMessage,
+        array $headers = []
+    ) {
+        foreach ($headers as $header) {
+            $this->copyHeader($fromMessage, $toMessage, $header);
+        }
     }
 
     /**
-     * @param Swift_FileStream      $outputStream
-     * @param Swift_InputByteStream $inputStream
+     * Copy a single header from one Swift message to another.
      *
-     * @throws Swift_IoException
+     * @param string $headerName
      */
-    protected function messageStreamToSignedByteStream(Swift_FileStream $outputStream, Swift_InputByteStream $inputStream)
+    protected function copyHeader(Swift_Message $fromMessage, Swift_Message $toMessage, $headerName)
     {
-        $signedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
-
-        $args = array($outputStream->getPath(), $signedMessageStream->getPath(), $this->signCertificate, $this->signPrivateKey, array(), $this->signOptions);
-        if (null !== $this->extraCerts) {
-            $args[] = $this->extraCerts;
+        $header = $fromMessage->getHeaders()->get($headerName);
+        if (!$header) {
+            return;
         }
-
-        if (!openssl_pkcs7_sign(...$args)) {
-            throw new Swift_IoException(sprintf('Failed to sign S/Mime message. Error: "%s".', openssl_error_string()));
+        $headers = $toMessage->getHeaders();
+        switch ($header->getFieldType()) {
+            case Swift_Mime_Header::TYPE_TEXT:
+                $headers->addTextHeader($header->getFieldName(), $header->getValue());
+                break;
+            case Swift_Mime_Header::TYPE_PARAMETERIZED:
+                $headers->addParameterizedHeader(
+                    $header->getFieldName(),
+                    $header->getValue(),
+                    $header->getParameters()
+                );
+                break;
         }
+    }
 
-        $this->copyFromOpenSSLOutput($signedMessageStream, $inputStream);
+    /**
+     * Remove all headers from a Swift message.
+     */
+    protected function clearAllHeaders(Swift_Message $message)
+    {
+        $headers = $message->getHeaders();
+        foreach ($headers->listAll() as $header) {
+            $headers->removeAll($header);
+        }
     }
 
     /**
-     * @param Swift_FileStream      $outputStream
-     * @param Swift_InputByteStream $is
+     * Wraps a Swift_Message in a message/rfc822 MIME part.
      *
-     * @throws Swift_IoException
+     * @return Swift_MimePart
      */
-    protected function messageStreamToEncryptedByteStream(Swift_FileStream $outputStream, Swift_InputByteStream $is)
+    protected function wrapMimeMessage(Swift_Message $message)
     {
-        $encryptedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        // Start by copying the original message into a message stream
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $message->toByteStream($messageStream);
+        $messageStream->commit();
 
-        if (!openssl_pkcs7_encrypt($outputStream->getPath(), $encryptedMessageStream->getPath(), $this->encryptCert, array(), 0, $this->encryptCipher)) {
-            throw new Swift_IoException(sprintf('Failed to encrypt S/Mime message. Error: "%s".', openssl_error_string()));
-        }
+        // Create a new MIME part that wraps the original stream
+        $wrappedMessage = new Swift_MimePart($messageStream, 'message/rfc822');
+        $wrappedMessage->setEncoder(new Swift_Mime_ContentEncoder_PlainContentEncoder('7bit'));
 
-        $this->copyFromOpenSSLOutput($encryptedMessageStream, $is);
+        return $wrappedMessage;
+    }
+
+    protected function parseSSLOutput(Swift_InputByteStream $inputStream, Swift_Message $message)
+    {
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $this->copyFromOpenSSLOutput($inputStream, $messageStream);
+
+        $this->streamToMime($messageStream, $message);
     }
 
     /**
-     * @param Swift_OutputByteStream $fromStream
-     * @param Swift_InputByteStream  $toStream
+     * Merges an OutputByteStream from OpenSSL to a Swift_Message.
      */
-    protected function copyFromOpenSSLOutput(Swift_OutputByteStream $fromStream, Swift_InputByteStream $toStream)
+    protected function streamToMime(Swift_OutputByteStream $fromStream, Swift_Message $message)
     {
-        $bufferLength = 4096;
-        $filteredStream = new Swift_ByteStream_TemporaryFileByteStream();
-        $filteredStream->addFilter($this->replacementFactory->createFilter("\r\n", "\n"), 'CRLF to LF');
-        $filteredStream->addFilter($this->replacementFactory->createFilter("\n", "\r\n"), 'LF to CRLF');
+        // Parse the stream into headers and body
+        list($headers, $messageStream) = $this->parseStream($fromStream);
 
-        while (false !== ($buffer = $fromStream->read($bufferLength))) {
-            $filteredStream->write($buffer);
+        // Get the original message headers
+        $messageHeaders = $message->getHeaders();
+
+        // Let the stream determine the headers describing the body content,
+        // since the body of the original message is overwritten by the body
+        // coming from the stream.
+        // These are all content-* headers.
+
+        // Default transfer encoding is 7bit if not set
+        $encoding = '';
+        // Remove all existing transfer encoding headers
+        $messageHeaders->removeAll('Content-Transfer-Encoding');
+        // See whether the stream sets the transfer encoding
+        if (isset($headers['content-transfer-encoding'])) {
+            $encoding = $headers['content-transfer-encoding'];
         }
 
-        $filteredStream->flushBuffers();
+        // We use the null content encoder, since the body is already encoded
+        // according to the transfer encoding specified in the stream
+        $message->setEncoder(new Swift_Mime_ContentEncoder_NullContentEncoder($encoding));
 
-        while (false !== ($buffer = $filteredStream->read($bufferLength))) {
-            $toStream->write($buffer);
+        // Set the disposition, if present
+        if (isset($headers['content-disposition'])) {
+            $messageHeaders->addTextHeader('Content-Disposition', $headers['content-disposition']);
         }
 
-        $toStream->commit();
+        // Copy over the body from the stream using the content type dictated
+        // by the stream content
+        $message->setChildren([]);
+        $message->setBody($messageStream, $headers['content-type']);
     }
 
     /**
-     * Merges an OutputByteStream to Swift_Message.
+     * This message will parse the headers of a MIME email byte stream
+     * and return an array that contains the headers as an associative
+     * array and the email body as a string.
      *
-     * @param Swift_OutputByteStream $fromStream
-     * @param Swift_Message          $message
+     * @return array
      */
-    protected function streamToMime(Swift_OutputByteStream $fromStream, Swift_Message $message)
+    protected function parseStream(Swift_OutputByteStream $emailStream)
     {
         $bufferLength = 78;
         $headerData = '';
+        $headerBodySeparator = "\r\n\r\n";
 
-        $fromStream->setReadPointer(0);
+        $emailStream->setReadPointer(0);
 
-        while (($buffer = $fromStream->read($bufferLength)) !== false) {
+        // Read out the headers section from the stream to a string
+        while (false !== ($buffer = $emailStream->read($bufferLength))) {
             $headerData .= $buffer;
 
-            if (false !== strpos($buffer, "\r\n\r\n")) {
+            $headersPosEnd = strpos($headerData, $headerBodySeparator);
+
+            // Stop reading if we found the end of the headers
+            if (false !== $headersPosEnd) {
                 break;
             }
         }
 
-        $headersPosEnd = strpos($headerData, "\r\n\r\n");
-        $headerData = trim($headerData);
-        $headerData = substr($headerData, 0, $headersPosEnd);
+        // Split the header data into lines
+        $headerData = trim(substr($headerData, 0, $headersPosEnd));
         $headerLines = explode("\r\n", $headerData);
         unset($headerData);
 
-        $headers = array();
+        $headers = [];
         $currentHeaderName = '';
 
+        // Transform header lines into an associative array
         foreach ($headerLines as $headerLine) {
-            // Line separated
-            if (ctype_space($headerLines[0]) || false === strpos($headerLine, ':')) {
+            // Handle headers that span multiple lines
+            if (false === strpos($headerLine, ':')) {
                 $headers[$currentHeaderName] .= ' '.trim($headerLine);
                 continue;
             }
@@ -368,50 +505,38 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
             $headers[$currentHeaderName] = trim($header[1]);
         }
 
-        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
-        $messageStream->addFilter($this->replacementFactory->createFilter("\r\n", "\n"), 'CRLF to LF');
-        $messageStream->addFilter($this->replacementFactory->createFilter("\n", "\r\n"), 'LF to CRLF');
-
-        $messageHeaders = $message->getHeaders();
-
-        // No need to check for 'application/pkcs7-mime', as this is always base64
-        if ('multipart/signed;' === substr($headers['content-type'], 0, 17)) {
-            if (!preg_match('/boundary=("[^"]+"|(?:[^\s]+|$))/is', $headers['content-type'], $contentTypeData)) {
-                throw new Swift_SwiftException('Failed to find Boundary parameter');
-            }
-
-            $boundary = trim($contentTypeData['1'], '"');
+        // Read the entire email body into a byte stream
+        $bodyStream = new Swift_ByteStream_TemporaryFileByteStream();
 
-            // Skip the header and CRLF CRLF
-            $fromStream->setReadPointer($headersPosEnd + 4);
+        // Skip the header and separator and point to the body
+        $emailStream->setReadPointer($headersPosEnd + strlen($headerBodySeparator));
 
-            while (false !== ($buffer = $fromStream->read($bufferLength))) {
-                $messageStream->write($buffer);
-            }
+        while (false !== ($buffer = $emailStream->read($bufferLength))) {
+            $bodyStream->write($buffer);
+        }
 
-            $messageStream->commit();
+        $bodyStream->commit();
 
-            $messageHeaders->remove('Content-Transfer-Encoding');
-            $message->setContentType($headers['content-type']);
-            $message->setBoundary($boundary);
-            $message->setBody($messageStream);
-        } else {
-            $fromStream->setReadPointer($headersPosEnd + 4);
+        return [$headers, $bodyStream];
+    }
 
-            if (null === $this->headerFactory) {
-                $this->headerFactory = Swift_DependencyContainer::getInstance()->lookup('mime.headerfactory');
-            }
+    protected function copyFromOpenSSLOutput(Swift_OutputByteStream $fromStream, Swift_InputByteStream $toStream)
+    {
+        $bufferLength = 4096;
+        $filteredStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $filteredStream->addFilter($this->replacementFactory->createFilter("\r\n", "\n"), 'CRLF to LF');
+        $filteredStream->addFilter($this->replacementFactory->createFilter("\n", "\r\n"), 'LF to CRLF');
 
-            $message->setContentType($headers['content-type']);
-            $messageHeaders->set($this->headerFactory->createTextHeader('Content-Transfer-Encoding', $headers['content-transfer-encoding']));
-            $messageHeaders->set($this->headerFactory->createTextHeader('Content-Disposition', $headers['content-disposition']));
+        while (false !== ($buffer = $fromStream->read($bufferLength))) {
+            $filteredStream->write($buffer);
+        }
 
-            while (false !== ($buffer = $fromStream->read($bufferLength))) {
-                $messageStream->write($buffer);
-            }
+        $filteredStream->flushBuffers();
 
-            $messageStream->commit();
-            $message->setBody($messageStream);
+        while (false !== ($buffer = $filteredStream->read($bufferLength))) {
+            $toStream->write($buffer);
         }
+
+        $toStream->commit();
     }
 }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php
index 011c03ab..e241e678 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php
@@ -23,22 +23,20 @@
 class Swift_SmtpTransport extends Swift_Transport_EsmtpTransport
 {
     /**
-     * Create a new SmtpTransport, optionally with $host, $port and $security.
-     *
      * @param string $host
      * @param int    $port
-     * @param string $security
+     * @param string $encryption
      */
-    public function __construct($host = 'localhost', $port = 25, $security = null)
+    public function __construct($host = 'localhost', $port = 25, $encryption = null)
     {
         call_user_func_array(
-            array($this, 'Swift_Transport_EsmtpTransport::__construct'),
+            [$this, 'Swift_Transport_EsmtpTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.smtp')
             );
 
         $this->setHost($host);
         $this->setPort($port);
-        $this->setEncryption($security);
+        $this->setEncryption($encryption);
     }
 }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SpoolTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SpoolTransport.php
index f92567ba..4b30f04e 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SpoolTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SpoolTransport.php
@@ -17,8 +17,6 @@ class Swift_SpoolTransport extends Swift_Transport_SpoolTransport
 {
     /**
      * Create a new SpoolTransport.
-     *
-     * @param Swift_Spool $spool
      */
     public function __construct(Swift_Spool $spool)
     {
@@ -28,7 +26,7 @@ class Swift_SpoolTransport extends Swift_Transport_SpoolTransport
         $arguments[] = $spool;
 
         call_user_func_array(
-            array($this, 'Swift_Transport_SpoolTransport::__construct'),
+            [$this, 'Swift_Transport_SpoolTransport::__construct'],
             $arguments
         );
     }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
index ba1f6d32..c3b7675d 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
@@ -17,9 +17,6 @@
  */
 class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilter
 {
-    /** The needle(s) to search for */
-    private $search;
-
     /** The replacement(s) to make */
     private $replace;
 
@@ -27,7 +24,7 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
     private $index;
 
     /** The Search Tree */
-    private $tree = array();
+    private $tree = [];
 
     /**  Gives the size of the largest search */
     private $treeMaxLen = 0;
@@ -42,17 +39,16 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
      */
     public function __construct($search, $replace)
     {
-        $this->search = $search;
-        $this->index = array();
-        $this->tree = array();
-        $this->replace = array();
-        $this->repSize = array();
+        $this->index = [];
+        $this->tree = [];
+        $this->replace = [];
+        $this->repSize = [];
 
         $tree = null;
         $i = null;
         $last_size = $size = 0;
         foreach ($search as $i => $search_element) {
-            if ($tree !== null) {
+            if (null !== $tree) {
                 $tree[-1] = min(count($replace) - 1, $i - 1);
                 $tree[-2] = $last_size;
             }
@@ -61,7 +57,7 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
                 foreach ($search_element as $k => $char) {
                     $this->index[$char] = true;
                     if (!isset($tree[$char])) {
-                        $tree[$char] = array();
+                        $tree[$char] = [];
                     }
                     $tree = &$tree[$char];
                 }
@@ -70,21 +66,21 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
             } else {
                 $last_size = 1;
                 if (!isset($tree[$search_element])) {
-                    $tree[$search_element] = array();
+                    $tree[$search_element] = [];
                 }
                 $tree = &$tree[$search_element];
                 $size = max($last_size, $size);
                 $this->index[$search_element] = true;
             }
         }
-        if ($i !== null) {
+        if (null !== $i) {
             $tree[-1] = min(count($replace) - 1, $i);
             $tree[-2] = $last_size;
             $this->treeMaxLen = $size;
         }
         foreach ($replace as $rep) {
             if (!is_array($rep)) {
-                $rep = array($rep);
+                $rep = [$rep];
             }
             $this->replace[] = $rep;
         }
@@ -118,11 +114,11 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
      */
     public function filter($buffer, $minReplaces = -1)
     {
-        if ($this->treeMaxLen == 0) {
+        if (0 == $this->treeMaxLen) {
             return $buffer;
         }
 
-        $newBuffer = array();
+        $newBuffer = [];
         $buf_size = count($buffer);
         $last_size = 0;
         for ($i = 0; $i < $buf_size; ++$i) {
@@ -141,7 +137,7 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
                     }
                 }
                 // We got a complete pattern
-                elseif ($last_found !== PHP_INT_MAX) {
+                elseif (PHP_INT_MAX !== $last_found) {
                     // Adding replacement datas to output buffer
                     $rep_size = $this->repSize[$last_found];
                     for ($j = 0; $j < $rep_size; ++$j) {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
index f60f0cf8..783b8896 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
@@ -16,7 +16,7 @@
 class Swift_StreamFilters_StringReplacementFilterFactory implements Swift_ReplacementFilterFactory
 {
     /** Lazy-loaded filters */
-    private $filters = array();
+    private $filters = [];
 
     /**
      * Create a new StreamFilter to replace $search with $replace in a string.
@@ -30,11 +30,11 @@ class Swift_StreamFilters_StringReplacementFilterFactory implements Swift_Replac
     {
         if (!isset($this->filters[$search][$replace])) {
             if (!isset($this->filters[$search])) {
-                $this->filters[$search] = array();
+                $this->filters[$search] = [];
             }
 
             if (!isset($this->filters[$search][$replace])) {
-                $this->filters[$search][$replace] = array();
+                $this->filters[$search][$replace] = [];
             }
 
             $this->filters[$search][$replace] = new Swift_StreamFilters_StringReplacementFilter($search, $replace);
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SwiftException.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SwiftException.php
index db3d3109..15e68b18 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SwiftException.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/SwiftException.php
@@ -18,9 +18,8 @@ class Swift_SwiftException extends Exception
     /**
      * Create a new SwiftException with $message.
      *
-     * @param string    $message
-     * @param int       $code
-     * @param Exception $previous
+     * @param string $message
+     * @param int    $code
      */
     public function __construct($message, $code = 0, Exception $previous = null)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php
index f6214b7b..0951f35e 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php
@@ -61,8 +61,10 @@ interface Swift_Transport
      * Recipient/sender data will be retrieved from the Message API.
      * The return value is the number of recipients who were accepted for delivery.
      *
+     * This is the responsibility of the send method to start the transport if needed.
+     *
      * @param Swift_Mime_SimpleMessage $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[]                 $failedRecipients An array of failures by-reference
      *
      * @return int
      */
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
index 34c3323f..18c8d9b9 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
@@ -27,6 +27,14 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
     /** The event dispatching layer */
     protected $eventDispatcher;
 
+    protected $addressEncoder;
+
+    /** Whether the PIPELINING SMTP extension is enabled (RFC 2920) */
+    protected $pipelining = null;
+
+    /** The pipelined commands waiting for response */
+    protected $pipeline = [];
+
     /** Source Ip */
     protected $sourceIp;
 
@@ -36,14 +44,13 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
     /**
      * Creates a new EsmtpTransport using the given I/O buffer.
      *
-     * @param Swift_Transport_IoBuffer     $buf
-     * @param Swift_Events_EventDispatcher $dispatcher
-     * @param string                       $localDomain
+     * @param string $localDomain
      */
-    public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1')
+    public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1', Swift_AddressEncoder $addressEncoder = null)
     {
-        $this->eventDispatcher = $dispatcher;
         $this->buffer = $buf;
+        $this->eventDispatcher = $dispatcher;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
         $this->setLocalDomain($localDomain);
     }
 
@@ -63,7 +70,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      */
     public function setLocalDomain($domain)
     {
-        if (substr($domain, 0, 1) !== '[') {
+        if ('[' !== substr($domain, 0, 1)) {
             if (filter_var($domain, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
                 $domain = '['.$domain.']';
             } elseif (filter_var($domain, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
@@ -109,6 +116,16 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
         return $this->sourceIp;
     }
 
+    public function setAddressEncoder(Swift_AddressEncoder $addressEncoder)
+    {
+        $this->addressEncoder = $addressEncoder;
+    }
+
+    public function getAddressEncoder()
+    {
+        return $this->addressEncoder;
+    }
+
     /**
      * Start the SMTP connection.
      */
@@ -154,13 +171,16 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      * Recipient/sender data will be retrieved from the Message API.
      * The return value is the number of recipients who were accepted for delivery.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
     public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
+        if (!$this->isStarted()) {
+            $this->start();
+        }
+
         $sent = 0;
         $failedRecipients = (array) $failedRecipients;
 
@@ -172,10 +192,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
         }
 
         if (!$reversePath = $this->getReversePath($message)) {
-            $this->throwException(new Swift_TransportException(
-                'Cannot send message without a sender address'
-                )
-            );
+            $this->throwException(new Swift_TransportException('Cannot send message without a sender address'));
         }
 
         $to = (array) $message->getTo();
@@ -183,18 +200,15 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
         $tos = array_merge($to, $cc);
         $bcc = (array) $message->getBcc();
 
-        $message->setBcc(array());
+        $message->setBcc([]);
 
         try {
             $sent += $this->sendTo($message, $reversePath, $tos, $failedRecipients);
             $sent += $this->sendBcc($message, $reversePath, $bcc, $failedRecipients);
-        } catch (Exception $e) {
+        } finally {
             $message->setBcc($bcc);
-            throw $e;
         }
 
-        $message->setBcc($bcc);
-
         if ($evt) {
             if ($sent == count($to) + count($cc) + count($bcc)) {
                 $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
@@ -226,7 +240,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
             }
 
             try {
-                $this->executeCommand("QUIT\r\n", array(221));
+                $this->executeCommand("QUIT\r\n", [221]);
             } catch (Swift_TransportException $e) {
             }
 
@@ -253,7 +267,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
                 $this->start();
             }
 
-            $this->executeCommand("NOOP\r\n", array(250));
+            $this->executeCommand("NOOP\r\n", [250]);
         } catch (Swift_TransportException $e) {
             try {
                 $this->stop();
@@ -268,8 +282,6 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
 
     /**
      * Register a plugin.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
@@ -281,7 +293,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      */
     public function reset()
     {
-        $this->executeCommand("RSET\r\n", array(250));
+        $this->executeCommand("RSET\r\n", [250], $failures, true);
     }
 
     /**
@@ -299,22 +311,43 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      *
      * If no response codes are given, the response will not be validated.
      * If codes are given, an exception will be thrown on an invalid response.
+     * If the command is RCPT TO, and the pipeline is non-empty, no exception
+     * will be thrown; instead the failing address is added to $failures.
      *
      * @param string   $command
      * @param int[]    $codes
      * @param string[] $failures An array of failures by-reference
+     * @param bool     $pipeline Do not wait for response
+     * @param string   $address  The address, if command is RCPT TO.
      *
-     * @return string
+     * @return string|null The server response, or null if pipelining is enabled
      */
-    public function executeCommand($command, $codes = array(), &$failures = null)
+    public function executeCommand($command, $codes = [], &$failures = null, $pipeline = false, $address = null)
     {
         $failures = (array) $failures;
         $seq = $this->buffer->write($command);
-        $response = $this->getFullResponse($seq);
         if ($evt = $this->eventDispatcher->createCommandEvent($this, $command, $codes)) {
             $this->eventDispatcher->dispatchEvent($evt, 'commandSent');
         }
-        $this->assertResponseCode($response, $codes);
+
+        $this->pipeline[] = [$command, $seq, $codes, $address];
+        if ($pipeline && $this->pipelining) {
+            $response = null;
+        } else {
+            while ($this->pipeline) {
+                list($command, $seq, $codes, $address) = array_shift($this->pipeline);
+                $response = $this->getFullResponse($seq);
+                try {
+                    $this->assertResponseCode($response, $codes);
+                } catch (Swift_TransportException $e) {
+                    if ($this->pipeline && $address) {
+                        $failures[] = $address;
+                    } else {
+                        $this->throwException($e);
+                    }
+                }
+            }
+        }
 
         return $response;
     }
@@ -322,51 +355,53 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
     /** Read the opening SMTP greeting */
     protected function readGreeting()
     {
-        $this->assertResponseCode($this->getFullResponse(0), array(220));
+        $this->assertResponseCode($this->getFullResponse(0), [220]);
     }
 
     /** Send the HELO welcome */
     protected function doHeloCommand()
     {
         $this->executeCommand(
-            sprintf("HELO %s\r\n", $this->domain), array(250)
+            sprintf("HELO %s\r\n", $this->domain), [250]
             );
     }
 
     /** Send the MAIL FROM command */
     protected function doMailFromCommand($address)
     {
+        $address = $this->addressEncoder->encodeString($address);
         $this->executeCommand(
-            sprintf("MAIL FROM:<%s>\r\n", $address), array(250)
+            sprintf("MAIL FROM:<%s>\r\n", $address), [250], $failures, true
             );
     }
 
     /** Send the RCPT TO command */
     protected function doRcptToCommand($address)
     {
+        $address = $this->addressEncoder->encodeString($address);
         $this->executeCommand(
-            sprintf("RCPT TO:<%s>\r\n", $address), array(250, 251, 252)
+            sprintf("RCPT TO:<%s>\r\n", $address), [250, 251, 252], $failures, true, $address
             );
     }
 
     /** Send the DATA command */
-    protected function doDataCommand()
+    protected function doDataCommand(&$failedRecipients)
     {
-        $this->executeCommand("DATA\r\n", array(354));
+        $this->executeCommand("DATA\r\n", [354], $failedRecipients);
     }
 
     /** Stream the contents of the message over the buffer */
     protected function streamMessage(Swift_Mime_SimpleMessage $message)
     {
-        $this->buffer->setWriteTranslations(array("\r\n." => "\r\n.."));
+        $this->buffer->setWriteTranslations(["\r\n." => "\r\n.."]);
         try {
             $message->toByteStream($this->buffer);
             $this->buffer->flushBuffers();
         } catch (Swift_TransportException $e) {
             $this->throwException($e);
         }
-        $this->buffer->setWriteTranslations(array());
-        $this->executeCommand("\r\n.\r\n", array(250));
+        $this->buffer->setWriteTranslations([]);
+        $this->executeCommand("\r\n.\r\n", [250]);
     }
 
     /** Determine the best-use reverse path for this message */
@@ -406,6 +441,10 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
     /** Throws an Exception if a response code is incorrect */
     protected function assertResponseCode($response, $wanted)
     {
+        if (!$response) {
+            $this->throwException(new Swift_TransportException('Expected response code '.implode('/', $wanted).' but got an empty response'));
+        }
+
         list($code) = sscanf($response, '%3d');
         $valid = (empty($wanted) || in_array($code, $wanted));
 
@@ -415,12 +454,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
         }
 
         if (!$valid) {
-            $this->throwException(
-                new Swift_TransportException(
-                    'Expected response code '.implode('/', $wanted).' but got code '.
-                    '"'.$code.'", with message "'.$response.'"',
-                    $code)
-                );
+            $this->throwException(new Swift_TransportException('Expected response code '.implode('/', $wanted).' but got code "'.$code.'", with message "'.$response.'"', $code));
         }
     }
 
@@ -436,10 +470,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
         } catch (Swift_TransportException $e) {
             $this->throwException($e);
         } catch (Swift_IoException $e) {
-            $this->throwException(
-                new Swift_TransportException(
-                    $e->getMessage())
-                );
+            $this->throwException(new Swift_TransportException($e->getMessage(), 0, $e));
         }
 
         return $response;
@@ -456,11 +487,16 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
                 ++$sent;
             } catch (Swift_TransportException $e) {
                 $failedRecipients[] = $forwardPath;
+            } catch (Swift_AddressEncoderException $e) {
+                $failedRecipients[] = $forwardPath;
             }
         }
 
-        if ($sent != 0) {
-            $this->doDataCommand();
+        if (0 != $sent) {
+            $sent += count($failedRecipients);
+            $this->doDataCommand($failedRecipients);
+            $sent -= count($failedRecipients);
+
             $this->streamMessage($message);
         } else {
             $this->reset();
@@ -485,9 +521,9 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
     {
         $sent = 0;
         foreach ($bcc as $forwardPath => $name) {
-            $message->setBcc(array($forwardPath => $name));
+            $message->setBcc([$forwardPath => $name]);
             $sent += $this->doMailTransaction(
-                $message, $reversePath, array($forwardPath), $failedRecipients
+                $message, $reversePath, [$forwardPath], $failedRecipients
                 );
         }
 
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
index 26c2d745..51dc7f56 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
@@ -26,29 +26,23 @@ class Swift_Transport_Esmtp_Auth_CramMd5Authenticator implements Swift_Transport
     }
 
     /**
-     * Try to authenticate the user with $username and $password.
-     *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
         try {
-            $challenge = $agent->executeCommand("AUTH CRAM-MD5\r\n", array(334));
+            $challenge = $agent->executeCommand("AUTH CRAM-MD5\r\n", [334]);
             $challenge = base64_decode(substr($challenge, 4));
             $message = base64_encode(
                 $username.' '.$this->getResponse($password, $challenge)
                 );
-            $agent->executeCommand(sprintf("%s\r\n", $message), array(235));
+            $agent->executeCommand(sprintf("%s\r\n", $message), [235]);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
index 6ab6e333..458c0383 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
@@ -26,26 +26,20 @@ class Swift_Transport_Esmtp_Auth_LoginAuthenticator implements Swift_Transport_E
     }
 
     /**
-     * Try to authenticate the user with $username and $password.
-     *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
         try {
-            $agent->executeCommand("AUTH LOGIN\r\n", array(334));
-            $agent->executeCommand(sprintf("%s\r\n", base64_encode($username)), array(334));
-            $agent->executeCommand(sprintf("%s\r\n", base64_encode($password)), array(235));
+            $agent->executeCommand("AUTH LOGIN\r\n", [334]);
+            $agent->executeCommand(sprintf("%s\r\n", base64_encode($username)), [334]);
+            $agent->executeCommand(sprintf("%s\r\n", base64_encode($password)), [235]);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
index fa5d2110..90081f8e 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
@@ -31,13 +31,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     }
 
     /**
-     * Try to authenticate the user with $username and $password.
-     *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
-     *
-     * @return bool
+     * {@inheritdoc}
      *
      * @throws \LogicException
      */
@@ -65,9 +59,9 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 
@@ -100,15 +94,13 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     /**
      * Send our auth message and returns the response.
      *
-     * @param Swift_Transport_SmtpAgent $agent
-     *
      * @return string SMTP Response
      */
     protected function sendMessage1(Swift_Transport_SmtpAgent $agent)
     {
         $message = $this->createMessage1();
 
-        return $agent->executeCommand(sprintf("AUTH %s %s\r\n", $this->getAuthKeyword(), base64_encode($message)), array(334));
+        return $agent->executeCommand(sprintf("AUTH %s %s\r\n", $this->getAuthKeyword(), base64_encode($message)), [334]);
     }
 
     /**
@@ -131,7 +123,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         $targetInfoBlock = substr($responseHex, $offset);
         list($domainName, $serverName, $DNSDomainName, $DNSServerName, $terminatorByte) = $this->readSubBlock($targetInfoBlock);
 
-        return array(
+        return [
             $challenge,
             $context,
             $targetInfoH,
@@ -142,14 +134,12 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
             $DNSServerName,
             hex2bin($targetInfoBlock),
             $terminatorByte,
-        );
+        ];
     }
 
     /**
      * Read the blob information in from message2.
      *
-     * @param $block
-     *
      * @return array
      */
     protected function readSubBlock($block)
@@ -159,7 +149,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
 
         $length = strlen($block);
         $offset = 0;
-        $data = array();
+        $data = [];
         while ($offset < $length) {
             $blockLength = hexdec(substr(substr($block, $offset, 8), -4)) / 256;
             $offset += 8;
@@ -167,7 +157,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
             $offset += $blockLength * 2;
         }
 
-        if (count($data) == 3) {
+        if (3 == count($data)) {
             $data[] = $data[2];
             $data[2] = '';
         }
@@ -180,13 +170,12 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     /**
      * Send our final message with all our data.
      *
-     * @param string                    $response  Message 1 response (message 2)
-     * @param string                    $username
-     * @param string                    $password
-     * @param string                    $timestamp
-     * @param string                    $client
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param bool                      $v2        Use version2 of the protocol
+     * @param string $response  Message 1 response (message 2)
+     * @param string $username
+     * @param string $password
+     * @param string $timestamp
+     * @param string $client
+     * @param bool   $v2        Use version2 of the protocol
      *
      * @return string
      */
@@ -210,7 +199,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
 
         $message = $this->createMessage3($domain, $username, $workstation, $lmResponse, $ntlmResponse);
 
-        return $agent->executeCommand(sprintf("%s\r\n", base64_encode($message)), array(235));
+        return $agent->executeCommand(sprintf("%s\r\n", base64_encode($message)), [235]);
     }
 
     /**
@@ -294,18 +283,18 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
      */
     protected function getDomainAndUsername($name)
     {
-        if (strpos($name, '\\') !== false) {
+        if (false !== strpos($name, '\\')) {
             return explode('\\', $name);
         }
 
         if (false !== strpos($name, '@')) {
             list($user, $domain) = explode('@', $name);
 
-            return array($domain, $user);
+            return [$domain, $user];
         }
 
         // no domain passed
-        return array('', $name);
+        return ['', $name];
     }
 
     /**
@@ -436,7 +425,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
 
     protected function createDesKey($key)
     {
-        $material = array(bin2hex($key[0]));
+        $material = [bin2hex($key[0])];
         $len = strlen($key);
         for ($i = 1; $i < $len; ++$i) {
             list($high, $low) = str_split(bin2hex($key[$i]));
@@ -448,9 +437,9 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         // odd parity
         foreach ($material as $k => $v) {
             $b = $this->castToByte(hexdec($v));
-            $needsParity = (($this->uRShift($b, 7) ^ $this->uRShift($b, 6) ^ $this->uRShift($b, 5)
+            $needsParity = 0 == (($this->uRShift($b, 7) ^ $this->uRShift($b, 6) ^ $this->uRShift($b, 5)
                         ^ $this->uRShift($b, 4) ^ $this->uRShift($b, 3) ^ $this->uRShift($b, 2)
-                        ^ $this->uRShift($b, 1)) & 0x01) == 0;
+                        ^ $this->uRShift($b, 1)) & 0x01);
 
             list($high, $low) = str_split($v);
             if ($needsParity) {
@@ -495,7 +484,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         $length = floor(hexdec(substr($value, 0, 4)) / 256) * 2;
         $offset = floor(hexdec(substr($value, 8, 4)) / 256) * 2;
 
-        return array($length, $offset);
+        return [$length, $offset];
     }
 
     /**
@@ -521,7 +510,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
      */
     protected function uRShift($a, $b)
     {
-        if ($b == 0) {
+        if (0 == $b) {
             return $a;
         }
 
@@ -592,7 +581,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
      *
      * @return string
      *
-     * @see http://php.net/manual/en/ref.hash.php
+     * @see https://secure.php.net/manual/en/ref.hash.php
      */
     protected function md4Encrypt($input)
     {
@@ -623,8 +612,8 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         echo substr($message, 0, 16)." NTLMSSP Signature<br />\n";
         echo $messageId." Type Indicator<br />\n";
 
-        if ($messageId == '02000000') {
-            $map = array(
+        if ('02000000' == $messageId) {
+            $map = [
                 'Challenge',
                 'Context',
                 'Target Information Security Buffer',
@@ -635,14 +624,14 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
                 'DNS Server Name',
                 'BLOB',
                 'Target Information Terminator',
-            );
+            ];
 
             $data = $this->parseMessage2(hex2bin($message));
 
             foreach ($map as $key => $value) {
                 echo bin2hex($data[$key]).' - '.$data[$key].' ||| '.$value."<br />\n";
             }
-        } elseif ($messageId == '03000000') {
+        } elseif ('03000000' == $messageId) {
             $i = 0;
             $data[$i++] = substr($message, 24, 16);
             list($lmLength, $lmOffset) = $this->readSecurityBuffer($data[$i - 1]);
@@ -667,7 +656,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
             $data[$i++] = substr($message, $lmOffset, $lmLength);
             $data[$i] = substr($message, $ntmlOffset, $ntmlLength);
 
-            $map = array(
+            $map = [
                 'LM Response Security Buffer',
                 'NTLM Response Security Buffer',
                 'Target Name Security Buffer',
@@ -680,7 +669,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
                 'Workstation Name Data',
                 'LM Response Data',
                 'NTLM Response Data',
-            );
+            ];
 
             foreach ($map as $key => $value) {
                 echo $data[$key].' - '.hex2bin($data[$key]).' ||| '.$value."<br />\n";
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
index 43219f93..1ff961cc 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
@@ -26,25 +26,19 @@ class Swift_Transport_Esmtp_Auth_PlainAuthenticator implements Swift_Transport_E
     }
 
     /**
-     * Try to authenticate the user with $username and $password.
-     *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
         try {
             $message = base64_encode($username.chr(0).$username.chr(0).$password);
-            $agent->executeCommand(sprintf("AUTH PLAIN %s\r\n", $message), array(235));
+            $agent->executeCommand(sprintf("AUTH PLAIN %s\r\n", $message), [235]);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
index d1a4cc3d..859f22f3 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
@@ -36,25 +36,19 @@ class Swift_Transport_Esmtp_Auth_XOAuth2Authenticator implements Swift_Transport
     }
 
     /**
-     * Try to authenticate the user with $email and $token.
-     *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $email
-     * @param string                    $token
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $email, $token)
     {
         try {
             $param = $this->constructXOAuth2Params($email, $token);
-            $agent->executeCommand('AUTH XOAUTH2 '.$param."\r\n", array(235));
+            $agent->executeCommand('AUTH XOAUTH2 '.$param."\r\n", [235]);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
index 94387f01..4798dbd1 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
@@ -9,7 +9,7 @@
  */
 
 /**
- * An ESMTP handler for AUTH support.
+ * An ESMTP handler for AUTH support (RFC 5248).
  *
  * @author Chris Corbyn
  */
@@ -20,7 +20,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      *
      * @var Swift_Transport_Esmtp_Authenticator[]
      */
-    private $authenticators = array();
+    private $authenticators = [];
 
     /**
      * The username for authentication.
@@ -48,7 +48,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      *
      * @var string[]
      */
-    private $esmtpParams = array();
+    private $esmtpParams = [];
 
     /**
      * Create a new AuthHandler with $authenticators for support.
@@ -143,7 +143,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
     /**
      * Get the name of the ESMTP extension this handles.
      *
-     * @return bool
+     * @return string
      */
     public function getHandledKeyword()
     {
@@ -169,19 +169,26 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
     {
         if ($this->username) {
             $count = 0;
+            $errors = [];
             foreach ($this->getAuthenticatorsForAgent() as $authenticator) {
-                if (in_array(strtolower($authenticator->getAuthKeyword()),
-                    array_map('strtolower', $this->esmtpParams))) {
+                if (in_array(strtolower($authenticator->getAuthKeyword()), array_map('strtolower', $this->esmtpParams))) {
                     ++$count;
-                    if ($authenticator->authenticate($agent, $this->username, $this->password)) {
-                        return;
+                    try {
+                        if ($authenticator->authenticate($agent, $this->username, $this->password)) {
+                            return;
+                        }
+                    } catch (Swift_TransportException $e) {
+                        // keep the error message, but tries the other authenticators
+                        $errors[] = [$authenticator->getAuthKeyword(), $e];
                     }
                 }
             }
-            throw new Swift_TransportException(
-                'Failed to authenticate on SMTP server with username "'.
-                $this->username.'" using '.$count.' possible authenticators'
-                );
+
+            $message = 'Failed to authenticate on SMTP server with username "'.$this->username.'" using '.$count.' possible authenticators.';
+            foreach ($errors as $error) {
+                $message .= ' Authenticator '.$error[0].' returned '.$error[1].'.';
+            }
+            throw new Swift_TransportException($message);
         }
     }
 
@@ -190,7 +197,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function getMailParams()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -198,13 +205,13 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function getRcptParams()
     {
-        return array();
+        return [];
     }
 
     /**
      * Not used.
      */
-    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = array(), &$failedRecipients = null, &$stop = false)
+    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = [], &$failedRecipients = null, &$stop = false)
     {
     }
 
@@ -229,7 +236,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function exposeMixinMethods()
     {
-        return array('setUsername', 'getUsername', 'setPassword', 'getPassword', 'setAuthMode', 'getAuthMode');
+        return ['setUsername', 'getUsername', 'setPassword', 'getPassword', 'setAuthMode', 'getAuthMode'];
     }
 
     /**
@@ -242,8 +249,6 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
     /**
      * Returns the authenticator list for the given agent.
      *
-     * @param Swift_Transport_SmtpAgent $agent
-     *
      * @return array
      */
     protected function getAuthenticatorsForAgent()
@@ -254,7 +259,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
 
         foreach ($this->authenticators as $authenticator) {
             if (strtolower($authenticator->getAuthKeyword()) == $mode) {
-                return array($authenticator);
+                return [$authenticator];
             }
         }
 
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
index 12a9abf8..cadfdc65 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
@@ -29,7 +29,9 @@ interface Swift_Transport_Esmtp_Authenticator
      * @param string                    $username
      * @param string                    $password
      *
-     * @return bool
+     * @return bool true if authentication worked (returning false is deprecated, throw a Swift_TransportException instead)
+     *
+     * @throws Swift_TransportException Allows the message to bubble up when authentication was not successful
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password);
 }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/EightBitMimeHandler.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/EightBitMimeHandler.php
new file mode 100644
index 00000000..63f70866
--- /dev/null
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/EightBitMimeHandler.php
@@ -0,0 +1,113 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An ESMTP handler for 8BITMIME support (RFC 6152).
+ *
+ * 8BITMIME is required when sending 8-bit content to over SMTP, e.g. when using
+ * Swift_Mime_ContentEncoder_PlainContentEncoder in "8bit" mode.
+ *
+ * 8BITMIME mode is enabled unconditionally, even when sending ASCII-only
+ * messages, so it should only be used with an outbound SMTP server that will
+ * convert the message to 7-bit MIME if the next hop does not support 8BITMIME.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_Transport_Esmtp_EightBitMimeHandler implements Swift_Transport_EsmtpHandler
+{
+    protected $encoding;
+
+    /**
+     * @param string $encoding The parameter so send with the MAIL FROM command;
+     *                         either "8BITMIME" or "7BIT"
+     */
+    public function __construct(string $encoding = '8BITMIME')
+    {
+        $this->encoding = $encoding;
+    }
+
+    /**
+     * Get the name of the ESMTP extension this handles.
+     *
+     * @return string
+     */
+    public function getHandledKeyword()
+    {
+        return '8BITMIME';
+    }
+
+    /**
+     * Not used.
+     */
+    public function setKeywordParams(array $parameters)
+    {
+    }
+
+    /**
+     * Not used.
+     */
+    public function afterEhlo(Swift_Transport_SmtpAgent $agent)
+    {
+    }
+
+    /**
+     * Get params which are appended to MAIL FROM:<>.
+     *
+     * @return string[]
+     */
+    public function getMailParams()
+    {
+        return ['BODY='.$this->encoding];
+    }
+
+    /**
+     * Not used.
+     */
+    public function getRcptParams()
+    {
+        return [];
+    }
+
+    /**
+     * Not used.
+     */
+    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = [], &$failedRecipients = null, &$stop = false)
+    {
+    }
+
+    /**
+     * Returns +1, -1 or 0 according to the rules for usort().
+     *
+     * This method is called to ensure extensions can be execute in an appropriate order.
+     *
+     * @param string $esmtpKeyword to compare with
+     *
+     * @return int
+     */
+    public function getPriorityOver($esmtpKeyword)
+    {
+        return 0;
+    }
+
+    /**
+     * Not used.
+     */
+    public function exposeMixinMethods()
+    {
+        return [];
+    }
+
+    /**
+     * Not used.
+     */
+    public function resetState()
+    {
+    }
+}
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/SmtpUtf8Handler.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/SmtpUtf8Handler.php
new file mode 100644
index 00000000..7d0252a0
--- /dev/null
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/SmtpUtf8Handler.php
@@ -0,0 +1,107 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An ESMTP handler for SMTPUTF8 support (RFC 6531).
+ *
+ * SMTPUTF8 is required when sending to email addresses containing non-ASCII
+ * characters in local-part (the substring before @). This handler should be
+ * used together with Swift_AddressEncoder_Utf8AddressEncoder.
+ *
+ * SMTPUTF8 mode is enabled unconditionally, even when sending to ASCII-only
+ * addresses, so it should only be used with an outbound SMTP server that will
+ * deliver ASCII-only messages even if the next hop does not support SMTPUTF8.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_Transport_Esmtp_SmtpUtf8Handler implements Swift_Transport_EsmtpHandler
+{
+    public function __construct()
+    {
+    }
+
+    /**
+     * Get the name of the ESMTP extension this handles.
+     *
+     * @return string
+     */
+    public function getHandledKeyword()
+    {
+        return 'SMTPUTF8';
+    }
+
+    /**
+     * Not used.
+     */
+    public function setKeywordParams(array $parameters)
+    {
+    }
+
+    /**
+     * Not used.
+     */
+    public function afterEhlo(Swift_Transport_SmtpAgent $agent)
+    {
+    }
+
+    /**
+     * Get params which are appended to MAIL FROM:<>.
+     *
+     * @return string[]
+     */
+    public function getMailParams()
+    {
+        return ['SMTPUTF8'];
+    }
+
+    /**
+     * Not used.
+     */
+    public function getRcptParams()
+    {
+        return [];
+    }
+
+    /**
+     * Not used.
+     */
+    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = [], &$failedRecipients = null, &$stop = false)
+    {
+    }
+
+    /**
+     * Returns +1, -1 or 0 according to the rules for usort().
+     *
+     * This method is called to ensure extensions can be execute in an appropriate order.
+     *
+     * @param string $esmtpKeyword to compare with
+     *
+     * @return int
+     */
+    public function getPriorityOver($esmtpKeyword)
+    {
+        return 0;
+    }
+
+    /**
+     * Not used.
+     */
+    public function exposeMixinMethods()
+    {
+        return [];
+    }
+
+    /**
+     * Not used.
+     */
+    public function resetState()
+    {
+    }
+}
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
index c17ef8fe..b8ea36e2 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
@@ -18,7 +18,7 @@ interface Swift_Transport_EsmtpHandler
     /**
      * Get the name of the ESMTP extension this handles.
      *
-     * @return bool
+     * @return string
      */
     public function getHandledKeyword();
 
@@ -59,7 +59,7 @@ interface Swift_Transport_EsmtpHandler
      * @param string[]                  $failedRecipients to collect failures
      * @param bool                      $stop             to be set true  by-reference if the command is now sent
      */
-    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = array(), &$failedRecipients = null, &$stop = false);
+    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = [], &$failedRecipients = null, &$stop = false);
 
     /**
      * Returns +1, -1 or 0 according to the rules for usort().
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
index 7eb7ef33..d1f1c2cf 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
@@ -20,21 +20,21 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      *
      * @var Swift_Transport_EsmtpHandler[]
      */
-    private $handlers = array();
+    private $handlers = [];
 
     /**
      * ESMTP capabilities.
      *
      * @var string[]
      */
-    private $capabilities = array();
+    private $capabilities = [];
 
     /**
      * Connection buffer parameters.
      *
      * @var array
      */
-    private $params = array(
+    private $params = [
         'protocol' => 'tcp',
         'host' => 'localhost',
         'port' => 25,
@@ -42,26 +42,26 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
         'blocking' => 1,
         'tls' => false,
         'type' => Swift_Transport_IoBuffer::TYPE_SOCKET,
-        'stream_context_options' => array(),
-        );
+        'stream_context_options' => [],
+        ];
 
     /**
      * Creates a new EsmtpTransport using the given I/O buffer.
      *
-     * @param Swift_Transport_IoBuffer       $buf
      * @param Swift_Transport_EsmtpHandler[] $extensionHandlers
-     * @param Swift_Events_EventDispatcher   $dispatcher
      * @param string                         $localDomain
      */
-    public function __construct(Swift_Transport_IoBuffer $buf, array $extensionHandlers, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1')
+    public function __construct(Swift_Transport_IoBuffer $buf, array $extensionHandlers, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1', Swift_AddressEncoder $addressEncoder = null)
     {
-        parent::__construct($buf, $dispatcher, $localDomain);
+        parent::__construct($buf, $dispatcher, $localDomain, $addressEncoder);
         $this->setExtensionHandlers($extensionHandlers);
     }
 
     /**
      * Set the host to connect to.
      *
+     * Literal IPv6 addresses should be wrapped in square brackets.
+     *
      * @param string $host
      *
      * @return $this
@@ -190,6 +190,8 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
     /**
      * Sets the source IP.
      *
+     * IPv6 addresses should be wrapped in square brackets.
+     *
      * @param string $source
      *
      * @return $this
@@ -211,6 +213,35 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
         return $this->params['sourceIp'] ?? null;
     }
 
+    /**
+     * Sets whether SMTP pipelining is enabled.
+     *
+     * By default, support is auto-detected using the PIPELINING SMTP extension.
+     * Use this function to override that in the unlikely event of compatibility
+     * issues.
+     *
+     * @param bool $enabled
+     *
+     * @return $this
+     */
+    public function setPipelining($enabled)
+    {
+        $this->pipelining = $enabled;
+
+        return $this;
+    }
+
+    /**
+     * Returns whether SMTP pipelining is enabled.
+     *
+     * @return bool|null a boolean if pipelining is explicitly enabled or disabled,
+     *                   or null if support is auto-detected.
+     */
+    public function getPipelining()
+    {
+        return $this->pipelining;
+    }
+
     /**
      * Set ESMTP extension handlers.
      *
@@ -220,7 +251,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function setExtensionHandlers(array $handlers)
     {
-        $assoc = array();
+        $assoc = [];
         foreach ($handlers as $handler) {
             $assoc[$handler->getHandledKeyword()] = $handler;
         }
@@ -252,10 +283,12 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      * @param string   $command
      * @param int[]    $codes
      * @param string[] $failures An array of failures by-reference
+     * @param bool     $pipeline Do not wait for response
+     * @param string   $address  The address, if command is RCPT TO.
      *
-     * @return string
+     * @return string|null The server response, or null if pipelining is enabled
      */
-    public function executeCommand($command, $codes = array(), &$failures = null)
+    public function executeCommand($command, $codes = [], &$failures = null, $pipeline = false, $address = null)
     {
         $failures = (array) $failures;
         $stopSignal = false;
@@ -269,7 +302,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
             }
         }
 
-        return parent::executeCommand($command, $codes, $failures);
+        return parent::executeCommand($command, $codes, $failures, $pipeline, $address);
     }
 
     /** Mixin handling method for ESMTP handlers */
@@ -279,9 +312,9 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
             if (in_array(strtolower($method),
                 array_map('strtolower', (array) $handler->exposeMixinMethods())
                 )) {
-                $return = call_user_func_array(array($handler, $method), $args);
+                $return = call_user_func_array([$handler, $method], $args);
                 // Allow fluid method calls
-                if (null === $return && substr($method, 0, 3) == 'set') {
+                if (null === $return && 'set' == substr($method, 0, 3)) {
                     return $this;
                 } else {
                     return $return;
@@ -302,7 +335,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
     {
         try {
             $response = $this->executeCommand(
-                sprintf("EHLO %s\r\n", $this->domain), array(250)
+                sprintf("EHLO %s\r\n", $this->domain), [250]
                 );
         } catch (Swift_TransportException $e) {
             return parent::doHeloCommand();
@@ -310,7 +343,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
 
         if ($this->params['tls']) {
             try {
-                $this->executeCommand("STARTTLS\r\n", array(220));
+                $this->executeCommand("STARTTLS\r\n", [220]);
 
                 if (!$this->buffer->startTLS()) {
                     throw new Swift_TransportException('Unable to connect with TLS encryption');
@@ -318,7 +351,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
 
                 try {
                     $response = $this->executeCommand(
-                        sprintf("EHLO %s\r\n", $this->domain), array(250)
+                        sprintf("EHLO %s\r\n", $this->domain), [250]
                         );
                 } catch (Swift_TransportException $e) {
                     return parent::doHeloCommand();
@@ -329,6 +362,10 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
         }
 
         $this->capabilities = $this->getCapabilities($response);
+        if (!isset($this->pipelining)) {
+            $this->pipelining = isset($this->capabilities['PIPELINING']);
+        }
+
         $this->setHandlerParams();
         foreach ($this->getActiveHandlers() as $handler) {
             $handler->afterEhlo($this);
@@ -338,35 +375,37 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
     /** Overridden to add Extension support */
     protected function doMailFromCommand($address)
     {
+        $address = $this->addressEncoder->encodeString($address);
         $handlers = $this->getActiveHandlers();
-        $params = array();
+        $params = [];
         foreach ($handlers as $handler) {
             $params = array_merge($params, (array) $handler->getMailParams());
         }
         $paramStr = !empty($params) ? ' '.implode(' ', $params) : '';
         $this->executeCommand(
-            sprintf("MAIL FROM:<%s>%s\r\n", $address, $paramStr), array(250)
+            sprintf("MAIL FROM:<%s>%s\r\n", $address, $paramStr), [250], $failures, true
             );
     }
 
     /** Overridden to add Extension support */
     protected function doRcptToCommand($address)
     {
+        $address = $this->addressEncoder->encodeString($address);
         $handlers = $this->getActiveHandlers();
-        $params = array();
+        $params = [];
         foreach ($handlers as $handler) {
             $params = array_merge($params, (array) $handler->getRcptParams());
         }
         $paramStr = !empty($params) ? ' '.implode(' ', $params) : '';
         $this->executeCommand(
-            sprintf("RCPT TO:<%s>%s\r\n", $address, $paramStr), array(250, 251, 252)
+            sprintf("RCPT TO:<%s>%s\r\n", $address, $paramStr), [250, 251, 252], $failures, true, $address
             );
     }
 
     /** Determine ESMTP capabilities by function group */
     private function getCapabilities($ehloResponse)
     {
-        $capabilities = array();
+        $capabilities = [];
         $ehloResponse = trim($ehloResponse);
         $lines = explode("\r\n", $ehloResponse);
         array_shift($lines);
@@ -374,7 +413,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
             if (preg_match('/^[0-9]{3}[ -]([A-Z0-9-]+)((?:[ =].*)?)$/Di', $line, $matches)) {
                 $keyword = strtoupper($matches[1]);
                 $paramStr = strtoupper(ltrim($matches[2], ' ='));
-                $params = !empty($paramStr) ? explode(' ', $paramStr) : array();
+                $params = !empty($paramStr) ? explode(' ', $paramStr) : [];
                 $capabilities[$keyword] = $params;
             }
         }
@@ -395,7 +434,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
     /** Get ESMTP handlers which are currently ok to use */
     private function getActiveHandlers()
     {
-        $handlers = array();
+        $handlers = [];
         foreach ($this->handlers as $keyword => $handler) {
             if (array_key_exists($keyword, $this->capabilities)) {
                 $handlers[] = $handler;
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
index 94151f89..21bce4b6 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
@@ -52,8 +52,7 @@ class Swift_Transport_FailoverTransport extends Swift_Transport_LoadBalancedTran
      * Recipient/sender data will be retrieved from the Message API.
      * The return value is the number of recipients who were accepted for delivery.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
@@ -80,7 +79,7 @@ class Swift_Transport_FailoverTransport extends Swift_Transport_LoadBalancedTran
             }
         }
 
-        if (count($this->transports) == 0) {
+        if (0 == count($this->transports)) {
             throw new Swift_TransportException(
                 'All Transports in FailoverTransport failed, or no Transports available'
                 );
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
index dc6a2149..a12ce8d2 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
@@ -20,14 +20,14 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      *
      * @var Swift_Transport[]
      */
-    private $deadTransports = array();
+    private $deadTransports = [];
 
     /**
      * The Transports which are used in rotation.
      *
      * @var Swift_Transport[]
      */
-    protected $transports = array();
+    protected $transports = [];
 
     /**
      * The Transport used in the last successful send operation.
@@ -49,7 +49,7 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
     public function setTransports(array $transports)
     {
         $this->transports = $transports;
-        $this->deadTransports = array();
+        $this->deadTransports = [];
     }
 
     /**
@@ -120,8 +120,7 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      * Recipient/sender data will be retrieved from the Message API.
      * The return value is the number of recipients who were accepted for delivery.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
@@ -146,7 +145,7 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
             }
         }
 
-        if (count($this->transports) == 0) {
+        if (0 == count($this->transports)) {
             throw new Swift_TransportException(
                 'All Transports in LoadBalancedTransport failed, or no Transports available'
                 );
@@ -157,8 +156,6 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
 
     /**
      * Register a plugin.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/NullTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
index dc38078c..5934ca93 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
@@ -61,8 +61,7 @@ class Swift_Transport_NullTransport implements Swift_Transport
     /**
      * Sends the given message.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int The number of sent emails
      */
@@ -91,8 +90,6 @@ class Swift_Transport_NullTransport implements Swift_Transport
 
     /**
      * Register a plugin.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
index 80753850..7f0476ad 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
@@ -24,23 +24,21 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
      *
      * @var array
      */
-    private $params = array(
+    private $params = [
         'timeout' => 30,
         'blocking' => 1,
         'command' => '/usr/sbin/sendmail -bs',
         'type' => Swift_Transport_IoBuffer::TYPE_PROCESS,
-        );
+        ];
 
     /**
      * Create a new SendmailTransport with $buf for I/O.
      *
-     * @param Swift_Transport_IoBuffer     $buf
-     * @param Swift_Events_EventDispatcher $dispatcher
-     * @param string                       $localDomain
+     * @param string $localDomain
      */
-    public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1')
+    public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1', Swift_AddressEncoder $addressEncoder = null)
     {
-        parent::__construct($buf, $dispatcher, $localDomain);
+        parent::__construct($buf, $dispatcher, $localDomain, $addressEncoder);
     }
 
     /**
@@ -93,8 +91,7 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
      * NOTE: If using 'sendmail -t' you will not be aware of any failures until
      * they bounce (i.e. send() will always return 100% success).
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
@@ -117,12 +114,12 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
                 $command .= ' -f'.escapeshellarg($this->getReversePath($message));
             }
 
-            $buffer->initialize(array_merge($this->params, array('command' => $command)));
+            $buffer->initialize(array_merge($this->params, ['command' => $command]));
 
             if (false === strpos($command, ' -i') && false === strpos($command, ' -oi')) {
-                $buffer->setWriteTranslations(array("\r\n" => "\n", "\n." => "\n.."));
+                $buffer->setWriteTranslations(["\r\n" => "\n", "\n." => "\n.."]);
             } else {
-                $buffer->setWriteTranslations(array("\r\n" => "\n"));
+                $buffer->setWriteTranslations(["\r\n" => "\n"]);
             }
 
             $count = count((array) $message->getTo())
@@ -131,7 +128,7 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
                 ;
             $message->toByteStream($buffer);
             $buffer->flushBuffers();
-            $buffer->setWriteTranslations(array());
+            $buffer->setWriteTranslations([]);
             $buffer->terminate();
 
             if ($evt) {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
index 90e913f8..e8ce65c2 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
@@ -32,5 +32,5 @@ interface Swift_Transport_SmtpAgent
      * @param int[]    $codes
      * @param string[] $failures An array of failures by-reference
      */
-    public function executeCommand($command, $codes = array(), &$failures = null);
+    public function executeCommand($command, $codes = [], &$failures = null);
 }
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
index 9a1d0711..0cb6a5b8 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
@@ -33,8 +33,6 @@ class Swift_Transport_SpoolTransport implements Swift_Transport
     /**
      * Sets the spool object.
      *
-     * @param Swift_Spool $spool
-     *
      * @return $this
      */
     public function setSpool(Swift_Spool $spool)
@@ -89,8 +87,7 @@ class Swift_Transport_SpoolTransport implements Swift_Transport
     /**
      * Sends the given message.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int The number of sent e-mail's
      */
@@ -115,8 +112,6 @@ class Swift_Transport_SpoolTransport implements Swift_Transport
 
     /**
      * Register a plugin.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
index bc6ed5a3..ab17f5c9 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
@@ -25,18 +25,16 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
     private $out;
 
     /** Buffer initialization parameters */
-    private $params = array();
+    private $params = [];
 
     /** The ReplacementFilterFactory */
     private $replacementFactory;
 
     /** Translations performed on data being streamed into the buffer */
-    private $translations = array();
+    private $translations = [];
 
     /**
      * Create a new StreamBuffer using $replacementFactory for transformations.
-     *
-     * @param Swift_ReplacementFilterFactory $replacementFactory
      */
     public function __construct(Swift_ReplacementFilterFactory $replacementFactory)
     {
@@ -47,8 +45,6 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
      * Perform any initialization needed, using the given $params.
      *
      * Parameters will vary depending upon the type of IoBuffer used.
-     *
-     * @param array $params
      */
     public function initialize(array $params)
     {
@@ -91,7 +87,11 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
 
     public function startTLS()
     {
-        return stream_socket_enable_crypto($this->stream, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
+        // STREAM_CRYPTO_METHOD_TLS_CLIENT only allow tls1.0 connections (some php versions)
+        // To support modern tls we allow explicit tls1.0, tls1.1, tls1.2
+        // Ssl3 and older are not allowed because they are vulnerable
+        // @TODO make tls arguments configurable
+        return stream_socket_enable_crypto($this->stream, true, STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT);
     }
 
     /**
@@ -160,7 +160,7 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
     {
         if (isset($this->out) && !feof($this->out)) {
             $line = fgets($this->out);
-            if (strlen($line) == 0) {
+            if (0 == strlen($line)) {
                 $metas = stream_get_meta_data($this->out);
                 if ($metas['timed_out']) {
                     throw new Swift_IoException(
@@ -192,7 +192,7 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
     {
         if (isset($this->out) && !feof($this->out)) {
             $ret = fread($this->out, $length);
-            if (strlen($ret) == 0) {
+            if (0 == strlen($ret)) {
                 $metas = stream_get_meta_data($this->out);
                 if ($metas['timed_out']) {
                     throw new Swift_IoException(
@@ -255,7 +255,7 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
         if (!empty($this->params['timeout'])) {
             $timeout = $this->params['timeout'];
         }
-        $options = array();
+        $options = [];
         if (!empty($this->params['sourceIp'])) {
             $options['socket']['bindto'] = $this->params['sourceIp'].':0';
         }
@@ -287,12 +287,12 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
     private function establishProcessConnection()
     {
         $command = $this->params['command'];
-        $descriptorSpec = array(
-            0 => array('pipe', 'r'),
-            1 => array('pipe', 'w'),
-            2 => array('pipe', 'w'),
-            );
-        $pipes = array();
+        $descriptorSpec = [
+            0 => ['pipe', 'r'],
+            1 => ['pipe', 'w'],
+            2 => ['pipe', 'w'],
+            ];
+        $pipes = [];
         $this->stream = proc_open($command, $descriptorSpec, $pipes);
         stream_set_blocking($pipes[2], 0);
         if ($err = stream_get_contents($pipes[2])) {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/TransportException.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/TransportException.php
index 4ae2412e..c7417455 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/TransportException.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/TransportException.php
@@ -18,9 +18,8 @@ class Swift_TransportException extends Swift_IoException
     /**
      * Create a new TransportException with $message.
      *
-     * @param string    $message
-     * @param int       $code
-     * @param Exception $previous
+     * @param string $message
+     * @param int    $code
      */
     public function __construct($message, $code = 0, Exception $previous = null)
     {
diff --git a/vendor/swiftmailer/swiftmailer/lib/dependency_maps/cache_deps.php b/vendor/swiftmailer/swiftmailer/lib/dependency_maps/cache_deps.php
index 6023448e..9d94d774 100644
--- a/vendor/swiftmailer/swiftmailer/lib/dependency_maps/cache_deps.php
+++ b/vendor/swiftmailer/swiftmailer/lib/dependency_maps/cache_deps.php
@@ -12,11 +12,11 @@ Swift_DependencyContainer::getInstance()
 
     ->register('cache.array')
     ->asSharedInstanceOf('Swift_KeyCache_ArrayKeyCache')
-    ->withDependencies(array('cache.inputstream'))
+    ->withDependencies(['cache.inputstream'])
 
     ->register('cache.disk')
     ->asSharedInstanceOf('Swift_KeyCache_DiskKeyCache')
-    ->withDependencies(array('cache.inputstream', 'tempdir'))
+    ->withDependencies(['cache.inputstream', 'tempdir'])
 
     ->register('cache.inputstream')
     ->asNewInstanceOf('Swift_KeyCache_SimpleKeyCacheInputStream')
diff --git a/vendor/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php b/vendor/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php
index 4ce9c7cb..307756c8 100644
--- a/vendor/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php
+++ b/vendor/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php
@@ -13,101 +13,105 @@ Swift_DependencyContainer::getInstance()
     // As SERVER_NAME can come from the user in certain configurations, check that
     // it does not contain forbidden characters (see RFC 952 and RFC 2181). Use
     // preg_replace() instead of preg_match() to prevent DoS attacks with long host names.
-    ->asValue(!empty($_SERVER['SERVER_NAME']) && preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $_SERVER['SERVER_NAME']) === '' ? $_SERVER['SERVER_NAME'] : 'swift.generated')
+    ->asValue(!empty($_SERVER['SERVER_NAME']) && '' === preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'swift.generated')
 
     ->register('mime.idgenerator')
     ->asSharedInstanceOf('Swift_Mime_IdGenerator')
-    ->withDependencies(array(
+    ->withDependencies([
         'mime.idgenerator.idright',
-    ))
+    ])
 
     ->register('mime.message')
     ->asNewInstanceOf('Swift_Mime_SimpleMessage')
-    ->withDependencies(array(
+    ->withDependencies([
         'mime.headerset',
-        'mime.qpcontentencoder',
+        'mime.textcontentencoder',
         'cache',
         'mime.idgenerator',
         'properties.charset',
-    ))
+    ])
 
     ->register('mime.part')
     ->asNewInstanceOf('Swift_Mime_MimePart')
-    ->withDependencies(array(
+    ->withDependencies([
         'mime.headerset',
-        'mime.qpcontentencoder',
+        'mime.textcontentencoder',
         'cache',
         'mime.idgenerator',
         'properties.charset',
-    ))
+    ])
 
     ->register('mime.attachment')
     ->asNewInstanceOf('Swift_Mime_Attachment')
-    ->withDependencies(array(
+    ->withDependencies([
         'mime.headerset',
         'mime.base64contentencoder',
         'cache',
         'mime.idgenerator',
-    ))
+    ])
     ->addConstructorValue($swift_mime_types)
 
     ->register('mime.embeddedfile')
     ->asNewInstanceOf('Swift_Mime_EmbeddedFile')
-    ->withDependencies(array(
+    ->withDependencies([
         'mime.headerset',
         'mime.base64contentencoder',
         'cache',
         'mime.idgenerator',
-    ))
+    ])
     ->addConstructorValue($swift_mime_types)
 
     ->register('mime.headerfactory')
     ->asNewInstanceOf('Swift_Mime_SimpleHeaderFactory')
-    ->withDependencies(array(
-            'mime.qpheaderencoder',
-            'mime.rfc2231encoder',
-            'email.validator',
-            'properties.charset',
-        ))
+    ->withDependencies([
+        'mime.qpheaderencoder',
+        'mime.rfc2231encoder',
+        'email.validator',
+        'properties.charset',
+        'address.idnaddressencoder',
+    ])
 
     ->register('mime.headerset')
     ->asNewInstanceOf('Swift_Mime_SimpleHeaderSet')
-    ->withDependencies(array('mime.headerfactory', 'properties.charset'))
+    ->withDependencies(['mime.headerfactory', 'properties.charset'])
 
     ->register('mime.qpheaderencoder')
     ->asNewInstanceOf('Swift_Mime_HeaderEncoder_QpHeaderEncoder')
-    ->withDependencies(array('mime.charstream'))
+    ->withDependencies(['mime.charstream'])
 
     ->register('mime.base64headerencoder')
     ->asNewInstanceOf('Swift_Mime_HeaderEncoder_Base64HeaderEncoder')
-    ->withDependencies(array('mime.charstream'))
+    ->withDependencies(['mime.charstream'])
 
     ->register('mime.charstream')
     ->asNewInstanceOf('Swift_CharacterStream_NgCharacterStream')
-    ->withDependencies(array('mime.characterreaderfactory', 'properties.charset'))
+    ->withDependencies(['mime.characterreaderfactory', 'properties.charset'])
 
     ->register('mime.bytecanonicalizer')
     ->asSharedInstanceOf('Swift_StreamFilters_ByteArrayReplacementFilter')
-    ->addConstructorValue(array(array(0x0D, 0x0A), array(0x0D), array(0x0A)))
-    ->addConstructorValue(array(array(0x0A), array(0x0A), array(0x0D, 0x0A)))
+    ->addConstructorValue([[0x0D, 0x0A], [0x0D], [0x0A]])
+    ->addConstructorValue([[0x0A], [0x0A], [0x0D, 0x0A]])
 
     ->register('mime.characterreaderfactory')
     ->asSharedInstanceOf('Swift_CharacterReaderFactory_SimpleCharacterReaderFactory')
 
+    ->register('mime.textcontentencoder')
+    ->asAliasOf('mime.qpcontentencoder')
+
     ->register('mime.safeqpcontentencoder')
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoder')
-    ->withDependencies(array('mime.charstream', 'mime.bytecanonicalizer'))
+    ->withDependencies(['mime.charstream', 'mime.bytecanonicalizer'])
 
     ->register('mime.rawcontentencoder')
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_RawContentEncoder')
 
     ->register('mime.nativeqpcontentencoder')
-    ->withDependencies(array('properties.charset'))
+    ->withDependencies(['properties.charset'])
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_NativeQpContentEncoder')
 
     ->register('mime.qpcontentencoder')
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoderProxy')
-    ->withDependencies(array('mime.safeqpcontentencoder', 'mime.nativeqpcontentencoder', 'properties.charset'))
+    ->withDependencies(['mime.safeqpcontentencoder', 'mime.nativeqpcontentencoder', 'properties.charset'])
 
     ->register('mime.7bitcontentencoder')
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_PlainContentEncoder')
@@ -124,7 +128,7 @@ Swift_DependencyContainer::getInstance()
 
     ->register('mime.rfc2231encoder')
     ->asNewInstanceOf('Swift_Encoder_Rfc2231Encoder')
-    ->withDependencies(array('mime.charstream'))
+    ->withDependencies(['mime.charstream'])
 ;
 
 unset($swift_mime_types);
diff --git a/vendor/swiftmailer/swiftmailer/lib/dependency_maps/transport_deps.php b/vendor/swiftmailer/swiftmailer/lib/dependency_maps/transport_deps.php
index 15772abb..34a63c78 100644
--- a/vendor/swiftmailer/swiftmailer/lib/dependency_maps/transport_deps.php
+++ b/vendor/swiftmailer/swiftmailer/lib/dependency_maps/transport_deps.php
@@ -5,24 +5,25 @@ Swift_DependencyContainer::getInstance()
     // As SERVER_NAME can come from the user in certain configurations, check that
     // it does not contain forbidden characters (see RFC 952 and RFC 2181). Use
     // preg_replace() instead of preg_match() to prevent DoS attacks with long host names.
-    ->asValue(!empty($_SERVER['SERVER_NAME']) && preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $_SERVER['SERVER_NAME']) === '' ? trim($_SERVER['SERVER_NAME'], '[]') : '127.0.0.1')
+    ->asValue(!empty($_SERVER['SERVER_NAME']) && '' === preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $_SERVER['SERVER_NAME']) ? trim($_SERVER['SERVER_NAME'], '[]') : '127.0.0.1')
 
     ->register('transport.smtp')
     ->asNewInstanceOf('Swift_Transport_EsmtpTransport')
-    ->withDependencies(array(
+    ->withDependencies([
         'transport.buffer',
-        array('transport.authhandler'),
+        'transport.smtphandlers',
         'transport.eventdispatcher',
         'transport.localdomain',
-    ))
+        'address.idnaddressencoder',
+    ])
 
     ->register('transport.sendmail')
     ->asNewInstanceOf('Swift_Transport_SendmailTransport')
-    ->withDependencies(array(
+    ->withDependencies([
         'transport.buffer',
         'transport.eventdispatcher',
         'transport.localdomain',
-    ))
+    ])
 
     ->register('transport.loadbalanced')
     ->asNewInstanceOf('Swift_Transport_LoadBalancedTransport')
@@ -32,27 +33,40 @@ Swift_DependencyContainer::getInstance()
 
     ->register('transport.spool')
     ->asNewInstanceOf('Swift_Transport_SpoolTransport')
-    ->withDependencies(array('transport.eventdispatcher'))
+    ->withDependencies(['transport.eventdispatcher'])
 
     ->register('transport.null')
     ->asNewInstanceOf('Swift_Transport_NullTransport')
-    ->withDependencies(array('transport.eventdispatcher'))
+    ->withDependencies(['transport.eventdispatcher'])
 
     ->register('transport.buffer')
     ->asNewInstanceOf('Swift_Transport_StreamBuffer')
-    ->withDependencies(array('transport.replacementfactory'))
+    ->withDependencies(['transport.replacementfactory'])
+
+    ->register('transport.smtphandlers')
+    ->asArray()
+    ->withDependencies(['transport.authhandler'])
 
     ->register('transport.authhandler')
     ->asNewInstanceOf('Swift_Transport_Esmtp_AuthHandler')
-    ->withDependencies(array(
-        array(
-            'transport.crammd5auth',
-            'transport.loginauth',
-            'transport.plainauth',
-            'transport.ntlmauth',
-            'transport.xoauth2auth',
-        ),
-    ))
+    ->withDependencies(['transport.authhandlers'])
+
+    ->register('transport.authhandlers')
+    ->asArray()
+    ->withDependencies([
+        'transport.crammd5auth',
+        'transport.loginauth',
+        'transport.plainauth',
+        'transport.ntlmauth',
+        'transport.xoauth2auth',
+    ])
+
+    ->register('transport.smtputf8handler')
+    ->asNewInstanceOf('Swift_Transport_Esmtp_SmtpUtf8Handler')
+
+    ->register('transport.8bitmimehandler')
+    ->asNewInstanceOf('Swift_Transport_Esmtp_EightBitMimeHandler')
+    ->addConstructorValue('8BITMIME')
 
     ->register('transport.crammd5auth')
     ->asNewInstanceOf('Swift_Transport_Esmtp_Auth_CramMd5Authenticator')
@@ -74,4 +88,10 @@ Swift_DependencyContainer::getInstance()
 
     ->register('transport.replacementfactory')
     ->asSharedInstanceOf('Swift_StreamFilters_StringReplacementFilterFactory')
+
+    ->register('address.idnaddressencoder')
+    ->asNewInstanceOf('Swift_AddressEncoder_IdnAddressEncoder')
+
+    ->register('address.utf8addressencoder')
+    ->asNewInstanceOf('Swift_AddressEncoder_Utf8AddressEncoder')
 ;
diff --git a/vendor/swiftmailer/swiftmailer/lib/mime_types.php b/vendor/swiftmailer/swiftmailer/lib/mime_types.php
index b42c1cc1..72c6fd2a 100644
--- a/vendor/swiftmailer/swiftmailer/lib/mime_types.php
+++ b/vendor/swiftmailer/swiftmailer/lib/mime_types.php
@@ -17,7 +17,7 @@
 
 // You may add or take away what you like (lowercase required)
 
-$swift_mime_types = array(
+$swift_mime_types = [
     '3dml' => 'text/vnd.in3d.3dml',
     '3ds' => 'image/x-3ds',
     '3g2' => 'video/3gpp2',
@@ -1004,4 +1004,4 @@ $swift_mime_types = array(
     'zirz' => 'application/vnd.zul',
     'zmm' => 'application/vnd.handheld-entertainment+xml',
     '123' => 'application/vnd.lotus-1-2-3',
-);
+];
diff --git a/vendor/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php b/vendor/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php
index 85f2d69f..7120db16 100755
--- a/vendor/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php
+++ b/vendor/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php
@@ -25,12 +25,12 @@ function generateUpToDateMimeArray()
     $mime_xml = @file_get_contents(FREEDESKTOP_XML_URL);
 
     // prepare valid mime types
-    $valid_mime_types = array();
+    $valid_mime_types = [];
 
     // split mime type and extensions eg. "video/x-matroska        mkv mk3d mks"
-    if (preg_match_all('/^#?([a-z0-9\-\+\/\.]+)[\t]+(.*)$/miu', $mime_types, $matches) !== false) {
+    if (false !== preg_match_all('/^#?([a-z0-9\-\+\/\.]+)[\t]+(.*)$/miu', $mime_types, $matches)) {
         // collection of predefined mimetypes (bugfix for wrong resolved or missing mime types)
-        $valid_mime_types_preset = array(
+        $valid_mime_types_preset = [
             'php' => 'application/x-php',
             'php3' => 'application/x-php',
             'php4' => 'application/x-php',
@@ -95,7 +95,7 @@ function generateUpToDateMimeArray()
             'xls' => 'application/vnd.ms-excel',
             'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
             'xml' => 'application/xml',
-        );
+        ];
 
         // wrap array for generating file
         foreach ($valid_mime_types_preset as $extension => $mime_type) {
@@ -103,9 +103,6 @@ function generateUpToDateMimeArray()
             $valid_mime_types[$extension] = "'{$extension}' => '{$mime_type}'";
         }
 
-        // collect extensions
-        $valid_extensions = array();
-
         // all extensions from second match
         foreach ($matches[2] as $i => $extensions) {
             // explode multiple extensions from string
@@ -113,7 +110,7 @@ function generateUpToDateMimeArray()
 
             // force array for foreach
             if (!is_array($extensions)) {
-                $extensions = array($extensions);
+                $extensions = [$extensions];
             }
 
             foreach ($extensions as $extension) {
@@ -122,9 +119,6 @@ function generateUpToDateMimeArray()
 
                 // check if string length lower than 10
                 if (strlen($extension) < 10) {
-                    // add extension
-                    $valid_extensions[] = $extension;
-
                     if (!isset($valid_mime_types[$mime_type])) {
                         // generate array for mimetype to extension resolver (only first match)
                         $valid_mime_types[$extension] = "'{$extension}' => '{$mime_type}'";
@@ -145,18 +139,13 @@ function generateUpToDateMimeArray()
         // get all matching extensions from match
         foreach ((array) $node->glob['pattern'] as $extension) {
             // skip none glob extensions
-            if (strpos($extension, '.') === false) {
+            if (false === strpos($extension, '.')) {
                 continue;
             }
 
             // remove get only last part
             $extension = explode('.', strtolower($extension));
             $extension = end($extension);
-
-            // maximum length in database column
-            if (strlen($extension) <= 9) {
-                $valid_extensions[] = $extension;
-            }
         }
 
         if (isset($node->glob['pattern'][0])) {
@@ -167,7 +156,7 @@ function generateUpToDateMimeArray()
             $extension = strtolower(trim($node->glob['ddpattern'][0], '*.'));
 
             // skip none glob extensions and check if string length between 1 and 10
-            if (strpos($extension, '.') !== false || strlen($extension) < 1 || strlen($extension) > 9) {
+            if (false !== strpos($extension, '.') || strlen($extension) < 1 || strlen($extension) > 9) {
                 continue;
             }
 
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/ByteStream/FileByteStreamAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/ByteStream/FileByteStreamAcceptanceTest.php
index bc458e99..8695b6e2 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/ByteStream/FileByteStreamAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/ByteStream/FileByteStreamAcceptanceTest.php
@@ -58,7 +58,7 @@ class Swift_ByteStream_FileByteStreamAcceptanceTest extends \PHPUnit\Framework\T
     public function testWritingToFileWithCanonicalization()
     {
         $file = $this->createFileStream($this->testFile, true);
-        $file->addFilter($this->createFilter(array("\r\n", "\r"), "\n"), 'allToLF');
+        $file->addFilter($this->createFilter(["\r\n", "\r"], "\n"), 'allToLF');
         $file->write("foo\r\nbar\r");
         $file->write("\nzip\r\ntest\r");
         $file->flushBuffers();
@@ -68,7 +68,7 @@ class Swift_ByteStream_FileByteStreamAcceptanceTest extends \PHPUnit\Framework\T
     public function testWritingWithFulleMessageLengthOfAMultipleOf8192()
     {
         $file = $this->createFileStream($this->testFile, true);
-        $file->addFilter($this->createFilter(array("\r\n", "\r"), "\n"), 'allToLF');
+        $file->addFilter($this->createFilter(["\r\n", "\r"], "\n"), 'allToLF');
         $file->write('');
         $file->flushBuffers();
         $this->assertEquals('', file_get_contents($this->testFile));
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/CharacterReaderFactory/SimpleCharacterReaderFactoryAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/CharacterReaderFactory/SimpleCharacterReaderFactoryAcceptanceTest.php
index 6b3c48e8..fcc7ad4d 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/CharacterReaderFactory/SimpleCharacterReaderFactoryAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/CharacterReaderFactory/SimpleCharacterReaderFactoryAcceptanceTest.php
@@ -12,7 +12,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
 
     public function testCreatingUtf8Reader()
     {
-        foreach (array('utf8', 'utf-8', 'UTF-8', 'UTF8') as $utf8) {
+        foreach (['utf8', 'utf-8', 'UTF-8', 'UTF8'] as $utf8) {
             $reader = $this->factory->getReaderFor($utf8);
             $this->assertInstanceOf($this->prefix.'Utf8Reader', $reader);
         }
@@ -20,9 +20,9 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
 
     public function testCreatingIso8859XReaders()
     {
-        $charsets = array();
+        $charsets = [];
         foreach (range(1, 16) as $number) {
-            foreach (array('iso', 'iec') as $body) {
+            foreach (['iso', 'iec'] as $body) {
                 $charsets[] = $body.'-8859-'.$number;
                 $charsets[] = $body.'8859-'.$number;
                 $charsets[] = strtoupper($body).'-8859-'.$number;
@@ -39,7 +39,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
 
     public function testCreatingWindows125XReaders()
     {
-        $charsets = array();
+        $charsets = [];
         foreach (range(0, 8) as $number) {
             $charsets[] = 'windows-125'.$number;
             $charsets[] = 'windows125'.$number;
@@ -56,7 +56,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
 
     public function testCreatingCodePageReaders()
     {
-        $charsets = array();
+        $charsets = [];
         foreach (range(0, 8) as $number) {
             $charsets[] = 'cp-125'.$number;
             $charsets[] = 'cp125'.$number;
@@ -64,8 +64,8 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
             $charsets[] = 'CP125'.$number;
         }
 
-        foreach (array(437, 737, 850, 855, 857, 858, 860,
-            861, 863, 865, 866, 869, ) as $number) {
+        foreach ([437, 737, 850, 855, 857, 858, 860,
+            861, 863, 865, 866, 869, ] as $number) {
             $charsets[] = 'cp-'.$number;
             $charsets[] = 'cp'.$number;
             $charsets[] = 'CP-'.$number;
@@ -81,7 +81,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
 
     public function testCreatingAnsiReader()
     {
-        foreach (array('ansi', 'ANSI') as $ansi) {
+        foreach (['ansi', 'ANSI'] as $ansi) {
             $reader = $this->factory->getReaderFor($ansi);
             $this->assertInstanceOf($this->prefix.'GenericFixedWidthReader', $reader);
             $this->assertEquals(1, $reader->getInitialByteSize());
@@ -90,7 +90,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
 
     public function testCreatingMacintoshReader()
     {
-        foreach (array('macintosh', 'MACINTOSH') as $mac) {
+        foreach (['macintosh', 'MACINTOSH'] as $mac) {
             $reader = $this->factory->getReaderFor($mac);
             $this->assertInstanceOf($this->prefix.'GenericFixedWidthReader', $reader);
             $this->assertEquals(1, $reader->getInitialByteSize());
@@ -99,8 +99,8 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
 
     public function testCreatingKOIReaders()
     {
-        $charsets = array();
-        foreach (array('7', '8-r', '8-u', '8u', '8r') as $end) {
+        $charsets = [];
+        foreach (['7', '8-r', '8-u', '8u', '8r'] as $end) {
             $charsets[] = 'koi-'.$end;
             $charsets[] = 'koi'.$end;
             $charsets[] = 'KOI-'.$end;
@@ -116,7 +116,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
 
     public function testCreatingIsciiReaders()
     {
-        foreach (array('iscii', 'ISCII', 'viscii', 'VISCII') as $charset) {
+        foreach (['iscii', 'ISCII', 'viscii', 'VISCII'] as $charset) {
             $reader = $this->factory->getReaderFor($charset);
             $this->assertInstanceOf($this->prefix.'GenericFixedWidthReader', $reader);
             $this->assertEquals(1, $reader->getInitialByteSize());
@@ -125,7 +125,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
 
     public function testCreatingMIKReader()
     {
-        foreach (array('mik', 'MIK') as $charset) {
+        foreach (['mik', 'MIK'] as $charset) {
             $reader = $this->factory->getReaderFor($charset);
             $this->assertInstanceOf($this->prefix.'GenericFixedWidthReader', $reader);
             $this->assertEquals(1, $reader->getInitialByteSize());
@@ -134,7 +134,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
 
     public function testCreatingCorkReader()
     {
-        foreach (array('cork', 'CORK', 't1', 'T1') as $charset) {
+        foreach (['cork', 'CORK', 't1', 'T1'] as $charset) {
             $reader = $this->factory->getReaderFor($charset);
             $this->assertInstanceOf($this->prefix.'GenericFixedWidthReader', $reader);
             $this->assertEquals(1, $reader->getInitialByteSize());
@@ -143,7 +143,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
 
     public function testCreatingUcs2Reader()
     {
-        foreach (array('ucs-2', 'UCS-2', 'ucs2', 'UCS2') as $charset) {
+        foreach (['ucs-2', 'UCS-2', 'ucs2', 'UCS2'] as $charset) {
             $reader = $this->factory->getReaderFor($charset);
             $this->assertInstanceOf($this->prefix.'GenericFixedWidthReader', $reader);
             $this->assertEquals(2, $reader->getInitialByteSize());
@@ -152,7 +152,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
 
     public function testCreatingUtf16Reader()
     {
-        foreach (array('utf-16', 'UTF-16', 'utf16', 'UTF16') as $charset) {
+        foreach (['utf-16', 'UTF-16', 'utf16', 'UTF16'] as $charset) {
             $reader = $this->factory->getReaderFor($charset);
             $this->assertInstanceOf($this->prefix.'GenericFixedWidthReader', $reader);
             $this->assertEquals(2, $reader->getInitialByteSize());
@@ -161,7 +161,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
 
     public function testCreatingUcs4Reader()
     {
-        foreach (array('ucs-4', 'UCS-4', 'ucs4', 'UCS4') as $charset) {
+        foreach (['ucs-4', 'UCS-4', 'ucs4', 'UCS4'] as $charset) {
             $reader = $this->factory->getReaderFor($charset);
             $this->assertInstanceOf($this->prefix.'GenericFixedWidthReader', $reader);
             $this->assertEquals(4, $reader->getInitialByteSize());
@@ -170,7 +170,7 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest ex
 
     public function testCreatingUtf32Reader()
     {
-        foreach (array('utf-32', 'UTF-32', 'utf32', 'UTF32') as $charset) {
+        foreach (['utf-32', 'UTF-32', 'utf32', 'UTF32'] as $charset) {
             $reader = $this->factory->getReaderFor($charset);
             $this->assertInstanceOf($this->prefix.'GenericFixedWidthReader', $reader);
             $this->assertEquals(4, $reader->getInitialByteSize());
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/Base64EncoderAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/Base64EncoderAcceptanceTest.php
index 5aa658dc..f7098c11 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/Base64EncoderAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/Base64EncoderAcceptanceTest.php
@@ -15,7 +15,7 @@ class Swift_Encoder_Base64EncoderAcceptanceTest extends \PHPUnit\Framework\TestC
     {
         $sampleFp = opendir($this->samplesDir);
         while (false !== $encodingDir = readdir($sampleFp)) {
-            if (substr($encodingDir, 0, 1) == '.') {
+            if ('.' == substr($encodingDir, 0, 1)) {
                 continue;
             }
 
@@ -24,7 +24,7 @@ class Swift_Encoder_Base64EncoderAcceptanceTest extends \PHPUnit\Framework\TestC
             if (is_dir($sampleDir)) {
                 $fileFp = opendir($sampleDir);
                 while (false !== $sampleFile = readdir($fileFp)) {
-                    if (substr($sampleFile, 0, 1) == '.') {
+                    if ('.' == substr($sampleFile, 0, 1)) {
                         continue;
                     }
 
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/QpEncoderAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/QpEncoderAcceptanceTest.php
index f2af26b9..5bbf067d 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/QpEncoderAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/QpEncoderAcceptanceTest.php
@@ -15,7 +15,7 @@ class Swift_Encoder_QpEncoderAcceptanceTest extends \PHPUnit\Framework\TestCase
     {
         $sampleFp = opendir($this->samplesDir);
         while (false !== $encodingDir = readdir($sampleFp)) {
-            if (substr($encodingDir, 0, 1) == '.') {
+            if ('.' == substr($encodingDir, 0, 1)) {
                 continue;
             }
 
@@ -29,7 +29,7 @@ class Swift_Encoder_QpEncoderAcceptanceTest extends \PHPUnit\Framework\TestCase
             if (is_dir($sampleDir)) {
                 $fileFp = opendir($sampleDir);
                 while (false !== $sampleFile = readdir($fileFp)) {
-                    if (substr($sampleFile, 0, 1) == '.') {
+                    if ('.' == substr($sampleFile, 0, 1)) {
                         continue;
                     }
 
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/Rfc2231EncoderAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/Rfc2231EncoderAcceptanceTest.php
index f31ac5bd..20c68d5d 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/Rfc2231EncoderAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/Rfc2231EncoderAcceptanceTest.php
@@ -15,7 +15,7 @@ class Swift_Encoder_Rfc2231EncoderAcceptanceTest extends \PHPUnit\Framework\Test
     {
         $sampleFp = opendir($this->samplesDir);
         while (false !== $encodingDir = readdir($sampleFp)) {
-            if (substr($encodingDir, 0, 1) == '.') {
+            if ('.' == substr($encodingDir, 0, 1)) {
                 continue;
             }
 
@@ -29,7 +29,7 @@ class Swift_Encoder_Rfc2231EncoderAcceptanceTest extends \PHPUnit\Framework\Test
             if (is_dir($sampleDir)) {
                 $fileFp = opendir($sampleDir);
                 while (false !== $sampleFile = readdir($fileFp)) {
-                    if (substr($sampleFile, 0, 1) == '.') {
+                    if ('.' == substr($sampleFile, 0, 1)) {
                         continue;
                     }
 
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/MessageAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/MessageAcceptanceTest.php
index 68a9b32e..16adb23b 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/MessageAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/MessageAcceptanceTest.php
@@ -9,8 +9,8 @@ class Swift_MessageAcceptanceTest extends Swift_Mime_SimpleMessageAcceptanceTest
     {
         $message = $this->createMessage();
         $message->setSubject('just a test subject');
-        $message->setFrom(array(
-            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $message->setFrom([
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ]);
 
         $id = $message->getId();
         $date = $message->getDate();
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/Base64ContentEncoderAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/Base64ContentEncoderAcceptanceTest.php
index e3e9ab72..a87b30ee 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/Base64ContentEncoderAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/Base64ContentEncoderAcceptanceTest.php
@@ -15,7 +15,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoderAcceptanceTest extends \PHPU
     {
         $sampleFp = opendir($this->samplesDir);
         while (false !== $encodingDir = readdir($sampleFp)) {
-            if (substr($encodingDir, 0, 1) == '.') {
+            if ('.' == substr($encodingDir, 0, 1)) {
                 continue;
             }
 
@@ -24,7 +24,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoderAcceptanceTest extends \PHPU
             if (is_dir($sampleDir)) {
                 $fileFp = opendir($sampleDir);
                 while (false !== $sampleFile = readdir($fileFp)) {
-                    if (substr($sampleFile, 0, 1) == '.') {
+                    if ('.' == substr($sampleFile, 0, 1)) {
                         continue;
                     }
 
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php
index 1efa4391..bf0a04ee 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php
@@ -19,7 +19,7 @@ class Swift_Mime_ContentEncoder_NativeQpContentEncoderAcceptanceTest extends \PH
     {
         $sampleFp = opendir($this->samplesDir);
         while (false !== $encodingDir = readdir($sampleFp)) {
-            if (substr($encodingDir, 0, 1) == '.') {
+            if ('.' == substr($encodingDir, 0, 1)) {
                 continue;
             }
 
@@ -28,7 +28,7 @@ class Swift_Mime_ContentEncoder_NativeQpContentEncoderAcceptanceTest extends \PH
             if (is_dir($sampleDir)) {
                 $fileFp = opendir($sampleDir);
                 while (false !== $sampleFile = readdir($fileFp)) {
-                    if (substr($sampleFile, 0, 1) == '.') {
+                    if ('.' == substr($sampleFile, 0, 1)) {
                         continue;
                     }
 
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/PlainContentEncoderAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/PlainContentEncoderAcceptanceTest.php
index db436917..544873a9 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/PlainContentEncoderAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/PlainContentEncoderAcceptanceTest.php
@@ -15,7 +15,7 @@ class Swift_Mime_ContentEncoder_PlainContentEncoderAcceptanceTest extends \PHPUn
     {
         $sampleFp = opendir($this->samplesDir);
         while (false !== $encodingDir = readdir($sampleFp)) {
-            if (substr($encodingDir, 0, 1) == '.') {
+            if ('.' == substr($encodingDir, 0, 1)) {
                 continue;
             }
 
@@ -24,7 +24,7 @@ class Swift_Mime_ContentEncoder_PlainContentEncoderAcceptanceTest extends \PHPUn
             if (is_dir($sampleDir)) {
                 $fileFp = opendir($sampleDir);
                 while (false !== $sampleFile = readdir($fileFp)) {
-                    if (substr($sampleFile, 0, 1) == '.') {
+                    if ('.' == substr($sampleFile, 0, 1)) {
                         continue;
                     }
 
@@ -47,7 +47,7 @@ class Swift_Mime_ContentEncoder_PlainContentEncoderAcceptanceTest extends \PHPUn
     {
         $sampleFp = opendir($this->samplesDir);
         while (false !== $encodingDir = readdir($sampleFp)) {
-            if (substr($encodingDir, 0, 1) == '.') {
+            if ('.' == substr($encodingDir, 0, 1)) {
                 continue;
             }
 
@@ -56,7 +56,7 @@ class Swift_Mime_ContentEncoder_PlainContentEncoderAcceptanceTest extends \PHPUn
             if (is_dir($sampleDir)) {
                 $fileFp = opendir($sampleDir);
                 while (false !== $sampleFile = readdir($fileFp)) {
-                    if (substr($sampleFile, 0, 1) == '.') {
+                    if ('.' == substr($sampleFile, 0, 1)) {
                         continue;
                     }
 
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/QpContentEncoderAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/QpContentEncoderAcceptanceTest.php
index 7eb51155..26d1a9bd 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/QpContentEncoderAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/QpContentEncoderAcceptanceTest.php
@@ -20,7 +20,7 @@ class Swift_Mime_ContentEncoder_QpContentEncoderAcceptanceTest extends \PHPUnit\
     {
         $sampleFp = opendir($this->samplesDir);
         while (false !== $encodingDir = readdir($sampleFp)) {
-            if (substr($encodingDir, 0, 1) == '.') {
+            if ('.' == substr($encodingDir, 0, 1)) {
                 continue;
             }
 
@@ -34,7 +34,7 @@ class Swift_Mime_ContentEncoder_QpContentEncoderAcceptanceTest extends \PHPUnit\
             if (is_dir($sampleDir)) {
                 $fileFp = opendir($sampleDir);
                 while (false !== $sampleFile = readdir($fileFp)) {
-                    if (substr($sampleFile, 0, 1) == '.') {
+                    if ('.' == substr($sampleFile, 0, 1)) {
                         continue;
                     }
 
@@ -67,7 +67,7 @@ class Swift_Mime_ContentEncoder_QpContentEncoderAcceptanceTest extends \PHPUnit\
     {
         $sampleFp = opendir($this->samplesDir);
         while (false !== $encodingDir = readdir($sampleFp)) {
-            if (substr($encodingDir, 0, 1) == '.') {
+            if ('.' == substr($encodingDir, 0, 1)) {
                 continue;
             }
 
@@ -79,7 +79,7 @@ class Swift_Mime_ContentEncoder_QpContentEncoderAcceptanceTest extends \PHPUnit\
             if (is_dir($sampleDir)) {
                 $fileFp = opendir($sampleDir);
                 while (false !== $sampleFile = readdir($fileFp)) {
-                    if (substr($sampleFile, 0, 1) == '.') {
+                    if ('.' == substr($sampleFile, 0, 1)) {
                         continue;
                     }
 
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/MimePartAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/MimePartAcceptanceTest.php
index 0a1f02a3..5a12daad 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/MimePartAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/MimePartAcceptanceTest.php
@@ -18,8 +18,8 @@ class Swift_Mime_MimePartAcceptanceTest extends \PHPUnit\Framework\TestCase
         $this->contentEncoder = new Swift_Mime_ContentEncoder_QpContentEncoder(
             new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8'),
             new Swift_StreamFilters_ByteArrayReplacementFilter(
-                array(array(0x0D, 0x0A), array(0x0D), array(0x0A)),
-                array(array(0x0A), array(0x0A), array(0x0D, 0x0A))
+                [[0x0D, 0x0A], [0x0D], [0x0A]],
+                [[0x0A], [0x0A], [0x0D, 0x0A]]
                 )
             );
 
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/SimpleMessageAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/SimpleMessageAcceptanceTest.php
index 246a58bb..1d981e78 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/SimpleMessageAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/SimpleMessageAcceptanceTest.php
@@ -185,7 +185,7 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
     {
         $message = $this->createMessage();
         $message->setSubject('just a test subject');
-        $message->setFrom(array('chris.corbyn@swiftmailer.org' => 'Chris Corbyn'));
+        $message->setFrom(['chris.corbyn@swiftmailer.org' => 'Chris Corbyn']);
         $id = $message->getId();
         $date = $message->getDate();
         $this->assertEquals(
@@ -204,10 +204,10 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
     {
         $message = $this->createMessage();
         $message->setSubject('just a test subject');
-        $message->setFrom(array(
+        $message->setFrom([
             'chris.corbyn@swiftmailer.org' => 'Chris Corbyn',
             'mark@swiftmailer.org',
-            ));
+            ]);
         $id = $message->getId();
         $date = $message->getDate();
         $this->assertEquals(
@@ -227,8 +227,8 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
         $message = $this->createMessage();
         $message->setReturnPath('chris@w3style.co.uk');
         $message->setSubject('just a test subject');
-        $message->setFrom(array(
-            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $message->setFrom([
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ]);
         $id = $message->getId();
         $date = $message->getDate();
         $this->assertEquals(
@@ -249,8 +249,8 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
         $message = $this->createMessage();
         $message->setReturnPath('');
         $message->setSubject('just a test subject');
-        $message->setFrom(array(
-            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $message->setFrom([
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ]);
         $id = $message->getId();
         $date = $message->getDate();
         $this->assertEquals(
@@ -290,7 +290,7 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
     {
         $message = $this->createMessage();
         $message->setSubject('just a test subject');
-        $message->setSender(array('chris.corbyn@swiftmailer.org' => 'Chris'));
+        $message->setSender(['chris.corbyn@swiftmailer.org' => 'Chris']);
         $id = $message->getId();
         $date = $message->getDate();
         $this->assertEquals(
@@ -310,8 +310,8 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
     {
         $message = $this->createMessage();
         $message->setSubject('just a test subject');
-        $message->setFrom(array('chris.corbyn@swiftmailer.org' => 'Chris'));
-        $message->setReplyTo(array('chris@w3style.co.uk' => 'Myself'));
+        $message->setFrom(['chris.corbyn@swiftmailer.org' => 'Chris']);
+        $message->setReplyTo(['chris@w3style.co.uk' => 'Myself']);
         $id = $message->getId();
         $date = $message->getDate();
         $this->assertEquals(
@@ -331,11 +331,11 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
     {
         $message = $this->createMessage();
         $message->setSubject('just a test subject');
-        $message->setFrom(array('chris.corbyn@swiftmailer.org' => 'Chris'));
-        $message->setReplyTo(array(
+        $message->setFrom(['chris.corbyn@swiftmailer.org' => 'Chris']);
+        $message->setReplyTo([
             'chris@w3style.co.uk' => 'Myself',
             'my.other@address.com' => 'Me',
-            ));
+            ]);
         $id = $message->getId();
         $date = $message->getDate();
         $this->assertEquals(
@@ -355,11 +355,11 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
     {
         $message = $this->createMessage();
         $message->setSubject('just a test subject');
-        $message->setFrom(array('chris.corbyn@swiftmailer.org' => 'Chris'));
-        $message->setReplyTo(array(
+        $message->setFrom(['chris.corbyn@swiftmailer.org' => 'Chris']);
+        $message->setReplyTo([
             'chris@w3style.co.uk' => 'Myself',
             'my.other@address.com' => 'Me',
-            ));
+            ]);
         $message->setTo('mark@swiftmailer.org');
         $id = $message->getId();
         $date = $message->getDate();
@@ -381,14 +381,14 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
     {
         $message = $this->createMessage();
         $message->setSubject('just a test subject');
-        $message->setFrom(array('chris.corbyn@swiftmailer.org' => 'Chris'));
-        $message->setReplyTo(array(
+        $message->setFrom(['chris.corbyn@swiftmailer.org' => 'Chris']);
+        $message->setReplyTo([
             'chris@w3style.co.uk' => 'Myself',
             'my.other@address.com' => 'Me',
-            ));
-        $message->setTo(array(
+            ]);
+        $message->setTo([
             'mark@swiftmailer.org', 'chris@swiftmailer.org' => 'Chris Corbyn',
-            ));
+            ]);
         $id = $message->getId();
         $date = $message->getDate();
         $this->assertEquals(
@@ -409,14 +409,14 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
     {
         $message = $this->createMessage();
         $message->setSubject('just a test subject');
-        $message->setFrom(array('chris.corbyn@swiftmailer.org' => 'Chris'));
-        $message->setReplyTo(array(
+        $message->setFrom(['chris.corbyn@swiftmailer.org' => 'Chris']);
+        $message->setReplyTo([
             'chris@w3style.co.uk' => 'Myself',
             'my.other@address.com' => 'Me',
-            ));
-        $message->setTo(array(
+            ]);
+        $message->setTo([
             'mark@swiftmailer.org', 'chris@swiftmailer.org' => 'Chris Corbyn',
-            ));
+            ]);
         $message->setCc('john@some-site.com');
         $id = $message->getId();
         $date = $message->getDate();
@@ -439,18 +439,18 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
     {
         $message = $this->createMessage();
         $message->setSubject('just a test subject');
-        $message->setFrom(array('chris.corbyn@swiftmailer.org' => 'Chris'));
-        $message->setReplyTo(array(
+        $message->setFrom(['chris.corbyn@swiftmailer.org' => 'Chris']);
+        $message->setReplyTo([
             'chris@w3style.co.uk' => 'Myself',
             'my.other@address.com' => 'Me',
-            ));
-        $message->setTo(array(
+            ]);
+        $message->setTo([
             'mark@swiftmailer.org', 'chris@swiftmailer.org' => 'Chris Corbyn',
-            ));
-        $message->setCc(array(
+            ]);
+        $message->setCc([
             'john@some-site.com' => 'John West',
             'fred@another-site.co.uk' => 'Big Fred',
-            ));
+            ]);
         $id = $message->getId();
         $date = $message->getDate();
         $this->assertEquals(
@@ -474,18 +474,18 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
         // separately in accordance with RFC 2822/2821
         $message = $this->createMessage();
         $message->setSubject('just a test subject');
-        $message->setFrom(array('chris.corbyn@swiftmailer.org' => 'Chris'));
-        $message->setReplyTo(array(
+        $message->setFrom(['chris.corbyn@swiftmailer.org' => 'Chris']);
+        $message->setReplyTo([
             'chris@w3style.co.uk' => 'Myself',
             'my.other@address.com' => 'Me',
-            ));
-        $message->setTo(array(
+            ]);
+        $message->setTo([
             'mark@swiftmailer.org', 'chris@swiftmailer.org' => 'Chris Corbyn',
-            ));
-        $message->setCc(array(
+            ]);
+        $message->setCc([
             'john@some-site.com' => 'John West',
             'fred@another-site.co.uk' => 'Big Fred',
-            ));
+            ]);
         $message->setBcc('x@alphabet.tld');
         $id = $message->getId();
         $date = $message->getDate();
@@ -511,19 +511,19 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
         // separately in accordance with RFC 2822/2821
         $message = $this->createMessage();
         $message->setSubject('just a test subject');
-        $message->setFrom(array('chris.corbyn@swiftmailer.org' => 'Chris'));
-        $message->setReplyTo(array(
+        $message->setFrom(['chris.corbyn@swiftmailer.org' => 'Chris']);
+        $message->setReplyTo([
             'chris@w3style.co.uk' => 'Myself',
             'my.other@address.com' => 'Me',
-            ));
-        $message->setTo(array(
+            ]);
+        $message->setTo([
             'mark@swiftmailer.org', 'chris@swiftmailer.org' => 'Chris Corbyn',
-            ));
-        $message->setCc(array(
+            ]);
+        $message->setCc([
             'john@some-site.com' => 'John West',
             'fred@another-site.co.uk' => 'Big Fred',
-            ));
-        $message->setBcc(array('x@alphabet.tld', 'a@alphabet.tld' => 'A'));
+            ]);
+        $message->setBcc(['x@alphabet.tld', 'a@alphabet.tld' => 'A']);
         $id = $message->getId();
         $date = $message->getDate();
         $this->assertEquals(
@@ -547,8 +547,8 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
         $message = $this->createMessage();
         $message->setReturnPath('chris@w3style.co.uk');
         $message->setSubject('just a test subject');
-        $message->setFrom(array(
-            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $message->setFrom([
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ]);
         $message->setBody(
             'just a test body'."\r\n".
             'with a new line'
@@ -576,8 +576,8 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
         $message = $this->createMessage();
         $message->setReturnPath('chris@w3style.co.uk');
         $message->setSubject('just a test subject');
-        $message->setFrom(array(
-            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $message->setFrom([
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ]);
         $message->setBody(
             'Just s'.pack('C*', 0xC2, 0x01, 0x01).'me multi-'."\r\n".
             'line message!'
@@ -605,8 +605,8 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
         $message = $this->createMessage();
         $message->setReturnPath('chris@w3style.co.uk');
         $message->setSubject('just a test subject');
-        $message->setFrom(array(
-            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $message->setFrom([
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ]);
 
         $id = $message->getId();
         $date = $message->getDate();
@@ -658,8 +658,8 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
         $message = $this->createMessage();
         $message->setReturnPath('chris@w3style.co.uk');
         $message->setSubject('just a test subject');
-        $message->setFrom(array(
-            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $message->setFrom([
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ]);
 
         $id = $message->getId();
         $date = preg_quote($message->getDate()->format('r'), '~');
@@ -720,8 +720,8 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
         $message = $this->createMessage();
         $message->setReturnPath('chris@w3style.co.uk');
         $message->setSubject('just a test subject');
-        $message->setFrom(array(
-            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $message->setFrom([
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ]);
 
         $id = $message->getId();
         $date = preg_quote($message->getDate()->format('r'), '~');
@@ -806,8 +806,8 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
         $message = $this->createMessage();
         $message->setReturnPath('chris@w3style.co.uk');
         $message->setSubject('just a test subject');
-        $message->setFrom(array(
-            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $message->setFrom([
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ]);
 
         $id = $message->getId();
         $date = preg_quote($message->getDate()->format('r'), '~');
@@ -883,8 +883,8 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
         $message = $this->createMessage();
         $message->setReturnPath('chris@w3style.co.uk');
         $message->setSubject('just a test subject');
-        $message->setFrom(array(
-            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $message->setFrom([
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ]);
 
         $id = $message->getId();
         $date = preg_quote($message->getDate()->format('r'), '~');
@@ -958,8 +958,8 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
         $message = $this->createMessage();
         $message->setReturnPath('chris@w3style.co.uk');
         $message->setSubject('just a test subject');
-        $message->setFrom(array(
-            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $message->setFrom([
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ]);
 
         $id = $message->getId();
         $date = $message->getDate();
@@ -1001,8 +1001,8 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
         $message = $this->createMessage();
         $message->setReturnPath('chris@w3style.co.uk');
         $message->setSubject('just a test subject');
-        $message->setFrom(array(
-            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $message->setFrom([
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ]);
         $message->setCharset('utf-8');
         $message->setFormat('flowed');
         $message->setDelSp(true);
@@ -1057,8 +1057,8 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
         $message = $this->createMessage();
         $message->setReturnPath('chris@w3style.co.uk');
         $message->setSubject('just a test subject');
-        $message->setFrom(array(
-            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $message->setFrom([
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ]);
         $message->setContentType('text/html');
         $message->setCharset('iso-8859-1');
         $message->setBody('foo');
@@ -1107,8 +1107,8 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
         $message = $this->createMessage();
         $message->setReturnPath('chris@w3style.co.uk');
         $message->setSubject('just a test subject');
-        $message->setFrom(array(
-            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $message->setFrom([
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ]);
 
         $id = $message->getId();
         $date = $message->getDate()->format('r');
@@ -1157,8 +1157,8 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
         $message = $this->createMessage();
         $message->setReturnPath('chris@w3style.co.uk');
         $message->setSubject('just a test subject');
-        $message->setFrom(array(
-            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $message->setFrom([
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ]);
         $message->setContentType('text/html');
         $message->setBody('foo');
 
@@ -1204,8 +1204,8 @@ class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit\Framework\TestCase
         $message = $this->createMessage();
         $message->setReturnPath('chris@w3style.co.uk');
         $message->setSubject('just a test subject');
-        $message->setFrom(array(
-            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $message->setFrom([
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ]);
         $message->setBody(
             'just a test body'."\n".
             'with a new line'
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/BasicSocketAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/BasicSocketAcceptanceTest.php
index 85b2f4ec..739a7ece 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/BasicSocketAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/BasicSocketAcceptanceTest.php
@@ -19,15 +19,15 @@ class Swift_Transport_StreamBuffer_BasicSocketAcceptanceTest extends Swift_Trans
     {
         $parts = explode(':', SWIFT_SMTP_HOST);
         $host = $parts[0];
-        $port = isset($parts[1]) ? $parts[1] : 25;
+        $port = $parts[1] ?? 25;
 
-        $this->buffer->initialize(array(
+        $this->buffer->initialize([
             'type' => Swift_Transport_IoBuffer::TYPE_SOCKET,
             'host' => $host,
             'port' => $port,
             'protocol' => 'tcp',
             'blocking' => 1,
             'timeout' => 15,
-        ));
+        ]);
     }
 }
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/ProcessAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/ProcessAcceptanceTest.php
index 4435d6f3..34ef3cbe 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/ProcessAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/ProcessAcceptanceTest.php
@@ -18,9 +18,9 @@ class Swift_Transport_StreamBuffer_ProcessAcceptanceTest extends Swift_Transport
 
     protected function initializeBuffer()
     {
-        $this->buffer->initialize(array(
+        $this->buffer->initialize([
             'type' => Swift_Transport_IoBuffer::TYPE_PROCESS,
             'command' => SWIFT_SENDMAIL_PATH.' -bs',
-        ));
+        ]);
     }
 }
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SocketTimeoutTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SocketTimeoutTest.php
index 1291b128..67073f89 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SocketTimeoutTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SocketTimeoutTest.php
@@ -34,14 +34,14 @@ class Swift_Transport_StreamBuffer_SocketTimeoutTest extends \PHPUnit\Framework\
         $host = '127.0.0.1';
         $port = $this->randomHighPort;
 
-        $this->buffer->initialize(array(
+        $this->buffer->initialize([
             'type' => Swift_Transport_IoBuffer::TYPE_SOCKET,
             'host' => $host,
             'port' => $port,
             'protocol' => 'tcp',
             'blocking' => 1,
             'timeout' => 1,
-        ));
+        ]);
     }
 
     public function testTimeoutException()
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SslSocketAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SslSocketAcceptanceTest.php
index abd7582d..e3bee2c8 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SslSocketAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SslSocketAcceptanceTest.php
@@ -26,15 +26,15 @@ class Swift_Transport_StreamBuffer_SslSocketAcceptanceTest extends Swift_Transpo
     {
         $parts = explode(':', SWIFT_SSL_HOST);
         $host = $parts[0];
-        $port = isset($parts[1]) ? $parts[1] : 25;
+        $port = $parts[1] ?? 25;
 
-        $this->buffer->initialize(array(
+        $this->buffer->initialize([
             'type' => Swift_Transport_IoBuffer::TYPE_SOCKET,
             'host' => $host,
             'port' => $port,
             'protocol' => 'ssl',
             'blocking' => 1,
             'timeout' => 15,
-        ));
+        ]);
     }
 }
diff --git a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/TlsSocketAcceptanceTest.php b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/TlsSocketAcceptanceTest.php
index 3148dbdc..a5092a24 100644
--- a/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/TlsSocketAcceptanceTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/TlsSocketAcceptanceTest.php
@@ -25,15 +25,15 @@ class Swift_Transport_StreamBuffer_TlsSocketAcceptanceTest extends Swift_Transpo
     {
         $parts = explode(':', SWIFT_TLS_HOST);
         $host = $parts[0];
-        $port = isset($parts[1]) ? $parts[1] : 25;
+        $port = $parts[1] ?? 25;
 
-        $this->buffer->initialize(array(
+        $this->buffer->initialize([
             'type' => Swift_Transport_IoBuffer::TYPE_SOCKET,
             'host' => $host,
             'port' => $port,
             'protocol' => 'tls',
             'blocking' => 1,
             'timeout' => 15,
-            ));
+            ]);
     }
 }
diff --git a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug111Test.php b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug111Test.php
index 9853f46e..e9085a99 100644
--- a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug111Test.php
+++ b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug111Test.php
@@ -4,31 +4,31 @@ class Swift_Bug111Test extends \PHPUnit\Framework\TestCase
 {
     public function testUnstructuredHeaderSlashesShouldNotBeEscaped()
     {
-        $complicated_header = array(
-            'to' => array(
+        $complicated_header = [
+            'to' => [
                 'email1@example.com',
                 'email2@example.com',
                 'email3@example.com',
                 'email4@example.com',
                 'email5@example.com',
-            ),
-            'sub' => array(
-                '-name-' => array(
+            ],
+            'sub' => [
+                '-name-' => [
                     'email1',
                     '"email2"',
                     'email3\\',
                     'email4',
                     'email5',
-                ),
-                '-url-' => array(
+                ],
+                '-url-' => [
                     'http://google.com',
                     'http://yahoo.com',
                     'http://hotmail.com',
                     'http://aol.com',
                     'http://facebook.com',
-                ),
-            ),
-        );
+                ],
+            ],
+        ];
         $json = json_encode($complicated_header);
 
         $message = new Swift_Message();
diff --git a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug206Test.php b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug206Test.php
index 02072e67..67c95510 100644
--- a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug206Test.php
+++ b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug206Test.php
@@ -29,9 +29,9 @@ class Swift_Bug206Test extends \PHPUnit\Framework\TestCase
 
     private function doTestHeaderIsFullyEncoded($email, $name, $expected)
     {
-        $mailboxHeader = $this->factory->createMailboxHeader('To', array(
+        $mailboxHeader = $this->factory->createMailboxHeader('To', [
             $email => $name,
-        ));
+        ]);
 
         $headerBody = substr($mailboxHeader->toString(), 3, strlen($expected));
 
diff --git a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug34Test.php b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug34Test.php
index 158cf5a5..0c8dd175 100644
--- a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug34Test.php
+++ b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug34Test.php
@@ -19,10 +19,10 @@ class Swift_Bug34Test extends \PHPUnit\Framework\TestCase
 
         $message->setBody('<img src="'.$cid.'" />', 'text/html');
 
-        $message->setTo(array('user@domain.tld' => 'User'));
+        $message->setTo(['user@domain.tld' => 'User']);
 
-        $message->setFrom(array('other@domain.tld' => 'Other'));
-        $message->setSender(array('other@domain.tld' => 'Other'));
+        $message->setFrom(['other@domain.tld' => 'Other']);
+        $message->setSender(['other@domain.tld' => 'Other']);
 
         $id = $message->getId();
         $date = preg_quote($message->getDate()->format('r'), '~');
diff --git a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug35Test.php b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug35Test.php
index f7835758..66644e93 100644
--- a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug35Test.php
+++ b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug35Test.php
@@ -19,10 +19,10 @@ class Swift_Bug35Test extends \PHPUnit\Framework\TestCase
 
         $message->setBody('HTML part', 'text/html');
 
-        $message->setTo(array('user@domain.tld' => 'User'));
+        $message->setTo(['user@domain.tld' => 'User']);
 
-        $message->setFrom(array('other@domain.tld' => 'Other'));
-        $message->setSender(array('other@domain.tld' => 'Other'));
+        $message->setFrom(['other@domain.tld' => 'Other']);
+        $message->setSender(['other@domain.tld' => 'Other']);
 
         $id = $message->getId();
         $date = preg_quote($message->getDate()->format('r'), '~');
diff --git a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug534Test.php b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug534Test.php
index 01f4af51..6b224f1d 100644
--- a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug534Test.php
+++ b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug534Test.php
@@ -25,7 +25,7 @@ class Swift_Bug534Test extends \SwiftMailerTestCase
             return true;
         };
 
-        $failedRecipients = array();
+        $failedRecipients = [];
 
         $transport = m::mock('Swift_Transport');
         $transport->shouldReceive('isStarted')->andReturn(true);
diff --git a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug650Test.php b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug650Test.php
index e7cc65a0..31036c6b 100644
--- a/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug650Test.php
+++ b/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug650Test.php
@@ -18,21 +18,21 @@ class Swift_Bug650Test extends \PHPUnit\Framework\TestCase
         $header = new Swift_Mime_Headers_MailboxHeader('To', $encoder, new EmailValidator());
         $header->setCharset('utf-8');
 
-        $header->setNameAddresses(array(
+        $header->setNameAddresses([
             'test@example.com' => $name,
-        ));
+        ]);
 
         $this->assertSame('To: '.$expectedEncodedName." <test@example.com>\r\n", $header->toString());
     }
 
     public function encodingDataProvider()
     {
-        return array(
-            array('this is " a test ö', 'this is =?utf-8?Q?=22?= a test =?utf-8?Q?=C3=B6?='),
-            array(': this is a test ö', '=?utf-8?Q?=3A?= this is a test =?utf-8?Q?=C3=B6?='),
-            array('( test ö', '=?utf-8?Q?=28?= test =?utf-8?Q?=C3=B6?='),
-            array('[ test ö', '=?utf-8?Q?=5B?= test =?utf-8?Q?=C3=B6?='),
-            array('@ test ö)', '=?utf-8?Q?=40?= test =?utf-8?Q?=C3=B6=29?='),
-        );
+        return [
+            ['this is " a test ö', 'this is =?utf-8?Q?=22?= a test =?utf-8?Q?=C3=B6?='],
+            [': this is a test ö', '=?utf-8?Q?=3A?= this is a test =?utf-8?Q?=C3=B6?='],
+            ['( test ö', '=?utf-8?Q?=28?= test =?utf-8?Q?=C3=B6?='],
+            ['[ test ö', '=?utf-8?Q?=5B?= test =?utf-8?Q?=C3=B6?='],
+            ['@ test ö)', '=?utf-8?Q?=40?= test =?utf-8?Q?=C3=B6=29?='],
+        ];
     }
 }
diff --git a/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php b/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php
index 496302ed..0be2c81e 100644
--- a/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php
@@ -18,7 +18,7 @@ class Swift_Smoke_AttachmentSmokeTest extends SwiftMailerSmokeTestCase
         $mailer = $this->getMailer();
         $message = (new Swift_Message())
             ->setSubject('[Swift Mailer] AttachmentSmokeTest')
-            ->setFrom(array(SWIFT_SMOKE_EMAIL_ADDRESS => 'Swift Mailer'))
+            ->setFrom([SWIFT_SMOKE_EMAIL_ADDRESS => 'Swift Mailer'])
             ->setTo(SWIFT_SMOKE_EMAIL_ADDRESS)
             ->setBody('This message should contain an attached ZIP file (named "textfile.zip").'.PHP_EOL.
                 'When unzipped, the archive should produce a text file which reads:'.PHP_EOL.
diff --git a/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/BasicSmokeTest.php b/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/BasicSmokeTest.php
index a0db5164..79915b34 100644
--- a/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/BasicSmokeTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/BasicSmokeTest.php
@@ -10,7 +10,7 @@ class Swift_Smoke_BasicSmokeTest extends SwiftMailerSmokeTestCase
         $mailer = $this->getMailer();
         $message = (new Swift_Message())
             ->setSubject('[Swift Mailer] BasicSmokeTest')
-            ->setFrom(array(SWIFT_SMOKE_EMAIL_ADDRESS => 'Swift Mailer'))
+            ->setFrom([SWIFT_SMOKE_EMAIL_ADDRESS => 'Swift Mailer'])
             ->setTo(SWIFT_SMOKE_EMAIL_ADDRESS)
             ->setBody('One, two, three, four, five...'.PHP_EOL.
                 'six, seven, eight...'
diff --git a/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/HtmlWithAttachmentSmokeTest.php b/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/HtmlWithAttachmentSmokeTest.php
index 7b3d8940..8a2647a7 100644
--- a/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/HtmlWithAttachmentSmokeTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/HtmlWithAttachmentSmokeTest.php
@@ -16,7 +16,7 @@ class Swift_Smoke_HtmlWithAttachmentSmokeTest extends SwiftMailerSmokeTestCase
     {
         $mailer = $this->getMailer();
         $message = (new Swift_Message('[Swift Mailer] HtmlWithAttachmentSmokeTest'))
-            ->setFrom(array(SWIFT_SMOKE_EMAIL_ADDRESS => 'Swift Mailer'))
+            ->setFrom([SWIFT_SMOKE_EMAIL_ADDRESS => 'Swift Mailer'])
             ->setTo(SWIFT_SMOKE_EMAIL_ADDRESS)
             ->attach(Swift_Attachment::fromPath($this->attFile))
             ->setBody('<p>This HTML-formatted message should contain an attached ZIP file (named "textfile.zip").'.PHP_EOL.
diff --git a/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/InternationalSmokeTest.php b/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/InternationalSmokeTest.php
index c47ddd2a..6dc715e8 100644
--- a/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/InternationalSmokeTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/InternationalSmokeTest.php
@@ -19,7 +19,7 @@ class Swift_Smoke_InternationalSmokeTest extends SwiftMailerSmokeTestCase
         $message = (new Swift_Message())
             ->setCharset('utf-8')
             ->setSubject('[Swift Mailer] InternationalSmokeTest (διεθνής)')
-            ->setFrom(array(SWIFT_SMOKE_EMAIL_ADDRESS => 'Χριστοφορου (Swift Mailer)'))
+            ->setFrom([SWIFT_SMOKE_EMAIL_ADDRESS => 'Χριστοφορου (Swift Mailer)'])
             ->setTo(SWIFT_SMOKE_EMAIL_ADDRESS)
             ->setBody('This message should contain an attached ZIP file (named "κείμενο, εδάφιο, θέμα.zip").'.PHP_EOL.
                 'When unzipped, the archive should produce a text file which reads:'.PHP_EOL.
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/ByteStream/ArrayByteStreamTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/ByteStream/ArrayByteStreamTest.php
index 4da0da70..29fe390f 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/ByteStream/ArrayByteStreamTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/ByteStream/ArrayByteStreamTest.php
@@ -4,9 +4,9 @@ class Swift_ByteStream_ArrayByteStreamTest extends \PHPUnit\Framework\TestCase
 {
     public function testReadingSingleBytesFromBaseInput()
     {
-        $input = array('a', 'b', 'c');
+        $input = ['a', 'b', 'c'];
         $bs = $this->createArrayStream($input);
-        $output = array();
+        $output = [];
         while (false !== $bytes = $bs->read(1)) {
             $output[] = $bytes;
         }
@@ -17,33 +17,33 @@ class Swift_ByteStream_ArrayByteStreamTest extends \PHPUnit\Framework\TestCase
 
     public function testReadingMultipleBytesFromBaseInput()
     {
-        $input = array('a', 'b', 'c', 'd');
+        $input = ['a', 'b', 'c', 'd'];
         $bs = $this->createArrayStream($input);
-        $output = array();
+        $output = [];
         while (false !== $bytes = $bs->read(2)) {
             $output[] = $bytes;
         }
-        $this->assertEquals(array('ab', 'cd'), $output,
+        $this->assertEquals(['ab', 'cd'], $output,
             '%s: Bytes read from stream should be in pairs'
             );
     }
 
     public function testReadingOddOffsetOnLastByte()
     {
-        $input = array('a', 'b', 'c', 'd', 'e');
+        $input = ['a', 'b', 'c', 'd', 'e'];
         $bs = $this->createArrayStream($input);
-        $output = array();
+        $output = [];
         while (false !== $bytes = $bs->read(2)) {
             $output[] = $bytes;
         }
-        $this->assertEquals(array('ab', 'cd', 'e'), $output,
+        $this->assertEquals(['ab', 'cd', 'e'], $output,
             '%s: Bytes read from stream should be in pairs except final read'
             );
     }
 
     public function testSettingPointerPartway()
     {
-        $input = array('a', 'b', 'c');
+        $input = ['a', 'b', 'c'];
         $bs = $this->createArrayStream($input);
         $bs->setReadPointer(1);
         $this->assertEquals('b', $bs->read(1),
@@ -53,7 +53,7 @@ class Swift_ByteStream_ArrayByteStreamTest extends \PHPUnit\Framework\TestCase
 
     public function testResettingPointerAfterExhaustion()
     {
-        $input = array('a', 'b', 'c');
+        $input = ['a', 'b', 'c'];
 
         $bs = $this->createArrayStream($input);
         while (false !== $bs->read(1));
@@ -66,7 +66,7 @@ class Swift_ByteStream_ArrayByteStreamTest extends \PHPUnit\Framework\TestCase
 
     public function testPointerNeverSetsBelowZero()
     {
-        $input = array('a', 'b', 'c');
+        $input = ['a', 'b', 'c'];
         $bs = $this->createArrayStream($input);
 
         $bs->setReadPointer(-1);
@@ -77,7 +77,7 @@ class Swift_ByteStream_ArrayByteStreamTest extends \PHPUnit\Framework\TestCase
 
     public function testPointerNeverSetsAboveStackSize()
     {
-        $input = array('a', 'b', 'c');
+        $input = ['a', 'b', 'c'];
         $bs = $this->createArrayStream($input);
 
         $bs->setReadPointer(3);
@@ -88,23 +88,23 @@ class Swift_ByteStream_ArrayByteStreamTest extends \PHPUnit\Framework\TestCase
 
     public function testBytesCanBeWrittenToStream()
     {
-        $input = array('a', 'b', 'c');
+        $input = ['a', 'b', 'c'];
         $bs = $this->createArrayStream($input);
 
         $bs->write('de');
 
-        $output = array();
+        $output = [];
         while (false !== $bytes = $bs->read(1)) {
             $output[] = $bytes;
         }
-        $this->assertEquals(array('a', 'b', 'c', 'd', 'e'), $output,
+        $this->assertEquals(['a', 'b', 'c', 'd', 'e'], $output,
             '%s: Bytes read from stream should be from initial stack + written'
             );
     }
 
     public function testContentsCanBeFlushed()
     {
-        $input = array('a', 'b', 'c');
+        $input = ['a', 'b', 'c'];
         $bs = $this->createArrayStream($input);
 
         $bs->flushBuffers();
@@ -117,11 +117,11 @@ class Swift_ByteStream_ArrayByteStreamTest extends \PHPUnit\Framework\TestCase
     public function testConstructorCanTakeStringArgument()
     {
         $bs = $this->createArrayStream('abc');
-        $output = array();
+        $output = [];
         while (false !== $bytes = $bs->read(1)) {
             $output[] = $bytes;
         }
-        $this->assertEquals(array('a', 'b', 'c'), $output,
+        $this->assertEquals(['a', 'b', 'c'], $output,
             '%s: Bytes read from stream should be the same as bytes in constructor'
             );
     }
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/GenericFixedWidthReaderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/GenericFixedWidthReaderTest.php
index 659b3c88..1ba5e784 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/GenericFixedWidthReaderTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/GenericFixedWidthReaderTest.php
@@ -16,19 +16,19 @@ class Swift_CharacterReader_GenericFixedWidthReaderTest extends \PHPUnit\Framewo
         $reader = new Swift_CharacterReader_GenericFixedWidthReader(4);
 
         $this->assertSame(
-            1, $reader->validateByteSequence(array(0x01, 0x02, 0x03), 3)
+            1, $reader->validateByteSequence([0x01, 0x02, 0x03], 3)
             ); //3 octets
 
         $this->assertSame(
-            2, $reader->validateByteSequence(array(0x01, 0x0A), 2)
+            2, $reader->validateByteSequence([0x01, 0x0A], 2)
             ); //2 octets
 
         $this->assertSame(
-            3, $reader->validateByteSequence(array(0xFE), 1)
+            3, $reader->validateByteSequence([0xFE], 1)
             ); //1 octet
 
         $this->assertSame(
-            0, $reader->validateByteSequence(array(0xFE, 0x03, 0x67, 0x9A), 4)
+            0, $reader->validateByteSequence([0xFE, 0x03, 0x67, 0x9A], 4)
             ); //All 4 octets
     }
 
@@ -37,7 +37,7 @@ class Swift_CharacterReader_GenericFixedWidthReaderTest extends \PHPUnit\Framewo
         $reader = new Swift_CharacterReader_GenericFixedWidthReader(6);
 
         $this->assertSame(-1, $reader->validateByteSequence(
-            array(0xFE, 0x03, 0x67, 0x9A, 0x10, 0x09, 0x85), 7
+            [0xFE, 0x03, 0x67, 0x9A, 0x10, 0x09, 0x85], 7
             )); //7 octets
     }
 }
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/UsAsciiReaderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/UsAsciiReaderTest.php
index 274cbdab..b85b0ab1 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/UsAsciiReaderTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/UsAsciiReaderTest.php
@@ -27,7 +27,7 @@ class Swift_CharacterReader_UsAsciiReaderTest extends \PHPUnit\Framework\TestCas
     {
         for ($ordinal = 0x00; $ordinal <= 0x7F; ++$ordinal) {
             $this->assertSame(
-                0, $this->reader->validateByteSequence(array($ordinal), 1)
+                0, $this->reader->validateByteSequence([$ordinal], 1)
                 );
         }
     }
@@ -36,7 +36,7 @@ class Swift_CharacterReader_UsAsciiReaderTest extends \PHPUnit\Framework\TestCas
     {
         for ($ordinal = 0x00; $ordinal <= 0x7F; $ordinal += 2) {
             $this->assertSame(
-                -1, $this->reader->validateByteSequence(array($ordinal, $ordinal + 1), 2)
+                -1, $this->reader->validateByteSequence([$ordinal, $ordinal + 1], 2)
                 );
         }
     }
@@ -45,7 +45,7 @@ class Swift_CharacterReader_UsAsciiReaderTest extends \PHPUnit\Framework\TestCas
     {
         for ($ordinal = 0x80; $ordinal <= 0xFF; ++$ordinal) {
             $this->assertSame(
-                -1, $this->reader->validateByteSequence(array($ordinal), 1)
+                -1, $this->reader->validateByteSequence([$ordinal], 1)
                 );
         }
     }
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/Utf8ReaderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/Utf8ReaderTest.php
index e28cf0ee..06379118 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/Utf8ReaderTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/Utf8ReaderTest.php
@@ -13,7 +13,7 @@ class Swift_CharacterReader_Utf8ReaderTest extends \PHPUnit\Framework\TestCase
     {
         for ($ordinal = 0x00; $ordinal <= 0x7F; ++$ordinal) {
             $this->assertSame(
-                0, $this->reader->validateByteSequence(array($ordinal), 1)
+                0, $this->reader->validateByteSequence([$ordinal], 1)
                 );
         }
     }
@@ -22,7 +22,7 @@ class Swift_CharacterReader_Utf8ReaderTest extends \PHPUnit\Framework\TestCase
     {
         for ($octet = 0xC0; $octet <= 0xDF; ++$octet) {
             $this->assertSame(
-                1, $this->reader->validateByteSequence(array($octet), 1)
+                1, $this->reader->validateByteSequence([$octet], 1)
                 );
         }
     }
@@ -31,7 +31,7 @@ class Swift_CharacterReader_Utf8ReaderTest extends \PHPUnit\Framework\TestCase
     {
         for ($octet = 0xE0; $octet <= 0xEF; ++$octet) {
             $this->assertSame(
-                2, $this->reader->validateByteSequence(array($octet), 1)
+                2, $this->reader->validateByteSequence([$octet], 1)
                 );
         }
     }
@@ -40,7 +40,7 @@ class Swift_CharacterReader_Utf8ReaderTest extends \PHPUnit\Framework\TestCase
     {
         for ($octet = 0xF0; $octet <= 0xF7; ++$octet) {
             $this->assertSame(
-                3, $this->reader->validateByteSequence(array($octet), 1)
+                3, $this->reader->validateByteSequence([$octet], 1)
                 );
         }
     }
@@ -49,7 +49,7 @@ class Swift_CharacterReader_Utf8ReaderTest extends \PHPUnit\Framework\TestCase
     {
         for ($octet = 0xF8; $octet <= 0xFB; ++$octet) {
             $this->assertSame(
-                4, $this->reader->validateByteSequence(array($octet), 1)
+                4, $this->reader->validateByteSequence([$octet], 1)
                 );
         }
     }
@@ -58,7 +58,7 @@ class Swift_CharacterReader_Utf8ReaderTest extends \PHPUnit\Framework\TestCase
     {
         for ($octet = 0xFC; $octet <= 0xFD; ++$octet) {
             $this->assertSame(
-                5, $this->reader->validateByteSequence(array($octet), 1)
+                5, $this->reader->validateByteSequence([$octet], 1)
                 );
         }
     }
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterStream/ArrayCharacterStreamTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterStream/ArrayCharacterStreamTest.php
index 8a5c64ae..d0158a23 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterStream/ArrayCharacterStreamTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterStream/ArrayCharacterStreamTest.php
@@ -12,12 +12,12 @@ class Swift_CharacterStream_ArrayCharacterStreamTest extends \SwiftMailerTestCas
         $reader->shouldReceive('getInitialByteSize')
                ->zeroOrMoreTimes()
                ->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD1), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD1], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
 
         $stream->importString(pack('C*',
             0xD0, 0x94,
@@ -40,14 +40,14 @@ class Swift_CharacterStream_ArrayCharacterStreamTest extends \SwiftMailerTestCas
         $reader->shouldReceive('getInitialByteSize')
                ->zeroOrMoreTimes()
                ->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD1), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD1), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD1), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD1], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD1], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD1], 1)->andReturn(1);
 
         $stream->importString(pack('C*', 0xD0, 0x94, 0xD0, 0xB6, 0xD0, 0xBE));
 
@@ -72,15 +72,15 @@ class Swift_CharacterStream_ArrayCharacterStreamTest extends \SwiftMailerTestCas
                ->zeroOrMoreTimes()
                ->andReturn(1);
         //String
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
         //Stream
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD1), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD1), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD1), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD1], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD1], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD1], 1)->andReturn(1);
 
         $stream->importString(pack('C*', 0xD0, 0x94, 0xD0, 0xB6, 0xD0, 0xBE));
 
@@ -117,15 +117,15 @@ class Swift_CharacterStream_ArrayCharacterStreamTest extends \SwiftMailerTestCas
                ->zeroOrMoreTimes()
                ->andReturn(1);
         //String
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
         //Stream
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD1), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD1), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD1), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD1], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD1], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD1], 1)->andReturn(1);
 
         $stream->importString(pack('C*', 0xD0, 0x94, 0xD0, 0xB6, 0xD0, 0xBE));
 
@@ -138,13 +138,13 @@ class Swift_CharacterStream_ArrayCharacterStreamTest extends \SwiftMailerTestCas
             )
         );
 
-        $this->assertEquals(array(0xD0, 0x94), $stream->readBytes(1));
-        $this->assertEquals(array(0xD0, 0xB6, 0xD0, 0xBE), $stream->readBytes(2));
-        $this->assertEquals(array(0xD0, 0xBB), $stream->readBytes(1));
+        $this->assertEquals([0xD0, 0x94], $stream->readBytes(1));
+        $this->assertEquals([0xD0, 0xB6, 0xD0, 0xBE], $stream->readBytes(2));
+        $this->assertEquals([0xD0, 0xBB], $stream->readBytes(1));
         $this->assertEquals(
-            array(0xD1, 0x8E, 0xD0, 0xB1, 0xD1, 0x8B), $stream->readBytes(3)
+            [0xD1, 0x8E, 0xD0, 0xB1, 0xD1, 0x8B], $stream->readBytes(3)
             );
-        $this->assertEquals(array(0xD1, 0x85), $stream->readBytes(1));
+        $this->assertEquals([0xD1, 0x85], $stream->readBytes(1));
 
         $this->assertFalse($stream->readBytes(1));
     }
@@ -159,9 +159,9 @@ class Swift_CharacterStream_ArrayCharacterStreamTest extends \SwiftMailerTestCas
         $reader->shouldReceive('getInitialByteSize')
                ->zeroOrMoreTimes()
                ->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
 
         $stream->importString(pack('C*', 0xD0, 0x94, 0xD0, 0xB6, 0xD0, 0xBE));
 
@@ -182,13 +182,13 @@ class Swift_CharacterStream_ArrayCharacterStreamTest extends \SwiftMailerTestCas
         $reader->shouldReceive('getInitialByteSize')
                ->zeroOrMoreTimes()
                ->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
 
         $stream->importString(pack('C*', 0xD0, 0x94, 0xD0, 0xB6, 0xD0, 0xBE));
 
-        $this->assertEquals(array(0xD0, 0x94, 0xD0, 0xB6, 0xD0, 0xBE),
+        $this->assertEquals([0xD0, 0x94, 0xD0, 0xB6, 0xD0, 0xBE],
             $stream->readBytes(100)
             );
 
@@ -205,9 +205,9 @@ class Swift_CharacterStream_ArrayCharacterStreamTest extends \SwiftMailerTestCas
         $reader->shouldReceive('getInitialByteSize')
                ->zeroOrMoreTimes()
                ->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
 
         $stream->importString(pack('C*', 0xD0, 0x94, 0xD0, 0xB6, 0xD0, 0xBE));
 
@@ -232,9 +232,9 @@ class Swift_CharacterStream_ArrayCharacterStreamTest extends \SwiftMailerTestCas
         $reader->shouldReceive('getInitialByteSize')
                ->zeroOrMoreTimes()
                ->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
 
         $stream->importString(pack('C*', 0xD0, 0x94, 0xD0, 0xB6, 0xD0, 0xBE));
 
@@ -267,9 +267,9 @@ class Swift_CharacterStream_ArrayCharacterStreamTest extends \SwiftMailerTestCas
         $reader->shouldReceive('getInitialByteSize')
                ->zeroOrMoreTimes()
                ->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
 
         $stream->importByteStream($os);
     }
@@ -298,9 +298,9 @@ class Swift_CharacterStream_ArrayCharacterStreamTest extends \SwiftMailerTestCas
         $reader->shouldReceive('getInitialByteSize')
                ->zeroOrMoreTimes()
                ->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0], 1)->andReturn(1);
 
         $stream->importByteStream($os);
 
@@ -319,9 +319,9 @@ class Swift_CharacterStream_ArrayCharacterStreamTest extends \SwiftMailerTestCas
         $reader->shouldReceive('getInitialByteSize')
                ->zeroOrMoreTimes()
                ->andReturn(2);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD1, 0x8D), 2);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0, 0xBB), 2);
-        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0, 0xB0), 2);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD1, 0x8D], 2);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0, 0xBB], 2);
+        $reader->shouldReceive('validateByteSequence')->once()->with([0xD0, 0xB0], 2);
 
         $stream = new Swift_CharacterStream_ArrayCharacterStream(
             $factory, 'utf-8'
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/DependencyContainerTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/DependencyContainerTest.php
index 7b8c87ba..286f8328 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/DependencyContainerTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/DependencyContainerTest.php
@@ -78,11 +78,17 @@ class Swift_DependencyContainerTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals($a, $b);
     }
 
+    public function testRegisterAndLookupArray()
+    {
+        $this->container->register('One')->asArray();
+        $this->assertSame([], $this->container->lookup('One'));
+    }
+
     public function testNewInstanceWithDependencies()
     {
         $this->container->register('foo')->asValue('FOO');
         $this->container->register('one')->asNewInstanceOf('One')
-            ->withDependencies(array('foo'));
+            ->withDependencies(['foo']);
         $obj = $this->container->lookup('one');
         $this->assertSame('FOO', $obj->arg1);
     }
@@ -92,7 +98,7 @@ class Swift_DependencyContainerTest extends \PHPUnit\Framework\TestCase
         $this->container->register('foo')->asValue('FOO');
         $this->container->register('bar')->asValue(42);
         $this->container->register('one')->asNewInstanceOf('One')
-            ->withDependencies(array('foo', 'bar'));
+            ->withDependencies(['foo', 'bar']);
         $obj = $this->container->lookup('one');
         $this->assertSame('FOO', $obj->arg1);
         $this->assertSame(42, $obj->arg2);
@@ -103,7 +109,7 @@ class Swift_DependencyContainerTest extends \PHPUnit\Framework\TestCase
         $this->container->register('foo')->asValue('FOO');
         $this->container->register('one')->asNewInstanceOf('One');
         $this->container->register('two')->asNewInstanceOf('One')
-            ->withDependencies(array('one', 'foo'));
+            ->withDependencies(['one', 'foo']);
         $obj = $this->container->lookup('two');
         $this->assertEquals($this->container->lookup('one'), $obj->arg1);
         $this->assertSame('FOO', $obj->arg2);
@@ -137,10 +143,10 @@ class Swift_DependencyContainerTest extends \PHPUnit\Framework\TestCase
         $this->container->register('foo')->asValue('FOO');
         $this->container->register('one')->asNewInstanceOf('One');
         $this->container->register('two')->asNewInstanceOf('One')
-            ->withDependencies(array('one', 'foo'));
+            ->withDependencies(['one', 'foo']);
         $deps = $this->container->createDependenciesFor('two');
         $this->assertEquals(
-            array($this->container->lookup('one'), 'FOO'), $deps
+            [$this->container->lookup('one'), 'FOO'], $deps
             );
     }
 
@@ -149,13 +155,22 @@ class Swift_DependencyContainerTest extends \PHPUnit\Framework\TestCase
         $this->container->register('foo')->asValue('FOO');
         $this->container->register('one')->asNewInstanceOf('One');
         $this->container->register('two')->asNewInstanceOf('One')
-            ->withDependencies(array(array('one', 'foo'), 'foo'));
+            ->withDependencies([['one', 'foo'], 'foo']);
 
         $obj = $this->container->lookup('two');
-        $this->assertEquals(array($this->container->lookup('one'), 'FOO'), $obj->arg1);
+        $this->assertEquals([$this->container->lookup('one'), 'FOO'], $obj->arg1);
         $this->assertSame('FOO', $obj->arg2);
     }
 
+    public function testArrayWithDependencies()
+    {
+        $this->container->register('foo')->asValue('FOO');
+        $this->container->register('bar')->asValue(42);
+        $this->container->register('one')->asArray('One')
+            ->withDependencies(['foo', 'bar']);
+        $this->assertSame(['FOO', 42], $this->container->lookup('one'));
+    }
+
     public function testAliasCanBeSet()
     {
         $this->container->register('foo')->asValue('FOO');
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Encoder/QpEncoderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Encoder/QpEncoderTest.php
index 4acd44b7..10e5e1d0 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Encoder/QpEncoderTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Encoder/QpEncoderTest.php
@@ -40,7 +40,7 @@ class Swift_Encoder_QpEncoderTest extends \SwiftMailerTestCase
                        ->with($char);
             $charStream->shouldReceive('readBytes')
                        ->once()
-                       ->andReturn(array($ordinal));
+                       ->andReturn([$ordinal]);
             $charStream->shouldReceive('readBytes')
                        ->atLeast()->times(1)
                        ->andReturn(false);
@@ -89,12 +89,12 @@ class Swift_Encoder_QpEncoderTest extends \SwiftMailerTestCase
                     ->once()
                     ->with($string);
 
-        $charStream->shouldReceive('readBytes')->once()->andReturn(array(ord('a')));
-        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x09));
-        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x09));
-        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x0D));
-        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x0A));
-        $charStream->shouldReceive('readBytes')->once()->andReturn(array(ord('b')));
+        $charStream->shouldReceive('readBytes')->once()->andReturn([ord('a')]);
+        $charStream->shouldReceive('readBytes')->once()->andReturn([0x09]);
+        $charStream->shouldReceive('readBytes')->once()->andReturn([0x09]);
+        $charStream->shouldReceive('readBytes')->once()->andReturn([0x0D]);
+        $charStream->shouldReceive('readBytes')->once()->andReturn([0x0A]);
+        $charStream->shouldReceive('readBytes')->once()->andReturn([ord('b')]);
         $charStream->shouldReceive('readBytes')->once()->andReturn(false);
 
         $encoder = new Swift_Encoder_QpEncoder($charStream);
@@ -113,12 +113,12 @@ class Swift_Encoder_QpEncoderTest extends \SwiftMailerTestCase
                     ->once()
                     ->with($string);
 
-        $charStream->shouldReceive('readBytes')->once()->andReturn(array(ord('a')));
-        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x20));
-        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x20));
-        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x0D));
-        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x0A));
-        $charStream->shouldReceive('readBytes')->once()->andReturn(array(ord('b')));
+        $charStream->shouldReceive('readBytes')->once()->andReturn([ord('a')]);
+        $charStream->shouldReceive('readBytes')->once()->andReturn([0x20]);
+        $charStream->shouldReceive('readBytes')->once()->andReturn([0x20]);
+        $charStream->shouldReceive('readBytes')->once()->andReturn([0x0D]);
+        $charStream->shouldReceive('readBytes')->once()->andReturn([0x0A]);
+        $charStream->shouldReceive('readBytes')->once()->andReturn([ord('b')]);
         $charStream->shouldReceive('readBytes')->once()->andReturn(false);
 
         $encoder = new Swift_Encoder_QpEncoder($charStream);
@@ -166,15 +166,15 @@ class Swift_Encoder_QpEncoderTest extends \SwiftMailerTestCase
                     ->once()
                     ->with($string);
 
-        $charStream->shouldReceive('readBytes')->once()->andReturn(array(ord('a')));
-        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x0D));
-        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x0A));
-        $charStream->shouldReceive('readBytes')->once()->andReturn(array(ord('b')));
-        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x0D));
-        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x0A));
-        $charStream->shouldReceive('readBytes')->once()->andReturn(array(ord('c')));
-        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x0D));
-        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x0A));
+        $charStream->shouldReceive('readBytes')->once()->andReturn([ord('a')]);
+        $charStream->shouldReceive('readBytes')->once()->andReturn([0x0D]);
+        $charStream->shouldReceive('readBytes')->once()->andReturn([0x0A]);
+        $charStream->shouldReceive('readBytes')->once()->andReturn([ord('b')]);
+        $charStream->shouldReceive('readBytes')->once()->andReturn([0x0D]);
+        $charStream->shouldReceive('readBytes')->once()->andReturn([0x0A]);
+        $charStream->shouldReceive('readBytes')->once()->andReturn([ord('c')]);
+        $charStream->shouldReceive('readBytes')->once()->andReturn([0x0D]);
+        $charStream->shouldReceive('readBytes')->once()->andReturn([0x0A]);
         $charStream->shouldReceive('readBytes')->once()->andReturn(false);
 
         $encoder = new Swift_Encoder_QpEncoder($charStream);
@@ -206,7 +206,7 @@ class Swift_Encoder_QpEncoderTest extends \SwiftMailerTestCase
         for ($i = 0; $i < 140; ++$i) {
             $charStream->shouldReceive('readBytes')
                        ->once()
-                       ->andReturn(array(ord('a')));
+                       ->andReturn([ord('a')]);
 
             if (75 == $i) {
                 $output .= "=\r\n";
@@ -237,7 +237,7 @@ class Swift_Encoder_QpEncoderTest extends \SwiftMailerTestCase
         for ($i = 0; $i < 100; ++$i) {
             $charStream->shouldReceive('readBytes')
                        ->once()
-                       ->andReturn(array(ord('a')));
+                       ->andReturn([ord('a')]);
 
             if (53 == $i) {
                 $output .= "=\r\n";
@@ -269,7 +269,7 @@ class Swift_Encoder_QpEncoderTest extends \SwiftMailerTestCase
                        ->with($char);
             $charStream->shouldReceive('readBytes')
                        ->once()
-                       ->andReturn(array($ordinal));
+                       ->andReturn([$ordinal]);
             $charStream->shouldReceive('readBytes')
                        ->atLeast()->times(1)
                        ->andReturn(false);
@@ -298,7 +298,7 @@ class Swift_Encoder_QpEncoderTest extends \SwiftMailerTestCase
                     ->with($char);
         $charStream->shouldReceive('readBytes')
                     ->once()
-                    ->andReturn(array(61));
+                    ->andReturn([61]);
         $charStream->shouldReceive('readBytes')
                     ->atLeast()->times(1)
                     ->andReturn(false);
@@ -325,7 +325,7 @@ class Swift_Encoder_QpEncoderTest extends \SwiftMailerTestCase
                        ->with($char);
             $charStream->shouldReceive('readBytes')
                        ->once()
-                       ->andReturn(array($ordinal));
+                       ->andReturn([$ordinal]);
             $charStream->shouldReceive('readBytes')
                        ->atLeast()->times(1)
                        ->andReturn(false);
@@ -353,7 +353,7 @@ class Swift_Encoder_QpEncoderTest extends \SwiftMailerTestCase
         for ($i = 0; $i < 140; ++$i) {
             $charStream->shouldReceive('readBytes')
                        ->once()
-                       ->andReturn(array(ord('a')));
+                       ->andReturn([ord('a')]);
 
             if (53 == $i || 53 + 75 == $i) {
                 $output .= "=\r\n";
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/CommandEventTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/CommandEventTest.php
index f254978c..2915870d 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/CommandEventTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/CommandEventTest.php
@@ -10,8 +10,8 @@ class Swift_Events_CommandEventTest extends \PHPUnit\Framework\TestCase
 
     public function testSuccessCodesCanBeFetchedViaGetter()
     {
-        $evt = $this->createEvent($this->createTransport(), "FOO\r\n", array(250));
-        $this->assertEquals(array(250), $evt->getSuccessCodes());
+        $evt = $this->createEvent($this->createTransport(), "FOO\r\n", [250]);
+        $this->assertEquals([250], $evt->getSuccessCodes());
     }
 
     public function testSourceIsBuffer()
@@ -22,7 +22,7 @@ class Swift_Events_CommandEventTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals($transport, $ref);
     }
 
-    private function createEvent(Swift_Transport $source, $command, $successCodes = array())
+    private function createEvent(Swift_Transport $source, $command, $successCodes = [])
     {
         return new Swift_Events_CommandEvent($source, $command, $successCodes);
     }
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/SendEventTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/SendEventTest.php
index 78dfca7a..9f55589a 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/SendEventTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/SendEventTest.php
@@ -63,9 +63,9 @@ class Swift_Events_SendEventTest extends \PHPUnit\Framework\TestCase
 
         $evt = $this->createEvent($transport, $message);
 
-        $evt->setFailedRecipients(array('foo@bar', 'zip@button'));
+        $evt->setFailedRecipients(['foo@bar', 'zip@button']);
 
-        $this->assertEquals(array('foo@bar', 'zip@button'), $evt->getFailedRecipients(),
+        $this->assertEquals(['foo@bar', 'zip@button'], $evt->getFailedRecipients(),
             '%s: FailedRecipients should be returned from getter'
             );
     }
@@ -76,7 +76,7 @@ class Swift_Events_SendEventTest extends \PHPUnit\Framework\TestCase
         $transport = $this->createTransport();
 
         $evt = $this->createEvent($transport, $message);
-        $this->assertEquals(array(), $evt->getFailedRecipients());
+        $this->assertEquals([], $evt->getFailedRecipients());
     }
 
     private function createEvent(Swift_Transport $source, Swift_Mime_SimpleMessage $message)
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/SimpleEventDispatcherTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/SimpleEventDispatcherTest.php
index 611a6df2..d5dce2b9 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/SimpleEventDispatcherTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/SimpleEventDispatcherTest.php
@@ -22,11 +22,11 @@ class Swift_Events_SimpleEventDispatcherTest extends \PHPUnit\Framework\TestCase
     public function testCommandEventCanBeCreated()
     {
         $buf = $this->getMockBuilder('Swift_Transport')->getMock();
-        $evt = $this->dispatcher->createCommandEvent($buf, "FOO\r\n", array(250));
+        $evt = $this->dispatcher->createCommandEvent($buf, "FOO\r\n", [250]);
         $this->assertInstanceOf('Swift_Events_CommandEvent', $evt);
         $this->assertSame($buf, $evt->getSource());
         $this->assertEquals("FOO\r\n", $evt->getCommand());
-        $this->assertEquals(array(250), $evt->getSuccessCodes());
+        $this->assertEquals([250], $evt->getSuccessCodes());
     }
 
     public function testResponseEventCanBeCreated()
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mailer/ArrayRecipientIteratorTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mailer/ArrayRecipientIteratorTest.php
index 4344910a..12506ddf 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mailer/ArrayRecipientIteratorTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mailer/ArrayRecipientIteratorTest.php
@@ -4,19 +4,19 @@ class Swift_Mailer_ArrayRecipientIteratorTest extends \PHPUnit\Framework\TestCas
 {
     public function testHasNextReturnsFalseForEmptyArray()
     {
-        $it = new Swift_Mailer_ArrayRecipientIterator(array());
+        $it = new Swift_Mailer_ArrayRecipientIterator([]);
         $this->assertFalse($it->hasNext());
     }
 
     public function testHasNextReturnsTrueIfItemsLeft()
     {
-        $it = new Swift_Mailer_ArrayRecipientIterator(array('foo@bar' => 'Foo'));
+        $it = new Swift_Mailer_ArrayRecipientIterator(['foo@bar' => 'Foo']);
         $this->assertTrue($it->hasNext());
     }
 
     public function testReadingToEndOfListCausesHasNextToReturnFalse()
     {
-        $it = new Swift_Mailer_ArrayRecipientIterator(array('foo@bar' => 'Foo'));
+        $it = new Swift_Mailer_ArrayRecipientIterator(['foo@bar' => 'Foo']);
         $this->assertTrue($it->hasNext());
         $it->nextRecipient();
         $this->assertFalse($it->hasNext());
@@ -24,19 +24,19 @@ class Swift_Mailer_ArrayRecipientIteratorTest extends \PHPUnit\Framework\TestCas
 
     public function testReturnedValueHasPreservedKeyValuePair()
     {
-        $it = new Swift_Mailer_ArrayRecipientIterator(array('foo@bar' => 'Foo'));
-        $this->assertEquals(array('foo@bar' => 'Foo'), $it->nextRecipient());
+        $it = new Swift_Mailer_ArrayRecipientIterator(['foo@bar' => 'Foo']);
+        $this->assertEquals(['foo@bar' => 'Foo'], $it->nextRecipient());
     }
 
     public function testIteratorMovesNextAfterEachIteration()
     {
-        $it = new Swift_Mailer_ArrayRecipientIterator(array(
+        $it = new Swift_Mailer_ArrayRecipientIterator([
             'foo@bar' => 'Foo',
             'zip@button' => 'Zip thing',
             'test@test' => null,
-            ));
-        $this->assertEquals(array('foo@bar' => 'Foo'), $it->nextRecipient());
-        $this->assertEquals(array('zip@button' => 'Zip thing'), $it->nextRecipient());
-        $this->assertEquals(array('test@test' => null), $it->nextRecipient());
+            ]);
+        $this->assertEquals(['foo@bar' => 'Foo'], $it->nextRecipient());
+        $this->assertEquals(['zip@button' => 'Zip thing'], $it->nextRecipient());
+        $this->assertEquals(['test@test' => null], $it->nextRecipient());
     }
 }
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/MailerTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/MailerTest.php
index b95e1b51..a2a96d0f 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/MailerTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/MailerTest.php
@@ -77,7 +77,7 @@ class Swift_MailerTest extends \SwiftMailerTestCase
 
     public function testFailedRecipientReferenceIsPassedToTransport()
     {
-        $failures = array();
+        $failures = [];
 
         $transport = $this->createTransport();
         $message = $this->createMessage();
@@ -92,14 +92,14 @@ class Swift_MailerTest extends \SwiftMailerTestCase
 
     public function testSendRecordsRfcComplianceExceptionAsEntireSendFailure()
     {
-        $failures = array();
+        $failures = [];
 
         $rfcException = new Swift_RfcComplianceException('test');
         $transport = $this->createTransport();
         $message = $this->createMessage();
         $message->shouldReceive('getTo')
                   ->once()
-                  ->andReturn(array('foo&invalid' => 'Foo', 'bar@valid.tld' => 'Bar'));
+                  ->andReturn(['foo&invalid' => 'Foo', 'bar@valid.tld' => 'Bar']);
         $transport->shouldReceive('send')
                   ->once()
                   ->with($message, $failures)
@@ -107,7 +107,7 @@ class Swift_MailerTest extends \SwiftMailerTestCase
 
         $mailer = $this->createMailer($transport);
         $this->assertEquals(0, $mailer->send($message, $failures), '%s: Should return 0');
-        $this->assertEquals(array('foo&invalid', 'bar@valid.tld'), $failures, '%s: Failures should contain all addresses since the entire message failed to compile');
+        $this->assertEquals(['foo&invalid', 'bar@valid.tld'], $failures, '%s: Failures should contain all addresses since the entire message failed to compile');
     }
 
     public function testRegisterPluginDelegatesToTransport()
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AbstractMimeEntityTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AbstractMimeEntityTest.php
index 928b7364..c7c2c03d 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AbstractMimeEntityTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AbstractMimeEntityTest.php
@@ -16,7 +16,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
     public function testContentTypeIsReturnedFromHeader()
     {
         $ctype = $this->createHeader('Content-Type', 'image/jpeg-test');
-        $headers = $this->createHeaderSet(array('Content-Type' => $ctype));
+        $headers = $this->createHeaderSet(['Content-Type' => $ctype]);
         $entity = $this->createEntity($headers, $this->createEncoder(),
             $this->createCache()
             );
@@ -25,8 +25,8 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
 
     public function testContentTypeIsSetInHeader()
     {
-        $ctype = $this->createHeader('Content-Type', 'text/plain', array(), false);
-        $headers = $this->createHeaderSet(array('Content-Type' => $ctype));
+        $ctype = $this->createHeader('Content-Type', 'text/plain', [], false);
+        $headers = $this->createHeaderSet(['Content-Type' => $ctype]);
 
         $ctype->shouldReceive('setFieldBodyModel')
               ->once()
@@ -43,7 +43,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
 
     public function testContentTypeHeaderIsAddedIfNoneSet()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addParameterizedHeader')
                 ->once()
                 ->with('Content-Type', 'image/jpeg');
@@ -58,7 +58,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
 
     public function testContentTypeCanBeSetViaSetBody()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addParameterizedHeader')
                 ->once()
                 ->with('Content-Type', 'text/html');
@@ -95,11 +95,11 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
     {
         $encoder = $this->createEncoder('base64');
         $encoding = $this->createHeader(
-            'Content-Transfer-Encoding', '8bit', array(), false
+            'Content-Transfer-Encoding', '8bit', [], false
             );
-        $headers = $this->createHeaderSet(array(
+        $headers = $this->createHeaderSet([
             'Content-Transfer-Encoding' => $encoding,
-            ));
+            ]);
         $encoding->shouldReceive('setFieldBodyModel')
                  ->once()
                  ->with('base64');
@@ -114,7 +114,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
 
     public function testSettingEncoderAddsEncodingHeaderIfNonePresent()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addTextHeader')
                 ->once()
                 ->with('Content-Transfer-Encoding', 'something');
@@ -137,7 +137,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
         */
 
         $cid = $this->createHeader('Content-ID', 'zip@button');
-        $headers = $this->createHeaderSet(array('Content-ID' => $cid));
+        $headers = $this->createHeaderSet(['Content-ID' => $cid]);
         $entity = $this->createEntity($headers, $this->createEncoder(),
             $this->createCache()
             );
@@ -146,8 +146,8 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
 
     public function testIdIsSetInHeader()
     {
-        $cid = $this->createHeader('Content-ID', 'zip@button', array(), false);
-        $headers = $this->createHeaderSet(array('Content-ID' => $cid));
+        $cid = $this->createHeader('Content-ID', 'zip@button', [], false);
+        $headers = $this->createHeaderSet(['Content-ID' => $cid]);
 
         $cid->shouldReceive('setFieldBodyModel')
             ->once()
@@ -201,7 +201,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
         */
 
         $desc = $this->createHeader('Content-Description', 'something');
-        $headers = $this->createHeaderSet(array('Content-Description' => $desc));
+        $headers = $this->createHeaderSet(['Content-Description' => $desc]);
         $entity = $this->createEntity($headers, $this->createEncoder(),
             $this->createCache()
             );
@@ -210,10 +210,10 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
 
     public function testDescriptionIsSetInHeader()
     {
-        $desc = $this->createHeader('Content-Description', '', array(), false);
+        $desc = $this->createHeader('Content-Description', '', [], false);
         $desc->shouldReceive('setFieldBodyModel')->once()->with('whatever');
 
-        $headers = $this->createHeaderSet(array('Content-Description' => $desc));
+        $headers = $this->createHeaderSet(['Content-Description' => $desc]);
 
         $entity = $this->createEntity($headers, $this->createEncoder(),
             $this->createCache()
@@ -223,7 +223,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
 
     public function testDescriptionHeaderIsAddedIfNotPresent()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addTextHeader')
                 ->once()
                 ->with('Content-Description', 'whatever');
@@ -276,7 +276,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
 
     public function testHeadersAppearInString()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('toString')
                 ->once()
                 ->andReturn(
@@ -305,7 +305,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
 
     public function testBodyIsAppended()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('toString')
                 ->once()
                 ->andReturn("Content-Type: text/plain; charset=utf-8\r\n");
@@ -334,7 +334,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
 
     public function testByteStreamBodyIsAppended()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $os = $this->createOutputStream('streamed');
         $headers->shouldReceive('toString')
                 ->once()
@@ -396,19 +396,19 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
     public function testAddingChildrenGeneratesBoundaryInHeaders()
     {
         $child = $this->createChild();
-        $cType = $this->createHeader('Content-Type', 'text/plain', array(), false);
+        $cType = $this->createHeader('Content-Type', 'text/plain', [], false);
         $cType->shouldReceive('setParameter')
               ->once()
               ->with('boundary', \Mockery::any());
         $cType->shouldReceive('setParameter')
               ->zeroOrMoreTimes();
 
-        $entity = $this->createEntity($this->createHeaderSet(array(
+        $entity = $this->createEntity($this->createHeaderSet([
             'Content-Type' => $cType,
-            )),
+            ]),
             $this->createEncoder(), $this->createCache()
             );
-        $entity->setChildren(array($child));
+        $entity->setChildren([$child]);
     }
 
     public function testChildrenOfLevelAttachmentAndLessCauseMultipartMixed()
@@ -417,7 +417,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
             $level > Swift_Mime_SimpleMimeEntity::LEVEL_TOP; $level /= 2) {
             $child = $this->createChild($level);
             $cType = $this->createHeader(
-                'Content-Type', 'text/plain', array(), false
+                'Content-Type', 'text/plain', [], false
                 );
             $cType->shouldReceive('setFieldBodyModel')
                   ->once()
@@ -425,11 +425,11 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
             $cType->shouldReceive('setFieldBodyModel')
                   ->zeroOrMoreTimes();
 
-            $entity = $this->createEntity($this->createHeaderSet(array(
-                'Content-Type' => $cType, )),
+            $entity = $this->createEntity($this->createHeaderSet([
+                'Content-Type' => $cType, ]),
                 $this->createEncoder(), $this->createCache()
                 );
-            $entity->setChildren(array($child));
+            $entity->setChildren([$child]);
         }
     }
 
@@ -439,7 +439,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
             $level > Swift_Mime_SimpleMimeEntity::LEVEL_MIXED; $level /= 2) {
             $child = $this->createChild($level);
             $cType = $this->createHeader(
-                'Content-Type', 'text/plain', array(), false
+                'Content-Type', 'text/plain', [], false
                 );
             $cType->shouldReceive('setFieldBodyModel')
                   ->once()
@@ -447,11 +447,11 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
             $cType->shouldReceive('setFieldBodyModel')
                   ->zeroOrMoreTimes();
 
-            $entity = $this->createEntity($this->createHeaderSet(array(
-                'Content-Type' => $cType, )),
+            $entity = $this->createEntity($this->createHeaderSet([
+                'Content-Type' => $cType, ]),
                 $this->createEncoder(), $this->createCache()
                 );
-            $entity->setChildren(array($child));
+            $entity->setChildren([$child]);
         }
     }
 
@@ -461,7 +461,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
             $level > Swift_Mime_SimpleMimeEntity::LEVEL_ALTERNATIVE; $level /= 2) {
             $child = $this->createChild($level);
             $cType = $this->createHeader(
-                'Content-Type', 'text/plain', array(), false
+                'Content-Type', 'text/plain', [], false
                 );
             $cType->shouldReceive('setFieldBodyModel')
                   ->once()
@@ -469,54 +469,54 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
             $cType->shouldReceive('setFieldBodyModel')
                   ->zeroOrMoreTimes();
 
-            $entity = $this->createEntity($this->createHeaderSet(array(
-                'Content-Type' => $cType, )),
+            $entity = $this->createEntity($this->createHeaderSet([
+                'Content-Type' => $cType, ]),
                 $this->createEncoder(), $this->createCache()
                 );
-            $entity->setChildren(array($child));
+            $entity->setChildren([$child]);
         }
     }
 
     public function testHighestLevelChildDeterminesContentType()
     {
-        $combinations = array(
-            array('levels' => array(Swift_Mime_SimpleMimeEntity::LEVEL_MIXED,
+        $combinations = [
+            ['levels' => [Swift_Mime_SimpleMimeEntity::LEVEL_MIXED,
                 Swift_Mime_SimpleMimeEntity::LEVEL_ALTERNATIVE,
                 Swift_Mime_SimpleMimeEntity::LEVEL_RELATED,
-                ),
+                ],
                 'type' => 'multipart/mixed',
-                ),
-            array('levels' => array(Swift_Mime_SimpleMimeEntity::LEVEL_MIXED,
+                ],
+            ['levels' => [Swift_Mime_SimpleMimeEntity::LEVEL_MIXED,
                 Swift_Mime_SimpleMimeEntity::LEVEL_RELATED,
-                ),
+                ],
                 'type' => 'multipart/mixed',
-                ),
-            array('levels' => array(Swift_Mime_SimpleMimeEntity::LEVEL_MIXED,
+                ],
+            ['levels' => [Swift_Mime_SimpleMimeEntity::LEVEL_MIXED,
                 Swift_Mime_SimpleMimeEntity::LEVEL_ALTERNATIVE,
-                ),
+                ],
                 'type' => 'multipart/mixed',
-                ),
-            array('levels' => array(Swift_Mime_SimpleMimeEntity::LEVEL_ALTERNATIVE,
+                ],
+            ['levels' => [Swift_Mime_SimpleMimeEntity::LEVEL_ALTERNATIVE,
                 Swift_Mime_SimpleMimeEntity::LEVEL_RELATED,
-                ),
+                ],
                 'type' => 'multipart/alternative',
-                ),
-            );
+                ],
+            ];
 
         foreach ($combinations as $combination) {
-            $children = array();
+            $children = [];
             foreach ($combination['levels'] as $level) {
                 $children[] = $this->createChild($level);
             }
 
             $cType = $this->createHeader(
-                'Content-Type', 'text/plain', array(), false
+                'Content-Type', 'text/plain', [], false
                 );
             $cType->shouldReceive('setFieldBodyModel')
                   ->once()
                   ->with($combination['type']);
 
-            $headerSet = $this->createHeaderSet(array('Content-Type' => $cType));
+            $headerSet = $this->createHeaderSet(['Content-Type' => $cType]);
             $headerSet->shouldReceive('newInstance')
                       ->zeroOrMoreTimes()
                       ->andReturnUsing(function () use ($headerSet) {
@@ -535,7 +535,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
      (excerpt too verbose to paste here)
      */
 
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
 
         $child1 = new MimeEntityFixture(Swift_Mime_SimpleMimeEntity::LEVEL_ALTERNATIVE,
             "Content-Type: text/plain\r\n".
@@ -557,7 +557,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
             $this->createCache()
             );
         $entity->setBoundary('xxx');
-        $entity->setChildren(array($child1, $child2));
+        $entity->setChildren([$child1, $child2]);
 
         $this->assertEquals(
             "Content-Type: multipart/alternative; boundary=\"xxx\"\r\n".
@@ -577,8 +577,8 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
 
     public function testMixingLevelsIsHierarchical()
     {
-        $headers = $this->createHeaderSet(array(), false);
-        $newHeaders = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
+        $newHeaders = $this->createHeaderSet([], false);
 
         $part = $this->createChild(Swift_Mime_SimpleMimeEntity::LEVEL_ALTERNATIVE,
             "Content-Type: text/plain\r\n".
@@ -606,7 +606,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
             $this->createCache()
             );
         $entity->setBoundary('xxx');
-        $entity->setChildren(array($part, $attachment));
+        $entity->setChildren([$part, $attachment]);
 
         $this->assertRegExp(
             '~^'.
@@ -640,7 +640,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
         $entity = $this->createEntity($this->createHeaderSet(),
             $this->createEncoder(), $this->createCache()
             );
-        $entity->setChildren(array($child));
+        $entity->setChildren([$child]);
         $entity->setEncoder($encoder);
     }
 
@@ -656,7 +656,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
         $entity = $this->createEntity($this->createHeaderSet(),
             $this->createEncoder(), $this->createCache()
             );
-        $entity->setChildren(array($child));
+        $entity->setChildren([$child]);
         $entity->encoderChanged($encoder);
     }
 
@@ -670,7 +670,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
         $entity = $this->createEntity($this->createHeaderSet(),
             $this->createEncoder(), $this->createCache()
             );
-        $entity->setChildren(array($child));
+        $entity->setChildren([$child]);
         $entity->charsetChanged('windows-874');
     }
 
@@ -714,7 +714,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
             'TEXT PART',
             'text/plain'
             );
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('toString')
                 ->zeroOrMoreTimes()
                 ->andReturn("Content-Type: multipart/alternative; boundary=\"xxx\"\r\n");
@@ -723,7 +723,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
             $this->createCache()
             );
         $entity->setBoundary('xxx');
-        $entity->setChildren(array($htmlChild, $textChild));
+        $entity->setChildren([$htmlChild, $textChild]);
 
         $this->assertEquals(
             "Content-Type: multipart/alternative; boundary=\"xxx\"\r\n".
@@ -754,7 +754,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
             'PART 2',
             'text/plain'
         );
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('toString')
             ->zeroOrMoreTimes()
             ->andReturn("Content-Type: multipart/alternative; boundary=\"xxx\"\r\n");
@@ -763,7 +763,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
             $this->createCache()
         );
         $entity->setBoundary('xxx');
-        $entity->setChildren(array($firstChild, $secondChild));
+        $entity->setChildren([$firstChild, $secondChild]);
 
         $this->assertEquals(
             "Content-Type: multipart/alternative; boundary=\"xxx\"\r\n".
@@ -782,7 +782,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
 
     public function testUnsettingChildrenRestoresContentType()
     {
-        $cType = $this->createHeader('Content-Type', 'text/plain', array(), false);
+        $cType = $this->createHeader('Content-Type', 'text/plain', [], false);
         $child = $this->createChild(Swift_Mime_SimpleMimeEntity::LEVEL_ALTERNATIVE);
 
         $cType->shouldReceive('setFieldBodyModel')
@@ -795,20 +795,20 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
               ->zeroOrMoreTimes()
               ->with(\Mockery::not('multipart/alternative', 'image/jpeg'));
 
-        $entity = $this->createEntity($this->createHeaderSet(array(
+        $entity = $this->createEntity($this->createHeaderSet([
             'Content-Type' => $cType,
-            )),
+            ]),
             $this->createEncoder(), $this->createCache()
             );
 
         $entity->setContentType('image/jpeg');
-        $entity->setChildren(array($child));
-        $entity->setChildren(array());
+        $entity->setChildren([$child]);
+        $entity->setChildren([]);
     }
 
     public function testBodyIsReadFromCacheWhenUsingToStringIfPresent()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('toString')
                 ->zeroOrMoreTimes()
                 ->andReturn("Content-Type: text/plain; charset=utf-8\r\n");
@@ -838,7 +838,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
 
     public function testBodyIsAddedToCacheWhenUsingToString()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('toString')
                 ->zeroOrMoreTimes()
                 ->andReturn("Content-Type: text/plain; charset=utf-8\r\n");
@@ -862,7 +862,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
 
     public function testBodyIsClearedFromCacheIfNewBodySet()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('toString')
                 ->zeroOrMoreTimes()
                 ->andReturn("Content-Type: text/plain; charset=utf-8\r\n");
@@ -885,7 +885,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
 
     public function testBodyIsNotClearedFromCacheIfSameBodySet()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('toString')
                 ->zeroOrMoreTimes()
                 ->andReturn("Content-Type: text/plain; charset=utf-8\r\n");
@@ -907,7 +907,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
 
     public function testBodyIsClearedFromCacheIfNewEncoderSet()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('toString')
                 ->zeroOrMoreTimes()
                 ->andReturn("Content-Type: text/plain; charset=utf-8\r\n");
@@ -984,7 +984,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
             ->setMaxLineLength(998)
             ->setBody('xx')
             ->setBoundary('xyz')
-            ->setChildren(array())
+            ->setChildren([])
             );
     }
 
@@ -1027,7 +1027,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
         return $this->getMockery('Swift_KeyCache')->shouldIgnoreMissing();
     }
 
-    protected function createHeaderSet($headers = array(), $stub = true)
+    protected function createHeaderSet($headers = [], $stub = true)
     {
         $set = $this->getMockery('Swift_Mime_SimpleHeaderSet')->shouldIgnoreMissing();
         $set->shouldReceive('get')
@@ -1044,7 +1044,7 @@ abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
         return $set;
     }
 
-    protected function createHeader($name, $model = null, $params = array(), $stub = true)
+    protected function createHeader($name, $model = null, $params = [], $stub = true)
     {
         $header = $this->getMockery('Swift_Mime_Headers_ParameterizedHeader')->shouldIgnoreMissing();
         $header->shouldReceive('getFieldName')
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AttachmentTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AttachmentTest.php
index adce0109..912d529c 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AttachmentTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AttachmentTest.php
@@ -19,8 +19,8 @@ class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTest
      */
 
         $disposition = $this->createHeader('Content-Disposition', 'attachment');
-        $attachment = $this->createAttachment($this->createHeaderSet(array(
-            'Content-Disposition' => $disposition, )),
+        $attachment = $this->createAttachment($this->createHeaderSet([
+            'Content-Disposition' => $disposition, ]),
             $this->createEncoder(), $this->createCache()
             );
         $this->assertEquals('attachment', $attachment->getDisposition());
@@ -29,7 +29,7 @@ class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTest
     public function testDispositionIsSetInHeader()
     {
         $disposition = $this->createHeader('Content-Disposition', 'attachment',
-            array(), false
+            [], false
             );
         $disposition->shouldReceive('setFieldBodyModel')
                     ->once()
@@ -37,8 +37,8 @@ class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTest
         $disposition->shouldReceive('setFieldBodyModel')
                     ->zeroOrMoreTimes();
 
-        $attachment = $this->createAttachment($this->createHeaderSet(array(
-            'Content-Disposition' => $disposition, )),
+        $attachment = $this->createAttachment($this->createHeaderSet([
+            'Content-Disposition' => $disposition, ]),
             $this->createEncoder(), $this->createCache()
             );
         $attachment->setDisposition('inline');
@@ -46,7 +46,7 @@ class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTest
 
     public function testDispositionIsAddedIfNonePresent()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addParameterizedHeader')
                 ->once()
                 ->with('Content-Disposition', 'inline');
@@ -61,7 +61,7 @@ class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTest
 
     public function testDispositionIsAutoDefaultedToAttachment()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addParameterizedHeader')
                 ->once()
                 ->with('Content-Disposition', 'attachment');
@@ -76,7 +76,7 @@ class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTest
     public function testDefaultContentTypeInitializedToOctetStream()
     {
         $cType = $this->createHeader('Content-Type', '',
-            array(), false
+            [], false
             );
         $cType->shouldReceive('setFieldBodyModel')
               ->once()
@@ -84,8 +84,8 @@ class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTest
         $cType->shouldReceive('setFieldBodyModel')
               ->zeroOrMoreTimes();
 
-        $attachment = $this->createAttachment($this->createHeaderSet(array(
-            'Content-Type' => $cType, )),
+        $attachment = $this->createAttachment($this->createHeaderSet([
+            'Content-Type' => $cType, ]),
             $this->createEncoder(), $this->createCache()
             );
     }
@@ -96,10 +96,10 @@ class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTest
      */
 
         $disposition = $this->createHeader('Content-Disposition', 'attachment',
-            array('filename' => 'foo.txt')
+            ['filename' => 'foo.txt']
             );
-        $attachment = $this->createAttachment($this->createHeaderSet(array(
-            'Content-Disposition' => $disposition, )),
+        $attachment = $this->createAttachment($this->createHeaderSet([
+            'Content-Disposition' => $disposition, ]),
             $this->createEncoder(), $this->createCache()
             );
         $this->assertEquals('foo.txt', $attachment->getFilename());
@@ -108,7 +108,7 @@ class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTest
     public function testFilenameIsSetInHeader()
     {
         $disposition = $this->createHeader('Content-Disposition', 'attachment',
-            array('filename' => 'foo.txt'), false
+            ['filename' => 'foo.txt'], false
             );
         $disposition->shouldReceive('setParameter')
                     ->once()
@@ -116,8 +116,8 @@ class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTest
         $disposition->shouldReceive('setParameter')
                     ->zeroOrMoreTimes();
 
-        $attachment = $this->createAttachment($this->createHeaderSet(array(
-            'Content-Disposition' => $disposition, )),
+        $attachment = $this->createAttachment($this->createHeaderSet([
+            'Content-Disposition' => $disposition, ]),
             $this->createEncoder(), $this->createCache()
             );
         $attachment->setFilename('bar.txt');
@@ -130,7 +130,7 @@ class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTest
      */
 
         $cType = $this->createHeader('Content-Type', 'text/plain',
-            array(), false
+            [], false
             );
         $cType->shouldReceive('setParameter')
               ->once()
@@ -138,8 +138,8 @@ class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTest
         $cType->shouldReceive('setParameter')
               ->zeroOrMoreTimes();
 
-        $attachment = $this->createAttachment($this->createHeaderSet(array(
-            'Content-Type' => $cType, )),
+        $attachment = $this->createAttachment($this->createHeaderSet([
+            'Content-Type' => $cType, ]),
             $this->createEncoder(), $this->createCache()
             );
         $attachment->setFilename('bar.txt');
@@ -151,10 +151,10 @@ class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTest
      */
 
         $disposition = $this->createHeader('Content-Disposition', 'attachment',
-            array('size' => 1234)
+            ['size' => 1234]
             );
-        $attachment = $this->createAttachment($this->createHeaderSet(array(
-            'Content-Disposition' => $disposition, )),
+        $attachment = $this->createAttachment($this->createHeaderSet([
+            'Content-Disposition' => $disposition, ]),
             $this->createEncoder(), $this->createCache()
             );
         $this->assertEquals(1234, $attachment->getSize());
@@ -163,7 +163,7 @@ class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTest
     public function testSizeIsSetInHeader()
     {
         $disposition = $this->createHeader('Content-Disposition', 'attachment',
-            array(), false
+            [], false
             );
         $disposition->shouldReceive('setParameter')
                     ->once()
@@ -171,8 +171,8 @@ class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTest
         $disposition->shouldReceive('setParameter')
                     ->zeroOrMoreTimes();
 
-        $attachment = $this->createAttachment($this->createHeaderSet(array(
-            'Content-Disposition' => $disposition, )),
+        $attachment = $this->createAttachment($this->createHeaderSet([
+            'Content-Disposition' => $disposition, ]),
             $this->createEncoder(), $this->createCache()
             );
         $attachment->setSize(12345);
@@ -182,14 +182,14 @@ class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTest
     {
         $file = $this->createFileStream('/bar/file.ext', '');
         $disposition = $this->createHeader('Content-Disposition', 'attachment',
-            array('filename' => 'foo.txt'), false
+            ['filename' => 'foo.txt'], false
             );
         $disposition->shouldReceive('setParameter')
                     ->once()
                     ->with('filename', 'file.ext');
 
-        $attachment = $this->createAttachment($this->createHeaderSet(array(
-            'Content-Disposition' => $disposition, )),
+        $attachment = $this->createAttachment($this->createHeaderSet([
+            'Content-Disposition' => $disposition, ]),
             $this->createEncoder(), $this->createCache()
             );
         $attachment->setFile($file);
@@ -199,23 +199,23 @@ class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTest
     {
         $file = $this->createFileStream('/bar/file.ext', '');
         $disposition = $this->createHeader('Content-Disposition', 'attachment',
-            array('filename' => 'foo.txt'), false
+            ['filename' => 'foo.txt'], false
             );
         $disposition->shouldReceive('setParameter')
                     ->once()
                     ->with('filename', 'file.ext');
 
-        $ctype = $this->createHeader('Content-Type', 'text/plain', array(), false);
+        $ctype = $this->createHeader('Content-Type', 'text/plain', [], false);
         $ctype->shouldReceive('setFieldBodyModel')
               ->once()
               ->with('text/html');
         $ctype->shouldReceive('setFieldBodyModel')
               ->zeroOrMoreTimes();
 
-        $headers = $this->createHeaderSet(array(
+        $headers = $this->createHeaderSet([
             'Content-Disposition' => $disposition,
             'Content-Type' => $ctype,
-            ));
+            ]);
 
         $attachment = $this->createAttachment($headers, $this->createEncoder(),
             $this->createCache()
@@ -227,26 +227,26 @@ class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTest
     {
         $file = $this->createFileStream('/bar/file.zip', '');
         $disposition = $this->createHeader('Content-Disposition', 'attachment',
-            array('filename' => 'foo.zip'), false
+            ['filename' => 'foo.zip'], false
             );
         $disposition->shouldReceive('setParameter')
                     ->once()
                     ->with('filename', 'file.zip');
 
-        $ctype = $this->createHeader('Content-Type', 'text/plain', array(), false);
+        $ctype = $this->createHeader('Content-Type', 'text/plain', [], false);
         $ctype->shouldReceive('setFieldBodyModel')
               ->once()
               ->with('application/zip');
         $ctype->shouldReceive('setFieldBodyModel')
               ->zeroOrMoreTimes();
 
-        $headers = $this->createHeaderSet(array(
+        $headers = $this->createHeaderSet([
             'Content-Disposition' => $disposition,
             'Content-Type' => $ctype,
-            ));
+            ]);
 
         $attachment = $this->createAttachment($headers, $this->createEncoder(),
-            $this->createCache(), array('zip' => 'application/zip', 'txt' => 'text/plain')
+            $this->createCache(), ['zip' => 'application/zip', 'txt' => 'text/plain']
             );
         $attachment->setFile($file);
     }
@@ -275,7 +275,7 @@ class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTest
             ->setMaxLineLength(998)
             ->setBody('xx')
             ->setBoundary('xyz')
-            ->setChildren(array())
+            ->setChildren([])
             ->setDisposition('inline')
             ->setFilename('afile.txt')
             ->setSize(123)
@@ -288,7 +288,7 @@ class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTest
         return $this->createAttachment($headers, $encoder, $cache);
     }
 
-    protected function createAttachment($headers, $encoder, $cache, $mimeTypes = array())
+    protected function createAttachment($headers, $encoder, $cache, $mimeTypes = [])
     {
         $idGenerator = new Swift_Mime_IdGenerator('example.com');
 
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/PlainContentEncoderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/PlainContentEncoderTest.php
index 7c673abd..270d02c3 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/PlainContentEncoderTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/PlainContentEncoderTest.php
@@ -49,7 +49,7 @@ class Swift_Mime_ContentEncoder_PlainContentEncoderTest extends \SwiftMailerTest
     {
         $encoder = $this->getEncoder('7bit');
 
-        $chars = array();
+        $chars = [];
         for ($i = 0; $i < 50; ++$i) {
             $chars[] = 'a';
         }
@@ -114,13 +114,13 @@ class Swift_Mime_ContentEncoder_PlainContentEncoderTest extends \SwiftMailerTest
 
     public function crlfProvider()
     {
-        return array(
-            array("\r", "a\r\nb"),
-            array("\n", "a\r\nb"),
-            array("\n\r", "a\r\n\r\nb"),
-            array("\n\n", "a\r\n\r\nb"),
-            array("\r\r", "a\r\n\r\nb"),
-        );
+        return [
+            ["\r", "a\r\nb"],
+            ["\n", "a\r\nb"],
+            ["\n\r", "a\r\n\r\nb"],
+            ["\n\n", "a\r\n\r\nb"],
+            ["\r\r", "a\r\n\r\nb"],
+        ];
     }
 
     /**
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/QpContentEncoderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/QpContentEncoderTest.php
index d9a9abc7..4e050a15 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/QpContentEncoderTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/QpContentEncoderTest.php
@@ -55,7 +55,7 @@ class Swift_Mime_ContentEncoder_QpContentEncoderTest extends \SwiftMailerTestCas
                        ->with($os);
             $charStream->shouldReceive('readBytes')
                        ->once()
-                       ->andReturn(array($ordinal));
+                       ->andReturn([$ordinal]);
             $charStream->shouldReceive('readBytes')
                        ->zeroOrMoreTimes()
                        ->andReturn(false);
@@ -110,22 +110,22 @@ class Swift_Mime_ContentEncoder_QpContentEncoderTest extends \SwiftMailerTestCas
                    ->with($os);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(ord('a')));
+                   ->andReturn([ord('a')]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(0x09));
+                   ->andReturn([0x09]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(0x09));
+                   ->andReturn([0x09]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(0x0D));
+                   ->andReturn([0x0D]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(0x0A));
+                   ->andReturn([0x0A]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(ord('b')));
+                   ->andReturn([ord('b')]);
         $charStream->shouldReceive('readBytes')
                    ->zeroOrMoreTimes()
                    ->andReturn(false);
@@ -151,22 +151,22 @@ class Swift_Mime_ContentEncoder_QpContentEncoderTest extends \SwiftMailerTestCas
                    ->with($os);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(ord('a')));
+                   ->andReturn([ord('a')]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(0x20));
+                   ->andReturn([0x20]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(0x20));
+                   ->andReturn([0x20]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(0x0D));
+                   ->andReturn([0x0D]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(0x0A));
+                   ->andReturn([0x0A]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(ord('b')));
+                   ->andReturn([ord('b')]);
         $charStream->shouldReceive('readBytes')
                    ->zeroOrMoreTimes()
                    ->andReturn(false);
@@ -221,31 +221,31 @@ class Swift_Mime_ContentEncoder_QpContentEncoderTest extends \SwiftMailerTestCas
                    ->with($os);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(ord('a')));
+                   ->andReturn([ord('a')]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(0x0D));
+                   ->andReturn([0x0D]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(0x0A));
+                   ->andReturn([0x0A]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(ord('b')));
+                   ->andReturn([ord('b')]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(0x0D));
+                   ->andReturn([0x0D]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(0x0A));
+                   ->andReturn([0x0A]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(ord('c')));
+                   ->andReturn([ord('c')]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(0x0D));
+                   ->andReturn([0x0D]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(0x0A));
+                   ->andReturn([0x0A]);
         $charStream->shouldReceive('readBytes')
                    ->zeroOrMoreTimes()
                    ->andReturn(false);
@@ -284,7 +284,7 @@ class Swift_Mime_ContentEncoder_QpContentEncoderTest extends \SwiftMailerTestCas
         for ($seq = 0; $seq <= 140; ++$seq) {
             $charStream->shouldReceive('readBytes')
                        ->once()
-                       ->andReturn(array(ord('a')));
+                       ->andReturn([ord('a')]);
         }
         $charStream->shouldReceive('readBytes')
                    ->zeroOrMoreTimes()
@@ -314,7 +314,7 @@ class Swift_Mime_ContentEncoder_QpContentEncoderTest extends \SwiftMailerTestCas
         for ($seq = 0; $seq <= 100; ++$seq) {
             $charStream->shouldReceive('readBytes')
                        ->once()
-                       ->andReturn(array(ord('a')));
+                       ->andReturn([ord('a')]);
         }
         $charStream->shouldReceive('readBytes')
                    ->zeroOrMoreTimes()
@@ -349,7 +349,7 @@ class Swift_Mime_ContentEncoder_QpContentEncoderTest extends \SwiftMailerTestCas
                        ->with($os);
             $charStream->shouldReceive('readBytes')
                        ->once()
-                       ->andReturn(array($ordinal));
+                       ->andReturn([$ordinal]);
             $charStream->shouldReceive('readBytes')
                        ->zeroOrMoreTimes()
                        ->andReturn(false);
@@ -383,7 +383,7 @@ class Swift_Mime_ContentEncoder_QpContentEncoderTest extends \SwiftMailerTestCas
                        ->with($os);
         $charStream->shouldReceive('readBytes')
                        ->once()
-                       ->andReturn(array(61));
+                       ->andReturn([61]);
         $charStream->shouldReceive('readBytes')
                        ->zeroOrMoreTimes()
                        ->andReturn(false);
@@ -417,7 +417,7 @@ class Swift_Mime_ContentEncoder_QpContentEncoderTest extends \SwiftMailerTestCas
                        ->with($os);
             $charStream->shouldReceive('readBytes')
                        ->once()
-                       ->andReturn(array($ordinal));
+                       ->andReturn([$ordinal]);
             $charStream->shouldReceive('readBytes')
                        ->zeroOrMoreTimes()
                        ->andReturn(false);
@@ -447,7 +447,7 @@ class Swift_Mime_ContentEncoder_QpContentEncoderTest extends \SwiftMailerTestCas
         for ($seq = 0; $seq <= 140; ++$seq) {
             $charStream->shouldReceive('readBytes')
                        ->once()
-                       ->andReturn(array(ord('a')));
+                       ->andReturn([ord('a')]);
         }
         $charStream->shouldReceive('readBytes')
                     ->zeroOrMoreTimes()
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/EmbeddedFileTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/EmbeddedFileTest.php
index a0656866..74f2accd 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/EmbeddedFileTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/EmbeddedFileTest.php
@@ -21,7 +21,7 @@ class Swift_Mime_EmbeddedFileTest extends Swift_Mime_AttachmentTest
 
     public function testIdIsAutoGenerated()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addIdHeader')
                 ->once()
                 ->with('Content-ID', '/^.*?@.*?$/D');
@@ -33,7 +33,7 @@ class Swift_Mime_EmbeddedFileTest extends Swift_Mime_AttachmentTest
 
     public function testDefaultDispositionIsInline()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addParameterizedHeader')
                 ->once()
                 ->with('Content-Disposition', 'inline');
@@ -45,7 +45,7 @@ class Swift_Mime_EmbeddedFileTest extends Swift_Mime_AttachmentTest
             );
     }
 
-    protected function createAttachment($headers, $encoder, $cache, $mimeTypes = array())
+    protected function createAttachment($headers, $encoder, $cache, $mimeTypes = [])
     {
         return $this->createEmbeddedFile($headers, $encoder, $cache, $mimeTypes);
     }
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/HeaderEncoder/QpHeaderEncoderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/HeaderEncoder/QpHeaderEncoderTest.php
index 79a11c4f..1b42300c 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/HeaderEncoder/QpHeaderEncoderTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/HeaderEncoder/QpHeaderEncoderTest.php
@@ -24,7 +24,7 @@ class Swift_Mime_HeaderEncoder_QpHeaderEncoderTest extends \SwiftMailerTestCase
         $charStream = $this->createCharacterStream();
         $charStream->shouldReceive('readBytes')
                    ->atLeast()->times(6)
-                   ->andReturn(array(ord('a')), array(0x20), array(0x09), array(0x20), array(ord('b')), false);
+                   ->andReturn([ord('a')], [0x20], [0x09], [0x20], [ord('b')], false);
 
         $encoder = $this->createEncoder($charStream);
         $this->assertNotRegExp('~[ \t]~', $encoder->encodeString("a \t b"),
@@ -46,13 +46,13 @@ class Swift_Mime_HeaderEncoder_QpHeaderEncoderTest extends \SwiftMailerTestCase
         $charStream = $this->createCharacterStream();
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(ord('a')));
+                   ->andReturn([ord('a')]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(0x20));
+                   ->andReturn([0x20]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(ord('b')));
+                   ->andReturn([ord('b')]);
         $charStream->shouldReceive('readBytes')
                    ->zeroOrMoreTimes()
                    ->andReturn(false);
@@ -75,13 +75,13 @@ class Swift_Mime_HeaderEncoder_QpHeaderEncoderTest extends \SwiftMailerTestCase
         $charStream = $this->createCharacterStream();
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(ord('=')));
+                   ->andReturn([ord('=')]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(ord('?')));
+                   ->andReturn([ord('?')]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(ord('_')));
+                   ->andReturn([ord('_')]);
         $charStream->shouldReceive('readBytes')
                    ->zeroOrMoreTimes()
                    ->andReturn(false);
@@ -102,13 +102,13 @@ class Swift_Mime_HeaderEncoder_QpHeaderEncoderTest extends \SwiftMailerTestCase
         $charStream = $this->createCharacterStream();
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(ord('(')));
+                   ->andReturn([ord('(')]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(ord('"')));
+                   ->andReturn([ord('"')]);
         $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array(ord(')')));
+                   ->andReturn([ord(')')]);
         $charStream->shouldReceive('readBytes')
                    ->zeroOrMoreTimes()
                    ->andReturn(false);
@@ -139,7 +139,7 @@ class Swift_Mime_HeaderEncoder_QpHeaderEncoderTest extends \SwiftMailerTestCase
         $allowedBytes = array_merge(
             range(ord('a'), ord('z')), range(ord('A'), ord('Z')),
             range(ord('0'), ord('9')),
-            array(ord('!'), ord('*'), ord('+'), ord('-'), ord('/'))
+            [ord('!'), ord('*'), ord('+'), ord('-'), ord('/')]
             );
 
         foreach (range(0x00, 0xFF) as $byte) {
@@ -148,7 +148,7 @@ class Swift_Mime_HeaderEncoder_QpHeaderEncoderTest extends \SwiftMailerTestCase
             $charStream = $this->createCharacterStream();
             $charStream->shouldReceive('readBytes')
                    ->once()
-                   ->andReturn(array($byte));
+                   ->andReturn([$byte]);
             $charStream->shouldReceive('readBytes')
                    ->zeroOrMoreTimes()
                    ->andReturn(false);
@@ -193,7 +193,7 @@ class Swift_Mime_HeaderEncoder_QpHeaderEncoderTest extends \SwiftMailerTestCase
         for (; $seq < 140; ++$seq) {
             $charStream->shouldReceive('readBytes')
                        ->once()
-                       ->andReturn(array(ord('a')));
+                       ->andReturn([ord('a')]);
 
             if (75 == $seq) {
                 $output .= "\r\n"; // =\r\n
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/IdentificationHeaderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/IdentificationHeaderTest.php
index 0000c2c4..0d2edb7e 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/IdentificationHeaderTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/IdentificationHeaderTest.php
@@ -45,8 +45,8 @@ class Swift_Mime_Headers_IdentificationHeaderTest extends \PHPUnit\Framework\Tes
     public function testMultipleIdsCanBeSet()
     {
         $header = $this->getHeader('References');
-        $header->setIds(array('a@b', 'x@y'));
-        $this->assertEquals(array('a@b', 'x@y'), $header->getIds());
+        $header->setIds(['a@b', 'x@y']);
+        $this->assertEquals(['a@b', 'x@y'], $header->getIds());
     }
 
     public function testSettingMultipleIdsProducesAListValue()
@@ -63,7 +63,7 @@ class Swift_Mime_Headers_IdentificationHeaderTest extends \PHPUnit\Framework\Tes
      */
 
         $header = $this->getHeader('References');
-        $header->setIds(array('a@b', 'x@y'));
+        $header->setIds(['a@b', 'x@y']);
         $this->assertEquals('<a@b> <x@y>', $header->getFieldBody());
     }
 
@@ -133,6 +133,14 @@ class Swift_Mime_Headers_IdentificationHeaderTest extends \PHPUnit\Framework\Tes
         $this->assertEquals('<a@[1.2.3.4]>', $header->getFieldBody());
     }
 
+    public function testIdRigthIsIdnEncoded()
+    {
+        $header = $this->getHeader('References');
+        $header->setId('a@ä');
+        $this->assertEquals('a@ä', $header->getId());
+        $this->assertEquals('<a@xn--4ca>', $header->getFieldBody());
+    }
+
     /**
      * @expectedException \Exception
      * @expectedMessageException "b c d" is not valid id-right
@@ -160,25 +168,25 @@ class Swift_Mime_Headers_IdentificationHeaderTest extends \PHPUnit\Framework\Tes
     {
         $header = $this->getHeader('Message-ID');
         $header->setFieldBodyModel('a@b');
-        $this->assertEquals(array('a@b'), $header->getIds());
+        $this->assertEquals(['a@b'], $header->getIds());
     }
 
     public function testGetBodyModel()
     {
         $header = $this->getHeader('Message-ID');
         $header->setId('a@b');
-        $this->assertEquals(array('a@b'), $header->getFieldBodyModel());
+        $this->assertEquals(['a@b'], $header->getFieldBodyModel());
     }
 
     public function testStringValue()
     {
         $header = $this->getHeader('References');
-        $header->setIds(array('a@b', 'x@y'));
+        $header->setIds(['a@b', 'x@y']);
         $this->assertEquals('References: <a@b> <x@y>'."\r\n", $header->toString());
     }
 
     private function getHeader($name)
     {
-        return new Swift_Mime_Headers_IdentificationHeader($name, new EmailValidator());
+        return new Swift_Mime_Headers_IdentificationHeader($name, new EmailValidator(), new Swift_AddressEncoder_IdnAddressEncoder());
     }
 }
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/MailboxHeaderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/MailboxHeaderTest.php
index 680bafcf..f64f5db5 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/MailboxHeaderTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/MailboxHeaderTest.php
@@ -11,181 +11,217 @@ class Swift_Mime_Headers_MailboxHeaderTest extends \SwiftMailerTestCase
 
     public function testTypeIsMailboxHeader()
     {
-        $header = $this->getHeader('To', $this->getEncoder('Q', true));
+        $header = $this->getHeader('To');
         $this->assertEquals(Swift_Mime_Header::TYPE_MAILBOX, $header->getFieldType());
     }
 
     public function testMailboxIsSetForAddress()
     {
-        $header = $this->getHeader('From', $this->getEncoder('Q', true));
+        $header = $this->getHeader('From');
         $header->setAddresses('chris@swiftmailer.org');
-        $this->assertEquals(array('chris@swiftmailer.org'),
+        $this->assertEquals(['chris@swiftmailer.org'],
             $header->getNameAddressStrings()
             );
     }
 
     public function testMailboxIsRenderedForNameAddress()
     {
-        $header = $this->getHeader('From', $this->getEncoder('Q', true));
-        $header->setNameAddresses(array('chris@swiftmailer.org' => 'Chris Corbyn'));
+        $header = $this->getHeader('From');
+        $header->setNameAddresses(['chris@swiftmailer.org' => 'Chris Corbyn']);
         $this->assertEquals(
-            array('Chris Corbyn <chris@swiftmailer.org>'), $header->getNameAddressStrings()
+            ['Chris Corbyn <chris@swiftmailer.org>'], $header->getNameAddressStrings()
             );
     }
 
     public function testAddressCanBeReturnedForAddress()
     {
-        $header = $this->getHeader('From', $this->getEncoder('Q', true));
+        $header = $this->getHeader('From');
         $header->setAddresses('chris@swiftmailer.org');
-        $this->assertEquals(array('chris@swiftmailer.org'), $header->getAddresses());
+        $this->assertEquals(['chris@swiftmailer.org'], $header->getAddresses());
     }
 
     public function testAddressCanBeReturnedForNameAddress()
     {
-        $header = $this->getHeader('From', $this->getEncoder('Q', true));
-        $header->setNameAddresses(array('chris@swiftmailer.org' => 'Chris Corbyn'));
-        $this->assertEquals(array('chris@swiftmailer.org'), $header->getAddresses());
+        $header = $this->getHeader('From');
+        $header->setNameAddresses(['chris@swiftmailer.org' => 'Chris Corbyn']);
+        $this->assertEquals(['chris@swiftmailer.org'], $header->getAddresses());
     }
 
     public function testQuotesInNameAreQuoted()
     {
-        $header = $this->getHeader('From', $this->getEncoder('Q', true));
-        $header->setNameAddresses(array(
+        $header = $this->getHeader('From');
+        $header->setNameAddresses([
             'chris@swiftmailer.org' => 'Chris Corbyn, "DHE"',
-            ));
+            ]);
         $this->assertEquals(
-            array('"Chris Corbyn, \"DHE\"" <chris@swiftmailer.org>'),
+            ['"Chris Corbyn, \"DHE\"" <chris@swiftmailer.org>'],
             $header->getNameAddressStrings()
             );
     }
 
     public function testEscapeCharsInNameAreQuoted()
     {
-        $header = $this->getHeader('From', $this->getEncoder('Q', true));
-        $header->setNameAddresses(array(
+        $header = $this->getHeader('From');
+        $header->setNameAddresses([
             'chris@swiftmailer.org' => 'Chris Corbyn, \\escaped\\',
-            ));
+            ]);
         $this->assertEquals(
-            array('"Chris Corbyn, \\\\escaped\\\\" <chris@swiftmailer.org>'),
+            ['"Chris Corbyn, \\\\escaped\\\\" <chris@swiftmailer.org>'],
+            $header->getNameAddressStrings()
+            );
+    }
+
+    public function testUtf8CharsInDomainAreIdnEncoded()
+    {
+        $header = $this->getHeader('From');
+        $header->setNameAddresses([
+            'chris@swïftmailer.org' => 'Chris Corbyn',
+            ]);
+        $this->assertEquals(
+            ['Chris Corbyn <chris@xn--swftmailer-78a.org>'],
+            $header->getNameAddressStrings()
+            );
+    }
+
+    /**
+     * @expectedException \Swift_AddressEncoderException
+     */
+    public function testUtf8CharsInLocalPartThrows()
+    {
+        $header = $this->getHeader('From');
+        $header->setNameAddresses([
+            'chrïs@swiftmailer.org' => 'Chris Corbyn',
+            ]);
+        $header->getNameAddressStrings();
+    }
+
+    public function testUtf8CharsInEmail()
+    {
+        $header = $this->getHeader('From', null, new Swift_AddressEncoder_Utf8AddressEncoder());
+        $header->setNameAddresses([
+            'chrïs@swïftmailer.org' => 'Chris Corbyn',
+            ]);
+        $this->assertEquals(
+            ['Chris Corbyn <chrïs@swïftmailer.org>'],
             $header->getNameAddressStrings()
             );
     }
 
     public function testGetMailboxesReturnsNameValuePairs()
     {
-        $header = $this->getHeader('From', $this->getEncoder('Q', true));
-        $header->setNameAddresses(array(
+        $header = $this->getHeader('From');
+        $header->setNameAddresses([
             'chris@swiftmailer.org' => 'Chris Corbyn, DHE',
-            ));
+            ]);
         $this->assertEquals(
-            array('chris@swiftmailer.org' => 'Chris Corbyn, DHE'), $header->getNameAddresses()
+            ['chris@swiftmailer.org' => 'Chris Corbyn, DHE'], $header->getNameAddresses()
             );
     }
 
     public function testMultipleAddressesCanBeSetAndFetched()
     {
-        $header = $this->getHeader('From', $this->getEncoder('Q', true));
-        $header->setAddresses(array(
+        $header = $this->getHeader('From');
+        $header->setAddresses([
             'chris@swiftmailer.org', 'mark@swiftmailer.org',
-            ));
+            ]);
         $this->assertEquals(
-            array('chris@swiftmailer.org', 'mark@swiftmailer.org'),
+            ['chris@swiftmailer.org', 'mark@swiftmailer.org'],
             $header->getAddresses()
             );
     }
 
     public function testMultipleAddressesAsMailboxes()
     {
-        $header = $this->getHeader('From', $this->getEncoder('Q', true));
-        $header->setAddresses(array(
+        $header = $this->getHeader('From');
+        $header->setAddresses([
             'chris@swiftmailer.org', 'mark@swiftmailer.org',
-            ));
+            ]);
         $this->assertEquals(
-            array('chris@swiftmailer.org' => null, 'mark@swiftmailer.org' => null),
+            ['chris@swiftmailer.org' => null, 'mark@swiftmailer.org' => null],
             $header->getNameAddresses()
             );
     }
 
     public function testMultipleAddressesAsMailboxStrings()
     {
-        $header = $this->getHeader('From', $this->getEncoder('Q', true));
-        $header->setAddresses(array(
+        $header = $this->getHeader('From');
+        $header->setAddresses([
             'chris@swiftmailer.org', 'mark@swiftmailer.org',
-            ));
+            ]);
         $this->assertEquals(
-            array('chris@swiftmailer.org', 'mark@swiftmailer.org'),
+            ['chris@swiftmailer.org', 'mark@swiftmailer.org'],
             $header->getNameAddressStrings()
             );
     }
 
     public function testMultipleNamedMailboxesReturnsMultipleAddresses()
     {
-        $header = $this->getHeader('From', $this->getEncoder('Q', true));
-        $header->setNameAddresses(array(
+        $header = $this->getHeader('From');
+        $header->setNameAddresses([
             'chris@swiftmailer.org' => 'Chris Corbyn',
             'mark@swiftmailer.org' => 'Mark Corbyn',
-            ));
+            ]);
         $this->assertEquals(
-            array('chris@swiftmailer.org', 'mark@swiftmailer.org'),
+            ['chris@swiftmailer.org', 'mark@swiftmailer.org'],
             $header->getAddresses()
             );
     }
 
     public function testMultipleNamedMailboxesReturnsMultipleMailboxes()
     {
-        $header = $this->getHeader('From', $this->getEncoder('Q', true));
-        $header->setNameAddresses(array(
+        $header = $this->getHeader('From');
+        $header->setNameAddresses([
             'chris@swiftmailer.org' => 'Chris Corbyn',
             'mark@swiftmailer.org' => 'Mark Corbyn',
-            ));
-        $this->assertEquals(array(
+            ]);
+        $this->assertEquals([
                 'chris@swiftmailer.org' => 'Chris Corbyn',
                 'mark@swiftmailer.org' => 'Mark Corbyn',
-                ),
+                ],
             $header->getNameAddresses()
             );
     }
 
     public function testMultipleMailboxesProducesMultipleMailboxStrings()
     {
-        $header = $this->getHeader('From', $this->getEncoder('Q', true));
-        $header->setNameAddresses(array(
+        $header = $this->getHeader('From');
+        $header->setNameAddresses([
             'chris@swiftmailer.org' => 'Chris Corbyn',
             'mark@swiftmailer.org' => 'Mark Corbyn',
-            ));
-        $this->assertEquals(array(
+            ]);
+        $this->assertEquals([
                 'Chris Corbyn <chris@swiftmailer.org>',
                 'Mark Corbyn <mark@swiftmailer.org>',
-                ),
+                ],
             $header->getNameAddressStrings()
             );
     }
 
     public function testSetAddressesOverwritesAnyMailboxes()
     {
-        $header = $this->getHeader('From', $this->getEncoder('Q', true));
-        $header->setNameAddresses(array(
+        $header = $this->getHeader('From');
+        $header->setNameAddresses([
             'chris@swiftmailer.org' => 'Chris Corbyn',
             'mark@swiftmailer.org' => 'Mark Corbyn',
-            ));
+            ]);
         $this->assertEquals(
-            array('chris@swiftmailer.org' => 'Chris Corbyn',
-            'mark@swiftmailer.org' => 'Mark Corbyn', ),
+            ['chris@swiftmailer.org' => 'Chris Corbyn',
+            'mark@swiftmailer.org' => 'Mark Corbyn', ],
             $header->getNameAddresses()
             );
         $this->assertEquals(
-            array('chris@swiftmailer.org', 'mark@swiftmailer.org'),
+            ['chris@swiftmailer.org', 'mark@swiftmailer.org'],
             $header->getAddresses()
             );
 
-        $header->setAddresses(array('chris@swiftmailer.org', 'mark@swiftmailer.org'));
+        $header->setAddresses(['chris@swiftmailer.org', 'mark@swiftmailer.org']);
 
         $this->assertEquals(
-            array('chris@swiftmailer.org' => null, 'mark@swiftmailer.org' => null),
+            ['chris@swiftmailer.org' => null, 'mark@swiftmailer.org' => null],
             $header->getNameAddresses()
             );
         $this->assertEquals(
-            array('chris@swiftmailer.org', 'mark@swiftmailer.org'),
+            ['chris@swiftmailer.org', 'mark@swiftmailer.org'],
             $header->getAddresses()
             );
     }
@@ -201,7 +237,7 @@ class Swift_Mime_Headers_MailboxHeaderTest extends \SwiftMailerTestCase
                 ->andReturn('C=8Frbyn');
 
         $header = $this->getHeader('From', $encoder);
-        $header->setNameAddresses(array('chris@swiftmailer.org' => 'Chris '.$name));
+        $header->setNameAddresses(['chris@swiftmailer.org' => 'Chris '.$name]);
 
         $addresses = $header->getNameAddressStrings();
         $this->assertEquals(
@@ -226,17 +262,17 @@ class Swift_Mime_Headers_MailboxHeaderTest extends \SwiftMailerTestCase
                 ->andReturn('C=8Frbyn');
 
         $header = $this->getHeader('From', $encoder);
-        $header->setNameAddresses(array('chris@swiftmailer.org' => 'Chris '.$name));
+        $header->setNameAddresses(['chris@swiftmailer.org' => 'Chris '.$name]);
 
         $header->getNameAddressStrings();
     }
 
     public function testGetValueReturnsMailboxStringValue()
     {
-        $header = $this->getHeader('From', $this->getEncoder('Q', true));
-        $header->setNameAddresses(array(
+        $header = $this->getHeader('From');
+        $header->setNameAddresses([
             'chris@swiftmailer.org' => 'Chris Corbyn',
-            ));
+            ]);
         $this->assertEquals(
             'Chris Corbyn <chris@swiftmailer.org>', $header->getFieldBody()
             );
@@ -244,11 +280,11 @@ class Swift_Mime_Headers_MailboxHeaderTest extends \SwiftMailerTestCase
 
     public function testGetValueReturnsMailboxStringValueForMultipleMailboxes()
     {
-        $header = $this->getHeader('From', $this->getEncoder('Q', true));
-        $header->setNameAddresses(array(
+        $header = $this->getHeader('From');
+        $header->setNameAddresses([
             'chris@swiftmailer.org' => 'Chris Corbyn',
             'mark@swiftmailer.org' => 'Mark Corbyn',
-            ));
+            ]);
         $this->assertEquals(
             'Chris Corbyn <chris@swiftmailer.org>, Mark Corbyn <mark@swiftmailer.org>',
             $header->getFieldBody()
@@ -257,51 +293,51 @@ class Swift_Mime_Headers_MailboxHeaderTest extends \SwiftMailerTestCase
 
     public function testRemoveAddressesWithSingleValue()
     {
-        $header = $this->getHeader('From', $this->getEncoder('Q', true));
-        $header->setNameAddresses(array(
+        $header = $this->getHeader('From');
+        $header->setNameAddresses([
             'chris@swiftmailer.org' => 'Chris Corbyn',
             'mark@swiftmailer.org' => 'Mark Corbyn',
-            ));
+            ]);
         $header->removeAddresses('chris@swiftmailer.org');
-        $this->assertEquals(array('mark@swiftmailer.org'),
+        $this->assertEquals(['mark@swiftmailer.org'],
             $header->getAddresses()
             );
     }
 
     public function testRemoveAddressesWithList()
     {
-        $header = $this->getHeader('From', $this->getEncoder('Q', true));
-        $header->setNameAddresses(array(
+        $header = $this->getHeader('From');
+        $header->setNameAddresses([
             'chris@swiftmailer.org' => 'Chris Corbyn',
             'mark@swiftmailer.org' => 'Mark Corbyn',
-            ));
+            ]);
         $header->removeAddresses(
-            array('chris@swiftmailer.org', 'mark@swiftmailer.org')
+            ['chris@swiftmailer.org', 'mark@swiftmailer.org']
             );
-        $this->assertEquals(array(), $header->getAddresses());
+        $this->assertEquals([], $header->getAddresses());
     }
 
     public function testSetBodyModel()
     {
-        $header = $this->getHeader('From', $this->getEncoder('Q', true));
+        $header = $this->getHeader('From');
         $header->setFieldBodyModel('chris@swiftmailer.org');
-        $this->assertEquals(array('chris@swiftmailer.org' => null), $header->getNameAddresses());
+        $this->assertEquals(['chris@swiftmailer.org' => null], $header->getNameAddresses());
     }
 
     public function testGetBodyModel()
     {
-        $header = $this->getHeader('From', $this->getEncoder('Q', true));
-        $header->setAddresses(array('chris@swiftmailer.org'));
-        $this->assertEquals(array('chris@swiftmailer.org' => null), $header->getFieldBodyModel());
+        $header = $this->getHeader('From');
+        $header->setAddresses(['chris@swiftmailer.org']);
+        $this->assertEquals(['chris@swiftmailer.org' => null], $header->getFieldBodyModel());
     }
 
     public function testToString()
     {
-        $header = $this->getHeader('From', $this->getEncoder('Q', true));
-        $header->setNameAddresses(array(
+        $header = $this->getHeader('From');
+        $header->setNameAddresses([
             'chris@swiftmailer.org' => 'Chris Corbyn',
             'mark@swiftmailer.org' => 'Mark Corbyn',
-            ));
+            ]);
         $this->assertEquals(
             'From: Chris Corbyn <chris@swiftmailer.org>, '.
             'Mark Corbyn <mark@swiftmailer.org>'."\r\n",
@@ -309,15 +345,17 @@ class Swift_Mime_Headers_MailboxHeaderTest extends \SwiftMailerTestCase
             );
     }
 
-    private function getHeader($name, $encoder)
+    private function getHeader($name, $encoder = null, $addressEncoder = null)
     {
-        $header = new Swift_Mime_Headers_MailboxHeader($name, $encoder, new EmailValidator());
+        $encoder = $encoder ?? $this->getEncoder('Q', true);
+        $addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
+        $header = new Swift_Mime_Headers_MailboxHeader($name, $encoder, new EmailValidator(), $addressEncoder);
         $header->setCharset($this->charset);
 
         return $header;
     }
 
-    private function getEncoder($type, $stub = false)
+    private function getEncoder($type)
     {
         $encoder = $this->getMockery('Swift_Mime_HeaderEncoder')->shouldIgnoreMissing();
         $encoder->shouldReceive('getName')
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/ParameterizedHeaderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/ParameterizedHeaderTest.php
index d6657af8..c90b05b4 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/ParameterizedHeaderTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/ParameterizedHeaderTest.php
@@ -47,7 +47,7 @@ class Swift_Mime_Headers_ParameterizedHeaderTest extends \SwiftMailerTestCase
             $this->getHeaderEncoder('Q', true), $this->getParameterEncoder(true)
             );
         $header->setValue('text/plain');
-        $header->setParameters(array('charset' => 'utf-8'));
+        $header->setParameters(['charset' => 'utf-8']);
         $this->assertEquals('text/plain; charset=utf-8', $header->getFieldBody());
     }
 
@@ -57,7 +57,7 @@ class Swift_Mime_Headers_ParameterizedHeaderTest extends \SwiftMailerTestCase
             $this->getHeaderEncoder('Q', true), $this->getParameterEncoder(true)
             );
         $header->setValue('attachment');
-        $header->setParameters(array('filename' => 'my file.txt'));
+        $header->setParameters(['filename' => 'my file.txt']);
         $this->assertEquals('attachment; filename="my file.txt"',
             $header->getFieldBody()
             );
@@ -105,7 +105,7 @@ class Swift_Mime_Headers_ParameterizedHeaderTest extends \SwiftMailerTestCase
             $this->getHeaderEncoder('Q', true), $encoder
             );
         $header->setValue('attachment');
-        $header->setParameters(array('filename' => $value));
+        $header->setParameters(['filename' => $value]);
         $header->setMaxLineLength(78);
         $this->assertEquals(
             'attachment; '.
@@ -153,7 +153,7 @@ class Swift_Mime_Headers_ParameterizedHeaderTest extends \SwiftMailerTestCase
             $this->getHeaderEncoder('Q', true), $encoder
             );
         $header->setValue('attachment');
-        $header->setParameters(array('filename' => $value));
+        $header->setParameters(['filename' => $value]);
         $header->setMaxLineLength(78);
         $header->setLanguage($this->lang);
         $this->assertEquals(
@@ -207,7 +207,7 @@ class Swift_Mime_Headers_ParameterizedHeaderTest extends \SwiftMailerTestCase
             $this->getHeaderEncoder('Q', true), $encoder
             );
         $header->setValue('attachment');
-        $header->setParameters(array('filename' => $value));
+        $header->setParameters(['filename' => $value]);
         $header->setMaxLineLength(78);
         $header->setLanguage($this->lang);
         $this->assertEquals(
@@ -224,7 +224,7 @@ class Swift_Mime_Headers_ParameterizedHeaderTest extends \SwiftMailerTestCase
             $this->getHeaderEncoder('Q', true), $this->getParameterEncoder(true)
             );
         $header->setValue('text/html');
-        $header->setParameters(array('charset' => 'utf-8'));
+        $header->setParameters(['charset' => 'utf-8']);
         $this->assertEquals('Content-Type: text/html; charset=utf-8'."\r\n",
             $header->toString()
             );
@@ -242,7 +242,7 @@ class Swift_Mime_Headers_ParameterizedHeaderTest extends \SwiftMailerTestCase
 
         $header = $this->getHeader('X-Foo', $encoder, $this->getParameterEncoder(true));
         $header->setValue($value);
-        $header->setParameters(array('lookslike' => 'foobar'));
+        $header->setParameters(['lookslike' => 'foobar']);
         $this->assertEquals('X-Foo: =?utf-8?Q?fo=8Fbar?=; lookslike=foobar'."\r\n",
             $header->toString()
             );
@@ -266,7 +266,7 @@ class Swift_Mime_Headers_ParameterizedHeaderTest extends \SwiftMailerTestCase
 
         $header = $this->getHeader('X-Foo', $encoder, $paramEncoder);
         $header->setValue($value);
-        $header->setParameters(array('says' => $value));
+        $header->setParameters(['says' => $value]);
         $this->assertEquals("X-Foo: =?utf-8?Q?fo=8Fbar?=; says*=utf-8''fo%8Fbar\r\n",
             $header->toString()
             );
@@ -284,7 +284,7 @@ class Swift_Mime_Headers_ParameterizedHeaderTest extends \SwiftMailerTestCase
 
         $header = $this->getHeader('X-Foo', $encoder, null);
         $header->setValue('bar');
-        $header->setParameters(array('says' => $value));
+        $header->setParameters(['says' => $value]);
         $this->assertEquals("X-Foo: bar; says=\"=?utf-8?Q?fo=8Fbar?=\"\r\n",
             $header->toString()
             );
@@ -326,7 +326,7 @@ class Swift_Mime_Headers_ParameterizedHeaderTest extends \SwiftMailerTestCase
         $header = $this->getHeader('X-Foo', $encoder, $paramEncoder);
         $header->setLanguage('en');
         $header->setValue($value);
-        $header->setParameters(array('says' => $value));
+        $header->setParameters(['says' => $value]);
         $this->assertEquals("X-Foo: =?utf-8*en?Q?fo=8Fbar?=; says*=utf-8'en'fo%8Fbar\r\n",
             $header->toString()
             );
@@ -355,9 +355,9 @@ class Swift_Mime_Headers_ParameterizedHeaderTest extends \SwiftMailerTestCase
         $header = $this->getHeader('Content-Type',
             $this->getHeaderEncoder('Q', true), $this->getParameterEncoder(true)
             );
-        $header->setParameters(array('charset' => 'utf-8', 'delsp' => 'yes'));
+        $header->setParameters(['charset' => 'utf-8', 'delsp' => 'yes']);
         $header->setParameter('delsp', 'no');
-        $this->assertEquals(array('charset' => 'utf-8', 'delsp' => 'no'),
+        $this->assertEquals(['charset' => 'utf-8', 'delsp' => 'no'],
             $header->getParameters()
             );
     }
@@ -367,7 +367,7 @@ class Swift_Mime_Headers_ParameterizedHeaderTest extends \SwiftMailerTestCase
         $header = $this->getHeader('Content-Type',
             $this->getHeaderEncoder('Q', true), $this->getParameterEncoder(true)
             );
-        $header->setParameters(array('charset' => 'utf-8', 'delsp' => 'yes'));
+        $header->setParameters(['charset' => 'utf-8', 'delsp' => 'yes']);
         $this->assertEquals('utf-8', $header->getParameter('charset'));
     }
 
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/PathHeaderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/PathHeaderTest.php
index 278678ec..045107e5 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/PathHeaderTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/PathHeaderTest.php
@@ -41,6 +41,23 @@ class Swift_Mime_Headers_PathHeaderTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals('<chris@swiftmailer.org>', $header->getFieldBody());
     }
 
+    public function testAddressIsIdnEncoded()
+    {
+        $header = $this->getHeader('Return-Path');
+        $header->setAddress('chris@swïftmailer.org');
+        $this->assertEquals('<chris@xn--swftmailer-78a.org>', $header->getFieldBody());
+    }
+
+    /**
+     * @expectedException \Swift_AddressEncoderException
+     */
+    public function testAddressMustBeEncodable()
+    {
+        $header = $this->getHeader('Return-Path');
+        $header->setAddress('chrïs@swiftmailer.org');
+        $header->getFieldBody();
+    }
+
     public function testValueIsEmptyAngleBracketsIfEmptyAddressSet()
     {
         $header = $this->getHeader('Return-Path');
@@ -73,6 +90,6 @@ class Swift_Mime_Headers_PathHeaderTest extends \PHPUnit\Framework\TestCase
 
     private function getHeader($name)
     {
-        return new Swift_Mime_Headers_PathHeader($name, new EmailValidator());
+        return new Swift_Mime_Headers_PathHeader($name, new EmailValidator(), new Swift_AddressEncoder_IdnAddressEncoder());
     }
 }
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/UnstructuredHeaderTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/UnstructuredHeaderTest.php
index b3dc1a7e..30ccb00c 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/UnstructuredHeaderTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/UnstructuredHeaderTest.php
@@ -130,7 +130,7 @@ class Swift_Mime_Headers_UnstructuredHeaderTest extends \SwiftMailerTestCase
     {
         //SPACE and TAB permitted
         $nonPrintableBytes = array_merge(
-            range(0x00, 0x08), range(0x10, 0x19), array(0x7F)
+            range(0x00, 0x08), range(0x10, 0x19), [0x7F]
             );
 
         foreach ($nonPrintableBytes as $byte) {
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/MimePartTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/MimePartTest.php
index 7bf49345..4575505f 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/MimePartTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/MimePartTest.php
@@ -28,10 +28,10 @@ class Swift_Mime_MimePartTest extends Swift_Mime_AbstractMimeEntityTest
         */
 
         $cType = $this->createHeader('Content-Type', 'text/plain',
-            array('charset' => 'iso-8859-1')
+            ['charset' => 'iso-8859-1']
             );
-        $part = $this->createMimePart($this->createHeaderSet(array(
-            'Content-Type' => $cType, )),
+        $part = $this->createMimePart($this->createHeaderSet([
+            'Content-Type' => $cType, ]),
             $this->createEncoder(), $this->createCache()
             );
         $this->assertEquals('iso-8859-1', $part->getCharset());
@@ -40,12 +40,12 @@ class Swift_Mime_MimePartTest extends Swift_Mime_AbstractMimeEntityTest
     public function testCharsetIsSetInHeader()
     {
         $cType = $this->createHeader('Content-Type', 'text/plain',
-            array('charset' => 'iso-8859-1'), false
+            ['charset' => 'iso-8859-1'], false
             );
         $cType->shouldReceive('setParameter')->once()->with('charset', 'utf-8');
 
-        $part = $this->createMimePart($this->createHeaderSet(array(
-            'Content-Type' => $cType, )),
+        $part = $this->createMimePart($this->createHeaderSet([
+            'Content-Type' => $cType, ]),
             $this->createEncoder(), $this->createCache()
             );
         $part->setCharset('utf-8');
@@ -54,12 +54,12 @@ class Swift_Mime_MimePartTest extends Swift_Mime_AbstractMimeEntityTest
     public function testCharsetIsSetInHeaderIfPassedToSetBody()
     {
         $cType = $this->createHeader('Content-Type', 'text/plain',
-            array('charset' => 'iso-8859-1'), false
+            ['charset' => 'iso-8859-1'], false
             );
         $cType->shouldReceive('setParameter')->once()->with('charset', 'utf-8');
 
-        $part = $this->createMimePart($this->createHeaderSet(array(
-            'Content-Type' => $cType, )),
+        $part = $this->createMimePart($this->createHeaderSet([
+            'Content-Type' => $cType, ]),
             $this->createEncoder(), $this->createCache()
             );
         $part->setBody('', 'text/plian', 'utf-8');
@@ -80,7 +80,7 @@ class Swift_Mime_MimePartTest extends Swift_Mime_AbstractMimeEntityTest
 
     public function testSettingCharsetNotifiesHeaders()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('charsetChanged')
                 ->zeroOrMoreTimes()
                 ->with('utf-8');
@@ -101,19 +101,19 @@ class Swift_Mime_MimePartTest extends Swift_Mime_AbstractMimeEntityTest
         $part = $this->createMimePart($this->createHeaderSet(),
             $this->createEncoder(), $this->createCache()
             );
-        $part->setChildren(array($child));
+        $part->setChildren([$child]);
         $part->setCharset('windows-874');
     }
 
     public function testCharsetChangeUpdatesCharset()
     {
         $cType = $this->createHeader('Content-Type', 'text/plain',
-            array('charset' => 'iso-8859-1'), false
+            ['charset' => 'iso-8859-1'], false
             );
         $cType->shouldReceive('setParameter')->once()->with('charset', 'utf-8');
 
-        $part = $this->createMimePart($this->createHeaderSet(array(
-            'Content-Type' => $cType, )),
+        $part = $this->createMimePart($this->createHeaderSet([
+            'Content-Type' => $cType, ]),
             $this->createEncoder(), $this->createCache()
             );
         $part->charsetChanged('utf-8');
@@ -121,7 +121,7 @@ class Swift_Mime_MimePartTest extends Swift_Mime_AbstractMimeEntityTest
 
     public function testSettingCharsetClearsCache()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('toString')
                 ->zeroOrMoreTimes()
                 ->andReturn("Content-Type: text/plain; charset=utf-8\r\n");
@@ -149,10 +149,10 @@ class Swift_Mime_MimePartTest extends Swift_Mime_AbstractMimeEntityTest
      */
 
         $cType = $this->createHeader('Content-Type', 'text/plain',
-            array('format' => 'flowed')
+            ['format' => 'flowed']
             );
-        $part = $this->createMimePart($this->createHeaderSet(array(
-            'Content-Type' => $cType, )),
+        $part = $this->createMimePart($this->createHeaderSet([
+            'Content-Type' => $cType, ]),
             $this->createEncoder(), $this->createCache()
             );
         $this->assertEquals('flowed', $part->getFormat());
@@ -160,11 +160,11 @@ class Swift_Mime_MimePartTest extends Swift_Mime_AbstractMimeEntityTest
 
     public function testFormatIsSetInHeader()
     {
-        $cType = $this->createHeader('Content-Type', 'text/plain', array(), false);
+        $cType = $this->createHeader('Content-Type', 'text/plain', [], false);
         $cType->shouldReceive('setParameter')->once()->with('format', 'fixed');
 
-        $part = $this->createMimePart($this->createHeaderSet(array(
-            'Content-Type' => $cType, )),
+        $part = $this->createMimePart($this->createHeaderSet([
+            'Content-Type' => $cType, ]),
             $this->createEncoder(), $this->createCache()
             );
         $part->setFormat('fixed');
@@ -176,10 +176,10 @@ class Swift_Mime_MimePartTest extends Swift_Mime_AbstractMimeEntityTest
      */
 
         $cType = $this->createHeader('Content-Type', 'text/plain',
-            array('delsp' => 'no')
+            ['delsp' => 'no']
             );
-        $part = $this->createMimePart($this->createHeaderSet(array(
-            'Content-Type' => $cType, )),
+        $part = $this->createMimePart($this->createHeaderSet([
+            'Content-Type' => $cType, ]),
             $this->createEncoder(), $this->createCache()
             );
         $this->assertFalse($part->getDelSp());
@@ -187,11 +187,11 @@ class Swift_Mime_MimePartTest extends Swift_Mime_AbstractMimeEntityTest
 
     public function testDelSpIsSetInHeader()
     {
-        $cType = $this->createHeader('Content-Type', 'text/plain', array(), false);
+        $cType = $this->createHeader('Content-Type', 'text/plain', [], false);
         $cType->shouldReceive('setParameter')->once()->with('delsp', 'yes');
 
-        $part = $this->createMimePart($this->createHeaderSet(array(
-            'Content-Type' => $cType, )),
+        $part = $this->createMimePart($this->createHeaderSet([
+            'Content-Type' => $cType, ]),
             $this->createEncoder(), $this->createCache()
             );
         $part->setDelSp(true);
@@ -212,7 +212,7 @@ class Swift_Mime_MimePartTest extends Swift_Mime_AbstractMimeEntityTest
             ->setMaxLineLength(998)
             ->setBody('xx')
             ->setBoundary('xyz')
-            ->setChildren(array())
+            ->setChildren([])
             ->setCharset('utf-8')
             ->setFormat('flowed')
             ->setDelSp(true)
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderFactoryTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderFactoryTest.php
index 5a16ad16..6bc825ef 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderFactoryTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderFactoryTest.php
@@ -26,9 +26,9 @@ class Swift_Mime_SimpleHeaderFactoryTest extends \PHPUnit\Framework\TestCase
     public function testMailboxHeaderHasCorrectModel()
     {
         $header = $this->factory->createMailboxHeader('X-Foo',
-            array('foo@bar' => 'FooBar')
+            ['foo@bar' => 'FooBar']
             );
-        $this->assertEquals(array('foo@bar' => 'FooBar'), $header->getFieldBodyModel());
+        $this->assertEquals(['foo@bar' => 'FooBar'], $header->getFieldBodyModel());
     }
 
     public function testDateHeaderHasCorrectType()
@@ -89,9 +89,9 @@ class Swift_Mime_SimpleHeaderFactoryTest extends \PHPUnit\Framework\TestCase
     public function testParameterizedHeaderHasCorrectParams()
     {
         $header = $this->factory->createParameterizedHeader('X-Foo', 'bar',
-            array('zip' => 'button')
+            ['zip' => 'button']
             );
-        $this->assertEquals(array('zip' => 'button'), $header->getParameters());
+        $this->assertEquals(['zip' => 'button'], $header->getParameters());
     }
 
     public function testIdHeaderHasCorrectType()
@@ -109,7 +109,7 @@ class Swift_Mime_SimpleHeaderFactoryTest extends \PHPUnit\Framework\TestCase
     public function testIdHeaderHasCorrectModel()
     {
         $header = $this->factory->createIdHeader('X-ID', 'xyz@abc');
-        $this->assertEquals(array('xyz@abc'), $header->getFieldBodyModel());
+        $this->assertEquals(['xyz@abc'], $header->getFieldBodyModel());
     }
 
     public function testPathHeaderHasCorrectType()
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderSetTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderSetTest.php
index e9dea811..4ddbff74 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderSetTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderSetTest.php
@@ -7,11 +7,11 @@ class Swift_Mime_SimpleHeaderSetTest extends \PHPUnit\Framework\TestCase
         $factory = $this->createFactory();
         $factory->expects($this->once())
                 ->method('createMailboxHeader')
-                ->with('From', array('person@domain' => 'Person'))
+                ->with('From', ['person@domain' => 'Person'])
                 ->will($this->returnValue($this->createHeader('From')));
 
         $set = $this->createSet($factory);
-        $set->addMailboxHeader('From', array('person@domain' => 'Person'));
+        $set->addMailboxHeader('From', ['person@domain' => 'Person']);
     }
 
     public function testAddDateHeaderDelegatesToFactory()
@@ -45,12 +45,12 @@ class Swift_Mime_SimpleHeaderSetTest extends \PHPUnit\Framework\TestCase
         $factory = $this->createFactory();
         $factory->expects($this->once())
                 ->method('createParameterizedHeader')
-                ->with('Content-Type', 'text/plain', array('charset' => 'utf-8'))
+                ->with('Content-Type', 'text/plain', ['charset' => 'utf-8'])
                 ->will($this->returnValue($this->createHeader('Content-Type')));
 
         $set = $this->createSet($factory);
         $set->addParameterizedHeader('Content-Type', 'text/plain',
-            array('charset' => 'utf-8')
+            ['charset' => 'utf-8']
             );
     }
 
@@ -89,11 +89,11 @@ class Swift_Mime_SimpleHeaderSetTest extends \PHPUnit\Framework\TestCase
         $factory = $this->createFactory();
         $factory->expects($this->once())
                 ->method('createMailboxHeader')
-                ->with('From', array('person@domain' => 'Person'))
+                ->with('From', ['person@domain' => 'Person'])
                 ->will($this->returnValue($this->createHeader('From')));
 
         $set = $this->createSet($factory);
-        $set->addMailboxHeader('From', array('person@domain' => 'Person'));
+        $set->addMailboxHeader('From', ['person@domain' => 'Person']);
         $this->assertTrue($set->has('From'));
     }
 
@@ -130,12 +130,12 @@ class Swift_Mime_SimpleHeaderSetTest extends \PHPUnit\Framework\TestCase
         $factory = $this->createFactory();
         $factory->expects($this->once())
                 ->method('createParameterizedHeader')
-                ->with('Content-Type', 'text/plain', array('charset' => 'utf-8'))
+                ->with('Content-Type', 'text/plain', ['charset' => 'utf-8'])
                 ->will($this->returnValue($this->createHeader('Content-Type')));
 
         $set = $this->createSet($factory);
         $set->addParameterizedHeader('Content-Type', 'text/plain',
-            array('charset' => 'utf-8')
+            ['charset' => 'utf-8']
             );
         $this->assertTrue($set->has('Content-Type'));
     }
@@ -289,7 +289,7 @@ class Swift_Mime_SimpleHeaderSetTest extends \PHPUnit\Framework\TestCase
         $set->addIdHeader('Message-ID', 'other@id');
         $set->addIdHeader('Message-ID', 'more@id');
 
-        $this->assertEquals(array($header0, $header1, $header2),
+        $this->assertEquals([$header0, $header1, $header2],
             $set->getAll('Message-ID')
             );
     }
@@ -318,7 +318,7 @@ class Swift_Mime_SimpleHeaderSetTest extends \PHPUnit\Framework\TestCase
         $set->addIdHeader('Subject', 'thing');
         $set->addIdHeader('To', 'person@example.org');
 
-        $this->assertEquals(array($header0, $header1, $header2),
+        $this->assertEquals([$header0, $header1, $header2],
             $set->getAll()
             );
     }
@@ -326,7 +326,7 @@ class Swift_Mime_SimpleHeaderSetTest extends \PHPUnit\Framework\TestCase
     public function testGetAllReturnsEmptyArrayIfNoneSet()
     {
         $set = $this->createSet($this->createFactory());
-        $this->assertEquals(array(), $set->getAll('Received'));
+        $this->assertEquals([], $set->getAll('Received'));
     }
 
     public function testRemoveWithUnspecifiedOffset()
@@ -467,7 +467,7 @@ class Swift_Mime_SimpleHeaderSetTest extends \PHPUnit\Framework\TestCase
 
         $set = $this->createSet($factory);
         $set->addIdHeader('Message-ID', 'some@id');
-        $this->assertEquals(array($header), $set->getAll('message-id'));
+        $this->assertEquals([$header], $set->getAll('message-id'));
     }
 
     public function testRemoveIsNotCaseSensitive()
@@ -558,7 +558,7 @@ class Swift_Mime_SimpleHeaderSetTest extends \PHPUnit\Framework\TestCase
         $set = $this->createSet($factory);
         $set->addTextHeader('Foo', '');
         $set->addTextHeader('Zip', '');
-        $set->setAlwaysDisplayed(array('Foo', 'Zip'));
+        $set->setAlwaysDisplayed(['Foo', 'Zip']);
         $this->assertEquals(
             "Foo: \r\n".
             "Zip: \r\n",
@@ -587,7 +587,7 @@ class Swift_Mime_SimpleHeaderSetTest extends \PHPUnit\Framework\TestCase
         $set->addTextHeader('First', 'one');
         $set->addTextHeader('Second', 'two');
 
-        $set->defineOrdering(array('First', 'Second', 'Third'));
+        $set->defineOrdering(['First', 'Second', 'Third']);
 
         $this->assertEquals(
             "First: one\r\n".
@@ -628,7 +628,7 @@ class Swift_Mime_SimpleHeaderSetTest extends \PHPUnit\Framework\TestCase
         $set->addTextHeader('First', 'one');
         $set->addTextHeader('Second', 'two');
 
-        $set->defineOrdering(array('First', 'Second', 'Third'));
+        $set->defineOrdering(['First', 'Second', 'Third']);
 
         $this->assertEquals(
             "First: one\r\n".
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleMessageTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleMessageTest.php
index 1be4c5ec..c5662cbe 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleMessageTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleMessageTest.php
@@ -25,7 +25,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
         $date = $this->createHeader('Date', $dateTime);
         $message = $this->createMessage(
-            $this->createHeaderSet(array('Date' => $date)),
+            $this->createHeaderSet(['Date' => $date]),
             $this->createEncoder(), $this->createCache()
             );
         $this->assertEquals($dateTime, $message->getDate());
@@ -35,7 +35,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
     {
         $dateTime = new DateTimeImmutable();
 
-        $date = $this->createHeader('Date', new DateTimeImmutable(), array(), false);
+        $date = $this->createHeader('Date', new DateTimeImmutable(), [], false);
         $date->shouldReceive('setFieldBodyModel')
              ->once()
              ->with($dateTime);
@@ -43,7 +43,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
              ->zeroOrMoreTimes();
 
         $message = $this->createMessage(
-            $this->createHeaderSet(array('Date' => $date)),
+            $this->createHeaderSet(['Date' => $date]),
             $this->createEncoder(), $this->createCache()
             );
         $message->setDate($dateTime);
@@ -53,7 +53,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
     {
         $dateTime = new DateTimeImmutable();
 
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addDateHeader')
                 ->once()
                 ->with('Date', $dateTime);
@@ -68,7 +68,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
     public function testDateHeaderIsAddedDuringConstruction()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addDateHeader')
                 ->once()
                 ->with('Date', Mockery::type('DateTimeImmutable'));
@@ -89,7 +89,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
         $messageId = $this->createHeader('Message-ID', 'a@b');
         $message = $this->createMessage(
-            $this->createHeaderSet(array('Message-ID' => $messageId)),
+            $this->createHeaderSet(['Message-ID' => $messageId]),
             $this->createEncoder(), $this->createCache()
             );
         $this->assertEquals('a@b', $message->getId());
@@ -97,7 +97,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
     public function testIdIsSetInHeader()
     {
-        $messageId = $this->createHeader('Message-ID', 'a@b', array(), false);
+        $messageId = $this->createHeader('Message-ID', 'a@b', [], false);
         $messageId->shouldReceive('setFieldBodyModel')
                   ->once()
                   ->with('x@y');
@@ -105,7 +105,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
                   ->zeroOrMoreTimes();
 
         $message = $this->createMessage(
-            $this->createHeaderSet(array('Message-ID' => $messageId)),
+            $this->createHeaderSet(['Message-ID' => $messageId]),
             $this->createEncoder(), $this->createCache()
             );
         $message->setId('x@y');
@@ -113,7 +113,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
     public function testIdIsAutoGenerated()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addIdHeader')
                 ->once()
                 ->with('Message-ID', '/^.*?@.*?$/D');
@@ -130,7 +130,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
         $subject = $this->createHeader('Subject', 'example subject');
         $message = $this->createMessage(
-            $this->createHeaderSet(array('Subject' => $subject)),
+            $this->createHeaderSet(['Subject' => $subject]),
             $this->createEncoder(), $this->createCache()
             );
         $this->assertEquals('example subject', $message->getSubject());
@@ -138,13 +138,13 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
     public function testSubjectIsSetInHeader()
     {
-        $subject = $this->createHeader('Subject', '', array(), false);
+        $subject = $this->createHeader('Subject', '', [], false);
         $subject->shouldReceive('setFieldBodyModel')
                 ->once()
                 ->with('foo');
 
         $message = $this->createMessage(
-            $this->createHeaderSet(array('Subject' => $subject)),
+            $this->createHeaderSet(['Subject' => $subject]),
             $this->createEncoder(), $this->createCache()
             );
         $message->setSubject('foo');
@@ -152,7 +152,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
     public function testSubjectHeaderIsCreatedIfNotPresent()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addTextHeader')
                 ->once()
                 ->with('Subject', 'example subject');
@@ -172,7 +172,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
         $path = $this->createHeader('Return-Path', 'bounces@domain');
         $message = $this->createMessage(
-            $this->createHeaderSet(array('Return-Path' => $path)),
+            $this->createHeaderSet(['Return-Path' => $path]),
             $this->createEncoder(), $this->createCache()
             );
         $this->assertEquals('bounces@domain', $message->getReturnPath());
@@ -180,13 +180,13 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
     public function testReturnPathIsSetInHeader()
     {
-        $path = $this->createHeader('Return-Path', '', array(), false);
+        $path = $this->createHeader('Return-Path', '', [], false);
         $path->shouldReceive('setFieldBodyModel')
              ->once()
              ->with('bounces@domain');
 
         $message = $this->createMessage(
-            $this->createHeaderSet(array('Return-Path' => $path)),
+            $this->createHeaderSet(['Return-Path' => $path]),
             $this->createEncoder(), $this->createCache()
             );
         $message->setReturnPath('bounces@domain');
@@ -194,7 +194,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
     public function testReturnPathHeaderIsAddedIfNoneSet()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addPathHeader')
                 ->once()
                 ->with('Return-Path', 'bounces@domain');
@@ -210,33 +210,33 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
         /* -- RFC 2822, 3.6.2.
      */
 
-        $sender = $this->createHeader('Sender', array('sender@domain' => 'Name'));
+        $sender = $this->createHeader('Sender', ['sender@domain' => 'Name']);
         $message = $this->createMessage(
-            $this->createHeaderSet(array('Sender' => $sender)),
+            $this->createHeaderSet(['Sender' => $sender]),
             $this->createEncoder(), $this->createCache()
             );
-        $this->assertEquals(array('sender@domain' => 'Name'), $message->getSender());
+        $this->assertEquals(['sender@domain' => 'Name'], $message->getSender());
     }
 
     public function testSenderIsSetInHeader()
     {
-        $sender = $this->createHeader('Sender', array('sender@domain' => 'Name'),
-            array(), false
+        $sender = $this->createHeader('Sender', ['sender@domain' => 'Name'],
+            [], false
             );
         $sender->shouldReceive('setFieldBodyModel')
                ->once()
-               ->with(array('other@domain' => 'Other'));
+               ->with(['other@domain' => 'Other']);
 
         $message = $this->createMessage(
-            $this->createHeaderSet(array('Sender' => $sender)),
+            $this->createHeaderSet(['Sender' => $sender]),
             $this->createEncoder(), $this->createCache()
             );
-        $message->setSender(array('other@domain' => 'Other'));
+        $message->setSender(['other@domain' => 'Other']);
     }
 
     public function testSenderHeaderIsAddedIfNoneSet()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addMailboxHeader')
                 ->once()
                 ->with('Sender', (array) 'sender@domain');
@@ -251,10 +251,10 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
     public function testNameCanBeUsedInSenderHeader()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addMailboxHeader')
                 ->once()
-                ->with('Sender', array('sender@domain' => 'Name'));
+                ->with('Sender', ['sender@domain' => 'Name']);
         $headers->shouldReceive('addMailboxHeader')
                 ->zeroOrMoreTimes();
 
@@ -269,41 +269,41 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
         /* -- RFC 2822, 3.6.2.
      */
 
-        $from = $this->createHeader('From', array('from@domain' => 'Name'));
+        $from = $this->createHeader('From', ['from@domain' => 'Name']);
         $message = $this->createMessage(
-            $this->createHeaderSet(array('From' => $from)),
+            $this->createHeaderSet(['From' => $from]),
             $this->createEncoder(), $this->createCache()
             );
-        $this->assertEquals(array('from@domain' => 'Name'), $message->getFrom());
+        $this->assertEquals(['from@domain' => 'Name'], $message->getFrom());
     }
 
     public function testFromIsSetInHeader()
     {
-        $from = $this->createHeader('From', array('from@domain' => 'Name'),
-            array(), false
+        $from = $this->createHeader('From', ['from@domain' => 'Name'],
+            [], false
             );
         $from->shouldReceive('setFieldBodyModel')
              ->once()
-             ->with(array('other@domain' => 'Other'));
+             ->with(['other@domain' => 'Other']);
 
         $message = $this->createMessage(
-            $this->createHeaderSet(array('From' => $from)),
+            $this->createHeaderSet(['From' => $from]),
             $this->createEncoder(), $this->createCache()
             );
-        $message->setFrom(array('other@domain' => 'Other'));
+        $message->setFrom(['other@domain' => 'Other']);
     }
 
     public function testFromIsAddedToHeadersDuringAddFrom()
     {
-        $from = $this->createHeader('From', array('from@domain' => 'Name'),
-            array(), false
+        $from = $this->createHeader('From', ['from@domain' => 'Name'],
+            [], false
             );
         $from->shouldReceive('setFieldBodyModel')
              ->once()
-             ->with(array('from@domain' => 'Name', 'other@domain' => 'Other'));
+             ->with(['from@domain' => 'Name', 'other@domain' => 'Other']);
 
         $message = $this->createMessage(
-            $this->createHeaderSet(array('From' => $from)),
+            $this->createHeaderSet(['From' => $from]),
             $this->createEncoder(), $this->createCache()
             );
         $message->addFrom('other@domain', 'Other');
@@ -311,7 +311,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
     public function testFromHeaderIsAddedIfNoneSet()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addMailboxHeader')
                 ->once()
                 ->with('From', (array) 'from@domain');
@@ -326,10 +326,10 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
     public function testPersonalNameCanBeUsedInFromAddress()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addMailboxHeader')
                 ->once()
-                ->with('From', array('from@domain' => 'Name'));
+                ->with('From', ['from@domain' => 'Name']);
         $headers->shouldReceive('addMailboxHeader')
                 ->zeroOrMoreTimes();
 
@@ -344,41 +344,41 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
         /* -- RFC 2822, 3.6.2.
      */
 
-        $reply = $this->createHeader('Reply-To', array('reply@domain' => 'Name'));
+        $reply = $this->createHeader('Reply-To', ['reply@domain' => 'Name']);
         $message = $this->createMessage(
-            $this->createHeaderSet(array('Reply-To' => $reply)),
+            $this->createHeaderSet(['Reply-To' => $reply]),
             $this->createEncoder(), $this->createCache()
             );
-        $this->assertEquals(array('reply@domain' => 'Name'), $message->getReplyTo());
+        $this->assertEquals(['reply@domain' => 'Name'], $message->getReplyTo());
     }
 
     public function testReplyToIsSetInHeader()
     {
-        $reply = $this->createHeader('Reply-To', array('reply@domain' => 'Name'),
-            array(), false
+        $reply = $this->createHeader('Reply-To', ['reply@domain' => 'Name'],
+            [], false
             );
         $reply->shouldReceive('setFieldBodyModel')
               ->once()
-              ->with(array('other@domain' => 'Other'));
+              ->with(['other@domain' => 'Other']);
 
         $message = $this->createMessage(
-            $this->createHeaderSet(array('Reply-To' => $reply)),
+            $this->createHeaderSet(['Reply-To' => $reply]),
             $this->createEncoder(), $this->createCache()
             );
-        $message->setReplyTo(array('other@domain' => 'Other'));
+        $message->setReplyTo(['other@domain' => 'Other']);
     }
 
     public function testReplyToIsAddedToHeadersDuringAddReplyTo()
     {
-        $replyTo = $this->createHeader('Reply-To', array('from@domain' => 'Name'),
-            array(), false
+        $replyTo = $this->createHeader('Reply-To', ['from@domain' => 'Name'],
+            [], false
             );
         $replyTo->shouldReceive('setFieldBodyModel')
                 ->once()
-                ->with(array('from@domain' => 'Name', 'other@domain' => 'Other'));
+                ->with(['from@domain' => 'Name', 'other@domain' => 'Other']);
 
         $message = $this->createMessage(
-            $this->createHeaderSet(array('Reply-To' => $replyTo)),
+            $this->createHeaderSet(['Reply-To' => $replyTo]),
             $this->createEncoder(), $this->createCache()
             );
         $message->addReplyTo('other@domain', 'Other');
@@ -386,7 +386,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
     public function testReplyToHeaderIsAddedIfNoneSet()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addMailboxHeader')
                 ->once()
                 ->with('Reply-To', (array) 'reply@domain');
@@ -401,10 +401,10 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
     public function testNameCanBeUsedInReplyTo()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addMailboxHeader')
                 ->once()
-                ->with('Reply-To', array('reply@domain' => 'Name'));
+                ->with('Reply-To', ['reply@domain' => 'Name']);
         $headers->shouldReceive('addMailboxHeader')
                 ->zeroOrMoreTimes();
 
@@ -419,41 +419,41 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
         /* -- RFC 2822, 3.6.3.
      */
 
-        $to = $this->createHeader('To', array('to@domain' => 'Name'));
+        $to = $this->createHeader('To', ['to@domain' => 'Name']);
         $message = $this->createMessage(
-            $this->createHeaderSet(array('To' => $to)),
+            $this->createHeaderSet(['To' => $to]),
             $this->createEncoder(), $this->createCache()
             );
-        $this->assertEquals(array('to@domain' => 'Name'), $message->getTo());
+        $this->assertEquals(['to@domain' => 'Name'], $message->getTo());
     }
 
     public function testToIsSetInHeader()
     {
-        $to = $this->createHeader('To', array('to@domain' => 'Name'),
-            array(), false
+        $to = $this->createHeader('To', ['to@domain' => 'Name'],
+            [], false
             );
         $to->shouldReceive('setFieldBodyModel')
            ->once()
-           ->with(array('other@domain' => 'Other'));
+           ->with(['other@domain' => 'Other']);
 
         $message = $this->createMessage(
-            $this->createHeaderSet(array('To' => $to)),
+            $this->createHeaderSet(['To' => $to]),
             $this->createEncoder(), $this->createCache()
             );
-        $message->setTo(array('other@domain' => 'Other'));
+        $message->setTo(['other@domain' => 'Other']);
     }
 
     public function testToIsAddedToHeadersDuringAddTo()
     {
-        $to = $this->createHeader('To', array('from@domain' => 'Name'),
-            array(), false
+        $to = $this->createHeader('To', ['from@domain' => 'Name'],
+            [], false
             );
         $to->shouldReceive('setFieldBodyModel')
            ->once()
-           ->with(array('from@domain' => 'Name', 'other@domain' => 'Other'));
+           ->with(['from@domain' => 'Name', 'other@domain' => 'Other']);
 
         $message = $this->createMessage(
-            $this->createHeaderSet(array('To' => $to)),
+            $this->createHeaderSet(['To' => $to]),
             $this->createEncoder(), $this->createCache()
             );
         $message->addTo('other@domain', 'Other');
@@ -461,7 +461,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
     public function testToHeaderIsAddedIfNoneSet()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addMailboxHeader')
                 ->once()
                 ->with('To', (array) 'to@domain');
@@ -476,10 +476,10 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
     public function testNameCanBeUsedInToHeader()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addMailboxHeader')
                 ->once()
-                ->with('To', array('to@domain' => 'Name'));
+                ->with('To', ['to@domain' => 'Name']);
         $headers->shouldReceive('addMailboxHeader')
                 ->zeroOrMoreTimes();
 
@@ -494,41 +494,41 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
         /* -- RFC 2822, 3.6.3.
      */
 
-        $cc = $this->createHeader('Cc', array('cc@domain' => 'Name'));
+        $cc = $this->createHeader('Cc', ['cc@domain' => 'Name']);
         $message = $this->createMessage(
-            $this->createHeaderSet(array('Cc' => $cc)),
+            $this->createHeaderSet(['Cc' => $cc]),
             $this->createEncoder(), $this->createCache()
             );
-        $this->assertEquals(array('cc@domain' => 'Name'), $message->getCc());
+        $this->assertEquals(['cc@domain' => 'Name'], $message->getCc());
     }
 
     public function testCcIsSetInHeader()
     {
-        $cc = $this->createHeader('Cc', array('cc@domain' => 'Name'),
-            array(), false
+        $cc = $this->createHeader('Cc', ['cc@domain' => 'Name'],
+            [], false
             );
         $cc->shouldReceive('setFieldBodyModel')
            ->once()
-           ->with(array('other@domain' => 'Other'));
+           ->with(['other@domain' => 'Other']);
 
         $message = $this->createMessage(
-            $this->createHeaderSet(array('Cc' => $cc)),
+            $this->createHeaderSet(['Cc' => $cc]),
             $this->createEncoder(), $this->createCache()
             );
-        $message->setCc(array('other@domain' => 'Other'));
+        $message->setCc(['other@domain' => 'Other']);
     }
 
     public function testCcIsAddedToHeadersDuringAddCc()
     {
-        $cc = $this->createHeader('Cc', array('from@domain' => 'Name'),
-            array(), false
+        $cc = $this->createHeader('Cc', ['from@domain' => 'Name'],
+            [], false
             );
         $cc->shouldReceive('setFieldBodyModel')
            ->once()
-           ->with(array('from@domain' => 'Name', 'other@domain' => 'Other'));
+           ->with(['from@domain' => 'Name', 'other@domain' => 'Other']);
 
         $message = $this->createMessage(
-            $this->createHeaderSet(array('Cc' => $cc)),
+            $this->createHeaderSet(['Cc' => $cc]),
             $this->createEncoder(), $this->createCache()
             );
         $message->addCc('other@domain', 'Other');
@@ -536,7 +536,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
     public function testCcHeaderIsAddedIfNoneSet()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addMailboxHeader')
                 ->once()
                 ->with('Cc', (array) 'cc@domain');
@@ -551,10 +551,10 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
     public function testNameCanBeUsedInCcHeader()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addMailboxHeader')
                 ->once()
-                ->with('Cc', array('cc@domain' => 'Name'));
+                ->with('Cc', ['cc@domain' => 'Name']);
         $headers->shouldReceive('addMailboxHeader')
                 ->zeroOrMoreTimes();
 
@@ -569,41 +569,41 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
         /* -- RFC 2822, 3.6.3.
      */
 
-        $bcc = $this->createHeader('Bcc', array('bcc@domain' => 'Name'));
+        $bcc = $this->createHeader('Bcc', ['bcc@domain' => 'Name']);
         $message = $this->createMessage(
-            $this->createHeaderSet(array('Bcc' => $bcc)),
+            $this->createHeaderSet(['Bcc' => $bcc]),
             $this->createEncoder(), $this->createCache()
             );
-        $this->assertEquals(array('bcc@domain' => 'Name'), $message->getBcc());
+        $this->assertEquals(['bcc@domain' => 'Name'], $message->getBcc());
     }
 
     public function testBccIsSetInHeader()
     {
-        $bcc = $this->createHeader('Bcc', array('bcc@domain' => 'Name'),
-            array(), false
+        $bcc = $this->createHeader('Bcc', ['bcc@domain' => 'Name'],
+            [], false
             );
         $bcc->shouldReceive('setFieldBodyModel')
             ->once()
-            ->with(array('other@domain' => 'Other'));
+            ->with(['other@domain' => 'Other']);
 
         $message = $this->createMessage(
-            $this->createHeaderSet(array('Bcc' => $bcc)),
+            $this->createHeaderSet(['Bcc' => $bcc]),
             $this->createEncoder(), $this->createCache()
             );
-        $message->setBcc(array('other@domain' => 'Other'));
+        $message->setBcc(['other@domain' => 'Other']);
     }
 
     public function testBccIsAddedToHeadersDuringAddBcc()
     {
-        $bcc = $this->createHeader('Bcc', array('from@domain' => 'Name'),
-            array(), false
+        $bcc = $this->createHeader('Bcc', ['from@domain' => 'Name'],
+            [], false
             );
         $bcc->shouldReceive('setFieldBodyModel')
             ->once()
-            ->with(array('from@domain' => 'Name', 'other@domain' => 'Other'));
+            ->with(['from@domain' => 'Name', 'other@domain' => 'Other']);
 
         $message = $this->createMessage(
-            $this->createHeaderSet(array('Bcc' => $bcc)),
+            $this->createHeaderSet(['Bcc' => $bcc]),
             $this->createEncoder(), $this->createCache()
             );
         $message->addBcc('other@domain', 'Other');
@@ -611,7 +611,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
     public function testBccHeaderIsAddedIfNoneSet()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addMailboxHeader')
                 ->once()
                 ->with('Bcc', (array) 'bcc@domain');
@@ -626,10 +626,10 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
     public function testNameCanBeUsedInBcc()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addMailboxHeader')
                 ->once()
-                ->with('Bcc', array('bcc@domain' => 'Name'));
+                ->with('Bcc', ['bcc@domain' => 'Name']);
         $headers->shouldReceive('addMailboxHeader')
                 ->zeroOrMoreTimes();
 
@@ -643,7 +643,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
     {
         $prio = $this->createHeader('X-Priority', '2 (High)');
         $message = $this->createMessage(
-            $this->createHeaderSet(array('X-Priority' => $prio)),
+            $this->createHeaderSet(['X-Priority' => $prio]),
             $this->createEncoder(), $this->createCache()
             );
         $this->assertEquals(2, $message->getPriority());
@@ -651,13 +651,13 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
     public function testPriorityIsSetInHeader()
     {
-        $prio = $this->createHeader('X-Priority', '2 (High)', array(), false);
+        $prio = $this->createHeader('X-Priority', '2 (High)', [], false);
         $prio->shouldReceive('setFieldBodyModel')
              ->once()
              ->with('5 (Lowest)');
 
         $message = $this->createMessage(
-            $this->createHeaderSet(array('X-Priority' => $prio)),
+            $this->createHeaderSet(['X-Priority' => $prio]),
             $this->createEncoder(), $this->createCache()
             );
         $message->setPriority($message::PRIORITY_LOWEST);
@@ -665,7 +665,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
     public function testPriorityHeaderIsAddedIfNoneSet()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addTextHeader')
                 ->once()
                 ->with('X-Priority', '4 (Low)');
@@ -681,26 +681,26 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
     public function testReadReceiptAddressReadFromHeader()
     {
         $rcpt = $this->createHeader('Disposition-Notification-To',
-            array('chris@swiftmailer.org' => 'Chris')
+            ['chris@swiftmailer.org' => 'Chris']
             );
         $message = $this->createMessage(
-            $this->createHeaderSet(array('Disposition-Notification-To' => $rcpt)),
+            $this->createHeaderSet(['Disposition-Notification-To' => $rcpt]),
             $this->createEncoder(), $this->createCache()
             );
-        $this->assertEquals(array('chris@swiftmailer.org' => 'Chris'),
+        $this->assertEquals(['chris@swiftmailer.org' => 'Chris'],
             $message->getReadReceiptTo()
             );
     }
 
     public function testReadReceiptIsSetInHeader()
     {
-        $rcpt = $this->createHeader('Disposition-Notification-To', array(), array(), false);
+        $rcpt = $this->createHeader('Disposition-Notification-To', [], [], false);
         $rcpt->shouldReceive('setFieldBodyModel')
              ->once()
              ->with('mark@swiftmailer.org');
 
         $message = $this->createMessage(
-            $this->createHeaderSet(array('Disposition-Notification-To' => $rcpt)),
+            $this->createHeaderSet(['Disposition-Notification-To' => $rcpt]),
             $this->createEncoder(), $this->createCache()
             );
         $message->setReadReceiptTo('mark@swiftmailer.org');
@@ -708,7 +708,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
     public function testReadReceiptHeaderIsAddedIfNoneSet()
     {
-        $headers = $this->createHeaderSet(array(), false);
+        $headers = $this->createHeaderSet([], false);
         $headers->shouldReceive('addMailboxHeader')
                 ->once()
                 ->with('Disposition-Notification-To', 'mark@swiftmailer.org');
@@ -733,7 +733,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
         $message->attach($child1);
         $message->attach($child2);
 
-        $this->assertEquals(array($child1, $child2), $message->getChildren());
+        $this->assertEquals([$child1, $child2], $message->getChildren());
     }
 
     public function testChildrenCanBeDetached()
@@ -750,7 +750,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
         $message->detach($child1);
 
-        $this->assertEquals(array($child2), $message->getChildren());
+        $this->assertEquals([$child2], $message->getChildren());
     }
 
     public function testEmbedAttachesChild()
@@ -763,7 +763,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
 
         $message->embed($child);
 
-        $this->assertEquals(array($child), $message->getChildren());
+        $this->assertEquals([$child], $message->getChildren());
     }
 
     public function testEmbedReturnsValidCid()
@@ -797,7 +797,7 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
             ->setMaxLineLength(998)
             ->setBody('xx')
             ->setBoundary('xyz')
-            ->setChildren(array())
+            ->setChildren([])
             ->setCharset('iso-8859-1')
             ->setFormat('flowed')
             ->setDelSp(false)
@@ -805,11 +805,11 @@ class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
             ->setDate(new DateTimeImmutable())
             ->setReturnPath('foo@bar')
             ->setSender('foo@bar')
-            ->setFrom(array('x@y' => 'XY'))
-            ->setReplyTo(array('ab@cd' => 'ABCD'))
-            ->setTo(array('chris@site.tld', 'mark@site.tld'))
+            ->setFrom(['x@y' => 'XY'])
+            ->setReplyTo(['ab@cd' => 'ABCD'])
+            ->setTo(['chris@site.tld', 'mark@site.tld'])
             ->setCc('john@somewhere.tld')
-            ->setBcc(array('one@site', 'two@site' => 'Two'))
+            ->setBcc(['one@site', 'two@site' => 'Two'])
             ->setPriority($message::PRIORITY_LOW)
             ->setReadReceiptTo('a@b')
             ->attach($child)
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/BandwidthMonitorPluginTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/BandwidthMonitorPluginTest.php
index bd65559d..cbacfe27 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/BandwidthMonitorPluginTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/BandwidthMonitorPluginTest.php
@@ -111,10 +111,10 @@ class Swift_Plugins_BandwidthMonitorPluginTest extends \PHPUnit\Framework\TestCa
         $msg = $this->getMockBuilder('Swift_Mime_SimpleMessage')->disableOriginalConstructor()->getMock();
         $msg->expects($this->any())
             ->method('toByteStream')
-            ->will($this->returnCallback(array($this, 'write')));
-      /*  $this->checking(Expectations::create()
-            -> ignoring($msg)->toByteStream(any()) -> calls(array($this, 'write'))
-        ); */
+            ->will($this->returnCallback([$this, 'write']));
+        /*  $this->checking(Expectations::create()
+              -> ignoring($msg)->toByteStream(any()) -> calls(array($this, 'write'))
+          ); */
 
         return $msg;
     }
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/DecoratorPluginTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/DecoratorPluginTest.php
index 2916e6c0..97b1d958 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/DecoratorPluginTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/DecoratorPluginTest.php
@@ -6,8 +6,8 @@ class Swift_Plugins_DecoratorPluginTest extends \SwiftMailerTestCase
     {
         $message = $this->createMessage(
             $this->createHeaders(),
-            array('zip@button.tld' => 'Zipathon'),
-            array('chris.corbyn@swiftmailer.org' => 'Chris'),
+            ['zip@button.tld' => 'Zipathon'],
+            ['chris.corbyn@swiftmailer.org' => 'Chris'],
             'Subject',
             'Hello {name}, you are customer #{id}'
             );
@@ -18,7 +18,7 @@ class Swift_Plugins_DecoratorPluginTest extends \SwiftMailerTestCase
                 ->zeroOrMoreTimes();
 
         $plugin = $this->createPlugin(
-            array('zip@button.tld' => array('{name}' => 'Zip', '{id}' => '456'))
+            ['zip@button.tld' => ['{name}' => 'Zip', '{id}' => '456']]
             );
 
         $evt = $this->createSendEvent($message);
@@ -31,8 +31,8 @@ class Swift_Plugins_DecoratorPluginTest extends \SwiftMailerTestCase
     {
         $message = $this->createMessage(
             $this->createHeaders(),
-            array('zip@button.tld' => 'Zipathon', 'foo@bar.tld' => 'Foo'),
-            array('chris.corbyn@swiftmailer.org' => 'Chris'),
+            ['zip@button.tld' => 'Zipathon', 'foo@bar.tld' => 'Foo'],
+            ['chris.corbyn@swiftmailer.org' => 'Chris'],
             'Subject',
             'Hello {name}, you are customer #{id}'
             );
@@ -49,10 +49,10 @@ class Swift_Plugins_DecoratorPluginTest extends \SwiftMailerTestCase
                 ->zeroOrMoreTimes();
 
         $plugin = $this->createPlugin(
-            array(
-                'foo@bar.tld' => array('{name}' => 'Foo', '{id}' => '123'),
-                'zip@button.tld' => array('{name}' => 'Zip', '{id}' => '456'),
-                )
+            [
+                'foo@bar.tld' => ['{name}' => 'Foo', '{id}' => '123'],
+                'zip@button.tld' => ['{name}' => 'Zip', '{id}' => '456'],
+                ]
             );
 
         $evt = $this->createSendEvent($message);
@@ -65,15 +65,15 @@ class Swift_Plugins_DecoratorPluginTest extends \SwiftMailerTestCase
 
     public function testReplacementsCanBeMadeInHeaders()
     {
-        $headers = $this->createHeaders(array(
+        $headers = $this->createHeaders([
             $returnPathHeader = $this->createHeader('Return-Path', 'foo-{id}@swiftmailer.org'),
             $toHeader = $this->createHeader('Subject', 'A message for {name}!'),
-        ));
+        ]);
 
         $message = $this->createMessage(
             $headers,
-            array('zip@button.tld' => 'Zipathon'),
-            array('chris.corbyn@swiftmailer.org' => 'Chris'),
+            ['zip@button.tld' => 'Zipathon'],
+            ['chris.corbyn@swiftmailer.org' => 'Chris'],
             'A message for {name}!',
             'Hello {name}, you are customer #{id}'
             );
@@ -95,7 +95,7 @@ class Swift_Plugins_DecoratorPluginTest extends \SwiftMailerTestCase
                          ->zeroOrMoreTimes();
 
         $plugin = $this->createPlugin(
-            array('zip@button.tld' => array('{name}' => 'Zip', '{id}' => '456'))
+            ['zip@button.tld' => ['{name}' => 'Zip', '{id}' => '456']]
             );
         $evt = $this->createSendEvent($message);
 
@@ -109,14 +109,14 @@ class Swift_Plugins_DecoratorPluginTest extends \SwiftMailerTestCase
         $part2 = $this->createPart('text/html', 'Your <em>name</em> is {name}?', '2@x');
         $message = $this->createMessage(
             $this->createHeaders(),
-            array('zip@button.tld' => 'Zipathon'),
-            array('chris.corbyn@swiftmailer.org' => 'Chris'),
+            ['zip@button.tld' => 'Zipathon'],
+            ['chris.corbyn@swiftmailer.org' => 'Chris'],
             'A message for {name}!',
             'Subject'
             );
         $message->shouldReceive('getChildren')
                 ->zeroOrMoreTimes()
-                ->andReturn(array($part1, $part2));
+                ->andReturn([$part1, $part2]);
         $part1->shouldReceive('setBody')
               ->once()
               ->with('Your name is Zip?');
@@ -129,7 +129,7 @@ class Swift_Plugins_DecoratorPluginTest extends \SwiftMailerTestCase
               ->zeroOrMoreTimes();
 
         $plugin = $this->createPlugin(
-            array('zip@button.tld' => array('{name}' => 'Zip', '{id}' => '456'))
+            ['zip@button.tld' => ['{name}' => 'Zip', '{id}' => '456']]
             );
 
         $evt = $this->createSendEvent($message);
@@ -142,8 +142,8 @@ class Swift_Plugins_DecoratorPluginTest extends \SwiftMailerTestCase
     {
         $message = $this->createMessage(
             $this->createHeaders(),
-            array('foo@bar' => 'Foobar', 'zip@zap' => 'Zip zap'),
-            array('chris.corbyn@swiftmailer.org' => 'Chris'),
+            ['foo@bar' => 'Foobar', 'zip@zap' => 'Zip zap'],
+            ['chris.corbyn@swiftmailer.org' => 'Chris'],
             'Subject',
             'Something {a}'
             );
@@ -161,11 +161,11 @@ class Swift_Plugins_DecoratorPluginTest extends \SwiftMailerTestCase
         $replacements->shouldReceive('getReplacementsFor')
                      ->once()
                      ->with('foo@bar')
-                     ->andReturn(array('{a}' => 'b'));
+                     ->andReturn(['{a}' => 'b']);
         $replacements->shouldReceive('getReplacementsFor')
                      ->once()
                      ->with('zip@zap')
-                     ->andReturn(array('{a}' => 'c'));
+                     ->andReturn(['{a}' => 'c']);
 
         $plugin = $this->createPlugin($replacements);
 
@@ -186,7 +186,7 @@ class Swift_Plugins_DecoratorPluginTest extends \SwiftMailerTestCase
 
         $evt = $this->createSendEvent($message);
 
-        $plugin = $this->createPlugin(array('somebody@hostname.tld' => array('foo' => 'bar')));
+        $plugin = $this->createPlugin(['somebody@hostname.tld' => ['foo' => 'bar']]);
 
         $plugin->beforeSendPerformed($evt);
 
@@ -194,14 +194,14 @@ class Swift_Plugins_DecoratorPluginTest extends \SwiftMailerTestCase
         $this->assertEquals('body bar', $message->getBody());
     }
 
-    private function createMessage($headers, $to = array(), $from = null, $subject = null,
+    private function createMessage($headers, $to = [], $from = null, $subject = null,
         $body = null)
     {
         $message = $this->getMockery('Swift_Mime_SimpleMessage')->shouldIgnoreMissing();
         foreach ($to as $addr => $name) {
             $message->shouldReceive('getTo')
                     ->once()
-                    ->andReturn(array($addr => $name));
+                    ->andReturn([$addr => $name]);
         }
         $message->shouldReceive('getHeaders')
                 ->zeroOrMoreTimes()
@@ -255,7 +255,7 @@ class Swift_Plugins_DecoratorPluginTest extends \SwiftMailerTestCase
         return $part;
     }
 
-    private function createHeaders($headers = array())
+    private function createHeaders($headers = [])
     {
         $set = $this->getMockery('Swift_Mime_SimpleHeaderSet')->shouldIgnoreMissing();
         $set->shouldReceive('getAll')
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/RedirectingPluginTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/RedirectingPluginTest.php
index 050c7eb2..0ad63867 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/RedirectingPluginTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/RedirectingPluginTest.php
@@ -14,19 +14,19 @@ class Swift_Plugins_RedirectingPluginTest extends \PHPUnit\Framework\TestCase
     {
         $message = (new Swift_Message())
             ->setSubject('...')
-            ->setFrom(array('john@example.com' => 'John Doe'))
-            ->setTo($to = array(
+            ->setFrom(['john@example.com' => 'John Doe'])
+            ->setTo($to = [
                 'fabien-to@example.com' => 'Fabien (To)',
                 'chris-to@example.com' => 'Chris (To)',
-            ))
-            ->setCc($cc = array(
+            ])
+            ->setCc($cc = [
                 'fabien-cc@example.com' => 'Fabien (Cc)',
                 'chris-cc@example.com' => 'Chris (Cc)',
-            ))
-            ->setBcc($bcc = array(
+            ])
+            ->setBcc($bcc = [
                 'fabien-bcc@example.com' => 'Fabien (Bcc)',
                 'chris-bcc@example.com' => 'Chris (Bcc)',
-            ))
+            ])
             ->setBody('...')
         ;
 
@@ -36,9 +36,9 @@ class Swift_Plugins_RedirectingPluginTest extends \PHPUnit\Framework\TestCase
 
         $plugin->beforeSendPerformed($evt);
 
-        $this->assertEquals($message->getTo(), array('god@example.com' => ''));
-        $this->assertEquals($message->getCc(), array());
-        $this->assertEquals($message->getBcc(), array());
+        $this->assertEquals($message->getTo(), ['god@example.com' => '']);
+        $this->assertEquals($message->getCc(), []);
+        $this->assertEquals($message->getBcc(), []);
 
         $plugin->sendPerformed($evt);
 
@@ -51,15 +51,15 @@ class Swift_Plugins_RedirectingPluginTest extends \PHPUnit\Framework\TestCase
     {
         $message = (new Swift_Message())
             ->setSubject('...')
-            ->setFrom(array('john@example.com' => 'John Doe'))
-            ->setCc($cc = array(
+            ->setFrom(['john@example.com' => 'John Doe'])
+            ->setCc($cc = [
                 'fabien-cc@example.com' => 'Fabien (Cc)',
                 'chris-cc@example.com' => 'Chris (Cc)',
-            ))
-            ->setBcc($bcc = array(
+            ])
+            ->setBcc($bcc = [
                 'fabien-bcc@example.com' => 'Fabien (Bcc)',
                 'chris-bcc@example.com' => 'Chris (Bcc)',
-            ))
+            ])
             ->setBody('...')
         ;
 
@@ -69,13 +69,13 @@ class Swift_Plugins_RedirectingPluginTest extends \PHPUnit\Framework\TestCase
 
         $plugin->beforeSendPerformed($evt);
 
-        $this->assertEquals($message->getTo(), array('god@example.com' => ''));
-        $this->assertEquals($message->getCc(), array());
-        $this->assertEquals($message->getBcc(), array());
+        $this->assertEquals($message->getTo(), ['god@example.com' => '']);
+        $this->assertEquals($message->getCc(), []);
+        $this->assertEquals($message->getBcc(), []);
 
         $plugin->sendPerformed($evt);
 
-        $this->assertEquals($message->getTo(), array());
+        $this->assertEquals($message->getTo(), []);
         $this->assertEquals($message->getCc(), $cc);
         $this->assertEquals($message->getBcc(), $bcc);
     }
@@ -84,27 +84,27 @@ class Swift_Plugins_RedirectingPluginTest extends \PHPUnit\Framework\TestCase
     {
         $message = (new Swift_Message())
             ->setSubject('...')
-            ->setFrom(array('john@example.com' => 'John Doe'))
-            ->setTo($to = array(
+            ->setFrom(['john@example.com' => 'John Doe'])
+            ->setTo($to = [
                 'fabien-to@example.com' => 'Fabien (To)',
                 'chris-to@example.com' => 'Chris (To)',
                 'lars-to@internal.com' => 'Lars (To)',
-            ))
-            ->setCc($cc = array(
+            ])
+            ->setCc($cc = [
                 'fabien-cc@example.com' => 'Fabien (Cc)',
                 'chris-cc@example.com' => 'Chris (Cc)',
                 'lars-cc@internal.org' => 'Lars (Cc)',
-            ))
-            ->setBcc($bcc = array(
+            ])
+            ->setBcc($bcc = [
                 'fabien-bcc@example.com' => 'Fabien (Bcc)',
                 'chris-bcc@example.com' => 'Chris (Bcc)',
                 'john-bcc@example.org' => 'John (Bcc)',
-            ))
+            ])
             ->setBody('...')
         ;
 
         $recipient = 'god@example.com';
-        $patterns = array('/^.*@internal.[a-z]+$/', '/^john-.*$/');
+        $patterns = ['/^.*@internal.[a-z]+$/', '/^john-.*$/'];
 
         $plugin = new Swift_Plugins_RedirectingPlugin($recipient, $patterns);
 
@@ -115,9 +115,9 @@ class Swift_Plugins_RedirectingPluginTest extends \PHPUnit\Framework\TestCase
 
         $plugin->beforeSendPerformed($evt);
 
-        $this->assertEquals($message->getTo(), array('lars-to@internal.com' => 'Lars (To)', 'god@example.com' => null));
-        $this->assertEquals($message->getCc(), array('lars-cc@internal.org' => 'Lars (Cc)'));
-        $this->assertEquals($message->getBcc(), array('john-bcc@example.org' => 'John (Bcc)'));
+        $this->assertEquals($message->getTo(), ['lars-to@internal.com' => 'Lars (To)', 'god@example.com' => null]);
+        $this->assertEquals($message->getCc(), ['lars-cc@internal.org' => 'Lars (Cc)']);
+        $this->assertEquals($message->getBcc(), ['john-bcc@example.org' => 'John (Bcc)']);
 
         $plugin->sendPerformed($evt);
 
@@ -130,27 +130,27 @@ class Swift_Plugins_RedirectingPluginTest extends \PHPUnit\Framework\TestCase
     {
         $message = (new Swift_Message())
             ->setSubject('...')
-            ->setFrom(array('john@example.com' => 'John Doe'))
-            ->setTo(array(
+            ->setFrom(['john@example.com' => 'John Doe'])
+            ->setTo([
             'fabien@example.com' => 'Fabien',
             'chris@example.com' => 'Chris (To)',
             'lars-to@internal.com' => 'Lars (To)',
-        ))
-            ->setCc(array(
+        ])
+            ->setCc([
             'fabien@example.com' => 'Fabien',
             'chris-cc@example.com' => 'Chris (Cc)',
             'lars-cc@internal.org' => 'Lars (Cc)',
-        ))
-            ->setBcc(array(
+        ])
+            ->setBcc([
             'fabien@example.com' => 'Fabien',
             'chris-bcc@example.com' => 'Chris (Bcc)',
             'john-bcc@example.org' => 'John (Bcc)',
-        ))
+        ])
             ->setBody('...')
         ;
 
-        $recipients = array('god@example.com', 'fabien@example.com');
-        $patterns = array('/^.*@internal.[a-z]+$/');
+        $recipients = ['god@example.com', 'fabien@example.com'];
+        $patterns = ['/^.*@internal.[a-z]+$/'];
 
         $plugin = new Swift_Plugins_RedirectingPlugin($recipients, $patterns);
 
@@ -160,13 +160,13 @@ class Swift_Plugins_RedirectingPluginTest extends \PHPUnit\Framework\TestCase
 
         $this->assertEquals(
             $message->getTo(),
-            array('fabien@example.com' => 'Fabien', 'lars-to@internal.com' => 'Lars (To)', 'god@example.com' => null)
+            ['fabien@example.com' => 'Fabien', 'lars-to@internal.com' => 'Lars (To)', 'god@example.com' => null]
         );
         $this->assertEquals(
             $message->getCc(),
-            array('fabien@example.com' => 'Fabien', 'lars-cc@internal.org' => 'Lars (Cc)')
+            ['fabien@example.com' => 'Fabien', 'lars-cc@internal.org' => 'Lars (Cc)']
         );
-        $this->assertEquals($message->getBcc(), array('fabien@example.com' => 'Fabien'));
+        $this->assertEquals($message->getBcc(), ['fabien@example.com' => 'Fabien']);
     }
 
     private function createSendEvent(Swift_Mime_SimpleMessage $message)
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/ReporterPluginTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/ReporterPluginTest.php
index f5ff7f86..19238f83 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/ReporterPluginTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/ReporterPluginTest.php
@@ -8,9 +8,9 @@ class Swift_Plugins_ReporterPluginTest extends \SwiftMailerTestCase
         $evt = $this->createSendEvent();
         $reporter = $this->createReporter();
 
-        $message->shouldReceive('getTo')->zeroOrMoreTimes()->andReturn(array('foo@bar.tld' => 'Foo'));
+        $message->shouldReceive('getTo')->zeroOrMoreTimes()->andReturn(['foo@bar.tld' => 'Foo']);
         $evt->shouldReceive('getMessage')->zeroOrMoreTimes()->andReturn($message);
-        $evt->shouldReceive('getFailedRecipients')->zeroOrMoreTimes()->andReturn(array());
+        $evt->shouldReceive('getFailedRecipients')->zeroOrMoreTimes()->andReturn([]);
         $reporter->shouldReceive('notify')->once()->with($message, 'foo@bar.tld', Swift_Plugins_Reporter::RESULT_PASS);
 
         $plugin = new Swift_Plugins_ReporterPlugin($reporter);
@@ -23,9 +23,9 @@ class Swift_Plugins_ReporterPluginTest extends \SwiftMailerTestCase
         $evt = $this->createSendEvent();
         $reporter = $this->createReporter();
 
-        $message->shouldReceive('getTo')->zeroOrMoreTimes()->andReturn(array('foo@bar.tld' => 'Foo', 'zip@button' => 'Zip'));
+        $message->shouldReceive('getTo')->zeroOrMoreTimes()->andReturn(['foo@bar.tld' => 'Foo', 'zip@button' => 'Zip']);
         $evt->shouldReceive('getMessage')->zeroOrMoreTimes()->andReturn($message);
-        $evt->shouldReceive('getFailedRecipients')->zeroOrMoreTimes()->andReturn(array('zip@button'));
+        $evt->shouldReceive('getFailedRecipients')->zeroOrMoreTimes()->andReturn(['zip@button']);
         $reporter->shouldReceive('notify')->once()->with($message, 'foo@bar.tld', Swift_Plugins_Reporter::RESULT_PASS);
         $reporter->shouldReceive('notify')->once()->with($message, 'zip@button', Swift_Plugins_Reporter::RESULT_FAIL);
 
@@ -39,10 +39,10 @@ class Swift_Plugins_ReporterPluginTest extends \SwiftMailerTestCase
         $evt = $this->createSendEvent();
         $reporter = $this->createReporter();
 
-        $message->shouldReceive('getTo')->zeroOrMoreTimes()->andReturn(array('foo@bar.tld' => 'Foo'));
-        $message->shouldReceive('getCc')->zeroOrMoreTimes()->andReturn(array('zip@button' => 'Zip', 'test@test.com' => 'Test'));
+        $message->shouldReceive('getTo')->zeroOrMoreTimes()->andReturn(['foo@bar.tld' => 'Foo']);
+        $message->shouldReceive('getCc')->zeroOrMoreTimes()->andReturn(['zip@button' => 'Zip', 'test@test.com' => 'Test']);
         $evt->shouldReceive('getMessage')->zeroOrMoreTimes()->andReturn($message);
-        $evt->shouldReceive('getFailedRecipients')->zeroOrMoreTimes()->andReturn(array('zip@button'));
+        $evt->shouldReceive('getFailedRecipients')->zeroOrMoreTimes()->andReturn(['zip@button']);
         $reporter->shouldReceive('notify')->once()->with($message, 'foo@bar.tld', Swift_Plugins_Reporter::RESULT_PASS);
         $reporter->shouldReceive('notify')->once()->with($message, 'zip@button', Swift_Plugins_Reporter::RESULT_FAIL);
         $reporter->shouldReceive('notify')->once()->with($message, 'test@test.com', Swift_Plugins_Reporter::RESULT_PASS);
@@ -57,10 +57,10 @@ class Swift_Plugins_ReporterPluginTest extends \SwiftMailerTestCase
         $evt = $this->createSendEvent();
         $reporter = $this->createReporter();
 
-        $message->shouldReceive('getTo')->zeroOrMoreTimes()->andReturn(array('foo@bar.tld' => 'Foo'));
-        $message->shouldReceive('getBcc')->zeroOrMoreTimes()->andReturn(array('zip@button' => 'Zip', 'test@test.com' => 'Test'));
+        $message->shouldReceive('getTo')->zeroOrMoreTimes()->andReturn(['foo@bar.tld' => 'Foo']);
+        $message->shouldReceive('getBcc')->zeroOrMoreTimes()->andReturn(['zip@button' => 'Zip', 'test@test.com' => 'Test']);
         $evt->shouldReceive('getMessage')->zeroOrMoreTimes()->andReturn($message);
-        $evt->shouldReceive('getFailedRecipients')->zeroOrMoreTimes()->andReturn(array('zip@button'));
+        $evt->shouldReceive('getFailedRecipients')->zeroOrMoreTimes()->andReturn(['zip@button']);
         $reporter->shouldReceive('notify')->once()->with($message, 'foo@bar.tld', Swift_Plugins_Reporter::RESULT_PASS);
         $reporter->shouldReceive('notify')->once()->with($message, 'zip@button', Swift_Plugins_Reporter::RESULT_FAIL);
         $reporter->shouldReceive('notify')->once()->with($message, 'test@test.com', Swift_Plugins_Reporter::RESULT_PASS);
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/Reporters/HitReporterTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/Reporters/HitReporterTest.php
index 70a46710..d5a1c9ce 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/Reporters/HitReporterTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/Reporters/HitReporterTest.php
@@ -16,7 +16,7 @@ class Swift_Plugins_Reporters_HitReporterTest extends \PHPUnit\Framework\TestCas
         $this->hitReporter->notify($this->message, 'foo@bar.tld',
             Swift_Plugins_Reporter::RESULT_FAIL
             );
-        $this->assertEquals(array('foo@bar.tld'),
+        $this->assertEquals(['foo@bar.tld'],
             $this->hitReporter->getFailedRecipients()
             );
     }
@@ -29,7 +29,7 @@ class Swift_Plugins_Reporters_HitReporterTest extends \PHPUnit\Framework\TestCas
         $this->hitReporter->notify($this->message, 'zip@button',
             Swift_Plugins_Reporter::RESULT_FAIL
             );
-        $this->assertEquals(array('foo@bar.tld', 'zip@button'),
+        $this->assertEquals(['foo@bar.tld', 'zip@button'],
             $this->hitReporter->getFailedRecipients()
             );
     }
@@ -42,7 +42,7 @@ class Swift_Plugins_Reporters_HitReporterTest extends \PHPUnit\Framework\TestCas
         $this->hitReporter->notify($this->message, 'zip@button',
             Swift_Plugins_Reporter::RESULT_PASS
             );
-        $this->assertEquals(array('foo@bar.tld'),
+        $this->assertEquals(['foo@bar.tld'],
             $this->hitReporter->getFailedRecipients()
             );
     }
@@ -55,10 +55,10 @@ class Swift_Plugins_Reporters_HitReporterTest extends \PHPUnit\Framework\TestCas
         $this->hitReporter->notify($this->message, 'zip@button',
             Swift_Plugins_Reporter::RESULT_FAIL
             );
-        $this->assertEquals(array('foo@bar.tld', 'zip@button'),
+        $this->assertEquals(['foo@bar.tld', 'zip@button'],
             $this->hitReporter->getFailedRecipients()
             );
         $this->hitReporter->clear();
-        $this->assertEquals(array(), $this->hitReporter->getFailedRecipients());
+        $this->assertEquals([], $this->hitReporter->getFailedRecipients());
     }
 }
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/DKIMSignerTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/DKIMSignerTest.php
index c1e0cac1..1d5f957f 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/DKIMSignerTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/DKIMSignerTest.php
@@ -31,7 +31,7 @@ class Swift_Signers_DKIMSignerTest extends \SwiftMailerTestCase
         $signer->setHashAlgorithm('rsa-sha1');
         $signer->setSignatureTimestamp('1299879181');
         $altered = $signer->getAlteredHeaders();
-        $this->assertEquals(array('DKIM-Signature'), $altered);
+        $this->assertEquals(['DKIM-Signature'], $altered);
         $signer->reset();
         $signer->setHeaders($headerSet);
         $this->assertFalse($headerSet->has('DKIM-Signature'));
@@ -54,7 +54,7 @@ class Swift_Signers_DKIMSignerTest extends \SwiftMailerTestCase
         $signer->setHashAlgorithm('rsa-sha256');
         $signer->setSignatureTimestamp('1299879181');
         $altered = $signer->getAlteredHeaders();
-        $this->assertEquals(array('DKIM-Signature'), $altered);
+        $this->assertEquals(['DKIM-Signature'], $altered);
         $signer->reset();
         $signer->setHeaders($headerSet);
         $this->assertFalse($headerSet->has('DKIM-Signature'));
@@ -79,7 +79,7 @@ class Swift_Signers_DKIMSignerTest extends \SwiftMailerTestCase
         $signer->setBodyCanon('relaxed');
         $signer->setHeaderCanon('relaxed');
         $altered = $signer->getAlteredHeaders();
-        $this->assertEquals(array('DKIM-Signature'), $altered);
+        $this->assertEquals(['DKIM-Signature'], $altered);
         $signer->reset();
         $signer->setHeaders($headerSet);
         $this->assertFalse($headerSet->has('DKIM-Signature'));
@@ -103,7 +103,7 @@ class Swift_Signers_DKIMSignerTest extends \SwiftMailerTestCase
         $signer->setSignatureTimestamp('1299879181');
         $signer->setHeaderCanon('relaxed');
         $altered = $signer->getAlteredHeaders();
-        $this->assertEquals(array('DKIM-Signature'), $altered);
+        $this->assertEquals(['DKIM-Signature'], $altered);
         $signer->reset();
         $signer->setHeaders($headerSet);
         $this->assertFalse($headerSet->has('DKIM-Signature'));
@@ -127,7 +127,7 @@ class Swift_Signers_DKIMSignerTest extends \SwiftMailerTestCase
         $signer->setSignatureTimestamp('1299879181');
         $signer->setBodyCanon('relaxed');
         $altered = $signer->getAlteredHeaders();
-        $this->assertEquals(array('DKIM-Signature'), $altered);
+        $this->assertEquals(['DKIM-Signature'], $altered);
         $signer->reset();
         $signer->setHeaders($headerSet);
         $this->assertFalse($headerSet->has('DKIM-Signature'));
@@ -173,7 +173,7 @@ class Swift_Signers_DKIMSignerTest extends \SwiftMailerTestCase
 
         $headers->shouldReceive('listAll')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('From', 'To', 'Date', 'Subject'));
+                ->andReturn(['From', 'To', 'Date', 'Subject']);
         $headers->shouldReceive('has')
                 ->zeroOrMoreTimes()
                 ->with('From')
@@ -181,7 +181,7 @@ class Swift_Signers_DKIMSignerTest extends \SwiftMailerTestCase
         $headers->shouldReceive('getAll')
                 ->zeroOrMoreTimes()
                 ->with('From')
-                ->andReturn(array($headerFactory->createMailboxHeader('From', 'test@test.test')));
+                ->andReturn([$headerFactory->createMailboxHeader('From', 'test@test.test')]);
         $headers->shouldReceive('has')
                 ->zeroOrMoreTimes()
                 ->with('To')
@@ -189,7 +189,7 @@ class Swift_Signers_DKIMSignerTest extends \SwiftMailerTestCase
         $headers->shouldReceive('getAll')
                 ->zeroOrMoreTimes()
                 ->with('To')
-                ->andReturn(array($headerFactory->createMailboxHeader('To', 'test@test.test')));
+                ->andReturn([$headerFactory->createMailboxHeader('To', 'test@test.test')]);
         $headers->shouldReceive('has')
                 ->zeroOrMoreTimes()
                 ->with('Date')
@@ -197,7 +197,7 @@ class Swift_Signers_DKIMSignerTest extends \SwiftMailerTestCase
         $headers->shouldReceive('getAll')
                 ->zeroOrMoreTimes()
                 ->with('Date')
-                ->andReturn(array($headerFactory->createTextHeader('Date', 'Fri, 11 Mar 2011 20:56:12 +0000 (GMT)')));
+                ->andReturn([$headerFactory->createTextHeader('Date', 'Fri, 11 Mar 2011 20:56:12 +0000 (GMT)')]);
         $headers->shouldReceive('has')
                 ->zeroOrMoreTimes()
                 ->with('Subject')
@@ -205,7 +205,7 @@ class Swift_Signers_DKIMSignerTest extends \SwiftMailerTestCase
         $headers->shouldReceive('getAll')
                 ->zeroOrMoreTimes()
                 ->with('Subject')
-                ->andReturn(array($headerFactory->createTextHeader('Subject', 'Foo Bar Text Message')));
+                ->andReturn([$headerFactory->createTextHeader('Subject', 'Foo Bar Text Message')]);
         $headers->shouldReceive('addTextHeader')
                 ->zeroOrMoreTimes()
                 ->with('DKIM-Signature', \Mockery::any())
@@ -213,7 +213,7 @@ class Swift_Signers_DKIMSignerTest extends \SwiftMailerTestCase
         $headers->shouldReceive('getAll')
                 ->zeroOrMoreTimes()
                 ->with('DKIM-Signature')
-                ->andReturn(array($headerFactory->createTextHeader('DKIM-Signature', 'Foo Bar Text Message')));
+                ->andReturn([$headerFactory->createTextHeader('DKIM-Signature', 'Foo Bar Text Message')]);
 
         return $headers;
     }
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/SMimeSignerTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/SMimeSignerTest.php
index aee7bceb..932e4862 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/SMimeSignerTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/SMimeSignerTest.php
@@ -17,21 +17,21 @@ class Swift_Signers_SMimeSignerTest extends \PHPUnit\Framework\TestCase
         $this->samplesDir = str_replace('\\', '/', realpath(__DIR__.'/../../../_samples/')).'/';
     }
 
-    public function testUnSingedMessage()
+    public function testUnSignedMessage()
     {
         $message = (new Swift_Message('Wonderful Subject'))
-          ->setFrom(array('john@doe.com' => 'John Doe'))
-          ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
+          ->setFrom(['john@doe.com' => 'John Doe'])
+          ->setTo(['receiver@domain.org', 'other@domain.org' => 'A name'])
           ->setBody('Here is the message itself');
 
         $this->assertEquals('Here is the message itself', $message->getBody());
     }
 
-    public function testSingedMessage()
+    public function testSignedMessage()
     {
         $message = (new Swift_Message('Wonderful Subject'))
-          ->setFrom(array('john@doe.com' => 'John Doe'))
-          ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
+          ->setFrom(['john@doe.com' => 'John Doe'])
+          ->setTo(['receiver@domain.org', 'other@domain.org' => 'A name'])
           ->setBody('Here is the message itself');
 
         $signer = new Swift_Signers_SMimeSigner();
@@ -70,11 +70,66 @@ OEL;
         unset($messageStream);
     }
 
-    public function testSingedMessageExtraCerts()
+    public function testSignedMessageWithFullyWrappedMessage()
+    {
+        $message = (new Swift_Message('Middle-out compression secrets'))
+          ->setFrom(['richard@piedpiper.com' => 'Richard Hendricks'])
+          ->setTo(['jared@piedpiper.com' => 'Jared Dunn'])
+          ->setBody('Here goes the entire algorithm...');
+
+        $signer = new Swift_Signers_SMimeSigner();
+        $signer->setSignCertificate($this->samplesDir.'smime/sign.crt', $this->samplesDir.'smime/sign.key');
+
+        // Tell the signer to wrap the full MIME message
+        $signer->setWrapFullMessage(true);
+        $message->attachSigner($signer);
+
+        $messageStream = $this->newFilteredStream();
+        $message->toByteStream($messageStream);
+        $messageStream->commit();
+
+        $entityString = $messageStream->getContent();
+        $headers = self::getHeadersOfMessage($entityString);
+
+        if (!($boundary = $this->getBoundary($headers['content-type']))) {
+            return false;
+        }
+
+        $expectedBody = <<<OEL
+This is an S/MIME signed message
+
+--$boundary
+Content-Type: message/rfc822; charset=utf-8
+Content-Transfer-Encoding: 7bit
+
+Message-ID: <[a-f0-9]+@swift.generated>
+Date: .*
+Subject: Middle-out compression secrets
+From: Richard Hendricks <richard@piedpiper.com>
+To: Jared Dunn <jared@piedpiper.com>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: quoted-printable
+
+Here goes the entire algorithm...
+--$boundary
+Content-Type: application/(x\-)?pkcs7-signature; name="smime\.p7s"
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename="smime\.p7s"
+
+(?:^[a-zA-Z0-9\/\\r\\n+]*={0,2})
+
+--$boundary--
+OEL;
+        $this->assertValidVerify($expectedBody, $messageStream);
+        unset($messageStream);
+    }
+
+    public function testSignedMessageExtraCerts()
     {
         $message = (new Swift_Message('Wonderful Subject'))
-          ->setFrom(array('john@doe.com' => 'John Doe'))
-          ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
+          ->setFrom(['john@doe.com' => 'John Doe'])
+          ->setTo(['receiver@domain.org', 'other@domain.org' => 'A name'])
           ->setBody('Here is the message itself');
 
         $signer = new Swift_Signers_SMimeSigner();
@@ -113,11 +168,11 @@ OEL;
         unset($messageStream);
     }
 
-    public function testSingedMessageBinary()
+    public function testSignedMessageBinary()
     {
         $message = (new Swift_Message('Wonderful Subject'))
-          ->setFrom(array('john@doe.com' => 'John Doe'))
-          ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
+          ->setFrom(['john@doe.com' => 'John Doe'])
+          ->setTo(['receiver@domain.org', 'other@domain.org' => 'A name'])
           ->setBody('Here is the message itself');
 
         $signer = new Swift_Signers_SMimeSigner();
@@ -148,11 +203,11 @@ OEL;
         unset($messageStreamClean, $messageStream);
     }
 
-    public function testSingedMessageWithAttachments()
+    public function testSignedMessageWithAttachments()
     {
         $message = (new Swift_Message('Wonderful Subject'))
-          ->setFrom(array('john@doe.com' => 'John Doe'))
-          ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
+          ->setFrom(['john@doe.com' => 'John Doe'])
+          ->setTo(['receiver@domain.org', 'other@domain.org' => 'A name'])
           ->setBody('Here is the message itself');
 
         $message->attach(Swift_Attachment::fromPath($this->samplesDir.'/files/textfile.zip'));
@@ -215,8 +270,8 @@ OEL;
     public function testEncryptedMessage()
     {
         $message = (new Swift_Message('Wonderful Subject'))
-          ->setFrom(array('john@doe.com' => 'John Doe'))
-          ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
+          ->setFrom(['john@doe.com' => 'John Doe'])
+          ->setTo(['receiver@domain.org', 'other@domain.org' => 'A name'])
           ->setBody('Here is the message itself');
 
         $originalMessage = $this->cleanMessage($message->toString());
@@ -242,7 +297,7 @@ OEL;
 
         $decryptedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
 
-        if (!openssl_pkcs7_decrypt($messageStream->getPath(), $decryptedMessageStream->getPath(), 'file://'.$this->samplesDir.'smime/encrypt.crt', array('file://'.$this->samplesDir.'smime/encrypt.key', 'swift'))) {
+        if (!openssl_pkcs7_decrypt($messageStream->getPath(), $decryptedMessageStream->getPath(), 'file://'.$this->samplesDir.'smime/encrypt.crt', ['file://'.$this->samplesDir.'smime/encrypt.key', 'swift'])) {
             $this->fail(sprintf('Decrypt of the message failed. Internal error "%s".', openssl_error_string()));
         }
 
@@ -250,17 +305,62 @@ OEL;
         unset($decryptedMessageStream, $messageStream);
     }
 
+    public function testEncryptedMessageWithFullyWrappedMessage()
+    {
+        $message = (new Swift_Message('Middle-out compression secrets'))
+          ->setFrom(['richard@piedpiper.com' => 'Richard Hendricks'])
+          ->setTo(['jared@piedpiper.com' => 'Jared Dunn'])
+          ->setBody('Here goes the entire algorithm...');
+
+        $originalMessage = $message->toString();
+
+        $signer = new Swift_Signers_SMimeSigner();
+        $signer->setEncryptCertificate($this->samplesDir.'smime/encrypt.crt');
+        $signer->setWrapFullMessage(true);
+        $message->attachSigner($signer);
+
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $message->toByteStream($messageStream);
+        $messageStream->commit();
+
+        $entityString = $messageStream->getContent();
+        $headers = self::getHeadersOfMessage($entityString);
+
+        if (!preg_match('#^application/(x\-)?pkcs7-mime; smime-type=enveloped\-data;#', $headers['content-type'])) {
+            $this->fail('Content-type does not match.');
+
+            return false;
+        }
+
+        $expectedBody = '(?:^[a-zA-Z0-9\/\\r\\n+]*={0,2})';
+
+        $decryptedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
+
+        if (!openssl_pkcs7_decrypt($messageStream->getPath(), $decryptedMessageStream->getPath(), 'file://'.$this->samplesDir.'smime/encrypt.crt', ['file://'.$this->samplesDir.'smime/encrypt.key', 'swift'])) {
+            $this->fail(sprintf('Decrypt of the message failed. Internal error "%s".', openssl_error_string()));
+        }
+
+        $decryptedMessage = $decryptedMessageStream->getContent();
+        $decryptedHeaders = self::getHeadersOfMessage($decryptedMessage);
+        $this->assertEquals('message/rfc822; charset=utf-8', $decryptedHeaders['content-type']);
+        $this->assertEquals('7bit', $decryptedHeaders['content-transfer-encoding']);
+
+        $decryptedMessageBody = self::getBodyOfMessage($decryptedMessage);
+        $this->assertEquals($originalMessage, $decryptedMessageBody);
+        unset($decryptedMessageStream, $messageStream);
+    }
+
     public function testEncryptedMessageWithMultipleCerts()
     {
         $message = (new Swift_Message('Wonderful Subject'))
-          ->setFrom(array('john@doe.com' => 'John Doe'))
-          ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
+          ->setFrom(['john@doe.com' => 'John Doe'])
+          ->setTo(['receiver@domain.org', 'other@domain.org' => 'A name'])
           ->setBody('Here is the message itself');
 
         $originalMessage = $this->cleanMessage($message->toString());
 
         $signer = new Swift_Signers_SMimeSigner();
-        $signer->setEncryptCertificate(array($this->samplesDir.'smime/encrypt.crt', $this->samplesDir.'smime/encrypt2.crt'));
+        $signer->setEncryptCertificate([$this->samplesDir.'smime/encrypt.crt', $this->samplesDir.'smime/encrypt2.crt']);
         $message->attachSigner($signer);
 
         $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
@@ -280,7 +380,7 @@ OEL;
 
         $decryptedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
 
-        if (!openssl_pkcs7_decrypt($messageStream->getPath(), $decryptedMessageStream->getPath(), 'file://'.$this->samplesDir.'smime/encrypt.crt', array('file://'.$this->samplesDir.'smime/encrypt.key', 'swift'))) {
+        if (!openssl_pkcs7_decrypt($messageStream->getPath(), $decryptedMessageStream->getPath(), 'file://'.$this->samplesDir.'smime/encrypt.crt', ['file://'.$this->samplesDir.'smime/encrypt.key', 'swift'])) {
             $this->fail(sprintf('Decrypt of the message failed. Internal error "%s".', openssl_error_string()));
         }
 
@@ -289,7 +389,7 @@ OEL;
 
         $decryptedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
 
-        if (!openssl_pkcs7_decrypt($messageStream->getPath(), $decryptedMessageStream->getPath(), 'file://'.$this->samplesDir.'smime/encrypt2.crt', array('file://'.$this->samplesDir.'smime/encrypt2.key', 'swift'))) {
+        if (!openssl_pkcs7_decrypt($messageStream->getPath(), $decryptedMessageStream->getPath(), 'file://'.$this->samplesDir.'smime/encrypt2.crt', ['file://'.$this->samplesDir.'smime/encrypt2.key', 'swift'])) {
             $this->fail(sprintf('Decrypt of the message failed. Internal error "%s".', openssl_error_string()));
         }
 
@@ -300,8 +400,8 @@ OEL;
     public function testSignThenEncryptedMessage()
     {
         $message = (new Swift_Message('Wonderful Subject'))
-          ->setFrom(array('john@doe.com' => 'John Doe'))
-          ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
+          ->setFrom(['john@doe.com' => 'John Doe'])
+          ->setTo(['receiver@domain.org', 'other@domain.org' => 'A name'])
           ->setBody('Here is the message itself');
 
         $signer = new Swift_Signers_SMimeSigner();
@@ -326,7 +426,7 @@ OEL;
 
         $decryptedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
 
-        if (!openssl_pkcs7_decrypt($messageStream->getPath(), $decryptedMessageStream->getPath(), 'file://'.$this->samplesDir.'smime/encrypt.crt', array('file://'.$this->samplesDir.'smime/encrypt.key', 'swift'))) {
+        if (!openssl_pkcs7_decrypt($messageStream->getPath(), $decryptedMessageStream->getPath(), 'file://'.$this->samplesDir.'smime/encrypt.crt', ['file://'.$this->samplesDir.'smime/encrypt.key', 'swift'])) {
             $this->fail(sprintf('Decrypt of the message failed. Internal error "%s".', openssl_error_string()));
         }
 
@@ -365,11 +465,11 @@ OEL;
     public function testEncryptThenSignMessage()
     {
         $message = (new Swift_Message('Wonderful Subject'))
-          ->setFrom(array('john@doe.com' => 'John Doe'))
-          ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
+          ->setFrom(['john@doe.com' => 'John Doe'])
+          ->setTo(['receiver@domain.org', 'other@domain.org' => 'A name'])
           ->setBody('Here is the message itself');
 
-        $originalMessage = $this->cleanMessage($message->toString());
+        $originalMessage = $message->toString();
 
         $signer = new Swift_Signers_SMimeSigner();
         $signer->setSignCertificate($this->samplesDir.'smime/sign.crt', $this->samplesDir.'smime/sign.key');
@@ -392,10 +492,10 @@ OEL;
 This is an S/MIME signed message
 
 --$boundary
-(?P<encrypted_message>MIME-Version: 1\.0
-Content-Disposition: attachment; filename="smime\.p7m"
-Content-Type: application/(x\-)?pkcs7-mime; smime-type=enveloped-data; name="smime\.p7m"
+(?P<encrypted_message>Content-Type: application/(x\-)?pkcs7-mime; smime-type=enveloped-data;
+ name="smime\.p7m"; charset=utf-8
 Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename="smime\.p7m"
 
 (?:^[a-zA-Z0-9\/\\r\\n+]*={0,2})
 
@@ -426,7 +526,7 @@ OEL;
 
         $decryptedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
 
-        if (!openssl_pkcs7_decrypt($messageStreamClean->getPath(), $decryptedMessageStream->getPath(), 'file://'.$this->samplesDir.'smime/encrypt.crt', array('file://'.$this->samplesDir.'smime/encrypt.key', 'swift'))) {
+        if (!openssl_pkcs7_decrypt($messageStreamClean->getPath(), $decryptedMessageStream->getPath(), 'file://'.$this->samplesDir.'smime/encrypt.crt', ['file://'.$this->samplesDir.'smime/encrypt.key', 'swift'])) {
             $this->fail(sprintf('Decrypt of the message failed. Internal error "%s".', openssl_error_string()));
         }
 
@@ -441,13 +541,13 @@ OEL;
         // File is UNIX encoded so convert them to correct line ending
         $expected = str_replace("\n", "\r\n", $expected);
 
-        $actual = trim(self::getBodyOfMessage($actual));
+        $actual = self::getBodyOfMessage($actual);
         if (!$this->assertRegExp('%^'.$expected.'$\s*%m', $actual)) {
             return false;
         }
 
         $opensslOutput = new Swift_ByteStream_TemporaryFileByteStream();
-        $verify = openssl_pkcs7_verify($messageStream->getPath(), null, $opensslOutput->getPath(), array($this->samplesDir.'smime/ca.crt'));
+        $verify = openssl_pkcs7_verify($messageStream->getPath(), null, $opensslOutput->getPath(), [$this->samplesDir.'smime/ca.crt']);
 
         if (false === $verify) {
             $this->fail('Verification of the message failed.');
@@ -484,7 +584,7 @@ OEL;
 
     protected static function getBodyOfMessage($message)
     {
-        return substr($message, strpos($message, "\r\n\r\n"));
+        return trim(substr($message, strpos($message, "\r\n\r\n")));
     }
 
     /**
@@ -496,7 +596,7 @@ OEL;
 
         $headers = self::getHeadersOfMessage($content);
         foreach ($headers as $headerName => $value) {
-            if (!in_array($headerName, array('content-type', 'content-transfer-encoding', 'content-disposition'))) {
+            if (!in_array($headerName, ['content-type', 'content-transfer-encoding', 'content-disposition'])) {
                 continue;
             }
 
@@ -511,7 +611,7 @@ OEL;
             $newContent .= "$headerName: $value\r\n";
         }
 
-        return $newContent."\r\n".ltrim(self::getBodyOfMessage($content));
+        return $newContent."\r\n".self::getBodyOfMessage($content);
     }
 
     /**
@@ -526,17 +626,19 @@ OEL;
     protected static function getHeadersOfMessage($message)
     {
         $headersPosEnd = strpos($message, "\r\n\r\n");
-        $headerData = substr($message, 0, $headersPosEnd);
+        $headerData = trim(substr($message, 0, $headersPosEnd));
         $headerLines = explode("\r\n", $headerData);
+        $headers = [];
 
-        if (empty($headerLines)) {
-            return array();
+        if (false === $headerLines) {
+            return $headers;
         }
 
-        $headers = array();
-
+        // Transform header lines into an associative array
+        $currentHeaderName = '';
         foreach ($headerLines as $headerLine) {
-            if (ctype_space($headerLines[0]) || false === strpos($headerLine, ':')) {
+            // Handle headers that span multiple lines
+            if (false === strpos($headerLine, ':')) {
                 $headers[$currentHeaderName] .= ' '.trim($headerLine);
                 continue;
             }
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/ByteArrayReplacementFilterTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/ByteArrayReplacementFilterTest.php
index 936acaa2..3c812242 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/ByteArrayReplacementFilterTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/ByteArrayReplacementFilterTest.php
@@ -4,17 +4,17 @@ class Swift_StreamFilters_ByteArrayReplacementFilterTest extends \PHPUnit\Framew
 {
     public function testBasicReplacementsAreMade()
     {
-        $filter = $this->createFilter(array(0x61, 0x62), array(0x63, 0x64));
+        $filter = $this->createFilter([0x61, 0x62], [0x63, 0x64]);
         $this->assertEquals(
-            array(0x59, 0x60, 0x63, 0x64, 0x65),
-            $filter->filter(array(0x59, 0x60, 0x61, 0x62, 0x65))
+            [0x59, 0x60, 0x63, 0x64, 0x65],
+            $filter->filter([0x59, 0x60, 0x61, 0x62, 0x65])
             );
     }
 
     public function testShouldBufferReturnsTrueIfPartialMatchAtEndOfBuffer()
     {
-        $filter = $this->createFilter(array(0x61, 0x62), array(0x63, 0x64));
-        $this->assertTrue($filter->shouldBuffer(array(0x59, 0x60, 0x61)),
+        $filter = $this->createFilter([0x61, 0x62], [0x63, 0x64]);
+        $this->assertTrue($filter->shouldBuffer([0x59, 0x60, 0x61]),
             '%s: Filter should buffer since 0x61 0x62 is the needle and the ending '.
             '0x61 could be from 0x61 0x62'
             );
@@ -22,34 +22,34 @@ class Swift_StreamFilters_ByteArrayReplacementFilterTest extends \PHPUnit\Framew
 
     public function testFilterCanMakeMultipleReplacements()
     {
-        $filter = $this->createFilter(array(array(0x61), array(0x62)), array(0x63));
+        $filter = $this->createFilter([[0x61], [0x62]], [0x63]);
         $this->assertEquals(
-            array(0x60, 0x63, 0x60, 0x63, 0x60),
-            $filter->filter(array(0x60, 0x61, 0x60, 0x62, 0x60))
+            [0x60, 0x63, 0x60, 0x63, 0x60],
+            $filter->filter([0x60, 0x61, 0x60, 0x62, 0x60])
             );
     }
 
     public function testMultipleReplacementsCanBeDifferent()
     {
-        $filter = $this->createFilter(array(array(0x61), array(0x62)), array(array(0x63), array(0x64)));
+        $filter = $this->createFilter([[0x61], [0x62]], [[0x63], [0x64]]);
         $this->assertEquals(
-            array(0x60, 0x63, 0x60, 0x64, 0x60),
-            $filter->filter(array(0x60, 0x61, 0x60, 0x62, 0x60))
+            [0x60, 0x63, 0x60, 0x64, 0x60],
+            $filter->filter([0x60, 0x61, 0x60, 0x62, 0x60])
             );
     }
 
     public function testShouldBufferReturnsFalseIfPartialMatchNotAtEndOfString()
     {
-        $filter = $this->createFilter(array(0x0D, 0x0A), array(0x0A));
-        $this->assertFalse($filter->shouldBuffer(array(0x61, 0x62, 0x0D, 0x0A, 0x63)),
+        $filter = $this->createFilter([0x0D, 0x0A], [0x0A]);
+        $this->assertFalse($filter->shouldBuffer([0x61, 0x62, 0x0D, 0x0A, 0x63]),
             '%s: Filter should not buffer since x0Dx0A is the needle and is not at EOF'
             );
     }
 
     public function testShouldBufferReturnsTrueIfAnyOfMultipleMatchesAtEndOfString()
     {
-        $filter = $this->createFilter(array(array(0x61, 0x62), array(0x63)), array(0x64));
-        $this->assertTrue($filter->shouldBuffer(array(0x59, 0x60, 0x61)),
+        $filter = $this->createFilter([[0x61, 0x62], [0x63]], [0x64]);
+        $this->assertTrue($filter->shouldBuffer([0x59, 0x60, 0x61]),
             '%s: Filter should buffer since 0x61 0x62 is a needle and the ending '.
             '0x61 could be from 0x61 0x62'
             );
@@ -58,52 +58,52 @@ class Swift_StreamFilters_ByteArrayReplacementFilterTest extends \PHPUnit\Framew
     public function testConvertingAllLineEndingsToCRLFWhenInputIsLF()
     {
         $filter = $this->createFilter(
-            array(array(0x0D, 0x0A), array(0x0D), array(0x0A)),
-            array(array(0x0A), array(0x0A), array(0x0D, 0x0A))
+            [[0x0D, 0x0A], [0x0D], [0x0A]],
+            [[0x0A], [0x0A], [0x0D, 0x0A]]
             );
 
         $this->assertEquals(
-            array(0x60, 0x0D, 0x0A, 0x61, 0x0D, 0x0A, 0x62, 0x0D, 0x0A, 0x63),
-            $filter->filter(array(0x60, 0x0A, 0x61, 0x0A, 0x62, 0x0A, 0x63))
+            [0x60, 0x0D, 0x0A, 0x61, 0x0D, 0x0A, 0x62, 0x0D, 0x0A, 0x63],
+            $filter->filter([0x60, 0x0A, 0x61, 0x0A, 0x62, 0x0A, 0x63])
             );
     }
 
     public function testConvertingAllLineEndingsToCRLFWhenInputIsCR()
     {
         $filter = $this->createFilter(
-            array(array(0x0D, 0x0A), array(0x0D), array(0x0A)),
-            array(array(0x0A), array(0x0A), array(0x0D, 0x0A))
+            [[0x0D, 0x0A], [0x0D], [0x0A]],
+            [[0x0A], [0x0A], [0x0D, 0x0A]]
             );
 
         $this->assertEquals(
-            array(0x60, 0x0D, 0x0A, 0x61, 0x0D, 0x0A, 0x62, 0x0D, 0x0A, 0x63),
-            $filter->filter(array(0x60, 0x0D, 0x61, 0x0D, 0x62, 0x0D, 0x63))
+            [0x60, 0x0D, 0x0A, 0x61, 0x0D, 0x0A, 0x62, 0x0D, 0x0A, 0x63],
+            $filter->filter([0x60, 0x0D, 0x61, 0x0D, 0x62, 0x0D, 0x63])
             );
     }
 
     public function testConvertingAllLineEndingsToCRLFWhenInputIsCRLF()
     {
         $filter = $this->createFilter(
-            array(array(0x0D, 0x0A), array(0x0D), array(0x0A)),
-            array(array(0x0A), array(0x0A), array(0x0D, 0x0A))
+            [[0x0D, 0x0A], [0x0D], [0x0A]],
+            [[0x0A], [0x0A], [0x0D, 0x0A]]
             );
 
         $this->assertEquals(
-            array(0x60, 0x0D, 0x0A, 0x61, 0x0D, 0x0A, 0x62, 0x0D, 0x0A, 0x63),
-            $filter->filter(array(0x60, 0x0D, 0x0A, 0x61, 0x0D, 0x0A, 0x62, 0x0D, 0x0A, 0x63))
+            [0x60, 0x0D, 0x0A, 0x61, 0x0D, 0x0A, 0x62, 0x0D, 0x0A, 0x63],
+            $filter->filter([0x60, 0x0D, 0x0A, 0x61, 0x0D, 0x0A, 0x62, 0x0D, 0x0A, 0x63])
             );
     }
 
     public function testConvertingAllLineEndingsToCRLFWhenInputIsLFCR()
     {
         $filter = $this->createFilter(
-            array(array(0x0D, 0x0A), array(0x0D), array(0x0A)),
-            array(array(0x0A), array(0x0A), array(0x0D, 0x0A))
+            [[0x0D, 0x0A], [0x0D], [0x0A]],
+            [[0x0A], [0x0A], [0x0D, 0x0A]]
             );
 
         $this->assertEquals(
-            array(0x60, 0x0D, 0x0A, 0x0D, 0x0A, 0x61, 0x0D, 0x0A, 0x0D, 0x0A, 0x62, 0x0D, 0x0A, 0x0D, 0x0A, 0x63),
-            $filter->filter(array(0x60, 0x0A, 0x0D, 0x61, 0x0A, 0x0D, 0x62, 0x0A, 0x0D, 0x63))
+            [0x60, 0x0D, 0x0A, 0x0D, 0x0A, 0x61, 0x0D, 0x0A, 0x0D, 0x0A, 0x62, 0x0D, 0x0A, 0x0D, 0x0A, 0x63],
+            $filter->filter([0x60, 0x0A, 0x0D, 0x61, 0x0A, 0x0D, 0x62, 0x0A, 0x0D, 0x63])
             );
     }
 
@@ -112,13 +112,13 @@ class Swift_StreamFilters_ByteArrayReplacementFilterTest extends \PHPUnit\Framew
         //Lighthouse Bug #23
 
         $filter = $this->createFilter(
-            array(array(0x0D, 0x0A), array(0x0D), array(0x0A)),
-            array(array(0x0A), array(0x0A), array(0x0D, 0x0A))
+            [[0x0D, 0x0A], [0x0D], [0x0A]],
+            [[0x0A], [0x0A], [0x0D, 0x0A]]
             );
 
         $this->assertEquals(
-            array(0x60, 0x0D, 0x0A, 0x0D, 0x0A, 0x61, 0x0D, 0x0A, 0x0D, 0x0A, 0x62, 0x0D, 0x0A, 0x0D, 0x0A, 0x63),
-            $filter->filter(array(0x60, 0x0A, 0x0A, 0x61, 0x0A, 0x0A, 0x62, 0x0A, 0x0A, 0x63))
+            [0x60, 0x0D, 0x0A, 0x0D, 0x0A, 0x61, 0x0D, 0x0A, 0x0D, 0x0A, 0x62, 0x0D, 0x0A, 0x0D, 0x0A, 0x63],
+            $filter->filter([0x60, 0x0A, 0x0A, 0x61, 0x0A, 0x0A, 0x62, 0x0A, 0x0A, 0x63])
             );
     }
 
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterTest.php
index 14b57eff..1a5f4dca 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterTest.php
@@ -19,13 +19,13 @@ class Swift_StreamFilters_StringReplacementFilterTest extends \PHPUnit\Framework
 
     public function testFilterCanMakeMultipleReplacements()
     {
-        $filter = $this->createFilter(array('a', 'b'), 'foo');
+        $filter = $this->createFilter(['a', 'b'], 'foo');
         $this->assertEquals('XfooYfooZ', $filter->filter('XaYbZ'));
     }
 
     public function testMultipleReplacementsCanBeDifferent()
     {
-        $filter = $this->createFilter(array('a', 'b'), array('foo', 'zip'));
+        $filter = $this->createFilter(['a', 'b'], ['foo', 'zip']);
         $this->assertEquals('XfooYzipZ', $filter->filter('XaYbZ'));
     }
 
@@ -39,7 +39,7 @@ class Swift_StreamFilters_StringReplacementFilterTest extends \PHPUnit\Framework
 
     public function testShouldBufferReturnsTrueIfAnyOfMultipleMatchesAtEndOfString()
     {
-        $filter = $this->createFilter(array('foo', 'zip'), 'bar');
+        $filter = $this->createFilter(['foo', 'zip'], 'bar');
         $this->assertTrue($filter->shouldBuffer('XfooYzi'),
             '%s: Filter should buffer since "zip" is a needle and the ending '.
             '"zi" could be from "zip"'
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpEventSupportTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpEventSupportTest.php
index 88141c5a..896171dc 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpEventSupportTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpEventSupportTest.php
@@ -27,10 +27,10 @@ abstract class Swift_Transport_AbstractSmtpEventSupportTest extends Swift_Transp
 
         $message->shouldReceive('getFrom')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('chris@swiftmailer.org' => null));
+                ->andReturn(['chris@swiftmailer.org' => null]);
         $message->shouldReceive('getTo')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('mark@swiftmailer.org' => 'Mark'));
+                ->andReturn(['mark@swiftmailer.org' => 'Mark']);
         $dispatcher->shouldReceive('createSendEvent')
                    ->once()
                    ->andReturn($evt);
@@ -58,10 +58,10 @@ abstract class Swift_Transport_AbstractSmtpEventSupportTest extends Swift_Transp
 
         $message->shouldReceive('getFrom')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('chris@swiftmailer.org' => null));
+                ->andReturn(['chris@swiftmailer.org' => null]);
         $message->shouldReceive('getTo')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('mark@swiftmailer.org' => 'Mark'));
+                ->andReturn(['mark@swiftmailer.org' => 'Mark']);
         $dispatcher->shouldReceive('createSendEvent')
                    ->once()
                    ->andReturn($evt);
@@ -89,10 +89,10 @@ abstract class Swift_Transport_AbstractSmtpEventSupportTest extends Swift_Transp
 
         $message->shouldReceive('getFrom')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('chris@swiftmailer.org' => null));
+                ->andReturn(['chris@swiftmailer.org' => null]);
         $message->shouldReceive('getTo')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('mark@swiftmailer.org' => 'Mark'));
+                ->andReturn(['mark@swiftmailer.org' => 'Mark']);
         $buf->shouldReceive('write')
             ->once()
             ->with("MAIL FROM:<chris@swiftmailer.org>\r\n")
@@ -123,7 +123,7 @@ abstract class Swift_Transport_AbstractSmtpEventSupportTest extends Swift_Transp
             ->andReturn(false);
         $evt->shouldReceive('setFailedRecipients')
             ->once()
-            ->with(array('mark@swiftmailer.org'));
+            ->with(['mark@swiftmailer.org']);
 
         $this->finishBuffer($buf);
         $smtp->start();
@@ -140,10 +140,10 @@ abstract class Swift_Transport_AbstractSmtpEventSupportTest extends Swift_Transp
 
         $message->shouldReceive('getFrom')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('chris@swiftmailer.org' => null));
+                ->andReturn(['chris@swiftmailer.org' => null]);
         $message->shouldReceive('getTo')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('mark@swiftmailer.org' => 'Mark'));
+                ->andReturn(['mark@swiftmailer.org' => 'Mark']);
         $buf->shouldReceive('write')
             ->once()
             ->with("MAIL FROM:<chris@swiftmailer.org>\r\n")
@@ -191,13 +191,13 @@ abstract class Swift_Transport_AbstractSmtpEventSupportTest extends Swift_Transp
 
         $message->shouldReceive('getFrom')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('chris@swiftmailer.org' => null));
+                ->andReturn(['chris@swiftmailer.org' => null]);
         $message->shouldReceive('getTo')
                 ->zeroOrMoreTimes()
-                ->andReturn(array(
+                ->andReturn([
                     'mark@swiftmailer.org' => 'Mark',
                     'chris@site.tld' => 'Chris',
-                ));
+                ]);
         $buf->shouldReceive('write')
             ->once()
             ->with("MAIL FROM:<chris@swiftmailer.org>\r\n")
@@ -245,13 +245,13 @@ abstract class Swift_Transport_AbstractSmtpEventSupportTest extends Swift_Transp
 
         $message->shouldReceive('getFrom')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('chris@swiftmailer.org' => null));
+                ->andReturn(['chris@swiftmailer.org' => null]);
         $message->shouldReceive('getTo')
                 ->zeroOrMoreTimes()
-                ->andReturn(array(
+                ->andReturn([
                     'mark@swiftmailer.org' => 'Mark',
                     'chris@site.tld' => 'Chris',
-                ));
+                ]);
         $dispatcher->shouldReceive('createSendEvent')
                    ->zeroOrMoreTimes()
                    ->with($smtp, \Mockery::any())
@@ -283,10 +283,10 @@ abstract class Swift_Transport_AbstractSmtpEventSupportTest extends Swift_Transp
 
         $message->shouldReceive('getFrom')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('chris@swiftmailer.org' => null));
+                ->andReturn(['chris@swiftmailer.org' => null]);
         $message->shouldReceive('getTo')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('mark@swiftmailer.org' => 'Mark'));
+                ->andReturn(['mark@swiftmailer.org' => 'Mark']);
         $dispatcher->shouldReceive('createSendEvent')
                    ->zeroOrMoreTimes()
                    ->with($smtp, \Mockery::any())
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpTest.php
index 58b58ed4..4c837fad 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpTest.php
@@ -51,7 +51,7 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
             $this->assertFalse($smtp->isStarted(), '%s: SMTP should begin non-started');
             $smtp->start();
             $this->fail('554 greeting indicates an error and should cause an exception');
-        } catch (Exception $e) {
+        } catch (Swift_TransportException $e) {
             $this->assertFalse($smtp->isStarted(), '%s: start() should have failed');
         }
     }
@@ -143,7 +143,7 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
             $this->assertFalse($smtp->isStarted(), '%s: SMTP should begin non-started');
             $smtp->start();
             $this->fail('Non 250 HELO response should raise Exception');
-        } catch (Exception $e) {
+        } catch (Swift_TransportException $e) {
             $this->assertFalse($smtp->isStarted(), '%s: SMTP start() should have failed');
         }
     }
@@ -226,10 +226,10 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
         $message = $this->createMessage();
         $message->shouldReceive('getFrom')
                 ->once()
-                ->andReturn(array('me@domain.com' => 'Me'));
+                ->andReturn(['me@domain.com' => 'Me']);
         $message->shouldReceive('getTo')
                 ->once()
-                ->andReturn(array('foo@bar' => null));
+                ->andReturn(['foo@bar' => null]);
         $buf->shouldReceive('initialize')
             ->once();
         $buf->shouldReceive('write')
@@ -258,10 +258,10 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
 
         $message->shouldReceive('getFrom')
                 ->once()
-                ->andReturn(array('me@domain.com' => 'Me'));
+                ->andReturn(['me@domain.com' => 'Me']);
         $message->shouldReceive('getTo')
                 ->once()
-                ->andReturn(array('foo@bar' => null));
+                ->andReturn(['foo@bar' => null]);
         $buf->shouldReceive('write')
             ->once()
             ->with("MAIL FROM:<me@domain.com>\r\n")
@@ -276,7 +276,7 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
             $smtp->start();
             $smtp->send($message);
             $this->fail('MAIL FROM should accept a 250 response');
-        } catch (Exception $e) {
+        } catch (Swift_TransportException $e) {
         }
     }
 
@@ -288,13 +288,13 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
 
         $message->shouldReceive('getFrom')
                 ->once()
-                ->andReturn(array('me@domain.com' => 'Me'));
+                ->andReturn(['me@domain.com' => 'Me']);
         $message->shouldReceive('getSender')
                 ->once()
-                ->andReturn(array('another@domain.com' => 'Someone'));
+                ->andReturn(['another@domain.com' => 'Someone']);
         $message->shouldReceive('getTo')
                 ->once()
-                ->andReturn(array('foo@bar' => null));
+                ->andReturn(['foo@bar' => null]);
         $buf->shouldReceive('write')
             ->once()
             ->with("MAIL FROM:<another@domain.com>\r\n")
@@ -317,16 +317,16 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
 
         $message->shouldReceive('getFrom')
                 ->once()
-                ->andReturn(array('me@domain.com' => 'Me'));
+                ->andReturn(['me@domain.com' => 'Me']);
         $message->shouldReceive('getSender')
                 ->once()
-                ->andReturn(array('another@domain.com' => 'Someone'));
+                ->andReturn(['another@domain.com' => 'Someone']);
         $message->shouldReceive('getReturnPath')
                 ->once()
                 ->andReturn('more@domain.com');
         $message->shouldReceive('getTo')
                 ->once()
-                ->andReturn(array('foo@bar' => null));
+                ->andReturn(['foo@bar' => null]);
         $buf->shouldReceive('write')
             ->once()
             ->with("MAIL FROM:<more@domain.com>\r\n")
@@ -397,10 +397,10 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
 
         $message->shouldReceive('getFrom')
                 ->once()
-                ->andReturn(array('me@domain.com' => 'Me'));
+                ->andReturn(['me@domain.com' => 'Me']);
         $message->shouldReceive('getTo')
                 ->once()
-                ->andReturn(array('foo@bar' => null));
+                ->andReturn(['foo@bar' => null]);
         $buf->shouldReceive('write')
             ->once()
             ->with("MAIL FROM:<me@domain.com>\r\n")
@@ -427,6 +427,89 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
         }
     }
 
+    public function testUtf8AddressWithIdnEncoder()
+    {
+        $buf = $this->getBuffer();
+        $smtp = $this->getTransport($buf);
+        $message = $this->createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->once()
+                ->andReturn(['me@dömain.com' => 'Me']);
+        $message->shouldReceive('getTo')
+                ->once()
+                ->andReturn(['foo@bär' => null]);
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("MAIL FROM:<me@xn--dmain-jua.com>\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("RCPT TO:<foo@xn--br-via>\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('250 OK'."\r\n");
+
+        $this->finishBuffer($buf);
+        $smtp->start();
+        $smtp->send($message);
+    }
+
+    public function testUtf8AddressWithUtf8Encoder()
+    {
+        $buf = $this->getBuffer();
+        $smtp = $this->getTransport($buf, null, new Swift_AddressEncoder_Utf8AddressEncoder());
+        $message = $this->createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->once()
+                ->andReturn(['më@dömain.com' => 'Me']);
+        $message->shouldReceive('getTo')
+                ->once()
+                ->andReturn(['föö@bär' => null]);
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("MAIL FROM:<më@dömain.com>\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("RCPT TO:<föö@bär>\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('250 OK'."\r\n");
+
+        $this->finishBuffer($buf);
+        $smtp->start();
+        $smtp->send($message);
+    }
+
+    public function testNonEncodableSenderCausesException()
+    {
+        $buf = $this->getBuffer();
+        $smtp = $this->getTransport($buf);
+        $message = $this->createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->once()
+                ->andReturn(['më@domain.com' => 'Me']);
+        $message->shouldReceive('getTo')
+                ->once()
+                ->andReturn(['foo@bar' => null]);
+
+        $this->finishBuffer($buf);
+        try {
+            $smtp->start();
+            $smtp->send($message);
+            $this->fail('më@domain.com cannot be encoded (not observed)');
+        } catch (Swift_AddressEncoderException $e) {
+            $this->assertEquals('më@domain.com', $e->getAddress());
+        }
+    }
+
     public function testMailFromCommandIsOnlySentOncePerMessage()
     {
         $buf = $this->getBuffer();
@@ -435,10 +518,10 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
 
         $message->shouldReceive('getFrom')
                 ->once()
-                ->andReturn(array('me@domain.com' => 'Me'));
+                ->andReturn(['me@domain.com' => 'Me']);
         $message->shouldReceive('getTo')
                 ->once()
-                ->andReturn(array('foo@bar' => null));
+                ->andReturn(['foo@bar' => null]);
         $buf->shouldReceive('write')
             ->once()
             ->with("MAIL FROM:<me@domain.com>\r\n")
@@ -472,14 +555,15 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
 
         $message->shouldReceive('getFrom')
                 ->once()
-                ->andReturn(array('me@domain.com' => 'Me'));
+                ->andReturn(['me@domain.com' => 'Me']);
         $message->shouldReceive('getTo')
                 ->once()
-                ->andReturn(array(
+                ->andReturn([
                     'foo@bar' => null,
                     'zip@button' => 'Zip Button',
                     'test@domain' => 'Test user',
-                ));
+                    'tëst@domain' => 'Test user',
+                ]);
         $buf->shouldReceive('write')
             ->once()
             ->with("RCPT TO:<foo@bar>\r\n")
@@ -518,16 +602,16 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
 
         $message->shouldReceive('getFrom')
                 ->once()
-                ->andReturn(array('me@domain.com' => 'Me'));
+                ->andReturn(['me@domain.com' => 'Me']);
         $message->shouldReceive('getTo')
                 ->once()
-                ->andReturn(array('foo@bar' => null));
+                ->andReturn(['foo@bar' => null]);
         $message->shouldReceive('getCc')
                 ->once()
-                ->andReturn(array(
+                ->andReturn([
                     'zip@button' => 'Zip Button',
                     'test@domain' => 'Test user',
-                ));
+                ]);
         $buf->shouldReceive('write')
             ->once()
             ->with("RCPT TO:<foo@bar>\r\n")
@@ -566,16 +650,16 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
 
         $message->shouldReceive('getFrom')
                 ->once()
-                ->andReturn(array('me@domain.com' => 'Me'));
+                ->andReturn(['me@domain.com' => 'Me']);
         $message->shouldReceive('getTo')
                 ->once()
-                ->andReturn(array('foo@bar' => null));
+                ->andReturn(['foo@bar' => null]);
         $message->shouldReceive('getCc')
                 ->once()
-                ->andReturn(array(
+                ->andReturn([
                     'zip@button' => 'Zip Button',
                     'test@domain' => 'Test user',
-                ));
+                ]);
         $buf->shouldReceive('write')
             ->once()
             ->with("RCPT TO:<foo@bar>\r\n")
@@ -630,10 +714,10 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
 
         $message->shouldReceive('getFrom')
                 ->once()
-                ->andReturn(array('me@domain.com' => 'Me'));
+                ->andReturn(['me@domain.com' => 'Me']);
         $message->shouldReceive('getTo')
                 ->once()
-                ->andReturn(array('foo@bar' => null));
+                ->andReturn(['foo@bar' => null]);
         $buf->shouldReceive('write')
             ->once()
             ->with("RCPT TO:<foo@bar>\r\n")
@@ -696,10 +780,10 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
 
         $message->shouldReceive('getFrom')
                 ->once()
-                ->andReturn(array('me@domain.com' => 'Me'));
+                ->andReturn(['me@domain.com' => 'Me']);
         $message->shouldReceive('getTo')
                 ->once()
-                ->andReturn(array('foo@bar' => null));
+                ->andReturn(['foo@bar' => null]);
         $buf->shouldReceive('write')
             ->once()
             ->with("DATA\r\n")
@@ -726,10 +810,10 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
 
         $message->shouldReceive('getFrom')
                 ->once()
-                ->andReturn(array('me@domain.com' => 'Me'));
+                ->andReturn(['me@domain.com' => 'Me']);
         $message->shouldReceive('getTo')
                 ->once()
-                ->andReturn(array('foo@bar' => null));
+                ->andReturn(['foo@bar' => null]);
         $buf->shouldReceive('write')
             ->once()
             ->with("DATA\r\n")
@@ -744,7 +828,7 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
             $smtp->start();
             $smtp->send($message);
             $this->fail('354 is the expected response to DATA (not observed)');
-        } catch (Exception $e) {
+        } catch (Swift_TransportException $e) {
         }
     }
 
@@ -756,10 +840,10 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
 
         $message->shouldReceive('getFrom')
                 ->once()
-                ->andReturn(array('me@domain.com' => 'Me'));
+                ->andReturn(['me@domain.com' => 'Me']);
         $message->shouldReceive('getTo')
                 ->once()
-                ->andReturn(array('foo@bar' => null));
+                ->andReturn(['foo@bar' => null]);
         $buf->shouldReceive('write')
             ->once()
             ->with("DATA\r\n")
@@ -790,10 +874,10 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
 
         $message->shouldReceive('getFrom')
                 ->once()
-                ->andReturn(array('me@domain.com' => 'Me'));
+                ->andReturn(['me@domain.com' => 'Me']);
         $message->shouldReceive('getTo')
                 ->once()
-                ->andReturn(array('foo@bar' => null));
+                ->andReturn(['foo@bar' => null]);
         $buf->shouldReceive('write')
             ->once()
             ->with("DATA\r\n")
@@ -816,7 +900,7 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
             $smtp->start();
             $smtp->send($message);
             $this->fail('250 is the expected response after a DATA transmission (not observed)');
-        } catch (Exception $e) {
+        } catch (Swift_TransportException $e) {
         }
     }
 
@@ -844,19 +928,19 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
         $message = $this->createMessage();
         $message->shouldReceive('getFrom')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('me@domain.com' => 'Me'));
+                ->andReturn(['me@domain.com' => 'Me']);
         $message->shouldReceive('getTo')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('foo@bar' => null));
+                ->andReturn(['foo@bar' => null]);
         $message->shouldReceive('getBcc')
                 ->zeroOrMoreTimes()
-                ->andReturn(array(
+                ->andReturn([
                     'zip@button' => 'Zip Button',
                     'test@domain' => 'Test user',
-                ));
+                ]);
         $message->shouldReceive('setBcc')
                 ->once()
-                ->with(array());
+                ->with([]);
         $message->shouldReceive('setBcc')
                 ->zeroOrMoreTimes();
 
@@ -873,31 +957,31 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
 
         $message->shouldReceive('getFrom')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('me@domain.com' => 'Me'));
+                ->andReturn(['me@domain.com' => 'Me']);
         $message->shouldReceive('getTo')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('foo@bar' => null));
+                ->andReturn(['foo@bar' => null]);
         $message->shouldReceive('getBcc')
                 ->zeroOrMoreTimes()
-                ->andReturn(array(
+                ->andReturn([
                     'zip@button' => 'Zip Button',
                     'test@domain' => 'Test user',
-                ));
+                ]);
         $message->shouldReceive('setBcc')
                 ->atLeast()->once()
-                ->with(array());
+                ->with([]);
         $message->shouldReceive('setBcc')
                 ->once()
-                ->with(array('zip@button' => 'Zip Button'));
+                ->with(['zip@button' => 'Zip Button']);
         $message->shouldReceive('setBcc')
                 ->once()
-                ->with(array('test@domain' => 'Test user'));
+                ->with(['test@domain' => 'Test user']);
         $message->shouldReceive('setBcc')
                 ->atLeast()->once()
-                ->with(array(
+                ->with([
                     'zip@button' => 'Zip Button',
                     'test@domain' => 'Test user',
-                ));
+                ]);
 
         $buf->shouldReceive('write')->once()->with("MAIL FROM:<me@domain.com>\r\n")->andReturn(1);
         $buf->shouldReceive('readLine')->once()->with(1)->andReturn("250 OK\r\n");
@@ -939,25 +1023,25 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
 
         $message->shouldReceive('getFrom')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('me@domain.com' => 'Me'));
+                ->andReturn(['me@domain.com' => 'Me']);
         $message->shouldReceive('getTo')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('foo@bar' => null));
+                ->andReturn(['foo@bar' => null]);
         $message->shouldReceive('getBcc')
                 ->zeroOrMoreTimes()
-                ->andReturn(array(
+                ->andReturn([
                     'zip@button' => 'Zip Button',
                     'test@domain' => 'Test user',
-                ));
+                ]);
         $message->shouldReceive('setBcc')
                 ->once()
-                ->with(array());
+                ->with([]);
         $message->shouldReceive('setBcc')
                 ->once()
-                ->with(array(
+                ->with([
                     'zip@button' => 'Zip Button',
                     'test@domain' => 'Test user',
-                ));
+                ]);
         $buf->shouldReceive('write')
             ->once()
             ->with("MAIL FROM:<me@domain.com>\r\n")
@@ -989,7 +1073,7 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
         try {
             $smtp->send($message);
             $this->fail('A bad response was given so exception is expected');
-        } catch (Exception $e) {
+        } catch (Swift_TransportException $e) {
         }
     }
 
@@ -1083,9 +1167,9 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
             ->andReturn("551 Not ok\r\n");
 
         try {
-            $smtp->executeCommand("FOO\r\n", array(250, 251));
+            $smtp->executeCommand("FOO\r\n", [250, 251]);
             $this->fail('A 250 or 251 response was needed but 551 was returned.');
-        } catch (Exception $e) {
+        } catch (Swift_TransportException $e) {
         }
     }
 
@@ -1097,31 +1181,31 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
 
         $message->shouldReceive('getFrom')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('me@domain.com' => 'Me'));
+                ->andReturn(['me@domain.com' => 'Me']);
         $message->shouldReceive('getTo')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('foo@bar' => null));
+                ->andReturn(['foo@bar' => null]);
         $message->shouldReceive('getBcc')
                 ->zeroOrMoreTimes()
-                ->andReturn(array(
+                ->andReturn([
                     'zip@button' => 'Zip Button',
                     'test@domain' => 'Test user',
-                ));
+                ]);
         $message->shouldReceive('setBcc')
                 ->atLeast()->once()
-                ->with(array());
+                ->with([]);
         $message->shouldReceive('setBcc')
                 ->once()
-                ->with(array('zip@button' => 'Zip Button'));
+                ->with(['zip@button' => 'Zip Button']);
         $message->shouldReceive('setBcc')
                 ->once()
-                ->with(array('test@domain' => 'Test user'));
+                ->with(['test@domain' => 'Test user']);
         $message->shouldReceive('setBcc')
                 ->atLeast()->once()
-                ->with(array(
+                ->with([
                     'zip@button' => 'Zip Button',
                     'test@domain' => 'Test user',
-                ));
+                ]);
 
         $buf->shouldReceive('write')->once()->with("MAIL FROM:<me@domain.com>\r\n")->andReturn(1);
         $buf->shouldReceive('readLine')->once()->with(1)->andReturn("250 OK\r\n");
@@ -1149,7 +1233,7 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
         $this->finishBuffer($buf);
         $smtp->start();
         $this->assertEquals(1, $smtp->send($message, $failures));
-        $this->assertEquals(array('zip@button', 'test@domain'), $failures,
+        $this->assertEquals(['zip@button', 'test@domain'], $failures,
             '%s: Failures should be caught in an array'
             );
     }
@@ -1161,10 +1245,10 @@ abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
         $message = $this->createMessage();
         $message->shouldReceive('getFrom')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('me@domain.com' => 'Me'));
+                ->andReturn(['me@domain.com' => 'Me']);
         $message->shouldReceive('getTo')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('foo@bar' => null));
+                ->andReturn(['foo@bar' => null]);
         $message->shouldReceive('generateId')
                 ->once();
 
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/CramMd5AuthenticatorTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/CramMd5AuthenticatorTest.php
index 01a9c10d..ba131e8e 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/CramMd5AuthenticatorTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/CramMd5AuthenticatorTest.php
@@ -25,36 +25,37 @@ class Swift_Transport_Esmtp_Auth_CramMd5AuthenticatorTest extends \SwiftMailerTe
 
         $this->agent->shouldReceive('executeCommand')
              ->once()
-             ->with("AUTH CRAM-MD5\r\n", array(334))
+             ->with("AUTH CRAM-MD5\r\n", [334])
              ->andReturn('334 '.base64_encode('<foo@bar>')."\r\n");
         $this->agent->shouldReceive('executeCommand')
              ->once()
-             ->with(\Mockery::any(), array(235));
+             ->with(\Mockery::any(), [235]);
 
         $this->assertTrue($cram->authenticate($this->agent, 'jack', 'pass'),
             '%s: The buffer accepted all commands authentication should succeed'
             );
     }
 
-    public function testAuthenticationFailureSendRsetAndReturnFalse()
+    /**
+     * @expectedException \Swift_TransportException
+     */
+    public function testAuthenticationFailureSendRset()
     {
         $cram = $this->getAuthenticator();
 
         $this->agent->shouldReceive('executeCommand')
              ->once()
-             ->with("AUTH CRAM-MD5\r\n", array(334))
+             ->with("AUTH CRAM-MD5\r\n", [334])
              ->andReturn('334 '.base64_encode('<foo@bar>')."\r\n");
         $this->agent->shouldReceive('executeCommand')
              ->once()
-             ->with(\Mockery::any(), array(235))
+             ->with(\Mockery::any(), [235])
              ->andThrow(new Swift_TransportException(''));
         $this->agent->shouldReceive('executeCommand')
              ->once()
-             ->with("RSET\r\n", array(250));
+             ->with("RSET\r\n", [250]);
 
-        $this->assertFalse($cram->authenticate($this->agent, 'jack', 'pass'),
-            '%s: Authentication fails, so RSET should be sent'
-            );
+        $cram->authenticate($this->agent, 'jack', 'pass');
     }
 
     private function getAuthenticator()
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/LoginAuthenticatorTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/LoginAuthenticatorTest.php
index 4ca83410..499ceb77 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/LoginAuthenticatorTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/LoginAuthenticatorTest.php
@@ -21,40 +21,41 @@ class Swift_Transport_Esmtp_Auth_LoginAuthenticatorTest extends \SwiftMailerTest
 
         $this->agent->shouldReceive('executeCommand')
              ->once()
-             ->with("AUTH LOGIN\r\n", array(334));
+             ->with("AUTH LOGIN\r\n", [334]);
         $this->agent->shouldReceive('executeCommand')
              ->once()
-             ->with(base64_encode('jack')."\r\n", array(334));
+             ->with(base64_encode('jack')."\r\n", [334]);
         $this->agent->shouldReceive('executeCommand')
              ->once()
-             ->with(base64_encode('pass')."\r\n", array(235));
+             ->with(base64_encode('pass')."\r\n", [235]);
 
         $this->assertTrue($login->authenticate($this->agent, 'jack', 'pass'),
             '%s: The buffer accepted all commands authentication should succeed'
             );
     }
 
-    public function testAuthenticationFailureSendRsetAndReturnFalse()
+    /**
+     * @expectedException \Swift_TransportException
+     */
+    public function testAuthenticationFailureSendRset()
     {
         $login = $this->getAuthenticator();
 
         $this->agent->shouldReceive('executeCommand')
              ->once()
-             ->with("AUTH LOGIN\r\n", array(334));
+             ->with("AUTH LOGIN\r\n", [334]);
         $this->agent->shouldReceive('executeCommand')
              ->once()
-             ->with(base64_encode('jack')."\r\n", array(334));
+             ->with(base64_encode('jack')."\r\n", [334]);
         $this->agent->shouldReceive('executeCommand')
              ->once()
-             ->with(base64_encode('pass')."\r\n", array(235))
+             ->with(base64_encode('pass')."\r\n", [235])
              ->andThrow(new Swift_TransportException(''));
         $this->agent->shouldReceive('executeCommand')
              ->once()
-             ->with("RSET\r\n", array(250));
+             ->with("RSET\r\n", [250]);
 
-        $this->assertFalse($login->authenticate($this->agent, 'jack', 'pass'),
-            '%s: Authentication fails, so RSET should be sent'
-            );
+        $login->authenticate($this->agent, 'jack', 'pass');
     }
 
     private function getAuthenticator()
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/NTLMAuthenticatorTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/NTLMAuthenticatorTest.php
index d781c2d8..df306eb4 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/NTLMAuthenticatorTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/NTLMAuthenticatorTest.php
@@ -34,7 +34,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
         $lmv1 = '1879f60127f8a877022132ec221bcbf3ca016a9f76095606';
 
         $login = $this->getAuthenticator();
-        $lmv1Result = $this->invokePrivateMethod('createLMPassword', $login, array($password, hex2bin($challenge)));
+        $lmv1Result = $this->invokePrivateMethod('createLMPassword', $login, [$password, hex2bin($challenge)]);
 
         $this->assertEquals($lmv1, bin2hex($lmv1Result), '%s: The keys should be the same cause we use the same values to generate them.');
     }
@@ -48,7 +48,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
         $lmv2 = 'd6e6152ea25d03b7c6ba6629c2d6aaf0ffffff0011223344';
 
         $login = $this->getAuthenticator();
-        $lmv2Result = $this->invokePrivateMethod('createLMv2Password', $login, array($password, $username, $domain, hex2bin($challenge), hex2bin('ffffff0011223344')));
+        $lmv2Result = $this->invokePrivateMethod('createLMv2Password', $login, [$password, $username, $domain, hex2bin($challenge), hex2bin('ffffff0011223344')]);
 
         $this->assertEquals($lmv2, bin2hex($lmv2Result), '%s: The keys should be the same cause we use the same values to generate them.');
     }
@@ -63,7 +63,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
         $message3T = '4e544c4d5353500003000000180018006000000018001800780000000c000c0040000000080008004c0000000c000c0054000000000000009a0000000102000054004500530054004e00540074006500730074004d0045004d004200450052001879f60127f8a877022132ec221bcbf3ca016a9f76095606e6285df3287c5d194f84df1a94817c7282d09754b6f9e02a';
 
         $login = $this->getAuthenticator();
-        $message3 = $this->invokePrivateMethod('createMessage3', $login, array($domain, $username, $workstation, hex2bin($lmResponse), hex2bin($ntlmResponse)));
+        $message3 = $this->invokePrivateMethod('createMessage3', $login, [$domain, $username, $workstation, hex2bin($lmResponse), hex2bin($ntlmResponse)]);
 
         $this->assertEquals($message3T, bin2hex($message3), '%s: We send the same information as the example is created with so this should be the same');
     }
@@ -77,7 +77,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
         $ntlmResponse = 'caa4da8f25d5e840974ed8976d3ada46010100000000000030fa7e3c677bc301f5ce3d2401c8f6e90000000002000c0054004500530054004e00540001000c004d0045004d0042004500520003001e006d0065006d006200650072002e0074006500730074002e0063006f006d000000000000000000';
 
         $login = $this->getAuthenticator();
-        $message3 = $this->invokePrivateMethod('createMessage3', $login, array($domain, $username, $workstation, hex2bin($lmResponse), hex2bin($ntlmResponse)));
+        $message3 = $this->invokePrivateMethod('createMessage3', $login, [$domain, $username, $workstation, hex2bin($lmResponse), hex2bin($ntlmResponse)]);
 
         $this->assertEquals($this->message3, bin2hex($message3), '%s: We send the same information as the example is created with so this should be the same');
     }
@@ -87,7 +87,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
         $username = "DOMAIN\user";
 
         $login = $this->getAuthenticator();
-        list($domain, $user) = $this->invokePrivateMethod('getDomainAndUsername', $login, array($username));
+        list($domain, $user) = $this->invokePrivateMethod('getDomainAndUsername', $login, [$username]);
 
         $this->assertEquals('DOMAIN', $domain, '%s: the fetched domain did not match');
         $this->assertEquals('user', $user, '%s: the fetched user did not match');
@@ -98,7 +98,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
         $username = "domain.com\user";
 
         $login = $this->getAuthenticator();
-        list($domain, $user) = $this->invokePrivateMethod('getDomainAndUsername', $login, array($username));
+        list($domain, $user) = $this->invokePrivateMethod('getDomainAndUsername', $login, [$username]);
 
         $this->assertEquals('domain.com', $domain, '%s: the fetched domain did not match');
         $this->assertEquals('user', $user, '%s: the fetched user did not match');
@@ -109,7 +109,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
         $username = 'user@DOMAIN';
 
         $login = $this->getAuthenticator();
-        list($domain, $user) = $this->invokePrivateMethod('getDomainAndUsername', $login, array($username));
+        list($domain, $user) = $this->invokePrivateMethod('getDomainAndUsername', $login, [$username]);
 
         $this->assertEquals('DOMAIN', $domain, '%s: the fetched domain did not match');
         $this->assertEquals('user', $user, '%s: the fetched user did not match');
@@ -120,7 +120,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
         $username = 'user@domain.com';
 
         $login = $this->getAuthenticator();
-        list($domain, $user) = $this->invokePrivateMethod('getDomainAndUsername', $login, array($username));
+        list($domain, $user) = $this->invokePrivateMethod('getDomainAndUsername', $login, [$username]);
 
         $this->assertEquals('domain.com', $domain, '%s: the fetched domain did not match');
         $this->assertEquals('user', $user, '%s: the fetched user did not match');
@@ -131,7 +131,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
         $username = 'user';
 
         $login = $this->getAuthenticator();
-        list($domain, $user) = $this->invokePrivateMethod('getDomainAndUsername', $login, array($username));
+        list($domain, $user) = $this->invokePrivateMethod('getDomainAndUsername', $login, [$username]);
 
         $this->assertEquals('', $domain, '%s: the fetched domain did not match');
         $this->assertEquals('user', $user, '%s: the fetched user did not match');
@@ -149,18 +149,21 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
               ->once()
               ->with('AUTH NTLM '.base64_encode(
                         $this->invokePrivateMethod('createMessage1', $ntlm)
-                    )."\r\n", array(334))
+                    )."\r\n", [334])
               ->andReturn('334 '.base64_encode(hex2bin('4e544c4d53535000020000000c000c003000000035828980514246973ea892c10000000000000000460046003c00000054004500530054004e00540002000c0054004500530054004e00540001000c004d0045004d0042004500520003001e006d0065006d006200650072002e0074006500730074002e0063006f006d0000000000')));
         $agent->shouldReceive('executeCommand')
               ->once()
               ->with(base64_encode(
-                        $this->invokePrivateMethod('createMessage3', $ntlm, array($domain, $username, hex2bin('4d0045004d00420045005200'), hex2bin('bf2e015119f6bdb3f6fdb768aa12d478f5ce3d2401c8f6e9'), hex2bin('caa4da8f25d5e840974ed8976d3ada46010100000000000030fa7e3c677bc301f5ce3d2401c8f6e90000000002000c0054004500530054004e00540001000c004d0045004d0042004500520003001e006d0065006d006200650072002e0074006500730074002e0063006f006d000000000000000000'))
-                    ))."\r\n", array(235));
+                        $this->invokePrivateMethod('createMessage3', $ntlm, [$domain, $username, hex2bin('4d0045004d00420045005200'), hex2bin('bf2e015119f6bdb3f6fdb768aa12d478f5ce3d2401c8f6e9'), hex2bin('caa4da8f25d5e840974ed8976d3ada46010100000000000030fa7e3c677bc301f5ce3d2401c8f6e90000000002000c0054004500530054004e00540001000c004d0045004d0042004500520003001e006d0065006d006200650072002e0074006500730074002e0063006f006d000000000000000000')]
+                    ))."\r\n", [235]);
 
         $this->assertTrue($ntlm->authenticate($agent, $username.'@'.$domain, $secret, hex2bin('30fa7e3c677bc301'), hex2bin('f5ce3d2401c8f6e9')), '%s: The buffer accepted all commands authentication should succeed');
     }
 
-    public function testAuthenticationFailureSendRsetAndReturnFalse()
+    /**
+     * @expectedException \Swift_TransportException
+     */
+    public function testAuthenticationFailureSendRset()
     {
         $domain = 'TESTNT';
         $username = 'test';
@@ -172,13 +175,13 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
               ->once()
               ->with('AUTH NTLM '.base64_encode(
                         $this->invokePrivateMethod('createMessage1', $ntlm)
-                    )."\r\n", array(334))
+                    )."\r\n", [334])
               ->andThrow(new Swift_TransportException(''));
         $agent->shouldReceive('executeCommand')
               ->once()
-              ->with("RSET\r\n", array(250));
+              ->with("RSET\r\n", [250]);
 
-        $this->assertFalse($ntlm->authenticate($agent, $username.'@'.$domain, $secret, hex2bin('30fa7e3c677bc301'), hex2bin('f5ce3d2401c8f6e9')), '%s: Authentication fails, so RSET should be sent');
+        $ntlm->authenticate($agent, $username.'@'.$domain, $secret, hex2bin('30fa7e3c677bc301'), hex2bin('f5ce3d2401c8f6e9'));
     }
 
     private function getAuthenticator()
@@ -191,7 +194,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestC
         return $this->getMockery('Swift_Transport_SmtpAgent')->shouldIgnoreMissing();
     }
 
-    private function invokePrivateMethod($method, $instance, array $args = array())
+    private function invokePrivateMethod($method, $instance, array $args = [])
     {
         $methodC = new ReflectionMethod($instance, trim($method));
         $methodC->setAccessible(true);
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/PlainAuthenticatorTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/PlainAuthenticatorTest.php
index c6c40420..1bb2c992 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/PlainAuthenticatorTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/PlainAuthenticatorTest.php
@@ -34,14 +34,17 @@ class Swift_Transport_Esmtp_Auth_PlainAuthenticatorTest extends \SwiftMailerTest
              ->once()
              ->with('AUTH PLAIN '.base64_encode(
                         'jack'.chr(0).'jack'.chr(0).'pass'
-                    )."\r\n", array(235));
+                    )."\r\n", [235]);
 
         $this->assertTrue($plain->authenticate($this->agent, 'jack', 'pass'),
             '%s: The buffer accepted all commands authentication should succeed'
             );
     }
 
-    public function testAuthenticationFailureSendRsetAndReturnFalse()
+    /**
+     * @expectedException \Swift_TransportException
+     */
+    public function testAuthenticationFailureSendRset()
     {
         $plain = $this->getAuthenticator();
 
@@ -49,15 +52,13 @@ class Swift_Transport_Esmtp_Auth_PlainAuthenticatorTest extends \SwiftMailerTest
              ->once()
              ->with('AUTH PLAIN '.base64_encode(
                         'jack'.chr(0).'jack'.chr(0).'pass'
-                    )."\r\n", array(235))
+                    )."\r\n", [235])
              ->andThrow(new Swift_TransportException(''));
         $this->agent->shouldReceive('executeCommand')
              ->once()
-             ->with("RSET\r\n", array(250));
+             ->with("RSET\r\n", [250]);
 
-        $this->assertFalse($plain->authenticate($this->agent, 'jack', 'pass'),
-            '%s: Authentication fails, so RSET should be sent'
-            );
+        $plain->authenticate($this->agent, 'jack', 'pass');
     }
 
     private function getAuthenticator()
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/AuthHandlerTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/AuthHandlerTest.php
index dadff3b0..36a4cf81 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/AuthHandlerTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/AuthHandlerTest.php
@@ -11,34 +11,34 @@ class Swift_Transport_Esmtp_AuthHandlerTest extends \SwiftMailerTestCase
 
     public function testKeywordIsAuth()
     {
-        $auth = $this->createHandler(array());
+        $auth = $this->createHandler([]);
         $this->assertEquals('AUTH', $auth->getHandledKeyword());
     }
 
     public function testUsernameCanBeSetAndFetched()
     {
-        $auth = $this->createHandler(array());
+        $auth = $this->createHandler([]);
         $auth->setUsername('jack');
         $this->assertEquals('jack', $auth->getUsername());
     }
 
     public function testPasswordCanBeSetAndFetched()
     {
-        $auth = $this->createHandler(array());
+        $auth = $this->createHandler([]);
         $auth->setPassword('pass');
         $this->assertEquals('pass', $auth->getPassword());
     }
 
     public function testAuthModeCanBeSetAndFetched()
     {
-        $auth = $this->createHandler(array());
+        $auth = $this->createHandler([]);
         $auth->setAuthMode('PLAIN');
         $this->assertEquals('PLAIN', $auth->getAuthMode());
     }
 
     public function testMixinMethods()
     {
-        $auth = $this->createHandler(array());
+        $auth = $this->createHandler([]);
         $mixins = $auth->exposeMixinMethods();
         $this->assertTrue(in_array('getUsername', $mixins),
             '%s: getUsername() should be accessible via mixin'
@@ -73,11 +73,11 @@ class Swift_Transport_Esmtp_AuthHandlerTest extends \SwiftMailerTestCase
            ->with($this->agent, 'jack', 'pass')
            ->andReturn(true);
 
-        $auth = $this->createHandler(array($a1, $a2));
+        $auth = $this->createHandler([$a1, $a2]);
         $auth->setUsername('jack');
         $auth->setPassword('pass');
 
-        $auth->setKeywordParams(array('CRAM-MD5', 'LOGIN'));
+        $auth->setKeywordParams(['CRAM-MD5', 'LOGIN']);
         $auth->afterEhlo($this->agent);
     }
 
@@ -94,9 +94,9 @@ class Swift_Transport_Esmtp_AuthHandlerTest extends \SwiftMailerTestCase
            ->with($this->agent, 'jack', 'pass')
            ->andReturn(true);
 
-        $auth = $this->createHandler(array($a1, $a2));
+        $auth = $this->createHandler([$a1, $a2]);
 
-        $auth->setKeywordParams(array('CRAM-MD5', 'LOGIN'));
+        $auth->setKeywordParams(['CRAM-MD5', 'LOGIN']);
         $auth->afterEhlo($this->agent);
     }
 
@@ -114,11 +114,11 @@ class Swift_Transport_Esmtp_AuthHandlerTest extends \SwiftMailerTestCase
            ->with($this->agent, 'jack', 'pass')
            ->andReturn(true);
 
-        $auth = $this->createHandler(array($a1, $a2));
+        $auth = $this->createHandler([$a1, $a2]);
         $auth->setUsername('jack');
         $auth->setPassword('pass');
 
-        $auth->setKeywordParams(array('PLAIN', 'LOGIN'));
+        $auth->setKeywordParams(['PLAIN', 'LOGIN']);
         $auth->afterEhlo($this->agent);
     }
 
@@ -140,11 +140,11 @@ class Swift_Transport_Esmtp_AuthHandlerTest extends \SwiftMailerTestCase
            ->never()
            ->with($this->agent, 'jack', 'pass');
 
-        $auth = $this->createHandler(array($a1, $a2));
+        $auth = $this->createHandler([$a1, $a2]);
         $auth->setUsername('jack');
         $auth->setPassword('pass');
 
-        $auth->setKeywordParams(array('PLAIN', 'LOGIN', 'CRAM-MD5'));
+        $auth->setKeywordParams(['PLAIN', 'LOGIN', 'CRAM-MD5']);
         $auth->afterEhlo($this->agent);
     }
 
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/EsmtpTransport/ExtensionSupportTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/EsmtpTransport/ExtensionSupportTest.php
index 2b8e919b..d9e363a7 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/EsmtpTransport/ExtensionSupportTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/EsmtpTransport/ExtensionSupportTest.php
@@ -34,8 +34,8 @@ class Swift_Transport_EsmtpTransport_ExtensionSupportTest extends Swift_Transpor
              ->andReturn(-1);
         $this->finishBuffer($buf);
 
-        $smtp->setExtensionHandlers(array($ext1, $ext2));
-        $this->assertEquals(array($ext2, $ext1), $smtp->getExtensionHandlers());
+        $smtp->setExtensionHandlers([$ext1, $ext2]);
+        $this->assertEquals([$ext2, $ext1], $smtp->getExtensionHandlers());
     }
 
     public function testHandlersAreNotifiedOfParams()
@@ -71,16 +71,16 @@ class Swift_Transport_EsmtpTransport_ExtensionSupportTest extends Swift_Transpor
              ->andReturn('AUTH');
         $ext1->shouldReceive('setKeywordParams')
              ->once()
-             ->with(array('PLAIN', 'LOGIN'));
+             ->with(['PLAIN', 'LOGIN']);
         $ext2->shouldReceive('getHandledKeyword')
              ->zeroOrMoreTimes()
              ->andReturn('SIZE');
         $ext2->shouldReceive('setKeywordParams')
              ->zeroOrMoreTimes()
-             ->with(array('123456'));
+             ->with(['123456']);
         $this->finishBuffer($buf);
 
-        $smtp->setExtensionHandlers(array($ext1, $ext2));
+        $smtp->setExtensionHandlers([$ext1, $ext2]);
         $smtp->start();
     }
 
@@ -133,7 +133,7 @@ class Swift_Transport_EsmtpTransport_ExtensionSupportTest extends Swift_Transpor
              ->with($smtp);
         $this->finishBuffer($buf);
 
-        $smtp->setExtensionHandlers(array($ext1, $ext2, $ext3));
+        $smtp->setExtensionHandlers([$ext1, $ext2, $ext3]);
         $smtp->start();
     }
 
@@ -141,7 +141,7 @@ class Swift_Transport_EsmtpTransport_ExtensionSupportTest extends Swift_Transpor
     {
         $buf = $this->getBuffer();
         $dispatcher = $this->createEventDispatcher();
-        $smtp = new Swift_Transport_EsmtpTransport($buf, array(), $dispatcher, 'example.org');
+        $smtp = new Swift_Transport_EsmtpTransport($buf, [], $dispatcher, 'example.org');
         $ext1 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
         $ext2 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
         $ext3 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
@@ -149,10 +149,10 @@ class Swift_Transport_EsmtpTransport_ExtensionSupportTest extends Swift_Transpor
 
         $message->shouldReceive('getFrom')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('me@domain' => 'Me'));
+                ->andReturn(['me@domain' => 'Me']);
         $message->shouldReceive('getTo')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('foo@bar' => null));
+                ->andReturn(['foo@bar' => null]);
 
         $buf->shouldReceive('readLine')
             ->once()
@@ -234,7 +234,7 @@ class Swift_Transport_EsmtpTransport_ExtensionSupportTest extends Swift_Transpor
              ->with('SIZE')
              ->andReturn(-1);
 
-        $smtp->setExtensionHandlers(array($ext1, $ext2, $ext3));
+        $smtp->setExtensionHandlers([$ext1, $ext2, $ext3]);
         $smtp->start();
         $smtp->send($message);
     }
@@ -243,7 +243,7 @@ class Swift_Transport_EsmtpTransport_ExtensionSupportTest extends Swift_Transpor
     {
         $buf = $this->getBuffer();
         $dispatcher = $this->createEventDispatcher();
-        $smtp = new Swift_Transport_EsmtpTransport($buf, array(), $dispatcher, 'example.org');
+        $smtp = new Swift_Transport_EsmtpTransport($buf, [], $dispatcher, 'example.org');
         $ext1 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
         $ext2 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
         $ext3 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
@@ -251,10 +251,10 @@ class Swift_Transport_EsmtpTransport_ExtensionSupportTest extends Swift_Transpor
 
         $message->shouldReceive('getFrom')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('me@domain' => 'Me'));
+                ->andReturn(['me@domain' => 'Me']);
         $message->shouldReceive('getTo')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('foo@bar' => null));
+                ->andReturn(['foo@bar' => null]);
 
         $buf->shouldReceive('readLine')
             ->once()
@@ -336,7 +336,7 @@ class Swift_Transport_EsmtpTransport_ExtensionSupportTest extends Swift_Transpor
              ->with('SIZE')
              ->andReturn(-1);
 
-        $smtp->setExtensionHandlers(array($ext1, $ext2, $ext3));
+        $smtp->setExtensionHandlers([$ext1, $ext2, $ext3]);
         $smtp->start();
         $smtp->send($message);
     }
@@ -384,13 +384,13 @@ class Swift_Transport_EsmtpTransport_ExtensionSupportTest extends Swift_Transpor
              ->andReturn('AUTH');
         $ext1->shouldReceive('onCommand')
              ->once()
-             ->with($smtp, "FOO\r\n", array(250, 251), \Mockery::any(), \Mockery::any());
+             ->with($smtp, "FOO\r\n", [250, 251], \Mockery::any(), \Mockery::any());
         $ext2->shouldReceive('getHandledKeyword')
              ->zeroOrMoreTimes()
              ->andReturn('SIZE');
         $ext2->shouldReceive('onCommand')
              ->once()
-             ->with($smtp, "FOO\r\n", array(250, 251), \Mockery::any(), \Mockery::any());
+             ->with($smtp, "FOO\r\n", [250, 251], \Mockery::any(), \Mockery::any());
         $ext3->shouldReceive('getHandledKeyword')
              ->zeroOrMoreTimes()
              ->andReturn('STARTTLS');
@@ -398,9 +398,9 @@ class Swift_Transport_EsmtpTransport_ExtensionSupportTest extends Swift_Transpor
              ->never()
              ->with(\Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any());
 
-        $smtp->setExtensionHandlers(array($ext1, $ext2, $ext3));
+        $smtp->setExtensionHandlers([$ext1, $ext2, $ext3]);
         $smtp->start();
-        $smtp->executeCommand("FOO\r\n", array(250, 251));
+        $smtp->executeCommand("FOO\r\n", [250, 251]);
     }
 
     public function testChainOfCommandAlgorithmWhenNotifyingExtensions()
@@ -441,7 +441,7 @@ class Swift_Transport_EsmtpTransport_ExtensionSupportTest extends Swift_Transpor
              ->andReturn('AUTH');
         $ext1->shouldReceive('onCommand')
              ->once()
-             ->with($smtp, "FOO\r\n", array(250, 251), \Mockery::any(), \Mockery::any())
+             ->with($smtp, "FOO\r\n", [250, 251], \Mockery::any(), \Mockery::any())
              ->andReturnUsing(function ($a, $b, $c, $d, &$e) {
                  $e = true;
 
@@ -461,9 +461,9 @@ class Swift_Transport_EsmtpTransport_ExtensionSupportTest extends Swift_Transpor
              ->never()
              ->with(\Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any());
 
-        $smtp->setExtensionHandlers(array($ext1, $ext2, $ext3));
+        $smtp->setExtensionHandlers([$ext1, $ext2, $ext3]);
         $smtp->start();
-        $smtp->executeCommand("FOO\r\n", array(250, 251));
+        $smtp->executeCommand("FOO\r\n", [250, 251]);
     }
 
     public function testExtensionsCanExposeMixinMethods()
@@ -478,7 +478,7 @@ class Swift_Transport_EsmtpTransport_ExtensionSupportTest extends Swift_Transpor
              ->andReturn('AUTH');
         $ext1->shouldReceive('exposeMixinMethods')
              ->zeroOrMoreTimes()
-             ->andReturn(array('setUsername', 'setPassword'));
+             ->andReturn(['setUsername', 'setPassword']);
         $ext1->shouldReceive('setUsername')
              ->once()
              ->with('mick');
@@ -490,7 +490,7 @@ class Swift_Transport_EsmtpTransport_ExtensionSupportTest extends Swift_Transpor
              ->andReturn('STARTTLS');
         $this->finishBuffer($buf);
 
-        $smtp->setExtensionHandlers(array($ext1, $ext2));
+        $smtp->setExtensionHandlers([$ext1, $ext2]);
         $smtp->setUsername('mick');
         $smtp->setPassword('pass');
     }
@@ -507,7 +507,7 @@ class Swift_Transport_EsmtpTransport_ExtensionSupportTest extends Swift_Transpor
              ->andReturn('AUTH');
         $ext1->shouldReceive('exposeMixinMethods')
              ->zeroOrMoreTimes()
-             ->andReturn(array('setUsername', 'setPassword'));
+             ->andReturn(['setUsername', 'setPassword']);
         $ext1->shouldReceive('setUsername')
              ->once()
              ->with('mick')
@@ -521,7 +521,7 @@ class Swift_Transport_EsmtpTransport_ExtensionSupportTest extends Swift_Transpor
              ->andReturn('STARTTLS');
         $this->finishBuffer($buf);
 
-        $smtp->setExtensionHandlers(array($ext1, $ext2));
+        $smtp->setExtensionHandlers([$ext1, $ext2]);
         $ret = $smtp->setUsername('mick');
         $this->assertEquals($smtp, $ret);
         $ret = $smtp->setPassword('pass');
@@ -540,7 +540,7 @@ class Swift_Transport_EsmtpTransport_ExtensionSupportTest extends Swift_Transpor
              ->andReturn('AUTH');
         $ext1->shouldReceive('exposeMixinMethods')
              ->zeroOrMoreTimes()
-             ->andReturn(array('setUsername', 'setPassword'));
+             ->andReturn(['setUsername', 'setPassword']);
         $ext1->shouldReceive('setUsername')
              ->once()
              ->with('mick')
@@ -554,7 +554,7 @@ class Swift_Transport_EsmtpTransport_ExtensionSupportTest extends Swift_Transpor
              ->andReturn('STARTTLS');
         $this->finishBuffer($buf);
 
-        $smtp->setExtensionHandlers(array($ext1, $ext2));
+        $smtp->setExtensionHandlers([$ext1, $ext2]);
         $this->assertEquals('x', $smtp->setUsername('mick'));
         $this->assertEquals('x', $smtp->setPassword('pass'));
     }
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/EsmtpTransportTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/EsmtpTransportTest.php
index 647ae939..db1edcef 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/EsmtpTransportTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/EsmtpTransportTest.php
@@ -2,13 +2,12 @@
 
 class Swift_Transport_EsmtpTransportTest extends Swift_Transport_AbstractSmtpEventSupportTest
 {
-    protected function getTransport($buf, $dispatcher = null)
+    protected function getTransport($buf, $dispatcher = null, $addressEncoder = null)
     {
-        if (!$dispatcher) {
-            $dispatcher = $this->createEventDispatcher();
-        }
+        $dispatcher = $dispatcher ?? $this->createEventDispatcher();
+        $addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
 
-        return new Swift_Transport_EsmtpTransport($buf, array(), $dispatcher, 'example.org');
+        return new Swift_Transport_EsmtpTransport($buf, [], $dispatcher, 'example.org', $addressEncoder);
     }
 
     public function testHostCanBeSetAndFetched()
@@ -279,6 +278,359 @@ class Swift_Transport_EsmtpTransportTest extends Swift_Transport_AbstractSmtpEve
         $smtp->start();
     }
 
+    public function testPipelining()
+    {
+        $buf = $this->getBuffer();
+        $smtp = $this->getTransport($buf);
+        $this->assertNull($smtp->getPipelining());
+
+        $message = $this->createMessage();
+        $message->shouldReceive('getFrom')
+                ->zeroOrMoreTimes()
+                ->andReturn(['me@domain.com' => 'Me']);
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn(['foo@bar' => null]);
+
+        $buf->shouldReceive('initialize')
+            ->once();
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(0)
+            ->andReturn("220 some.server.tld bleh\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with('~^EHLO .+?\r\n$~D')
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('250-ServerName'."\r\n");
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('250 PIPELINING'."\r\n");
+
+        $buf->shouldReceive('write')
+            ->ordered()
+            ->once()
+            ->with("MAIL FROM:<me@domain.com>\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('write')
+            ->ordered()
+            ->once()
+            ->with("RCPT TO:<foo@bar>\r\n")
+            ->andReturn(2);
+        $buf->shouldReceive('write')
+            ->ordered()
+            ->once()
+            ->with("DATA\r\n")->andReturn(3);
+        $buf->shouldReceive('readLine')
+            ->ordered()
+            ->once()
+            ->with(1)->andReturn("250 OK\r\n");
+        $buf->shouldReceive('readLine')
+            ->ordered()
+            ->once()
+            ->with(2)->andReturn("250 OK\r\n");
+        $buf->shouldReceive('readLine')
+            ->ordered()
+            ->once()
+            ->with(3)->andReturn("354 OK\r\n");
+
+        $this->finishBuffer($buf);
+        $smtp->start();
+        $sent = $smtp->send($message, $failedRecipients);
+
+        $this->assertEquals(1, $sent);
+        $this->assertEmpty($failedRecipients);
+
+        $this->assertTrue($smtp->getPipelining());
+    }
+
+    public function testPipeliningWithRecipientFailure()
+    {
+        $buf = $this->getBuffer();
+        $smtp = $this->getTransport($buf);
+        $this->assertNull($smtp->getPipelining());
+
+        $message = $this->createMessage();
+        $message->shouldReceive('getFrom')
+                ->zeroOrMoreTimes()
+                ->andReturn(['me@domain.com' => 'Me']);
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn([
+                    'good@foo' => null,
+                    'bad@foo' => null,
+                    'good@bar' => null,
+                ]);
+
+        $buf->shouldReceive('initialize')
+            ->once();
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(0)
+            ->andReturn("220 some.server.tld bleh\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with('~^EHLO .+?\r\n$~D')
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('250-ServerName'."\r\n");
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('250 PIPELINING'."\r\n");
+
+        $buf->shouldReceive('write')
+            ->ordered()
+            ->once()
+            ->with("MAIL FROM:<me@domain.com>\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('write')
+            ->ordered()
+            ->once()
+            ->with("RCPT TO:<good@foo>\r\n")
+            ->andReturn(2);
+        $buf->shouldReceive('write')
+            ->ordered()
+            ->once()
+            ->with("RCPT TO:<bad@foo>\r\n")
+            ->andReturn(3);
+        $buf->shouldReceive('write')
+            ->ordered()
+            ->once()
+            ->with("RCPT TO:<good@bar>\r\n")
+            ->andReturn(4);
+        $buf->shouldReceive('write')
+            ->ordered()
+            ->once()
+            ->with("DATA\r\n")
+            ->andReturn(5);
+        $buf->shouldReceive('readLine')
+            ->ordered()
+            ->once()
+            ->with(1)
+            ->andReturn("250 OK\r\n");
+        $buf->shouldReceive('readLine')
+            ->ordered()
+            ->once()
+            ->with(2)
+            ->andReturn("250 OK\r\n");
+        $buf->shouldReceive('readLine')
+            ->ordered()
+            ->once()
+            ->with(3)
+            ->andReturn("450 Unknown address bad@foo\r\n");
+        $buf->shouldReceive('readLine')
+            ->ordered()
+            ->once()
+            ->with(4)
+            ->andReturn("250 OK\r\n");
+        $buf->shouldReceive('readLine')
+            ->ordered()
+            ->once()
+            ->with(5)
+            ->andReturn("354 OK\r\n");
+
+        $this->finishBuffer($buf);
+        $smtp->start();
+        $sent = $smtp->send($message, $failedRecipients);
+
+        $this->assertEquals(2, $sent);
+        $this->assertEquals(['bad@foo'], $failedRecipients);
+
+        $this->assertTrue($smtp->getPipelining());
+    }
+
+    public function testPipeliningWithSenderFailure()
+    {
+        $buf = $this->getBuffer();
+        $smtp = $this->getTransport($buf);
+        $this->assertNull($smtp->getPipelining());
+
+        $message = $this->createMessage();
+        $message->shouldReceive('getFrom')
+                ->zeroOrMoreTimes()
+                ->andReturn(['me@domain.com' => 'Me']);
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn(['foo@bar' => null]);
+
+        $buf->shouldReceive('initialize')
+            ->once();
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(0)
+            ->andReturn("220 some.server.tld bleh\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with('~^EHLO .+?\r\n$~D')
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('250-ServerName'."\r\n");
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('250 PIPELINING'."\r\n");
+
+        $buf->shouldReceive('write')
+            ->ordered()
+            ->once()
+            ->with("MAIL FROM:<me@domain.com>\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('write')
+            ->ordered()
+            ->once()
+            ->with("RCPT TO:<foo@bar>\r\n")
+            ->andReturn(2);
+        $buf->shouldReceive('write')
+            ->ordered()
+            ->once()
+            ->with("DATA\r\n")->andReturn(3);
+        $buf->shouldReceive('readLine')
+            ->ordered()
+            ->once()
+            ->with(1)
+            ->andReturn("550 Unknown address me@domain.com\r\n");
+
+        $smtp->start();
+
+        $this->expectException('Swift_TransportException');
+        $this->expectExceptionMessage('Expected response code 250 but got code "550"');
+        $smtp->send($message, $failedRecipients);
+    }
+
+    public function testPipeliningWithDataFailure()
+    {
+        $buf = $this->getBuffer();
+        $smtp = $this->getTransport($buf);
+        $this->assertNull($smtp->getPipelining());
+
+        $message = $this->createMessage();
+        $message->shouldReceive('getFrom')
+                ->zeroOrMoreTimes()
+                ->andReturn(['me@domain.com' => 'Me']);
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn(['foo@bar' => null]);
+
+        $buf->shouldReceive('initialize')
+            ->once();
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(0)
+            ->andReturn("220 some.server.tld bleh\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with('~^EHLO .+?\r\n$~D')
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('250-ServerName'."\r\n");
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('250 PIPELINING'."\r\n");
+
+        $buf->shouldReceive('write')
+            ->ordered()
+            ->once()
+            ->with("MAIL FROM:<me@domain.com>\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('write')
+            ->ordered()
+            ->once()
+            ->with("RCPT TO:<foo@bar>\r\n")
+            ->andReturn(2);
+        $buf->shouldReceive('write')
+            ->ordered()
+            ->once()
+            ->with("DATA\r\n")->andReturn(3);
+        $buf->shouldReceive('readLine')
+            ->ordered()
+            ->once()
+            ->with(1)
+            ->andReturn("250 OK\r\n");
+        $buf->shouldReceive('readLine')
+            ->ordered()
+            ->once()
+            ->with(2)
+            ->andReturn("250 OK\r\n");
+        $buf->shouldReceive('readLine')
+            ->ordered()
+            ->once()
+            ->with(3)
+            ->andReturn("452 Insufficient system storage\r\n");
+
+        $smtp->start();
+
+        $this->expectException('Swift_TransportException');
+        $this->expectExceptionMessage('Expected response code 354 but got code "452"');
+        $smtp->send($message, $failedRecipients);
+    }
+
+    public function providerPipeliningOverride()
+    {
+        return [
+            [null, true, true],
+            [null, false, false],
+            [true, false, true],
+            [true, true, true],
+            [false, false, false],
+            [false, true, false],
+        ];
+    }
+
+    /**
+     * @dataProvider providerPipeliningOverride
+     */
+    public function testPipeliningOverride($enabled, bool $supported, bool $expected)
+    {
+        $buf = $this->getBuffer();
+        $smtp = $this->getTransport($buf);
+        $this->assertNull($smtp->getPipelining());
+
+        $smtp->setPipelining($enabled);
+        $this->assertSame($enabled, $smtp->getPipelining());
+
+        $message = $this->createMessage();
+        $message->shouldReceive('getFrom')
+                ->zeroOrMoreTimes()
+                ->andReturn(['me@domain.com' => 'Me']);
+
+        $buf->shouldReceive('initialize')
+            ->once();
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(0)
+            ->andReturn("220 some.server.tld bleh\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with('~^EHLO .+?\r\n$~D')
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('250-ServerName'."\r\n");
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('250 '.($supported ? 'PIPELINING' : 'FOOBAR')."\r\n");
+
+        $this->finishBuffer($buf);
+        $smtp->start();
+        $smtp->send($message);
+
+        $this->assertSame($expected, $smtp->getPipelining());
+    }
+
     public function testFluidInterface()
     {
         $buf = $this->getBuffer();
@@ -292,6 +644,7 @@ class Swift_Transport_EsmtpTransportTest extends Swift_Transport_AbstractSmtpEve
             ->setPort(25)
             ->setEncryption('tls')
             ->setTimeout(30)
+            ->setPipelining(false)
             ;
         $this->assertEquals($ref, $smtp);
     }
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/FailoverTransportTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/FailoverTransportTest.php
index 9f46d279..deb0617d 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/FailoverTransportTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/FailoverTransportTest.php
@@ -33,7 +33,7 @@ class Swift_Transport_FailoverTransportTest extends \SwiftMailerTestCase
         $t2->shouldReceive('start')->never();
         $t2->shouldReceive('send')->never();
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $transport->start();
         $this->assertEquals(1, $transport->send($message1));
         $this->assertEquals(1, $transport->send($message2));
@@ -91,7 +91,7 @@ class Swift_Transport_FailoverTransportTest extends \SwiftMailerTestCase
                }
            });
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $transport->start();
         $this->assertEquals(1, $transport->send($message));
     }
@@ -126,7 +126,7 @@ class Swift_Transport_FailoverTransportTest extends \SwiftMailerTestCase
                return 0;
            });
 
-        $transport = $this->getTransport(array($t1));
+        $transport = $this->getTransport([$t1]);
         $transport->start();
         $this->assertEquals(0, $transport->send($message));
     }
@@ -195,7 +195,7 @@ class Swift_Transport_FailoverTransportTest extends \SwiftMailerTestCase
                }
            });
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $transport->start();
         $this->assertEquals(1, $transport->send($message1));
         $this->assertEquals(1, $transport->send($message2));
@@ -255,7 +255,7 @@ class Swift_Transport_FailoverTransportTest extends \SwiftMailerTestCase
                }
            });
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $transport->start();
         try {
             $transport->send($message);
@@ -298,7 +298,7 @@ class Swift_Transport_FailoverTransportTest extends \SwiftMailerTestCase
                }
            });
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $transport->start();
         $transport->stop();
     }
@@ -358,7 +358,7 @@ class Swift_Transport_FailoverTransportTest extends \SwiftMailerTestCase
                }
            });
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $transport->start();
         $this->assertTrue($transport->isStarted());
         try {
@@ -436,7 +436,7 @@ class Swift_Transport_FailoverTransportTest extends \SwiftMailerTestCase
            ->never()
            ->with($message2, \Mockery::any());
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $transport->start();
         $this->assertTrue($transport->isStarted());
         try {
@@ -453,7 +453,7 @@ class Swift_Transport_FailoverTransportTest extends \SwiftMailerTestCase
 
     public function testFailureReferenceIsPassedToDelegates()
     {
-        $failures = array();
+        $failures = [];
 
         $message = $this->getMockery('Swift_Mime_SimpleMessage');
         $t1 = $this->getMockery('Swift_Transport');
@@ -481,7 +481,7 @@ class Swift_Transport_FailoverTransportTest extends \SwiftMailerTestCase
                }
            });
 
-        $transport = $this->getTransport(array($t1));
+        $transport = $this->getTransport([$t1]);
         $transport->start();
         $transport->send($message, $failures);
     }
@@ -499,7 +499,7 @@ class Swift_Transport_FailoverTransportTest extends \SwiftMailerTestCase
            ->once()
            ->with($plugin);
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $transport->registerPlugin($plugin);
     }
 
@@ -520,7 +520,7 @@ class Swift_Transport_FailoverTransportTest extends \SwiftMailerTestCase
            ->once()
            ->andReturn(true);
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $this->assertTrue($transport->isStarted());
         $this->assertTrue($transport->ping());
     }
@@ -549,7 +549,7 @@ class Swift_Transport_FailoverTransportTest extends \SwiftMailerTestCase
            ->twice()
            ->andReturn(true);
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $this->assertTrue($transport->ping());
         $this->assertTrue($transport->ping());
         $this->assertTrue($transport->isStarted());
@@ -579,7 +579,7 @@ class Swift_Transport_FailoverTransportTest extends \SwiftMailerTestCase
            ->once()
            ->andReturn(false);
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $this->assertFalse($transport->ping());
         $this->assertFalse($transport->isStarted());
         $this->assertFalse($transport->ping());
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/LoadBalancedTransportTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/LoadBalancedTransportTest.php
index e0283843..dbc60afa 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/LoadBalancedTransportTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/LoadBalancedTransportTest.php
@@ -62,7 +62,7 @@ class Swift_Transport_LoadBalancedTransportTest extends \SwiftMailerTestCase
            ->never()
            ->with($message1, \Mockery::any());
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $transport->start();
         $this->assertEquals(1, $transport->send($message1));
         $this->assertEquals(1, $transport->send($message2));
@@ -154,7 +154,7 @@ class Swift_Transport_LoadBalancedTransportTest extends \SwiftMailerTestCase
            ->never()
            ->with($message3, \Mockery::any());
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $transport->start();
 
         $this->assertEquals(1, $transport->send($message1));
@@ -218,7 +218,7 @@ class Swift_Transport_LoadBalancedTransportTest extends \SwiftMailerTestCase
                $testCase->fail();
            });
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $transport->start();
         $this->assertEquals(1, $transport->send($message));
     }
@@ -277,7 +277,7 @@ class Swift_Transport_LoadBalancedTransportTest extends \SwiftMailerTestCase
                return 0;
            });
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $transport->start();
         $this->assertEquals(1, $transport->send($message));
     }
@@ -336,7 +336,7 @@ class Swift_Transport_LoadBalancedTransportTest extends \SwiftMailerTestCase
                return 1;
            });
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $transport->start();
         $this->assertEquals(0, $transport->send($message));
     }
@@ -408,7 +408,7 @@ class Swift_Transport_LoadBalancedTransportTest extends \SwiftMailerTestCase
                $testCase->fail();
            });
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $transport->start();
         $this->assertEquals(1, $transport->send($message1));
         $this->assertEquals(1, $transport->send($message2));
@@ -468,7 +468,7 @@ class Swift_Transport_LoadBalancedTransportTest extends \SwiftMailerTestCase
                }
            });
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $transport->start();
         try {
             $transport->send($message);
@@ -510,7 +510,7 @@ class Swift_Transport_LoadBalancedTransportTest extends \SwiftMailerTestCase
                }
            });
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $transport->start();
         $transport->stop();
     }
@@ -567,7 +567,7 @@ class Swift_Transport_LoadBalancedTransportTest extends \SwiftMailerTestCase
                }
            });
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $transport->start();
         $this->assertTrue($transport->isStarted());
         try {
@@ -643,7 +643,7 @@ class Swift_Transport_LoadBalancedTransportTest extends \SwiftMailerTestCase
            ->never()
            ->with($message2, \Mockery::any());
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $transport->start();
         $this->assertTrue($transport->isStarted());
         try {
@@ -660,7 +660,7 @@ class Swift_Transport_LoadBalancedTransportTest extends \SwiftMailerTestCase
 
     public function testFailureReferenceIsPassedToDelegates()
     {
-        $failures = array();
+        $failures = [];
         $testCase = $this;
 
         $message = $this->getMockery('Swift_Mime_SimpleMessage');
@@ -690,7 +690,7 @@ class Swift_Transport_LoadBalancedTransportTest extends \SwiftMailerTestCase
                }
            });
 
-        $transport = $this->getTransport(array($t1));
+        $transport = $this->getTransport([$t1]);
         $transport->start();
         $transport->send($message, $failures);
     }
@@ -709,7 +709,7 @@ class Swift_Transport_LoadBalancedTransportTest extends \SwiftMailerTestCase
            ->once()
            ->with($plugin);
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $transport->registerPlugin($plugin);
     }
 
@@ -737,7 +737,7 @@ class Swift_Transport_LoadBalancedTransportTest extends \SwiftMailerTestCase
            ->once()
            ->andReturn(true);
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $this->assertTrue($transport->isStarted());
         $this->assertTrue($transport->ping());
     }
@@ -766,7 +766,7 @@ class Swift_Transport_LoadBalancedTransportTest extends \SwiftMailerTestCase
            ->once()
            ->andReturn(false);
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $this->assertTrue($transport->ping());
         $this->assertTrue($transport->ping());
         $this->assertTrue($transport->isStarted());
@@ -796,7 +796,7 @@ class Swift_Transport_LoadBalancedTransportTest extends \SwiftMailerTestCase
            ->once()
            ->andReturn(false);
 
-        $transport = $this->getTransport(array($t1, $t2));
+        $transport = $this->getTransport([$t1, $t2]);
         $this->assertFalse($transport->ping());
         $this->assertFalse($transport->isStarted());
         $this->assertFalse($transport->ping());
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/SendmailTransportTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/SendmailTransportTest.php
index 034e5a08..fe40d6c8 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/SendmailTransportTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/SendmailTransportTest.php
@@ -2,12 +2,12 @@
 
 class Swift_Transport_SendmailTransportTest extends Swift_Transport_AbstractSmtpEventSupportTest
 {
-    protected function getTransport($buf, $dispatcher = null, $command = '/usr/sbin/sendmail -bs')
+    protected function getTransport($buf, $dispatcher = null, $addressEncoder = null, $command = '/usr/sbin/sendmail -bs')
     {
         if (!$dispatcher) {
             $dispatcher = $this->createEventDispatcher();
         }
-        $transport = new Swift_Transport_SendmailTransport($buf, $dispatcher, 'example.org');
+        $transport = new Swift_Transport_SendmailTransport($buf, $dispatcher, 'example.org', $addressEncoder);
         $transport->setCommand($command);
 
         return $transport;
@@ -41,7 +41,7 @@ class Swift_Transport_SendmailTransportTest extends Swift_Transport_AbstractSmtp
 
         $message->shouldReceive('getTo')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('foo@bar' => 'Foobar', 'zip@button' => 'Zippy'));
+                ->andReturn(['foo@bar' => 'Foobar', 'zip@button' => 'Zippy']);
         $message->shouldReceive('toByteStream')
                 ->once()
                 ->with($buf);
@@ -51,10 +51,10 @@ class Swift_Transport_SendmailTransportTest extends Swift_Transport_AbstractSmtp
             ->once();
         $buf->shouldReceive('setWriteTranslations')
             ->once()
-            ->with(array("\r\n" => "\n", "\n." => "\n.."));
+            ->with(["\r\n" => "\n", "\n." => "\n.."]);
         $buf->shouldReceive('setWriteTranslations')
             ->once()
-            ->with(array());
+            ->with([]);
 
         $sendmail->setCommand('/usr/sbin/sendmail -t');
         $this->assertEquals(2, $sendmail->send($message));
@@ -68,7 +68,7 @@ class Swift_Transport_SendmailTransportTest extends Swift_Transport_AbstractSmtp
 
         $message->shouldReceive('getTo')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('foo@bar' => 'Foobar', 'zip@button' => 'Zippy'));
+                ->andReturn(['foo@bar' => 'Foobar', 'zip@button' => 'Zippy']);
         $message->shouldReceive('toByteStream')
                 ->once()
                 ->with($buf);
@@ -78,10 +78,10 @@ class Swift_Transport_SendmailTransportTest extends Swift_Transport_AbstractSmtp
             ->once();
         $buf->shouldReceive('setWriteTranslations')
             ->once()
-            ->with(array("\r\n" => "\n"));
+            ->with(["\r\n" => "\n"]);
         $buf->shouldReceive('setWriteTranslations')
             ->once()
-            ->with(array());
+            ->with([]);
 
         $sendmail->setCommand('/usr/sbin/sendmail -i -t');
         $this->assertEquals(2, $sendmail->send($message));
@@ -95,7 +95,7 @@ class Swift_Transport_SendmailTransportTest extends Swift_Transport_AbstractSmtp
 
         $message->shouldReceive('getTo')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('foo@bar' => 'Foobar', 'zip@button' => 'Zippy'));
+                ->andReturn(['foo@bar' => 'Foobar', 'zip@button' => 'Zippy']);
         $message->shouldReceive('toByteStream')
                 ->once()
                 ->with($buf);
@@ -105,10 +105,10 @@ class Swift_Transport_SendmailTransportTest extends Swift_Transport_AbstractSmtp
             ->once();
         $buf->shouldReceive('setWriteTranslations')
             ->once()
-            ->with(array("\r\n" => "\n"));
+            ->with(["\r\n" => "\n"]);
         $buf->shouldReceive('setWriteTranslations')
             ->once()
-            ->with(array());
+            ->with([]);
 
         $sendmail->setCommand('/usr/sbin/sendmail -oi -t');
         $this->assertEquals(2, $sendmail->send($message));
@@ -122,7 +122,7 @@ class Swift_Transport_SendmailTransportTest extends Swift_Transport_AbstractSmtp
 
         $message->shouldReceive('getTo')
                 ->zeroOrMoreTimes()
-                ->andReturn(array('foo@bar' => 'Foobar', 'zip@button' => 'Zippy'));
+                ->andReturn(['foo@bar' => 'Foobar', 'zip@button' => 'Zippy']);
         $message->shouldReceive('generateId');
         $buf->shouldReceive('initialize')
             ->once();
@@ -130,10 +130,10 @@ class Swift_Transport_SendmailTransportTest extends Swift_Transport_AbstractSmtp
             ->once();
         $buf->shouldReceive('setWriteTranslations')
             ->once()
-            ->with(array("\r\n" => "\n", "\n." => "\n.."));
+            ->with(["\r\n" => "\n", "\n." => "\n.."]);
         $buf->shouldReceive('setWriteTranslations')
             ->once()
-            ->with(array());
+            ->with([]);
 
         $sendmail->setCommand('/usr/sbin/sendmail -t');
         $this->assertEquals(2, $sendmail->send($message));
diff --git a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/StreamBufferTest.php b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/StreamBufferTest.php
index a9c45099..540709af 100644
--- a/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/StreamBufferTest.php
+++ b/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/StreamBufferTest.php
@@ -8,10 +8,10 @@ class Swift_Transport_StreamBufferTest extends \PHPUnit\Framework\TestCase
         $factory->expects($this->once())
                 ->method('createFilter')
                 ->with('a', 'b')
-                ->will($this->returnCallback(array($this, 'createFilter')));
+                ->will($this->returnCallback([$this, 'createFilter']));
 
         $buffer = $this->createBuffer($factory);
-        $buffer->setWriteTranslations(array('a' => 'b'));
+        $buffer->setWriteTranslations(['a' => 'b']);
     }
 
     public function testOverridingTranslationsOnlyAddsNeededFilters()
@@ -19,11 +19,11 @@ class Swift_Transport_StreamBufferTest extends \PHPUnit\Framework\TestCase
         $factory = $this->createFactory();
         $factory->expects($this->exactly(2))
                 ->method('createFilter')
-                ->will($this->returnCallback(array($this, 'createFilter')));
+                ->will($this->returnCallback([$this, 'createFilter']));
 
         $buffer = $this->createBuffer($factory);
-        $buffer->setWriteTranslations(array('a' => 'b'));
-        $buffer->setWriteTranslations(array('x' => 'y', 'a' => 'b'));
+        $buffer->setWriteTranslations(['a' => 'b']);
+        $buffer->setWriteTranslations(['x' => 'y', 'a' => 'b']);
     }
 
     private function createBuffer($replacementFactory)
diff --git a/vendor/symfony/console/Application.php b/vendor/symfony/console/Application.php
index 107c1ed6..3ef76b3f 100644
--- a/vendor/symfony/console/Application.php
+++ b/vendor/symfony/console/Application.php
@@ -11,35 +11,36 @@
 
 namespace Symfony\Component\Console;
 
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Command\HelpCommand;
+use Symfony\Component\Console\Command\ListCommand;
 use Symfony\Component\Console\CommandLoader\CommandLoaderInterface;
+use Symfony\Component\Console\Event\ConsoleCommandEvent;
+use Symfony\Component\Console\Event\ConsoleErrorEvent;
+use Symfony\Component\Console\Event\ConsoleTerminateEvent;
+use Symfony\Component\Console\Exception\CommandNotFoundException;
 use Symfony\Component\Console\Exception\ExceptionInterface;
+use Symfony\Component\Console\Exception\LogicException;
+use Symfony\Component\Console\Exception\NamespaceNotFoundException;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Helper\DebugFormatterHelper;
+use Symfony\Component\Console\Helper\FormatterHelper;
 use Symfony\Component\Console\Helper\Helper;
+use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Helper\ProcessHelper;
 use Symfony\Component\Console\Helper\QuestionHelper;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\StreamableInputInterface;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\InputDefinition;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputAwareInterface;
-use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\StreamableInputInterface;
 use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Output\ConsoleOutputInterface;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Command\HelpCommand;
-use Symfony\Component\Console\Command\ListCommand;
-use Symfony\Component\Console\Helper\HelperSet;
-use Symfony\Component\Console\Helper\FormatterHelper;
-use Symfony\Component\Console\Event\ConsoleCommandEvent;
-use Symfony\Component\Console\Event\ConsoleErrorEvent;
-use Symfony\Component\Console\Event\ConsoleExceptionEvent;
-use Symfony\Component\Console\Event\ConsoleTerminateEvent;
-use Symfony\Component\Console\Exception\CommandNotFoundException;
-use Symfony\Component\Console\Exception\LogicException;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Debug\ErrorHandler;
 use Symfony\Component\Debug\Exception\FatalThrowableError;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -81,7 +82,7 @@ class Application
      * @param string $name    The name of the application
      * @param string $version The version of the application
      */
-    public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN')
+    public function __construct(string $name = 'UNKNOWN', string $version = 'UNKNOWN')
     {
         $this->name = $name;
         $this->version = $version;
@@ -131,17 +132,13 @@ class Application
         };
         if ($phpHandler = set_exception_handler($renderException)) {
             restore_exception_handler();
-            if (!is_array($phpHandler) || !$phpHandler[0] instanceof ErrorHandler) {
+            if (!\is_array($phpHandler) || !$phpHandler[0] instanceof ErrorHandler) {
                 $debugHandler = true;
             } elseif ($debugHandler = $phpHandler[0]->setExceptionHandler($renderException)) {
                 $phpHandler[0]->setExceptionHandler($debugHandler);
             }
         }
 
-        if (null !== $this->dispatcher && $this->dispatcher->hasListeners(ConsoleEvents::EXCEPTION)) {
-            @trigger_error(sprintf('The "ConsoleEvents::EXCEPTION" event is deprecated since Symfony 3.3 and will be removed in 4.0. Listen to the "ConsoleEvents::ERROR" event instead.'), E_USER_DEPRECATED);
-        }
-
         $this->configureIO($input, $output);
 
         try {
@@ -224,24 +221,41 @@ class Application
         }
 
         try {
-            $e = $this->runningCommand = null;
+            $this->runningCommand = null;
             // the command name MUST be the first element of the input
             $command = $this->find($name);
-        } catch (\Exception $e) {
         } catch (\Throwable $e) {
-        }
-        if (null !== $e) {
-            if (null !== $this->dispatcher) {
-                $event = new ConsoleErrorEvent($input, $output, $e);
-                $this->dispatcher->dispatch(ConsoleEvents::ERROR, $event);
-                $e = $event->getError();
+            if (!($e instanceof CommandNotFoundException && !$e instanceof NamespaceNotFoundException) || 1 !== \count($alternatives = $e->getAlternatives()) || !$input->isInteractive()) {
+                if (null !== $this->dispatcher) {
+                    $event = new ConsoleErrorEvent($input, $output, $e);
+                    $this->dispatcher->dispatch(ConsoleEvents::ERROR, $event);
 
-                if (0 === $event->getExitCode()) {
-                    return 0;
+                    if (0 === $event->getExitCode()) {
+                        return 0;
+                    }
+
+                    $e = $event->getError();
                 }
+
+                throw $e;
             }
 
-            throw $e;
+            $alternative = $alternatives[0];
+
+            $style = new SymfonyStyle($input, $output);
+            $style->block(sprintf("\nCommand \"%s\" is not defined.\n", $name), null, 'error');
+            if (!$style->confirm(sprintf('Do you want to run "%s" instead? ', $alternative), false)) {
+                if (null !== $this->dispatcher) {
+                    $event = new ConsoleErrorEvent($input, $output, $e);
+                    $this->dispatcher->dispatch(ConsoleEvents::ERROR, $event);
+
+                    return $event->getExitCode();
+                }
+
+                return 1;
+            }
+
+            $command = $this->find($alternative);
         }
 
         $this->runningCommand = $command;
@@ -451,11 +465,11 @@ class Application
         }
 
         if (null === $command->getDefinition()) {
-            throw new LogicException(sprintf('Command class "%s" is not correctly initialized. You probably forgot to call the parent constructor.', get_class($command)));
+            throw new LogicException(sprintf('Command class "%s" is not correctly initialized. You probably forgot to call the parent constructor.', \get_class($command)));
         }
 
         if (!$command->getName()) {
-            throw new LogicException(sprintf('The command defined in "%s" cannot have an empty name.', get_class($command)));
+            throw new LogicException(sprintf('The command defined in "%s" cannot have an empty name.', \get_class($command)));
         }
 
         $this->commands[$command->getName()] = $command;
@@ -540,7 +554,7 @@ class Application
      *
      * @return string A registered namespace
      *
-     * @throws CommandNotFoundException When namespace is incorrect or ambiguous
+     * @throws NamespaceNotFoundException When namespace is incorrect or ambiguous
      */
     public function findNamespace($namespace)
     {
@@ -552,7 +566,7 @@ class Application
             $message = sprintf('There are no commands defined in the "%s" namespace.', $namespace);
 
             if ($alternatives = $this->findAlternatives($namespace, $allNamespaces)) {
-                if (1 == count($alternatives)) {
+                if (1 == \count($alternatives)) {
                     $message .= "\n\nDid you mean this?\n    ";
                 } else {
                     $message .= "\n\nDid you mean one of these?\n    ";
@@ -561,12 +575,12 @@ class Application
                 $message .= implode("\n    ", $alternatives);
             }
 
-            throw new CommandNotFoundException($message, $alternatives);
+            throw new NamespaceNotFoundException($message, $alternatives);
         }
 
-        $exact = in_array($namespace, $namespaces, true);
-        if (count($namespaces) > 1 && !$exact) {
-            throw new CommandNotFoundException(sprintf("The namespace \"%s\" is ambiguous.\nDid you mean one of these?\n%s", $namespace, $this->getAbbreviationSuggestions(array_values($namespaces))), array_values($namespaces));
+        $exact = \in_array($namespace, $namespaces, true);
+        if (\count($namespaces) > 1 && !$exact) {
+            throw new NamespaceNotFoundException(sprintf("The namespace \"%s\" is ambiguous.\nDid you mean one of these?\n%s", $namespace, $this->getAbbreviationSuggestions(array_values($namespaces))), array_values($namespaces));
         }
 
         return $exact ? $namespace : reset($namespaces);
@@ -598,7 +612,7 @@ class Application
         }
 
         // if no commands matched or we just matched namespaces
-        if (empty($commands) || count(preg_grep('{^'.$expr.'$}i', $commands)) < 1) {
+        if (empty($commands) || \count(preg_grep('{^'.$expr.'$}i', $commands)) < 1) {
             if (false !== $pos = strrpos($name, ':')) {
                 // check if a namespace exists and contains commands
                 $this->findNamespace(substr($name, 0, $pos));
@@ -607,7 +621,7 @@ class Application
             $message = sprintf('Command "%s" is not defined.', $name);
 
             if ($alternatives = $this->findAlternatives($name, $allCommands)) {
-                if (1 == count($alternatives)) {
+                if (1 == \count($alternatives)) {
                     $message .= "\n\nDid you mean this?\n    ";
                 } else {
                     $message .= "\n\nDid you mean one of these?\n    ";
@@ -619,18 +633,18 @@ class Application
         }
 
         // filter out aliases for commands which are already on the list
-        if (count($commands) > 1) {
+        if (\count($commands) > 1) {
             $commandList = $this->commandLoader ? array_merge(array_flip($this->commandLoader->getNames()), $this->commands) : $this->commands;
             $commands = array_unique(array_filter($commands, function ($nameOrAlias) use ($commandList, $commands, &$aliases) {
                 $commandName = $commandList[$nameOrAlias] instanceof Command ? $commandList[$nameOrAlias]->getName() : $nameOrAlias;
                 $aliases[$nameOrAlias] = $commandName;
 
-                return $commandName === $nameOrAlias || !in_array($commandName, $commands);
+                return $commandName === $nameOrAlias || !\in_array($commandName, $commands);
             }));
         }
 
-        $exact = in_array($name, $commands, true) || isset($aliases[$name]);
-        if (count($commands) > 1 && !$exact) {
+        $exact = \in_array($name, $commands, true) || isset($aliases[$name]);
+        if (\count($commands) > 1 && !$exact) {
             $usableWidth = $this->terminal->getWidth() - 10;
             $abbrevs = array_values($commands);
             $maxLen = 0;
@@ -710,7 +724,7 @@ class Application
     {
         $abbrevs = array();
         foreach ($names as $name) {
-            for ($len = strlen($name); $len > 0; --$len) {
+            for ($len = \strlen($name); $len > 0; --$len) {
                 $abbrev = substr($name, 0, $len);
                 $abbrevs[$abbrev][] = $name;
             }
@@ -739,17 +753,13 @@ class Application
         do {
             $message = trim($e->getMessage());
             if ('' === $message || OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
-                $title = sprintf('  [%s%s]  ', get_class($e), 0 !== ($code = $e->getCode()) ? ' ('.$code.')' : '');
+                $title = sprintf('  [%s%s]  ', \get_class($e), 0 !== ($code = $e->getCode()) ? ' ('.$code.')' : '');
                 $len = Helper::strlen($title);
             } else {
                 $len = 0;
             }
 
             $width = $this->terminal->getWidth() ? $this->terminal->getWidth() - 1 : PHP_INT_MAX;
-            // HHVM only accepts 32 bits integer in str_split, even when PHP_INT_MAX is a 64 bit integer: https://github.com/facebook/hhvm/issues/1327
-            if (defined('HHVM_VERSION') && $width > 1 << 31) {
-                $width = 1 << 31;
-            }
             $lines = array();
             foreach ('' !== $message ? preg_split('/\r?\n/', $message) : array() as $line) {
                 foreach ($this->splitStringByWidth($line, $width - 4) as $line) {
@@ -783,7 +793,7 @@ class Application
                 // exception related properties
                 $trace = $e->getTrace();
 
-                for ($i = 0, $count = count($trace); $i < $count; ++$i) {
+                for ($i = 0, $count = \count($trace); $i < $count; ++$i) {
                     $class = isset($trace[$i]['class']) ? $trace[$i]['class'] : '';
                     $type = isset($trace[$i]['type']) ? $trace[$i]['type'] : '';
                     $function = $trace[$i]['function'];
@@ -798,70 +808,6 @@ class Application
         } while ($e = $e->getPrevious());
     }
 
-    /**
-     * Tries to figure out the terminal width in which this application runs.
-     *
-     * @return int|null
-     *
-     * @deprecated since version 3.2, to be removed in 4.0. Create a Terminal instance instead.
-     */
-    protected function getTerminalWidth()
-    {
-        @trigger_error(sprintf('%s is deprecated as of 3.2 and will be removed in 4.0. Create a Terminal instance instead.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->terminal->getWidth();
-    }
-
-    /**
-     * Tries to figure out the terminal height in which this application runs.
-     *
-     * @return int|null
-     *
-     * @deprecated since version 3.2, to be removed in 4.0. Create a Terminal instance instead.
-     */
-    protected function getTerminalHeight()
-    {
-        @trigger_error(sprintf('%s is deprecated as of 3.2 and will be removed in 4.0. Create a Terminal instance instead.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->terminal->getHeight();
-    }
-
-    /**
-     * Tries to figure out the terminal dimensions based on the current environment.
-     *
-     * @return array Array containing width and height
-     *
-     * @deprecated since version 3.2, to be removed in 4.0. Create a Terminal instance instead.
-     */
-    public function getTerminalDimensions()
-    {
-        @trigger_error(sprintf('%s is deprecated as of 3.2 and will be removed in 4.0. Create a Terminal instance instead.', __METHOD__), E_USER_DEPRECATED);
-
-        return array($this->terminal->getWidth(), $this->terminal->getHeight());
-    }
-
-    /**
-     * Sets terminal dimensions.
-     *
-     * Can be useful to force terminal dimensions for functional tests.
-     *
-     * @param int $width  The width
-     * @param int $height The height
-     *
-     * @return $this
-     *
-     * @deprecated since version 3.2, to be removed in 4.0. Set the COLUMNS and LINES env vars instead.
-     */
-    public function setTerminalDimensions($width, $height)
-    {
-        @trigger_error(sprintf('%s is deprecated as of 3.2 and will be removed in 4.0. Set the COLUMNS and LINES env vars instead.', __METHOD__), E_USER_DEPRECATED);
-
-        putenv('COLUMNS='.$width);
-        putenv('LINES='.$height);
-
-        return $this;
-    }
-
     /**
      * Configures the input and output instances based on the user arguments and options.
      */
@@ -875,19 +821,13 @@ class Application
 
         if (true === $input->hasParameterOption(array('--no-interaction', '-n'), true)) {
             $input->setInteractive(false);
-        } elseif (function_exists('posix_isatty')) {
+        } elseif (\function_exists('posix_isatty')) {
             $inputStream = null;
 
             if ($input instanceof StreamableInputInterface) {
                 $inputStream = $input->getStream();
             }
 
-            // This check ensures that calling QuestionHelper::setInputStream() works
-            // To be removed in 4.0 (in the same time as QuestionHelper::setInputStream)
-            if (!$inputStream && $this->getHelperSet()->has('question')) {
-                $inputStream = $this->getHelperSet()->get('question')->getInputStream(false);
-            }
-
             if (!@posix_isatty($inputStream) && false === getenv('SHELL_INTERACTIVE')) {
                 $input->setInteractive(false);
             }
@@ -965,19 +905,7 @@ class Application
             } else {
                 $exitCode = ConsoleCommandEvent::RETURN_CODE_DISABLED;
             }
-        } catch (\Exception $e) {
         } catch (\Throwable $e) {
-        }
-        if (null !== $e) {
-            if ($this->dispatcher->hasListeners(ConsoleEvents::EXCEPTION)) {
-                $x = $e instanceof \Exception ? $e : new FatalThrowableError($e);
-                $event = new ConsoleExceptionEvent($command, $input, $output, $x, $x->getCode());
-                $this->dispatcher->dispatch(ConsoleEvents::EXCEPTION, $event);
-
-                if ($x !== $event->getException()) {
-                    $e = $event->getException();
-                }
-            }
             $event = new ConsoleErrorEvent($input, $output, $e, $command);
             $this->dispatcher->dispatch(ConsoleEvents::ERROR, $event);
             $e = $event->getError();
@@ -1079,7 +1007,7 @@ class Application
         $parts = explode(':', $name);
         array_pop($parts);
 
-        return implode(':', null === $limit ? $parts : array_slice($parts, 0, $limit));
+        return implode(':', null === $limit ? $parts : \array_slice($parts, 0, $limit));
     }
 
     /**
@@ -1112,7 +1040,7 @@ class Application
                 }
 
                 $lev = levenshtein($subname, $parts[$i]);
-                if ($lev <= strlen($subname) / 3 || '' !== $subname && false !== strpos($parts[$i], $subname)) {
+                if ($lev <= \strlen($subname) / 3 || '' !== $subname && false !== strpos($parts[$i], $subname)) {
                     $alternatives[$collectionName] = $exists ? $alternatives[$collectionName] + $lev : $lev;
                 } elseif ($exists) {
                     $alternatives[$collectionName] += $threshold;
@@ -1122,7 +1050,7 @@ class Application
 
         foreach ($collection as $item) {
             $lev = levenshtein($name, $item);
-            if ($lev <= strlen($name) / 3 || false !== strpos($item, $name)) {
+            if ($lev <= \strlen($name) / 3 || false !== strpos($item, $name)) {
                 $alternatives[$item] = isset($alternatives[$item]) ? $alternatives[$item] - $lev : $lev;
             }
         }
@@ -1178,7 +1106,7 @@ class Application
             $line = $char;
         }
 
-        $lines[] = count($lines) ? str_pad($line, $width) : $line;
+        $lines[] = \count($lines) ? str_pad($line, $width) : $line;
 
         mb_convert_variables($encoding, 'utf8', $lines);
 
@@ -1199,7 +1127,7 @@ class Application
         $namespaces = array();
 
         foreach ($parts as $part) {
-            if (count($namespaces)) {
+            if (\count($namespaces)) {
                 $namespaces[] = end($namespaces).':'.$part;
             } else {
                 $namespaces[] = $part;
diff --git a/vendor/symfony/console/CHANGELOG.md b/vendor/symfony/console/CHANGELOG.md
index 946ff1e0..7682feb5 100644
--- a/vendor/symfony/console/CHANGELOG.md
+++ b/vendor/symfony/console/CHANGELOG.md
@@ -1,6 +1,23 @@
 CHANGELOG
 =========
 
+4.1.0
+-----
+
+ * added option to run suggested command if command is not found and only 1 alternative is available
+ * added option to modify console output and print multiple modifiable sections
+ * added support for iterable messages in output `write` and `writeln` methods
+
+4.0.0
+-----
+
+ * `OutputFormatter` throws an exception when unknown options are used
+ * removed `QuestionHelper::setInputStream()/getInputStream()`
+ * removed `Application::getTerminalWidth()/getTerminalHeight()` and 
+  `Application::setTerminalDimensions()/getTerminalDimensions()`
+* removed `ConsoleExceptionEvent`
+* removed `ConsoleEvents::EXCEPTION`
+
 3.4.0
 -----
 
diff --git a/vendor/symfony/console/Command/Command.php b/vendor/symfony/console/Command/Command.php
index 627da5ec..3bf2f3a5 100644
--- a/vendor/symfony/console/Command/Command.php
+++ b/vendor/symfony/console/Command/Command.php
@@ -11,16 +11,16 @@
 
 namespace Symfony\Component\Console\Command;
 
+use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Exception\ExceptionInterface;
-use Symfony\Component\Console\Input\InputDefinition;
-use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
+use Symfony\Component\Console\Exception\LogicException;
+use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Helper\HelperSet;
-use Symfony\Component\Console\Exception\InvalidArgumentException;
-use Symfony\Component\Console\Exception\LogicException;
 
 /**
  * Base class for all commands.
@@ -55,7 +55,7 @@ class Command
      */
     public static function getDefaultName()
     {
-        $class = get_called_class();
+        $class = \get_called_class();
         $r = new \ReflectionProperty($class, 'defaultName');
 
         return $class === $r->class ? static::$defaultName : null;
@@ -66,7 +66,7 @@ class Command
      *
      * @throws LogicException When the command name is empty
      */
-    public function __construct($name = null)
+    public function __construct(string $name = null)
     {
         $this->definition = new InputDefinition();
 
@@ -150,7 +150,7 @@ class Command
      * execute() method, you set the code to execute by passing
      * a Closure to the setCode() method.
      *
-     * @return null|int null or 0 if everything went fine, or an error code
+     * @return int|null null or 0 if everything went fine, or an error code
      *
      * @throws LogicException When this abstract method is not implemented
      *
@@ -173,10 +173,14 @@ class Command
     }
 
     /**
-     * Initializes the command just after the input has been validated.
+     * Initializes the command after the input has been bound and before the input
+     * is validated.
      *
      * This is mainly useful when a lot of commands extends one main command
      * where some things need to be initialized based on the input arguments and options.
+     *
+     * @see InputInterface::bind()
+     * @see InputInterface::validate()
      */
     protected function initialize(InputInterface $input, OutputInterface $output)
     {
@@ -217,15 +221,15 @@ class Command
         $this->initialize($input, $output);
 
         if (null !== $this->processTitle) {
-            if (function_exists('cli_set_process_title')) {
+            if (\function_exists('cli_set_process_title')) {
                 if (!@cli_set_process_title($this->processTitle)) {
                     if ('Darwin' === PHP_OS) {
-                        $output->writeln('<comment>Running "cli_get_process_title" as an unprivileged user is not supported on MacOS.</comment>');
+                        $output->writeln('<comment>Running "cli_set_process_title" as an unprivileged user is not supported on MacOS.</comment>', OutputInterface::VERBOSITY_VERY_VERBOSE);
                     } else {
                         cli_set_process_title($this->processTitle);
                     }
                 }
-            } elseif (function_exists('setproctitle')) {
+            } elseif (\function_exists('setproctitle')) {
                 setproctitle($this->processTitle);
             } elseif (OutputInterface::VERBOSITY_VERY_VERBOSE === $output->getVerbosity()) {
                 $output->writeln('<comment>Install the proctitle PECL to be able to change the process title.</comment>');
@@ -246,7 +250,7 @@ class Command
         $input->validate();
 
         if ($this->code) {
-            $statusCode = call_user_func($this->code, $input, $output);
+            $statusCode = \call_user_func($this->code, $input, $output);
         } else {
             $statusCode = $this->execute($input, $output);
         }
@@ -273,15 +277,7 @@ class Command
         if ($code instanceof \Closure) {
             $r = new \ReflectionFunction($code);
             if (null === $r->getClosureThis()) {
-                if (\PHP_VERSION_ID < 70000) {
-                    // Bug in PHP5: https://bugs.php.net/bug.php?id=64761
-                    // This means that we cannot bind static closures and therefore we must
-                    // ignore any errors here.  There is no way to test if the closure is
-                    // bindable.
-                    $code = @\Closure::bind($code, $this);
-                } else {
-                    $code = \Closure::bind($code, $this);
-                }
+                $code = \Closure::bind($code, $this);
             }
         }
 
@@ -550,7 +546,7 @@ class Command
      */
     public function setAliases($aliases)
     {
-        if (!is_array($aliases) && !$aliases instanceof \Traversable) {
+        if (!\is_array($aliases) && !$aliases instanceof \Traversable) {
             throw new InvalidArgumentException('$aliases must be an array or an instance of \Traversable');
         }
 
@@ -643,11 +639,9 @@ class Command
      *
      * It must be non-empty and parts can optionally be separated by ":".
      *
-     * @param string $name
-     *
      * @throws InvalidArgumentException When the name is invalid
      */
-    private function validateName($name)
+    private function validateName(string $name)
     {
         if (!preg_match('/^[^\:]++(\:[^\:]++)*$/', $name)) {
             throw new InvalidArgumentException(sprintf('Command name "%s" is invalid.', $name));
diff --git a/vendor/symfony/console/Command/HelpCommand.php b/vendor/symfony/console/Command/HelpCommand.php
index 112679b3..1e20b008 100644
--- a/vendor/symfony/console/Command/HelpCommand.php
+++ b/vendor/symfony/console/Command/HelpCommand.php
@@ -13,8 +13,8 @@ namespace Symfony\Component\Console\Command;
 
 use Symfony\Component\Console\Helper\DescriptorHelper;
 use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
diff --git a/vendor/symfony/console/Command/ListCommand.php b/vendor/symfony/console/Command/ListCommand.php
index 179ddea5..5d932338 100644
--- a/vendor/symfony/console/Command/ListCommand.php
+++ b/vendor/symfony/console/Command/ListCommand.php
@@ -13,10 +13,10 @@ namespace Symfony\Component\Console\Command;
 
 use Symfony\Component\Console\Helper\DescriptorHelper;
 use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputDefinition;
 
 /**
  * ListCommand displays the list of all available commands for the application.
diff --git a/vendor/symfony/console/Command/LockableTrait.php b/vendor/symfony/console/Command/LockableTrait.php
index 308ebf28..6c634ce4 100644
--- a/vendor/symfony/console/Command/LockableTrait.php
+++ b/vendor/symfony/console/Command/LockableTrait.php
@@ -43,7 +43,7 @@ trait LockableTrait
             throw new LogicException('A lock is already in place.');
         }
 
-        if (SemaphoreStore::isSupported($blocking)) {
+        if (SemaphoreStore::isSupported()) {
             $store = new SemaphoreStore();
         } else {
             $store = new FlockStore();
diff --git a/vendor/symfony/console/ConsoleEvents.php b/vendor/symfony/console/ConsoleEvents.php
index bf6cab9a..4975643a 100644
--- a/vendor/symfony/console/ConsoleEvents.php
+++ b/vendor/symfony/console/ConsoleEvents.php
@@ -35,19 +35,6 @@ final class ConsoleEvents
      */
     const TERMINATE = 'console.terminate';
 
-    /**
-     * The EXCEPTION event occurs when an uncaught exception appears
-     * while executing Command#run().
-     *
-     * This event allows you to deal with the exception or
-     * to modify the thrown exception.
-     *
-     * @Event("Symfony\Component\Console\Event\ConsoleExceptionEvent")
-     *
-     * @deprecated The console.exception event is deprecated since version 3.3 and will be removed in 4.0. Use the console.error event instead.
-     */
-    const EXCEPTION = 'console.exception';
-
     /**
      * The ERROR event occurs when an uncaught exception or error appears.
      *
diff --git a/vendor/symfony/console/DependencyInjection/AddConsoleCommandPass.php b/vendor/symfony/console/DependencyInjection/AddConsoleCommandPass.php
index 39d53ef8..bf14ba2d 100644
--- a/vendor/symfony/console/DependencyInjection/AddConsoleCommandPass.php
+++ b/vendor/symfony/console/DependencyInjection/AddConsoleCommandPass.php
@@ -29,7 +29,7 @@ class AddConsoleCommandPass implements CompilerPassInterface
     private $commandLoaderServiceId;
     private $commandTag;
 
-    public function __construct($commandLoaderServiceId = 'console.command_loader', $commandTag = 'console.command')
+    public function __construct(string $commandLoaderServiceId = 'console.command_loader', string $commandTag = 'console.command')
     {
         $this->commandLoaderServiceId = $commandLoaderServiceId;
         $this->commandTag = $commandTag;
@@ -41,14 +41,11 @@ class AddConsoleCommandPass implements CompilerPassInterface
         $lazyCommandMap = array();
         $lazyCommandRefs = array();
         $serviceIds = array();
-        $lazyServiceIds = array();
 
         foreach ($commandServices as $id => $tags) {
             $definition = $container->getDefinition($id);
             $class = $container->getParameterBag()->resolveValue($definition->getClass());
 
-            $commandId = 'console.command.'.strtolower(str_replace('\\', '_', $class));
-
             if (isset($tags[0]['command'])) {
                 $commandName = $tags[0]['command'];
             } else {
@@ -62,20 +59,16 @@ class AddConsoleCommandPass implements CompilerPassInterface
             }
 
             if (null === $commandName) {
-                if (isset($serviceIds[$commandId]) || $container->hasAlias($commandId)) {
-                    $commandId = $commandId.'_'.$id;
-                }
                 if (!$definition->isPublic() || $definition->isPrivate()) {
+                    $commandId = 'console.command.public_alias.'.$id;
                     $container->setAlias($commandId, $id)->setPublic(true);
                     $id = $commandId;
                 }
-                $serviceIds[$commandId] = $id;
+                $serviceIds[] = $id;
 
                 continue;
             }
 
-            $serviceIds[$commandId] = $id;
-            $lazyServiceIds[$id] = true;
             unset($tags[0]);
             $lazyCommandMap[$commandName] = $id;
             $lazyCommandRefs[$id] = new TypedReference($id, $class);
@@ -101,6 +94,5 @@ class AddConsoleCommandPass implements CompilerPassInterface
             ->setArguments(array(ServiceLocatorTagPass::register($container, $lazyCommandRefs), $lazyCommandMap));
 
         $container->setParameter('console.command.ids', $serviceIds);
-        $container->setParameter('console.lazy_command.ids', $lazyServiceIds);
     }
 }
diff --git a/vendor/symfony/console/Descriptor/ApplicationDescription.php b/vendor/symfony/console/Descriptor/ApplicationDescription.php
index ef4c673b..5d347786 100644
--- a/vendor/symfony/console/Descriptor/ApplicationDescription.php
+++ b/vendor/symfony/console/Descriptor/ApplicationDescription.php
@@ -43,12 +43,7 @@ class ApplicationDescription
      */
     private $aliases;
 
-    /**
-     * @param Application $application
-     * @param string|null $namespace
-     * @param bool        $showHidden
-     */
-    public function __construct(Application $application, $namespace = null, $showHidden = false)
+    public function __construct(Application $application, string $namespace = null, bool $showHidden = false)
     {
         $this->application = $application;
         $this->namespace = $namespace;
@@ -123,10 +118,7 @@ class ApplicationDescription
         }
     }
 
-    /**
-     * @return array
-     */
-    private function sortCommands(array $commands)
+    private function sortCommands(array $commands): array
     {
         $namespacedCommands = array();
         $globalCommands = array();
diff --git a/vendor/symfony/console/Descriptor/Descriptor.php b/vendor/symfony/console/Descriptor/Descriptor.php
index fe169cb4..151d84f7 100644
--- a/vendor/symfony/console/Descriptor/Descriptor.php
+++ b/vendor/symfony/console/Descriptor/Descriptor.php
@@ -13,11 +13,11 @@ namespace Symfony\Component\Console\Descriptor;
 
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Exception\InvalidArgumentException;
 
 /**
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
@@ -55,7 +55,7 @@ abstract class Descriptor implements DescriptorInterface
                 $this->describeApplication($object, $options);
                 break;
             default:
-                throw new InvalidArgumentException(sprintf('Object of type "%s" is not describable.', get_class($object)));
+                throw new InvalidArgumentException(sprintf('Object of type "%s" is not describable.', \get_class($object)));
         }
     }
 
diff --git a/vendor/symfony/console/Descriptor/MarkdownDescriptor.php b/vendor/symfony/console/Descriptor/MarkdownDescriptor.php
index d52ba553..6d8399f9 100644
--- a/vendor/symfony/console/Descriptor/MarkdownDescriptor.php
+++ b/vendor/symfony/console/Descriptor/MarkdownDescriptor.php
@@ -88,7 +88,7 @@ class MarkdownDescriptor extends Descriptor
      */
     protected function describeInputDefinition(InputDefinition $definition, array $options = array())
     {
-        if ($showArguments = count($definition->getArguments()) > 0) {
+        if ($showArguments = \count($definition->getArguments()) > 0) {
             $this->write('### Arguments');
             foreach ($definition->getArguments() as $argument) {
                 $this->write("\n\n");
@@ -96,7 +96,7 @@ class MarkdownDescriptor extends Descriptor
             }
         }
 
-        if (count($definition->getOptions()) > 0) {
+        if (\count($definition->getOptions()) > 0) {
             if ($showArguments) {
                 $this->write("\n\n");
             }
diff --git a/vendor/symfony/console/Descriptor/TextDescriptor.php b/vendor/symfony/console/Descriptor/TextDescriptor.php
index a79df7e2..9361b109 100644
--- a/vendor/symfony/console/Descriptor/TextDescriptor.php
+++ b/vendor/symfony/console/Descriptor/TextDescriptor.php
@@ -33,14 +33,14 @@ class TextDescriptor extends Descriptor
      */
     protected function describeInputArgument(InputArgument $argument, array $options = array())
     {
-        if (null !== $argument->getDefault() && (!is_array($argument->getDefault()) || count($argument->getDefault()))) {
+        if (null !== $argument->getDefault() && (!\is_array($argument->getDefault()) || \count($argument->getDefault()))) {
             $default = sprintf('<comment> [default: %s]</comment>', $this->formatDefaultValue($argument->getDefault()));
         } else {
             $default = '';
         }
 
         $totalWidth = isset($options['total_width']) ? $options['total_width'] : Helper::strlen($argument->getName());
-        $spacingWidth = $totalWidth - strlen($argument->getName());
+        $spacingWidth = $totalWidth - \strlen($argument->getName());
 
         $this->writeText(sprintf('  <info>%s</info>  %s%s%s',
             $argument->getName(),
@@ -56,7 +56,7 @@ class TextDescriptor extends Descriptor
      */
     protected function describeInputOption(InputOption $option, array $options = array())
     {
-        if ($option->acceptValue() && null !== $option->getDefault() && (!is_array($option->getDefault()) || count($option->getDefault()))) {
+        if ($option->acceptValue() && null !== $option->getDefault() && (!\is_array($option->getDefault()) || \count($option->getDefault()))) {
             $default = sprintf('<comment> [default: %s]</comment>', $this->formatDefaultValue($option->getDefault()));
         } else {
             $default = '';
@@ -117,7 +117,7 @@ class TextDescriptor extends Descriptor
 
             $this->writeText('<comment>Options:</comment>', $options);
             foreach ($definition->getOptions() as $option) {
-                if (strlen($option->getShortcut()) > 1) {
+                if (\strlen($option->getShortcut()) > 1) {
                     $laterOptions[] = $option;
                     continue;
                 }
@@ -140,6 +140,13 @@ class TextDescriptor extends Descriptor
         $command->getSynopsis(false);
         $command->mergeApplicationDefinition(false);
 
+        if ($description = $command->getDescription()) {
+            $this->writeText('<comment>Description:</comment>', $options);
+            $this->writeText("\n");
+            $this->writeText('  '.$description);
+            $this->writeText("\n\n");
+        }
+
         $this->writeText('<comment>Usage:</comment>', $options);
         foreach (array_merge(array($command->getSynopsis(true)), $command->getAliases(), $command->getUsages()) as $usage) {
             $this->writeText("\n");
@@ -154,7 +161,8 @@ class TextDescriptor extends Descriptor
             $this->writeText("\n");
         }
 
-        if ($help = $command->getProcessedHelp()) {
+        $help = $command->getProcessedHelp();
+        if ($help && $help !== $description) {
             $this->writeText("\n");
             $this->writeText('<comment>Help:</comment>', $options);
             $this->writeText("\n");
@@ -202,9 +210,9 @@ class TextDescriptor extends Descriptor
             }
 
             // calculate max. width based on available commands per namespace
-            $width = $this->getColumnWidth(call_user_func_array('array_merge', array_map(function ($namespace) use ($commands) {
+            $width = $this->getColumnWidth(array_merge(...array_values(array_map(function ($namespace) use ($commands) {
                 return array_intersect($namespace['commands'], array_keys($commands));
-            }, $namespaces)));
+            }, $namespaces))));
 
             if ($describedNamespace) {
                 $this->writeText(sprintf('<comment>Available commands for the "%s" namespace:</comment>', $describedNamespace), $options);
@@ -252,10 +260,8 @@ class TextDescriptor extends Descriptor
 
     /**
      * Formats command aliases to show them in the command description.
-     *
-     * @return string
      */
-    private function getCommandAliasesText(Command $command)
+    private function getCommandAliasesText(Command $command): string
     {
         $text = '';
         $aliases = $command->getAliases();
@@ -271,20 +277,18 @@ class TextDescriptor extends Descriptor
      * Formats input option/argument default value.
      *
      * @param mixed $default
-     *
-     * @return string
      */
-    private function formatDefaultValue($default)
+    private function formatDefaultValue($default): string
     {
         if (INF === $default) {
             return 'INF';
         }
 
-        if (is_string($default)) {
+        if (\is_string($default)) {
             $default = OutputFormatter::escape($default);
-        } elseif (is_array($default)) {
+        } elseif (\is_array($default)) {
             foreach ($default as $key => $value) {
-                if (is_string($value)) {
+                if (\is_string($value)) {
                     $default[$key] = OutputFormatter::escape($value);
                 }
             }
@@ -295,10 +299,8 @@ class TextDescriptor extends Descriptor
 
     /**
      * @param (Command|string)[] $commands
-     *
-     * @return int
      */
-    private function getColumnWidth(array $commands)
+    private function getColumnWidth(array $commands): int
     {
         $widths = array();
 
@@ -318,10 +320,8 @@ class TextDescriptor extends Descriptor
 
     /**
      * @param InputOption[] $options
-     *
-     * @return int
      */
-    private function calculateTotalWidthForOptions(array $options)
+    private function calculateTotalWidthForOptions(array $options): int
     {
         $totalWidth = 0;
         foreach ($options as $option) {
diff --git a/vendor/symfony/console/Descriptor/XmlDescriptor.php b/vendor/symfony/console/Descriptor/XmlDescriptor.php
index 1a105352..d0c6abdd 100644
--- a/vendor/symfony/console/Descriptor/XmlDescriptor.php
+++ b/vendor/symfony/console/Descriptor/XmlDescriptor.php
@@ -188,10 +188,7 @@ class XmlDescriptor extends Descriptor
         $this->write($dom->saveXML());
     }
 
-    /**
-     * @return \DOMDocument
-     */
-    private function getInputArgumentDocument(InputArgument $argument)
+    private function getInputArgumentDocument(InputArgument $argument): \DOMDocument
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
 
@@ -203,7 +200,7 @@ class XmlDescriptor extends Descriptor
         $descriptionXML->appendChild($dom->createTextNode($argument->getDescription()));
 
         $objectXML->appendChild($defaultsXML = $dom->createElement('defaults'));
-        $defaults = is_array($argument->getDefault()) ? $argument->getDefault() : (is_bool($argument->getDefault()) ? array(var_export($argument->getDefault(), true)) : ($argument->getDefault() ? array($argument->getDefault()) : array()));
+        $defaults = \is_array($argument->getDefault()) ? $argument->getDefault() : (\is_bool($argument->getDefault()) ? array(var_export($argument->getDefault(), true)) : ($argument->getDefault() ? array($argument->getDefault()) : array()));
         foreach ($defaults as $default) {
             $defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
             $defaultXML->appendChild($dom->createTextNode($default));
@@ -212,10 +209,7 @@ class XmlDescriptor extends Descriptor
         return $dom;
     }
 
-    /**
-     * @return \DOMDocument
-     */
-    private function getInputOptionDocument(InputOption $option)
+    private function getInputOptionDocument(InputOption $option): \DOMDocument
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
 
@@ -235,7 +229,7 @@ class XmlDescriptor extends Descriptor
         $descriptionXML->appendChild($dom->createTextNode($option->getDescription()));
 
         if ($option->acceptValue()) {
-            $defaults = is_array($option->getDefault()) ? $option->getDefault() : (is_bool($option->getDefault()) ? array(var_export($option->getDefault(), true)) : ($option->getDefault() ? array($option->getDefault()) : array()));
+            $defaults = \is_array($option->getDefault()) ? $option->getDefault() : (\is_bool($option->getDefault()) ? array(var_export($option->getDefault(), true)) : ($option->getDefault() ? array($option->getDefault()) : array()));
             $objectXML->appendChild($defaultsXML = $dom->createElement('defaults'));
 
             if (!empty($defaults)) {
diff --git a/vendor/symfony/console/Event/ConsoleErrorEvent.php b/vendor/symfony/console/Event/ConsoleErrorEvent.php
index 0d05b9da..25d9b881 100644
--- a/vendor/symfony/console/Event/ConsoleErrorEvent.php
+++ b/vendor/symfony/console/Event/ConsoleErrorEvent.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Console\Event;
 
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -26,58 +25,34 @@ final class ConsoleErrorEvent extends ConsoleEvent
     private $error;
     private $exitCode;
 
-    public function __construct(InputInterface $input, OutputInterface $output, $error, Command $command = null)
+    public function __construct(InputInterface $input, OutputInterface $output, \Throwable $error, Command $command = null)
     {
         parent::__construct($command, $input, $output);
 
-        $this->setError($error);
+        $this->error = $error;
     }
 
-    /**
-     * Returns the thrown error/exception.
-     *
-     * @return \Throwable
-     */
-    public function getError()
+    public function getError(): \Throwable
     {
         return $this->error;
     }
 
-    /**
-     * Replaces the thrown error/exception.
-     *
-     * @param \Throwable $error
-     */
-    public function setError($error)
+    public function setError(\Throwable $error): void
     {
-        if (!$error instanceof \Throwable && !$error instanceof \Exception) {
-            throw new InvalidArgumentException(sprintf('The error passed to ConsoleErrorEvent must be an instance of \Throwable or \Exception, "%s" was passed instead.', is_object($error) ? get_class($error) : gettype($error)));
-        }
-
         $this->error = $error;
     }
 
-    /**
-     * Sets the exit code.
-     *
-     * @param int $exitCode The command exit code
-     */
-    public function setExitCode($exitCode)
+    public function setExitCode(int $exitCode): void
     {
-        $this->exitCode = (int) $exitCode;
+        $this->exitCode = $exitCode;
 
         $r = new \ReflectionProperty($this->error, 'code');
         $r->setAccessible(true);
         $r->setValue($this->error, $this->exitCode);
     }
 
-    /**
-     * Gets the exit code.
-     *
-     * @return int The command exit code
-     */
-    public function getExitCode()
+    public function getExitCode(): int
     {
-        return null !== $this->exitCode ? $this->exitCode : (is_int($this->error->getCode()) && 0 !== $this->error->getCode() ? $this->error->getCode() : 1);
+        return null !== $this->exitCode ? $this->exitCode : (\is_int($this->error->getCode()) && 0 !== $this->error->getCode() ? $this->error->getCode() : 1);
     }
 }
diff --git a/vendor/symfony/console/Event/ConsoleExceptionEvent.php b/vendor/symfony/console/Event/ConsoleExceptionEvent.php
deleted file mode 100644
index 0adfaf9a..00000000
--- a/vendor/symfony/console/Event/ConsoleExceptionEvent.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Event;
-
-@trigger_error(sprintf('The "%s" class is deprecated since Symfony 3.3 and will be removed in 4.0. Use the ConsoleErrorEvent instead.', ConsoleExceptionEvent::class), E_USER_DEPRECATED);
-
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-
-/**
- * Allows to handle exception thrown in a command.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since version 3.3, to be removed in 4.0. Use ConsoleErrorEvent instead.
- */
-class ConsoleExceptionEvent extends ConsoleEvent
-{
-    private $exception;
-    private $exitCode;
-
-    public function __construct(Command $command, InputInterface $input, OutputInterface $output, \Exception $exception, $exitCode)
-    {
-        parent::__construct($command, $input, $output);
-
-        $this->setException($exception);
-        $this->exitCode = (int) $exitCode;
-    }
-
-    /**
-     * Returns the thrown exception.
-     *
-     * @return \Exception The thrown exception
-     */
-    public function getException()
-    {
-        return $this->exception;
-    }
-
-    /**
-     * Replaces the thrown exception.
-     *
-     * This exception will be thrown if no response is set in the event.
-     *
-     * @param \Exception $exception The thrown exception
-     */
-    public function setException(\Exception $exception)
-    {
-        $this->exception = $exception;
-    }
-
-    /**
-     * Gets the exit code.
-     *
-     * @return int The command exit code
-     */
-    public function getExitCode()
-    {
-        return $this->exitCode;
-    }
-}
diff --git a/vendor/symfony/console/Event/ConsoleTerminateEvent.php b/vendor/symfony/console/Event/ConsoleTerminateEvent.php
index b6a5d7c0..ff0c749d 100644
--- a/vendor/symfony/console/Event/ConsoleTerminateEvent.php
+++ b/vendor/symfony/console/Event/ConsoleTerminateEvent.php
@@ -22,14 +22,9 @@ use Symfony\Component\Console\Output\OutputInterface;
  */
 class ConsoleTerminateEvent extends ConsoleEvent
 {
-    /**
-     * The exit code of the command.
-     *
-     * @var int
-     */
     private $exitCode;
 
-    public function __construct(Command $command, InputInterface $input, OutputInterface $output, $exitCode)
+    public function __construct(Command $command, InputInterface $input, OutputInterface $output, int $exitCode)
     {
         parent::__construct($command, $input, $output);
 
diff --git a/vendor/symfony/console/Exception/CommandNotFoundException.php b/vendor/symfony/console/Exception/CommandNotFoundException.php
index cb7d1131..2f6e644b 100644
--- a/vendor/symfony/console/Exception/CommandNotFoundException.php
+++ b/vendor/symfony/console/Exception/CommandNotFoundException.php
@@ -26,7 +26,7 @@ class CommandNotFoundException extends \InvalidArgumentException implements Exce
      * @param int        $code         Exception code
      * @param \Exception $previous     Previous exception used for the exception chaining
      */
-    public function __construct($message, array $alternatives = array(), $code = 0, \Exception $previous = null)
+    public function __construct(string $message, array $alternatives = array(), int $code = 0, \Exception $previous = null)
     {
         parent::__construct($message, $code, $previous);
 
diff --git a/vendor/symfony/console/Exception/NamespaceNotFoundException.php b/vendor/symfony/console/Exception/NamespaceNotFoundException.php
new file mode 100644
index 00000000..dd16e450
--- /dev/null
+++ b/vendor/symfony/console/Exception/NamespaceNotFoundException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Exception;
+
+/**
+ * Represents an incorrect namespace typed in the console.
+ *
+ * @author Pierre du Plessis <pdples@gmail.com>
+ */
+class NamespaceNotFoundException extends CommandNotFoundException
+{
+}
diff --git a/vendor/symfony/console/Formatter/OutputFormatter.php b/vendor/symfony/console/Formatter/OutputFormatter.php
index 6ece9e90..eebac82e 100644
--- a/vendor/symfony/console/Formatter/OutputFormatter.php
+++ b/vendor/symfony/console/Formatter/OutputFormatter.php
@@ -50,10 +50,10 @@ class OutputFormatter implements OutputFormatterInterface
     public static function escapeTrailingBackslash($text)
     {
         if ('\\' === substr($text, -1)) {
-            $len = strlen($text);
+            $len = \strlen($text);
             $text = rtrim($text, '\\');
             $text = str_replace("\0", '', $text);
-            $text .= str_repeat("\0", $len - strlen($text));
+            $text .= str_repeat("\0", $len - \strlen($text));
         }
 
         return $text;
@@ -65,9 +65,9 @@ class OutputFormatter implements OutputFormatterInterface
      * @param bool                            $decorated Whether this formatter should actually decorate strings
      * @param OutputFormatterStyleInterface[] $styles    Array of "name => FormatterStyle" instances
      */
-    public function __construct($decorated = false, array $styles = array())
+    public function __construct(bool $decorated = false, array $styles = array())
     {
-        $this->decorated = (bool) $decorated;
+        $this->decorated = $decorated;
 
         $this->setStyle('error', new OutputFormatterStyle('white', 'red'));
         $this->setStyle('info', new OutputFormatterStyle('green'));
@@ -145,7 +145,7 @@ class OutputFormatter implements OutputFormatterInterface
 
             // add the text up to the next tag
             $output .= $this->applyCurrentStyle(substr($message, $offset, $pos - $offset));
-            $offset = $pos + strlen($text);
+            $offset = $pos + \strlen($text);
 
             // opening tag?
             if ($open = '/' != $text[1]) {
@@ -186,11 +186,9 @@ class OutputFormatter implements OutputFormatterInterface
     /**
      * Tries to create new style instance from string.
      *
-     * @param string $string
-     *
-     * @return OutputFormatterStyle|false false if string is not format string
+     * @return OutputFormatterStyle|false False if string is not format string
      */
-    private function createStyleFromString($string)
+    private function createStyleFromString(string $string)
     {
         if (isset($this->styles[$string])) {
             return $this->styles[$string];
@@ -212,13 +210,7 @@ class OutputFormatter implements OutputFormatterInterface
                 preg_match_all('([^,;]+)', $match[1], $options);
                 $options = array_shift($options);
                 foreach ($options as $option) {
-                    try {
-                        $style->setOption($option);
-                    } catch (\InvalidArgumentException $e) {
-                        @trigger_error(sprintf('Unknown style options are deprecated since Symfony 3.2 and will be removed in 4.0. Exception "%s".', $e->getMessage()), E_USER_DEPRECATED);
-
-                        return false;
-                    }
+                    $style->setOption($option);
                 }
             } else {
                 return false;
@@ -230,13 +222,9 @@ class OutputFormatter implements OutputFormatterInterface
 
     /**
      * Applies current style from stack to text, if must be applied.
-     *
-     * @param string $text Input text
-     *
-     * @return string Styled text
      */
-    private function applyCurrentStyle($text)
+    private function applyCurrentStyle(string $text): string
     {
-        return $this->isDecorated() && strlen($text) > 0 ? $this->styleStack->getCurrent()->apply($text) : $text;
+        return $this->isDecorated() && \strlen($text) > 0 ? $this->styleStack->getCurrent()->apply($text) : $text;
     }
 }
diff --git a/vendor/symfony/console/Formatter/OutputFormatterStyle.php b/vendor/symfony/console/Formatter/OutputFormatterStyle.php
index 7ada54f4..906021f6 100644
--- a/vendor/symfony/console/Formatter/OutputFormatterStyle.php
+++ b/vendor/symfony/console/Formatter/OutputFormatterStyle.php
@@ -61,7 +61,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
      * @param string|null $background The style background color name
      * @param array       $options    The style options
      */
-    public function __construct($foreground = null, $background = null, array $options = array())
+    public function __construct(string $foreground = null, string $background = null, array $options = array())
     {
         if (null !== $foreground) {
             $this->setForeground($foreground);
@@ -69,7 +69,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
         if (null !== $background) {
             $this->setBackground($background);
         }
-        if (count($options)) {
+        if (\count($options)) {
             $this->setOptions($options);
         }
     }
@@ -90,11 +90,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
         }
 
         if (!isset(static::$availableForegroundColors[$color])) {
-            throw new InvalidArgumentException(sprintf(
-                'Invalid foreground color specified: "%s". Expected one of (%s)',
-                $color,
-                implode(', ', array_keys(static::$availableForegroundColors))
-            ));
+            throw new InvalidArgumentException(sprintf('Invalid foreground color specified: "%s". Expected one of (%s)', $color, implode(', ', array_keys(static::$availableForegroundColors))));
         }
 
         $this->foreground = static::$availableForegroundColors[$color];
@@ -116,11 +112,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
         }
 
         if (!isset(static::$availableBackgroundColors[$color])) {
-            throw new InvalidArgumentException(sprintf(
-                'Invalid background color specified: "%s". Expected one of (%s)',
-                $color,
-                implode(', ', array_keys(static::$availableBackgroundColors))
-            ));
+            throw new InvalidArgumentException(sprintf('Invalid background color specified: "%s". Expected one of (%s)', $color, implode(', ', array_keys(static::$availableBackgroundColors))));
         }
 
         $this->background = static::$availableBackgroundColors[$color];
@@ -136,14 +128,10 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
     public function setOption($option)
     {
         if (!isset(static::$availableOptions[$option])) {
-            throw new InvalidArgumentException(sprintf(
-                'Invalid option specified: "%s". Expected one of (%s)',
-                $option,
-                implode(', ', array_keys(static::$availableOptions))
-            ));
+            throw new InvalidArgumentException(sprintf('Invalid option specified: "%s". Expected one of (%s)', $option, implode(', ', array_keys(static::$availableOptions))));
         }
 
-        if (!in_array(static::$availableOptions[$option], $this->options)) {
+        if (!\in_array(static::$availableOptions[$option], $this->options)) {
             $this->options[] = static::$availableOptions[$option];
         }
     }
@@ -158,11 +146,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
     public function unsetOption($option)
     {
         if (!isset(static::$availableOptions[$option])) {
-            throw new InvalidArgumentException(sprintf(
-                'Invalid option specified: "%s". Expected one of (%s)',
-                $option,
-                implode(', ', array_keys(static::$availableOptions))
-            ));
+            throw new InvalidArgumentException(sprintf('Invalid option specified: "%s". Expected one of (%s)', $option, implode(', ', array_keys(static::$availableOptions))));
         }
 
         $pos = array_search(static::$availableOptions[$option], $this->options);
@@ -203,14 +187,14 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
             $setCodes[] = $this->background['set'];
             $unsetCodes[] = $this->background['unset'];
         }
-        if (count($this->options)) {
+        if (\count($this->options)) {
             foreach ($this->options as $option) {
                 $setCodes[] = $option['set'];
                 $unsetCodes[] = $option['unset'];
             }
         }
 
-        if (0 === count($setCodes)) {
+        if (0 === \count($setCodes)) {
             return $text;
         }
 
diff --git a/vendor/symfony/console/Formatter/OutputFormatterStyleStack.php b/vendor/symfony/console/Formatter/OutputFormatterStyleStack.php
index bf0beb70..9e7283c2 100644
--- a/vendor/symfony/console/Formatter/OutputFormatterStyleStack.php
+++ b/vendor/symfony/console/Formatter/OutputFormatterStyleStack.php
@@ -66,7 +66,7 @@ class OutputFormatterStyleStack
 
         foreach (array_reverse($this->styles, true) as $index => $stackedStyle) {
             if ($style->apply('') === $stackedStyle->apply('')) {
-                $this->styles = array_slice($this->styles, 0, $index);
+                $this->styles = \array_slice($this->styles, 0, $index);
 
                 return $stackedStyle;
             }
@@ -86,7 +86,7 @@ class OutputFormatterStyleStack
             return $this->emptyStyle;
         }
 
-        return $this->styles[count($this->styles) - 1];
+        return $this->styles[\count($this->styles) - 1];
     }
 
     /**
diff --git a/vendor/symfony/console/Helper/DebugFormatterHelper.php b/vendor/symfony/console/Helper/DebugFormatterHelper.php
index 1119b795..f5393ede 100644
--- a/vendor/symfony/console/Helper/DebugFormatterHelper.php
+++ b/vendor/symfony/console/Helper/DebugFormatterHelper.php
@@ -35,7 +35,7 @@ class DebugFormatterHelper extends Helper
      */
     public function start($id, $message, $prefix = 'RUN')
     {
-        $this->started[$id] = array('border' => ++$this->count % count($this->colors));
+        $this->started[$id] = array('border' => ++$this->count % \count($this->colors));
 
         return sprintf("%s<bg=blue;fg=white> %s </> <fg=blue>%s</>\n", $this->getBorder($id), $prefix, $message);
     }
diff --git a/vendor/symfony/console/Helper/DescriptorHelper.php b/vendor/symfony/console/Helper/DescriptorHelper.php
index 6f5c8183..54d3b1af 100644
--- a/vendor/symfony/console/Helper/DescriptorHelper.php
+++ b/vendor/symfony/console/Helper/DescriptorHelper.php
@@ -16,8 +16,8 @@ use Symfony\Component\Console\Descriptor\JsonDescriptor;
 use Symfony\Component\Console\Descriptor\MarkdownDescriptor;
 use Symfony\Component\Console\Descriptor\TextDescriptor;
 use Symfony\Component\Console\Descriptor\XmlDescriptor;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Exception\InvalidArgumentException;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * This class adds helper method to describe objects in various formats.
diff --git a/vendor/symfony/console/Helper/FormatterHelper.php b/vendor/symfony/console/Helper/FormatterHelper.php
index 6a48a77f..79ab2849 100644
--- a/vendor/symfony/console/Helper/FormatterHelper.php
+++ b/vendor/symfony/console/Helper/FormatterHelper.php
@@ -45,7 +45,7 @@ class FormatterHelper extends Helper
      */
     public function formatBlock($messages, $style, $large = false)
     {
-        if (!is_array($messages)) {
+        if (!\is_array($messages)) {
             $messages = array($messages);
         }
 
diff --git a/vendor/symfony/console/Helper/Helper.php b/vendor/symfony/console/Helper/Helper.php
index 0954bad6..50901855 100644
--- a/vendor/symfony/console/Helper/Helper.php
+++ b/vendor/symfony/console/Helper/Helper.php
@@ -48,7 +48,7 @@ abstract class Helper implements HelperInterface
     public static function strlen($string)
     {
         if (false === $encoding = mb_detect_encoding($string, null, true)) {
-            return strlen($string);
+            return \strlen($string);
         }
 
         return mb_strwidth($string, $encoding);
@@ -89,9 +89,9 @@ abstract class Helper implements HelperInterface
         foreach ($timeFormats as $index => $format) {
             if ($secs >= $format[0]) {
                 if ((isset($timeFormats[$index + 1]) && $secs < $timeFormats[$index + 1][0])
-                    || $index == count($timeFormats) - 1
+                    || $index == \count($timeFormats) - 1
                 ) {
-                    if (2 == count($format)) {
+                    if (2 == \count($format)) {
                         return $format[1];
                     }
 
diff --git a/vendor/symfony/console/Helper/HelperSet.php b/vendor/symfony/console/Helper/HelperSet.php
index 24ce18fb..4c44b05f 100644
--- a/vendor/symfony/console/Helper/HelperSet.php
+++ b/vendor/symfony/console/Helper/HelperSet.php
@@ -33,7 +33,7 @@ class HelperSet implements \IteratorAggregate
     public function __construct(array $helpers = array())
     {
         foreach ($helpers as $alias => $helper) {
-            $this->set($helper, is_int($alias) ? null : $alias);
+            $this->set($helper, \is_int($alias) ? null : $alias);
         }
     }
 
diff --git a/vendor/symfony/console/Helper/InputAwareHelper.php b/vendor/symfony/console/Helper/InputAwareHelper.php
index 42617674..0d0dba23 100644
--- a/vendor/symfony/console/Helper/InputAwareHelper.php
+++ b/vendor/symfony/console/Helper/InputAwareHelper.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Console\Helper;
 
-use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputAwareInterface;
+use Symfony\Component\Console\Input\InputInterface;
 
 /**
  * An implementation of InputAwareInterface for Helpers.
diff --git a/vendor/symfony/console/Helper/ProcessHelper.php b/vendor/symfony/console/Helper/ProcessHelper.php
index 82935bae..666f114a 100644
--- a/vendor/symfony/console/Helper/ProcessHelper.php
+++ b/vendor/symfony/console/Helper/ProcessHelper.php
@@ -121,7 +121,7 @@ class ProcessHelper extends Helper
             $output->write($formatter->progress(spl_object_hash($process), $this->escapeString($buffer), Process::ERR === $type));
 
             if (null !== $callback) {
-                call_user_func($callback, $type, $buffer);
+                \call_user_func($callback, $type, $buffer);
             }
         };
     }
diff --git a/vendor/symfony/console/Helper/ProgressBar.php b/vendor/symfony/console/Helper/ProgressBar.php
index 247b5913..38452b06 100644
--- a/vendor/symfony/console/Helper/ProgressBar.php
+++ b/vendor/symfony/console/Helper/ProgressBar.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Console\Helper;
 
+use Symfony\Component\Console\Exception\LogicException;
 use Symfony\Component\Console\Output\ConsoleOutputInterface;
+use Symfony\Component\Console\Output\ConsoleSectionOutput;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Exception\LogicException;
 use Symfony\Component\Console\Terminal;
 
 /**
@@ -50,7 +51,7 @@ final class ProgressBar
      * @param OutputInterface $output An OutputInterface instance
      * @param int             $max    Maximum steps (0 if unknown)
      */
-    public function __construct(OutputInterface $output, $max = 0)
+    public function __construct(OutputInterface $output, int $max = 0)
     {
         if ($output instanceof ConsoleOutputInterface) {
             $output = $output->getErrorOutput();
@@ -79,7 +80,7 @@ final class ProgressBar
      * @param string   $name     The placeholder name (including the delimiter char like %)
      * @param callable $callable A PHP callable
      */
-    public static function setPlaceholderFormatterDefinition($name, callable $callable)
+    public static function setPlaceholderFormatterDefinition(string $name, callable $callable): void
     {
         if (!self::$formatters) {
             self::$formatters = self::initPlaceholderFormatters();
@@ -95,7 +96,7 @@ final class ProgressBar
      *
      * @return callable|null A PHP callable
      */
-    public static function getPlaceholderFormatterDefinition($name)
+    public static function getPlaceholderFormatterDefinition(string $name): ?callable
     {
         if (!self::$formatters) {
             self::$formatters = self::initPlaceholderFormatters();
@@ -112,7 +113,7 @@ final class ProgressBar
      * @param string $name   The format name
      * @param string $format A format string
      */
-    public static function setFormatDefinition($name, $format)
+    public static function setFormatDefinition(string $name, string $format): void
     {
         if (!self::$formats) {
             self::$formats = self::initFormats();
@@ -128,7 +129,7 @@ final class ProgressBar
      *
      * @return string|null A format string
      */
-    public static function getFormatDefinition($name)
+    public static function getFormatDefinition(string $name): ?string
     {
         if (!self::$formats) {
             self::$formats = self::initFormats();
@@ -147,102 +148,57 @@ final class ProgressBar
      * @param string $message The text to associate with the placeholder
      * @param string $name    The name of the placeholder
      */
-    public function setMessage($message, $name = 'message')
+    public function setMessage(string $message, string $name = 'message')
     {
         $this->messages[$name] = $message;
     }
 
-    public function getMessage($name = 'message')
+    public function getMessage(string $name = 'message')
     {
         return $this->messages[$name];
     }
 
-    /**
-     * Gets the progress bar start time.
-     *
-     * @return int The progress bar start time
-     */
-    public function getStartTime()
+    public function getStartTime(): int
     {
         return $this->startTime;
     }
 
-    /**
-     * Gets the progress bar maximal steps.
-     *
-     * @return int The progress bar max steps
-     */
-    public function getMaxSteps()
+    public function getMaxSteps(): int
     {
         return $this->max;
     }
 
-    /**
-     * Gets the current step position.
-     *
-     * @return int The progress bar step
-     */
-    public function getProgress()
+    public function getProgress(): int
     {
         return $this->step;
     }
 
-    /**
-     * Gets the progress bar step width.
-     *
-     * @return int The progress bar step width
-     */
-    private function getStepWidth()
+    private function getStepWidth(): int
     {
         return $this->stepWidth;
     }
 
-    /**
-     * Gets the current progress bar percent.
-     *
-     * @return float The current progress bar percent
-     */
-    public function getProgressPercent()
+    public function getProgressPercent(): float
     {
         return $this->percent;
     }
 
-    /**
-     * Sets the progress bar width.
-     *
-     * @param int $size The progress bar size
-     */
-    public function setBarWidth($size)
+    public function setBarWidth(int $size)
     {
-        $this->barWidth = max(1, (int) $size);
+        $this->barWidth = max(1, $size);
     }
 
-    /**
-     * Gets the progress bar width.
-     *
-     * @return int The progress bar size
-     */
-    public function getBarWidth()
+    public function getBarWidth(): int
     {
         return $this->barWidth;
     }
 
-    /**
-     * Sets the bar character.
-     *
-     * @param string $char A character
-     */
-    public function setBarCharacter($char)
+    public function setBarCharacter(string $char)
     {
         $this->barChar = $char;
     }
 
-    /**
-     * Gets the bar character.
-     *
-     * @return string A character
-     */
-    public function getBarCharacter()
+    public function getBarCharacter(): string
     {
         if (null === $this->barChar) {
             return $this->max ? '=' : $this->emptyBarChar;
@@ -251,52 +207,27 @@ final class ProgressBar
         return $this->barChar;
     }
 
-    /**
-     * Sets the empty bar character.
-     *
-     * @param string $char A character
-     */
-    public function setEmptyBarCharacter($char)
+    public function setEmptyBarCharacter(string $char)
     {
         $this->emptyBarChar = $char;
     }
 
-    /**
-     * Gets the empty bar character.
-     *
-     * @return string A character
-     */
-    public function getEmptyBarCharacter()
+    public function getEmptyBarCharacter(): string
     {
         return $this->emptyBarChar;
     }
 
-    /**
-     * Sets the progress bar character.
-     *
-     * @param string $char A character
-     */
-    public function setProgressCharacter($char)
+    public function setProgressCharacter(string $char)
     {
         $this->progressChar = $char;
     }
 
-    /**
-     * Gets the progress bar character.
-     *
-     * @return string A character
-     */
-    public function getProgressCharacter()
+    public function getProgressCharacter(): string
     {
         return $this->progressChar;
     }
 
-    /**
-     * Sets the progress bar format.
-     *
-     * @param string $format The format
-     */
-    public function setFormat($format)
+    public function setFormat(string $format)
     {
         $this->format = null;
         $this->internalFormat = $format;
@@ -307,9 +238,9 @@ final class ProgressBar
      *
      * @param int|float $freq The frequency in steps
      */
-    public function setRedrawFrequency($freq)
+    public function setRedrawFrequency(int $freq)
     {
-        $this->redrawFreq = max((int) $freq, 1);
+        $this->redrawFreq = max($freq, 1);
     }
 
     /**
@@ -317,7 +248,7 @@ final class ProgressBar
      *
      * @param int|null $max Number of steps to complete the bar (0 if indeterminate), null to leave unchanged
      */
-    public function start($max = null)
+    public function start(int $max = null)
     {
         $this->startTime = time();
         $this->step = 0;
@@ -335,30 +266,21 @@ final class ProgressBar
      *
      * @param int $step Number of steps to advance
      */
-    public function advance($step = 1)
+    public function advance(int $step = 1)
     {
         $this->setProgress($this->step + $step);
     }
 
     /**
      * Sets whether to overwrite the progressbar, false for new line.
-     *
-     * @param bool $overwrite
      */
-    public function setOverwrite($overwrite)
+    public function setOverwrite(bool $overwrite)
     {
-        $this->overwrite = (bool) $overwrite;
+        $this->overwrite = $overwrite;
     }
 
-    /**
-     * Sets the current progress.
-     *
-     * @param int $step The current progress
-     */
-    public function setProgress($step)
+    public function setProgress(int $step)
     {
-        $step = (int) $step;
-
         if ($this->max && $step > $this->max) {
             $this->max = $step;
         } elseif ($step < 0) {
@@ -374,10 +296,17 @@ final class ProgressBar
         }
     }
 
+    public function setMaxSteps(int $max)
+    {
+        $this->format = null;
+        $this->max = max(0, $max);
+        $this->stepWidth = $this->max ? Helper::strlen((string) $this->max) : 4;
+    }
+
     /**
      * Finishes the progress output.
      */
-    public function finish()
+    public function finish(): void
     {
         if (!$this->max) {
             $this->max = $this->step;
@@ -394,7 +323,7 @@ final class ProgressBar
     /**
      * Outputs the current progress string.
      */
-    public function display()
+    public function display(): void
     {
         if (OutputInterface::VERBOSITY_QUIET === $this->output->getVerbosity()) {
             return;
@@ -414,7 +343,7 @@ final class ProgressBar
      * while a progress bar is running.
      * Call display() to show the progress bar again.
      */
-    public function clear()
+    public function clear(): void
     {
         if (!$this->overwrite) {
             return;
@@ -427,12 +356,7 @@ final class ProgressBar
         $this->overwrite('');
     }
 
-    /**
-     * Sets the progress bar format.
-     *
-     * @param string $format The format
-     */
-    private function setRealFormat($format)
+    private function setRealFormat(string $format)
     {
         // try to use the _nomax variant if available
         if (!$this->max && null !== self::getFormatDefinition($format.'_nomax')) {
@@ -446,35 +370,27 @@ final class ProgressBar
         $this->formatLineCount = substr_count($this->format, "\n");
     }
 
-    /**
-     * Sets the progress bar maximal steps.
-     *
-     * @param int $max The progress bar max steps
-     */
-    private function setMaxSteps($max)
-    {
-        $this->max = max(0, (int) $max);
-        $this->stepWidth = $this->max ? Helper::strlen($this->max) : 4;
-    }
-
     /**
      * Overwrites a previous message to the output.
-     *
-     * @param string $message The message
      */
-    private function overwrite($message)
+    private function overwrite(string $message): void
     {
         if ($this->overwrite) {
             if (!$this->firstRun) {
-                // Move the cursor to the beginning of the line
-                $this->output->write("\x0D");
+                if ($this->output instanceof ConsoleSectionOutput) {
+                    $lines = floor(Helper::strlen($message) / $this->terminal->getWidth()) + $this->formatLineCount + 1;
+                    $this->output->clear($lines);
+                } else {
+                    // Move the cursor to the beginning of the line
+                    $this->output->write("\x0D");
 
-                // Erase the line
-                $this->output->write("\x1B[2K");
+                    // Erase the line
+                    $this->output->write("\x1B[2K");
 
-                // Erase previous lines
-                if ($this->formatLineCount > 0) {
-                    $this->output->write(str_repeat("\x1B[1A\x1B[2K", $this->formatLineCount));
+                    // Erase previous lines
+                    if ($this->formatLineCount > 0) {
+                        $this->output->write(str_repeat("\x1B[1A\x1B[2K", $this->formatLineCount));
+                    }
                 }
             }
         } elseif ($this->step > 0) {
@@ -486,7 +402,7 @@ final class ProgressBar
         $this->output->write($message);
     }
 
-    private function determineBestFormat()
+    private function determineBestFormat(): string
     {
         switch ($this->output->getVerbosity()) {
             // OutputInterface::VERBOSITY_QUIET: display is disabled anyway
@@ -501,7 +417,7 @@ final class ProgressBar
         }
     }
 
-    private static function initPlaceholderFormatters()
+    private static function initPlaceholderFormatters(): array
     {
         return array(
             'bar' => function (ProgressBar $bar, OutputInterface $output) {
@@ -558,7 +474,7 @@ final class ProgressBar
         );
     }
 
-    private static function initFormats()
+    private static function initFormats(): array
     {
         return array(
             'normal' => ' %current%/%max% [%bar%] %percent:3s%%',
@@ -575,15 +491,12 @@ final class ProgressBar
         );
     }
 
-    /**
-     * @return string
-     */
-    private function buildLine()
+    private function buildLine(): string
     {
         $regex = "{%([a-z\-_]+)(?:\:([^%]+))?%}i";
         $callback = function ($matches) {
             if ($formatter = $this::getPlaceholderFormatterDefinition($matches[1])) {
-                $text = call_user_func($formatter, $this, $this->output);
+                $text = \call_user_func($formatter, $this, $this->output);
             } elseif (isset($this->messages[$matches[1]])) {
                 $text = $this->messages[$matches[1]];
             } else {
diff --git a/vendor/symfony/console/Helper/ProgressIndicator.php b/vendor/symfony/console/Helper/ProgressIndicator.php
index d441accd..fe516df0 100644
--- a/vendor/symfony/console/Helper/ProgressIndicator.php
+++ b/vendor/symfony/console/Helper/ProgressIndicator.php
@@ -39,7 +39,7 @@ class ProgressIndicator
      * @param int             $indicatorChangeInterval Change interval in milliseconds
      * @param array|null      $indicatorValues         Animated indicator characters
      */
-    public function __construct(OutputInterface $output, $format = null, $indicatorChangeInterval = 100, $indicatorValues = null)
+    public function __construct(OutputInterface $output, string $format = null, int $indicatorChangeInterval = 100, array $indicatorValues = null)
     {
         $this->output = $output;
 
@@ -53,7 +53,7 @@ class ProgressIndicator
 
         $indicatorValues = array_values($indicatorValues);
 
-        if (2 > count($indicatorValues)) {
+        if (2 > \count($indicatorValues)) {
             throw new InvalidArgumentException('Must have at least 2 indicator value characters.');
         }
 
@@ -196,7 +196,7 @@ class ProgressIndicator
 
         $this->overwrite(preg_replace_callback("{%([a-z\-_]+)(?:\:([^%]+))?%}i", function ($matches) use ($self) {
             if ($formatter = $self::getPlaceholderFormatterDefinition($matches[1])) {
-                return call_user_func($formatter, $self);
+                return \call_user_func($formatter, $self);
             }
 
             return $matches[0];
@@ -219,10 +219,8 @@ class ProgressIndicator
 
     /**
      * Overwrites a previous message to the output.
-     *
-     * @param string $message The message
      */
-    private function overwrite($message)
+    private function overwrite(string $message)
     {
         if ($this->output->isDecorated()) {
             $this->output->write("\x0D\x1B[2K");
@@ -241,7 +239,7 @@ class ProgressIndicator
     {
         return array(
             'indicator' => function (ProgressIndicator $indicator) {
-                return $indicator->indicatorValues[$indicator->indicatorCurrent % count($indicator->indicatorValues)];
+                return $indicator->indicatorValues[$indicator->indicatorCurrent % \count($indicator->indicatorValues)];
             },
             'message' => function (ProgressIndicator $indicator) {
                 return $indicator->message;
diff --git a/vendor/symfony/console/Helper/QuestionHelper.php b/vendor/symfony/console/Helper/QuestionHelper.php
index e793256f..5e6ef03e 100644
--- a/vendor/symfony/console/Helper/QuestionHelper.php
+++ b/vendor/symfony/console/Helper/QuestionHelper.php
@@ -11,16 +11,16 @@
 
 namespace Symfony\Component\Console\Helper;
 
-use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\StreamableInputInterface;
 use Symfony\Component\Console\Output\ConsoleOutputInterface;
+use Symfony\Component\Console\Output\ConsoleSectionOutput;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Question\ChoiceQuestion;
+use Symfony\Component\Console\Question\Question;
 
 /**
  * The QuestionHelper class provides helpers to interact with the user.
@@ -71,46 +71,6 @@ class QuestionHelper extends Helper
         return $this->validateAttempts($interviewer, $output, $question);
     }
 
-    /**
-     * Sets the input stream to read from when interacting with the user.
-     *
-     * This is mainly useful for testing purpose.
-     *
-     * @deprecated since version 3.2, to be removed in 4.0. Use
-     *             StreamableInputInterface::setStream() instead.
-     *
-     * @param resource $stream The input stream
-     *
-     * @throws InvalidArgumentException In case the stream is not a resource
-     */
-    public function setInputStream($stream)
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.2 and will be removed in 4.0. Use %s::setStream() instead.', __METHOD__, StreamableInputInterface::class), E_USER_DEPRECATED);
-
-        if (!is_resource($stream)) {
-            throw new InvalidArgumentException('Input stream must be a valid resource.');
-        }
-
-        $this->inputStream = $stream;
-    }
-
-    /**
-     * Returns the helper's input stream.
-     *
-     * @deprecated since version 3.2, to be removed in 4.0. Use
-     *             StreamableInputInterface::getStream() instead.
-     *
-     * @return resource
-     */
-    public function getInputStream()
-    {
-        if (0 === func_num_args() || func_get_arg(0)) {
-            @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.2 and will be removed in 4.0. Use %s::getStream() instead.', __METHOD__, StreamableInputInterface::class), E_USER_DEPRECATED);
-        }
-
-        return $this->inputStream;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -130,7 +90,7 @@ class QuestionHelper extends Helper
     /**
      * Asks the question to the user.
      *
-     * @return bool|mixed|null|string
+     * @return bool|mixed|string|null
      *
      * @throws RuntimeException In case the fallback is deactivated and the response cannot be hidden
      */
@@ -161,10 +121,14 @@ class QuestionHelper extends Helper
                 $ret = trim($ret);
             }
         } else {
-            $ret = trim($this->autocomplete($output, $question, $inputStream, is_array($autocomplete) ? $autocomplete : iterator_to_array($autocomplete, false)));
+            $ret = trim($this->autocomplete($output, $question, $inputStream, \is_array($autocomplete) ? $autocomplete : iterator_to_array($autocomplete, false)));
+        }
+
+        if ($output instanceof ConsoleSectionOutput) {
+            $output->addContent($ret);
         }
 
-        $ret = strlen($ret) > 0 ? $ret : $question->getDefault();
+        $ret = \strlen($ret) > 0 ? $ret : $question->getDefault();
 
         if ($normalizer = $question->getNormalizer()) {
             return $normalizer($ret);
@@ -217,18 +181,15 @@ class QuestionHelper extends Helper
      * @param OutputInterface $output
      * @param Question        $question
      * @param resource        $inputStream
-     * @param array           $autocomplete
-     *
-     * @return string
      */
-    private function autocomplete(OutputInterface $output, Question $question, $inputStream, array $autocomplete)
+    private function autocomplete(OutputInterface $output, Question $question, $inputStream, array $autocomplete): string
     {
         $ret = '';
 
         $i = 0;
         $ofs = -1;
         $matches = $autocomplete;
-        $numMatches = count($matches);
+        $numMatches = \count($matches);
 
         $sttyMode = shell_exec('stty -g');
 
@@ -253,7 +214,7 @@ class QuestionHelper extends Helper
                 if (0 === $i) {
                     $ofs = -1;
                     $matches = $autocomplete;
-                    $numMatches = count($matches);
+                    $numMatches = \count($matches);
                 } else {
                     $numMatches = 0;
                 }
@@ -277,13 +238,13 @@ class QuestionHelper extends Helper
                     $ofs += ('A' === $c[2]) ? -1 : 1;
                     $ofs = ($numMatches + $ofs) % $numMatches;
                 }
-            } elseif (ord($c) < 32) {
+            } elseif (\ord($c) < 32) {
                 if ("\t" === $c || "\n" === $c) {
                     if ($numMatches > 0 && -1 !== $ofs) {
                         $ret = $matches[$ofs];
                         // Echo out remaining chars for current match
                         $output->write(substr($ret, $i));
-                        $i = strlen($ret);
+                        $i = \strlen($ret);
                     }
 
                     if ("\n" === $c) {
@@ -336,13 +297,11 @@ class QuestionHelper extends Helper
      * @param OutputInterface $output      An Output instance
      * @param resource        $inputStream The handler resource
      *
-     * @return string The answer
-     *
      * @throws RuntimeException In case the fallback is deactivated and the response cannot be hidden
      */
-    private function getHiddenResponse(OutputInterface $output, $inputStream)
+    private function getHiddenResponse(OutputInterface $output, $inputStream): string
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $exe = __DIR__.'/../Resources/bin/hiddeninput.exe';
 
             // handle code running from a phar
@@ -412,7 +371,7 @@ class QuestionHelper extends Helper
             }
 
             try {
-                return call_user_func($question->getValidator(), $interviewer());
+                return \call_user_func($question->getValidator(), $interviewer());
             } catch (RuntimeException $e) {
                 throw $e;
             } catch (\Exception $error) {
@@ -451,10 +410,8 @@ class QuestionHelper extends Helper
 
     /**
      * Returns whether Stty is available or not.
-     *
-     * @return bool
      */
-    private function hasSttyAvailable()
+    private function hasSttyAvailable(): bool
     {
         if (null !== self::$stty) {
             return self::$stty;
diff --git a/vendor/symfony/console/Helper/SymfonyQuestionHelper.php b/vendor/symfony/console/Helper/SymfonyQuestionHelper.php
index cf071d59..260c03e2 100644
--- a/vendor/symfony/console/Helper/SymfonyQuestionHelper.php
+++ b/vendor/symfony/console/Helper/SymfonyQuestionHelper.php
@@ -11,14 +11,12 @@
 
 namespace Symfony\Component\Console\Helper;
 
-use Symfony\Component\Console\Exception\LogicException;
-use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ChoiceQuestion;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Symfony\Component\Console\Formatter\OutputFormatter;
 
 /**
  * Symfony Style Guide compliant question helper.
@@ -27,32 +25,6 @@ use Symfony\Component\Console\Formatter\OutputFormatter;
  */
 class SymfonyQuestionHelper extends QuestionHelper
 {
-    /**
-     * {@inheritdoc}
-     *
-     * To be removed in 4.0
-     */
-    public function ask(InputInterface $input, OutputInterface $output, Question $question)
-    {
-        $validator = $question->getValidator();
-        $question->setValidator(function ($value) use ($validator) {
-            if (null !== $validator) {
-                $value = $validator($value);
-            } else {
-                // make required
-                if (!is_array($value) && !is_bool($value) && 0 === strlen($value)) {
-                    @trigger_error('The default question validator is deprecated since Symfony 3.3 and will not be used anymore in version 4.0. Set a custom question validator if needed.', E_USER_DEPRECATED);
-
-                    throw new LogicException('A value is required.');
-                }
-            }
-
-            return $value;
-        });
-
-        return parent::ask($input, $output, $question);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -86,7 +58,7 @@ class SymfonyQuestionHelper extends QuestionHelper
 
             case $question instanceof ChoiceQuestion:
                 $choices = $question->getChoices();
-                $text = sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape($choices[$default]));
+                $text = sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape(isset($choices[$default]) ? $choices[$default] : $default));
 
                 break;
 
diff --git a/vendor/symfony/console/Helper/Table.php b/vendor/symfony/console/Helper/Table.php
index 81d0e427..95775484 100644
--- a/vendor/symfony/console/Helper/Table.php
+++ b/vendor/symfony/console/Helper/Table.php
@@ -11,8 +11,10 @@
 
 namespace Symfony\Component\Console\Helper;
 
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Exception\InvalidArgumentException;
+use Symfony\Component\Console\Exception\RuntimeException;
+use Symfony\Component\Console\Output\ConsoleSectionOutput;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Provides helpers to display a table.
@@ -21,9 +23,17 @@ use Symfony\Component\Console\Exception\InvalidArgumentException;
  * @author Саша Стаменковић <umpirsky@gmail.com>
  * @author Abdellatif Ait boudad <a.aitboudad@gmail.com>
  * @author Max Grigorian <maxakawizard@gmail.com>
+ * @author Dany Maillard <danymaillard93b@gmail.com>
  */
 class Table
 {
+    private const SEPARATOR_TOP = 0;
+    private const SEPARATOR_TOP_BOTTOM = 1;
+    private const SEPARATOR_MID = 2;
+    private const SEPARATOR_BOTTOM = 3;
+    private const BORDER_OUTSIDE = 0;
+    private const BORDER_INSIDE = 1;
+
     /**
      * Table headers.
      */
@@ -70,6 +80,8 @@ class Table
 
     private static $styles;
 
+    private $rendered = false;
+
     public function __construct(OutputInterface $output)
     {
         $this->output = $output;
@@ -210,7 +222,7 @@ class Table
     public function setHeaders(array $headers)
     {
         $headers = array_values($headers);
-        if (!empty($headers) && !is_array($headers[0])) {
+        if (!empty($headers) && !\is_array($headers[0])) {
             $headers = array($headers);
         }
 
@@ -243,7 +255,7 @@ class Table
             return $this;
         }
 
-        if (!is_array($row)) {
+        if (!\is_array($row)) {
             throw new InvalidArgumentException('A row must be an array or a TableSeparator instance.');
         }
 
@@ -252,6 +264,25 @@ class Table
         return $this;
     }
 
+    /**
+     * Adds a row to the table, and re-renders the table.
+     */
+    public function appendRow($row): self
+    {
+        if (!$this->output instanceof ConsoleSectionOutput) {
+            throw new RuntimeException(sprintf('Output should be an instance of "%s" when calling "%s".', ConsoleSectionOutput::class, __METHOD__));
+        }
+
+        if ($this->rendered) {
+            $this->output->clear($this->calculateRowCount());
+        }
+
+        $this->addRow($row);
+        $this->render();
+
+        return $this;
+    }
+
     public function setRow($column, array $row)
     {
         $this->rows[$column] = $row;
@@ -263,63 +294,89 @@ class Table
      * Renders table to output.
      *
      * Example:
-     * <code>
-     * +---------------+-----------------------+------------------+
-     * | ISBN          | Title                 | Author           |
-     * +---------------+-----------------------+------------------+
-     * | 99921-58-10-7 | Divine Comedy         | Dante Alighieri  |
-     * | 9971-5-0210-0 | A Tale of Two Cities  | Charles Dickens  |
-     * | 960-425-059-0 | The Lord of the Rings | J. R. R. Tolkien |
-     * +---------------+-----------------------+------------------+
-     * </code>
+     *
+     *     +---------------+-----------------------+------------------+
+     *     | ISBN          | Title                 | Author           |
+     *     +---------------+-----------------------+------------------+
+     *     | 99921-58-10-7 | Divine Comedy         | Dante Alighieri  |
+     *     | 9971-5-0210-0 | A Tale of Two Cities  | Charles Dickens  |
+     *     | 960-425-059-0 | The Lord of the Rings | J. R. R. Tolkien |
+     *     +---------------+-----------------------+------------------+
      */
     public function render()
     {
-        $this->calculateNumberOfColumns();
-        $rows = $this->buildTableRows($this->rows);
-        $headers = $this->buildTableRows($this->headers);
+        $rows = array_merge($this->headers, array($divider = new TableSeparator()), $this->rows);
+        $this->calculateNumberOfColumns($rows);
 
-        $this->calculateColumnsWidth(array_merge($headers, $rows));
+        $rows = $this->buildTableRows($rows);
+        $this->calculateColumnsWidth($rows);
 
-        $this->renderRowSeparator();
-        if (!empty($headers)) {
-            foreach ($headers as $header) {
-                $this->renderRow($header, $this->style->getCellHeaderFormat());
-                $this->renderRowSeparator();
-            }
-        }
+        $isHeader = true;
+        $isFirstRow = false;
         foreach ($rows as $row) {
+            if ($divider === $row) {
+                $isHeader = false;
+                $isFirstRow = true;
+
+                continue;
+            }
             if ($row instanceof TableSeparator) {
                 $this->renderRowSeparator();
-            } else {
-                $this->renderRow($row, $this->style->getCellRowFormat());
+
+                continue;
             }
+            if (!$row) {
+                continue;
+            }
+
+            if ($isHeader || $isFirstRow) {
+                $this->renderRowSeparator($isFirstRow ? self::SEPARATOR_TOP_BOTTOM : self::SEPARATOR_TOP);
+                if ($isFirstRow) {
+                    $isFirstRow = false;
+                }
+            }
+
+            $this->renderRow($row, $isHeader ? $this->style->getCellHeaderFormat() : $this->style->getCellRowFormat());
         }
-        if (!empty($rows)) {
-            $this->renderRowSeparator();
-        }
+        $this->renderRowSeparator(self::SEPARATOR_BOTTOM);
 
         $this->cleanup();
+        $this->rendered = true;
     }
 
     /**
      * Renders horizontal header separator.
      *
-     * Example: <code>+-----+-----------+-------+</code>
+     * Example:
+     *
+     *     +-----+-----------+-------+
      */
-    private function renderRowSeparator()
+    private function renderRowSeparator(int $type = self::SEPARATOR_MID)
     {
         if (0 === $count = $this->numberOfColumns) {
             return;
         }
 
-        if (!$this->style->getHorizontalBorderChar() && !$this->style->getCrossingChar()) {
+        $borders = $this->style->getBorderChars();
+        if (!$borders[0] && !$borders[2] && !$this->style->getCrossingChar()) {
             return;
         }
 
-        $markup = $this->style->getCrossingChar();
+        $crossings = $this->style->getCrossingChars();
+        if (self::SEPARATOR_MID === $type) {
+            list($horizontal, $leftChar, $midChar, $rightChar) = array($borders[2], $crossings[8], $crossings[0], $crossings[4]);
+        } elseif (self::SEPARATOR_TOP === $type) {
+            list($horizontal, $leftChar, $midChar, $rightChar) = array($borders[0], $crossings[1], $crossings[2], $crossings[3]);
+        } elseif (self::SEPARATOR_TOP_BOTTOM === $type) {
+            list($horizontal, $leftChar, $midChar, $rightChar) = array($borders[0], $crossings[9], $crossings[10], $crossings[11]);
+        } else {
+            list($horizontal, $leftChar, $midChar, $rightChar) = array($borders[0], $crossings[7], $crossings[6], $crossings[5]);
+        }
+
+        $markup = $leftChar;
         for ($column = 0; $column < $count; ++$column) {
-            $markup .= str_repeat($this->style->getHorizontalBorderChar(), $this->effectiveColumnWidths[$column]).$this->style->getCrossingChar();
+            $markup .= str_repeat($horizontal, $this->effectiveColumnWidths[$column]);
+            $markup .= $column === $count - 1 ? $rightChar : $midChar;
         }
 
         $this->output->writeln(sprintf($this->style->getBorderFormat(), $markup));
@@ -328,41 +385,36 @@ class Table
     /**
      * Renders vertical column separator.
      */
-    private function renderColumnSeparator()
+    private function renderColumnSeparator($type = self::BORDER_OUTSIDE)
     {
-        return sprintf($this->style->getBorderFormat(), $this->style->getVerticalBorderChar());
+        $borders = $this->style->getBorderChars();
+
+        return sprintf($this->style->getBorderFormat(), self::BORDER_OUTSIDE === $type ? $borders[1] : $borders[3]);
     }
 
     /**
      * Renders table row.
      *
-     * Example: <code>| 9971-5-0210-0 | A Tale of Two Cities  | Charles Dickens  |</code>
+     * Example:
      *
-     * @param array  $row
-     * @param string $cellFormat
+     *     | 9971-5-0210-0 | A Tale of Two Cities  | Charles Dickens  |
      */
-    private function renderRow(array $row, $cellFormat)
+    private function renderRow(array $row, string $cellFormat)
     {
-        if (empty($row)) {
-            return;
-        }
-
-        $rowContent = $this->renderColumnSeparator();
-        foreach ($this->getRowColumns($row) as $column) {
+        $rowContent = $this->renderColumnSeparator(self::BORDER_OUTSIDE);
+        $columns = $this->getRowColumns($row);
+        $last = \count($columns) - 1;
+        foreach ($columns as $i => $column) {
             $rowContent .= $this->renderCell($row, $column, $cellFormat);
-            $rowContent .= $this->renderColumnSeparator();
+            $rowContent .= $this->renderColumnSeparator($last === $i ? self::BORDER_OUTSIDE : self::BORDER_INSIDE);
         }
         $this->output->writeln($rowContent);
     }
 
     /**
      * Renders table cell with padding.
-     *
-     * @param array  $row
-     * @param int    $column
-     * @param string $cellFormat
      */
-    private function renderCell(array $row, $column, $cellFormat)
+    private function renderCell(array $row, int $column, string $cellFormat)
     {
         $cell = isset($row[$column]) ? $row[$column] : '';
         $width = $this->effectiveColumnWidths[$column];
@@ -375,13 +427,13 @@ class Table
 
         // str_pad won't work properly with multi-byte strings, we need to fix the padding
         if (false !== $encoding = mb_detect_encoding($cell, null, true)) {
-            $width += strlen($cell) - mb_strwidth($cell, $encoding);
+            $width += \strlen($cell) - mb_strwidth($cell, $encoding);
         }
 
         $style = $this->getColumnStyle($column);
 
         if ($cell instanceof TableSeparator) {
-            return sprintf($style->getBorderFormat(), str_repeat($style->getHorizontalBorderChar(), $width));
+            return sprintf($style->getBorderFormat(), str_repeat($style->getBorderChars()[2], $width));
         }
 
         $width += Helper::strlen($cell) - Helper::strlenWithoutDecoration($this->output->getFormatter(), $cell);
@@ -393,14 +445,10 @@ class Table
     /**
      * Calculate number of columns for this table.
      */
-    private function calculateNumberOfColumns()
+    private function calculateNumberOfColumns($rows)
     {
-        if (null !== $this->numberOfColumns) {
-            return;
-        }
-
         $columns = array(0);
-        foreach (array_merge($this->headers, $this->rows) as $row) {
+        foreach ($rows as $row) {
             if ($row instanceof TableSeparator) {
                 continue;
             }
@@ -414,7 +462,7 @@ class Table
     private function buildTableRows($rows)
     {
         $unmergedRows = array();
-        for ($rowKey = 0; $rowKey < count($rows); ++$rowKey) {
+        for ($rowKey = 0; $rowKey < \count($rows); ++$rowKey) {
             $rows = $this->fillNextRows($rows, $rowKey);
 
             // Remove any new line breaks and replace it with a new line
@@ -436,40 +484,50 @@ class Table
             }
         }
 
-        $tableRows = array();
-        foreach ($rows as $rowKey => $row) {
-            $tableRows[] = $this->fillCells($row);
-            if (isset($unmergedRows[$rowKey])) {
-                $tableRows = array_merge($tableRows, $unmergedRows[$rowKey]);
+        return new TableRows(function () use ($rows, $unmergedRows) {
+            foreach ($rows as $rowKey => $row) {
+                yield $this->fillCells($row);
+
+                if (isset($unmergedRows[$rowKey])) {
+                    foreach ($unmergedRows[$rowKey] as $row) {
+                        yield $row;
+                    }
+                }
             }
+        });
+    }
+
+    private function calculateRowCount(): int
+    {
+        $numberOfRows = \count(iterator_to_array($this->buildTableRows(array_merge($this->headers, array(new TableSeparator()), $this->rows))));
+
+        if ($this->headers) {
+            ++$numberOfRows; // Add row for header separator
         }
 
-        return $tableRows;
+        ++$numberOfRows; // Add row for footer separator
+
+        return $numberOfRows;
     }
 
     /**
      * fill rows that contains rowspan > 1.
      *
-     * @param array $rows
-     * @param int   $line
-     *
-     * @return array
-     *
      * @throws InvalidArgumentException
      */
-    private function fillNextRows(array $rows, $line)
+    private function fillNextRows(array $rows, int $line): array
     {
         $unmergedRows = array();
         foreach ($rows[$line] as $column => $cell) {
-            if (null !== $cell && !$cell instanceof TableCell && !is_scalar($cell) && !(is_object($cell) && method_exists($cell, '__toString'))) {
-                throw new InvalidArgumentException(sprintf('A cell must be a TableCell, a scalar or an object implementing __toString, %s given.', gettype($cell)));
+            if (null !== $cell && !$cell instanceof TableCell && !is_scalar($cell) && !(\is_object($cell) && method_exists($cell, '__toString'))) {
+                throw new InvalidArgumentException(sprintf('A cell must be a TableCell, a scalar or an object implementing __toString, %s given.', \gettype($cell)));
             }
             if ($cell instanceof TableCell && $cell->getRowspan() > 1) {
                 $nbLines = $cell->getRowspan() - 1;
                 $lines = array($cell);
                 if (strstr($cell, "\n")) {
                     $lines = explode("\n", str_replace("\n", "<fg=default;bg=default>\n</>", $cell));
-                    $nbLines = count($lines) > $nbLines ? substr_count($cell, "\n") : $nbLines;
+                    $nbLines = \count($lines) > $nbLines ? substr_count($cell, "\n") : $nbLines;
 
                     $rows[$line][$column] = new TableCell($lines[0], array('colspan' => $cell->getColspan()));
                     unset($lines[0]);
@@ -489,7 +547,7 @@ class Table
 
         foreach ($unmergedRows as $unmergedRowKey => $unmergedRow) {
             // we need to know if $unmergedRow will be merged or inserted into $rows
-            if (isset($rows[$unmergedRowKey]) && is_array($rows[$unmergedRowKey]) && ($this->getNumberOfColumns($rows[$unmergedRowKey]) + $this->getNumberOfColumns($unmergedRows[$unmergedRowKey]) <= $this->numberOfColumns)) {
+            if (isset($rows[$unmergedRowKey]) && \is_array($rows[$unmergedRowKey]) && ($this->getNumberOfColumns($rows[$unmergedRowKey]) + $this->getNumberOfColumns($unmergedRows[$unmergedRowKey]) <= $this->numberOfColumns)) {
                 foreach ($unmergedRow as $cellKey => $cell) {
                     // insert cell into row at cellKey position
                     array_splice($rows[$unmergedRowKey], $cellKey, 0, array($cell));
@@ -510,8 +568,6 @@ class Table
 
     /**
      * fill cells for a row that contains colspan > 1.
-     *
-     * @return array
      */
     private function fillCells($row)
     {
@@ -529,13 +585,7 @@ class Table
         return $newRow ?: $row;
     }
 
-    /**
-     * @param array $rows
-     * @param int   $line
-     *
-     * @return array
-     */
-    private function copyRow(array $rows, $line)
+    private function copyRow(array $rows, int $line): array
     {
         $row = $rows[$line];
         foreach ($row as $cellKey => $cellValue) {
@@ -550,12 +600,10 @@ class Table
 
     /**
      * Gets number of columns by row.
-     *
-     * @return int
      */
-    private function getNumberOfColumns(array $row)
+    private function getNumberOfColumns(array $row): int
     {
-        $columns = count($row);
+        $columns = \count($row);
         foreach ($row as $column) {
             $columns += $column instanceof TableCell ? ($column->getColspan() - 1) : 0;
         }
@@ -565,10 +613,8 @@ class Table
 
     /**
      * Gets list of columns for the given row.
-     *
-     * @return array
      */
-    private function getRowColumns(array $row)
+    private function getRowColumns(array $row): array
     {
         $columns = range(0, $this->numberOfColumns - 1);
         foreach ($row as $cellKey => $cell) {
@@ -584,7 +630,7 @@ class Table
     /**
      * Calculates columns widths.
      */
-    private function calculateColumnsWidth(array $rows)
+    private function calculateColumnsWidth(iterable $rows)
     {
         for ($column = 0; $column < $this->numberOfColumns; ++$column) {
             $lengths = array();
@@ -609,29 +655,16 @@ class Table
                 $lengths[] = $this->getCellWidth($row, $column);
             }
 
-            $this->effectiveColumnWidths[$column] = max($lengths) + strlen($this->style->getCellRowContentFormat()) - 2;
+            $this->effectiveColumnWidths[$column] = max($lengths) + Helper::strlen($this->style->getCellRowContentFormat()) - 2;
         }
     }
 
-    /**
-     * Gets column width.
-     *
-     * @return int
-     */
-    private function getColumnSeparatorWidth()
+    private function getColumnSeparatorWidth(): int
     {
-        return strlen(sprintf($this->style->getBorderFormat(), $this->style->getVerticalBorderChar()));
+        return Helper::strlen(sprintf($this->style->getBorderFormat(), $this->style->getBorderChars()[3]));
     }
 
-    /**
-     * Gets cell width.
-     *
-     * @param array $row
-     * @param int   $column
-     *
-     * @return int
-     */
-    private function getCellWidth(array $row, $column)
+    private function getCellWidth(array $row, int $column): int
     {
         $cellWidth = 0;
 
@@ -658,32 +691,46 @@ class Table
     {
         $borderless = new TableStyle();
         $borderless
-            ->setHorizontalBorderChar('=')
-            ->setVerticalBorderChar(' ')
-            ->setCrossingChar(' ')
+            ->setHorizontalBorderChars('=')
+            ->setVerticalBorderChars(' ')
+            ->setDefaultCrossingChar(' ')
         ;
 
         $compact = new TableStyle();
         $compact
-            ->setHorizontalBorderChar('')
-            ->setVerticalBorderChar(' ')
-            ->setCrossingChar('')
+            ->setHorizontalBorderChars('')
+            ->setVerticalBorderChars(' ')
+            ->setDefaultCrossingChar('')
             ->setCellRowContentFormat('%s')
         ;
 
         $styleGuide = new TableStyle();
         $styleGuide
-            ->setHorizontalBorderChar('-')
-            ->setVerticalBorderChar(' ')
-            ->setCrossingChar(' ')
+            ->setHorizontalBorderChars('-')
+            ->setVerticalBorderChars(' ')
+            ->setDefaultCrossingChar(' ')
             ->setCellHeaderFormat('%s')
         ;
 
+        $box = (new TableStyle())
+            ->setHorizontalBorderChars('─')
+            ->setVerticalBorderChars('│')
+            ->setCrossingChars('┼', '┌', '┬', '┐', '┤', '┘', '┴', '└', '├')
+        ;
+
+        $boxDouble = (new TableStyle())
+            ->setHorizontalBorderChars('═', '─')
+            ->setVerticalBorderChars('║', '│')
+            ->setCrossingChars('┼', '╔', '╤', '╗', '╢', '╝', '╧', '╚', '╟', '╠', '╪', '╣')
+        ;
+
         return array(
             'default' => new TableStyle(),
             'borderless' => $borderless,
             'compact' => $compact,
             'symfony-style-guide' => $styleGuide,
+            'box' => $box,
+            'box-double' => $boxDouble,
         );
     }
 
diff --git a/vendor/symfony/console/Helper/TableCell.php b/vendor/symfony/console/Helper/TableCell.php
index 6fc7d3b9..f800fb44 100644
--- a/vendor/symfony/console/Helper/TableCell.php
+++ b/vendor/symfony/console/Helper/TableCell.php
@@ -24,16 +24,8 @@ class TableCell
         'colspan' => 1,
     );
 
-    /**
-     * @param string $value
-     * @param array  $options
-     */
-    public function __construct($value = '', array $options = array())
+    public function __construct(string $value = '', array $options = array())
     {
-        if (is_numeric($value) && !is_string($value)) {
-            $value = (string) $value;
-        }
-
         $this->value = $value;
 
         // check option names
diff --git a/vendor/symfony/console/Helper/TableRows.php b/vendor/symfony/console/Helper/TableRows.php
new file mode 100644
index 00000000..4809daf1
--- /dev/null
+++ b/vendor/symfony/console/Helper/TableRows.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Helper;
+
+/**
+ * @internal
+ */
+class TableRows implements \IteratorAggregate
+{
+    private $generator;
+
+    public function __construct(callable $generator)
+    {
+        $this->generator = $generator;
+    }
+
+    public function getIterator()
+    {
+        $g = $this->generator;
+
+        return $g();
+    }
+}
diff --git a/vendor/symfony/console/Helper/TableStyle.php b/vendor/symfony/console/Helper/TableStyle.php
index 2999c76f..0536713a 100644
--- a/vendor/symfony/console/Helper/TableStyle.php
+++ b/vendor/symfony/console/Helper/TableStyle.php
@@ -19,13 +19,27 @@ use Symfony\Component\Console\Exception\LogicException;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Саша Стаменковић <umpirsky@gmail.com>
+ * @author Dany Maillard <danymaillard93b@gmail.com>
  */
 class TableStyle
 {
     private $paddingChar = ' ';
-    private $horizontalBorderChar = '-';
-    private $verticalBorderChar = '|';
+    private $horizontalOutsideBorderChar = '-';
+    private $horizontalInsideBorderChar = '-';
+    private $verticalOutsideBorderChar = '|';
+    private $verticalInsideBorderChar = '|';
     private $crossingChar = '+';
+    private $crossingTopRightChar = '+';
+    private $crossingTopMidChar = '+';
+    private $crossingTopLeftChar = '+';
+    private $crossingMidRightChar = '+';
+    private $crossingBottomRightChar = '+';
+    private $crossingBottomMidChar = '+';
+    private $crossingBottomLeftChar = '+';
+    private $crossingMidLeftChar = '+';
+    private $crossingTopLeftBottomChar = '+';
+    private $crossingTopMidBottomChar = '+';
+    private $crossingTopRightBottomChar = '+';
     private $cellHeaderFormat = '<info>%s</info>';
     private $cellRowFormat = '%s';
     private $cellRowContentFormat = ' %s ';
@@ -60,28 +74,85 @@ class TableStyle
         return $this->paddingChar;
     }
 
+    /**
+     * Sets horizontal border characters.
+     *
+     * <code>
+     * ╔═══════════════╤══════════════════════════╤══════════════════╗
+     * 1 ISBN          2 Title                    │ Author           ║
+     * ╠═══════════════╪══════════════════════════╪══════════════════╣
+     * ║ 99921-58-10-7 │ Divine Comedy            │ Dante Alighieri  ║
+     * ║ 9971-5-0210-0 │ A Tale of Two Cities     │ Charles Dickens  ║
+     * ║ 960-425-059-0 │ The Lord of the Rings    │ J. R. R. Tolkien ║
+     * ║ 80-902734-1-6 │ And Then There Were None │ Agatha Christie  ║
+     * ╚═══════════════╧══════════════════════════╧══════════════════╝
+     * </code>
+     *
+     * @param string      $outside Outside border char (see #1 of example)
+     * @param string|null $inside  Inside border char (see #2 of example), equals $outside if null
+     */
+    public function setHorizontalBorderChars(string $outside, string $inside = null): self
+    {
+        $this->horizontalOutsideBorderChar = $outside;
+        $this->horizontalInsideBorderChar = $inside ?? $outside;
+
+        return $this;
+    }
+
     /**
      * Sets horizontal border character.
      *
      * @param string $horizontalBorderChar
      *
      * @return $this
+     *
+     * @deprecated since Symfony 4.1, use {@link setHorizontalBorderChars()} instead.
      */
     public function setHorizontalBorderChar($horizontalBorderChar)
     {
-        $this->horizontalBorderChar = $horizontalBorderChar;
+        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1, use setHorizontalBorderChars() instead.', __METHOD__), E_USER_DEPRECATED);
 
-        return $this;
+        return $this->setHorizontalBorderChars($horizontalBorderChar, $horizontalBorderChar);
     }
 
     /**
      * Gets horizontal border character.
      *
      * @return string
+     *
+     * @deprecated since Symfony 4.1, use {@link getBorderChars()} instead.
      */
     public function getHorizontalBorderChar()
     {
-        return $this->horizontalBorderChar;
+        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1, use getBorderChars() instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return $this->horizontalOutsideBorderChar;
+    }
+
+    /**
+     * Sets vertical border characters.
+     *
+     * <code>
+     * ╔═══════════════╤══════════════════════════╤══════════════════╗
+     * ║ ISBN          │ Title                    │ Author           ║
+     * ╠═══════1═══════╪══════════════════════════╪══════════════════╣
+     * ║ 99921-58-10-7 │ Divine Comedy            │ Dante Alighieri  ║
+     * ║ 9971-5-0210-0 │ A Tale of Two Cities     │ Charles Dickens  ║
+     * ╟───────2───────┼──────────────────────────┼──────────────────╢
+     * ║ 960-425-059-0 │ The Lord of the Rings    │ J. R. R. Tolkien ║
+     * ║ 80-902734-1-6 │ And Then There Were None │ Agatha Christie  ║
+     * ╚═══════════════╧══════════════════════════╧══════════════════╝
+     * </code>
+     *
+     * @param string      $outside Outside border char (see #1 of example)
+     * @param string|null $inside  Inside border char (see #2 of example), equals $outside if null
+     */
+    public function setVerticalBorderChars(string $outside, string $inside = null): self
+    {
+        $this->verticalOutsideBorderChar = $outside;
+        $this->verticalInsideBorderChar = $inside ?? $outside;
+
+        return $this;
     }
 
     /**
@@ -90,22 +161,100 @@ class TableStyle
      * @param string $verticalBorderChar
      *
      * @return $this
+     *
+     * @deprecated since Symfony 4.1, use {@link setVerticalBorderChars()} instead.
      */
     public function setVerticalBorderChar($verticalBorderChar)
     {
-        $this->verticalBorderChar = $verticalBorderChar;
+        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1, use setVerticalBorderChars() instead.', __METHOD__), E_USER_DEPRECATED);
 
-        return $this;
+        return $this->setVerticalBorderChars($verticalBorderChar, $verticalBorderChar);
     }
 
     /**
      * Gets vertical border character.
      *
      * @return string
+     *
+     * @deprecated since Symfony 4.1, use {@link getBorderChars()} instead.
      */
     public function getVerticalBorderChar()
     {
-        return $this->verticalBorderChar;
+        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1, use getBorderChars() instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return $this->verticalOutsideBorderChar;
+    }
+
+    /**
+     * Gets border characters.
+     *
+     * @internal
+     */
+    public function getBorderChars()
+    {
+        return array(
+            $this->horizontalOutsideBorderChar,
+            $this->verticalOutsideBorderChar,
+            $this->horizontalInsideBorderChar,
+            $this->verticalInsideBorderChar,
+        );
+    }
+
+    /**
+     * Sets crossing characters.
+     *
+     * Example:
+     * <code>
+     * 1═══════════════2══════════════════════════2══════════════════3
+     * ║ ISBN          │ Title                    │ Author           ║
+     * 8'══════════════0'═════════════════════════0'═════════════════4'
+     * ║ 99921-58-10-7 │ Divine Comedy            │ Dante Alighieri  ║
+     * ║ 9971-5-0210-0 │ A Tale of Two Cities     │ Charles Dickens  ║
+     * 8───────────────0──────────────────────────0──────────────────4
+     * ║ 960-425-059-0 │ The Lord of the Rings    │ J. R. R. Tolkien ║
+     * ║ 80-902734-1-6 │ And Then There Were None │ Agatha Christie  ║
+     * 7═══════════════6══════════════════════════6══════════════════5
+     * </code>
+     *
+     * @param string      $cross          Crossing char (see #0 of example)
+     * @param string      $topLeft        Top left char (see #1 of example)
+     * @param string      $topMid         Top mid char (see #2 of example)
+     * @param string      $topRight       Top right char (see #3 of example)
+     * @param string      $midRight       Mid right char (see #4 of example)
+     * @param string      $bottomRight    Bottom right char (see #5 of example)
+     * @param string      $bottomMid      Bottom mid char (see #6 of example)
+     * @param string      $bottomLeft     Bottom left char (see #7 of example)
+     * @param string      $midLeft        Mid left char (see #8 of example)
+     * @param string|null $topLeftBottom  Top left bottom char (see #8' of example), equals to $midLeft if null
+     * @param string|null $topMidBottom   Top mid bottom char (see #0' of example), equals to $cross if null
+     * @param string|null $topRightBottom Top right bottom char (see #4' of example), equals to $midRight if null
+     */
+    public function setCrossingChars(string $cross, string $topLeft, string $topMid, string $topRight, string $midRight, string $bottomRight, string $bottomMid, string $bottomLeft, string $midLeft, string $topLeftBottom = null, string $topMidBottom = null, string $topRightBottom = null): self
+    {
+        $this->crossingChar = $cross;
+        $this->crossingTopLeftChar = $topLeft;
+        $this->crossingTopMidChar = $topMid;
+        $this->crossingTopRightChar = $topRight;
+        $this->crossingMidRightChar = $midRight;
+        $this->crossingBottomRightChar = $bottomRight;
+        $this->crossingBottomMidChar = $bottomMid;
+        $this->crossingBottomLeftChar = $bottomLeft;
+        $this->crossingMidLeftChar = $midLeft;
+        $this->crossingTopLeftBottomChar = $topLeftBottom ?? $midLeft;
+        $this->crossingTopMidBottomChar = $topMidBottom ?? $cross;
+        $this->crossingTopRightBottomChar = $topRightBottom ?? $midRight;
+
+        return $this;
+    }
+
+    /**
+     * Sets default crossing character used for each cross.
+     *
+     * @see {@link setCrossingChars()} for setting each crossing individually.
+     */
+    public function setDefaultCrossingChar(string $char): self
+    {
+        return $this->setCrossingChars($char, $char, $char, $char, $char, $char, $char, $char, $char);
     }
 
     /**
@@ -114,12 +263,14 @@ class TableStyle
      * @param string $crossingChar
      *
      * @return $this
+     *
+     * @deprecated since Symfony 4.1. Use {@link setDefaultCrossingChar()} instead.
      */
     public function setCrossingChar($crossingChar)
     {
-        $this->crossingChar = $crossingChar;
+        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1. Use setDefaultCrossingChar() instead.', __METHOD__), E_USER_DEPRECATED);
 
-        return $this;
+        return $this->setDefaultCrossingChar($crossingChar);
     }
 
     /**
@@ -132,6 +283,29 @@ class TableStyle
         return $this->crossingChar;
     }
 
+    /**
+     * Gets crossing characters.
+     *
+     * @internal
+     */
+    public function getCrossingChars(): array
+    {
+        return array(
+            $this->crossingChar,
+            $this->crossingTopLeftChar,
+            $this->crossingTopMidChar,
+            $this->crossingTopRightChar,
+            $this->crossingMidRightChar,
+            $this->crossingBottomRightChar,
+            $this->crossingBottomMidChar,
+            $this->crossingBottomLeftChar,
+            $this->crossingMidLeftChar,
+            $this->crossingTopLeftBottomChar,
+            $this->crossingTopMidBottomChar,
+            $this->crossingTopRightBottomChar,
+        );
+    }
+
     /**
      * Sets header cell format.
      *
@@ -237,7 +411,7 @@ class TableStyle
      */
     public function setPadType($padType)
     {
-        if (!in_array($padType, array(STR_PAD_LEFT, STR_PAD_RIGHT, STR_PAD_BOTH), true)) {
+        if (!\in_array($padType, array(STR_PAD_LEFT, STR_PAD_RIGHT, STR_PAD_BOTH), true)) {
             throw new InvalidArgumentException('Invalid padding type. Expected one of (STR_PAD_LEFT, STR_PAD_RIGHT, STR_PAD_BOTH).');
         }
 
diff --git a/vendor/symfony/console/Input/ArgvInput.php b/vendor/symfony/console/Input/ArgvInput.php
index fd819810..b459ae47 100644
--- a/vendor/symfony/console/Input/ArgvInput.php
+++ b/vendor/symfony/console/Input/ArgvInput.php
@@ -97,7 +97,7 @@ class ArgvInput extends Input
     {
         $name = substr($token, 1);
 
-        if (strlen($name) > 1) {
+        if (\strlen($name) > 1) {
             if ($this->definition->hasShortcut($name[0]) && $this->definition->getOptionForShortcut($name[0])->acceptValue()) {
                 // an option with a value (with no space)
                 $this->addShortOption($name[0], substr($name, 1));
@@ -118,10 +118,11 @@ class ArgvInput extends Input
      */
     private function parseShortOptionSet($name)
     {
-        $len = strlen($name);
+        $len = \strlen($name);
         for ($i = 0; $i < $len; ++$i) {
             if (!$this->definition->hasShortcut($name[$i])) {
-                throw new RuntimeException(sprintf('The "-%s" option does not exist.', $name[$i]));
+                $encoding = mb_detect_encoding($name, null, true);
+                throw new RuntimeException(sprintf('The "-%s" option does not exist.', false === $encoding ? $name[$i] : mb_substr($name, $i, 1, $encoding)));
             }
 
             $option = $this->definition->getOptionForShortcut($name[$i]);
@@ -145,12 +146,7 @@ class ArgvInput extends Input
         $name = substr($token, 2);
 
         if (false !== $pos = strpos($name, '=')) {
-            if (0 === strlen($value = substr($name, $pos + 1))) {
-                // if no value after "=" then substr() returns "" since php7 only, false before
-                // see http://php.net/manual/fr/migration70.incompatible.php#119151
-                if (\PHP_VERSION_ID < 70000 && false === $value) {
-                    $value = '';
-                }
+            if (0 === \strlen($value = substr($name, $pos + 1))) {
                 array_unshift($this->parsed, $value);
             }
             $this->addLongOption(substr($name, 0, $pos), $value);
@@ -168,7 +164,7 @@ class ArgvInput extends Input
      */
     private function parseArgument($token)
     {
-        $c = count($this->arguments);
+        $c = \count($this->arguments);
 
         // if input is expecting another argument, add it
         if ($this->definition->hasArgument($c)) {
@@ -183,7 +179,7 @@ class ArgvInput extends Input
         // unexpected argument
         } else {
             $all = $this->definition->getArguments();
-            if (count($all)) {
+            if (\count($all)) {
                 throw new RuntimeException(sprintf('Too many arguments, expected arguments "%s".', implode('" "', array_keys($all))));
             }
 
@@ -228,11 +224,11 @@ class ArgvInput extends Input
             throw new RuntimeException(sprintf('The "--%s" option does not accept a value.', $name));
         }
 
-        if (in_array($value, array('', null), true) && $option->acceptValue() && count($this->parsed)) {
+        if (\in_array($value, array('', null), true) && $option->acceptValue() && \count($this->parsed)) {
             // if option accepts an optional or mandatory argument
             // let's see if there is one provided
             $next = array_shift($this->parsed);
-            if ((isset($next[0]) && '-' !== $next[0]) || in_array($next, array('', null), true)) {
+            if ((isset($next[0]) && '-' !== $next[0]) || \in_array($next, array('', null), true)) {
                 $value = $next;
             } else {
                 array_unshift($this->parsed, $next);
@@ -303,10 +299,10 @@ class ArgvInput extends Input
         $values = (array) $values;
         $tokens = $this->tokens;
 
-        while (0 < count($tokens)) {
+        while (0 < \count($tokens)) {
             $token = array_shift($tokens);
             if ($onlyParams && '--' === $token) {
-                return false;
+                return $default;
             }
 
             foreach ($values as $value) {
@@ -318,7 +314,7 @@ class ArgvInput extends Input
                 //   For short options, test for '-o' at beginning
                 $leading = 0 === strpos($value, '--') ? $value.'=' : $value;
                 if ('' !== $leading && 0 === strpos($token, $leading)) {
-                    return substr($token, strlen($leading));
+                    return substr($token, \strlen($leading));
                 }
             }
         }
diff --git a/vendor/symfony/console/Input/ArrayInput.php b/vendor/symfony/console/Input/ArrayInput.php
index 4d9797ba..8b6917fc 100644
--- a/vendor/symfony/console/Input/ArrayInput.php
+++ b/vendor/symfony/console/Input/ArrayInput.php
@@ -56,7 +56,7 @@ class ArrayInput extends Input
         $values = (array) $values;
 
         foreach ($this->parameters as $k => $v) {
-            if (!is_int($k)) {
+            if (!\is_int($k)) {
                 $v = $k;
             }
 
@@ -64,7 +64,7 @@ class ArrayInput extends Input
                 return false;
             }
 
-            if (in_array($v, $values)) {
+            if (\in_array($v, $values)) {
                 return true;
             }
         }
@@ -80,15 +80,15 @@ class ArrayInput extends Input
         $values = (array) $values;
 
         foreach ($this->parameters as $k => $v) {
-            if ($onlyParams && ('--' === $k || (is_int($k) && '--' === $v))) {
-                return false;
+            if ($onlyParams && ('--' === $k || (\is_int($k) && '--' === $v))) {
+                return $default;
             }
 
-            if (is_int($k)) {
-                if (in_array($v, $values)) {
+            if (\is_int($k)) {
+                if (\in_array($v, $values)) {
                     return true;
                 }
-            } elseif (in_array($k, $values)) {
+            } elseif (\in_array($k, $values)) {
                 return $v;
             }
         }
@@ -106,7 +106,7 @@ class ArrayInput extends Input
         $params = array();
         foreach ($this->parameters as $param => $val) {
             if ($param && '-' === $param[0]) {
-                if (is_array($val)) {
+                if (\is_array($val)) {
                     foreach ($val as $v) {
                         $params[] = $param.('' != $v ? '='.$this->escapeToken($v) : '');
                     }
@@ -114,7 +114,7 @@ class ArrayInput extends Input
                     $params[] = $param.('' != $val ? '='.$this->escapeToken($val) : '');
                 }
             } else {
-                $params[] = is_array($val) ? implode(' ', array_map(array($this, 'escapeToken'), $val)) : $this->escapeToken($val);
+                $params[] = \is_array($val) ? implode(' ', array_map(array($this, 'escapeToken'), $val)) : $this->escapeToken($val);
             }
         }
 
diff --git a/vendor/symfony/console/Input/Input.php b/vendor/symfony/console/Input/Input.php
index 41413252..fa5644d1 100644
--- a/vendor/symfony/console/Input/Input.php
+++ b/vendor/symfony/console/Input/Input.php
@@ -72,7 +72,7 @@ abstract class Input implements InputInterface, StreamableInputInterface
             return !array_key_exists($argument, $givenArguments) && $definition->getArgument($argument)->isRequired();
         });
 
-        if (count($missingArguments) > 0) {
+        if (\count($missingArguments) > 0) {
             throw new RuntimeException(sprintf('Not enough arguments (missing: "%s").', implode(', ', $missingArguments)));
         }
     }
diff --git a/vendor/symfony/console/Input/InputArgument.php b/vendor/symfony/console/Input/InputArgument.php
index a969d2c5..94e82f0b 100644
--- a/vendor/symfony/console/Input/InputArgument.php
+++ b/vendor/symfony/console/Input/InputArgument.php
@@ -31,18 +31,18 @@ class InputArgument
     private $description;
 
     /**
-     * @param string $name        The argument name
-     * @param int    $mode        The argument mode: self::REQUIRED or self::OPTIONAL
-     * @param string $description A description text
-     * @param mixed  $default     The default value (for self::OPTIONAL mode only)
+     * @param string               $name        The argument name
+     * @param int|null             $mode        The argument mode: self::REQUIRED or self::OPTIONAL
+     * @param string               $description A description text
+     * @param string|string[]|null $default     The default value (for self::OPTIONAL mode only)
      *
      * @throws InvalidArgumentException When argument mode is not valid
      */
-    public function __construct($name, $mode = null, $description = '', $default = null)
+    public function __construct(string $name, int $mode = null, string $description = '', $default = null)
     {
         if (null === $mode) {
             $mode = self::OPTIONAL;
-        } elseif (!is_int($mode) || $mode > 7 || $mode < 1) {
+        } elseif ($mode > 7 || $mode < 1) {
             throw new InvalidArgumentException(sprintf('Argument mode "%s" is not valid.', $mode));
         }
 
@@ -86,7 +86,7 @@ class InputArgument
     /**
      * Sets the default value.
      *
-     * @param mixed $default The default value
+     * @param string|string[]|null $default The default value
      *
      * @throws LogicException When incorrect default value is given
      */
@@ -99,7 +99,7 @@ class InputArgument
         if ($this->isArray()) {
             if (null === $default) {
                 $default = array();
-            } elseif (!is_array($default)) {
+            } elseif (!\is_array($default)) {
                 throw new LogicException('A default value for an array argument must be an array.');
             }
         }
@@ -110,7 +110,7 @@ class InputArgument
     /**
      * Returns the default value.
      *
-     * @return mixed The default value
+     * @return string|string[]|null The default value
      */
     public function getDefault()
     {
diff --git a/vendor/symfony/console/Input/InputDefinition.php b/vendor/symfony/console/Input/InputDefinition.php
index d5b99ab3..21fc67df 100644
--- a/vendor/symfony/console/Input/InputDefinition.php
+++ b/vendor/symfony/console/Input/InputDefinition.php
@@ -20,8 +20,8 @@ use Symfony\Component\Console\Exception\LogicException;
  * Usage:
  *
  *     $definition = new InputDefinition(array(
- *       new InputArgument('name', InputArgument::REQUIRED),
- *       new InputOption('foo', 'f', InputOption::VALUE_REQUIRED),
+ *         new InputArgument('name', InputArgument::REQUIRED),
+ *         new InputOption('foo', 'f', InputOption::VALUE_REQUIRED),
  *     ));
  *
  * @author Fabien Potencier <fabien@symfony.com>
@@ -135,7 +135,7 @@ class InputDefinition
             throw new InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name));
         }
 
-        $arguments = is_int($name) ? array_values($this->arguments) : $this->arguments;
+        $arguments = \is_int($name) ? array_values($this->arguments) : $this->arguments;
 
         return $arguments[$name];
     }
@@ -149,7 +149,7 @@ class InputDefinition
      */
     public function hasArgument($name)
     {
-        $arguments = is_int($name) ? array_values($this->arguments) : $this->arguments;
+        $arguments = \is_int($name) ? array_values($this->arguments) : $this->arguments;
 
         return isset($arguments[$name]);
     }
@@ -171,7 +171,7 @@ class InputDefinition
      */
     public function getArgumentCount()
     {
-        return $this->hasAnArrayArgument ? PHP_INT_MAX : count($this->arguments);
+        return $this->hasAnArrayArgument ? PHP_INT_MAX : \count($this->arguments);
     }
 
     /**
@@ -378,25 +378,25 @@ class InputDefinition
             }
         }
 
-        if (count($elements) && $this->getArguments()) {
+        if (\count($elements) && $this->getArguments()) {
             $elements[] = '[--]';
         }
 
+        $tail = '';
         foreach ($this->getArguments() as $argument) {
             $element = '<'.$argument->getName().'>';
-            if (!$argument->isRequired()) {
-                $element = '['.$element.']';
-            } elseif ($argument->isArray()) {
-                $element = $element.' ('.$element.')';
-            }
-
             if ($argument->isArray()) {
                 $element .= '...';
             }
 
+            if (!$argument->isRequired()) {
+                $element = '['.$element;
+                $tail .= ']';
+            }
+
             $elements[] = $element;
         }
 
-        return implode(' ', $elements);
+        return implode(' ', $elements).$tail;
     }
 }
diff --git a/vendor/symfony/console/Input/InputInterface.php b/vendor/symfony/console/Input/InputInterface.php
index 43810f7a..b9bcf3bb 100644
--- a/vendor/symfony/console/Input/InputInterface.php
+++ b/vendor/symfony/console/Input/InputInterface.php
@@ -61,6 +61,8 @@ interface InputInterface
 
     /**
      * Binds the current Input instance with the given arguments and options.
+     *
+     * @throws RuntimeException
      */
     public function bind(InputDefinition $definition);
 
@@ -83,7 +85,7 @@ interface InputInterface
      *
      * @param string $name The argument name
      *
-     * @return mixed The argument value
+     * @return string|string[]|null The argument value
      *
      * @throws InvalidArgumentException When argument given doesn't exist
      */
@@ -92,8 +94,8 @@ interface InputInterface
     /**
      * Sets an argument value by name.
      *
-     * @param string $name  The argument name
-     * @param string $value The argument value
+     * @param string               $name  The argument name
+     * @param string|string[]|null $value The argument value
      *
      * @throws InvalidArgumentException When argument given doesn't exist
      */
@@ -120,7 +122,7 @@ interface InputInterface
      *
      * @param string $name The option name
      *
-     * @return mixed The option value
+     * @return string|string[]|bool|null The option value
      *
      * @throws InvalidArgumentException When option given doesn't exist
      */
@@ -129,8 +131,8 @@ interface InputInterface
     /**
      * Sets an option value by name.
      *
-     * @param string      $name  The option name
-     * @param string|bool $value The option value
+     * @param string                    $name  The option name
+     * @param string|string[]|bool|null $value The option value
      *
      * @throws InvalidArgumentException When option given doesn't exist
      */
diff --git a/vendor/symfony/console/Input/InputOption.php b/vendor/symfony/console/Input/InputOption.php
index c9da966a..174e871a 100644
--- a/vendor/symfony/console/Input/InputOption.php
+++ b/vendor/symfony/console/Input/InputOption.php
@@ -33,15 +33,15 @@ class InputOption
     private $description;
 
     /**
-     * @param string       $name        The option name
-     * @param string|array $shortcut    The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
-     * @param int          $mode        The option mode: One of the VALUE_* constants
-     * @param string       $description A description text
-     * @param mixed        $default     The default value (must be null for self::VALUE_NONE)
+     * @param string                    $name        The option name
+     * @param string|array              $shortcut    The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
+     * @param int|null                  $mode        The option mode: One of the VALUE_* constants
+     * @param string                    $description A description text
+     * @param string|string[]|bool|null $default     The default value (must be null for self::VALUE_NONE)
      *
      * @throws InvalidArgumentException If option mode is invalid or incompatible
      */
-    public function __construct($name, $shortcut = null, $mode = null, $description = '', $default = null)
+    public function __construct(string $name, $shortcut = null, int $mode = null, string $description = '', $default = null)
     {
         if (0 === strpos($name, '--')) {
             $name = substr($name, 2);
@@ -56,7 +56,7 @@ class InputOption
         }
 
         if (null !== $shortcut) {
-            if (is_array($shortcut)) {
+            if (\is_array($shortcut)) {
                 $shortcut = implode('|', $shortcut);
             }
             $shortcuts = preg_split('{(\|)-?}', ltrim($shortcut, '-'));
@@ -70,7 +70,7 @@ class InputOption
 
         if (null === $mode) {
             $mode = self::VALUE_NONE;
-        } elseif (!is_int($mode) || $mode > 15 || $mode < 1) {
+        } elseif ($mode > 15 || $mode < 1) {
             throw new InvalidArgumentException(sprintf('Option mode "%s" is not valid.', $mode));
         }
 
@@ -149,7 +149,7 @@ class InputOption
     /**
      * Sets the default value.
      *
-     * @param mixed $default The default value
+     * @param string|string[]|bool|null $default The default value
      *
      * @throws LogicException When incorrect default value is given
      */
@@ -162,7 +162,7 @@ class InputOption
         if ($this->isArray()) {
             if (null === $default) {
                 $default = array();
-            } elseif (!is_array($default)) {
+            } elseif (!\is_array($default)) {
                 throw new LogicException('A default value for an array option must be an array.');
             }
         }
@@ -173,7 +173,7 @@ class InputOption
     /**
      * Returns the default value.
      *
-     * @return mixed The default value
+     * @return string|string[]|bool|null The default value
      */
     public function getDefault()
     {
diff --git a/vendor/symfony/console/Input/StringInput.php b/vendor/symfony/console/Input/StringInput.php
index 969b9da7..61e29481 100644
--- a/vendor/symfony/console/Input/StringInput.php
+++ b/vendor/symfony/console/Input/StringInput.php
@@ -30,7 +30,7 @@ class StringInput extends ArgvInput
     /**
      * @param string $input A string representing the parameters from the CLI
      */
-    public function __construct($input)
+    public function __construct(string $input)
     {
         parent::__construct(array());
 
@@ -49,14 +49,14 @@ class StringInput extends ArgvInput
     private function tokenize($input)
     {
         $tokens = array();
-        $length = strlen($input);
+        $length = \strlen($input);
         $cursor = 0;
         while ($cursor < $length) {
             if (preg_match('/\s+/A', $input, $match, null, $cursor)) {
             } elseif (preg_match('/([^="\'\s]+?)(=?)('.self::REGEX_QUOTED_STRING.'+)/A', $input, $match, null, $cursor)) {
-                $tokens[] = $match[1].$match[2].stripcslashes(str_replace(array('"\'', '\'"', '\'\'', '""'), '', substr($match[3], 1, strlen($match[3]) - 2)));
+                $tokens[] = $match[1].$match[2].stripcslashes(str_replace(array('"\'', '\'"', '\'\'', '""'), '', substr($match[3], 1, \strlen($match[3]) - 2)));
             } elseif (preg_match('/'.self::REGEX_QUOTED_STRING.'/A', $input, $match, null, $cursor)) {
-                $tokens[] = stripcslashes(substr($match[0], 1, strlen($match[0]) - 2));
+                $tokens[] = stripcslashes(substr($match[0], 1, \strlen($match[0]) - 2));
             } elseif (preg_match('/'.self::REGEX_STRING.'/A', $input, $match, null, $cursor)) {
                 $tokens[] = stripcslashes($match[1]);
             } else {
@@ -64,7 +64,7 @@ class StringInput extends ArgvInput
                 throw new InvalidArgumentException(sprintf('Unable to parse input near "... %s ..."', substr($input, $cursor, 10)));
             }
 
-            $cursor += strlen($match[0]);
+            $cursor += \strlen($match[0]);
         }
 
         return $tokens;
diff --git a/vendor/symfony/console/Logger/ConsoleLogger.php b/vendor/symfony/console/Logger/ConsoleLogger.php
index 05dd3b96..0f7d551a 100644
--- a/vendor/symfony/console/Logger/ConsoleLogger.php
+++ b/vendor/symfony/console/Logger/ConsoleLogger.php
@@ -14,8 +14,8 @@ namespace Symfony\Component\Console\Logger;
 use Psr\Log\AbstractLogger;
 use Psr\Log\InvalidArgumentException;
 use Psr\Log\LogLevel;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Output\ConsoleOutputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * PSR-3 compliant console logger.
@@ -99,13 +99,8 @@ class ConsoleLogger extends AbstractLogger
      * Interpolates context values into the message placeholders.
      *
      * @author PHP Framework Interoperability Group
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return string
      */
-    private function interpolate($message, array $context)
+    private function interpolate(string $message, array $context): string
     {
         if (false === strpos($message, '{')) {
             return $message;
diff --git a/vendor/symfony/console/Output/ConsoleOutput.php b/vendor/symfony/console/Output/ConsoleOutput.php
index edef356c..e106d4f2 100644
--- a/vendor/symfony/console/Output/ConsoleOutput.php
+++ b/vendor/symfony/console/Output/ConsoleOutput.php
@@ -30,13 +30,14 @@ use Symfony\Component\Console\Formatter\OutputFormatterInterface;
 class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface
 {
     private $stderr;
+    private $consoleSectionOutputs = array();
 
     /**
      * @param int                           $verbosity The verbosity level (one of the VERBOSITY constants in OutputInterface)
      * @param bool|null                     $decorated Whether to decorate messages (null for auto-guessing)
      * @param OutputFormatterInterface|null $formatter Output formatter instance (null to use default OutputFormatter)
      */
-    public function __construct($verbosity = self::VERBOSITY_NORMAL, $decorated = null, OutputFormatterInterface $formatter = null)
+    public function __construct(int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = null, OutputFormatterInterface $formatter = null)
     {
         parent::__construct($this->openOutputStream(), $verbosity, $decorated, $formatter);
 
@@ -48,6 +49,14 @@ class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface
         }
     }
 
+    /**
+     * Creates a new output section.
+     */
+    public function section(): ConsoleSectionOutput
+    {
+        return new ConsoleSectionOutput($this->getStream(), $this->consoleSectionOutputs, $this->getVerbosity(), $this->isDecorated(), $this->getFormatter());
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -122,7 +131,7 @@ class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface
     private function isRunningOS400()
     {
         $checks = array(
-            function_exists('php_uname') ? php_uname('s') : '',
+            \function_exists('php_uname') ? php_uname('s') : '',
             getenv('OSTYPE'),
             PHP_OS,
         );
diff --git a/vendor/symfony/console/Output/ConsoleOutputInterface.php b/vendor/symfony/console/Output/ConsoleOutputInterface.php
index b44ea7e0..f4c2fa62 100644
--- a/vendor/symfony/console/Output/ConsoleOutputInterface.php
+++ b/vendor/symfony/console/Output/ConsoleOutputInterface.php
@@ -13,9 +13,11 @@ namespace Symfony\Component\Console\Output;
 
 /**
  * ConsoleOutputInterface is the interface implemented by ConsoleOutput class.
- * This adds information about stderr output stream.
+ * This adds information about stderr and section output stream.
  *
  * @author Dariusz Górecki <darek.krk@gmail.com>
+ *
+ * @method ConsoleSectionOutput section() Creates a new output section
  */
 interface ConsoleOutputInterface extends OutputInterface
 {
diff --git a/vendor/symfony/console/Output/ConsoleSectionOutput.php b/vendor/symfony/console/Output/ConsoleSectionOutput.php
new file mode 100644
index 00000000..d7e1685b
--- /dev/null
+++ b/vendor/symfony/console/Output/ConsoleSectionOutput.php
@@ -0,0 +1,141 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Output;
+
+use Symfony\Component\Console\Formatter\OutputFormatterInterface;
+use Symfony\Component\Console\Helper\Helper;
+use Symfony\Component\Console\Terminal;
+
+/**
+ * @author Pierre du Plessis <pdples@gmail.com>
+ * @author Gabriel Ostrolucký <gabriel.ostrolucky@gmail.com>
+ */
+class ConsoleSectionOutput extends StreamOutput
+{
+    private $content = array();
+    private $lines = 0;
+    private $sections;
+    private $terminal;
+
+    /**
+     * @param resource               $stream
+     * @param ConsoleSectionOutput[] $sections
+     */
+    public function __construct($stream, array &$sections, int $verbosity, bool $decorated, OutputFormatterInterface $formatter)
+    {
+        parent::__construct($stream, $verbosity, $decorated, $formatter);
+        array_unshift($sections, $this);
+        $this->sections = &$sections;
+        $this->terminal = new Terminal();
+    }
+
+    /**
+     * Clears previous output for this section.
+     *
+     * @param int $lines Number of lines to clear. If null, then the entire output of this section is cleared
+     */
+    public function clear(int $lines = null)
+    {
+        if (empty($this->content) || !$this->isDecorated()) {
+            return;
+        }
+
+        if ($lines) {
+            \array_splice($this->content, -($lines * 2)); // Multiply lines by 2 to cater for each new line added between content
+        } else {
+            $lines = $this->lines;
+            $this->content = array();
+        }
+
+        $this->lines -= $lines;
+
+        parent::doWrite($this->popStreamContentUntilCurrentSection($lines), false);
+    }
+
+    /**
+     * Overwrites the previous output with a new message.
+     *
+     * @param array|string $message
+     */
+    public function overwrite($message)
+    {
+        $this->clear();
+        $this->writeln($message);
+    }
+
+    public function getContent(): string
+    {
+        return implode('', $this->content);
+    }
+
+    /**
+     * @internal
+     */
+    public function addContent(string $input)
+    {
+        foreach (explode(PHP_EOL, $input) as $lineContent) {
+            $this->lines += ceil($this->getDisplayLength($lineContent) / $this->terminal->getWidth()) ?: 1;
+            $this->content[] = $lineContent;
+            $this->content[] = PHP_EOL;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doWrite($message, $newline)
+    {
+        if (!$this->isDecorated()) {
+            return parent::doWrite($message, $newline);
+        }
+
+        $erasedContent = $this->popStreamContentUntilCurrentSection();
+
+        $this->addContent($message);
+
+        parent::doWrite($message, true);
+        parent::doWrite($erasedContent, false);
+    }
+
+    /**
+     * At initial stage, cursor is at the end of stream output. This method makes cursor crawl upwards until it hits
+     * current section. Then it erases content it crawled through. Optionally, it erases part of current section too.
+     */
+    private function popStreamContentUntilCurrentSection(int $numberOfLinesToClearFromCurrentSection = 0): string
+    {
+        $numberOfLinesToClear = $numberOfLinesToClearFromCurrentSection;
+        $erasedContent = array();
+
+        foreach ($this->sections as $section) {
+            if ($section === $this) {
+                break;
+            }
+
+            $numberOfLinesToClear += $section->lines;
+            $erasedContent[] = $section->getContent();
+        }
+
+        if ($numberOfLinesToClear > 0) {
+            // move cursor up n lines
+            parent::doWrite(sprintf("\x1b[%dA", $numberOfLinesToClear), false);
+            // erase to end of screen
+            parent::doWrite("\x1b[0J", false);
+        }
+
+        return implode('', array_reverse($erasedContent));
+    }
+
+    private function getDisplayLength(string $text): string
+    {
+        return Helper::strlenWithoutDecoration($this->getFormatter(), str_replace("\t", '        ', $text));
+    }
+}
diff --git a/vendor/symfony/console/Output/Output.php b/vendor/symfony/console/Output/Output.php
index 371735e1..00852e28 100644
--- a/vendor/symfony/console/Output/Output.php
+++ b/vendor/symfony/console/Output/Output.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Console\Output;
 
-use Symfony\Component\Console\Formatter\OutputFormatterInterface;
 use Symfony\Component\Console\Formatter\OutputFormatter;
+use Symfony\Component\Console\Formatter\OutputFormatterInterface;
 
 /**
  * Base class for output classes.
@@ -37,7 +37,7 @@ abstract class Output implements OutputInterface
      * @param bool                          $decorated Whether to decorate messages
      * @param OutputFormatterInterface|null $formatter Output formatter instance (null to use default OutputFormatter)
      */
-    public function __construct($verbosity = self::VERBOSITY_NORMAL, $decorated = false, OutputFormatterInterface $formatter = null)
+    public function __construct(?int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = false, OutputFormatterInterface $formatter = null)
     {
         $this->verbosity = null === $verbosity ? self::VERBOSITY_NORMAL : $verbosity;
         $this->formatter = $formatter ?: new OutputFormatter();
@@ -137,7 +137,9 @@ abstract class Output implements OutputInterface
      */
     public function write($messages, $newline = false, $options = self::OUTPUT_NORMAL)
     {
-        $messages = (array) $messages;
+        if (!is_iterable($messages)) {
+            $messages = array($messages);
+        }
 
         $types = self::OUTPUT_NORMAL | self::OUTPUT_RAW | self::OUTPUT_PLAIN;
         $type = $types & $options ?: self::OUTPUT_NORMAL;
diff --git a/vendor/symfony/console/Output/OutputInterface.php b/vendor/symfony/console/Output/OutputInterface.php
index cddfbb49..0dfd12b9 100644
--- a/vendor/symfony/console/Output/OutputInterface.php
+++ b/vendor/symfony/console/Output/OutputInterface.php
@@ -33,17 +33,17 @@ interface OutputInterface
     /**
      * Writes a message to the output.
      *
-     * @param string|array $messages The message as an array of lines or a single string
-     * @param bool         $newline  Whether to add a newline
-     * @param int          $options  A bitmask of options (one of the OUTPUT or VERBOSITY constants), 0 is considered the same as self::OUTPUT_NORMAL | self::VERBOSITY_NORMAL
+     * @param string|iterable $messages The message as an iterable of strings or a single string
+     * @param bool            $newline  Whether to add a newline
+     * @param int             $options  A bitmask of options (one of the OUTPUT or VERBOSITY constants), 0 is considered the same as self::OUTPUT_NORMAL | self::VERBOSITY_NORMAL
      */
     public function write($messages, $newline = false, $options = 0);
 
     /**
      * Writes a message to the output and adds a newline at the end.
      *
-     * @param string|array $messages The message as an array of lines of a single string
-     * @param int          $options  A bitmask of options (one of the OUTPUT or VERBOSITY constants), 0 is considered the same as self::OUTPUT_NORMAL | self::VERBOSITY_NORMAL
+     * @param string|iterable $messages The message as an iterable of strings or a single string
+     * @param int             $options  A bitmask of options (one of the OUTPUT or VERBOSITY constants), 0 is considered the same as self::OUTPUT_NORMAL | self::VERBOSITY_NORMAL
      */
     public function writeln($messages, $options = 0);
 
diff --git a/vendor/symfony/console/Output/StreamOutput.php b/vendor/symfony/console/Output/StreamOutput.php
index 5fc5d01e..fe8632b3 100644
--- a/vendor/symfony/console/Output/StreamOutput.php
+++ b/vendor/symfony/console/Output/StreamOutput.php
@@ -20,11 +20,11 @@ use Symfony\Component\Console\Formatter\OutputFormatterInterface;
  *
  * Usage:
  *
- * $output = new StreamOutput(fopen('php://stdout', 'w'));
+ *     $output = new StreamOutput(fopen('php://stdout', 'w'));
  *
  * As `StreamOutput` can use any stream, you can also use a file:
  *
- * $output = new StreamOutput(fopen('/path/to/output.log', 'a', false));
+ *     $output = new StreamOutput(fopen('/path/to/output.log', 'a', false));
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
@@ -40,9 +40,9 @@ class StreamOutput extends Output
      *
      * @throws InvalidArgumentException When first argument is not a real stream
      */
-    public function __construct($stream, $verbosity = self::VERBOSITY_NORMAL, $decorated = null, OutputFormatterInterface $formatter = null)
+    public function __construct($stream, int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = null, OutputFormatterInterface $formatter = null)
     {
-        if (!is_resource($stream) || 'stream' !== get_resource_type($stream)) {
+        if (!\is_resource($stream) || 'stream' !== get_resource_type($stream)) {
             throw new InvalidArgumentException('The StreamOutput class needs a stream as its first argument.');
         }
 
@@ -93,19 +93,23 @@ class StreamOutput extends Output
      */
     protected function hasColorSupport()
     {
-        if (DIRECTORY_SEPARATOR === '\\') {
-            return (function_exists('sapi_windows_vt100_support')
+        if ('Hyper' === getenv('TERM_PROGRAM')) {
+            return true;
+        }
+
+        if (\DIRECTORY_SEPARATOR === '\\') {
+            return (\function_exists('sapi_windows_vt100_support')
                 && @sapi_windows_vt100_support($this->stream))
                 || false !== getenv('ANSICON')
                 || 'ON' === getenv('ConEmuANSI')
                 || 'xterm' === getenv('TERM');
         }
 
-        if (function_exists('stream_isatty')) {
+        if (\function_exists('stream_isatty')) {
             return @stream_isatty($this->stream);
         }
 
-        if (function_exists('posix_isatty')) {
+        if (\function_exists('posix_isatty')) {
             return @posix_isatty($this->stream);
         }
 
diff --git a/vendor/symfony/console/Question/ChoiceQuestion.php b/vendor/symfony/console/Question/ChoiceQuestion.php
index 46cc72a3..4aa6f672 100644
--- a/vendor/symfony/console/Question/ChoiceQuestion.php
+++ b/vendor/symfony/console/Question/ChoiceQuestion.php
@@ -30,7 +30,7 @@ class ChoiceQuestion extends Question
      * @param array  $choices  The list of available choices
      * @param mixed  $default  The default answer to return
      */
-    public function __construct($question, array $choices, $default = null)
+    public function __construct(string $question, array $choices, $default = null)
     {
         if (!$choices) {
             throw new \LogicException('Choice question must have at least 1 choice available.');
@@ -121,12 +121,7 @@ class ChoiceQuestion extends Question
         return $this;
     }
 
-    /**
-     * Returns the default answer validator.
-     *
-     * @return callable
-     */
-    private function getDefaultValidator()
+    private function getDefaultValidator(): callable
     {
         $choices = $this->choices;
         $errorMessage = $this->errorMessage;
@@ -156,7 +151,7 @@ class ChoiceQuestion extends Question
                     }
                 }
 
-                if (count($results) > 1) {
+                if (\count($results) > 1) {
                     throw new InvalidArgumentException(sprintf('The provided answer is ambiguous. Value should be one of %s.', implode(' or ', $results)));
                 }
 
diff --git a/vendor/symfony/console/Question/ConfirmationQuestion.php b/vendor/symfony/console/Question/ConfirmationQuestion.php
index 40f54b4e..26eea6a1 100644
--- a/vendor/symfony/console/Question/ConfirmationQuestion.php
+++ b/vendor/symfony/console/Question/ConfirmationQuestion.php
@@ -25,9 +25,9 @@ class ConfirmationQuestion extends Question
      * @param bool   $default         The default answer to return, true or false
      * @param string $trueAnswerRegex A regex to match the "yes" answer
      */
-    public function __construct($question, $default = true, $trueAnswerRegex = '/^y/i')
+    public function __construct(string $question, bool $default = true, string $trueAnswerRegex = '/^y/i')
     {
-        parent::__construct($question, (bool) $default);
+        parent::__construct($question, $default);
 
         $this->trueAnswerRegex = $trueAnswerRegex;
         $this->setNormalizer($this->getDefaultNormalizer());
@@ -44,7 +44,7 @@ class ConfirmationQuestion extends Question
         $regex = $this->trueAnswerRegex;
 
         return function ($answer) use ($default, $regex) {
-            if (is_bool($answer)) {
+            if (\is_bool($answer)) {
                 return $answer;
             }
 
diff --git a/vendor/symfony/console/Question/Question.php b/vendor/symfony/console/Question/Question.php
index 63afbc4c..593e9f1e 100644
--- a/vendor/symfony/console/Question/Question.php
+++ b/vendor/symfony/console/Question/Question.php
@@ -34,7 +34,7 @@ class Question
      * @param string $question The question to ask to the user
      * @param mixed  $default  The default answer to return if the user enters nothing
      */
-    public function __construct($question, $default = null)
+    public function __construct(string $question, $default = null)
     {
         $this->question = $question;
         $this->default = $default;
@@ -117,7 +117,7 @@ class Question
     /**
      * Gets values for the autocompleter.
      *
-     * @return null|iterable
+     * @return iterable|null
      */
     public function getAutocompleterValues()
     {
@@ -127,7 +127,7 @@ class Question
     /**
      * Sets values for the autocompleter.
      *
-     * @param null|iterable $values
+     * @param iterable|null $values
      *
      * @return $this
      *
@@ -136,11 +136,11 @@ class Question
      */
     public function setAutocompleterValues($values)
     {
-        if (is_array($values)) {
+        if (\is_array($values)) {
             $values = $this->isAssoc($values) ? array_merge(array_keys($values), array_values($values)) : array_values($values);
         }
 
-        if (null !== $values && !is_array($values) && !$values instanceof \Traversable) {
+        if (null !== $values && !\is_array($values) && !$values instanceof \Traversable) {
             throw new InvalidArgumentException('Autocompleter values can be either an array, `null` or a `Traversable` object.');
         }
 
@@ -156,7 +156,7 @@ class Question
     /**
      * Sets a validator for the question.
      *
-     * @param null|callable $validator
+     * @param callable|null $validator
      *
      * @return $this
      */
@@ -170,7 +170,7 @@ class Question
     /**
      * Gets the validator for the question.
      *
-     * @return null|callable
+     * @return callable|null
      */
     public function getValidator()
     {
@@ -182,7 +182,7 @@ class Question
      *
      * Null means an unlimited number of attempts.
      *
-     * @param null|int $attempts
+     * @param int|null $attempts
      *
      * @return $this
      *
@@ -204,7 +204,7 @@ class Question
      *
      * Null means an unlimited number of attempts.
      *
-     * @return null|int
+     * @return int|null
      */
     public function getMaxAttempts()
     {
@@ -241,6 +241,6 @@ class Question
 
     protected function isAssoc($array)
     {
-        return (bool) count(array_filter(array_keys($array), 'is_string'));
+        return (bool) \count(array_filter(array_keys($array), 'is_string'));
     }
 }
diff --git a/vendor/symfony/console/Style/OutputStyle.php b/vendor/symfony/console/Style/OutputStyle.php
index ad886411..b1262b55 100644
--- a/vendor/symfony/console/Style/OutputStyle.php
+++ b/vendor/symfony/console/Style/OutputStyle.php
@@ -13,8 +13,8 @@ namespace Symfony\Component\Console\Style;
 
 use Symfony\Component\Console\Formatter\OutputFormatterInterface;
 use Symfony\Component\Console\Helper\ProgressBar;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Output\ConsoleOutputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Decorates output to add console style guide helpers.
diff --git a/vendor/symfony/console/Style/SymfonyStyle.php b/vendor/symfony/console/Style/SymfonyStyle.php
index 6cf53cd9..eb56a1f7 100644
--- a/vendor/symfony/console/Style/SymfonyStyle.php
+++ b/vendor/symfony/console/Style/SymfonyStyle.php
@@ -46,7 +46,7 @@ class SymfonyStyle extends OutputStyle
         $this->bufferedOutput = new BufferedOutput($output->getVerbosity(), false, clone $output->getFormatter());
         // Windows cmd wraps lines as soon as the terminal width is reached, whether there are following chars or not.
         $width = (new Terminal())->getWidth() ?: self::MAX_LINE_LENGTH;
-        $this->lineLength = min($width - (int) (DIRECTORY_SEPARATOR === '\\'), self::MAX_LINE_LENGTH);
+        $this->lineLength = min($width - (int) (\DIRECTORY_SEPARATOR === '\\'), self::MAX_LINE_LENGTH);
 
         parent::__construct($output);
     }
@@ -63,7 +63,7 @@ class SymfonyStyle extends OutputStyle
      */
     public function block($messages, $type = null, $style = null, $prefix = ' ', $padding = false, $escape = true)
     {
-        $messages = is_array($messages) ? array_values($messages) : array($messages);
+        $messages = \is_array($messages) ? array_values($messages) : array($messages);
 
         $this->autoPrependBlock();
         $this->writeln($this->createBlock($messages, $type, $style, $prefix, $padding, $escape));
@@ -117,7 +117,7 @@ class SymfonyStyle extends OutputStyle
     {
         $this->autoPrependText();
 
-        $messages = is_array($message) ? array_values($message) : array($message);
+        $messages = \is_array($message) ? array_values($message) : array($message);
         foreach ($messages as $message) {
             $this->writeln(sprintf(' %s', $message));
         }
@@ -269,7 +269,7 @@ class SymfonyStyle extends OutputStyle
     {
         $progressBar = parent::createProgressBar($max);
 
-        if ('\\' !== DIRECTORY_SEPARATOR) {
+        if ('\\' !== \DIRECTORY_SEPARATOR || 'Hyper' === getenv('TERM_PROGRAM')) {
             $progressBar->setEmptyBarCharacter('░'); // light shade character \u2591
             $progressBar->setProgressCharacter('');
             $progressBar->setBarCharacter('▓'); // dark shade character \u2593
@@ -306,8 +306,14 @@ class SymfonyStyle extends OutputStyle
      */
     public function writeln($messages, $type = self::OUTPUT_NORMAL)
     {
-        parent::writeln($messages, $type);
-        $this->bufferedOutput->writeln($this->reduceBuffer($messages), $type);
+        if (!is_iterable($messages)) {
+            $messages = array($messages);
+        }
+
+        foreach ($messages as $message) {
+            parent::writeln($message, $type);
+            $this->writeBuffer($message, true, $type);
+        }
     }
 
     /**
@@ -315,8 +321,14 @@ class SymfonyStyle extends OutputStyle
      */
     public function write($messages, $newline = false, $type = self::OUTPUT_NORMAL)
     {
-        parent::write($messages, $newline, $type);
-        $this->bufferedOutput->write($this->reduceBuffer($messages), $newline, $type);
+        if (!is_iterable($messages)) {
+            $messages = array($messages);
+        }
+
+        foreach ($messages as $message) {
+            parent::write($message, $newline, $type);
+            $this->writeBuffer($message, $newline, $type);
+        }
     }
 
     /**
@@ -338,10 +350,7 @@ class SymfonyStyle extends OutputStyle
         return new self($this->input, $this->getErrorOutput());
     }
 
-    /**
-     * @return ProgressBar
-     */
-    private function getProgressBar()
+    private function getProgressBar(): ProgressBar
     {
         if (!$this->progressBar) {
             throw new RuntimeException('The ProgressBar is not started.');
@@ -350,18 +359,20 @@ class SymfonyStyle extends OutputStyle
         return $this->progressBar;
     }
 
-    private function autoPrependBlock()
+    private function autoPrependBlock(): void
     {
         $chars = substr(str_replace(PHP_EOL, "\n", $this->bufferedOutput->fetch()), -2);
 
         if (!isset($chars[0])) {
-            return $this->newLine(); //empty history, so we should start with a new line.
+            $this->newLine(); //empty history, so we should start with a new line.
+
+            return;
         }
         //Prepend new line for each non LF chars (This means no blank line was output before)
         $this->newLine(2 - substr_count($chars, "\n"));
     }
 
-    private function autoPrependText()
+    private function autoPrependText(): void
     {
         $fetched = $this->bufferedOutput->fetch();
         //Prepend new line if last char isn't EOL:
@@ -370,16 +381,14 @@ class SymfonyStyle extends OutputStyle
         }
     }
 
-    private function reduceBuffer($messages)
+    private function writeBuffer(string $message, bool $newLine, int $type): void
     {
         // We need to know if the two last chars are PHP_EOL
         // Preserve the last 4 chars inserted (PHP_EOL on windows is two chars) in the history buffer
-        return array_map(function ($value) {
-            return substr($value, -4);
-        }, array_merge(array($this->bufferedOutput->fetch()), (array) $messages));
+        $this->bufferedOutput->write(substr($message, -4), $newLine, $type);
     }
 
-    private function createBlock($messages, $type = null, $style = null, $prefix = ' ', $padding = false, $escape = false)
+    private function createBlock(iterable $messages, string $type = null, string $style = null, string $prefix = ' ', bool $padding = false, bool $escape = false)
     {
         $indentLength = 0;
         $prefixLength = Helper::strlenWithoutDecoration($this->getFormatter(), $prefix);
@@ -387,7 +396,7 @@ class SymfonyStyle extends OutputStyle
 
         if (null !== $type) {
             $type = sprintf('[%s] ', $type);
-            $indentLength = strlen($type);
+            $indentLength = \strlen($type);
             $lineIndentation = str_repeat(' ', $indentLength);
         }
 
@@ -399,7 +408,7 @@ class SymfonyStyle extends OutputStyle
 
             $lines = array_merge($lines, explode(PHP_EOL, wordwrap($message, $this->lineLength - $prefixLength - $indentLength, PHP_EOL, true)));
 
-            if (count($messages) > 1 && $key < count($messages) - 1) {
+            if (\count($messages) > 1 && $key < \count($messages) - 1) {
                 $lines[] = '';
             }
         }
diff --git a/vendor/symfony/console/Terminal.php b/vendor/symfony/console/Terminal.php
index 927dfc4d..3930ca0c 100644
--- a/vendor/symfony/console/Terminal.php
+++ b/vendor/symfony/console/Terminal.php
@@ -56,7 +56,7 @@ class Terminal
 
     private static function initDimensions()
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             if (preg_match('/^(\d+)x(\d+)(?: \((\d+)x(\d+)\))?$/', trim(getenv('ANSICON')), $matches)) {
                 // extract [w, H] from "wxh (WxH)"
                 // or [w, h] from "wxh"
@@ -87,7 +87,7 @@ class Terminal
      */
     private static function getConsoleMode()
     {
-        if (!function_exists('proc_open')) {
+        if (!\function_exists('proc_open')) {
             return;
         }
 
@@ -96,7 +96,7 @@ class Terminal
             2 => array('pipe', 'w'),
         );
         $process = proc_open('mode CON', $descriptorspec, $pipes, null, null, array('suppress_errors' => true));
-        if (is_resource($process)) {
+        if (\is_resource($process)) {
             $info = stream_get_contents($pipes[1]);
             fclose($pipes[1]);
             fclose($pipes[2]);
@@ -115,7 +115,7 @@ class Terminal
      */
     private static function getSttyColumns()
     {
-        if (!function_exists('proc_open')) {
+        if (!\function_exists('proc_open')) {
             return;
         }
 
@@ -125,7 +125,7 @@ class Terminal
         );
 
         $process = proc_open('stty -a | grep columns', $descriptorspec, $pipes, null, null, array('suppress_errors' => true));
-        if (is_resource($process)) {
+        if (\is_resource($process)) {
             $info = stream_get_contents($pipes[1]);
             fclose($pipes[1]);
             fclose($pipes[2]);
diff --git a/vendor/symfony/console/Tester/ApplicationTester.php b/vendor/symfony/console/Tester/ApplicationTester.php
index c0f8c720..3ae31152 100644
--- a/vendor/symfony/console/Tester/ApplicationTester.php
+++ b/vendor/symfony/console/Tester/ApplicationTester.php
@@ -13,9 +13,7 @@ namespace Symfony\Component\Console\Tester;
 
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\ConsoleOutput;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Output\StreamOutput;
 
 /**
@@ -30,13 +28,11 @@ use Symfony\Component\Console\Output\StreamOutput;
  */
 class ApplicationTester
 {
+    use TesterTrait;
+
     private $application;
     private $input;
     private $statusCode;
-    /**
-     * @var OutputInterface
-     */
-    private $output;
     private $captureStreamsIndependently = false;
 
     public function __construct(Application $application)
@@ -66,6 +62,13 @@ class ApplicationTester
             $this->input->setInteractive($options['interactive']);
         }
 
+        $shellInteractive = getenv('SHELL_INTERACTIVE');
+
+        if ($this->inputs) {
+            $this->input->setStream(self::createStream($this->inputs));
+            putenv('SHELL_INTERACTIVE=1');
+        }
+
         $this->captureStreamsIndependently = array_key_exists('capture_stderr_separately', $options) && $options['capture_stderr_separately'];
         if (!$this->captureStreamsIndependently) {
             $this->output = new StreamOutput(fopen('php://memory', 'w', false));
@@ -97,27 +100,11 @@ class ApplicationTester
             $streamProperty->setValue($this->output, fopen('php://memory', 'w', false));
         }
 
-        return $this->statusCode = $this->application->run($this->input, $this->output);
-    }
-
-    /**
-     * Gets the display returned by the last execution of the application.
-     *
-     * @param bool $normalize Whether to normalize end of lines to \n or not
-     *
-     * @return string The display
-     */
-    public function getDisplay($normalize = false)
-    {
-        rewind($this->output->getStream());
-
-        $display = stream_get_contents($this->output->getStream());
+        $this->statusCode = $this->application->run($this->input, $this->output);
 
-        if ($normalize) {
-            $display = str_replace(PHP_EOL, "\n", $display);
-        }
+        putenv($shellInteractive ? "SHELL_INTERACTIVE=$shellInteractive" : 'SHELL_INTERACTIVE');
 
-        return $display;
+        return $this->statusCode;
     }
 
     /**
@@ -143,34 +130,4 @@ class ApplicationTester
 
         return $display;
     }
-
-    /**
-     * Gets the input instance used by the last execution of the application.
-     *
-     * @return InputInterface The current input instance
-     */
-    public function getInput()
-    {
-        return $this->input;
-    }
-
-    /**
-     * Gets the output instance used by the last execution of the application.
-     *
-     * @return OutputInterface The current output instance
-     */
-    public function getOutput()
-    {
-        return $this->output;
-    }
-
-    /**
-     * Gets the status code returned by the last execution of the application.
-     *
-     * @return int The status code
-     */
-    public function getStatusCode()
-    {
-        return $this->statusCode;
-    }
 }
diff --git a/vendor/symfony/console/Tester/CommandTester.php b/vendor/symfony/console/Tester/CommandTester.php
index 39723b26..ecdc40c0 100644
--- a/vendor/symfony/console/Tester/CommandTester.php
+++ b/vendor/symfony/console/Tester/CommandTester.php
@@ -14,8 +14,6 @@ namespace Symfony\Component\Console\Tester;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\StreamOutput;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Eases the testing of console commands.
@@ -25,10 +23,10 @@ use Symfony\Component\Console\Output\OutputInterface;
  */
 class CommandTester
 {
+    use TesterTrait;
+
     private $command;
     private $input;
-    private $output;
-    private $inputs = array();
     private $statusCode;
 
     public function __construct(Command $command)
@@ -78,79 +76,4 @@ class CommandTester
 
         return $this->statusCode = $this->command->run($this->input, $this->output);
     }
-
-    /**
-     * Gets the display returned by the last execution of the command.
-     *
-     * @param bool $normalize Whether to normalize end of lines to \n or not
-     *
-     * @return string The display
-     */
-    public function getDisplay($normalize = false)
-    {
-        rewind($this->output->getStream());
-
-        $display = stream_get_contents($this->output->getStream());
-
-        if ($normalize) {
-            $display = str_replace(PHP_EOL, "\n", $display);
-        }
-
-        return $display;
-    }
-
-    /**
-     * Gets the input instance used by the last execution of the command.
-     *
-     * @return InputInterface The current input instance
-     */
-    public function getInput()
-    {
-        return $this->input;
-    }
-
-    /**
-     * Gets the output instance used by the last execution of the command.
-     *
-     * @return OutputInterface The current output instance
-     */
-    public function getOutput()
-    {
-        return $this->output;
-    }
-
-    /**
-     * Gets the status code returned by the last execution of the application.
-     *
-     * @return int The status code
-     */
-    public function getStatusCode()
-    {
-        return $this->statusCode;
-    }
-
-    /**
-     * Sets the user inputs.
-     *
-     * @param array $inputs An array of strings representing each input
-     *                      passed to the command input stream
-     *
-     * @return CommandTester
-     */
-    public function setInputs(array $inputs)
-    {
-        $this->inputs = $inputs;
-
-        return $this;
-    }
-
-    private static function createStream(array $inputs)
-    {
-        $stream = fopen('php://memory', 'r+', false);
-
-        fwrite($stream, implode(PHP_EOL, $inputs));
-        rewind($stream);
-
-        return $stream;
-    }
 }
diff --git a/vendor/symfony/console/Tester/TesterTrait.php b/vendor/symfony/console/Tester/TesterTrait.php
new file mode 100644
index 00000000..4e1e0795
--- /dev/null
+++ b/vendor/symfony/console/Tester/TesterTrait.php
@@ -0,0 +1,103 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Tester;
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Output\StreamOutput;
+
+/**
+ * @author Amrouche Hamza <hamza.simperfit@gmail.com>
+ *
+ * @internal
+ */
+trait TesterTrait
+{
+    /** @var StreamOutput */
+    private $output;
+    private $inputs = array();
+
+    /**
+     * Gets the display returned by the last execution of the command or application.
+     *
+     * @param bool $normalize Whether to normalize end of lines to \n or not
+     *
+     * @return string The display
+     */
+    public function getDisplay($normalize = false)
+    {
+        rewind($this->output->getStream());
+
+        $display = stream_get_contents($this->output->getStream());
+
+        if ($normalize) {
+            $display = str_replace(PHP_EOL, "\n", $display);
+        }
+
+        return $display;
+    }
+
+    /**
+     * Gets the input instance used by the last execution of the command or application.
+     *
+     * @return InputInterface The current input instance
+     */
+    public function getInput()
+    {
+        return $this->input;
+    }
+
+    /**
+     * Gets the output instance used by the last execution of the command or application.
+     *
+     * @return OutputInterface The current output instance
+     */
+    public function getOutput()
+    {
+        return $this->output;
+    }
+
+    /**
+     * Gets the status code returned by the last execution of the command or application.
+     *
+     * @return int The status code
+     */
+    public function getStatusCode()
+    {
+        return $this->statusCode;
+    }
+
+    /**
+     * Sets the user inputs.
+     *
+     * @param $inputs array An array of strings representing each input
+     *              passed to the command input stream
+     *
+     * @return self
+     */
+    public function setInputs(array $inputs)
+    {
+        $this->inputs = $inputs;
+
+        return $this;
+    }
+
+    private static function createStream(array $inputs)
+    {
+        $stream = fopen('php://memory', 'r+', false);
+
+        fwrite($stream, implode(PHP_EOL, $inputs));
+        rewind($stream);
+
+        return $stream;
+    }
+}
diff --git a/vendor/symfony/console/Tests/ApplicationTest.php b/vendor/symfony/console/Tests/ApplicationTest.php
index 38389b1b..f6494f45 100644
--- a/vendor/symfony/console/Tests/ApplicationTest.php
+++ b/vendor/symfony/console/Tests/ApplicationTest.php
@@ -16,24 +16,24 @@ use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\CommandLoader\FactoryCommandLoader;
 use Symfony\Component\Console\DependencyInjection\AddConsoleCommandPass;
-use Symfony\Component\Console\Helper\HelperSet;
+use Symfony\Component\Console\Event\ConsoleCommandEvent;
+use Symfony\Component\Console\Event\ConsoleErrorEvent;
+use Symfony\Component\Console\Event\ConsoleTerminateEvent;
+use Symfony\Component\Console\Exception\CommandNotFoundException;
+use Symfony\Component\Console\Exception\NamespaceNotFoundException;
 use Symfony\Component\Console\Helper\FormatterHelper;
+use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Output\Output;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Output\StreamOutput;
 use Symfony\Component\Console\Tester\ApplicationTester;
-use Symfony\Component\Console\Event\ConsoleCommandEvent;
-use Symfony\Component\Console\Event\ConsoleErrorEvent;
-use Symfony\Component\Console\Event\ConsoleExceptionEvent;
-use Symfony\Component\Console\Event\ConsoleTerminateEvent;
-use Symfony\Component\Console\Exception\CommandNotFoundException;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
@@ -57,6 +57,7 @@ class ApplicationTest extends TestCase
         require_once self::$fixturesPath.'/BarBucCommand.php';
         require_once self::$fixturesPath.'/FooSubnamespaced1Command.php';
         require_once self::$fixturesPath.'/FooSubnamespaced2Command.php';
+        require_once self::$fixturesPath.'/FooWithoutAliasCommand.php';
         require_once self::$fixturesPath.'/TestTiti.php';
         require_once self::$fixturesPath.'/TestToto.php';
     }
@@ -276,10 +277,10 @@ class ApplicationTest extends TestCase
         $expectedMsg = "The namespace \"f\" is ambiguous.\nDid you mean one of these?\n    foo\n    foo1";
 
         if (method_exists($this, 'expectException')) {
-            $this->expectException(CommandNotFoundException::class);
+            $this->expectException(NamespaceNotFoundException::class);
             $this->expectExceptionMessage($expectedMsg);
         } else {
-            $this->setExpectedException(CommandNotFoundException::class, $expectedMsg);
+            $this->setExpectedException(NamespaceNotFoundException::class, $expectedMsg);
         }
 
         $application->findNamespace('f');
@@ -294,7 +295,7 @@ class ApplicationTest extends TestCase
     }
 
     /**
-     * @expectedException        \Symfony\Component\Console\Exception\CommandNotFoundException
+     * @expectedException        \Symfony\Component\Console\Exception\NamespaceNotFoundException
      * @expectedExceptionMessage There are no commands defined in the "bar" namespace.
      */
     public function testFindInvalidNamespace()
@@ -458,6 +459,52 @@ class ApplicationTest extends TestCase
         $application->find($name);
     }
 
+    public function testDontRunAlternativeNamespaceName()
+    {
+        $application = new Application();
+        $application->add(new \Foo1Command());
+        $application->setAutoExit(false);
+        $tester = new ApplicationTester($application);
+        $tester->run(array('command' => 'foos:bar1'), array('decorated' => false));
+        $this->assertSame('
+                                                          
+  There are no commands defined in the "foos" namespace.  
+                                                          
+  Did you mean this?                                      
+      foo                                                 
+                                                          
+
+', $tester->getDisplay(true));
+    }
+
+    public function testCanRunAlternativeCommandName()
+    {
+        $application = new Application();
+        $application->add(new \FooWithoutAliasCommand());
+        $application->setAutoExit(false);
+        $tester = new ApplicationTester($application);
+        $tester->setInputs(array('y'));
+        $tester->run(array('command' => 'foos'), array('decorated' => false));
+        $display = trim($tester->getDisplay(true));
+        $this->assertContains('Command "foos" is not defined', $display);
+        $this->assertContains('Do you want to run "foo" instead?  (yes/no) [no]:', $display);
+        $this->assertContains('called', $display);
+    }
+
+    public function testDontRunAlternativeCommandName()
+    {
+        $application = new Application();
+        $application->add(new \FooWithoutAliasCommand());
+        $application->setAutoExit(false);
+        $tester = new ApplicationTester($application);
+        $tester->setInputs(array('n'));
+        $exitCode = $tester->run(array('command' => 'foos'), array('decorated' => false));
+        $this->assertSame(1, $exitCode);
+        $display = trim($tester->getDisplay(true));
+        $this->assertContains('Command "foos" is not defined', $display);
+        $this->assertContains('Do you want to run "foo" instead?  (yes/no) [no]:', $display);
+    }
+
     public function provideInvalidCommandNamesSingle()
     {
         return array(
@@ -575,7 +622,8 @@ class ApplicationTest extends TestCase
             $application->find('foo2:command');
             $this->fail('->find() throws a CommandNotFoundException if namespace does not exist');
         } catch (\Exception $e) {
-            $this->assertInstanceOf('Symfony\Component\Console\Exception\CommandNotFoundException', $e, '->find() throws a CommandNotFoundException if namespace does not exist');
+            $this->assertInstanceOf('Symfony\Component\Console\Exception\NamespaceNotFoundException', $e, '->find() throws a NamespaceNotFoundException if namespace does not exist');
+            $this->assertInstanceOf('Symfony\Component\Console\Exception\CommandNotFoundException', $e, 'NamespaceNotFoundException extends from CommandNotFoundException');
             $this->assertCount(3, $e->getAlternatives());
             $this->assertContains('foo', $e->getAlternatives());
             $this->assertContains('foo1', $e->getAlternatives());
@@ -912,6 +960,30 @@ class ApplicationTest extends TestCase
         $this->assertSame(4, $exitCode, '->run() returns integer exit code extracted from raised exception');
     }
 
+    public function testRunDispatchesIntegerExitCode()
+    {
+        $passedRightValue = false;
+
+        // We can assume here that some other test asserts that the event is dispatched at all
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener('console.terminate', function (ConsoleTerminateEvent $event) use (&$passedRightValue) {
+            $passedRightValue = (4 === $event->getExitCode());
+        });
+
+        $application = new Application();
+        $application->setDispatcher($dispatcher);
+        $application->setAutoExit(false);
+
+        $application->register('test')->setCode(function (InputInterface $input, OutputInterface $output) {
+            throw new \Exception('', 4);
+        });
+
+        $tester = new ApplicationTester($application);
+        $tester->run(array('command' => 'test'));
+
+        $this->assertTrue($passedRightValue, '-> exit code 4 was passed in the console.terminate event');
+    }
+
     public function testRunReturnsExitCodeOneForExceptionCodeZero()
     {
         $exception = new \Exception('', 0);
@@ -927,6 +999,30 @@ class ApplicationTest extends TestCase
         $this->assertSame(1, $exitCode, '->run() returns exit code 1 when exception code is 0');
     }
 
+    public function testRunDispatchesExitCodeOneForExceptionCodeZero()
+    {
+        $passedRightValue = false;
+
+        // We can assume here that some other test asserts that the event is dispatched at all
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener('console.terminate', function (ConsoleTerminateEvent $event) use (&$passedRightValue) {
+            $passedRightValue = (1 === $event->getExitCode());
+        });
+
+        $application = new Application();
+        $application->setDispatcher($dispatcher);
+        $application->setAutoExit(false);
+
+        $application->register('test')->setCode(function (InputInterface $input, OutputInterface $output) {
+            throw new \Exception();
+        });
+
+        $tester = new ApplicationTester($application);
+        $tester->run(array('command' => 'test'));
+
+        $this->assertTrue($passedRightValue, '-> exit code 1 was passed in the console.terminate event');
+    }
+
     /**
      * @expectedException \LogicException
      * @expectedExceptionMessage An option with shortcut "e" already exists.
@@ -1164,9 +1260,6 @@ class ApplicationTest extends TestCase
         $this->assertContains('before.error.after.', $tester->getDisplay());
     }
 
-    /**
-     * @requires PHP 7
-     */
     public function testRunWithError()
     {
         $application = new Application();
@@ -1235,36 +1328,6 @@ class ApplicationTest extends TestCase
         $this->assertEquals(1, $tester->getStatusCode());
     }
 
-    /**
-     * @group legacy
-     * @expectedDeprecation The "ConsoleEvents::EXCEPTION" event is deprecated since Symfony 3.3 and will be removed in 4.0. Listen to the "ConsoleEvents::ERROR" event instead.
-     */
-    public function testLegacyExceptionListenersAreStillTriggered()
-    {
-        $dispatcher = $this->getDispatcher();
-        $dispatcher->addListener('console.exception', function (ConsoleExceptionEvent $event) {
-            $event->getOutput()->write('caught.');
-
-            $event->setException(new \RuntimeException('replaced in caught.'));
-        });
-
-        $application = new Application();
-        $application->setDispatcher($dispatcher);
-        $application->setAutoExit(false);
-
-        $application->register('foo')->setCode(function (InputInterface $input, OutputInterface $output) {
-            throw new \RuntimeException('foo');
-        });
-
-        $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'foo'));
-        $this->assertContains('before.caught.error.after.', $tester->getDisplay());
-        $this->assertContains('replaced in caught.', $tester->getDisplay());
-    }
-
-    /**
-     * @requires PHP 7
-     */
     public function testErrorIsRethrownIfNotHandledByConsoleErrorEvent()
     {
         $application = new Application();
@@ -1287,7 +1350,6 @@ class ApplicationTest extends TestCase
     }
 
     /**
-     * @requires PHP 7
      * @expectedException        \LogicException
      * @expectedExceptionMessage error
      */
@@ -1309,9 +1371,6 @@ class ApplicationTest extends TestCase
         $this->assertContains('before.dym.error.after.', $tester->getDisplay(), 'The PHP Error did not dispached events');
     }
 
-    /**
-     * @requires PHP 7
-     */
     public function testRunDispatchesAllEventsWithError()
     {
         $application = new Application();
@@ -1329,9 +1388,6 @@ class ApplicationTest extends TestCase
         $this->assertContains('before.dym.error.after.', $tester->getDisplay(), 'The PHP Error did not dispached events');
     }
 
-    /**
-     * @requires PHP 7
-     */
     public function testRunWithErrorFailingStatusCode()
     {
         $application = new Application();
@@ -1422,24 +1478,6 @@ class ApplicationTest extends TestCase
         $this->assertEquals('some test value', $extraValue);
     }
 
-    /**
-     * @group legacy
-     */
-    public function testTerminalDimensions()
-    {
-        $application = new Application();
-        $originalDimensions = $application->getTerminalDimensions();
-        $this->assertCount(2, $originalDimensions);
-
-        $width = 80;
-        if ($originalDimensions[0] == $width) {
-            $width = 100;
-        }
-
-        $application->setTerminalDimensions($width, 80);
-        $this->assertSame(array($width, 80), $application->getTerminalDimensions());
-    }
-
     public function testSetRunCustomDefaultCommand()
     {
         $command = new \FooCommand();
@@ -1592,9 +1630,6 @@ class ApplicationTest extends TestCase
         return $dispatcher;
     }
 
-    /**
-     * @requires PHP 7
-     */
     public function testErrorIsRethrownIfNotHandledByConsoleErrorEventWithCatchingEnabled()
     {
         $application = new Application();
@@ -1615,6 +1650,34 @@ class ApplicationTest extends TestCase
         }
     }
 
+    /**
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessage foo
+     */
+    public function testThrowingErrorListener()
+    {
+        $dispatcher = $this->getDispatcher();
+        $dispatcher->addListener('console.error', function (ConsoleErrorEvent $event) {
+            throw new \RuntimeException('foo');
+        });
+
+        $dispatcher->addListener('console.command', function () {
+            throw new \RuntimeException('bar');
+        });
+
+        $application = new Application();
+        $application->setDispatcher($dispatcher);
+        $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
+
+        $application->register('foo')->setCode(function (InputInterface $input, OutputInterface $output) {
+            $output->write('foo.');
+        });
+
+        $tester = new ApplicationTester($application);
+        $tester->run(array('command' => 'foo'));
+    }
+
     protected function tearDown()
     {
         putenv('SHELL_VERBOSITY');
diff --git a/vendor/symfony/console/Tests/Command/CommandTest.php b/vendor/symfony/console/Tests/Command/CommandTest.php
index 4fcbf957..78e4d906 100644
--- a/vendor/symfony/console/Tests/Command/CommandTest.php
+++ b/vendor/symfony/console/Tests/Command/CommandTest.php
@@ -12,16 +12,16 @@
 namespace Symfony\Component\Console\Tests\Command;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\FormatterHelper;
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\StringInput;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Output\NullOutput;
+use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Tester\CommandTester;
 
 class CommandTest extends TestCase
@@ -340,7 +340,7 @@ class CommandTest extends TestCase
         $command->setApplication(new Application());
         $command->setProcessTitle('foo');
         $this->assertSame(0, $command->run(new StringInput(''), new NullOutput()));
-        if (function_exists('cli_set_process_title')) {
+        if (\function_exists('cli_set_process_title')) {
             if (null === @cli_get_process_title() && 'Darwin' === PHP_OS) {
                 $this->markTestSkipped('Running "cli_get_process_title" as an unprivileged user is not supported on MacOS.');
             }
@@ -392,13 +392,7 @@ class CommandTest extends TestCase
         $tester = new CommandTester($command);
         $tester->execute(array());
 
-        if (\PHP_VERSION_ID < 70000) {
-            // Cannot bind static closures in PHP 5
-            $this->assertEquals('interact called'.PHP_EOL.'not bound'.PHP_EOL, $tester->getDisplay());
-        } else {
-            // Can bind static closures in PHP 7
-            $this->assertEquals('interact called'.PHP_EOL.'bound'.PHP_EOL, $tester->getDisplay());
-        }
+        $this->assertEquals('interact called'.PHP_EOL.'bound'.PHP_EOL, $tester->getDisplay());
     }
 
     private static function createClosure()
diff --git a/vendor/symfony/console/Tests/Command/HelpCommandTest.php b/vendor/symfony/console/Tests/Command/HelpCommandTest.php
index 4d618ac1..30fe2b6e 100644
--- a/vendor/symfony/console/Tests/Command/HelpCommandTest.php
+++ b/vendor/symfony/console/Tests/Command/HelpCommandTest.php
@@ -12,10 +12,10 @@
 namespace Symfony\Component\Console\Tests\Command;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\HelpCommand;
 use Symfony\Component\Console\Command\ListCommand;
-use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
 
 class HelpCommandTest extends TestCase
 {
diff --git a/vendor/symfony/console/Tests/Command/ListCommandTest.php b/vendor/symfony/console/Tests/Command/ListCommandTest.php
index 64478ecc..b39f7ec5 100644
--- a/vendor/symfony/console/Tests/Command/ListCommandTest.php
+++ b/vendor/symfony/console/Tests/Command/ListCommandTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Console\Tests\Command;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
 
 class ListCommandTest extends TestCase
 {
diff --git a/vendor/symfony/console/Tests/Command/LockableTraitTest.php b/vendor/symfony/console/Tests/Command/LockableTraitTest.php
index a622d1b4..f5d62d73 100644
--- a/vendor/symfony/console/Tests/Command/LockableTraitTest.php
+++ b/vendor/symfony/console/Tests/Command/LockableTraitTest.php
@@ -41,7 +41,7 @@ class LockableTraitTest extends TestCase
     {
         $command = new \FooLockCommand();
 
-        if (SemaphoreStore::isSupported(false)) {
+        if (SemaphoreStore::isSupported()) {
             $store = new SemaphoreStore();
         } else {
             $store = new FlockStore();
diff --git a/vendor/symfony/console/Tests/DependencyInjection/AddConsoleCommandPassTest.php b/vendor/symfony/console/Tests/DependencyInjection/AddConsoleCommandPassTest.php
index 34f64861..af3e66ec 100644
--- a/vendor/symfony/console/Tests/DependencyInjection/AddConsoleCommandPassTest.php
+++ b/vendor/symfony/console/Tests/DependencyInjection/AddConsoleCommandPassTest.php
@@ -12,10 +12,12 @@
 namespace Symfony\Component\Console\Tests\DependencyInjection;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\CommandLoader\ContainerCommandLoader;
 use Symfony\Component\Console\DependencyInjection\AddConsoleCommandPass;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\TypedReference;
@@ -28,31 +30,30 @@ class AddConsoleCommandPassTest extends TestCase
     public function testProcess($public)
     {
         $container = new ContainerBuilder();
-        $container->addCompilerPass(new AddConsoleCommandPass());
+        $container->addCompilerPass(new AddConsoleCommandPass(), PassConfig::TYPE_BEFORE_REMOVING);
         $container->setParameter('my-command.class', 'Symfony\Component\Console\Tests\DependencyInjection\MyCommand');
 
+        $id = 'my-command';
         $definition = new Definition('%my-command.class%');
         $definition->setPublic($public);
         $definition->addTag('console.command');
-        $container->setDefinition('my-command', $definition);
+        $container->setDefinition($id, $definition);
 
         $container->compile();
 
-        $alias = 'console.command.symfony_component_console_tests_dependencyinjection_mycommand';
+        $alias = 'console.command.public_alias.my-command';
 
         if ($public) {
             $this->assertFalse($container->hasAlias($alias));
-            $id = 'my-command';
         } else {
-            $id = $alias;
             // The alias is replaced by a Definition by the ReplaceAliasByActualDefinitionPass
             // in case the original service is private
-            $this->assertFalse($container->hasDefinition('my-command'));
+            $this->assertFalse($container->hasDefinition($id));
             $this->assertTrue($container->hasDefinition($alias));
         }
 
         $this->assertTrue($container->hasParameter('console.command.ids'));
-        $this->assertSame(array($alias => $id), $container->getParameter('console.command.ids'));
+        $this->assertSame(array($public ? $id : $alias), $container->getParameter('console.command.ids'));
     }
 
     public function testProcessRegistersLazyCommands()
@@ -73,8 +74,7 @@ class AddConsoleCommandPassTest extends TestCase
         $this->assertSame(ContainerCommandLoader::class, $commandLoader->getClass());
         $this->assertSame(array('my:command' => 'my-command', 'my:alias' => 'my-command'), $commandLoader->getArgument(1));
         $this->assertEquals(array(array('my-command' => new ServiceClosureArgument(new TypedReference('my-command', MyCommand::class)))), $commandLocator->getArguments());
-        $this->assertSame(array('console.command.symfony_component_console_tests_dependencyinjection_mycommand' => 'my-command'), $container->getParameter('console.command.ids'));
-        $this->assertSame(array('my-command' => true), $container->getParameter('console.lazy_command.ids'));
+        $this->assertSame(array(), $container->getParameter('console.command.ids'));
         $this->assertSame(array(array('setName', array('my:command')), array('setAliases', array(array('my:alias')))), $command->getMethodCalls());
     }
 
@@ -96,8 +96,7 @@ class AddConsoleCommandPassTest extends TestCase
         $this->assertSame(ContainerCommandLoader::class, $commandLoader->getClass());
         $this->assertSame(array('default' => 'with-default-name'), $commandLoader->getArgument(1));
         $this->assertEquals(array(array('with-default-name' => new ServiceClosureArgument(new TypedReference('with-default-name', NamedCommand::class)))), $commandLocator->getArguments());
-        $this->assertSame(array('console.command.symfony_component_console_tests_dependencyinjection_namedcommand' => 'with-default-name'), $container->getParameter('console.command.ids'));
-        $this->assertSame(array('with-default-name' => true), $container->getParameter('console.lazy_command.ids'));
+        $this->assertSame(array(), $container->getParameter('console.command.ids'));
 
         $container = new ContainerBuilder();
         $container
@@ -127,7 +126,7 @@ class AddConsoleCommandPassTest extends TestCase
     {
         $container = new ContainerBuilder();
         $container->setResourceTracking(false);
-        $container->addCompilerPass(new AddConsoleCommandPass());
+        $container->addCompilerPass(new AddConsoleCommandPass(), PassConfig::TYPE_BEFORE_REMOVING);
 
         $definition = new Definition('Symfony\Component\Console\Tests\DependencyInjection\MyCommand');
         $definition->addTag('console.command');
@@ -145,7 +144,7 @@ class AddConsoleCommandPassTest extends TestCase
     {
         $container = new ContainerBuilder();
         $container->setResourceTracking(false);
-        $container->addCompilerPass(new AddConsoleCommandPass());
+        $container->addCompilerPass(new AddConsoleCommandPass(), PassConfig::TYPE_BEFORE_REMOVING);
 
         $definition = new Definition('SplObjectStorage');
         $definition->addTag('console.command');
@@ -170,10 +169,82 @@ class AddConsoleCommandPassTest extends TestCase
 
         (new AddConsoleCommandPass())->process($container);
 
-        $alias1 = 'console.command.symfony_component_console_tests_dependencyinjection_mycommand';
-        $alias2 = $alias1.'_my-command2';
-        $this->assertTrue($container->hasAlias($alias1));
-        $this->assertTrue($container->hasAlias($alias2));
+        $aliasPrefix = 'console.command.public_alias.';
+        $this->assertTrue($container->hasAlias($aliasPrefix.'my-command1'));
+        $this->assertTrue($container->hasAlias($aliasPrefix.'my-command2'));
+    }
+
+    public function testProcessOnChildDefinitionWithClass()
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new AddConsoleCommandPass(), PassConfig::TYPE_BEFORE_REMOVING);
+        $className = 'Symfony\Component\Console\Tests\DependencyInjection\MyCommand';
+
+        $parentId = 'my-parent-command';
+        $childId = 'my-child-command';
+
+        $parentDefinition = new Definition(/* no class */);
+        $parentDefinition->setAbstract(true)->setPublic(false);
+
+        $childDefinition = new ChildDefinition($parentId);
+        $childDefinition->addTag('console.command')->setPublic(true);
+        $childDefinition->setClass($className);
+
+        $container->setDefinition($parentId, $parentDefinition);
+        $container->setDefinition($childId, $childDefinition);
+
+        $container->compile();
+        $command = $container->get($childId);
+
+        $this->assertInstanceOf($className, $command);
+    }
+
+    public function testProcessOnChildDefinitionWithParentClass()
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new AddConsoleCommandPass(), PassConfig::TYPE_BEFORE_REMOVING);
+        $className = 'Symfony\Component\Console\Tests\DependencyInjection\MyCommand';
+
+        $parentId = 'my-parent-command';
+        $childId = 'my-child-command';
+
+        $parentDefinition = new Definition($className);
+        $parentDefinition->setAbstract(true)->setPublic(false);
+
+        $childDefinition = new ChildDefinition($parentId);
+        $childDefinition->addTag('console.command')->setPublic(true);
+
+        $container->setDefinition($parentId, $parentDefinition);
+        $container->setDefinition($childId, $childDefinition);
+
+        $container->compile();
+        $command = $container->get($childId);
+
+        $this->assertInstanceOf($className, $command);
+    }
+
+    /**
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessage The definition for "my-child-command" has no class.
+     */
+    public function testProcessOnChildDefinitionWithoutClass()
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new AddConsoleCommandPass(), PassConfig::TYPE_BEFORE_REMOVING);
+
+        $parentId = 'my-parent-command';
+        $childId = 'my-child-command';
+
+        $parentDefinition = new Definition();
+        $parentDefinition->setAbstract(true)->setPublic(false);
+
+        $childDefinition = new ChildDefinition($parentId);
+        $childDefinition->addTag('console.command')->setPublic(true);
+
+        $container->setDefinition($parentId, $parentDefinition);
+        $container->setDefinition($childId, $childDefinition);
+
+        $container->compile();
     }
 }
 
diff --git a/vendor/symfony/console/Tests/EventListener/ErrorListenerTest.php b/vendor/symfony/console/Tests/EventListener/ErrorListenerTest.php
index 3794a266..b3f3fb45 100644
--- a/vendor/symfony/console/Tests/EventListener/ErrorListenerTest.php
+++ b/vendor/symfony/console/Tests/EventListener/ErrorListenerTest.php
@@ -20,8 +20,8 @@ use Symfony\Component\Console\EventListener\ErrorListener;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\Input;
-use Symfony\Component\Console\Input\StringInput;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\StringInput;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ErrorListenerTest extends TestCase
diff --git a/vendor/symfony/console/Tests/Fixtures/Foo6Command.php b/vendor/symfony/console/Tests/Fixtures/Foo6Command.php
index 6ae987e4..ef5bd770 100644
--- a/vendor/symfony/console/Tests/Fixtures/Foo6Command.php
+++ b/vendor/symfony/console/Tests/Fixtures/Foo6Command.php
@@ -1,6 +1,5 @@
 <?php
 
-
 use Symfony\Component\Console\Command\Command;
 
 class Foo6Command extends Command
diff --git a/vendor/symfony/console/Tests/Fixtures/FooWithoutAliasCommand.php b/vendor/symfony/console/Tests/Fixtures/FooWithoutAliasCommand.php
new file mode 100644
index 00000000..e301cc5f
--- /dev/null
+++ b/vendor/symfony/console/Tests/Fixtures/FooWithoutAliasCommand.php
@@ -0,0 +1,21 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class FooWithoutAliasCommand extends Command
+{
+    protected function configure()
+    {
+        $this
+            ->setName('foo')
+            ->setDescription('The foo command')
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $output->writeln('called');
+    }
+}
diff --git a/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_4_with_iterators.php b/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_4_with_iterators.php
new file mode 100644
index 00000000..a644fb41
--- /dev/null
+++ b/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_4_with_iterators.php
@@ -0,0 +1,34 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure has single blank line after any text and a title
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+
+    $output->write('Lorem ipsum dolor sit amet');
+    $output->title('First title');
+
+    $output->writeln('Lorem ipsum dolor sit amet');
+    $output->title('Second title');
+
+    $output->write('Lorem ipsum dolor sit amet');
+    $output->write('');
+    $output->title('Third title');
+
+    //Ensure edge case by appending empty strings to history:
+    $output->write('Lorem ipsum dolor sit amet');
+    $output->write(new \ArrayIterator(array('', '', '')));
+    $output->title('Fourth title');
+
+    //Ensure have manual control over number of blank lines:
+    $output->writeln('Lorem ipsum dolor sit amet');
+    $output->writeln(new \ArrayIterator(array('', ''))); //Should append an extra blank line
+    $output->title('Fifth title');
+
+    $output->writeln('Lorem ipsum dolor sit amet');
+    $output->newLine(2); //Should append an extra blank line
+    $output->title('Fifth title');
+};
diff --git a/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_8.php b/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_8.php
index 922ef1f9..16b26b52 100644
--- a/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_8.php
+++ b/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_8.php
@@ -1,9 +1,9 @@
 <?php
 
+use Symfony\Component\Console\Helper\TableCell;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Symfony\Component\Console\Helper\TableCell;
 
 //Ensure formatting tables when using multiple headers with TableCell
 return function (InputInterface $input, OutputInterface $output) {
diff --git a/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_4_with_iterators.txt b/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_4_with_iterators.txt
new file mode 100644
index 00000000..2646d858
--- /dev/null
+++ b/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_4_with_iterators.txt
@@ -0,0 +1,32 @@
+Lorem ipsum dolor sit amet
+
+First title
+===========
+
+Lorem ipsum dolor sit amet
+
+Second title
+============
+
+Lorem ipsum dolor sit amet
+
+Third title
+===========
+
+Lorem ipsum dolor sit amet
+
+Fourth title
+============
+
+Lorem ipsum dolor sit amet
+
+
+Fifth title
+===========
+
+Lorem ipsum dolor sit amet
+
+
+Fifth title
+===========
+
diff --git a/vendor/symfony/console/Tests/Fixtures/application_run2.txt b/vendor/symfony/console/Tests/Fixtures/application_run2.txt
index 65a685d0..90050b05 100644
--- a/vendor/symfony/console/Tests/Fixtures/application_run2.txt
+++ b/vendor/symfony/console/Tests/Fixtures/application_run2.txt
@@ -1,3 +1,6 @@
+Description:
+  Lists commands
+
 Usage:
   list [options] [--] [<namespace>]
 
diff --git a/vendor/symfony/console/Tests/Fixtures/application_run3.txt b/vendor/symfony/console/Tests/Fixtures/application_run3.txt
index 65a685d0..90050b05 100644
--- a/vendor/symfony/console/Tests/Fixtures/application_run3.txt
+++ b/vendor/symfony/console/Tests/Fixtures/application_run3.txt
@@ -1,3 +1,6 @@
+Description:
+  Lists commands
+
 Usage:
   list [options] [--] [<namespace>]
 
diff --git a/vendor/symfony/console/Tests/Fixtures/command_1.txt b/vendor/symfony/console/Tests/Fixtures/command_1.txt
index e5e93ee0..bf5fa3c0 100644
--- a/vendor/symfony/console/Tests/Fixtures/command_1.txt
+++ b/vendor/symfony/console/Tests/Fixtures/command_1.txt
@@ -1,3 +1,6 @@
+<comment>Description:</comment>
+  command 1 description
+
 <comment>Usage:</comment>
   descriptor:command1
   alias1
diff --git a/vendor/symfony/console/Tests/Fixtures/command_2.txt b/vendor/symfony/console/Tests/Fixtures/command_2.txt
index 2864c7bd..45e7bec4 100644
--- a/vendor/symfony/console/Tests/Fixtures/command_2.txt
+++ b/vendor/symfony/console/Tests/Fixtures/command_2.txt
@@ -1,3 +1,6 @@
+<comment>Description:</comment>
+  command 2 description
+
 <comment>Usage:</comment>
   descriptor:command2 [options] [--] \<argument_name>
   descriptor:command2 -o|--option_name \<argument_name>
diff --git a/vendor/symfony/console/Tests/Fixtures/command_mbstring.txt b/vendor/symfony/console/Tests/Fixtures/command_mbstring.txt
index cde457dc..2fd51d05 100644
--- a/vendor/symfony/console/Tests/Fixtures/command_mbstring.txt
+++ b/vendor/symfony/console/Tests/Fixtures/command_mbstring.txt
@@ -1,3 +1,6 @@
+<comment>Description:</comment>
+  command åèä description
+
 <comment>Usage:</comment>
   descriptor:åèä [options] [--] \<argument_åèä>
   descriptor:åèä -o|--option_name \<argument_name>
diff --git a/vendor/symfony/console/Tests/Formatter/OutputFormatterStyleStackTest.php b/vendor/symfony/console/Tests/Formatter/OutputFormatterStyleStackTest.php
index 6cd7c82b..e212bf25 100644
--- a/vendor/symfony/console/Tests/Formatter/OutputFormatterStyleStackTest.php
+++ b/vendor/symfony/console/Tests/Formatter/OutputFormatterStyleStackTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Console\Tests\Formatter;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Console\Formatter\OutputFormatterStyleStack;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
+use Symfony\Component\Console\Formatter\OutputFormatterStyleStack;
 
 class OutputFormatterStyleStackTest extends TestCase
 {
diff --git a/vendor/symfony/console/Tests/Formatter/OutputFormatterTest.php b/vendor/symfony/console/Tests/Formatter/OutputFormatterTest.php
index 4b715c68..c1addbab 100644
--- a/vendor/symfony/console/Tests/Formatter/OutputFormatterTest.php
+++ b/vendor/symfony/console/Tests/Formatter/OutputFormatterTest.php
@@ -196,17 +196,6 @@ class OutputFormatterTest extends TestCase
         );
     }
 
-    /**
-     * @group legacy
-     * @dataProvider provideInlineStyleTagsWithUnknownOptions
-     * @expectedDeprecation Unknown style options are deprecated since Symfony 3.2 and will be removed in 4.0. Exception "Invalid option specified: "%s". Expected one of (bold, underscore, blink, reverse, conceal)".
-     */
-    public function testInlineStyleOptionsUnknownAreDeprecated($tag, $option)
-    {
-        $formatter = new OutputFormatter(true);
-        $formatter->format($tag);
-    }
-
     public function provideInlineStyleTagsWithUnknownOptions()
     {
         return array(
diff --git a/vendor/symfony/console/Tests/Helper/HelperSetTest.php b/vendor/symfony/console/Tests/Helper/HelperSetTest.php
index aceef704..0fdb2cef 100644
--- a/vendor/symfony/console/Tests/Helper/HelperSetTest.php
+++ b/vendor/symfony/console/Tests/Helper/HelperSetTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Console\Tests\Helper;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\HelperSet;
 
 class HelperSetTest extends TestCase
 {
diff --git a/vendor/symfony/console/Tests/Helper/ProcessHelperTest.php b/vendor/symfony/console/Tests/Helper/ProcessHelperTest.php
index eb619539..382c9f4c 100644
--- a/vendor/symfony/console/Tests/Helper/ProcessHelperTest.php
+++ b/vendor/symfony/console/Tests/Helper/ProcessHelperTest.php
@@ -14,8 +14,8 @@ namespace Symfony\Component\Console\Tests\Helper;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Helper\DebugFormatterHelper;
 use Symfony\Component\Console\Helper\HelperSet;
-use Symfony\Component\Console\Output\StreamOutput;
 use Symfony\Component\Console\Helper\ProcessHelper;
+use Symfony\Component\Console\Output\StreamOutput;
 use Symfony\Component\Process\Process;
 
 class ProcessHelperTest extends TestCase
diff --git a/vendor/symfony/console/Tests/Helper/ProgressBarTest.php b/vendor/symfony/console/Tests/Helper/ProgressBarTest.php
index aca64914..d35f336d 100644
--- a/vendor/symfony/console/Tests/Helper/ProgressBarTest.php
+++ b/vendor/symfony/console/Tests/Helper/ProgressBarTest.php
@@ -12,8 +12,10 @@
 namespace Symfony\Component\Console\Tests\Helper;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Console\Helper\ProgressBar;
+use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Helper\Helper;
+use Symfony\Component\Console\Helper\ProgressBar;
+use Symfony\Component\Console\Output\ConsoleSectionOutput;
 use Symfony\Component\Console\Output\StreamOutput;
 
 /**
@@ -310,6 +312,88 @@ class ProgressBarTest extends TestCase
         );
     }
 
+    public function testOverwriteWithSectionOutput()
+    {
+        $sections = array();
+        $stream = $this->getOutputStream(true);
+        $output = new ConsoleSectionOutput($stream->getStream(), $sections, $stream->getVerbosity(), $stream->isDecorated(), new OutputFormatter());
+
+        $bar = new ProgressBar($output, 50);
+        $bar->start();
+        $bar->display();
+        $bar->advance();
+        $bar->advance();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            '  0/50 [>---------------------------]   0%'.PHP_EOL.
+            "\x1b[1A\x1b[0J".'  0/50 [>---------------------------]   0%'.PHP_EOL.
+            "\x1b[1A\x1b[0J".'  1/50 [>---------------------------]   2%'.PHP_EOL.
+            "\x1b[1A\x1b[0J".'  2/50 [=>--------------------------]   4%'.PHP_EOL,
+            stream_get_contents($output->getStream())
+        );
+    }
+
+    public function testOverwriteMultipleProgressBarsWithSectionOutputs()
+    {
+        $sections = array();
+        $stream = $this->getOutputStream(true);
+        $output1 = new ConsoleSectionOutput($stream->getStream(), $sections, $stream->getVerbosity(), $stream->isDecorated(), new OutputFormatter());
+        $output2 = new ConsoleSectionOutput($stream->getStream(), $sections, $stream->getVerbosity(), $stream->isDecorated(), new OutputFormatter());
+
+        $progress = new ProgressBar($output1, 50);
+        $progress2 = new ProgressBar($output2, 50);
+
+        $progress->start();
+        $progress2->start();
+
+        $progress2->advance();
+        $progress->advance();
+
+        rewind($stream->getStream());
+
+        $this->assertEquals(
+            '  0/50 [>---------------------------]   0%'.PHP_EOL.
+            '  0/50 [>---------------------------]   0%'.PHP_EOL.
+            "\x1b[1A\x1b[0J".'  1/50 [>---------------------------]   2%'.PHP_EOL.
+            "\x1b[2A\x1b[0J".'  1/50 [>---------------------------]   2%'.PHP_EOL.
+            "\x1b[1A\x1b[0J".'  1/50 [>---------------------------]   2%'.PHP_EOL.
+            '  1/50 [>---------------------------]   2%'.PHP_EOL,
+            stream_get_contents($stream->getStream())
+        );
+    }
+
+    public function testMultipleSectionsWithCustomFormat()
+    {
+        $sections = array();
+        $stream = $this->getOutputStream(true);
+        $output1 = new ConsoleSectionOutput($stream->getStream(), $sections, $stream->getVerbosity(), $stream->isDecorated(), new OutputFormatter());
+        $output2 = new ConsoleSectionOutput($stream->getStream(), $sections, $stream->getVerbosity(), $stream->isDecorated(), new OutputFormatter());
+
+        ProgressBar::setFormatDefinition('test', '%current%/%max% [%bar%] %percent:3s%% Fruitcake marzipan toffee. Cupcake gummi bears tart dessert ice cream chupa chups cupcake chocolate bar sesame snaps. Croissant halvah cookie jujubes powder macaroon. Fruitcake bear claw bonbon jelly beans oat cake pie muffin Fruitcake marzipan toffee.');
+
+        $progress = new ProgressBar($output1, 50);
+        $progress2 = new ProgressBar($output2, 50);
+        $progress2->setFormat('test');
+
+        $progress->start();
+        $progress2->start();
+
+        $progress->advance();
+        $progress2->advance();
+
+        rewind($stream->getStream());
+
+        $this->assertEquals('  0/50 [>---------------------------]   0%'.PHP_EOL.
+            ' 0/50 [>]   0% Fruitcake marzipan toffee. Cupcake gummi bears tart dessert ice cream chupa chups cupcake chocolate bar sesame snaps. Croissant halvah cookie jujubes powder macaroon. Fruitcake bear claw bonbon jelly beans oat cake pie muffin Fruitcake marzipan toffee.'.PHP_EOL.
+            "\x1b[4A\x1b[0J".' 0/50 [>]   0% Fruitcake marzipan toffee. Cupcake gummi bears tart dessert ice cream chupa chups cupcake chocolate bar sesame snaps. Croissant halvah cookie jujubes powder macaroon. Fruitcake bear claw bonbon jelly beans oat cake pie muffin Fruitcake marzipan toffee.'.PHP_EOL.
+            "\x1b[3A\x1b[0J".'  1/50 [>---------------------------]   2%'.PHP_EOL.
+            ' 0/50 [>]   0% Fruitcake marzipan toffee. Cupcake gummi bears tart dessert ice cream chupa chups cupcake chocolate bar sesame snaps. Croissant halvah cookie jujubes powder macaroon. Fruitcake bear claw bonbon jelly beans oat cake pie muffin Fruitcake marzipan toffee.'.PHP_EOL.
+            "\x1b[3A\x1b[0J".' 1/50 [>]   2% Fruitcake marzipan toffee. Cupcake gummi bears tart dessert ice cream chupa chups cupcake chocolate bar sesame snaps. Croissant halvah cookie jujubes powder macaroon. Fruitcake bear claw bonbon jelly beans oat cake pie muffin Fruitcake marzipan toffee.'.PHP_EOL,
+            stream_get_contents($stream->getStream())
+        );
+    }
+
     public function testStartWithMax()
     {
         $bar = new ProgressBar($output = $this->getOutputStream());
@@ -592,6 +676,29 @@ class ProgressBarTest extends TestCase
         );
     }
 
+    public function testSettingMaxStepsDuringProgressing()
+    {
+        $output = $this->getOutputStream();
+        $bar = new ProgressBar($output);
+        $bar->start();
+        $bar->setProgress(2);
+        $bar->setMaxSteps(10);
+        $bar->setProgress(5);
+        $bar->setMaxSteps(100);
+        $bar->setProgress(10);
+        $bar->finish();
+
+        rewind($output->getStream());
+        $this->assertEquals(
+            rtrim('    0 [>---------------------------]').
+            rtrim($this->generateOutput('    2 [-->-------------------------]')).
+            rtrim($this->generateOutput('  5/10 [==============>-------------]  50%')).
+            rtrim($this->generateOutput('  10/100 [==>-------------------------]  10%')).
+            rtrim($this->generateOutput(' 100/100 [============================] 100%')),
+            stream_get_contents($output->getStream())
+        );
+    }
+
     public function testWithSmallScreen()
     {
         $output = $this->getOutputStream();
diff --git a/vendor/symfony/console/Tests/Helper/QuestionHelperTest.php b/vendor/symfony/console/Tests/Helper/QuestionHelperTest.php
index cf12acdb..67d6981c 100644
--- a/vendor/symfony/console/Tests/Helper/QuestionHelperTest.php
+++ b/vendor/symfony/console/Tests/Helper/QuestionHelperTest.php
@@ -12,9 +12,9 @@
 namespace Symfony\Component\Console\Tests\Helper;
 
 use Symfony\Component\Console\Formatter\OutputFormatter;
-use Symfony\Component\Console\Helper\QuestionHelper;
-use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Helper\FormatterHelper;
+use Symfony\Component\Console\Helper\HelperSet;
+use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Output\StreamOutput;
 use Symfony\Component\Console\Question\ChoiceQuestion;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
@@ -221,7 +221,7 @@ class QuestionHelperTest extends AbstractQuestionHelperTest
 
     public function testAskHiddenResponse()
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('This test is not supported on Windows');
         }
 
@@ -276,7 +276,7 @@ class QuestionHelperTest extends AbstractQuestionHelperTest
 
         $error = 'This is not a color!';
         $validator = function ($color) use ($error) {
-            if (!in_array($color, array('white', 'black'))) {
+            if (!\in_array($color, array('white', 'black'))) {
                 throw new \InvalidArgumentException($error);
             }
 
@@ -490,357 +490,6 @@ class QuestionHelperTest extends AbstractQuestionHelperTest
         $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream("\n")), $output, $question);
     }
 
-    /**
-     * @group legacy
-     */
-    public function testLegacyAskChoice()
-    {
-        $questionHelper = new QuestionHelper();
-
-        $helperSet = new HelperSet(array(new FormatterHelper()));
-        $questionHelper->setHelperSet($helperSet);
-
-        $heroes = array('Superman', 'Batman', 'Spiderman');
-
-        $questionHelper->setInputStream($this->getInputStream("\n1\n  1  \nFabien\n1\nFabien\n1\n0,2\n 0 , 2  \n\n\n"));
-
-        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, '2');
-        $question->setMaxAttempts(1);
-        // first answer is an empty answer, we're supposed to receive the default value
-        $this->assertEquals('Spiderman', $questionHelper->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-
-        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes);
-        $question->setMaxAttempts(1);
-        $this->assertEquals('Batman', $questionHelper->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-        $this->assertEquals('Batman', $questionHelper->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-
-        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes);
-        $question->setErrorMessage('Input "%s" is not a superhero!');
-        $question->setMaxAttempts(2);
-        $this->assertEquals('Batman', $questionHelper->ask($this->createInputInterfaceMock(), $output = $this->createOutputInterface(), $question));
-
-        rewind($output->getStream());
-        $stream = stream_get_contents($output->getStream());
-        $this->assertContains('Input "Fabien" is not a superhero!', $stream);
-
-        try {
-            $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, '1');
-            $question->setMaxAttempts(1);
-            $questionHelper->ask($this->createInputInterfaceMock(), $output = $this->createOutputInterface(), $question);
-            $this->fail();
-        } catch (\InvalidArgumentException $e) {
-            $this->assertEquals('Value "Fabien" is invalid', $e->getMessage());
-        }
-
-        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, null);
-        $question->setMaxAttempts(1);
-        $question->setMultiselect(true);
-
-        $this->assertEquals(array('Batman'), $questionHelper->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-        $this->assertEquals(array('Superman', 'Spiderman'), $questionHelper->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-        $this->assertEquals(array('Superman', 'Spiderman'), $questionHelper->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-
-        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, '0,1');
-        $question->setMaxAttempts(1);
-        $question->setMultiselect(true);
-
-        $this->assertEquals(array('Superman', 'Batman'), $questionHelper->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-
-        $question = new ChoiceQuestion('What is your favorite superhero?', $heroes, ' 0 , 1 ');
-        $question->setMaxAttempts(1);
-        $question->setMultiselect(true);
-
-        $this->assertEquals(array('Superman', 'Batman'), $questionHelper->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testLegacyAsk()
-    {
-        $dialog = new QuestionHelper();
-
-        $dialog->setInputStream($this->getInputStream("\n8AM\n"));
-
-        $question = new Question('What time is it?', '2PM');
-        $this->assertEquals('2PM', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-
-        $question = new Question('What time is it?', '2PM');
-        $this->assertEquals('8AM', $dialog->ask($this->createInputInterfaceMock(), $output = $this->createOutputInterface(), $question));
-
-        rewind($output->getStream());
-        $this->assertEquals('What time is it?', stream_get_contents($output->getStream()));
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testLegacyAskWithAutocomplete()
-    {
-        if (!$this->hasSttyAvailable()) {
-            $this->markTestSkipped('`stty` is required to test autocomplete functionality');
-        }
-
-        // Acm<NEWLINE>
-        // Ac<BACKSPACE><BACKSPACE>s<TAB>Test<NEWLINE>
-        // <NEWLINE>
-        // <UP ARROW><UP ARROW><NEWLINE>
-        // <UP ARROW><UP ARROW><UP ARROW><UP ARROW><UP ARROW><TAB>Test<NEWLINE>
-        // <DOWN ARROW><NEWLINE>
-        // S<BACKSPACE><BACKSPACE><DOWN ARROW><DOWN ARROW><NEWLINE>
-        // F00<BACKSPACE><BACKSPACE>oo<TAB><NEWLINE>
-        $inputStream = $this->getInputStream("Acm\nAc\177\177s\tTest\n\n\033[A\033[A\n\033[A\033[A\033[A\033[A\033[A\tTest\n\033[B\nS\177\177\033[B\033[B\nF00\177\177oo\t\n");
-
-        $dialog = new QuestionHelper();
-        $dialog->setInputStream($inputStream);
-        $helperSet = new HelperSet(array(new FormatterHelper()));
-        $dialog->setHelperSet($helperSet);
-
-        $question = new Question('Please select a bundle', 'FrameworkBundle');
-        $question->setAutocompleterValues(array('AcmeDemoBundle', 'AsseticBundle', 'SecurityBundle', 'FooBundle'));
-
-        $this->assertEquals('AcmeDemoBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-        $this->assertEquals('AsseticBundleTest', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-        $this->assertEquals('FrameworkBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-        $this->assertEquals('SecurityBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-        $this->assertEquals('FooBundleTest', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-        $this->assertEquals('AcmeDemoBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-        $this->assertEquals('AsseticBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-        $this->assertEquals('FooBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testLegacyAskWithAutocompleteWithNonSequentialKeys()
-    {
-        if (!$this->hasSttyAvailable()) {
-            $this->markTestSkipped('`stty` is required to test autocomplete functionality');
-        }
-
-        // <UP ARROW><UP ARROW><NEWLINE><DOWN ARROW><DOWN ARROW><NEWLINE>
-        $inputStream = $this->getInputStream("\033[A\033[A\n\033[B\033[B\n");
-
-        $dialog = new QuestionHelper();
-        $dialog->setInputStream($inputStream);
-        $dialog->setHelperSet(new HelperSet(array(new FormatterHelper())));
-
-        $question = new ChoiceQuestion('Please select a bundle', array(1 => 'AcmeDemoBundle', 4 => 'AsseticBundle'));
-        $question->setMaxAttempts(1);
-
-        $this->assertEquals('AcmeDemoBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-        $this->assertEquals('AsseticBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testLegacyAskHiddenResponse()
-    {
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $this->markTestSkipped('This test is not supported on Windows');
-        }
-
-        $dialog = new QuestionHelper();
-        $dialog->setInputStream($this->getInputStream("8AM\n"));
-
-        $question = new Question('What time is it?');
-        $question->setHidden(true);
-
-        $this->assertEquals('8AM', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-    }
-
-    /**
-     * @group        legacy
-     * @dataProvider getAskConfirmationData
-     */
-    public function testLegacyAskConfirmation($question, $expected, $default = true)
-    {
-        $dialog = new QuestionHelper();
-
-        $dialog->setInputStream($this->getInputStream($question."\n"));
-        $question = new ConfirmationQuestion('Do you like French fries?', $default);
-        $this->assertEquals($expected, $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question), 'confirmation question should '.($expected ? 'pass' : 'cancel'));
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testLegacyAskConfirmationWithCustomTrueAnswer()
-    {
-        $dialog = new QuestionHelper();
-
-        $dialog->setInputStream($this->getInputStream("j\ny\n"));
-        $question = new ConfirmationQuestion('Do you like French fries?', false, '/^(j|y)/i');
-        $this->assertTrue($dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-        $question = new ConfirmationQuestion('Do you like French fries?', false, '/^(j|y)/i');
-        $this->assertTrue($dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testLegacyAskAndValidate()
-    {
-        $dialog = new QuestionHelper();
-        $helperSet = new HelperSet(array(new FormatterHelper()));
-        $dialog->setHelperSet($helperSet);
-
-        $error = 'This is not a color!';
-        $validator = function ($color) use ($error) {
-            if (!in_array($color, array('white', 'black'))) {
-                throw new \InvalidArgumentException($error);
-            }
-
-            return $color;
-        };
-
-        $question = new Question('What color was the white horse of Henry IV?', 'white');
-        $question->setValidator($validator);
-        $question->setMaxAttempts(2);
-
-        $dialog->setInputStream($this->getInputStream("\nblack\n"));
-        $this->assertEquals('white', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-        $this->assertEquals('black', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
-
-        $dialog->setInputStream($this->getInputStream("green\nyellow\norange\n"));
-        try {
-            $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question);
-            $this->fail();
-        } catch (\InvalidArgumentException $e) {
-            $this->assertEquals($error, $e->getMessage());
-        }
-    }
-
-    /**
-     * @group        legacy
-     * @dataProvider simpleAnswerProvider
-     */
-    public function testLegacySelectChoiceFromSimpleChoices($providedAnswer, $expectedValue)
-    {
-        $possibleChoices = array(
-            'My environment 1',
-            'My environment 2',
-            'My environment 3',
-        );
-
-        $dialog = new QuestionHelper();
-        $dialog->setInputStream($this->getInputStream($providedAnswer."\n"));
-        $helperSet = new HelperSet(array(new FormatterHelper()));
-        $dialog->setHelperSet($helperSet);
-
-        $question = new ChoiceQuestion('Please select the environment to load', $possibleChoices);
-        $question->setMaxAttempts(1);
-        $answer = $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question);
-
-        $this->assertSame($expectedValue, $answer);
-    }
-
-    /**
-     * @group        legacy
-     * @dataProvider mixedKeysChoiceListAnswerProvider
-     */
-    public function testLegacyChoiceFromChoicelistWithMixedKeys($providedAnswer, $expectedValue)
-    {
-        $possibleChoices = array(
-            '0' => 'No environment',
-            '1' => 'My environment 1',
-            'env_2' => 'My environment 2',
-            3 => 'My environment 3',
-        );
-
-        $dialog = new QuestionHelper();
-        $dialog->setInputStream($this->getInputStream($providedAnswer."\n"));
-        $helperSet = new HelperSet(array(new FormatterHelper()));
-        $dialog->setHelperSet($helperSet);
-
-        $question = new ChoiceQuestion('Please select the environment to load', $possibleChoices);
-        $question->setMaxAttempts(1);
-        $answer = $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question);
-
-        $this->assertSame($expectedValue, $answer);
-    }
-
-    /**
-     * @group        legacy
-     * @dataProvider answerProvider
-     */
-    public function testLegacySelectChoiceFromChoiceList($providedAnswer, $expectedValue)
-    {
-        $possibleChoices = array(
-            'env_1' => 'My environment 1',
-            'env_2' => 'My environment',
-            'env_3' => 'My environment',
-        );
-
-        $dialog = new QuestionHelper();
-        $dialog->setInputStream($this->getInputStream($providedAnswer."\n"));
-        $helperSet = new HelperSet(array(new FormatterHelper()));
-        $dialog->setHelperSet($helperSet);
-
-        $question = new ChoiceQuestion('Please select the environment to load', $possibleChoices);
-        $question->setMaxAttempts(1);
-        $answer = $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question);
-
-        $this->assertSame($expectedValue, $answer);
-    }
-
-    /**
-     * @group                    legacy
-     * @expectedException        \InvalidArgumentException
-     * @expectedExceptionMessage The provided answer is ambiguous. Value should be one of env_2 or env_3.
-     */
-    public function testLegacyAmbiguousChoiceFromChoicelist()
-    {
-        $possibleChoices = array(
-            'env_1' => 'My first environment',
-            'env_2' => 'My environment',
-            'env_3' => 'My environment',
-        );
-
-        $dialog = new QuestionHelper();
-        $dialog->setInputStream($this->getInputStream("My environment\n"));
-        $helperSet = new HelperSet(array(new FormatterHelper()));
-        $dialog->setHelperSet($helperSet);
-
-        $question = new ChoiceQuestion('Please select the environment to load', $possibleChoices);
-        $question->setMaxAttempts(1);
-
-        $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question);
-    }
-
-    /**
-     * @requires function mb_strwidth
-     * @group legacy
-     */
-    public function testLegacyChoiceOutputFormattingQuestionForUtf8Keys()
-    {
-        $question = 'Lorem ipsum?';
-        $possibleChoices = array(
-            'foo' => 'foo',
-            'żółw' => 'bar',
-            'łabądź' => 'baz',
-        );
-        $outputShown = array(
-            $question,
-            '  [<info>foo   </info>] foo',
-            '  [<info>żółw  </info>] bar',
-            '  [<info>łabądź</info>] baz',
-        );
-        $output = $this->getMockBuilder('\Symfony\Component\Console\Output\OutputInterface')->getMock();
-        $output->method('getFormatter')->willReturn(new OutputFormatter());
-
-        $dialog = new QuestionHelper();
-        $dialog->setInputStream($this->getInputStream("\n"));
-        $helperSet = new HelperSet(array(new FormatterHelper()));
-        $dialog->setHelperSet($helperSet);
-
-        $output->expects($this->once())->method('writeln')->with($this->equalTo($outputShown));
-
-        $question = new ChoiceQuestion($question, $possibleChoices, 'foo');
-        $dialog->ask($this->createInputInterfaceMock(), $output, $question);
-    }
-
     /**
      * @expectedException        \Symfony\Component\Console\Exception\RuntimeException
      * @expectedExceptionMessage Aborted
diff --git a/vendor/symfony/console/Tests/Helper/SymfonyQuestionHelperTest.php b/vendor/symfony/console/Tests/Helper/SymfonyQuestionHelperTest.php
index ce946e5b..9406e5b8 100644
--- a/vendor/symfony/console/Tests/Helper/SymfonyQuestionHelperTest.php
+++ b/vendor/symfony/console/Tests/Helper/SymfonyQuestionHelperTest.php
@@ -6,8 +6,8 @@ use Symfony\Component\Console\Helper\FormatterHelper;
 use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Helper\SymfonyQuestionHelper;
 use Symfony\Component\Console\Output\StreamOutput;
-use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Question\ChoiceQuestion;
+use Symfony\Component\Console\Question\Question;
 
 /**
  * @group tty
@@ -74,6 +74,18 @@ class SymfonyQuestionHelperTest extends AbstractQuestionHelperTest
         $this->assertOutputContains('What is your favorite superhero? [Superman, Batman]', $output);
     }
 
+    public function testAskChoiceWithChoiceValueAsDefault()
+    {
+        $questionHelper = new SymfonyQuestionHelper();
+        $helperSet = new HelperSet(array(new FormatterHelper()));
+        $questionHelper->setHelperSet($helperSet);
+        $question = new ChoiceQuestion('What is your favorite superhero?', array('Superman', 'Batman', 'Spiderman'), 'Batman');
+        $question->setMaxAttempts(1);
+
+        $this->assertSame('Batman', $questionHelper->ask($this->createStreamableInputInterfaceMock($this->getInputStream("Batman\n")), $output = $this->createOutputInterface(), $question));
+        $this->assertOutputContains('What is your favorite superhero? [Batman]', $output);
+    }
+
     public function testAskReturnsNullIfValidatorAllowsIt()
     {
         $questionHelper = new SymfonyQuestionHelper();
diff --git a/vendor/symfony/console/Tests/Helper/TableTest.php b/vendor/symfony/console/Tests/Helper/TableTest.php
index b195e09a..7a9a688a 100644
--- a/vendor/symfony/console/Tests/Helper/TableTest.php
+++ b/vendor/symfony/console/Tests/Helper/TableTest.php
@@ -12,10 +12,12 @@
 namespace Symfony\Component\Console\Tests\Helper;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Helper\Table;
-use Symfony\Component\Console\Helper\TableStyle;
-use Symfony\Component\Console\Helper\TableSeparator;
 use Symfony\Component\Console\Helper\TableCell;
+use Symfony\Component\Console\Helper\TableSeparator;
+use Symfony\Component\Console\Helper\TableStyle;
+use Symfony\Component\Console\Output\ConsoleSectionOutput;
 use Symfony\Component\Console\Output\StreamOutput;
 
 class TableTest extends TestCase
@@ -136,6 +138,45 @@ TABLE
   80-902734-1-6   And Then There Were None   Agatha Christie   
  =============== ========================== ================== 
 
+TABLE
+            ),
+            array(
+                array('ISBN', 'Title', 'Author'),
+                $books,
+                'box',
+                <<<'TABLE'
+┌───────────────┬──────────────────────────┬──────────────────┐
+│ ISBN          │ Title                    │ Author           │
+├───────────────┼──────────────────────────┼──────────────────┤
+│ 99921-58-10-7 │ Divine Comedy            │ Dante Alighieri  │
+│ 9971-5-0210-0 │ A Tale of Two Cities     │ Charles Dickens  │
+│ 960-425-059-0 │ The Lord of the Rings    │ J. R. R. Tolkien │
+│ 80-902734-1-6 │ And Then There Were None │ Agatha Christie  │
+└───────────────┴──────────────────────────┴──────────────────┘
+
+TABLE
+            ),
+            array(
+                array('ISBN', 'Title', 'Author'),
+                array(
+                    array('99921-58-10-7', 'Divine Comedy', 'Dante Alighieri'),
+                    array('9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens'),
+                    new TableSeparator(),
+                    array('960-425-059-0', 'The Lord of the Rings', 'J. R. R. Tolkien'),
+                    array('80-902734-1-6', 'And Then There Were None', 'Agatha Christie'),
+                ),
+                'box-double',
+                <<<'TABLE'
+╔═══════════════╤══════════════════════════╤══════════════════╗
+║ ISBN          │ Title                    │ Author           ║
+╠═══════════════╪══════════════════════════╪══════════════════╣
+║ 99921-58-10-7 │ Divine Comedy            │ Dante Alighieri  ║
+║ 9971-5-0210-0 │ A Tale of Two Cities     │ Charles Dickens  ║
+╟───────────────┼──────────────────────────┼──────────────────╢
+║ 960-425-059-0 │ The Lord of the Rings    │ J. R. R. Tolkien ║
+║ 80-902734-1-6 │ And Then There Were None │ Agatha Christie  ║
+╚═══════════════╧══════════════════════════╧══════════════════╝
+
 TABLE
             ),
             array(
@@ -610,9 +651,9 @@ TABLE;
     {
         $style = new TableStyle();
         $style
-            ->setHorizontalBorderChar('.')
-            ->setVerticalBorderChar('.')
-            ->setCrossingChar('.')
+            ->setHorizontalBorderChars('.')
+            ->setVerticalBorderChars('.')
+            ->setDefaultCrossingChar('.')
         ;
 
         Table::setStyleDefinition('dotfull', $style);
@@ -742,7 +783,7 @@ TABLE;
         $table->render();
     }
 
-    public function testColumnWith()
+    public function testColumnWidth()
     {
         $table = new Table($output = $this->getOutputStream());
         $table
@@ -774,7 +815,7 @@ TABLE;
         $this->assertEquals($expected, $this->getOutputContent($output));
     }
 
-    public function testColumnWiths()
+    public function testColumnWidths()
     {
         $table = new Table($output = $this->getOutputStream());
         $table
@@ -805,6 +846,115 @@ TABLE;
         $this->assertEquals($expected, $this->getOutputContent($output));
     }
 
+    public function testSectionOutput()
+    {
+        $sections = array();
+        $stream = $this->getOutputStream(true);
+        $output = new ConsoleSectionOutput($stream->getStream(), $sections, $stream->getVerbosity(), $stream->isDecorated(), new OutputFormatter());
+        $table = new Table($output);
+        $table
+            ->setHeaders(array('ISBN', 'Title', 'Author', 'Price'))
+            ->setRows(array(
+                array('99921-58-10-7', 'Divine Comedy', 'Dante Alighieri', '9.95'),
+            ));
+
+        $table->render();
+
+        $table->appendRow(array('9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens', '139.25'));
+
+        $expected =
+            <<<TABLE
++---------------+---------------+-----------------+-------+
+|\033[32m ISBN          \033[39m|\033[32m Title         \033[39m|\033[32m Author          \033[39m|\033[32m Price \033[39m|
++---------------+---------------+-----------------+-------+
+| 99921-58-10-7 | Divine Comedy | Dante Alighieri | 9.95  |
++---------------+---------------+-----------------+-------+
+\x1b[5A\x1b[0J+---------------+----------------------+-----------------+--------+
+|\033[32m ISBN          \033[39m|\033[32m Title                \033[39m|\033[32m Author          \033[39m|\033[32m Price  \033[39m|
++---------------+----------------------+-----------------+--------+
+| 99921-58-10-7 | Divine Comedy        | Dante Alighieri | 9.95   |
+| 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens | 139.25 |
++---------------+----------------------+-----------------+--------+
+
+TABLE;
+
+        $this->assertEquals($expected, $this->getOutputContent($output));
+    }
+
+    public function testSectionOutputDoesntClearIfTableIsntRendered()
+    {
+        $sections = array();
+        $stream = $this->getOutputStream(true);
+        $output = new ConsoleSectionOutput($stream->getStream(), $sections, $stream->getVerbosity(), $stream->isDecorated(), new OutputFormatter());
+        $table = new Table($output);
+        $table
+            ->setHeaders(array('ISBN', 'Title', 'Author', 'Price'))
+            ->setRows(array(
+                array('99921-58-10-7', 'Divine Comedy', 'Dante Alighieri', '9.95'),
+            ));
+
+        $table->appendRow(array('9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens', '139.25'));
+
+        $expected =
+            <<<TABLE
++---------------+----------------------+-----------------+--------+
+|\033[32m ISBN          \033[39m|\033[32m Title                \033[39m|\033[32m Author          \033[39m|\033[32m Price  \033[39m|
++---------------+----------------------+-----------------+--------+
+| 99921-58-10-7 | Divine Comedy        | Dante Alighieri | 9.95   |
+| 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens | 139.25 |
++---------------+----------------------+-----------------+--------+
+
+TABLE;
+
+        $this->assertEquals($expected, $this->getOutputContent($output));
+    }
+
+    public function testSectionOutputWithoutDecoration()
+    {
+        $sections = array();
+        $stream = $this->getOutputStream();
+        $output = new ConsoleSectionOutput($stream->getStream(), $sections, $stream->getVerbosity(), $stream->isDecorated(), new OutputFormatter());
+        $table = new Table($output);
+        $table
+            ->setHeaders(array('ISBN', 'Title', 'Author', 'Price'))
+            ->setRows(array(
+                array('99921-58-10-7', 'Divine Comedy', 'Dante Alighieri', '9.95'),
+            ));
+
+        $table->render();
+
+        $table->appendRow(array('9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens', '139.25'));
+
+        $expected =
+            <<<TABLE
++---------------+---------------+-----------------+-------+
+| ISBN          | Title         | Author          | Price |
++---------------+---------------+-----------------+-------+
+| 99921-58-10-7 | Divine Comedy | Dante Alighieri | 9.95  |
++---------------+---------------+-----------------+-------+
++---------------+----------------------+-----------------+--------+
+| ISBN          | Title                | Author          | Price  |
++---------------+----------------------+-----------------+--------+
+| 99921-58-10-7 | Divine Comedy        | Dante Alighieri | 9.95   |
+| 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens | 139.25 |
++---------------+----------------------+-----------------+--------+
+
+TABLE;
+
+        $this->assertEquals($expected, $this->getOutputContent($output));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Console\Exception\RuntimeException
+     * @expectedExceptionMessage Output should be an instance of "Symfony\Component\Console\Output\ConsoleSectionOutput" when calling "Symfony\Component\Console\Helper\Table::appendRow".
+     */
+    public function testAppendRowWithoutSectionOutput()
+    {
+        $table = new Table($this->getOutputStream());
+
+        $table->appendRow(array('9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens', '139.25'));
+    }
+
     /**
      * @expectedException \Symfony\Component\Console\Exception\InvalidArgumentException
      * @expectedExceptionMessage Style "absent" is not defined.
@@ -824,6 +974,42 @@ TABLE;
         Table::getStyleDefinition('absent');
     }
 
+    public function testBoxedStyleWithColspan()
+    {
+        $boxed = new TableStyle();
+        $boxed
+            ->setHorizontalBorderChars('─')
+            ->setVerticalBorderChars('│')
+            ->setCrossingChars('┼', '┌', '┬', '┐', '┤', '┘', '┴', '└', '├')
+        ;
+
+        $table = new Table($output = $this->getOutputStream());
+        $table->setStyle($boxed);
+        $table
+            ->setHeaders(array('ISBN', 'Title', 'Author'))
+            ->setRows(array(
+                array('99921-58-10-7', 'Divine Comedy', 'Dante Alighieri'),
+                new TableSeparator(),
+                array(new TableCell('This value spans 3 columns.', array('colspan' => 3))),
+            ))
+        ;
+        $table->render();
+
+        $expected =
+            <<<TABLE
+┌───────────────┬───────────────┬─────────────────┐
+│ ISBN          │ Title         │ Author          │
+├───────────────┼───────────────┼─────────────────┤
+│ 99921-58-10-7 │ Divine Comedy │ Dante Alighieri │
+├───────────────┼───────────────┼─────────────────┤
+│ This value spans 3 columns.                     │
+└───────────────┴───────────────┴─────────────────┘
+
+TABLE;
+
+        $this->assertSame($expected, $this->getOutputContent($output));
+    }
+
     protected function getOutputStream($decorated = false)
     {
         return new StreamOutput($this->stream, StreamOutput::VERBOSITY_NORMAL, $decorated);
diff --git a/vendor/symfony/console/Tests/Input/ArgvInputTest.php b/vendor/symfony/console/Tests/Input/ArgvInputTest.php
index 61d1723e..b91b6d71 100644
--- a/vendor/symfony/console/Tests/Input/ArgvInputTest.php
+++ b/vendor/symfony/console/Tests/Input/ArgvInputTest.php
@@ -13,8 +13,8 @@ namespace Symfony\Component\Console\Tests\Input;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputOption;
 
 class ArgvInputTest extends TestCase
@@ -246,6 +246,11 @@ class ArgvInputTest extends TestCase
                 new InputDefinition(array(new InputArgument('number'))),
                 'The "-1" option does not exist.',
             ),
+            array(
+                array('cli.php', '-fЩ'),
+                new InputDefinition(array(new InputOption('foo', 'f', InputOption::VALUE_NONE))),
+                'The "-Щ" option does not exist.',
+            ),
         );
     }
 
@@ -395,25 +400,26 @@ class ArgvInputTest extends TestCase
     /**
      * @dataProvider provideGetParameterOptionValues
      */
-    public function testGetParameterOptionEqualSign($argv, $key, $onlyParams, $expected)
+    public function testGetParameterOptionEqualSign($argv, $key, $default, $onlyParams, $expected)
     {
         $input = new ArgvInput($argv);
-        $this->assertEquals($expected, $input->getParameterOption($key, false, $onlyParams), '->getParameterOption() returns the expected value');
+        $this->assertEquals($expected, $input->getParameterOption($key, $default, $onlyParams), '->getParameterOption() returns the expected value');
     }
 
     public function provideGetParameterOptionValues()
     {
         return array(
-            array(array('app/console', 'foo:bar', '-e', 'dev'), '-e', false, 'dev'),
-            array(array('app/console', 'foo:bar', '--env=dev'), '--env', false, 'dev'),
-            array(array('app/console', 'foo:bar', '-e', 'dev'), array('-e', '--env'), false, 'dev'),
-            array(array('app/console', 'foo:bar', '--env=dev'), array('-e', '--env'), false, 'dev'),
-            array(array('app/console', 'foo:bar', '--env=dev', '--en=1'), array('--en'), false, '1'),
-            array(array('app/console', 'foo:bar', '--env=dev', '', '--en=1'), array('--en'), false, '1'),
-            array(array('app/console', 'foo:bar', '--env', 'val'), '--env', false, 'val'),
-            array(array('app/console', 'foo:bar', '--env', 'val', '--dummy'), '--env', false, 'val'),
-            array(array('app/console', 'foo:bar', '--', '--env=dev'), '--env', false, 'dev'),
-            array(array('app/console', 'foo:bar', '--', '--env=dev'), '--env', true, false),
+            array(array('app/console', 'foo:bar'), '-e', 'default', false, 'default'),
+            array(array('app/console', 'foo:bar', '-e', 'dev'), '-e', 'default', false, 'dev'),
+            array(array('app/console', 'foo:bar', '--env=dev'), '--env', 'default', false, 'dev'),
+            array(array('app/console', 'foo:bar', '-e', 'dev'), array('-e', '--env'), 'default', false, 'dev'),
+            array(array('app/console', 'foo:bar', '--env=dev'), array('-e', '--env'), 'default', false, 'dev'),
+            array(array('app/console', 'foo:bar', '--env=dev', '--en=1'), array('--en'), 'default', false, '1'),
+            array(array('app/console', 'foo:bar', '--env=dev', '', '--en=1'), array('--en'), 'default', false, '1'),
+            array(array('app/console', 'foo:bar', '--env', 'val'), '--env', 'default', false, 'val'),
+            array(array('app/console', 'foo:bar', '--env', 'val', '--dummy'), '--env', 'default', false, 'val'),
+            array(array('app/console', 'foo:bar', '--', '--env=dev'), '--env', 'default', false, 'dev'),
+            array(array('app/console', 'foo:bar', '--', '--env=dev'), '--env', 'default', true, 'default'),
         );
     }
 
diff --git a/vendor/symfony/console/Tests/Input/ArrayInputTest.php b/vendor/symfony/console/Tests/Input/ArrayInputTest.php
index 6b443e0b..4bc83b3c 100644
--- a/vendor/symfony/console/Tests/Input/ArrayInputTest.php
+++ b/vendor/symfony/console/Tests/Input/ArrayInputTest.php
@@ -13,8 +13,8 @@ namespace Symfony\Component\Console\Tests\Input;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputOption;
 
 class ArrayInputTest extends TestCase
@@ -47,14 +47,14 @@ class ArrayInputTest extends TestCase
     {
         $input = new ArrayInput(array('name' => 'Fabien', '--foo' => 'bar'));
         $this->assertEquals('bar', $input->getParameterOption('--foo'), '->getParameterOption() returns the option of specified name');
-        $this->assertFalse($input->getParameterOption('--bar'), '->getParameterOption() returns the default if an option is not present in the passed parameters');
+        $this->assertEquals('default', $input->getParameterOption('--bar', 'default'), '->getParameterOption() returns the default value if an option is not present in the passed parameters');
 
         $input = new ArrayInput(array('Fabien', '--foo' => 'bar'));
         $this->assertEquals('bar', $input->getParameterOption('--foo'), '->getParameterOption() returns the option of specified name');
 
         $input = new ArrayInput(array('--foo', '--', '--bar' => 'woop'));
         $this->assertEquals('woop', $input->getParameterOption('--bar'), '->getParameterOption() returns the correct value if an option is present in the passed parameters');
-        $this->assertFalse($input->getParameterOption('--bar', false, true), '->getParameterOption() returns false if an option is present in the passed parameters after an end of options signal');
+        $this->assertEquals('default', $input->getParameterOption('--bar', 'default', true), '->getParameterOption() returns the default value if an option is present in the passed parameters after an end of options signal');
     }
 
     public function testParseArguments()
diff --git a/vendor/symfony/console/Tests/Input/InputArgumentTest.php b/vendor/symfony/console/Tests/Input/InputArgumentTest.php
index 66af98b3..881300c2 100644
--- a/vendor/symfony/console/Tests/Input/InputArgumentTest.php
+++ b/vendor/symfony/console/Tests/Input/InputArgumentTest.php
@@ -38,26 +38,12 @@ class InputArgumentTest extends TestCase
     }
 
     /**
-     * @dataProvider provideInvalidModes
+     * @expectedException        \InvalidArgumentException
+     * @expectedExceptionMessage Argument mode "-1" is not valid.
      */
-    public function testInvalidModes($mode)
+    public function testInvalidModes()
     {
-        if (method_exists($this, 'expectException')) {
-            $this->expectException('InvalidArgumentException');
-            $this->expectExceptionMessage(sprintf('Argument mode "%s" is not valid.', $mode));
-        } else {
-            $this->setExpectedException('InvalidArgumentException', sprintf('Argument mode "%s" is not valid.', $mode));
-        }
-
-        new InputArgument('foo', $mode);
-    }
-
-    public function provideInvalidModes()
-    {
-        return array(
-            array('ANOTHER_ONE'),
-            array(-1),
-        );
+        new InputArgument('foo', '-1');
     }
 
     public function testIsArray()
diff --git a/vendor/symfony/console/Tests/Input/InputDefinitionTest.php b/vendor/symfony/console/Tests/Input/InputDefinitionTest.php
index 1374ddfd..0fd43421 100644
--- a/vendor/symfony/console/Tests/Input/InputDefinitionTest.php
+++ b/vendor/symfony/console/Tests/Input/InputDefinitionTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Console\Tests\Input;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputOption;
 
 class InputDefinitionTest extends TestCase
@@ -374,8 +374,9 @@ class InputDefinitionTest extends TestCase
 
             array(new InputDefinition(array(new InputArgument('foo', InputArgument::REQUIRED))), '<foo>', 'puts arguments in angle brackets'),
             array(new InputDefinition(array(new InputArgument('foo'))), '[<foo>]', 'puts optional arguments in square brackets'),
-            array(new InputDefinition(array(new InputArgument('foo', InputArgument::IS_ARRAY))), '[<foo>]...', 'uses an ellipsis for array arguments'),
-            array(new InputDefinition(array(new InputArgument('foo', InputArgument::REQUIRED | InputArgument::IS_ARRAY))), '<foo> (<foo>)...', 'uses parenthesis and ellipsis for required array arguments'),
+            array(new InputDefinition(array(new InputArgument('foo'), new InputArgument('bar'))), '[<foo> [<bar>]]', 'chains optional arguments inside brackets'),
+            array(new InputDefinition(array(new InputArgument('foo', InputArgument::IS_ARRAY))), '[<foo>...]', 'uses an ellipsis for array arguments'),
+            array(new InputDefinition(array(new InputArgument('foo', InputArgument::REQUIRED | InputArgument::IS_ARRAY))), '<foo>...', 'uses an ellipsis for required array arguments'),
 
             array(new InputDefinition(array(new InputOption('foo'), new InputArgument('foo', InputArgument::REQUIRED))), '[--foo] [--] <foo>', 'puts [--] between options and arguments'),
         );
diff --git a/vendor/symfony/console/Tests/Input/InputOptionTest.php b/vendor/symfony/console/Tests/Input/InputOptionTest.php
index 943bf607..66a6dd5a 100644
--- a/vendor/symfony/console/Tests/Input/InputOptionTest.php
+++ b/vendor/symfony/console/Tests/Input/InputOptionTest.php
@@ -74,26 +74,12 @@ class InputOptionTest extends TestCase
     }
 
     /**
-     * @dataProvider provideInvalidModes
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Option mode "-1" is not valid.
      */
-    public function testInvalidModes($mode)
-    {
-        if (method_exists($this, 'expectException')) {
-            $this->expectException('InvalidArgumentException');
-            $this->expectExceptionMessage(sprintf('Option mode "%s" is not valid.', $mode));
-        } else {
-            $this->setExpectedException('InvalidArgumentException', sprintf('Option mode "%s" is not valid.', $mode));
-        }
-
-        new InputOption('foo', 'f', $mode);
-    }
-
-    public function provideInvalidModes()
+    public function testInvalidModes()
     {
-        return array(
-            array('ANOTHER_ONE'),
-            array(-1),
-        );
+        new InputOption('foo', 'f', '-1');
     }
 
     /**
diff --git a/vendor/symfony/console/Tests/Input/InputTest.php b/vendor/symfony/console/Tests/Input/InputTest.php
index 4410d2f5..7cf1d244 100644
--- a/vendor/symfony/console/Tests/Input/InputTest.php
+++ b/vendor/symfony/console/Tests/Input/InputTest.php
@@ -13,8 +13,8 @@ namespace Symfony\Component\Console\Tests\Input;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputOption;
 
 class InputTest extends TestCase
diff --git a/vendor/symfony/console/Tests/Logger/ConsoleLoggerTest.php b/vendor/symfony/console/Tests/Logger/ConsoleLoggerTest.php
index 734a153e..95e78fc2 100644
--- a/vendor/symfony/console/Tests/Logger/ConsoleLoggerTest.php
+++ b/vendor/symfony/console/Tests/Logger/ConsoleLoggerTest.php
@@ -16,8 +16,8 @@ use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
 use Symfony\Component\Console\Logger\ConsoleLogger;
 use Symfony\Component\Console\Output\BufferedOutput;
-use Symfony\Component\Console\Tests\Fixtures\DummyOutput;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Tests\Fixtures\DummyOutput;
 
 /**
  * Console logger test.
diff --git a/vendor/symfony/console/Tests/Output/ConsoleSectionOutputTest.php b/vendor/symfony/console/Tests/Output/ConsoleSectionOutputTest.php
new file mode 100644
index 00000000..e5cd0597
--- /dev/null
+++ b/vendor/symfony/console/Tests/Output/ConsoleSectionOutputTest.php
@@ -0,0 +1,163 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Tests\Output;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Formatter\OutputFormatter;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\StreamableInputInterface;
+use Symfony\Component\Console\Output\ConsoleSectionOutput;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Output\StreamOutput;
+use Symfony\Component\Console\Question\Question;
+
+class ConsoleSectionOutputTest extends TestCase
+{
+    private $stream;
+
+    protected function setUp()
+    {
+        $this->stream = fopen('php://memory', 'r+b', false);
+    }
+
+    protected function tearDown()
+    {
+        $this->stream = null;
+    }
+
+    public function testClearAll()
+    {
+        $sections = array();
+        $output = new ConsoleSectionOutput($this->stream, $sections, OutputInterface::VERBOSITY_NORMAL, true, new OutputFormatter());
+
+        $output->writeln('Foo'.PHP_EOL.'Bar');
+        $output->clear();
+
+        rewind($output->getStream());
+        $this->assertEquals('Foo'.PHP_EOL.'Bar'.PHP_EOL.sprintf("\x1b[%dA", 2)."\x1b[0J", stream_get_contents($output->getStream()));
+    }
+
+    public function testClearNumberOfLines()
+    {
+        $sections = array();
+        $output = new ConsoleSectionOutput($this->stream, $sections, OutputInterface::VERBOSITY_NORMAL, true, new OutputFormatter());
+
+        $output->writeln("Foo\nBar\nBaz\nFooBar");
+        $output->clear(2);
+
+        rewind($output->getStream());
+        $this->assertEquals("Foo\nBar\nBaz\nFooBar".PHP_EOL.sprintf("\x1b[%dA", 2)."\x1b[0J", stream_get_contents($output->getStream()));
+    }
+
+    public function testClearNumberOfLinesWithMultipleSections()
+    {
+        $output = new StreamOutput($this->stream);
+        $sections = array();
+        $output1 = new ConsoleSectionOutput($output->getStream(), $sections, OutputInterface::VERBOSITY_NORMAL, true, new OutputFormatter());
+        $output2 = new ConsoleSectionOutput($output->getStream(), $sections, OutputInterface::VERBOSITY_NORMAL, true, new OutputFormatter());
+
+        $output2->writeln('Foo');
+        $output2->writeln('Bar');
+        $output2->clear(1);
+        $output1->writeln('Baz');
+
+        rewind($output->getStream());
+
+        $this->assertEquals('Foo'.PHP_EOL.'Bar'.PHP_EOL."\x1b[1A\x1b[0J\e[1A\e[0J".'Baz'.PHP_EOL.'Foo'.PHP_EOL, stream_get_contents($output->getStream()));
+    }
+
+    public function testClearPreservingEmptyLines()
+    {
+        $output = new StreamOutput($this->stream);
+        $sections = array();
+        $output1 = new ConsoleSectionOutput($output->getStream(), $sections, OutputInterface::VERBOSITY_NORMAL, true, new OutputFormatter());
+        $output2 = new ConsoleSectionOutput($output->getStream(), $sections, OutputInterface::VERBOSITY_NORMAL, true, new OutputFormatter());
+
+        $output2->writeln(PHP_EOL.'foo');
+        $output2->clear(1);
+        $output1->writeln('bar');
+
+        rewind($output->getStream());
+
+        $this->assertEquals(PHP_EOL.'foo'.PHP_EOL."\x1b[1A\x1b[0J\x1b[1A\x1b[0J".'bar'.PHP_EOL.PHP_EOL, stream_get_contents($output->getStream()));
+    }
+
+    public function testOverwrite()
+    {
+        $sections = array();
+        $output = new ConsoleSectionOutput($this->stream, $sections, OutputInterface::VERBOSITY_NORMAL, true, new OutputFormatter());
+
+        $output->writeln('Foo');
+        $output->overwrite('Bar');
+
+        rewind($output->getStream());
+        $this->assertEquals('Foo'.PHP_EOL."\x1b[1A\x1b[0JBar".PHP_EOL, stream_get_contents($output->getStream()));
+    }
+
+    public function testOverwriteMultipleLines()
+    {
+        $sections = array();
+        $output = new ConsoleSectionOutput($this->stream, $sections, OutputInterface::VERBOSITY_NORMAL, true, new OutputFormatter());
+
+        $output->writeln('Foo'.PHP_EOL.'Bar'.PHP_EOL.'Baz');
+        $output->overwrite('Bar');
+
+        rewind($output->getStream());
+        $this->assertEquals('Foo'.PHP_EOL.'Bar'.PHP_EOL.'Baz'.PHP_EOL.sprintf("\x1b[%dA", 3)."\x1b[0J".'Bar'.PHP_EOL, stream_get_contents($output->getStream()));
+    }
+
+    public function testAddingMultipleSections()
+    {
+        $sections = array();
+        $output1 = new ConsoleSectionOutput($this->stream, $sections, OutputInterface::VERBOSITY_NORMAL, true, new OutputFormatter());
+        $output2 = new ConsoleSectionOutput($this->stream, $sections, OutputInterface::VERBOSITY_NORMAL, true, new OutputFormatter());
+
+        $this->assertCount(2, $sections);
+    }
+
+    public function testMultipleSectionsOutput()
+    {
+        $output = new StreamOutput($this->stream);
+        $sections = array();
+        $output1 = new ConsoleSectionOutput($output->getStream(), $sections, OutputInterface::VERBOSITY_NORMAL, true, new OutputFormatter());
+        $output2 = new ConsoleSectionOutput($output->getStream(), $sections, OutputInterface::VERBOSITY_NORMAL, true, new OutputFormatter());
+
+        $output1->writeln('Foo');
+        $output2->writeln('Bar');
+
+        $output1->overwrite('Baz');
+        $output2->overwrite('Foobar');
+
+        rewind($output->getStream());
+        $this->assertEquals('Foo'.PHP_EOL.'Bar'.PHP_EOL."\x1b[2A\x1b[0JBar".PHP_EOL."\x1b[1A\x1b[0JBaz".PHP_EOL.'Bar'.PHP_EOL."\x1b[1A\x1b[0JFoobar".PHP_EOL, stream_get_contents($output->getStream()));
+    }
+
+    public function testClearSectionContainingQuestion()
+    {
+        $inputStream = fopen('php://memory', 'r+b', false);
+        fwrite($inputStream, "Batman & Robin\n");
+        rewind($inputStream);
+
+        $input = $this->getMockBuilder(StreamableInputInterface::class)->getMock();
+        $input->expects($this->once())->method('isInteractive')->willReturn(true);
+        $input->expects($this->once())->method('getStream')->willReturn($inputStream);
+
+        $sections = array();
+        $output = new ConsoleSectionOutput($this->stream, $sections, OutputInterface::VERBOSITY_NORMAL, true, new OutputFormatter());
+
+        (new QuestionHelper())->ask($input, $output, new Question('What\'s your favorite super hero?'));
+        $output->clear();
+
+        rewind($output->getStream());
+        $this->assertSame('What\'s your favorite super hero?'.PHP_EOL."\x1b[2A\x1b[0J", stream_get_contents($output->getStream()));
+    }
+}
diff --git a/vendor/symfony/console/Tests/Output/OutputTest.php b/vendor/symfony/console/Tests/Output/OutputTest.php
index d8330d0b..24347f62 100644
--- a/vendor/symfony/console/Tests/Output/OutputTest.php
+++ b/vendor/symfony/console/Tests/Output/OutputTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Console\Tests\Output;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Console\Output\Output;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
+use Symfony\Component\Console\Output\Output;
 
 class OutputTest extends TestCase
 {
@@ -81,6 +81,19 @@ class OutputTest extends TestCase
         $this->assertEquals("foo\nbar\n", $output->output, '->writeln() can take an array of messages to output');
     }
 
+    public function testWriteAnIterableOfMessages()
+    {
+        $output = new TestOutput();
+        $output->writeln($this->generateMessages());
+        $this->assertEquals("foo\nbar\n", $output->output, '->writeln() can take an iterable of messages to output');
+    }
+
+    private function generateMessages(): iterable
+    {
+        yield 'foo';
+        yield 'bar';
+    }
+
     /**
      * @dataProvider provideWriteArguments
      */
diff --git a/vendor/symfony/console/Tests/Style/SymfonyStyleTest.php b/vendor/symfony/console/Tests/Style/SymfonyStyleTest.php
index 865bb33f..308030bb 100644
--- a/vendor/symfony/console/Tests/Style/SymfonyStyleTest.php
+++ b/vendor/symfony/console/Tests/Style/SymfonyStyleTest.php
@@ -13,12 +13,12 @@ namespace Symfony\Component\Console\Tests\Style;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\Console\Formatter\OutputFormatter;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Output\ConsoleOutputInterface;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\ConsoleOutputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Console\Tester\CommandTester;
 
 class SymfonyStyleTest extends TestCase
 {
diff --git a/vendor/symfony/console/Tests/Tester/ApplicationTesterTest.php b/vendor/symfony/console/Tests/Tester/ApplicationTesterTest.php
index 57e7136d..71547e7b 100644
--- a/vendor/symfony/console/Tests/Tester/ApplicationTesterTest.php
+++ b/vendor/symfony/console/Tests/Tester/ApplicationTesterTest.php
@@ -13,7 +13,9 @@ namespace Symfony\Component\Console\Tests\Tester;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Output\Output;
+use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Tester\ApplicationTester;
 
 class ApplicationTesterTest extends TestCase
@@ -27,7 +29,9 @@ class ApplicationTesterTest extends TestCase
         $this->application->setAutoExit(false);
         $this->application->register('foo')
             ->addArgument('foo')
-            ->setCode(function ($input, $output) { $output->writeln('foo'); })
+            ->setCode(function ($input, $output) {
+                $output->writeln('foo');
+            })
         ;
 
         $this->tester = new ApplicationTester($this->application);
@@ -63,6 +67,25 @@ class ApplicationTesterTest extends TestCase
         $this->assertEquals('foo'.PHP_EOL, $this->tester->getDisplay(), '->getDisplay() returns the display of the last execution');
     }
 
+    public function testSetInputs()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->register('foo')->setCode(function ($input, $output) {
+            $helper = new QuestionHelper();
+            $helper->ask($input, $output, new Question('Q1'));
+            $helper->ask($input, $output, new Question('Q2'));
+            $helper->ask($input, $output, new Question('Q3'));
+        });
+        $tester = new ApplicationTester($application);
+
+        $tester->setInputs(array('I1', 'I2', 'I3'));
+        $tester->run(array('command' => 'foo'));
+
+        $this->assertSame(0, $tester->getStatusCode());
+        $this->assertEquals('Q1Q2Q3', $tester->getDisplay(true));
+    }
+
     public function testGetStatusCode()
     {
         $this->assertSame(0, $this->tester->getStatusCode(), '->getStatusCode() returns the status code');
diff --git a/vendor/symfony/console/Tests/Tester/CommandTesterTest.php b/vendor/symfony/console/Tests/Tester/CommandTesterTest.php
index 8d86da43..58eb8103 100644
--- a/vendor/symfony/console/Tests/Tester/CommandTesterTest.php
+++ b/vendor/symfony/console/Tests/Tester/CommandTesterTest.php
@@ -14,12 +14,12 @@ namespace Symfony\Component\Console\Tests\Tester;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Output\Output;
-use Symfony\Component\Console\Tester\CommandTester;
-use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Output\Output;
+use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Console\Tester\CommandTester;
 
 class CommandTesterTest extends TestCase
 {
diff --git a/vendor/symfony/console/composer.json b/vendor/symfony/console/composer.json
index ab348abd..d3aadfbc 100644
--- a/vendor/symfony/console/composer.json
+++ b/vendor/symfony/console/composer.json
@@ -16,16 +16,15 @@
         }
     ],
     "require": {
-        "php": "^5.5.9|>=7.0.8",
-        "symfony/polyfill-mbstring": "~1.0",
-        "symfony/debug": "~2.8|~3.0|~4.0"
+        "php": "^7.1.3",
+        "symfony/polyfill-mbstring": "~1.0"
     },
     "require-dev": {
-        "symfony/config": "~3.3|~4.0",
-        "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
+        "symfony/config": "~3.4|~4.0",
+        "symfony/event-dispatcher": "~3.4|~4.0",
         "symfony/dependency-injection": "~3.4|~4.0",
         "symfony/lock": "~3.4|~4.0",
-        "symfony/process": "~3.3|~4.0",
+        "symfony/process": "~3.4|~4.0",
         "psr/log": "~1.0"
     },
     "suggest": {
@@ -47,7 +46,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "3.4-dev"
+            "dev-master": "4.1-dev"
         }
     }
 }
diff --git a/vendor/symfony/css-selector/Node/AbstractNode.php b/vendor/symfony/css-selector/Node/AbstractNode.php
index 123ef1b1..aac3f0a5 100644
--- a/vendor/symfony/css-selector/Node/AbstractNode.php
+++ b/vendor/symfony/css-selector/Node/AbstractNode.php
@@ -34,7 +34,7 @@ abstract class AbstractNode implements NodeInterface
     public function getNodeName(): string
     {
         if (null === $this->nodeName) {
-            $this->nodeName = preg_replace('~.*\\\\([^\\\\]+)Node$~', '$1', get_called_class());
+            $this->nodeName = preg_replace('~.*\\\\([^\\\\]+)Node$~', '$1', \get_called_class());
         }
 
         return $this->nodeName;
diff --git a/vendor/symfony/css-selector/Node/ElementNode.php b/vendor/symfony/css-selector/Node/ElementNode.php
index 7d405b31..8fc0be89 100644
--- a/vendor/symfony/css-selector/Node/ElementNode.php
+++ b/vendor/symfony/css-selector/Node/ElementNode.php
@@ -37,7 +37,7 @@ class ElementNode extends AbstractNode
     }
 
     /**
-     * @return null|string
+     * @return string|null
      */
     public function getNamespace()
     {
@@ -45,7 +45,7 @@ class ElementNode extends AbstractNode
     }
 
     /**
-     * @return null|string
+     * @return string|null
      */
     public function getElement()
     {
diff --git a/vendor/symfony/css-selector/Parser/Handler/HashHandler.php b/vendor/symfony/css-selector/Parser/Handler/HashHandler.php
index f40807cd..7ae9b438 100644
--- a/vendor/symfony/css-selector/Parser/Handler/HashHandler.php
+++ b/vendor/symfony/css-selector/Parser/Handler/HashHandler.php
@@ -13,9 +13,9 @@ namespace Symfony\Component\CssSelector\Parser\Handler;
 
 use Symfony\Component\CssSelector\Parser\Reader;
 use Symfony\Component\CssSelector\Parser\Token;
-use Symfony\Component\CssSelector\Parser\TokenStream;
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerEscaping;
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
+use Symfony\Component\CssSelector\Parser\TokenStream;
 
 /**
  * CSS selector comment handler.
@@ -51,7 +51,7 @@ class HashHandler implements HandlerInterface
 
         $value = $this->escaping->escapeUnicode($match[1]);
         $stream->push(new Token(Token::TYPE_HASH, $value, $reader->getPosition()));
-        $reader->moveForward(strlen($match[0]));
+        $reader->moveForward(\strlen($match[0]));
 
         return true;
     }
diff --git a/vendor/symfony/css-selector/Parser/Handler/IdentifierHandler.php b/vendor/symfony/css-selector/Parser/Handler/IdentifierHandler.php
index 5ea0d5fd..7b2a14e2 100644
--- a/vendor/symfony/css-selector/Parser/Handler/IdentifierHandler.php
+++ b/vendor/symfony/css-selector/Parser/Handler/IdentifierHandler.php
@@ -13,9 +13,9 @@ namespace Symfony\Component\CssSelector\Parser\Handler;
 
 use Symfony\Component\CssSelector\Parser\Reader;
 use Symfony\Component\CssSelector\Parser\Token;
-use Symfony\Component\CssSelector\Parser\TokenStream;
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerEscaping;
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
+use Symfony\Component\CssSelector\Parser\TokenStream;
 
 /**
  * CSS selector comment handler.
@@ -51,7 +51,7 @@ class IdentifierHandler implements HandlerInterface
 
         $value = $this->escaping->escapeUnicode($match[0]);
         $stream->push(new Token(Token::TYPE_IDENTIFIER, $value, $reader->getPosition()));
-        $reader->moveForward(strlen($match[0]));
+        $reader->moveForward(\strlen($match[0]));
 
         return true;
     }
diff --git a/vendor/symfony/css-selector/Parser/Handler/NumberHandler.php b/vendor/symfony/css-selector/Parser/Handler/NumberHandler.php
index 41e5844e..8291a68d 100644
--- a/vendor/symfony/css-selector/Parser/Handler/NumberHandler.php
+++ b/vendor/symfony/css-selector/Parser/Handler/NumberHandler.php
@@ -13,8 +13,8 @@ namespace Symfony\Component\CssSelector\Parser\Handler;
 
 use Symfony\Component\CssSelector\Parser\Reader;
 use Symfony\Component\CssSelector\Parser\Token;
-use Symfony\Component\CssSelector\Parser\TokenStream;
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
+use Symfony\Component\CssSelector\Parser\TokenStream;
 
 /**
  * CSS selector comment handler.
@@ -47,7 +47,7 @@ class NumberHandler implements HandlerInterface
         }
 
         $stream->push(new Token(Token::TYPE_NUMBER, $match[0], $reader->getPosition()));
-        $reader->moveForward(strlen($match[0]));
+        $reader->moveForward(\strlen($match[0]));
 
         return true;
     }
diff --git a/vendor/symfony/css-selector/Parser/Handler/StringHandler.php b/vendor/symfony/css-selector/Parser/Handler/StringHandler.php
index fe92c1fc..eea1aa9b 100644
--- a/vendor/symfony/css-selector/Parser/Handler/StringHandler.php
+++ b/vendor/symfony/css-selector/Parser/Handler/StringHandler.php
@@ -15,9 +15,9 @@ use Symfony\Component\CssSelector\Exception\InternalErrorException;
 use Symfony\Component\CssSelector\Exception\SyntaxErrorException;
 use Symfony\Component\CssSelector\Parser\Reader;
 use Symfony\Component\CssSelector\Parser\Token;
-use Symfony\Component\CssSelector\Parser\TokenStream;
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerEscaping;
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
+use Symfony\Component\CssSelector\Parser\TokenStream;
 
 /**
  * CSS selector comment handler.
@@ -47,7 +47,7 @@ class StringHandler implements HandlerInterface
     {
         $quote = $reader->getSubstring(1);
 
-        if (!in_array($quote, array("'", '"'))) {
+        if (!\in_array($quote, array("'", '"'))) {
             return false;
         }
 
@@ -59,18 +59,18 @@ class StringHandler implements HandlerInterface
         }
 
         // check unclosed strings
-        if (strlen($match[0]) === $reader->getRemainingLength()) {
+        if (\strlen($match[0]) === $reader->getRemainingLength()) {
             throw SyntaxErrorException::unclosedString($reader->getPosition() - 1);
         }
 
         // check quotes pairs validity
-        if ($quote !== $reader->getSubstring(1, strlen($match[0]))) {
+        if ($quote !== $reader->getSubstring(1, \strlen($match[0]))) {
             throw SyntaxErrorException::unclosedString($reader->getPosition() - 1);
         }
 
         $string = $this->escaping->escapeUnicodeAndNewLine($match[0]);
         $stream->push(new Token(Token::TYPE_STRING, $string, $reader->getPosition()));
-        $reader->moveForward(strlen($match[0]) + 1);
+        $reader->moveForward(\strlen($match[0]) + 1);
 
         return true;
     }
diff --git a/vendor/symfony/css-selector/Parser/Handler/WhitespaceHandler.php b/vendor/symfony/css-selector/Parser/Handler/WhitespaceHandler.php
index ebf8a19f..21345e32 100644
--- a/vendor/symfony/css-selector/Parser/Handler/WhitespaceHandler.php
+++ b/vendor/symfony/css-selector/Parser/Handler/WhitespaceHandler.php
@@ -39,7 +39,7 @@ class WhitespaceHandler implements HandlerInterface
         }
 
         $stream->push(new Token(Token::TYPE_WHITESPACE, $match[0], $reader->getPosition()));
-        $reader->moveForward(strlen($match[0]));
+        $reader->moveForward(\strlen($match[0]));
 
         return true;
     }
diff --git a/vendor/symfony/css-selector/Parser/Parser.php b/vendor/symfony/css-selector/Parser/Parser.php
index dc84cc18..d42bdca6 100644
--- a/vendor/symfony/css-selector/Parser/Parser.php
+++ b/vendor/symfony/css-selector/Parser/Parser.php
@@ -150,7 +150,7 @@ class Parser implements ParserInterface
     {
         $stream->skipWhitespace();
 
-        $selectorStart = count($stream->getUsed());
+        $selectorStart = \count($stream->getUsed());
         $result = $this->parseElementNode($stream);
         $pseudoElement = null;
 
@@ -187,7 +187,7 @@ class Parser implements ParserInterface
                 }
 
                 $identifier = $stream->getNextIdentifier();
-                if (in_array(strtolower($identifier), array('first-line', 'first-letter', 'before', 'after'))) {
+                if (\in_array(strtolower($identifier), array('first-line', 'first-letter', 'before', 'after'))) {
                     // Special case: CSS 2.1 pseudo-elements can have a single ':'.
                     // Any new pseudo-element must have two.
                     $pseudoElement = $identifier;
@@ -253,7 +253,7 @@ class Parser implements ParserInterface
             }
         }
 
-        if (count($stream->getUsed()) === $selectorStart) {
+        if (\count($stream->getUsed()) === $selectorStart) {
             throw SyntaxErrorException::unexpectedToken('selector', $stream->getPeek());
         }
 
diff --git a/vendor/symfony/css-selector/Parser/Reader.php b/vendor/symfony/css-selector/Parser/Reader.php
index adfd3c21..4b43effe 100644
--- a/vendor/symfony/css-selector/Parser/Reader.php
+++ b/vendor/symfony/css-selector/Parser/Reader.php
@@ -30,7 +30,7 @@ class Reader
     public function __construct(string $source)
     {
         $this->source = $source;
-        $this->length = strlen($source);
+        $this->length = \strlen($source);
     }
 
     public function isEOF(): bool
diff --git a/vendor/symfony/css-selector/Parser/Token.php b/vendor/symfony/css-selector/Parser/Token.php
index 554deb8e..91a98f71 100644
--- a/vendor/symfony/css-selector/Parser/Token.php
+++ b/vendor/symfony/css-selector/Parser/Token.php
@@ -72,7 +72,7 @@ class Token
             return true;
         }
 
-        return in_array($this->value, $values);
+        return \in_array($this->value, $values);
     }
 
     public function isWhitespace(): bool
diff --git a/vendor/symfony/css-selector/Parser/TokenStream.php b/vendor/symfony/css-selector/Parser/TokenStream.php
index 24e8634a..d2aee541 100644
--- a/vendor/symfony/css-selector/Parser/TokenStream.php
+++ b/vendor/symfony/css-selector/Parser/TokenStream.php
@@ -142,7 +142,7 @@ class TokenStream
     /**
      * Returns nex identifier or star delimiter token.
      *
-     * @return null|string The identifier token value or null if star found
+     * @return string|null The identifier token value or null if star found
      *
      * @throws SyntaxErrorException If next token is not an identifier or a star delimiter
      */
diff --git a/vendor/symfony/css-selector/Parser/Tokenizer/TokenizerEscaping.php b/vendor/symfony/css-selector/Parser/Tokenizer/TokenizerEscaping.php
index 2df63f51..200272f2 100644
--- a/vendor/symfony/css-selector/Parser/Tokenizer/TokenizerEscaping.php
+++ b/vendor/symfony/css-selector/Parser/Tokenizer/TokenizerEscaping.php
@@ -50,13 +50,13 @@ class TokenizerEscaping
             $c = hexdec($match[1]);
 
             if (0x80 > $c %= 0x200000) {
-                return chr($c);
+                return \chr($c);
             }
             if (0x800 > $c) {
-                return chr(0xC0 | $c >> 6).chr(0x80 | $c & 0x3F);
+                return \chr(0xC0 | $c >> 6).\chr(0x80 | $c & 0x3F);
             }
             if (0x10000 > $c) {
-                return chr(0xE0 | $c >> 12).chr(0x80 | $c >> 6 & 0x3F).chr(0x80 | $c & 0x3F);
+                return \chr(0xE0 | $c >> 12).\chr(0x80 | $c >> 6 & 0x3F).\chr(0x80 | $c & 0x3F);
             }
         }, $value);
     }
diff --git a/vendor/symfony/css-selector/Tests/Node/HashNodeTest.php b/vendor/symfony/css-selector/Tests/Node/HashNodeTest.php
index 8554b226..3bc74da9 100644
--- a/vendor/symfony/css-selector/Tests/Node/HashNodeTest.php
+++ b/vendor/symfony/css-selector/Tests/Node/HashNodeTest.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\CssSelector\Tests\Node;
 
-use Symfony\Component\CssSelector\Node\HashNode;
 use Symfony\Component\CssSelector\Node\ElementNode;
+use Symfony\Component\CssSelector\Node\HashNode;
 
 class HashNodeTest extends AbstractNodeTest
 {
diff --git a/vendor/symfony/css-selector/Tests/Node/NegationNodeTest.php b/vendor/symfony/css-selector/Tests/Node/NegationNodeTest.php
index edf4552b..ed4d2482 100644
--- a/vendor/symfony/css-selector/Tests/Node/NegationNodeTest.php
+++ b/vendor/symfony/css-selector/Tests/Node/NegationNodeTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\CssSelector\Tests\Node;
 
 use Symfony\Component\CssSelector\Node\ClassNode;
-use Symfony\Component\CssSelector\Node\NegationNode;
 use Symfony\Component\CssSelector\Node\ElementNode;
+use Symfony\Component\CssSelector\Node\NegationNode;
 
 class NegationNodeTest extends AbstractNodeTest
 {
diff --git a/vendor/symfony/css-selector/Tests/Parser/Handler/AbstractHandlerTest.php b/vendor/symfony/css-selector/Tests/Parser/Handler/AbstractHandlerTest.php
index 8005616a..f5c9dc8b 100644
--- a/vendor/symfony/css-selector/Tests/Parser/Handler/AbstractHandlerTest.php
+++ b/vendor/symfony/css-selector/Tests/Parser/Handler/AbstractHandlerTest.php
@@ -63,7 +63,7 @@ abstract class AbstractHandlerTest extends TestCase
             $this->assertEquals(0, $reader->getRemainingLength());
             $this->assertTrue($reader->isEOF());
         } else {
-            $this->assertEquals(strlen($remainingContent), $reader->getRemainingLength());
+            $this->assertEquals(\strlen($remainingContent), $reader->getRemainingLength());
             $this->assertEquals(0, $reader->getOffset($remainingContent));
         }
     }
diff --git a/vendor/symfony/css-selector/Tests/Parser/Handler/HashHandlerTest.php b/vendor/symfony/css-selector/Tests/Parser/Handler/HashHandlerTest.php
index b7fa00a2..5730120b 100644
--- a/vendor/symfony/css-selector/Tests/Parser/Handler/HashHandlerTest.php
+++ b/vendor/symfony/css-selector/Tests/Parser/Handler/HashHandlerTest.php
@@ -13,8 +13,8 @@ namespace Symfony\Component\CssSelector\Tests\Parser\Handler;
 
 use Symfony\Component\CssSelector\Parser\Handler\HashHandler;
 use Symfony\Component\CssSelector\Parser\Token;
-use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerEscaping;
+use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
 
 class HashHandlerTest extends AbstractHandlerTest
 {
diff --git a/vendor/symfony/css-selector/Tests/Parser/Handler/IdentifierHandlerTest.php b/vendor/symfony/css-selector/Tests/Parser/Handler/IdentifierHandlerTest.php
index 44d35749..f56430c7 100644
--- a/vendor/symfony/css-selector/Tests/Parser/Handler/IdentifierHandlerTest.php
+++ b/vendor/symfony/css-selector/Tests/Parser/Handler/IdentifierHandlerTest.php
@@ -13,8 +13,8 @@ namespace Symfony\Component\CssSelector\Tests\Parser\Handler;
 
 use Symfony\Component\CssSelector\Parser\Handler\IdentifierHandler;
 use Symfony\Component\CssSelector\Parser\Token;
-use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerEscaping;
+use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
 
 class IdentifierHandlerTest extends AbstractHandlerTest
 {
diff --git a/vendor/symfony/css-selector/Tests/Parser/Handler/StringHandlerTest.php b/vendor/symfony/css-selector/Tests/Parser/Handler/StringHandlerTest.php
index 89eff8bd..8ea5d4d5 100644
--- a/vendor/symfony/css-selector/Tests/Parser/Handler/StringHandlerTest.php
+++ b/vendor/symfony/css-selector/Tests/Parser/Handler/StringHandlerTest.php
@@ -13,8 +13,8 @@ namespace Symfony\Component\CssSelector\Tests\Parser\Handler;
 
 use Symfony\Component\CssSelector\Parser\Handler\StringHandler;
 use Symfony\Component\CssSelector\Parser\Token;
-use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerEscaping;
+use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
 
 class StringHandlerTest extends AbstractHandlerTest
 {
diff --git a/vendor/symfony/css-selector/Tests/XPath/TranslatorTest.php b/vendor/symfony/css-selector/Tests/XPath/TranslatorTest.php
index 51941783..61045829 100644
--- a/vendor/symfony/css-selector/Tests/XPath/TranslatorTest.php
+++ b/vendor/symfony/css-selector/Tests/XPath/TranslatorTest.php
@@ -37,9 +37,9 @@ class TranslatorTest extends TestCase
         $translator = new Translator();
         $document = new \SimpleXMLElement(file_get_contents(__DIR__.'/Fixtures/lang.xml'));
         $elements = $document->xpath($translator->cssToXPath($css));
-        $this->assertCount(count($elementsId), $elements);
+        $this->assertCount(\count($elementsId), $elements);
         foreach ($elements as $element) {
-            $this->assertTrue(in_array($element->attributes()->id, $elementsId));
+            $this->assertTrue(\in_array($element->attributes()->id, $elementsId));
         }
     }
 
@@ -54,10 +54,10 @@ class TranslatorTest extends TestCase
         $document->loadHTMLFile(__DIR__.'/Fixtures/ids.html');
         $document = simplexml_import_dom($document);
         $elements = $document->xpath($translator->cssToXPath($css));
-        $this->assertCount(count($elementsId), $elementsId);
+        $this->assertCount(\count($elementsId), $elementsId);
         foreach ($elements as $element) {
             if (null !== $element->attributes()->id) {
-                $this->assertTrue(in_array($element->attributes()->id, $elementsId));
+                $this->assertTrue(\in_array($element->attributes()->id, $elementsId));
             }
         }
         libxml_clear_errors();
diff --git a/vendor/symfony/css-selector/XPath/Extension/AttributeMatchingExtension.php b/vendor/symfony/css-selector/XPath/Extension/AttributeMatchingExtension.php
index ee8976fd..8a4d8842 100644
--- a/vendor/symfony/css-selector/XPath/Extension/AttributeMatchingExtension.php
+++ b/vendor/symfony/css-selector/XPath/Extension/AttributeMatchingExtension.php
@@ -86,7 +86,7 @@ class AttributeMatchingExtension extends AbstractExtension
         return $xpath->addCondition($value ? sprintf(
             '%1$s and substring(%1$s, string-length(%1$s)-%2$s) = %3$s',
             $attribute,
-            strlen($value) - 1,
+            \strlen($value) - 1,
             Translator::getXpathLiteral($value)
         ) : '0');
     }
diff --git a/vendor/symfony/css-selector/XPath/Extension/FunctionExtension.php b/vendor/symfony/css-selector/XPath/Extension/FunctionExtension.php
index 52b9c2f6..ebe508fe 100644
--- a/vendor/symfony/css-selector/XPath/Extension/FunctionExtension.php
+++ b/vendor/symfony/css-selector/XPath/Extension/FunctionExtension.php
@@ -133,10 +133,7 @@ class FunctionExtension extends AbstractExtension
         $arguments = $function->getArguments();
         foreach ($arguments as $token) {
             if (!($token->isString() || $token->isIdentifier())) {
-                throw new ExpressionErrorException(
-                    'Expected a single string or identifier for :contains(), got '
-                    .implode(', ', $arguments)
-                );
+                throw new ExpressionErrorException('Expected a single string or identifier for :contains(), got '.implode(', ', $arguments));
             }
         }
 
@@ -154,10 +151,7 @@ class FunctionExtension extends AbstractExtension
         $arguments = $function->getArguments();
         foreach ($arguments as $token) {
             if (!($token->isString() || $token->isIdentifier())) {
-                throw new ExpressionErrorException(
-                    'Expected a single string or identifier for :lang(), got '
-                    .implode(', ', $arguments)
-                );
+                throw new ExpressionErrorException('Expected a single string or identifier for :lang(), got '.implode(', ', $arguments));
             }
         }
 
diff --git a/vendor/symfony/css-selector/XPath/Extension/HtmlExtension.php b/vendor/symfony/css-selector/XPath/Extension/HtmlExtension.php
index 625ffa5c..cd8e0d5f 100644
--- a/vendor/symfony/css-selector/XPath/Extension/HtmlExtension.php
+++ b/vendor/symfony/css-selector/XPath/Extension/HtmlExtension.php
@@ -158,10 +158,7 @@ class HtmlExtension extends AbstractExtension
         $arguments = $function->getArguments();
         foreach ($arguments as $token) {
             if (!($token->isString() || $token->isIdentifier())) {
-                throw new ExpressionErrorException(
-                    'Expected a single string or identifier for :lang(), got '
-                    .implode(', ', $arguments)
-                );
+                throw new ExpressionErrorException('Expected a single string or identifier for :lang(), got '.implode(', ', $arguments));
             }
         }
 
diff --git a/vendor/symfony/css-selector/XPath/Translator.php b/vendor/symfony/css-selector/XPath/Translator.php
index 73b54821..97e4dfba 100644
--- a/vendor/symfony/css-selector/XPath/Translator.php
+++ b/vendor/symfony/css-selector/XPath/Translator.php
@@ -84,7 +84,7 @@ class Translator implements TranslatorInterface
             }
         }
 
-        return sprintf('concat(%s)', implode($parts, ', '));
+        return sprintf('concat(%s)', implode(', ', $parts));
     }
 
     /**
@@ -155,7 +155,7 @@ class Translator implements TranslatorInterface
             throw new ExpressionErrorException(sprintf('Node "%s" not supported.', $node->getNodeName()));
         }
 
-        return call_user_func($this->nodeTranslators[$node->getNodeName()], $node, $this);
+        return \call_user_func($this->nodeTranslators[$node->getNodeName()], $node, $this);
     }
 
     /**
@@ -167,7 +167,7 @@ class Translator implements TranslatorInterface
             throw new ExpressionErrorException(sprintf('Combiner "%s" not supported.', $combiner));
         }
 
-        return call_user_func($this->combinationTranslators[$combiner], $this->nodeToXPath($xpath), $this->nodeToXPath($combinedXpath));
+        return \call_user_func($this->combinationTranslators[$combiner], $this->nodeToXPath($xpath), $this->nodeToXPath($combinedXpath));
     }
 
     /**
@@ -179,7 +179,7 @@ class Translator implements TranslatorInterface
             throw new ExpressionErrorException(sprintf('Function "%s" not supported.', $function->getName()));
         }
 
-        return call_user_func($this->functionTranslators[$function->getName()], $xpath, $function);
+        return \call_user_func($this->functionTranslators[$function->getName()], $xpath, $function);
     }
 
     /**
@@ -191,7 +191,7 @@ class Translator implements TranslatorInterface
             throw new ExpressionErrorException(sprintf('Pseudo-class "%s" not supported.', $pseudoClass));
         }
 
-        return call_user_func($this->pseudoClassTranslators[$pseudoClass], $xpath);
+        return \call_user_func($this->pseudoClassTranslators[$pseudoClass], $xpath);
     }
 
     /**
@@ -203,7 +203,7 @@ class Translator implements TranslatorInterface
             throw new ExpressionErrorException(sprintf('Attribute matcher operator "%s" not supported.', $operator));
         }
 
-        return call_user_func($this->attributeMatchingTranslators[$operator], $xpath, $attribute, $value);
+        return \call_user_func($this->attributeMatchingTranslators[$operator], $xpath, $attribute, $value);
     }
 
     /**
diff --git a/vendor/symfony/debug/CHANGELOG.md b/vendor/symfony/debug/CHANGELOG.md
index 31c67eb6..122af731 100644
--- a/vendor/symfony/debug/CHANGELOG.md
+++ b/vendor/symfony/debug/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+4.0.0
+-----
+
+* removed the symfony_debug extension
+* removed `ContextErrorException`
+
 3.4.0
 -----
 
diff --git a/vendor/symfony/debug/Debug.php b/vendor/symfony/debug/Debug.php
index aaa54118..3f657032 100644
--- a/vendor/symfony/debug/Debug.php
+++ b/vendor/symfony/debug/Debug.php
@@ -25,9 +25,6 @@ class Debug
      *
      * This method registers an error handler and an exception handler.
      *
-     * If the Symfony ClassLoader component is available, a special
-     * class loader is also registered.
-     *
      * @param int  $errorReportingLevel The level of error reporting you want
      * @param bool $displayErrors       Whether to display errors (for development) or just log them (for production)
      */
@@ -45,7 +42,7 @@ class Debug
             error_reporting(E_ALL);
         }
 
-        if (!\in_array(PHP_SAPI, array('cli', 'phpdbg'), true)) {
+        if (!\in_array(\PHP_SAPI, array('cli', 'phpdbg'), true)) {
             ini_set('display_errors', 0);
             ExceptionHandler::register();
         } elseif ($displayErrors && (!ini_get('log_errors') || ini_get('error_log'))) {
diff --git a/vendor/symfony/debug/DebugClassLoader.php b/vendor/symfony/debug/DebugClassLoader.php
index 33e715a8..b7f3ca37 100644
--- a/vendor/symfony/debug/DebugClassLoader.php
+++ b/vendor/symfony/debug/DebugClassLoader.php
@@ -34,17 +34,16 @@ class DebugClassLoader
     private static $deprecated = array();
     private static $internal = array();
     private static $internalMethods = array();
-    private static $php7Reserved = array('int' => 1, 'float' => 1, 'bool' => 1, 'string' => 1, 'true' => 1, 'false' => 1, 'null' => 1);
     private static $darwinCache = array('/' => array('/', array()));
 
     public function __construct(callable $classLoader)
     {
         $this->classLoader = $classLoader;
-        $this->isFinder = is_array($classLoader) && method_exists($classLoader[0], 'findFile');
+        $this->isFinder = \is_array($classLoader) && method_exists($classLoader[0], 'findFile');
 
         if (!isset(self::$caseCheck)) {
-            $file = file_exists(__FILE__) ? __FILE__ : rtrim(realpath('.'), DIRECTORY_SEPARATOR);
-            $i = strrpos($file, DIRECTORY_SEPARATOR);
+            $file = file_exists(__FILE__) ? __FILE__ : rtrim(realpath('.'), \DIRECTORY_SEPARATOR);
+            $i = strrpos($file, \DIRECTORY_SEPARATOR);
             $dir = substr($file, 0, 1 + $i);
             $file = substr($file, 1 + $i);
             $test = strtoupper($file) === $file ? strtolower($file) : strtoupper($file);
@@ -53,7 +52,7 @@ class DebugClassLoader
             if (false === $test || false === $i) {
                 // filesystem is case sensitive
                 self::$caseCheck = 0;
-            } elseif (substr($test, -strlen($file)) === $file) {
+            } elseif (substr($test, -\strlen($file)) === $file) {
                 // filesystem is case insensitive and realpath() normalizes the case of characters
                 self::$caseCheck = 1;
             } elseif (false !== stripos(PHP_OS, 'darwin')) {
@@ -85,7 +84,7 @@ class DebugClassLoader
         class_exists('Symfony\Component\Debug\ErrorHandler');
         class_exists('Psr\Log\LogLevel');
 
-        if (!is_array($functions = spl_autoload_functions())) {
+        if (!\is_array($functions = spl_autoload_functions())) {
             return;
         }
 
@@ -94,7 +93,7 @@ class DebugClassLoader
         }
 
         foreach ($functions as $function) {
-            if (!is_array($function) || !$function[0] instanceof self) {
+            if (!\is_array($function) || !$function[0] instanceof self) {
                 $function = array(new static($function), 'loadClass');
             }
 
@@ -107,7 +106,7 @@ class DebugClassLoader
      */
     public static function disable()
     {
-        if (!is_array($functions = spl_autoload_functions())) {
+        if (!\is_array($functions = spl_autoload_functions())) {
             return;
         }
 
@@ -116,7 +115,7 @@ class DebugClassLoader
         }
 
         foreach ($functions as $function) {
-            if (is_array($function) && $function[0] instanceof self) {
+            if (\is_array($function) && $function[0] instanceof self) {
                 $function = $function[0]->getClassLoader();
             }
 
@@ -129,8 +128,6 @@ class DebugClassLoader
      *
      * @param string $class The name of the class
      *
-     * @return bool|null True, if loaded
-     *
      * @throws \RuntimeException
      */
     public function loadClass($class)
@@ -150,7 +147,7 @@ class DebugClassLoader
                     }
                 }
             } else {
-                call_user_func($this->classLoader, $class);
+                \call_user_func($this->classLoader, $class);
                 $file = false;
             }
         } finally {
@@ -184,200 +181,223 @@ class DebugClassLoader
                 throw new \RuntimeException(sprintf('Case mismatch between loaded and declared class names: "%s" vs "%s".', $class, $name));
             }
 
-            // Don't trigger deprecations for classes in the same vendor
-            if (2 > $len = 1 + (\strpos($name, '\\') ?: \strpos($name, '_'))) {
-                $len = 0;
-                $ns = '';
-            } else {
-                $ns = \substr($name, 0, $len);
+            $deprecations = $this->checkAnnotations($refl, $name);
+
+            foreach ($deprecations as $message) {
+                @trigger_error($message, E_USER_DEPRECATED);
             }
+        }
 
-            // Detect annotations on the class
-            if (false !== $doc = $refl->getDocComment()) {
-                foreach (array('final', 'deprecated', 'internal') as $annotation) {
-                    if (false !== \strpos($doc, $annotation) && preg_match('#\n \* @'.$annotation.'(?:( .+?)\.?)?\r?\n \*(?: @|/$)#s', $doc, $notice)) {
-                        self::${$annotation}[$name] = isset($notice[1]) ? preg_replace('#\s*\r?\n \* +#', ' ', $notice[1]) : '';
-                    }
-                }
+        if (!$file) {
+            return;
+        }
+
+        if (!$exists) {
+            if (false !== strpos($class, '/')) {
+                throw new \RuntimeException(sprintf('Trying to autoload a class with an invalid name "%s". Be careful that the namespace separator is "\" in PHP, not "/".', $class));
             }
 
-            $parentAndTraits = \class_uses($name, false);
-            if ($parent = \get_parent_class($class)) {
-                $parentAndTraits[] = $parent;
+            throw new \RuntimeException(sprintf('The autoloader expected class "%s" to be defined in file "%s". The file was found but the class was not in it, the class name or namespace probably has a typo.', $class, $file));
+        }
 
-                if (!isset(self::$checkedClasses[$parent])) {
-                    $this->checkClass($parent);
-                }
+        if (self::$caseCheck && $message = $this->checkCase($refl, $file, $class)) {
+            throw new \RuntimeException(sprintf('Case mismatch between class and real file names: "%s" vs "%s" in "%s".', $message[0], $message[1], $message[2]));
+        }
+    }
 
-                if (isset(self::$final[$parent])) {
-                    @trigger_error(sprintf('The "%s" class is considered final%s. It may change without further notice as of its next major version. You should not extend it from "%s".', $parent, self::$final[$parent], $name), E_USER_DEPRECATED);
+    public function checkAnnotations(\ReflectionClass $refl, $class)
+    {
+        $deprecations = array();
+
+        // Don't trigger deprecations for classes in the same vendor
+        if (2 > $len = 1 + (\strpos($class, '\\') ?: \strpos($class, '_'))) {
+            $len = 0;
+            $ns = '';
+        } else {
+            $ns = \substr($class, 0, $len);
+        }
+
+        // Detect annotations on the class
+        if (false !== $doc = $refl->getDocComment()) {
+            foreach (array('final', 'deprecated', 'internal') as $annotation) {
+                if (false !== \strpos($doc, $annotation) && preg_match('#\n \* @'.$annotation.'(?:( .+?)\.?)?\r?\n \*(?: @|/$)#s', $doc, $notice)) {
+                    self::${$annotation}[$class] = isset($notice[1]) ? preg_replace('#\s*\r?\n \* +#', ' ', $notice[1]) : '';
                 }
             }
+        }
 
-            // Detect if the parent is annotated
-            foreach ($parentAndTraits + $this->getOwnInterfaces($name, $parent) as $use) {
-                if (!isset(self::$checkedClasses[$use])) {
-                    $this->checkClass($use);
-                }
-                if (isset(self::$deprecated[$use]) && \strncmp($ns, $use, $len)) {
-                    $type = class_exists($name, false) ? 'class' : (interface_exists($name, false) ? 'interface' : 'trait');
-                    $verb = class_exists($use, false) || interface_exists($name, false) ? 'extends' : (interface_exists($use, false) ? 'implements' : 'uses');
+        $parent = \get_parent_class($class);
+        $parentAndOwnInterfaces = $this->getOwnInterfaces($class, $parent);
+        if ($parent) {
+            $parentAndOwnInterfaces[$parent] = $parent;
 
-                    @trigger_error(sprintf('The "%s" %s %s "%s" that is deprecated%s.', $name, $type, $verb, $use, self::$deprecated[$use]), E_USER_DEPRECATED);
-                }
-                if (isset(self::$internal[$use]) && \strncmp($ns, $use, $len)) {
-                    @trigger_error(sprintf('The "%s" %s is considered internal%s. It may change without further notice. You should not use it from "%s".', $use, class_exists($use, false) ? 'class' : (interface_exists($use, false) ? 'interface' : 'trait'), self::$internal[$use], $name), E_USER_DEPRECATED);
-                }
+            if (!isset(self::$checkedClasses[$parent])) {
+                $this->checkClass($parent);
             }
 
-            // Inherit @final and @internal annotations for methods
-            self::$finalMethods[$name] = array();
-            self::$internalMethods[$name] = array();
-            foreach ($parentAndTraits as $use) {
-                foreach (array('finalMethods', 'internalMethods') as $property) {
-                    if (isset(self::${$property}[$use])) {
-                        self::${$property}[$name] = self::${$property}[$name] ? self::${$property}[$use] + self::${$property}[$name] : self::${$property}[$use];
-                    }
-                }
+            if (isset(self::$final[$parent])) {
+                $deprecations[] = sprintf('The "%s" class is considered final%s. It may change without further notice as of its next major version. You should not extend it from "%s".', $parent, self::$final[$parent], $class);
             }
+        }
 
-            $isClass = \class_exists($name, false);
-            foreach ($refl->getMethods(\ReflectionMethod::IS_PUBLIC | \ReflectionMethod::IS_PROTECTED) as $method) {
-                if ($method->class !== $name) {
-                    continue;
-                }
+        // Detect if the parent is annotated
+        foreach ($parentAndOwnInterfaces + \class_uses($class, false) as $use) {
+            if (!isset(self::$checkedClasses[$use])) {
+                $this->checkClass($use);
+            }
+            if (isset(self::$deprecated[$use]) && \strncmp($ns, $use, $len)) {
+                $type = class_exists($class, false) ? 'class' : (interface_exists($class, false) ? 'interface' : 'trait');
+                $verb = class_exists($use, false) || interface_exists($class, false) ? 'extends' : (interface_exists($use, false) ? 'implements' : 'uses');
 
-                // Method from a trait
-                if ($method->getFilename() !== $refl->getFileName()) {
-                    continue;
-                }
+                $deprecations[] = sprintf('The "%s" %s %s "%s" that is deprecated%s.', $class, $type, $verb, $use, self::$deprecated[$use]);
+            }
+            if (isset(self::$internal[$use]) && \strncmp($ns, $use, $len)) {
+                $deprecations[] = sprintf('The "%s" %s is considered internal%s. It may change without further notice. You should not use it from "%s".', $use, class_exists($use, false) ? 'class' : (interface_exists($use, false) ? 'interface' : 'trait'), self::$internal[$use], $class);
+            }
+        }
 
-                if ($isClass && $parent && isset(self::$finalMethods[$parent][$method->name])) {
-                    list($declaringClass, $message) = self::$finalMethods[$parent][$method->name];
-                    @trigger_error(sprintf('The "%s::%s()" method is considered final%s. It may change without further notice as of its next major version. You should not extend it from "%s".', $declaringClass, $method->name, $message, $name), E_USER_DEPRECATED);
-                }
+        if (\trait_exists($class)) {
+            return $deprecations;
+        }
 
-                foreach ($parentAndTraits as $use) {
-                    if (isset(self::$internalMethods[$use][$method->name])) {
-                        list($declaringClass, $message) = self::$internalMethods[$use][$method->name];
-                        if (\strncmp($ns, $declaringClass, $len)) {
-                            @trigger_error(sprintf('The "%s::%s()" method is considered internal%s. It may change without further notice. You should not extend it from "%s".', $declaringClass, $method->name, $message, $name), E_USER_DEPRECATED);
-                        }
-                    }
+        // Inherit @final and @internal annotations for methods
+        self::$finalMethods[$class] = array();
+        self::$internalMethods[$class] = array();
+        foreach ($parentAndOwnInterfaces as $use) {
+            foreach (array('finalMethods', 'internalMethods') as $property) {
+                if (isset(self::${$property}[$use])) {
+                    self::${$property}[$class] = self::${$property}[$class] ? self::${$property}[$use] + self::${$property}[$class] : self::${$property}[$use];
                 }
+            }
+        }
 
-                // Detect method annotations
-                if (false === $doc = $method->getDocComment()) {
-                    continue;
-                }
+        foreach ($refl->getMethods(\ReflectionMethod::IS_PUBLIC | \ReflectionMethod::IS_PROTECTED) as $method) {
+            if ($method->class !== $class) {
+                continue;
+            }
 
-                foreach (array('final', 'internal') as $annotation) {
-                    if (false !== \strpos($doc, $annotation) && preg_match('#\n\s+\* @'.$annotation.'(?:( .+?)\.?)?\r?\n\s+\*(?: @|/$)#s', $doc, $notice)) {
-                        $message = isset($notice[1]) ? preg_replace('#\s*\r?\n \* +#', ' ', $notice[1]) : '';
-                        self::${$annotation.'Methods'}[$name][$method->name] = array($name, $message);
-                    }
+            if ($parent && isset(self::$finalMethods[$parent][$method->name])) {
+                list($declaringClass, $message) = self::$finalMethods[$parent][$method->name];
+                $deprecations[] = sprintf('The "%s::%s()" method is considered final%s. It may change without further notice as of its next major version. You should not extend it from "%s".', $declaringClass, $method->name, $message, $class);
+            }
+
+            if (isset(self::$internalMethods[$class][$method->name])) {
+                list($declaringClass, $message) = self::$internalMethods[$class][$method->name];
+                if (\strncmp($ns, $declaringClass, $len)) {
+                    $deprecations[] = sprintf('The "%s::%s()" method is considered internal%s. It may change without further notice. You should not extend it from "%s".', $declaringClass, $method->name, $message, $class);
                 }
             }
 
-            if (isset(self::$php7Reserved[\strtolower($refl->getShortName())])) {
-                @trigger_error(sprintf('The "%s" class uses the reserved name "%s", it will break on PHP 7 and higher', $name, $refl->getShortName()), E_USER_DEPRECATED);
+            // Detect method annotations
+            if (false === $doc = $method->getDocComment()) {
+                continue;
             }
-        }
 
-        if ($file) {
-            if (!$exists) {
-                if (false !== strpos($class, '/')) {
-                    throw new \RuntimeException(sprintf('Trying to autoload a class with an invalid name "%s". Be careful that the namespace separator is "\" in PHP, not "/".', $class));
+            foreach (array('final', 'internal') as $annotation) {
+                if (false !== \strpos($doc, $annotation) && preg_match('#\n\s+\* @'.$annotation.'(?:( .+?)\.?)?\r?\n\s+\*(?: @|/$)#s', $doc, $notice)) {
+                    $message = isset($notice[1]) ? preg_replace('#\s*\r?\n \* +#', ' ', $notice[1]) : '';
+                    self::${$annotation.'Methods'}[$class][$method->name] = array($class, $message);
                 }
-
-                throw new \RuntimeException(sprintf('The autoloader expected class "%s" to be defined in file "%s". The file was found but the class was not in it, the class name or namespace probably has a typo.', $class, $file));
             }
-            if (self::$caseCheck) {
-                $real = explode('\\', $class.strrchr($file, '.'));
-                $tail = explode(DIRECTORY_SEPARATOR, str_replace('/', DIRECTORY_SEPARATOR, $file));
+        }
 
-                $i = count($tail) - 1;
-                $j = count($real) - 1;
+        return $deprecations;
+    }
 
-                while (isset($tail[$i], $real[$j]) && $tail[$i] === $real[$j]) {
-                    --$i;
-                    --$j;
-                }
+    public function checkCase(\ReflectionClass $refl, $file, $class)
+    {
+        $real = explode('\\', $class.strrchr($file, '.'));
+        $tail = explode(\DIRECTORY_SEPARATOR, str_replace('/', \DIRECTORY_SEPARATOR, $file));
 
-                array_splice($tail, 0, $i + 1);
-            }
-            if (self::$caseCheck && $tail) {
-                $tail = DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $tail);
-                $tailLen = strlen($tail);
-                $real = $refl->getFileName();
-
-                if (2 === self::$caseCheck) {
-                    // realpath() on MacOSX doesn't normalize the case of characters
-
-                    $i = 1 + strrpos($real, '/');
-                    $file = substr($real, $i);
-                    $real = substr($real, 0, $i);
-
-                    if (isset(self::$darwinCache[$real])) {
-                        $kDir = $real;
-                    } else {
-                        $kDir = strtolower($real);
-
-                        if (isset(self::$darwinCache[$kDir])) {
-                            $real = self::$darwinCache[$kDir][0];
-                        } else {
-                            $dir = getcwd();
-                            chdir($real);
-                            $real = getcwd().'/';
-                            chdir($dir);
-
-                            $dir = $real;
-                            $k = $kDir;
-                            $i = strlen($dir) - 1;
-                            while (!isset(self::$darwinCache[$k])) {
-                                self::$darwinCache[$k] = array($dir, array());
-                                self::$darwinCache[$dir] = &self::$darwinCache[$k];
-
-                                while ('/' !== $dir[--$i]) {
-                                }
-                                $k = substr($k, 0, ++$i);
-                                $dir = substr($dir, 0, $i--);
-                            }
-                        }
-                    }
+        $i = \count($tail) - 1;
+        $j = \count($real) - 1;
 
-                    $dirFiles = self::$darwinCache[$kDir][1];
-
-                    if (isset($dirFiles[$file])) {
-                        $kFile = $file;
-                    } else {
-                        $kFile = strtolower($file);
-
-                        if (!isset($dirFiles[$kFile])) {
-                            foreach (scandir($real, 2) as $f) {
-                                if ('.' !== $f[0]) {
-                                    $dirFiles[$f] = $f;
-                                    if ($f === $file) {
-                                        $kFile = $k = $file;
-                                    } elseif ($f !== $k = strtolower($f)) {
-                                        $dirFiles[$k] = $f;
-                                    }
-                                }
-                            }
-                            self::$darwinCache[$kDir][1] = $dirFiles;
-                        }
-                    }
+        while (isset($tail[$i], $real[$j]) && $tail[$i] === $real[$j]) {
+            --$i;
+            --$j;
+        }
+
+        array_splice($tail, 0, $i + 1);
+
+        if (!$tail) {
+            return;
+        }
+
+        $tail = \DIRECTORY_SEPARATOR.implode(\DIRECTORY_SEPARATOR, $tail);
+        $tailLen = \strlen($tail);
+        $real = $refl->getFileName();
+
+        if (2 === self::$caseCheck) {
+            $real = $this->darwinRealpath($real);
+        }
 
-                    $real .= $dirFiles[$kFile];
+        if (0 === substr_compare($real, $tail, -$tailLen, $tailLen, true)
+            && 0 !== substr_compare($real, $tail, -$tailLen, $tailLen, false)
+        ) {
+            return array(substr($tail, -$tailLen + 1), substr($real, -$tailLen + 1), substr($real, 0, -$tailLen + 1));
+        }
+    }
+
+    /**
+     * `realpath` on MacOSX doesn't normalize the case of characters.
+     */
+    private function darwinRealpath($real)
+    {
+        $i = 1 + strrpos($real, '/');
+        $file = substr($real, $i);
+        $real = substr($real, 0, $i);
+
+        if (isset(self::$darwinCache[$real])) {
+            $kDir = $real;
+        } else {
+            $kDir = strtolower($real);
+
+            if (isset(self::$darwinCache[$kDir])) {
+                $real = self::$darwinCache[$kDir][0];
+            } else {
+                $dir = getcwd();
+                chdir($real);
+                $real = getcwd().'/';
+                chdir($dir);
+
+                $dir = $real;
+                $k = $kDir;
+                $i = \strlen($dir) - 1;
+                while (!isset(self::$darwinCache[$k])) {
+                    self::$darwinCache[$k] = array($dir, array());
+                    self::$darwinCache[$dir] = &self::$darwinCache[$k];
+
+                    while ('/' !== $dir[--$i]) {
+                    }
+                    $k = substr($k, 0, ++$i);
+                    $dir = substr($dir, 0, $i--);
                 }
+            }
+        }
 
-                if (0 === substr_compare($real, $tail, -$tailLen, $tailLen, true)
-                  && 0 !== substr_compare($real, $tail, -$tailLen, $tailLen, false)
-                ) {
-                    throw new \RuntimeException(sprintf('Case mismatch between class and real file names: "%s" vs "%s" in "%s".', substr($tail, -$tailLen + 1), substr($real, -$tailLen + 1), substr($real, 0, -$tailLen + 1)));
+        $dirFiles = self::$darwinCache[$kDir][1];
+
+        if (isset($dirFiles[$file])) {
+            return $real .= $dirFiles[$file];
+        }
+
+        $kFile = strtolower($file);
+
+        if (!isset($dirFiles[$kFile])) {
+            foreach (scandir($real, 2) as $f) {
+                if ('.' !== $f[0]) {
+                    $dirFiles[$f] = $f;
+                    if ($f === $file) {
+                        $kFile = $k = $file;
+                    } elseif ($f !== $k = strtolower($f)) {
+                        $dirFiles[$k] = $f;
+                    }
                 }
             }
+            self::$darwinCache[$kDir][1] = $dirFiles;
         }
+
+        return $real .= $dirFiles[$kFile];
     }
 
     /**
diff --git a/vendor/symfony/debug/ErrorHandler.php b/vendor/symfony/debug/ErrorHandler.php
index bed0e04a..caffd541 100644
--- a/vendor/symfony/debug/ErrorHandler.php
+++ b/vendor/symfony/debug/ErrorHandler.php
@@ -11,17 +11,16 @@
 
 namespace Symfony\Component\Debug;
 
-use Psr\Log\LogLevel;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\Debug\Exception\ContextErrorException;
+use Psr\Log\LogLevel;
 use Symfony\Component\Debug\Exception\FatalErrorException;
 use Symfony\Component\Debug\Exception\FatalThrowableError;
 use Symfony\Component\Debug\Exception\OutOfMemoryException;
 use Symfony\Component\Debug\Exception\SilencedErrorContext;
-use Symfony\Component\Debug\FatalErrorHandler\UndefinedFunctionFatalErrorHandler;
-use Symfony\Component\Debug\FatalErrorHandler\UndefinedMethodFatalErrorHandler;
 use Symfony\Component\Debug\FatalErrorHandler\ClassNotFoundFatalErrorHandler;
 use Symfony\Component\Debug\FatalErrorHandler\FatalErrorHandlerInterface;
+use Symfony\Component\Debug\FatalErrorHandler\UndefinedFunctionFatalErrorHandler;
+use Symfony\Component\Debug\FatalErrorHandler\UndefinedMethodFatalErrorHandler;
 
 /**
  * A generic ErrorHandler for the PHP engine.
@@ -97,8 +96,6 @@ class ErrorHandler
     private $bootstrappingLogger;
 
     private static $reservedMemory;
-    private static $stackedErrors = array();
-    private static $stackedErrorLevels = array();
     private static $toStringException = null;
     private static $silencedErrorCache = array();
     private static $silencedErrorCount = 0;
@@ -130,17 +127,17 @@ class ErrorHandler
             $handler->isRoot = true;
         }
 
-        if ($handlerIsNew && is_array($prev) && $prev[0] instanceof self) {
+        if ($handlerIsNew && \is_array($prev) && $prev[0] instanceof self) {
             $handler = $prev[0];
             $replace = false;
         }
         if (!$replace && $prev) {
             restore_error_handler();
-            $handlerIsRegistered = is_array($prev) && $handler === $prev[0];
+            $handlerIsRegistered = \is_array($prev) && $handler === $prev[0];
         } else {
             $handlerIsRegistered = true;
         }
-        if (is_array($prev = set_exception_handler(array($handler, 'handleException'))) && $prev[0] instanceof self) {
+        if (\is_array($prev = set_exception_handler(array($handler, 'handleException'))) && $prev[0] instanceof self) {
             restore_exception_handler();
             if (!$handlerIsRegistered) {
                 $handler = $prev[0];
@@ -180,7 +177,7 @@ class ErrorHandler
     {
         $loggers = array();
 
-        if (is_array($levels)) {
+        if (\is_array($levels)) {
             foreach ($levels as $type => $logLevel) {
                 if (empty($this->loggers[$type][0]) || $replace || $this->loggers[$type][0] === $this->bootstrappingLogger) {
                     $loggers[$type] = array($logger, $logLevel);
@@ -220,7 +217,7 @@ class ErrorHandler
             if (!isset($prev[$type])) {
                 throw new \InvalidArgumentException('Unknown error type: '.$type);
             }
-            if (!is_array($log)) {
+            if (!\is_array($log)) {
                 $log = array($log);
             } elseif (!array_key_exists(0, $log)) {
                 throw new \InvalidArgumentException('No logger provided');
@@ -353,7 +350,7 @@ class ErrorHandler
     {
         if ($prev !== $this->thrownErrors | $this->loggedErrors) {
             $handler = set_error_handler('var_dump');
-            $handler = is_array($handler) ? $handler[0] : null;
+            $handler = \is_array($handler) ? $handler[0] : null;
             restore_error_handler();
             if ($handler === $this) {
                 restore_error_handler();
@@ -396,12 +393,10 @@ class ErrorHandler
         }
         $scope = $this->scopedErrors & $type;
 
-        if (4 < $numArgs = func_num_args()) {
+        if (4 < $numArgs = \func_num_args()) {
             $context = $scope ? (func_get_arg(4) ?: array()) : array();
-            $backtrace = 5 < $numArgs ? func_get_arg(5) : null; // defined on HHVM
         } else {
             $context = array();
-            $backtrace = null;
         }
 
         if (isset($context['GLOBALS']) && $scope) {
@@ -410,15 +405,6 @@ class ErrorHandler
             $context = $e;
         }
 
-        if (null !== $backtrace && $type & E_ERROR) {
-            // E_ERROR fatal errors are triggered on HHVM when
-            // hhvm.error_handling.call_user_handler_on_fatals=1
-            // which is the way to get their backtrace.
-            $this->handleFatalError(compact('type', 'message', 'file', 'line', 'backtrace'));
-
-            return true;
-        }
-
         $logMessage = $this->levels[$type].': '.$message;
 
         if (null !== self::$toStringException) {
@@ -448,19 +434,16 @@ class ErrorHandler
                 return;
             }
         } else {
-            if ($scope) {
-                $errorAsException = new ContextErrorException($logMessage, 0, $type, $file, $line, $context);
-            } else {
-                $errorAsException = new \ErrorException($logMessage, 0, $type, $file, $line);
-            }
+            $errorAsException = new \ErrorException($logMessage, 0, $type, $file, $line);
 
             // Clean the trace by removing function arguments and the first frames added by the error handler itself.
             if ($throw || $this->tracedErrors & $type) {
-                $backtrace = $backtrace ?: $errorAsException->getTrace();
+                $backtrace = $errorAsException->getTrace();
                 $lightTrace = $this->cleanTrace($backtrace, $type, $file, $line, $throw);
                 $this->traceReflector->setValue($errorAsException, $lightTrace);
             } else {
                 $this->traceReflector->setValue($errorAsException, array());
+                $backtrace = array();
             }
         }
 
@@ -474,32 +457,25 @@ class ErrorHandler
                         && ('trigger_error' === $backtrace[$i - 1]['function'] || 'user_error' === $backtrace[$i - 1]['function'])
                     ) {
                         // Here, we know trigger_error() has been called from __toString().
-                        // HHVM is fine with throwing from __toString() but PHP triggers a fatal error instead.
+                        // PHP triggers a fatal error when throwing from __toString().
                         // A small convention allows working around the limitation:
                         // given a caught $e exception in __toString(), quitting the method with
                         // `return trigger_error($e, E_USER_ERROR);` allows this error handler
                         // to make $e get through the __toString() barrier.
 
                         foreach ($context as $e) {
-                            if (($e instanceof \Exception || $e instanceof \Throwable) && $e->__toString() === $message) {
-                                if (1 === $i) {
-                                    // On HHVM
-                                    $errorAsException = $e;
-                                    break;
-                                }
+                            if ($e instanceof \Throwable && $e->__toString() === $message) {
                                 self::$toStringException = $e;
 
                                 return true;
                             }
                         }
 
-                        if (1 < $i) {
-                            // On PHP (not on HHVM), display the original error message instead of the default one.
-                            $this->handleException($errorAsException);
+                        // Display the original error message instead of the default one.
+                        $this->handleException($errorAsException);
 
-                            // Stop the process by giving back the error to the native handler.
-                            return false;
-                        }
+                        // Stop the process by giving back the error to the native handler.
+                        return false;
                     }
                 }
             }
@@ -509,13 +485,6 @@ class ErrorHandler
 
         if ($this->isRecursive) {
             $log = 0;
-        } elseif (self::$stackedErrorLevels) {
-            self::$stackedErrors[] = array(
-                $this->loggers[$type][0],
-                ($type & $level) ? $this->loggers[$type][1] : LogLevel::DEBUG,
-                $logMessage,
-                $errorAsException ? array('exception' => $errorAsException) : array(),
-            );
         } else {
             try {
                 $this->isRecursive = true;
@@ -569,7 +538,6 @@ class ErrorHandler
         if ($this->loggedErrors & $type) {
             try {
                 $this->loggers[$type][0]->log($this->loggers[$type][1], $message, array('exception' => $exception));
-            } catch (\Exception $handlerException) {
             } catch (\Throwable $handlerException) {
             }
         }
@@ -588,7 +556,6 @@ class ErrorHandler
                 return \call_user_func($exceptionHandler, $exception);
             }
             $handlerException = $handlerException ?: $exception;
-        } catch (\Exception $handlerException) {
         } catch (\Throwable $handlerException) {
         }
         if ($exception === $handlerException) {
@@ -616,7 +583,7 @@ class ErrorHandler
         $previousHandler = null;
         $sameHandlerLimit = 10;
 
-        while (!is_array($handler) || !$handler[0] instanceof self) {
+        while (!\is_array($handler) || !$handler[0] instanceof self) {
             $handler = set_exception_handler('var_dump');
             restore_exception_handler();
 
@@ -649,16 +616,6 @@ class ErrorHandler
             $error = error_get_last();
         }
 
-        try {
-            while (self::$stackedErrorLevels) {
-                static::unstackErrors();
-            }
-        } catch (\Exception $exception) {
-            // Handled below
-        } catch (\Throwable $exception) {
-            // Handled below
-        }
-
         if ($error && $error['type'] &= E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR) {
             // Let's not throw anymore but keep logging
             $handler->throwAt(0, true);
@@ -669,10 +626,12 @@ class ErrorHandler
             } else {
                 $exception = new FatalErrorException($handler->levels[$error['type']].': '.$error['message'], 0, $error['type'], $error['file'], $error['line'], 2, true, $trace);
             }
+        } else {
+            $exception = null;
         }
 
         try {
-            if (isset($exception)) {
+            if (null !== $exception) {
                 self::$exitCode = 255;
                 $handler->handleException($exception, $error);
             }
@@ -686,55 +645,6 @@ class ErrorHandler
         }
     }
 
-    /**
-     * Configures the error handler for delayed handling.
-     * Ensures also that non-catchable fatal errors are never silenced.
-     *
-     * As shown by http://bugs.php.net/42098 and http://bugs.php.net/60724
-     * PHP has a compile stage where it behaves unusually. To workaround it,
-     * we plug an error handler that only stacks errors for later.
-     *
-     * The most important feature of this is to prevent
-     * autoloading until unstackErrors() is called.
-     *
-     * @deprecated since version 3.4, to be removed in 4.0.
-     */
-    public static function stackErrors()
-    {
-        @trigger_error('Support for stacking errors is deprecated since Symfony 3.4 and will be removed in 4.0.', E_USER_DEPRECATED);
-
-        self::$stackedErrorLevels[] = error_reporting(error_reporting() | E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR);
-    }
-
-    /**
-     * Unstacks stacked errors and forwards to the logger.
-     *
-     * @deprecated since version 3.4, to be removed in 4.0.
-     */
-    public static function unstackErrors()
-    {
-        @trigger_error('Support for unstacking errors is deprecated since Symfony 3.4 and will be removed in 4.0.', E_USER_DEPRECATED);
-
-        $level = array_pop(self::$stackedErrorLevels);
-
-        if (null !== $level) {
-            $errorReportingLevel = error_reporting($level);
-            if ($errorReportingLevel !== ($level | E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR)) {
-                // If the user changed the error level, do not overwrite it
-                error_reporting($errorReportingLevel);
-            }
-        }
-
-        if (empty(self::$stackedErrorLevels)) {
-            $errors = self::$stackedErrors;
-            self::$stackedErrors = array();
-
-            foreach ($errors as $error) {
-                $error[0]->log($error[1], $error[2], $error[3]);
-            }
-        }
-    }
-
     /**
      * Gets the fatal error handlers.
      *
@@ -757,7 +667,7 @@ class ErrorHandler
 
         for ($i = 0; isset($backtrace[$i]); ++$i) {
             if (isset($backtrace[$i]['file'], $backtrace[$i]['line']) && $backtrace[$i]['line'] === $line && $backtrace[$i]['file'] === $file) {
-                $lightTrace = array_slice($lightTrace, 1 + $i);
+                $lightTrace = \array_slice($lightTrace, 1 + $i);
                 break;
             }
         }
diff --git a/vendor/symfony/debug/Exception/ClassNotFoundException.php b/vendor/symfony/debug/Exception/ClassNotFoundException.php
index b91bf466..fa98c497 100644
--- a/vendor/symfony/debug/Exception/ClassNotFoundException.php
+++ b/vendor/symfony/debug/Exception/ClassNotFoundException.php
@@ -18,7 +18,7 @@ namespace Symfony\Component\Debug\Exception;
  */
 class ClassNotFoundException extends FatalErrorException
 {
-    public function __construct($message, \ErrorException $previous)
+    public function __construct(string $message, \ErrorException $previous)
     {
         parent::__construct(
             $message,
@@ -26,6 +26,9 @@ class ClassNotFoundException extends FatalErrorException
             $previous->getSeverity(),
             $previous->getFile(),
             $previous->getLine(),
+            null,
+            true,
+            null,
             $previous->getPrevious()
         );
         $this->setTrace($previous->getTrace());
diff --git a/vendor/symfony/debug/Exception/ContextErrorException.php b/vendor/symfony/debug/Exception/ContextErrorException.php
deleted file mode 100644
index 554139da..00000000
--- a/vendor/symfony/debug/Exception/ContextErrorException.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Debug\Exception;
-
-/**
- * Error Exception with Variable Context.
- *
- * @author Christian Sciberras <uuf6429@gmail.com>
- *
- * @deprecated since version 3.3. Instead, \ErrorException will be used directly in 4.0.
- */
-class ContextErrorException extends \ErrorException
-{
-    private $context = array();
-
-    public function __construct($message, $code, $severity, $filename, $lineno, $context = array())
-    {
-        parent::__construct($message, $code, $severity, $filename, $lineno);
-        $this->context = $context;
-    }
-
-    /**
-     * @return array Array of variables that existed when the exception occurred
-     */
-    public function getContext()
-    {
-        @trigger_error(sprintf('The %s class is deprecated since Symfony 3.3 and will be removed in 4.0.', __CLASS__), E_USER_DEPRECATED);
-
-        return $this->context;
-    }
-}
diff --git a/vendor/symfony/debug/Exception/FatalErrorException.php b/vendor/symfony/debug/Exception/FatalErrorException.php
index f24a54e7..8305d392 100644
--- a/vendor/symfony/debug/Exception/FatalErrorException.php
+++ b/vendor/symfony/debug/Exception/FatalErrorException.php
@@ -18,9 +18,9 @@ namespace Symfony\Component\Debug\Exception;
  */
 class FatalErrorException extends \ErrorException
 {
-    public function __construct($message, $code, $severity, $filename, $lineno, $traceOffset = null, $traceArgs = true, array $trace = null)
+    public function __construct(string $message, int $code, int $severity, string $filename, int $lineno, int $traceOffset = null, bool $traceArgs = true, array $trace = null, \Throwable $previous = null)
     {
-        parent::__construct($message, $code, $severity, $filename, $lineno);
+        parent::__construct($message, $code, $severity, $filename, $lineno, $previous);
 
         if (null !== $trace) {
             if (!$traceArgs) {
@@ -31,7 +31,7 @@ class FatalErrorException extends \ErrorException
 
             $this->setTrace($trace);
         } elseif (null !== $traceOffset) {
-            if (function_exists('xdebug_get_function_stack')) {
+            if (\function_exists('xdebug_get_function_stack')) {
                 $trace = xdebug_get_function_stack();
                 if (0 < $traceOffset) {
                     array_splice($trace, -$traceOffset);
@@ -60,11 +60,6 @@ class FatalErrorException extends \ErrorException
 
                 unset($frame);
                 $trace = array_reverse($trace);
-            } elseif (function_exists('symfony_debug_backtrace')) {
-                $trace = symfony_debug_backtrace();
-                if (0 < $traceOffset) {
-                    array_splice($trace, 0, $traceOffset);
-                }
             } else {
                 $trace = array();
             }
diff --git a/vendor/symfony/debug/Exception/FatalThrowableError.php b/vendor/symfony/debug/Exception/FatalThrowableError.php
index fafc9226..cdafb2a5 100644
--- a/vendor/symfony/debug/Exception/FatalThrowableError.php
+++ b/vendor/symfony/debug/Exception/FatalThrowableError.php
@@ -18,21 +18,22 @@ namespace Symfony\Component\Debug\Exception;
  */
 class FatalThrowableError extends FatalErrorException
 {
+    private $originalClassName;
+
     public function __construct(\Throwable $e)
     {
+        $this->originalClassName = \get_class($e);
+
         if ($e instanceof \ParseError) {
-            $message = 'Parse error: '.$e->getMessage();
             $severity = E_PARSE;
         } elseif ($e instanceof \TypeError) {
-            $message = 'Type error: '.$e->getMessage();
             $severity = E_RECOVERABLE_ERROR;
         } else {
-            $message = $e->getMessage();
             $severity = E_ERROR;
         }
 
         \ErrorException::__construct(
-            $message,
+            $e->getMessage(),
             $e->getCode(),
             $severity,
             $e->getFile(),
@@ -42,4 +43,9 @@ class FatalThrowableError extends FatalErrorException
 
         $this->setTrace($e->getTrace());
     }
+
+    public function getOriginalClassName(): string
+    {
+        return $this->originalClassName;
+    }
 }
diff --git a/vendor/symfony/debug/Exception/FlattenException.php b/vendor/symfony/debug/Exception/FlattenException.php
index f491bf2a..b091b55b 100644
--- a/vendor/symfony/debug/Exception/FlattenException.php
+++ b/vendor/symfony/debug/Exception/FlattenException.php
@@ -15,7 +15,7 @@ use Symfony\Component\HttpFoundation\Exception\RequestExceptionInterface;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 
 /**
- * FlattenException wraps a PHP Exception to be able to serialize it.
+ * FlattenException wraps a PHP Error or Exception to be able to serialize it.
  *
  * Basically, this class removes all objects from the trace.
  *
@@ -34,6 +34,11 @@ class FlattenException
     private $line;
 
     public static function create(\Exception $exception, $statusCode = null, array $headers = array())
+    {
+        return static::createFromThrowable($exception, $statusCode, $headers);
+    }
+
+    public static function createFromThrowable(\Throwable $exception, ?int $statusCode = null, array $headers = array()): self
     {
         $e = new static();
         $e->setMessage($exception->getMessage());
@@ -52,17 +57,15 @@ class FlattenException
 
         $e->setStatusCode($statusCode);
         $e->setHeaders($headers);
-        $e->setTraceFromException($exception);
-        $e->setClass(get_class($exception));
+        $e->setTraceFromThrowable($exception);
+        $e->setClass($exception instanceof FatalThrowableError ? $exception->getOriginalClassName() : \get_class($exception));
         $e->setFile($exception->getFile());
         $e->setLine($exception->getLine());
 
         $previous = $exception->getPrevious();
 
-        if ($previous instanceof \Exception) {
-            $e->setPrevious(static::create($previous));
-        } elseif ($previous instanceof \Throwable) {
-            $e->setPrevious(static::create(new FatalThrowableError($previous)));
+        if ($previous instanceof \Throwable) {
+            $e->setPrevious(static::createFromThrowable($previous));
         }
 
         return $e;
@@ -178,9 +181,19 @@ class FlattenException
         return $this->trace;
     }
 
+    /**
+     * @deprecated since 4.1, use {@see setTraceFromThrowable()} instead.
+     */
     public function setTraceFromException(\Exception $exception)
     {
-        $this->setTrace($exception->getTrace(), $exception->getFile(), $exception->getLine());
+        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1, use "setTraceFromThrowable()" instead.', __METHOD__), E_USER_DEPRECATED);
+
+        $this->setTraceFromThrowable($exception);
+    }
+
+    public function setTraceFromThrowable(\Throwable $throwable): void
+    {
+        $this->setTrace($throwable->getTrace(), $throwable->getFile(), $throwable->getLine());
     }
 
     public function setTrace($trace, $file, $line)
@@ -228,9 +241,9 @@ class FlattenException
             if ($value instanceof \__PHP_Incomplete_Class) {
                 // is_object() returns false on PHP<=7.1
                 $result[$key] = array('incomplete-object', $this->getClassNameFromIncomplete($value));
-            } elseif (is_object($value)) {
-                $result[$key] = array('object', get_class($value));
-            } elseif (is_array($value)) {
+            } elseif (\is_object($value)) {
+                $result[$key] = array('object', \get_class($value));
+            } elseif (\is_array($value)) {
                 if ($level > 10) {
                     $result[$key] = array('array', '*DEEP NESTED ARRAY*');
                 } else {
@@ -238,13 +251,13 @@ class FlattenException
                 }
             } elseif (null === $value) {
                 $result[$key] = array('null', null);
-            } elseif (is_bool($value)) {
+            } elseif (\is_bool($value)) {
                 $result[$key] = array('boolean', $value);
-            } elseif (is_int($value)) {
+            } elseif (\is_int($value)) {
                 $result[$key] = array('integer', $value);
-            } elseif (is_float($value)) {
+            } elseif (\is_float($value)) {
                 $result[$key] = array('float', $value);
-            } elseif (is_resource($value)) {
+            } elseif (\is_resource($value)) {
                 $result[$key] = array('resource', get_resource_type($value));
             } else {
                 $result[$key] = array('string', (string) $value);
diff --git a/vendor/symfony/debug/Exception/SilencedErrorContext.php b/vendor/symfony/debug/Exception/SilencedErrorContext.php
index 4be83491..6f84617c 100644
--- a/vendor/symfony/debug/Exception/SilencedErrorContext.php
+++ b/vendor/symfony/debug/Exception/SilencedErrorContext.php
@@ -25,7 +25,7 @@ class SilencedErrorContext implements \JsonSerializable
     private $line;
     private $trace;
 
-    public function __construct($severity, $file, $line, array $trace = array(), $count = 1)
+    public function __construct(int $severity, string $file, int $line, array $trace = array(), int $count = 1)
     {
         $this->severity = $severity;
         $this->file = $file;
diff --git a/vendor/symfony/debug/Exception/UndefinedFunctionException.php b/vendor/symfony/debug/Exception/UndefinedFunctionException.php
index a66ae2a3..d936c875 100644
--- a/vendor/symfony/debug/Exception/UndefinedFunctionException.php
+++ b/vendor/symfony/debug/Exception/UndefinedFunctionException.php
@@ -18,7 +18,7 @@ namespace Symfony\Component\Debug\Exception;
  */
 class UndefinedFunctionException extends FatalErrorException
 {
-    public function __construct($message, \ErrorException $previous)
+    public function __construct(string $message, \ErrorException $previous)
     {
         parent::__construct(
             $message,
@@ -26,6 +26,9 @@ class UndefinedFunctionException extends FatalErrorException
             $previous->getSeverity(),
             $previous->getFile(),
             $previous->getLine(),
+            null,
+            true,
+            null,
             $previous->getPrevious()
         );
         $this->setTrace($previous->getTrace());
diff --git a/vendor/symfony/debug/Exception/UndefinedMethodException.php b/vendor/symfony/debug/Exception/UndefinedMethodException.php
index 350dc318..f627561f 100644
--- a/vendor/symfony/debug/Exception/UndefinedMethodException.php
+++ b/vendor/symfony/debug/Exception/UndefinedMethodException.php
@@ -18,7 +18,7 @@ namespace Symfony\Component\Debug\Exception;
  */
 class UndefinedMethodException extends FatalErrorException
 {
-    public function __construct($message, \ErrorException $previous)
+    public function __construct(string $message, \ErrorException $previous)
     {
         parent::__construct(
             $message,
@@ -26,6 +26,9 @@ class UndefinedMethodException extends FatalErrorException
             $previous->getSeverity(),
             $previous->getFile(),
             $previous->getLine(),
+            null,
+            true,
+            null,
             $previous->getPrevious()
         );
         $this->setTrace($previous->getTrace());
diff --git a/vendor/symfony/debug/ExceptionHandler.php b/vendor/symfony/debug/ExceptionHandler.php
index f22b70f6..1845bc88 100644
--- a/vendor/symfony/debug/ExceptionHandler.php
+++ b/vendor/symfony/debug/ExceptionHandler.php
@@ -36,7 +36,7 @@ class ExceptionHandler
     private $caughtLength;
     private $fileLinkFormat;
 
-    public function __construct($debug = true, $charset = null, $fileLinkFormat = null)
+    public function __construct(bool $debug = true, string $charset = null, $fileLinkFormat = null)
     {
         $this->debug = $debug;
         $this->charset = $charset ?: ini_get('default_charset') ?: 'UTF-8';
@@ -57,7 +57,7 @@ class ExceptionHandler
         $handler = new static($debug, $charset, $fileLinkFormat);
 
         $prev = set_exception_handler(array($handler, 'handle'));
-        if (is_array($prev) && $prev[0] instanceof ErrorHandler) {
+        if (\is_array($prev) && $prev[0] instanceof ErrorHandler) {
             restore_exception_handler();
             $prev[0]->setExceptionHandler(array($handler, 'handle'));
         }
@@ -142,7 +142,7 @@ class ExceptionHandler
         $this->caughtBuffer = null;
 
         try {
-            call_user_func($this->handler, $exception);
+            \call_user_func($this->handler, $exception);
             $this->caughtLength = $caughtLength;
         } catch (\Exception $e) {
             if (!$caughtLength) {
@@ -208,48 +208,54 @@ class ExceptionHandler
                 $title = 'Whoops, looks like something went wrong.';
         }
 
+        if (!$this->debug) {
+            return <<<EOF
+                <div class="container">
+                    <h1>$title</h1>
+                </div>
+EOF;
+        }
+
         $content = '';
-        if ($this->debug) {
-            try {
-                $count = count($exception->getAllPrevious());
-                $total = $count + 1;
-                foreach ($exception->toArray() as $position => $e) {
-                    $ind = $count - $position + 1;
-                    $class = $this->formatClass($e['class']);
-                    $message = nl2br($this->escapeHtml($e['message']));
-                    $content .= sprintf(<<<'EOF'
-                        <div class="trace trace-as-html">
-                            <table class="trace-details">
-                                <thead class="trace-head"><tr><th>
-                                    <h3 class="trace-class">
-                                        <span class="text-muted">(%d/%d)</span>
-                                        <span class="exception_title">%s</span>
-                                    </h3>
-                                    <p class="break-long-words trace-message">%s</p>
-                                </th></tr></thead>
-                                <tbody>
+        try {
+            $count = \count($exception->getAllPrevious());
+            $total = $count + 1;
+            foreach ($exception->toArray() as $position => $e) {
+                $ind = $count - $position + 1;
+                $class = $this->formatClass($e['class']);
+                $message = nl2br($this->escapeHtml($e['message']));
+                $content .= sprintf(<<<'EOF'
+                    <div class="trace trace-as-html">
+                        <table class="trace-details">
+                            <thead class="trace-head"><tr><th>
+                                <h3 class="trace-class">
+                                    <span class="text-muted">(%d/%d)</span>
+                                    <span class="exception_title">%s</span>
+                                </h3>
+                                <p class="break-long-words trace-message">%s</p>
+                            </th></tr></thead>
+                            <tbody>
 EOF
-                        , $ind, $total, $class, $message);
-                    foreach ($e['trace'] as $trace) {
-                        $content .= '<tr><td>';
-                        if ($trace['function']) {
-                            $content .= sprintf('at <span class="trace-class">%s</span><span class="trace-type">%s</span><span class="trace-method">%s</span>(<span class="trace-arguments">%s</span>)', $this->formatClass($trace['class']), $trace['type'], $trace['function'], $this->formatArgs($trace['args']));
-                        }
-                        if (isset($trace['file']) && isset($trace['line'])) {
-                            $content .= $this->formatPath($trace['file'], $trace['line']);
-                        }
-                        $content .= "</td></tr>\n";
+                    , $ind, $total, $class, $message);
+                foreach ($e['trace'] as $trace) {
+                    $content .= '<tr><td>';
+                    if ($trace['function']) {
+                        $content .= sprintf('at <span class="trace-class">%s</span><span class="trace-type">%s</span><span class="trace-method">%s</span>(<span class="trace-arguments">%s</span>)', $this->formatClass($trace['class']), $trace['type'], $trace['function'], $this->formatArgs($trace['args']));
                     }
-
-                    $content .= "</tbody>\n</table>\n</div>\n";
-                }
-            } catch (\Exception $e) {
-                // something nasty happened and we cannot throw an exception anymore
-                if ($this->debug) {
-                    $title = sprintf('Exception thrown when handling an exception (%s: %s)', get_class($e), $this->escapeHtml($e->getMessage()));
-                } else {
-                    $title = 'Whoops, looks like something went wrong.';
+                    if (isset($trace['file']) && isset($trace['line'])) {
+                        $content .= $this->formatPath($trace['file'], $trace['line']);
+                    }
+                    $content .= "</td></tr>\n";
                 }
+
+                $content .= "</tbody>\n</table>\n</div>\n";
+            }
+        } catch (\Exception $e) {
+            // something nasty happened and we cannot throw an exception anymore
+            if ($this->debug) {
+                $title = sprintf('Exception thrown when handling an exception (%s: %s)', \get_class($e), $this->escapeHtml($e->getMessage()));
+            } else {
+                $title = 'Whoops, looks like something went wrong.';
             }
         }
 
@@ -278,6 +284,14 @@ EOF;
      */
     public function getStylesheet(FlattenException $exception)
     {
+        if (!$this->debug) {
+            return <<<'EOF'
+                body { background-color: #fff; color: #222; font: 16px/1.5 -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; margin: 0; }
+                .container { margin: 30px; max-width: 600px; }
+                h1 { color: #dc3545; font-size: 24px; }
+EOF;
+        }
+
         return <<<'EOF'
             body { background-color: #F9F9F9; color: #222; font: 14px/1.4 Helvetica, Arial, sans-serif; margin: 0; padding-bottom: 45px; }
 
@@ -362,12 +376,12 @@ EOF;
         }
 
         if (\is_string($fmt)) {
-            $i = strpos($f = $fmt, '&', max(strrpos($f, '%f'), strrpos($f, '%l'))) ?: strlen($f);
+            $i = strpos($f = $fmt, '&', max(strrpos($f, '%f'), strrpos($f, '%l'))) ?: \strlen($f);
             $fmt = array(substr($f, 0, $i)) + preg_split('/&([^>]++)>/', substr($f, $i), -1, PREG_SPLIT_DELIM_CAPTURE);
 
             for ($i = 1; isset($fmt[$i]); ++$i) {
                 if (0 === strpos($path, $k = $fmt[$i++])) {
-                    $path = substr_replace($path, $fmt[$i], 0, strlen($k));
+                    $path = substr_replace($path, $fmt[$i], 0, \strlen($k));
                     break;
                 }
             }
@@ -394,7 +408,7 @@ EOF;
             if ('object' === $item[0]) {
                 $formattedValue = sprintf('<em>object</em>(%s)', $this->formatClass($item[1]));
             } elseif ('array' === $item[0]) {
-                $formattedValue = sprintf('<em>array</em>(%s)', is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]);
+                $formattedValue = sprintf('<em>array</em>(%s)', \is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]);
             } elseif ('null' === $item[0]) {
                 $formattedValue = '<em>null</em>';
             } elseif ('boolean' === $item[0]) {
@@ -405,7 +419,7 @@ EOF;
                 $formattedValue = str_replace("\n", '', $this->escapeHtml(var_export($item[1], true)));
             }
 
-            $result[] = is_int($key) ? $formattedValue : sprintf("'%s' => %s", $this->escapeHtml($key), $formattedValue);
+            $result[] = \is_int($key) ? $formattedValue : sprintf("'%s' => %s", $this->escapeHtml($key), $formattedValue);
         }
 
         return implode(', ', $result);
diff --git a/vendor/symfony/debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php b/vendor/symfony/debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
index 32ba9a09..4ccd16fe 100644
--- a/vendor/symfony/debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
+++ b/vendor/symfony/debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
@@ -11,11 +11,11 @@
 
 namespace Symfony\Component\Debug\FatalErrorHandler;
 
-use Symfony\Component\Debug\Exception\ClassNotFoundException;
-use Symfony\Component\Debug\Exception\FatalErrorException;
-use Symfony\Component\Debug\DebugClassLoader;
 use Composer\Autoload\ClassLoader as ComposerClassLoader;
 use Symfony\Component\ClassLoader\ClassLoader as SymfonyClassLoader;
+use Symfony\Component\Debug\DebugClassLoader;
+use Symfony\Component\Debug\Exception\ClassNotFoundException;
+use Symfony\Component\Debug\Exception\FatalErrorException;
 
 /**
  * ErrorHandler for classes that do not exist.
@@ -29,9 +29,9 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
      */
     public function handleError(array $error, FatalErrorException $exception)
     {
-        $messageLen = strlen($error['message']);
+        $messageLen = \strlen($error['message']);
         $notFoundSuffix = '\' not found';
-        $notFoundSuffixLen = strlen($notFoundSuffix);
+        $notFoundSuffixLen = \strlen($notFoundSuffix);
         if ($notFoundSuffixLen > $messageLen) {
             return;
         }
@@ -42,7 +42,7 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
 
         foreach (array('class', 'interface', 'trait') as $typeName) {
             $prefix = ucfirst($typeName).' \'';
-            $prefixLen = strlen($prefix);
+            $prefixLen = \strlen($prefix);
             if (0 !== strpos($error['message'], $prefix)) {
                 continue;
             }
@@ -83,9 +83,9 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
      *
      * @return array An array of possible fully qualified class names
      */
-    private function getClassCandidates($class)
+    private function getClassCandidates(string $class): array
     {
-        if (!is_array($functions = spl_autoload_functions())) {
+        if (!\is_array($functions = spl_autoload_functions())) {
             return array();
         }
 
@@ -93,14 +93,14 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
         $classes = array();
 
         foreach ($functions as $function) {
-            if (!is_array($function)) {
+            if (!\is_array($function)) {
                 continue;
             }
             // get class loaders wrapped by DebugClassLoader
             if ($function[0] instanceof DebugClassLoader) {
                 $function = $function[0]->getClassLoader();
 
-                if (!is_array($function)) {
+                if (!\is_array($function)) {
                     continue;
                 }
             }
@@ -124,16 +124,9 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
         return array_unique($classes);
     }
 
-    /**
-     * @param string $path
-     * @param string $class
-     * @param string $prefix
-     *
-     * @return array
-     */
-    private function findClassInPath($path, $class, $prefix)
+    private function findClassInPath(string $path, string $class, string $prefix): array
     {
-        if (!$path = realpath($path.'/'.strtr($prefix, '\\_', '//')) ?: realpath($path.'/'.dirname(strtr($prefix, '\\_', '//'))) ?: realpath($path)) {
+        if (!$path = realpath($path.'/'.strtr($prefix, '\\_', '//')) ?: realpath($path.'/'.\dirname(strtr($prefix, '\\_', '//'))) ?: realpath($path)) {
             return array();
         }
 
@@ -148,18 +141,11 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
         return $classes;
     }
 
-    /**
-     * @param string $path
-     * @param string $file
-     * @param string $prefix
-     *
-     * @return string|null
-     */
-    private function convertFileToClass($path, $file, $prefix)
+    private function convertFileToClass(string $path, string $file, string $prefix): ?string
     {
         $candidates = array(
             // namespaced class
-            $namespacedClass = str_replace(array($path.DIRECTORY_SEPARATOR, '.php', '/'), array('', '', '\\'), $file),
+            $namespacedClass = str_replace(array($path.\DIRECTORY_SEPARATOR, '.php', '/'), array('', '', '\\'), $file),
             // namespaced class (with target dir)
             $prefix.$namespacedClass,
             // namespaced class (with target dir and separator)
@@ -192,14 +178,11 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
                 return $candidate;
             }
         }
+
+        return null;
     }
 
-    /**
-     * @param string $class
-     *
-     * @return bool
-     */
-    private function classExists($class)
+    private function classExists(string $class): bool
     {
         return class_exists($class, false) || interface_exists($class, false) || trait_exists($class, false);
     }
diff --git a/vendor/symfony/debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php b/vendor/symfony/debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php
index c6f391a7..db241803 100644
--- a/vendor/symfony/debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php
+++ b/vendor/symfony/debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Debug\FatalErrorHandler;
 
-use Symfony\Component\Debug\Exception\UndefinedFunctionException;
 use Symfony\Component\Debug\Exception\FatalErrorException;
+use Symfony\Component\Debug\Exception\UndefinedFunctionException;
 
 /**
  * ErrorHandler for undefined functions.
@@ -26,9 +26,9 @@ class UndefinedFunctionFatalErrorHandler implements FatalErrorHandlerInterface
      */
     public function handleError(array $error, FatalErrorException $exception)
     {
-        $messageLen = strlen($error['message']);
+        $messageLen = \strlen($error['message']);
         $notFoundSuffix = '()';
-        $notFoundSuffixLen = strlen($notFoundSuffix);
+        $notFoundSuffixLen = \strlen($notFoundSuffix);
         if ($notFoundSuffixLen > $messageLen) {
             return;
         }
@@ -38,7 +38,7 @@ class UndefinedFunctionFatalErrorHandler implements FatalErrorHandlerInterface
         }
 
         $prefix = 'Call to undefined function ';
-        $prefixLen = strlen($prefix);
+        $prefixLen = \strlen($prefix);
         if (0 !== strpos($error['message'], $prefix)) {
             return;
         }
diff --git a/vendor/symfony/debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php b/vendor/symfony/debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
index 6fa62b6f..618a2c20 100644
--- a/vendor/symfony/debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
+++ b/vendor/symfony/debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
@@ -44,7 +44,7 @@ class UndefinedMethodFatalErrorHandler implements FatalErrorHandlerInterface
         $candidates = array();
         foreach ($methods as $definedMethodName) {
             $lev = levenshtein($methodName, $definedMethodName);
-            if ($lev <= strlen($methodName) / 3 || false !== strpos($definedMethodName, $methodName)) {
+            if ($lev <= \strlen($methodName) / 3 || false !== strpos($definedMethodName, $methodName)) {
                 $candidates[] = $definedMethodName;
             }
         }
diff --git a/vendor/symfony/debug/Resources/ext/README.md b/vendor/symfony/debug/Resources/ext/README.md
deleted file mode 100644
index 25dccf07..00000000
--- a/vendor/symfony/debug/Resources/ext/README.md
+++ /dev/null
@@ -1,134 +0,0 @@
-Symfony Debug Extension for PHP 5
-=================================
-
-This extension publishes several functions to help building powerful debugging tools.
-It is compatible with PHP 5.3, 5.4, 5.5 and 5.6; with ZTS and non-ZTS modes.
-It is not required thus not provided for PHP 7.
-
-symfony_zval_info()
--------------------
-
-- exposes zval_hash/refcounts, allowing e.g. efficient exploration of arbitrary structures in PHP,
-- does work with references, preventing memory copying.
-
-Its behavior is about the same as:
-
-```php
-<?php
-
-function symfony_zval_info($key, $array, $options = 0)
-{
-
-    // $options is currently not used, but could be in future version.
-
-    if (!array_key_exists($key, $array)) {
-        return null;
-    }
-
-    $info = array(
-        'type' => gettype($array[$key]),
-        'zval_hash' => /* hashed memory address of $array[$key] */,
-        'zval_refcount' => /* internal zval refcount of $array[$key] */,
-        'zval_isref' => /* is_ref status of $array[$key] */,
-    );
-
-    switch ($info['type']) {
-        case 'object':
-            $info += array(
-                'object_class' => get_class($array[$key]),
-                'object_refcount' => /* internal object refcount of $array[$key] */,
-                'object_hash' => spl_object_hash($array[$key]),
-                'object_handle' => /* internal object handle $array[$key] */,
-            );
-            break;
-
-        case 'resource':
-            $info += array(
-                'resource_handle' => (int) $array[$key],
-                'resource_type' => get_resource_type($array[$key]),
-                'resource_refcount' => /* internal resource refcount of $array[$key] */,
-            );
-            break;
-
-        case 'array':
-            $info += array(
-                'array_count' => count($array[$key]),
-            );
-            break;
-
-        case 'string':
-            $info += array(
-                'strlen' => strlen($array[$key]),
-            );
-            break;
-    }
-
-    return $info;
-}
-```
-
-symfony_debug_backtrace()
--------------------------
-
-This function works like debug_backtrace(), except that it can fetch the full backtrace in case of fatal errors:
-
-```php
-function foo() { fatal(); }
-function bar() { foo(); }
-
-function sd() { var_dump(symfony_debug_backtrace()); }
-
-register_shutdown_function('sd');
-
-bar();
-
-/* Will output
-Fatal error: Call to undefined function fatal() in foo.php on line 42
-array(3) {
-  [0]=>
-  array(2) {
-    ["function"]=>
-    string(2) "sd"
-    ["args"]=>
-    array(0) {
-    }
-  }
-  [1]=>
-  array(4) {
-    ["file"]=>
-    string(7) "foo.php"
-    ["line"]=>
-    int(1)
-    ["function"]=>
-    string(3) "foo"
-    ["args"]=>
-    array(0) {
-    }
-  }
-  [2]=>
-  array(4) {
-    ["file"]=>
-    string(102) "foo.php"
-    ["line"]=>
-    int(2)
-    ["function"]=>
-    string(3) "bar"
-    ["args"]=>
-    array(0) {
-    }
-  }
-}
-*/
-```
-
-Usage
------
-
-To enable the extension from source, run:
-
-```
-    phpize
-    ./configure
-    make
-    sudo make install
-```
diff --git a/vendor/symfony/debug/Resources/ext/config.m4 b/vendor/symfony/debug/Resources/ext/config.m4
deleted file mode 100644
index 3c560471..00000000
--- a/vendor/symfony/debug/Resources/ext/config.m4
+++ /dev/null
@@ -1,63 +0,0 @@
-dnl $Id$
-dnl config.m4 for extension symfony_debug
-
-dnl Comments in this file start with the string 'dnl'.
-dnl Remove where necessary. This file will not work
-dnl without editing.
-
-dnl If your extension references something external, use with:
-
-dnl PHP_ARG_WITH(symfony_debug, for symfony_debug support,
-dnl Make sure that the comment is aligned:
-dnl [  --with-symfony_debug             Include symfony_debug support])
-
-dnl Otherwise use enable:
-
-PHP_ARG_ENABLE(symfony_debug, whether to enable symfony_debug support,
-dnl Make sure that the comment is aligned:
-[  --enable-symfony_debug           Enable symfony_debug support])
-
-if test "$PHP_SYMFONY_DEBUG" != "no"; then
-  dnl Write more examples of tests here...
-
-  dnl # --with-symfony_debug -> check with-path
-  dnl SEARCH_PATH="/usr/local /usr"     # you might want to change this
-  dnl SEARCH_FOR="/include/symfony_debug.h"  # you most likely want to change this
-  dnl if test -r $PHP_SYMFONY_DEBUG/$SEARCH_FOR; then # path given as parameter
-  dnl   SYMFONY_DEBUG_DIR=$PHP_SYMFONY_DEBUG
-  dnl else # search default path list
-  dnl   AC_MSG_CHECKING([for symfony_debug files in default path])
-  dnl   for i in $SEARCH_PATH ; do
-  dnl     if test -r $i/$SEARCH_FOR; then
-  dnl       SYMFONY_DEBUG_DIR=$i
-  dnl       AC_MSG_RESULT(found in $i)
-  dnl     fi
-  dnl   done
-  dnl fi
-  dnl
-  dnl if test -z "$SYMFONY_DEBUG_DIR"; then
-  dnl   AC_MSG_RESULT([not found])
-  dnl   AC_MSG_ERROR([Please reinstall the symfony_debug distribution])
-  dnl fi
-
-  dnl # --with-symfony_debug -> add include path
-  dnl PHP_ADD_INCLUDE($SYMFONY_DEBUG_DIR/include)
-
-  dnl # --with-symfony_debug -> check for lib and symbol presence
-  dnl LIBNAME=symfony_debug # you may want to change this
-  dnl LIBSYMBOL=symfony_debug # you most likely want to change this 
-
-  dnl PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
-  dnl [
-  dnl   PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $SYMFONY_DEBUG_DIR/lib, SYMFONY_DEBUG_SHARED_LIBADD)
-  dnl   AC_DEFINE(HAVE_SYMFONY_DEBUGLIB,1,[ ])
-  dnl ],[
-  dnl   AC_MSG_ERROR([wrong symfony_debug lib version or lib not found])
-  dnl ],[
-  dnl   -L$SYMFONY_DEBUG_DIR/lib -lm
-  dnl ])
-  dnl
-  dnl PHP_SUBST(SYMFONY_DEBUG_SHARED_LIBADD)
-
-  PHP_NEW_EXTENSION(symfony_debug, symfony_debug.c, $ext_shared)
-fi
diff --git a/vendor/symfony/debug/Resources/ext/config.w32 b/vendor/symfony/debug/Resources/ext/config.w32
deleted file mode 100644
index 487e6913..00000000
--- a/vendor/symfony/debug/Resources/ext/config.w32
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-// vim:ft=javascript
-
-// If your extension references something external, use ARG_WITH
-// ARG_WITH("symfony_debug", "for symfony_debug support", "no");
-
-// Otherwise, use ARG_ENABLE
-// ARG_ENABLE("symfony_debug", "enable symfony_debug support", "no");
-
-if (PHP_SYMFONY_DEBUG != "no") {
-	EXTENSION("symfony_debug", "symfony_debug.c");
-}
-
diff --git a/vendor/symfony/debug/Resources/ext/php_symfony_debug.h b/vendor/symfony/debug/Resources/ext/php_symfony_debug.h
deleted file mode 100644
index 26d0e8c0..00000000
--- a/vendor/symfony/debug/Resources/ext/php_symfony_debug.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-#ifndef PHP_SYMFONY_DEBUG_H
-#define PHP_SYMFONY_DEBUG_H
-
-extern zend_module_entry symfony_debug_module_entry;
-#define phpext_symfony_debug_ptr &symfony_debug_module_entry
-
-#define PHP_SYMFONY_DEBUG_VERSION "2.7"
-
-#ifdef PHP_WIN32
-#	define PHP_SYMFONY_DEBUG_API __declspec(dllexport)
-#elif defined(__GNUC__) && __GNUC__ >= 4
-#	define PHP_SYMFONY_DEBUG_API __attribute__ ((visibility("default")))
-#else
-#	define PHP_SYMFONY_DEBUG_API
-#endif
-
-#ifdef ZTS
-#include "TSRM.h"
-#endif
-
-ZEND_BEGIN_MODULE_GLOBALS(symfony_debug)
-	intptr_t req_rand_init;
-	void (*old_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
-	zval *debug_bt;
-ZEND_END_MODULE_GLOBALS(symfony_debug)
-
-PHP_MINIT_FUNCTION(symfony_debug);
-PHP_MSHUTDOWN_FUNCTION(symfony_debug);
-PHP_RINIT_FUNCTION(symfony_debug);
-PHP_RSHUTDOWN_FUNCTION(symfony_debug);
-PHP_MINFO_FUNCTION(symfony_debug);
-PHP_GINIT_FUNCTION(symfony_debug);
-PHP_GSHUTDOWN_FUNCTION(symfony_debug);
-
-PHP_FUNCTION(symfony_zval_info);
-PHP_FUNCTION(symfony_debug_backtrace);
-
-static char *_symfony_debug_memory_address_hash(void * TSRMLS_DC);
-static const char *_symfony_debug_zval_type(zval *);
-static const char* _symfony_debug_get_resource_type(long TSRMLS_DC);
-static int _symfony_debug_get_resource_refcount(long TSRMLS_DC);
-
-void symfony_debug_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
-
-#ifdef ZTS
-#define SYMFONY_DEBUG_G(v) TSRMG(symfony_debug_globals_id, zend_symfony_debug_globals *, v)
-#else
-#define SYMFONY_DEBUG_G(v) (symfony_debug_globals.v)
-#endif
-
-#endif	/* PHP_SYMFONY_DEBUG_H */
diff --git a/vendor/symfony/debug/Resources/ext/symfony_debug.c b/vendor/symfony/debug/Resources/ext/symfony_debug.c
deleted file mode 100644
index 0d7cb602..00000000
--- a/vendor/symfony/debug/Resources/ext/symfony_debug.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "php.h"
-#ifdef ZTS
-#include "TSRM.h"
-#endif
-#include "php_ini.h"
-#include "ext/standard/info.h"
-#include "php_symfony_debug.h"
-#include "ext/standard/php_rand.h"
-#include "ext/standard/php_lcg.h"
-#include "ext/spl/php_spl.h"
-#include "Zend/zend_gc.h"
-#include "Zend/zend_builtin_functions.h"
-#include "Zend/zend_extensions.h" /* for ZEND_EXTENSION_API_NO */
-#include "ext/standard/php_array.h"
-#include "Zend/zend_interfaces.h"
-#include "SAPI.h"
-
-#define IS_PHP_53 ZEND_EXTENSION_API_NO == 220090626
-
-ZEND_DECLARE_MODULE_GLOBALS(symfony_debug)
-
-ZEND_BEGIN_ARG_INFO_EX(symfony_zval_arginfo, 0, 0, 2)
-	ZEND_ARG_INFO(0, key)
-	ZEND_ARG_ARRAY_INFO(0, array, 0)
-	ZEND_ARG_INFO(0, options)
-ZEND_END_ARG_INFO()
-
-const zend_function_entry symfony_debug_functions[] = {
-	PHP_FE(symfony_zval_info,	symfony_zval_arginfo)
-	PHP_FE(symfony_debug_backtrace, NULL)
-	PHP_FE_END
-};
-
-PHP_FUNCTION(symfony_debug_backtrace)
-{
-	if (zend_parse_parameters_none() == FAILURE) {
-		return;
-	}
-#if IS_PHP_53
-	zend_fetch_debug_backtrace(return_value, 1, 0 TSRMLS_CC);
-#else
-	zend_fetch_debug_backtrace(return_value, 1, 0, 0 TSRMLS_CC);
-#endif
-
-	if (!SYMFONY_DEBUG_G(debug_bt)) {
-		return;
-	}
-
-	php_array_merge(Z_ARRVAL_P(return_value), Z_ARRVAL_P(SYMFONY_DEBUG_G(debug_bt)), 0 TSRMLS_CC);
-}
-
-PHP_FUNCTION(symfony_zval_info)
-{
-	zval *key = NULL, *arg = NULL;
-	zval **data = NULL;
-	HashTable *array = NULL;
-	long options = 0;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zh|l", &key, &array, &options) == FAILURE) {
-		return;
-	}
-
-	switch (Z_TYPE_P(key)) {
-		case IS_STRING:
-			if (zend_symtable_find(array, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&data) == FAILURE) {
-				return;
-			}
-		break;
-		case IS_LONG:
-			if (zend_hash_index_find(array, Z_LVAL_P(key), (void **)&data)) {
-				return;
-			}
-		break;
-	}
-
-	arg = *data;
-
-	array_init(return_value);
-
-	add_assoc_string(return_value, "type", (char *)_symfony_debug_zval_type(arg), 1);
-	add_assoc_stringl(return_value, "zval_hash", _symfony_debug_memory_address_hash((void *)arg TSRMLS_CC), 16, 0);
-	add_assoc_long(return_value, "zval_refcount", Z_REFCOUNT_P(arg));
-	add_assoc_bool(return_value, "zval_isref", (zend_bool)Z_ISREF_P(arg));
-
-	if (Z_TYPE_P(arg) == IS_OBJECT) {
-		char hash[33] = {0};
-
-		php_spl_object_hash(arg, (char *)hash TSRMLS_CC);
-		add_assoc_stringl(return_value, "object_class", (char *)Z_OBJCE_P(arg)->name, Z_OBJCE_P(arg)->name_length, 1);
-		add_assoc_long(return_value, "object_refcount", EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(arg)].bucket.obj.refcount);
-		add_assoc_string(return_value, "object_hash", hash, 1);
-		add_assoc_long(return_value, "object_handle", Z_OBJ_HANDLE_P(arg));
-	} else if (Z_TYPE_P(arg) == IS_ARRAY) {
-		add_assoc_long(return_value, "array_count", zend_hash_num_elements(Z_ARRVAL_P(arg)));
-	} else if(Z_TYPE_P(arg) == IS_RESOURCE) {
-		add_assoc_long(return_value, "resource_handle", Z_LVAL_P(arg));
-		add_assoc_string(return_value, "resource_type", (char *)_symfony_debug_get_resource_type(Z_LVAL_P(arg) TSRMLS_CC), 1);
-		add_assoc_long(return_value, "resource_refcount", _symfony_debug_get_resource_refcount(Z_LVAL_P(arg) TSRMLS_CC));
-	} else if (Z_TYPE_P(arg) == IS_STRING) {
-		add_assoc_long(return_value, "strlen", Z_STRLEN_P(arg));
-	}
-}
-
-void symfony_debug_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args)
-{
-	TSRMLS_FETCH();
-	zval *retval;
-
-	switch (type) {
-		case E_ERROR:
-		case E_PARSE:
-		case E_CORE_ERROR:
-		case E_CORE_WARNING:
-		case E_COMPILE_ERROR:
-		case E_COMPILE_WARNING:
-			ALLOC_INIT_ZVAL(retval);
-#if IS_PHP_53
-			zend_fetch_debug_backtrace(retval, 1, 0 TSRMLS_CC);
-#else
-			zend_fetch_debug_backtrace(retval, 1, 0, 0 TSRMLS_CC);
-#endif
-			SYMFONY_DEBUG_G(debug_bt) = retval;
-	}
-
-	SYMFONY_DEBUG_G(old_error_cb)(type, error_filename, error_lineno, format, args);
-}
-
-static const char* _symfony_debug_get_resource_type(long rsid TSRMLS_DC)
-{
-	const char *res_type;
-	res_type = zend_rsrc_list_get_rsrc_type(rsid TSRMLS_CC);
-
-	if (!res_type) {
-		return "Unknown";
-	}
-
-	return res_type;
-}
-
-static int _symfony_debug_get_resource_refcount(long rsid TSRMLS_DC)
-{
-	zend_rsrc_list_entry *le;
-
-	if (zend_hash_index_find(&EG(regular_list), rsid, (void **) &le)==SUCCESS) {
-		return le->refcount;
-	}
-
-	return 0;
-}
-
-static char *_symfony_debug_memory_address_hash(void *address TSRMLS_DC)
-{
-	char *result = NULL;
-	intptr_t address_rand;
-
-	if (!SYMFONY_DEBUG_G(req_rand_init)) {
-		if (!BG(mt_rand_is_seeded)) {
-			php_mt_srand(GENERATE_SEED() TSRMLS_CC);
-		}
-		SYMFONY_DEBUG_G(req_rand_init) = (intptr_t)php_mt_rand(TSRMLS_C);
-	}
-
-	address_rand = (intptr_t)address ^ SYMFONY_DEBUG_G(req_rand_init);
-
-	spprintf(&result, 17, "%016zx", address_rand);
-
-	return result;
-}
-
-static const char *_symfony_debug_zval_type(zval *zv)
-{
-	switch (Z_TYPE_P(zv)) {
-		case IS_NULL:
-			return "NULL";
-			break;
-
-		case IS_BOOL:
-			return "boolean";
-			break;
-
-		case IS_LONG:
-			return "integer";
-			break;
-
-		case IS_DOUBLE:
-			return "double";
-			break;
-
-		case IS_STRING:
-			return "string";
-			break;
-
-		case IS_ARRAY:
-			return "array";
-			break;
-
-		case IS_OBJECT:
-			return "object";
-
-		case IS_RESOURCE:
-			return "resource";
-
-		default:
-			return "unknown type";
-	}
-}
-
-zend_module_entry symfony_debug_module_entry = {
-	STANDARD_MODULE_HEADER,
-	"symfony_debug",
-	symfony_debug_functions,
-	PHP_MINIT(symfony_debug),
-	PHP_MSHUTDOWN(symfony_debug),
-	PHP_RINIT(symfony_debug),
-	PHP_RSHUTDOWN(symfony_debug),
-	PHP_MINFO(symfony_debug),
-	PHP_SYMFONY_DEBUG_VERSION,
-	PHP_MODULE_GLOBALS(symfony_debug),
-	PHP_GINIT(symfony_debug),
-	PHP_GSHUTDOWN(symfony_debug),
-	NULL,
-	STANDARD_MODULE_PROPERTIES_EX
-};
-
-#ifdef COMPILE_DL_SYMFONY_DEBUG
-ZEND_GET_MODULE(symfony_debug)
-#endif
-
-PHP_GINIT_FUNCTION(symfony_debug)
-{
-	memset(symfony_debug_globals, 0 , sizeof(*symfony_debug_globals));
-}
-
-PHP_GSHUTDOWN_FUNCTION(symfony_debug)
-{
-
-}
-
-PHP_MINIT_FUNCTION(symfony_debug)
-{
-	SYMFONY_DEBUG_G(old_error_cb) = zend_error_cb;
-	zend_error_cb                 = symfony_debug_error_cb;
-
-	return SUCCESS;
-}
-
-PHP_MSHUTDOWN_FUNCTION(symfony_debug)
-{
-	zend_error_cb = SYMFONY_DEBUG_G(old_error_cb);
-
-	return SUCCESS;
-}
-
-PHP_RINIT_FUNCTION(symfony_debug)
-{
-	return SUCCESS;
-}
-
-PHP_RSHUTDOWN_FUNCTION(symfony_debug)
-{
-	return SUCCESS;
-}
-
-PHP_MINFO_FUNCTION(symfony_debug)
-{
-	php_info_print_table_start();
-	php_info_print_table_header(2, "Symfony Debug support", "enabled");
-	php_info_print_table_header(2, "Symfony Debug version", PHP_SYMFONY_DEBUG_VERSION);
-	php_info_print_table_end();
-}
diff --git a/vendor/symfony/debug/Resources/ext/tests/001.phpt b/vendor/symfony/debug/Resources/ext/tests/001.phpt
deleted file mode 100644
index 4a87cd31..00000000
--- a/vendor/symfony/debug/Resources/ext/tests/001.phpt
+++ /dev/null
@@ -1,155 +0,0 @@
---TEST--
-Test symfony_zval_info API
---SKIPIF--
-<?php if (!extension_loaded('symfony_debug')) {
-    echo 'skip';
-} ?>
---FILE--
-<?php
-
-$int = 42;
-$float = 42.42;
-$str = 'foobar';
-$object = new StdClass();
-$array = array('foo', 'bar');
-$resource = tmpfile();
-$null = null;
-$bool = true;
-
-$anotherint = 42;
-$refcount2 = &$anotherint;
-
-$var = array(
-    'int' => $int,
-    'float' => $float,
-    'str' => $str,
-    'object' => $object,
-    'array' => $array,
-    'resource' => $resource,
-    'null' => $null,
-    'bool' => $bool,
-    'refcount' => &$refcount2,
-);
-
-var_dump(symfony_zval_info('int', $var));
-var_dump(symfony_zval_info('float', $var));
-var_dump(symfony_zval_info('str', $var));
-var_dump(symfony_zval_info('object', $var));
-var_dump(symfony_zval_info('array', $var));
-var_dump(symfony_zval_info('resource', $var));
-var_dump(symfony_zval_info('null', $var));
-var_dump(symfony_zval_info('bool', $var));
-
-var_dump(symfony_zval_info('refcount', $var));
-var_dump(symfony_zval_info('not-exist', $var));
-?>
---EXPECTF--
-array(4) {
-  ["type"]=>
-  string(7) "integer"
-  ["zval_hash"]=>
-  string(16) "%s"
-  ["zval_refcount"]=>
-  int(2)
-  ["zval_isref"]=>
-  bool(false)
-}
-array(4) {
-  ["type"]=>
-  string(6) "double"
-  ["zval_hash"]=>
-  string(16) "%s"
-  ["zval_refcount"]=>
-  int(2)
-  ["zval_isref"]=>
-  bool(false)
-}
-array(5) {
-  ["type"]=>
-  string(6) "string"
-  ["zval_hash"]=>
-  string(16) "%s"
-  ["zval_refcount"]=>
-  int(2)
-  ["zval_isref"]=>
-  bool(false)
-  ["strlen"]=>
-  int(6)
-}
-array(8) {
-  ["type"]=>
-  string(6) "object"
-  ["zval_hash"]=>
-  string(16) "%s"
-  ["zval_refcount"]=>
-  int(2)
-  ["zval_isref"]=>
-  bool(false)
-  ["object_class"]=>
-  string(8) "stdClass"
-  ["object_refcount"]=>
-  int(1)
-  ["object_hash"]=>
-  string(32) "%s"
-  ["object_handle"]=>
-  int(%d)
-}
-array(5) {
-  ["type"]=>
-  string(5) "array"
-  ["zval_hash"]=>
-  string(16) "%s"
-  ["zval_refcount"]=>
-  int(2)
-  ["zval_isref"]=>
-  bool(false)
-  ["array_count"]=>
-  int(2)
-}
-array(7) {
-  ["type"]=>
-  string(8) "resource"
-  ["zval_hash"]=>
-  string(16) "%s"
-  ["zval_refcount"]=>
-  int(2)
-  ["zval_isref"]=>
-  bool(false)
-  ["resource_handle"]=>
-  int(%d)
-  ["resource_type"]=>
-  string(6) "stream"
-  ["resource_refcount"]=>
-  int(1)
-}
-array(4) {
-  ["type"]=>
-  string(4) "NULL"
-  ["zval_hash"]=>
-  string(16) "%s"
-  ["zval_refcount"]=>
-  int(2)
-  ["zval_isref"]=>
-  bool(false)
-}
-array(4) {
-  ["type"]=>
-  string(7) "boolean"
-  ["zval_hash"]=>
-  string(16) "%s"
-  ["zval_refcount"]=>
-  int(2)
-  ["zval_isref"]=>
-  bool(false)
-}
-array(4) {
-  ["type"]=>
-  string(7) "integer"
-  ["zval_hash"]=>
-  string(16) "%s"
-  ["zval_refcount"]=>
-  int(3)
-  ["zval_isref"]=>
-  bool(true)
-}
-NULL
diff --git a/vendor/symfony/debug/Resources/ext/tests/002.phpt b/vendor/symfony/debug/Resources/ext/tests/002.phpt
deleted file mode 100644
index afc7bb49..00000000
--- a/vendor/symfony/debug/Resources/ext/tests/002.phpt
+++ /dev/null
@@ -1,65 +0,0 @@
---TEST--
-Test symfony_debug_backtrace in case of fatal error
---SKIPIF--
-<?php if (!extension_loaded('symfony_debug')) {
-    echo 'skip';
-} ?>
---FILE--
-<?php
-
-function bar()
-{
-    foo();
-}
-
-function foo()
-{
-    notexist();
-}
-
-function bt()
-{
-    print_r(symfony_debug_backtrace());
-}
-
-register_shutdown_function('bt');
-
-bar();
-
-?>
---EXPECTF--
-Fatal error: Call to undefined function notexist() in %s on line %d
-Array
-(
-    [0] => Array
-        (
-            [function] => bt
-            [args] => Array
-                (
-                )
-
-        )
-
-    [1] => Array
-        (
-            [file] => %s
-            [line] => %d
-            [function] => foo
-            [args] => Array
-                (
-                )
-
-        )
-
-    [2] => Array
-        (
-            [file] => %s
-            [line] => %d
-            [function] => bar
-            [args] => Array
-                (
-                )
-
-        )
-
-)
diff --git a/vendor/symfony/debug/Resources/ext/tests/002_1.phpt b/vendor/symfony/debug/Resources/ext/tests/002_1.phpt
deleted file mode 100644
index 86de3e17..00000000
--- a/vendor/symfony/debug/Resources/ext/tests/002_1.phpt
+++ /dev/null
@@ -1,48 +0,0 @@
---TEST--
-Test symfony_debug_backtrace in case of non fatal error
---SKIPIF--
-<?php if (!extension_loaded('symfony_debug')) {
-    echo 'skip';
-} ?>
---FILE--
-<?php
-
-function bar()
-{
-    bt();
-}
-
-function bt()
-{
-    print_r(symfony_debug_backtrace());
-}
-
-bar();
-
-?>
---EXPECTF--
-Array
-(
-    [0] => Array
-        (
-            [file] => %s
-            [line] => %d
-            [function] => bt
-            [args] => Array
-                (
-                )
-
-        )
-
-    [1] => Array
-        (
-            [file] => %s
-            [line] => %d
-            [function] => bar
-            [args] => Array
-                (
-                )
-
-        )
-
-)
diff --git a/vendor/symfony/debug/Resources/ext/tests/003.phpt b/vendor/symfony/debug/Resources/ext/tests/003.phpt
deleted file mode 100644
index ce3c4e0a..00000000
--- a/vendor/symfony/debug/Resources/ext/tests/003.phpt
+++ /dev/null
@@ -1,87 +0,0 @@
---TEST--
-Test ErrorHandler in case of fatal error
---SKIPIF--
-<?php if (!extension_loaded('symfony_debug')) {
-    echo 'skip';
-} ?>
---FILE--
-<?php
-
-namespace Psr\Log;
-
-class LogLevel
-{
-    const EMERGENCY = 'emergency';
-    const ALERT = 'alert';
-    const CRITICAL = 'critical';
-    const ERROR = 'error';
-    const WARNING = 'warning';
-    const NOTICE = 'notice';
-    const INFO = 'info';
-    const DEBUG = 'debug';
-}
-
-namespace Symfony\Component\Debug;
-
-$dir = __DIR__.'/../../../';
-require $dir.'ErrorHandler.php';
-require $dir.'Exception/FatalErrorException.php';
-require $dir.'Exception/UndefinedFunctionException.php';
-require $dir.'FatalErrorHandler/FatalErrorHandlerInterface.php';
-require $dir.'FatalErrorHandler/ClassNotFoundFatalErrorHandler.php';
-require $dir.'FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php';
-require $dir.'FatalErrorHandler/UndefinedMethodFatalErrorHandler.php';
-
-function bar()
-{
-    foo();
-}
-
-function foo()
-{
-    notexist();
-}
-
-$handler = ErrorHandler::register();
-$handler->setExceptionHandler('print_r');
-
-if (function_exists('xdebug_disable')) {
-    xdebug_disable();
-}
-
-bar();
-?>
---EXPECTF--
-Fatal error: Call to undefined function Symfony\Component\Debug\notexist() in %s on line %d
-Symfony\Component\Debug\Exception\UndefinedFunctionException Object
-(
-    [message:protected] => Attempted to call function "notexist" from namespace "Symfony\Component\Debug".
-    [string:Exception:private] => 
-    [code:protected] => 0
-    [file:protected] => %s
-    [line:protected] => %d
-    [trace:Exception:private] => Array
-        (
-            [0] => Array
-                (
-%A                    [function] => Symfony\Component\Debug\foo
-%A                    [args] => Array
-                        (
-                        )
-
-                )
-
-            [1] => Array
-                (
-%A                    [function] => Symfony\Component\Debug\bar
-%A                    [args] => Array
-                        (
-                        )
-
-                )
-%A
-        )
-
-    [previous:Exception:private] => 
-    [severity:protected] => 1
-)
diff --git a/vendor/symfony/debug/Tests/DebugClassLoaderTest.php b/vendor/symfony/debug/Tests/DebugClassLoaderTest.php
index 0219f533..4a237554 100644
--- a/vendor/symfony/debug/Tests/DebugClassLoaderTest.php
+++ b/vendor/symfony/debug/Tests/DebugClassLoaderTest.php
@@ -13,7 +13,6 @@ namespace Symfony\Component\Debug\Tests;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Debug\DebugClassLoader;
-use Symfony\Component\Debug\ErrorHandler;
 
 class DebugClassLoaderTest extends TestCase
 {
@@ -76,72 +75,8 @@ class DebugClassLoaderTest extends TestCase
         class_exists(__NAMESPACE__.'\Fixtures\Throwing');
     }
 
-    public function testUnsilencing()
-    {
-        if (\PHP_VERSION_ID >= 70000) {
-            $this->markTestSkipped('PHP7 throws exceptions, unsilencing is not required anymore.');
-        }
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped('HHVM is not handled in this test case.');
-        }
-
-        ob_start();
-
-        $this->iniSet('log_errors', 0);
-        $this->iniSet('display_errors', 1);
-
-        // See below: this will fail with parse error
-        // but this should not be @-silenced.
-        @class_exists(__NAMESPACE__.'\TestingUnsilencing', true);
-
-        $output = ob_get_clean();
-
-        $this->assertStringMatchesFormat('%aParse error%a', $output);
-    }
-
-    public function testStacking()
-    {
-        // the ContextErrorException must not be loaded to test the workaround
-        // for https://bugs.php.net/65322.
-        if (class_exists('Symfony\Component\Debug\Exception\ContextErrorException', false)) {
-            $this->markTestSkipped('The ContextErrorException class is already loaded.');
-        }
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped('HHVM is not handled in this test case.');
-        }
-
-        ErrorHandler::register();
-
-        try {
-            // Trigger autoloading + E_STRICT at compile time
-            // which in turn triggers $errorHandler->handle()
-            // that again triggers autoloading for ContextErrorException.
-            // Error stacking works around the bug above and everything is fine.
-
-            eval('
-                namespace '.__NAMESPACE__.';
-                class ChildTestingStacking extends TestingStacking { function foo($bar) {} }
-            ');
-            $this->fail('ContextErrorException expected');
-        } catch (\ErrorException $exception) {
-            // if an exception is thrown, the test passed
-            $this->assertStringStartsWith(__FILE__, $exception->getFile());
-            if (\PHP_VERSION_ID < 70000) {
-                $this->assertRegExp('/^Runtime Notice: Declaration/', $exception->getMessage());
-                $this->assertEquals(E_STRICT, $exception->getSeverity());
-            } else {
-                $this->assertRegExp('/^Warning: Declaration/', $exception->getMessage());
-                $this->assertEquals(E_WARNING, $exception->getSeverity());
-            }
-        } finally {
-            restore_error_handler();
-            restore_exception_handler();
-        }
-    }
-
     /**
      * @expectedException \RuntimeException
-     * @expectedExceptionMessage Case mismatch between loaded and declared class names
      */
     public function testNameCaseMismatch()
     {
@@ -163,7 +98,6 @@ class DebugClassLoaderTest extends TestCase
 
     /**
      * @expectedException \RuntimeException
-     * @expectedExceptionMessage Case mismatch between loaded and declared class names
      */
     public function testPsr4CaseMismatch()
     {
@@ -262,32 +196,6 @@ class DebugClassLoaderTest extends TestCase
         $this->assertSame($xError, $lastError);
     }
 
-    public function testReservedForPhp7()
-    {
-        if (\PHP_VERSION_ID >= 70000) {
-            $this->markTestSkipped('PHP7 already prevents using reserved names.');
-        }
-
-        set_error_handler(function () { return false; });
-        $e = error_reporting(0);
-        trigger_error('', E_USER_NOTICE);
-
-        class_exists('Test\\'.__NAMESPACE__.'\\Float', true);
-
-        error_reporting($e);
-        restore_error_handler();
-
-        $lastError = error_get_last();
-        unset($lastError['file'], $lastError['line']);
-
-        $xError = array(
-            'type' => E_USER_DEPRECATED,
-            'message' => 'The "Test\Symfony\Component\Debug\Tests\Float" class uses the reserved name "Float", it will break on PHP 7 and higher',
-        );
-
-        $this->assertSame($xError, $lastError);
-    }
-
     public function testExtendedFinalClass()
     {
         set_error_handler(function () { return false; });
@@ -304,7 +212,7 @@ class DebugClassLoaderTest extends TestCase
 
         $xError = array(
             'type' => E_USER_DEPRECATED,
-            'message' => 'The "Symfony\Component\Debug\Tests\Fixtures\FinalClass" class is considered final since version 3.3. It may change without further notice as of its next major version. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsFinalClass".',
+            'message' => 'The "Symfony\Component\Debug\Tests\Fixtures\FinalClass" class is considered final. It may change without further notice as of its next major version. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsFinalClass".',
         );
 
         $this->assertSame($xError, $lastError);
@@ -312,24 +220,21 @@ class DebugClassLoaderTest extends TestCase
 
     public function testExtendedFinalMethod()
     {
-        set_error_handler(function () { return false; });
-        $e = error_reporting(0);
-        trigger_error('', E_USER_NOTICE);
+        $deprecations = array();
+        set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
+        $e = error_reporting(E_USER_DEPRECATED);
 
         class_exists(__NAMESPACE__.'\\Fixtures\\ExtendedFinalMethod', true);
 
         error_reporting($e);
         restore_error_handler();
 
-        $lastError = error_get_last();
-        unset($lastError['file'], $lastError['line']);
-
         $xError = array(
-            'type' => E_USER_DEPRECATED,
-            'message' => 'The "Symfony\Component\Debug\Tests\Fixtures\FinalMethod::finalMethod()" method is considered final since version 3.3. It may change without further notice as of its next major version. You should not extend it from "Symfony\Component\Debug\Tests\Fixtures\ExtendedFinalMethod".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\FinalMethod::finalMethod()" method is considered final. It may change without further notice as of its next major version. You should not extend it from "Symfony\Component\Debug\Tests\Fixtures\ExtendedFinalMethod".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\FinalMethod::finalMethod2()" method is considered final. It may change without further notice as of its next major version. You should not extend it from "Symfony\Component\Debug\Tests\Fixtures\ExtendedFinalMethod".',
         );
 
-        $this->assertSame($xError, $lastError);
+        $this->assertSame($xError, $deprecations);
     }
 
     public function testExtendedDeprecatedMethodDoesntTriggerAnyNotice()
@@ -361,12 +266,26 @@ class DebugClassLoaderTest extends TestCase
         restore_error_handler();
 
         $this->assertSame($deprecations, array(
-            'The "Symfony\Component\Debug\Tests\Fixtures\InternalClass" class is considered internal since version 3.4. It may change without further notice. You should not use it from "Test\Symfony\Component\Debug\Tests\ExtendsInternalsParent".',
             'The "Symfony\Component\Debug\Tests\Fixtures\InternalInterface" interface is considered internal. It may change without further notice. You should not use it from "Test\Symfony\Component\Debug\Tests\ExtendsInternalsParent".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\InternalClass" class is considered internal. It may change without further notice. You should not use it from "Test\Symfony\Component\Debug\Tests\ExtendsInternalsParent".',
             'The "Symfony\Component\Debug\Tests\Fixtures\InternalTrait" trait is considered internal. It may change without further notice. You should not use it from "Test\Symfony\Component\Debug\Tests\ExtendsInternals".',
-            'The "Symfony\Component\Debug\Tests\Fixtures\InternalTrait2::internalMethod()" method is considered internal since version 3.4. It may change without further notice. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsInternals".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\InternalClass::internalMethod()" method is considered internal. It may change without further notice. You should not extend it from "Test\Symfony\Component\Debug\Tests\ExtendsInternals".',
         ));
     }
+
+    public function testUseTraitWithInternalMethod()
+    {
+        $deprecations = array();
+        set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
+        $e = error_reporting(E_USER_DEPRECATED);
+
+        class_exists('Test\\'.__NAMESPACE__.'\\UseTraitWithInternalMethod', true);
+
+        error_reporting($e);
+        restore_error_handler();
+
+        $this->assertSame(array(), $deprecations);
+    }
 }
 
 class ClassLoader
@@ -420,6 +339,8 @@ class ClassLoader
             }');
         } elseif ('Test\\'.__NAMESPACE__.'\ExtendsInternalsParent' === $class) {
             eval('namespace Test\\'.__NAMESPACE__.'; class ExtendsInternalsParent extends \\'.__NAMESPACE__.'\Fixtures\InternalClass implements \\'.__NAMESPACE__.'\Fixtures\InternalInterface { }');
+        } elseif ('Test\\'.__NAMESPACE__.'\UseTraitWithInternalMethod' === $class) {
+            eval('namespace Test\\'.__NAMESPACE__.'; class UseTraitWithInternalMethod { use \\'.__NAMESPACE__.'\Fixtures\TraitWithInternalMethod; }');
         }
     }
 }
diff --git a/vendor/symfony/debug/Tests/ErrorHandlerTest.php b/vendor/symfony/debug/Tests/ErrorHandlerTest.php
index b354e641..15e47638 100644
--- a/vendor/symfony/debug/Tests/ErrorHandlerTest.php
+++ b/vendor/symfony/debug/Tests/ErrorHandlerTest.php
@@ -323,9 +323,6 @@ class ErrorHandlerTest extends TestCase
         @$handler->handleError(E_USER_DEPRECATED, 'Foo deprecation', __FILE__, __LINE__, array());
     }
 
-    /**
-     * @group no-hhvm
-     */
     public function testHandleException()
     {
         try {
@@ -367,38 +364,6 @@ class ErrorHandlerTest extends TestCase
         }
     }
 
-    /**
-     * @group legacy
-     */
-    public function testErrorStacking()
-    {
-        try {
-            $handler = ErrorHandler::register();
-            $handler->screamAt(E_USER_WARNING);
-
-            $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
-
-            $logger
-                ->expects($this->exactly(2))
-                ->method('log')
-                ->withConsecutive(
-                    array($this->equalTo(LogLevel::WARNING), $this->equalTo('Dummy log')),
-                    array($this->equalTo(LogLevel::DEBUG), $this->equalTo('User Warning: Silenced warning'))
-                )
-            ;
-
-            $handler->setDefaultLogger($logger, array(E_USER_WARNING => LogLevel::WARNING));
-
-            ErrorHandler::stackErrors();
-            @trigger_error('Silenced warning', E_USER_WARNING);
-            $logger->log(LogLevel::WARNING, 'Dummy log');
-            ErrorHandler::unstackErrors();
-        } finally {
-            restore_error_handler();
-            restore_exception_handler();
-        }
-    }
-
     public function testBootstrappingLogger()
     {
         $bootLogger = new BufferingLogger();
@@ -450,9 +415,6 @@ class ErrorHandlerTest extends TestCase
         $handler->setLoggers(array(E_DEPRECATED => array($mockLogger, LogLevel::WARNING)));
     }
 
-    /**
-     * @group no-hhvm
-     */
     public function testSettingLoggerWhenExceptionIsBuffered()
     {
         $bootLogger = new BufferingLogger();
@@ -472,9 +434,6 @@ class ErrorHandlerTest extends TestCase
         $handler->handleException($exception);
     }
 
-    /**
-     * @group no-hhvm
-     */
     public function testHandleFatalError()
     {
         try {
@@ -515,16 +474,13 @@ class ErrorHandlerTest extends TestCase
         }
     }
 
-    /**
-     * @requires PHP 7
-     */
     public function testHandleErrorException()
     {
         $exception = new \Error("Class 'Foo' not found");
 
         $handler = new ErrorHandler();
         $handler->setExceptionHandler(function () use (&$args) {
-            $args = func_get_args();
+            $args = \func_get_args();
         });
 
         $handler->handleException($exception);
@@ -533,46 +489,8 @@ class ErrorHandlerTest extends TestCase
         $this->assertStringStartsWith("Attempted to load class \"Foo\" from the global namespace.\nDid you forget a \"use\" statement", $args[0]->getMessage());
     }
 
-    /**
-     * @group no-hhvm
-     */
-    public function testHandleFatalErrorOnHHVM()
-    {
-        try {
-            $handler = ErrorHandler::register();
-
-            $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
-            $logger
-                ->expects($this->once())
-                ->method('log')
-                ->with(
-                    $this->equalTo(LogLevel::CRITICAL),
-                    $this->equalTo('Fatal Error: foo')
-                )
-            ;
-
-            $handler->setDefaultLogger($logger, E_ERROR);
-
-            $error = array(
-                'type' => E_ERROR + 0x1000000, // This error level is used by HHVM for fatal errors
-                'message' => 'foo',
-                'file' => 'bar',
-                'line' => 123,
-                'context' => array(123),
-                'backtrace' => array(456),
-            );
-
-            call_user_func_array(array($handler, 'handleError'), $error);
-            $handler->handleFatalError($error);
-        } finally {
-            restore_error_handler();
-            restore_exception_handler();
-        }
-    }
-
     /**
      * @expectedException \Exception
-     * @group no-hhvm
      */
     public function testCustomExceptionHandler()
     {
diff --git a/vendor/symfony/debug/Tests/Exception/FlattenExceptionTest.php b/vendor/symfony/debug/Tests/Exception/FlattenExceptionTest.php
index 66171e3a..4bac1609 100644
--- a/vendor/symfony/debug/Tests/Exception/FlattenExceptionTest.php
+++ b/vendor/symfony/debug/Tests/Exception/FlattenExceptionTest.php
@@ -12,21 +12,22 @@
 namespace Symfony\Component\Debug\Tests\Exception;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Debug\Exception\FatalThrowableError;
 use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
-use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
-use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException;
 use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
-use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\GoneHttpException;
 use Symfony\Component\HttpKernel\Exception\LengthRequiredHttpException;
+use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
+use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\Exception\PreconditionFailedHttpException;
 use Symfony\Component\HttpKernel\Exception\PreconditionRequiredHttpException;
 use Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException;
 use Symfony\Component\HttpKernel\Exception\TooManyRequestsHttpException;
+use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
 use Symfony\Component\HttpKernel\Exception\UnsupportedMediaTypeHttpException;
 
 class FlattenExceptionTest extends TestCase
@@ -39,6 +40,12 @@ class FlattenExceptionTest extends TestCase
         $flattened = FlattenException::create(new \RuntimeException());
         $this->assertEquals('500', $flattened->getStatusCode());
 
+        $flattened = FlattenException::createFromThrowable(new \DivisionByZeroError(), 403);
+        $this->assertEquals('403', $flattened->getStatusCode());
+
+        $flattened = FlattenException::createFromThrowable(new \DivisionByZeroError());
+        $this->assertEquals('500', $flattened->getStatusCode());
+
         $flattened = FlattenException::create(new NotFoundHttpException());
         $this->assertEquals('404', $flattened->getStatusCode());
 
@@ -111,10 +118,10 @@ class FlattenExceptionTest extends TestCase
     /**
      * @dataProvider flattenDataProvider
      */
-    public function testFlattenHttpException(\Exception $exception)
+    public function testFlattenHttpException(\Throwable $exception)
     {
-        $flattened = FlattenException::create($exception);
-        $flattened2 = FlattenException::create($exception);
+        $flattened = FlattenException::createFromThrowable($exception);
+        $flattened2 = FlattenException::createFromThrowable($exception);
 
         $flattened->setPrevious($flattened2);
 
@@ -123,13 +130,33 @@ class FlattenExceptionTest extends TestCase
         $this->assertInstanceOf($flattened->getClass(), $exception, 'The class is set to the class of the original exception');
     }
 
+    public function testWrappedThrowable()
+    {
+        $exception = new FatalThrowableError(new \DivisionByZeroError('Ouch', 42));
+        $flattened = FlattenException::create($exception);
+
+        $this->assertSame('Ouch', $flattened->getMessage(), 'The message is copied from the original error.');
+        $this->assertSame(42, $flattened->getCode(), 'The code is copied from the original error.');
+        $this->assertSame('DivisionByZeroError', $flattened->getClass(), 'The class is set to the class of the original error');
+    }
+
+    public function testThrowable()
+    {
+        $error = new \DivisionByZeroError('Ouch', 42);
+        $flattened = FlattenException::createFromThrowable($error);
+
+        $this->assertSame('Ouch', $flattened->getMessage(), 'The message is copied from the original error.');
+        $this->assertSame(42, $flattened->getCode(), 'The code is copied from the original error.');
+        $this->assertSame('DivisionByZeroError', $flattened->getClass(), 'The class is set to the class of the original error');
+    }
+
     /**
      * @dataProvider flattenDataProvider
      */
-    public function testPrevious(\Exception $exception)
+    public function testPrevious(\Throwable $exception)
     {
-        $flattened = FlattenException::create($exception);
-        $flattened2 = FlattenException::create($exception);
+        $flattened = FlattenException::createFromThrowable($exception);
+        $flattened2 = FlattenException::createFromThrowable($exception);
 
         $flattened->setPrevious($flattened2);
 
@@ -138,50 +165,47 @@ class FlattenExceptionTest extends TestCase
         $this->assertSame(array($flattened2), $flattened->getAllPrevious());
     }
 
-    /**
-     * @requires PHP 7.0
-     */
     public function testPreviousError()
     {
         $exception = new \Exception('test', 123, new \ParseError('Oh noes!', 42));
 
         $flattened = FlattenException::create($exception)->getPrevious();
 
-        $this->assertEquals($flattened->getMessage(), 'Parse error: Oh noes!', 'The message is copied from the original exception.');
+        $this->assertEquals($flattened->getMessage(), 'Oh noes!', 'The message is copied from the original exception.');
         $this->assertEquals($flattened->getCode(), 42, 'The code is copied from the original exception.');
-        $this->assertEquals($flattened->getClass(), 'Symfony\Component\Debug\Exception\FatalThrowableError', 'The class is set to the class of the original exception');
+        $this->assertEquals($flattened->getClass(), 'ParseError', 'The class is set to the class of the original exception');
     }
 
     /**
      * @dataProvider flattenDataProvider
      */
-    public function testLine(\Exception $exception)
+    public function testLine(\Throwable $exception)
     {
-        $flattened = FlattenException::create($exception);
+        $flattened = FlattenException::createFromThrowable($exception);
         $this->assertSame($exception->getLine(), $flattened->getLine());
     }
 
     /**
      * @dataProvider flattenDataProvider
      */
-    public function testFile(\Exception $exception)
+    public function testFile(\Throwable $exception)
     {
-        $flattened = FlattenException::create($exception);
+        $flattened = FlattenException::createFromThrowable($exception);
         $this->assertSame($exception->getFile(), $flattened->getFile());
     }
 
     /**
      * @dataProvider flattenDataProvider
      */
-    public function testToArray(\Exception $exception)
+    public function testToArray(\Throwable $exception, string $expectedClass)
     {
-        $flattened = FlattenException::create($exception);
+        $flattened = FlattenException::createFromThrowable($exception);
         $flattened->setTrace(array(), 'foo.php', 123);
 
         $this->assertEquals(array(
             array(
                 'message' => 'test',
-                'class' => 'Exception',
+                'class' => $expectedClass,
                 'trace' => array(array(
                     'namespace' => '', 'short_class' => '', 'class' => '', 'type' => '', 'function' => '', 'file' => 'foo.php', 'line' => 123,
                     'args' => array(),
@@ -190,10 +214,24 @@ class FlattenExceptionTest extends TestCase
         ), $flattened->toArray());
     }
 
+    public function testCreate()
+    {
+        $exception = new NotFoundHttpException(
+            'test',
+            new \RuntimeException('previous', 123)
+        );
+
+        $this->assertSame(
+            FlattenException::createFromThrowable($exception)->toArray(),
+            FlattenException::create($exception)->toArray()
+        );
+    }
+
     public function flattenDataProvider()
     {
         return array(
-            array(new \Exception('test', 123)),
+            array(new \Exception('test', 123), 'Exception'),
+            array(new \Error('test', 123), 'Error'),
         );
     }
 
@@ -236,7 +274,7 @@ class FlattenExceptionTest extends TestCase
         $this->assertSame(array('object', 'stdClass'), $array[$i++]);
         $this->assertSame(array('object', 'Symfony\Component\HttpKernel\Exception\NotFoundHttpException'), $array[$i++]);
         $this->assertSame(array('incomplete-object', 'BogusTestClass'), $array[$i++]);
-        $this->assertSame(array('resource', defined('HHVM_VERSION') ? 'Directory' : 'stream'), $array[$i++]);
+        $this->assertSame(array('resource', 'stream'), $array[$i++]);
         $this->assertSame(array('resource', 'stream'), $array[$i++]);
 
         $args = $array[$i++];
diff --git a/vendor/symfony/debug/Tests/ExceptionHandlerTest.php b/vendor/symfony/debug/Tests/ExceptionHandlerTest.php
index 0285eff1..6ff6a74f 100644
--- a/vendor/symfony/debug/Tests/ExceptionHandlerTest.php
+++ b/vendor/symfony/debug/Tests/ExceptionHandlerTest.php
@@ -12,10 +12,10 @@
 namespace Symfony\Component\Debug\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Debug\ExceptionHandler;
 use Symfony\Component\Debug\Exception\OutOfMemoryException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Debug\ExceptionHandler;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 require_once __DIR__.'/HeaderMock.php';
 
diff --git a/vendor/symfony/debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php b/vendor/symfony/debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
index 65c80fc1..5cdac2f1 100644
--- a/vendor/symfony/debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
+++ b/vendor/symfony/debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
@@ -11,18 +11,18 @@
 
 namespace Symfony\Component\Debug\Tests\FatalErrorHandler;
 
+use Composer\Autoload\ClassLoader as ComposerClassLoader;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Debug\DebugClassLoader;
 use Symfony\Component\Debug\Exception\FatalErrorException;
 use Symfony\Component\Debug\FatalErrorHandler\ClassNotFoundFatalErrorHandler;
-use Symfony\Component\Debug\DebugClassLoader;
-use Composer\Autoload\ClassLoader as ComposerClassLoader;
 
 class ClassNotFoundFatalErrorHandlerTest extends TestCase
 {
     public static function setUpBeforeClass()
     {
         foreach (spl_autoload_functions() as $function) {
-            if (!is_array($function)) {
+            if (!\is_array($function)) {
                 continue;
             }
 
@@ -32,7 +32,7 @@ class ClassNotFoundFatalErrorHandlerTest extends TestCase
             }
 
             if ($function[0] instanceof ComposerClassLoader) {
-                $function[0]->add('Symfony_Component_Debug_Tests_Fixtures', dirname(dirname(dirname(dirname(dirname(__DIR__))))));
+                $function[0]->add('Symfony_Component_Debug_Tests_Fixtures', \dirname(\dirname(\dirname(\dirname(\dirname(__DIR__))))));
                 break;
             }
         }
diff --git a/vendor/symfony/debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php b/vendor/symfony/debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
index 1dc21200..60153fc5 100644
--- a/vendor/symfony/debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
+++ b/vendor/symfony/debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
@@ -26,7 +26,7 @@ class UndefinedFunctionFatalErrorHandlerTest extends TestCase
         $exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line']));
 
         $this->assertInstanceOf('Symfony\Component\Debug\Exception\UndefinedFunctionException', $exception);
-        // class names are case insensitive and PHP/HHVM do not return the same
+        // class names are case insensitive and PHP do not return the same
         $this->assertSame(strtolower($translatedMessage), strtolower($exception->getMessage()));
         $this->assertSame($error['type'], $exception->getSeverity());
         $this->assertSame($error['file'], $exception->getFile());
diff --git a/vendor/symfony/debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php b/vendor/symfony/debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
index 739e5b2b..a2647f57 100644
--- a/vendor/symfony/debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
+++ b/vendor/symfony/debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
@@ -64,10 +64,10 @@ class UndefinedMethodFatalErrorHandlerTest extends TestCase
             ),
             array(
                 array(
-                  'type' => 1,
-                  'message' => 'Call to undefined method class@anonymous::test()',
-                  'file' => '/home/possum/work/symfony/test.php',
-                  'line' => 11,
+                    'type' => 1,
+                    'message' => 'Call to undefined method class@anonymous::test()',
+                    'file' => '/home/possum/work/symfony/test.php',
+                    'line' => 11,
                 ),
                 'Attempted to call an undefined method named "test" of class "class@anonymous".',
             ),
diff --git a/vendor/symfony/debug/Tests/Fixtures/AnnotatedClass.php b/vendor/symfony/debug/Tests/Fixtures/AnnotatedClass.php
index dff9517d..4eecb6d3 100644
--- a/vendor/symfony/debug/Tests/Fixtures/AnnotatedClass.php
+++ b/vendor/symfony/debug/Tests/Fixtures/AnnotatedClass.php
@@ -5,7 +5,7 @@ namespace Symfony\Component\Debug\Tests\Fixtures;
 class AnnotatedClass
 {
     /**
-     * @deprecated since version 3.4.
+     * @deprecated
      */
     public function deprecatedMethod()
     {
diff --git a/vendor/symfony/debug/Tests/Fixtures/ExtendedFinalMethod.php b/vendor/symfony/debug/Tests/Fixtures/ExtendedFinalMethod.php
index 2bd337e5..050d19ff 100644
--- a/vendor/symfony/debug/Tests/Fixtures/ExtendedFinalMethod.php
+++ b/vendor/symfony/debug/Tests/Fixtures/ExtendedFinalMethod.php
@@ -4,6 +4,8 @@ namespace Symfony\Component\Debug\Tests\Fixtures;
 
 class ExtendedFinalMethod extends FinalMethod
 {
+    use FinalMethod2Trait;
+
     /**
      * {@inheritdoc}
      */
diff --git a/vendor/symfony/debug/Tests/Fixtures/FinalClass.php b/vendor/symfony/debug/Tests/Fixtures/FinalClass.php
index 2cf26b19..f4c69b85 100644
--- a/vendor/symfony/debug/Tests/Fixtures/FinalClass.php
+++ b/vendor/symfony/debug/Tests/Fixtures/FinalClass.php
@@ -3,7 +3,7 @@
 namespace Symfony\Component\Debug\Tests\Fixtures;
 
 /**
- * @final since version 3.3.
+ * @final
  */
 class FinalClass
 {
diff --git a/vendor/symfony/debug/Tests/Fixtures/FinalMethod.php b/vendor/symfony/debug/Tests/Fixtures/FinalMethod.php
index 92ec4218..03e47e8a 100644
--- a/vendor/symfony/debug/Tests/Fixtures/FinalMethod.php
+++ b/vendor/symfony/debug/Tests/Fixtures/FinalMethod.php
@@ -5,12 +5,19 @@ namespace Symfony\Component\Debug\Tests\Fixtures;
 class FinalMethod
 {
     /**
-     * @final since version 3.3.
+     * @final
      */
     public function finalMethod()
     {
     }
 
+    /**
+     * @final
+     */
+    public function finalMethod2()
+    {
+    }
+
     public function anotherMethod()
     {
     }
diff --git a/vendor/symfony/debug/Tests/Fixtures/FinalMethod2Trait.php b/vendor/symfony/debug/Tests/Fixtures/FinalMethod2Trait.php
new file mode 100644
index 00000000..8547f3af
--- /dev/null
+++ b/vendor/symfony/debug/Tests/Fixtures/FinalMethod2Trait.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+trait FinalMethod2Trait
+{
+    public function finalMethod2()
+    {
+    }
+}
diff --git a/vendor/symfony/debug/Tests/Fixtures/InternalClass.php b/vendor/symfony/debug/Tests/Fixtures/InternalClass.php
index 119842c2..30efe79b 100644
--- a/vendor/symfony/debug/Tests/Fixtures/InternalClass.php
+++ b/vendor/symfony/debug/Tests/Fixtures/InternalClass.php
@@ -3,7 +3,7 @@
 namespace Symfony\Component\Debug\Tests\Fixtures;
 
 /**
- * @internal since version 3.4.
+ * @internal
  */
 class InternalClass
 {
diff --git a/vendor/symfony/debug/Tests/Fixtures/InternalTrait2.php b/vendor/symfony/debug/Tests/Fixtures/InternalTrait2.php
index 05f18e83..e4cbe12a 100644
--- a/vendor/symfony/debug/Tests/Fixtures/InternalTrait2.php
+++ b/vendor/symfony/debug/Tests/Fixtures/InternalTrait2.php
@@ -8,7 +8,7 @@ namespace Symfony\Component\Debug\Tests\Fixtures;
 trait InternalTrait2
 {
     /**
-     * @internal since version 3.4
+     * @internal
      */
     public function internalMethod()
     {
diff --git a/vendor/symfony/debug/Tests/Fixtures/TraitWithInternalMethod.php b/vendor/symfony/debug/Tests/Fixtures/TraitWithInternalMethod.php
new file mode 100644
index 00000000..4c3dae37
--- /dev/null
+++ b/vendor/symfony/debug/Tests/Fixtures/TraitWithInternalMethod.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\Debug\Tests\Fixtures;
+
+trait TraitWithInternalMethod
+{
+    /**
+     * @internal
+     */
+    public function foo()
+    {
+    }
+}
diff --git a/vendor/symfony/debug/Tests/HeaderMock.php b/vendor/symfony/debug/Tests/HeaderMock.php
index 65d0b588..3d8d84c5 100644
--- a/vendor/symfony/debug/Tests/HeaderMock.php
+++ b/vendor/symfony/debug/Tests/HeaderMock.php
@@ -27,12 +27,12 @@ function testHeader()
 {
     static $headers = array();
 
-    if (!$h = func_get_args()) {
+    if (!$h = \func_get_args()) {
         $h = $headers;
         $headers = array();
 
         return $h;
     }
 
-    $headers[] = func_get_args();
+    $headers[] = \func_get_args();
 }
diff --git a/vendor/symfony/debug/Tests/phpt/debug_class_loader.phpt b/vendor/symfony/debug/Tests/phpt/debug_class_loader.phpt
index b9d3d728..53839c48 100644
--- a/vendor/symfony/debug/Tests/phpt/debug_class_loader.phpt
+++ b/vendor/symfony/debug/Tests/phpt/debug_class_loader.phpt
@@ -9,7 +9,7 @@ use Symfony\Component\Debug\DebugClassLoader;
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
-    $vendor = dirname($vendor);
+    $vendor = \dirname($vendor);
 }
 require $vendor.'/vendor/autoload.php';
 
@@ -23,4 +23,5 @@ class_exists(ExtendedFinalMethod::class);
 
 ?>
 --EXPECTF--
-The "Symfony\Component\Debug\Tests\Fixtures\FinalMethod::finalMethod()" method is considered final since version 3.3. It may change without further notice as of its next major version. You should not extend it from "Symfony\Component\Debug\Tests\Fixtures\ExtendedFinalMethod".
+The "Symfony\Component\Debug\Tests\Fixtures\FinalMethod::finalMethod()" method is considered final. It may change without further notice as of its next major version. You should not extend it from "Symfony\Component\Debug\Tests\Fixtures\ExtendedFinalMethod".
+The "Symfony\Component\Debug\Tests\Fixtures\FinalMethod::finalMethod2()" method is considered final. It may change without further notice as of its next major version. You should not extend it from "Symfony\Component\Debug\Tests\Fixtures\ExtendedFinalMethod".
diff --git a/vendor/symfony/debug/Tests/phpt/decorate_exception_hander.phpt b/vendor/symfony/debug/Tests/phpt/decorate_exception_hander.phpt
index 7ce7b9dc..9cd44388 100644
--- a/vendor/symfony/debug/Tests/phpt/decorate_exception_hander.phpt
+++ b/vendor/symfony/debug/Tests/phpt/decorate_exception_hander.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test catching fatal errors when handlers are nested
+--INI--
+display_errors=0
 --FILE--
 <?php
 
@@ -7,7 +9,7 @@ namespace Symfony\Component\Debug;
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
-    $vendor = dirname($vendor);
+    $vendor = \dirname($vendor);
 }
 require $vendor.'/vendor/autoload.php';
 
@@ -24,7 +26,6 @@ if (true) {
 
 ?>
 --EXPECTF--
-Fatal error: Class 'Symfony\Component\Debug\missing' not found in %s on line %d
 object(Symfony\Component\Debug\Exception\ClassNotFoundException)#%d (8) {
   ["message":protected]=>
   string(131) "Attempted to load class "missing" from namespace "Symfony\Component\Debug".
@@ -38,8 +39,7 @@ Did you forget a "use" statement for another namespace?"
   ["line":protected]=>
   int(%d)
   ["trace":"Exception":private]=>
-  array(0) {
-  }
+  array(%d) {%A}
   ["previous":"Exception":private]=>
   NULL
   ["severity":protected]=>
diff --git a/vendor/symfony/debug/Tests/phpt/exception_rethrown.phpt b/vendor/symfony/debug/Tests/phpt/exception_rethrown.phpt
index 9df0a65c..3f455954 100644
--- a/vendor/symfony/debug/Tests/phpt/exception_rethrown.phpt
+++ b/vendor/symfony/debug/Tests/phpt/exception_rethrown.phpt
@@ -7,7 +7,7 @@ namespace Symfony\Component\Debug;
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
-    $vendor = dirname($vendor);
+    $vendor = \dirname($vendor);
 }
 require $vendor.'/vendor/autoload.php';
 
diff --git a/vendor/symfony/debug/Tests/phpt/fatal_with_nested_handlers.phpt b/vendor/symfony/debug/Tests/phpt/fatal_with_nested_handlers.phpt
index 5c5245c0..2b74e5c6 100644
--- a/vendor/symfony/debug/Tests/phpt/fatal_with_nested_handlers.phpt
+++ b/vendor/symfony/debug/Tests/phpt/fatal_with_nested_handlers.phpt
@@ -7,7 +7,7 @@ namespace Symfony\Component\Debug;
 
 $vendor = __DIR__;
 while (!file_exists($vendor.'/vendor')) {
-    $vendor = dirname($vendor);
+    $vendor = \dirname($vendor);
 }
 require $vendor.'/vendor/autoload.php';
 
diff --git a/vendor/symfony/debug/composer.json b/vendor/symfony/debug/composer.json
index f98a5d07..9b2deebe 100644
--- a/vendor/symfony/debug/composer.json
+++ b/vendor/symfony/debug/composer.json
@@ -16,14 +16,14 @@
         }
     ],
     "require": {
-        "php": "^5.5.9|>=7.0.8",
+        "php": "^7.1.3",
         "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"
+        "symfony/http-kernel": "<3.4"
     },
     "require-dev": {
-        "symfony/http-kernel": "~2.8|~3.0|~4.0"
+        "symfony/http-kernel": "~3.4|~4.0"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Debug\\": "" },
@@ -34,7 +34,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "3.4-dev"
+            "dev-master": "4.1-dev"
         }
     }
 }
diff --git a/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php b/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php
index 3b6e7cc3..aae32752 100644
--- a/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php
+++ b/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php
@@ -11,11 +11,11 @@
 
 namespace Symfony\Component\EventDispatcher\Debug;
 
+use Psr\Log\LoggerInterface;
+use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\Stopwatch\Stopwatch;
-use Psr\Log\LoggerInterface;
 
 /**
  * Collects some data about event listeners.
@@ -217,6 +217,7 @@ class TraceableEventDispatcher implements TraceableEventDispatcherInterface
     public function reset()
     {
         $this->called = array();
+        $this->orphanedEvents = array();
     }
 
     /**
@@ -229,7 +230,7 @@ class TraceableEventDispatcher implements TraceableEventDispatcherInterface
      */
     public function __call($method, $arguments)
     {
-        return call_user_func_array(array($this->dispatcher, $method), $arguments);
+        return \call_user_func_array(array($this->dispatcher, $method), $arguments);
     }
 
     /**
@@ -314,11 +315,11 @@ class TraceableEventDispatcher implements TraceableEventDispatcherInterface
 
     private function sortListenersByPriority($a, $b)
     {
-        if (is_int($a['priority']) && !is_int($b['priority'])) {
+        if (\is_int($a['priority']) && !\is_int($b['priority'])) {
             return 1;
         }
 
-        if (!is_int($a['priority']) && is_int($b['priority'])) {
+        if (!\is_int($a['priority']) && \is_int($b['priority'])) {
             return -1;
         }
 
diff --git a/vendor/symfony/event-dispatcher/Debug/WrappedListener.php b/vendor/symfony/event-dispatcher/Debug/WrappedListener.php
index f7b0273e..2d8126a6 100644
--- a/vendor/symfony/event-dispatcher/Debug/WrappedListener.php
+++ b/vendor/symfony/event-dispatcher/Debug/WrappedListener.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\EventDispatcher\Debug;
 
-use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\VarDumper\Caster\ClassStub;
 
 /**
@@ -40,15 +40,15 @@ class WrappedListener
         $this->called = false;
         $this->stoppedPropagation = false;
 
-        if (is_array($listener)) {
-            $this->name = is_object($listener[0]) ? get_class($listener[0]) : $listener[0];
+        if (\is_array($listener)) {
+            $this->name = \is_object($listener[0]) ? \get_class($listener[0]) : $listener[0];
             $this->pretty = $this->name.'::'.$listener[1];
         } elseif ($listener instanceof \Closure) {
             $this->pretty = $this->name = 'closure';
-        } elseif (is_string($listener)) {
+        } elseif (\is_string($listener)) {
             $this->pretty = $this->name = $listener;
         } else {
-            $this->name = get_class($listener);
+            $this->name = \get_class($listener);
             $this->pretty = $this->name.'::__invoke';
         }
 
@@ -101,7 +101,7 @@ class WrappedListener
 
         $e = $this->stopwatch->start($this->name, 'event_listener');
 
-        call_user_func($this->listener, $event, $eventName, $this->dispatcher ?: $dispatcher);
+        \call_user_func($this->listener, $event, $eventName, $this->dispatcher ?: $dispatcher);
 
         if ($e->isStarted()) {
             $e->stop();
diff --git a/vendor/symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php b/vendor/symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php
index 17a89e7f..4c8db4c6 100644
--- a/vendor/symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php
+++ b/vendor/symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\EventDispatcher\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\EventDispatcher\EventDispatcher;
diff --git a/vendor/symfony/event-dispatcher/EventDispatcher.php b/vendor/symfony/event-dispatcher/EventDispatcher.php
index bc79a958..4e75c63e 100644
--- a/vendor/symfony/event-dispatcher/EventDispatcher.php
+++ b/vendor/symfony/event-dispatcher/EventDispatcher.php
@@ -82,13 +82,13 @@ class EventDispatcher implements EventDispatcherInterface
             return;
         }
 
-        if (is_array($listener) && isset($listener[0]) && $listener[0] instanceof \Closure) {
+        if (\is_array($listener) && isset($listener[0]) && $listener[0] instanceof \Closure) {
             $listener[0] = $listener[0]();
         }
 
         foreach ($this->listeners[$eventName] as $priority => $listeners) {
             foreach ($listeners as $k => $v) {
-                if ($v !== $listener && is_array($v) && isset($v[0]) && $v[0] instanceof \Closure) {
+                if ($v !== $listener && \is_array($v) && isset($v[0]) && $v[0] instanceof \Closure) {
                     $v[0] = $v[0]();
                     $this->listeners[$eventName][$priority][$k] = $v;
                 }
@@ -135,13 +135,13 @@ class EventDispatcher implements EventDispatcherInterface
             return;
         }
 
-        if (is_array($listener) && isset($listener[0]) && $listener[0] instanceof \Closure) {
+        if (\is_array($listener) && isset($listener[0]) && $listener[0] instanceof \Closure) {
             $listener[0] = $listener[0]();
         }
 
         foreach ($this->listeners[$eventName] as $priority => $listeners) {
             foreach ($listeners as $k => $v) {
-                if ($v !== $listener && is_array($v) && isset($v[0]) && $v[0] instanceof \Closure) {
+                if ($v !== $listener && \is_array($v) && isset($v[0]) && $v[0] instanceof \Closure) {
                     $v[0] = $v[0]();
                 }
                 if ($v === $listener) {
@@ -165,9 +165,9 @@ class EventDispatcher implements EventDispatcherInterface
     public function addSubscriber(EventSubscriberInterface $subscriber)
     {
         foreach ($subscriber->getSubscribedEvents() as $eventName => $params) {
-            if (is_string($params)) {
+            if (\is_string($params)) {
                 $this->addListener($eventName, array($subscriber, $params));
-            } elseif (is_string($params[0])) {
+            } elseif (\is_string($params[0])) {
                 $this->addListener($eventName, array($subscriber, $params[0]), isset($params[1]) ? $params[1] : 0);
             } else {
                 foreach ($params as $listener) {
@@ -183,12 +183,12 @@ class EventDispatcher implements EventDispatcherInterface
     public function removeSubscriber(EventSubscriberInterface $subscriber)
     {
         foreach ($subscriber->getSubscribedEvents() as $eventName => $params) {
-            if (is_array($params) && is_array($params[0])) {
+            if (\is_array($params) && \is_array($params[0])) {
                 foreach ($params as $listener) {
                     $this->removeListener($eventName, array($subscriber, $listener[0]));
                 }
             } else {
-                $this->removeListener($eventName, array($subscriber, is_string($params) ? $params : $params[0]));
+                $this->removeListener($eventName, array($subscriber, \is_string($params) ? $params : $params[0]));
             }
         }
     }
diff --git a/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php b/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php
index 2521f741..b5c53528 100644
--- a/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php
+++ b/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php
@@ -13,10 +13,10 @@ namespace Symfony\Component\EventDispatcher\Tests\Debug;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcher;
+use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\EventDispatcher\EventDispatcher;
-use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\Stopwatch\Stopwatch;
 
 class TraceableEventDispatcherTest extends TestCase
@@ -271,6 +271,17 @@ class TraceableEventDispatcherTest extends TestCase
 
         $this->assertCount(1, $eventDispatcher->getListeners('foo'), 'expected listener1 to be removed');
     }
+
+    public function testClearOrphanedEvents()
+    {
+        $tdispatcher = new TraceableEventDispatcher(new EventDispatcher(), new Stopwatch());
+        $tdispatcher->dispatch('foo');
+        $events = $tdispatcher->getOrphanedEvents();
+        $this->assertCount(1, $events);
+        $tdispatcher->reset();
+        $events = $tdispatcher->getOrphanedEvents();
+        $this->assertCount(0, $events);
+    }
 }
 
 class EventSubscriber implements EventSubscriberInterface
diff --git a/vendor/symfony/finder/CHANGELOG.md b/vendor/symfony/finder/CHANGELOG.md
index 53c34be8..c795e54c 100644
--- a/vendor/symfony/finder/CHANGELOG.md
+++ b/vendor/symfony/finder/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+4.0.0
+-----
+
+ * removed `ExceptionInterface`
+ * removed `Symfony\Component\Finder\Iterator\FilterIterator`
+
 3.4.0
 -----
 
diff --git a/vendor/symfony/finder/Comparator/Comparator.php b/vendor/symfony/finder/Comparator/Comparator.php
index 4f5e1ffe..ea37566d 100644
--- a/vendor/symfony/finder/Comparator/Comparator.php
+++ b/vendor/symfony/finder/Comparator/Comparator.php
@@ -64,7 +64,7 @@ class Comparator
             $operator = '==';
         }
 
-        if (!in_array($operator, array('>', '<', '>=', '<=', '==', '!='))) {
+        if (!\in_array($operator, array('>', '<', '>=', '<=', '==', '!='))) {
             throw new \InvalidArgumentException(sprintf('Invalid operator "%s".', $operator));
         }
 
diff --git a/vendor/symfony/finder/Comparator/DateComparator.php b/vendor/symfony/finder/Comparator/DateComparator.php
index 3de43ef4..d17c77a9 100644
--- a/vendor/symfony/finder/Comparator/DateComparator.php
+++ b/vendor/symfony/finder/Comparator/DateComparator.php
@@ -23,7 +23,7 @@ class DateComparator extends Comparator
      *
      * @throws \InvalidArgumentException If the test is not understood
      */
-    public function __construct($test)
+    public function __construct(string $test)
     {
         if (!preg_match('#^\s*(==|!=|[<>]=?|after|since|before|until)?\s*(.+?)\s*$#i', $test, $matches)) {
             throw new \InvalidArgumentException(sprintf('Don\'t understand "%s" as a date test.', $test));
diff --git a/vendor/symfony/finder/Comparator/NumberComparator.php b/vendor/symfony/finder/Comparator/NumberComparator.php
index f62c0e57..80667c9d 100644
--- a/vendor/symfony/finder/Comparator/NumberComparator.php
+++ b/vendor/symfony/finder/Comparator/NumberComparator.php
@@ -39,7 +39,7 @@ class NumberComparator extends Comparator
      *
      * @throws \InvalidArgumentException If the test is not understood
      */
-    public function __construct($test)
+    public function __construct(?string $test)
     {
         if (!preg_match('#^\s*(==|!=|[<>]=?)?\s*([0-9\.]+)\s*([kmg]i?)?\s*$#i', $test, $matches)) {
             throw new \InvalidArgumentException(sprintf('Don\'t understand "%s" as a number test.', $test));
diff --git a/vendor/symfony/finder/Exception/ExceptionInterface.php b/vendor/symfony/finder/Exception/ExceptionInterface.php
deleted file mode 100644
index 161e9686..00000000
--- a/vendor/symfony/finder/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Finder\Exception;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- *
- * @deprecated since 3.3, to be removed in 4.0.
- */
-interface ExceptionInterface
-{
-    /**
-     * @return \Symfony\Component\Finder\Adapter\AdapterInterface
-     */
-    public function getAdapter();
-}
diff --git a/vendor/symfony/finder/Finder.php b/vendor/symfony/finder/Finder.php
index 278b9841..e8026ed8 100644
--- a/vendor/symfony/finder/Finder.php
+++ b/vendor/symfony/finder/Finder.php
@@ -31,7 +31,7 @@ use Symfony\Component\Finder\Iterator\SortableIterator;
  *
  * All methods return the current Finder object to allow easy chaining:
  *
- * $finder = Finder::create()->files()->name('*.php')->in(__DIR__);
+ *     $finder = Finder::create()->files()->name('*.php')->in(__DIR__);
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
@@ -105,8 +105,8 @@ class Finder implements \IteratorAggregate, \Countable
      *
      * Usage:
      *
-     *   $finder->depth('> 1') // the Finder will start matching at level 1.
-     *   $finder->depth('< 3') // the Finder will descend at most 3 levels of directories below the starting point.
+     *     $finder->depth('> 1') // the Finder will start matching at level 1.
+     *     $finder->depth('< 3') // the Finder will descend at most 3 levels of directories below the starting point.
      *
      * @param string|int $level The depth level expression
      *
@@ -127,10 +127,10 @@ class Finder implements \IteratorAggregate, \Countable
      *
      * The date must be something that strtotime() is able to parse:
      *
-     *   $finder->date('since yesterday');
-     *   $finder->date('until 2 days ago');
-     *   $finder->date('> now - 2 hours');
-     *   $finder->date('>= 2005-10-15');
+     *     $finder->date('since yesterday');
+     *     $finder->date('until 2 days ago');
+     *     $finder->date('> now - 2 hours');
+     *     $finder->date('>= 2005-10-15');
      *
      * @param string $date A date range string
      *
@@ -152,9 +152,9 @@ class Finder implements \IteratorAggregate, \Countable
      *
      * You can use patterns (delimited with / sign), globs or simple strings.
      *
-     * $finder->name('*.php')
-     * $finder->name('/\.php$/') // same as above
-     * $finder->name('test.php')
+     *     $finder->name('*.php')
+     *     $finder->name('/\.php$/') // same as above
+     *     $finder->name('test.php')
      *
      * @param string $pattern A pattern (a regexp, a glob, or a string)
      *
@@ -190,8 +190,8 @@ class Finder implements \IteratorAggregate, \Countable
      *
      * Strings or PCRE patterns can be used:
      *
-     * $finder->contains('Lorem ipsum')
-     * $finder->contains('/Lorem ipsum/i')
+     *     $finder->contains('Lorem ipsum')
+     *     $finder->contains('/Lorem ipsum/i')
      *
      * @param string $pattern A pattern (string or regexp)
      *
@@ -211,8 +211,8 @@ class Finder implements \IteratorAggregate, \Countable
      *
      * Strings or PCRE patterns can be used:
      *
-     * $finder->notContains('Lorem ipsum')
-     * $finder->notContains('/Lorem ipsum/i')
+     *     $finder->notContains('Lorem ipsum')
+     *     $finder->notContains('/Lorem ipsum/i')
      *
      * @param string $pattern A pattern (string or regexp)
      *
@@ -232,8 +232,8 @@ class Finder implements \IteratorAggregate, \Countable
      *
      * You can use patterns (delimited with / sign) or simple strings.
      *
-     * $finder->path('some/special/dir')
-     * $finder->path('/some\/special\/dir/') // same as above
+     *     $finder->path('some/special/dir')
+     *     $finder->path('/some\/special\/dir/') // same as above
      *
      * Use only / as dirname separator.
      *
@@ -255,8 +255,8 @@ class Finder implements \IteratorAggregate, \Countable
      *
      * You can use patterns (delimited with / sign) or simple strings.
      *
-     * $finder->notPath('some/special/dir')
-     * $finder->notPath('/some\/special\/dir/') // same as above
+     *     $finder->notPath('some/special/dir')
+     *     $finder->notPath('/some\/special\/dir/') // same as above
      *
      * Use only / as dirname separator.
      *
@@ -276,9 +276,9 @@ class Finder implements \IteratorAggregate, \Countable
     /**
      * Adds tests for file sizes.
      *
-     * $finder->size('> 10K');
-     * $finder->size('<= 1Ki');
-     * $finder->size(4);
+     *     $finder->size('> 10K');
+     *     $finder->size('<= 1Ki');
+     *     $finder->size(4);
      *
      * @param string|int $size A size range string or an integer
      *
@@ -541,7 +541,7 @@ class Finder implements \IteratorAggregate, \Countable
         foreach ((array) $dirs as $dir) {
             if (is_dir($dir)) {
                 $resolvedDirs[] = $this->normalizeDir($dir);
-            } elseif ($glob = glob($dir, (defined('GLOB_BRACE') ? GLOB_BRACE : 0) | GLOB_ONLYDIR)) {
+            } elseif ($glob = glob($dir, (\defined('GLOB_BRACE') ? GLOB_BRACE : 0) | GLOB_ONLYDIR)) {
                 $resolvedDirs = array_merge($resolvedDirs, array_map(array($this, 'normalizeDir'), $glob));
             } else {
                 throw new \InvalidArgumentException(sprintf('The "%s" directory does not exist.', $dir));
@@ -564,11 +564,11 @@ class Finder implements \IteratorAggregate, \Countable
      */
     public function getIterator()
     {
-        if (0 === count($this->dirs) && 0 === count($this->iterators)) {
+        if (0 === \count($this->dirs) && 0 === \count($this->iterators)) {
             throw new \LogicException('You must call one of in() or append() methods before iterating over a Finder.');
         }
 
-        if (1 === count($this->dirs) && 0 === count($this->iterators)) {
+        if (1 === \count($this->dirs) && 0 === \count($this->iterators)) {
             return $this->searchInDirectory($this->dirs[0]);
         }
 
@@ -589,7 +589,7 @@ class Finder implements \IteratorAggregate, \Countable
      *
      * The set can be another Finder, an Iterator, an IteratorAggregate, or even a plain array.
      *
-     * @param mixed $iterator
+     * @param iterable $iterator
      *
      * @return $this
      *
@@ -601,7 +601,7 @@ class Finder implements \IteratorAggregate, \Countable
             $this->iterators[] = $iterator->getIterator();
         } elseif ($iterator instanceof \Iterator) {
             $this->iterators[] = $iterator;
-        } elseif ($iterator instanceof \Traversable || is_array($iterator)) {
+        } elseif ($iterator instanceof \Traversable || \is_array($iterator)) {
             $it = new \ArrayIterator();
             foreach ($iterator as $file) {
                 $it->append($file instanceof \SplFileInfo ? $file : new \SplFileInfo($file));
@@ -638,12 +638,7 @@ class Finder implements \IteratorAggregate, \Countable
         return iterator_count($this->getIterator());
     }
 
-    /**
-     * @param $dir
-     *
-     * @return \Iterator
-     */
-    private function searchInDirectory($dir)
+    private function searchInDirectory(string $dir): \Iterator
     {
         if (static::IGNORE_VCS_FILES === (static::IGNORE_VCS_FILES & $this->ignore)) {
             $this->exclude = array_merge($this->exclude, self::$vcsPatterns);
@@ -732,12 +727,20 @@ class Finder implements \IteratorAggregate, \Countable
     /**
      * Normalizes given directory names by removing trailing slashes.
      *
+     * Excluding: (s)ftp:// wrapper
+     *
      * @param string $dir
      *
      * @return string
      */
     private function normalizeDir($dir)
     {
-        return rtrim($dir, '/'.\DIRECTORY_SEPARATOR);
+        $dir = rtrim($dir, '/'.\DIRECTORY_SEPARATOR);
+
+        if (preg_match('#^s?ftp://#', $dir)) {
+            $dir .= '/';
+        }
+
+        return $dir;
     }
 }
diff --git a/vendor/symfony/finder/Glob.php b/vendor/symfony/finder/Glob.php
index df8b86fa..27d9ce3d 100644
--- a/vendor/symfony/finder/Glob.php
+++ b/vendor/symfony/finder/Glob.php
@@ -14,14 +14,14 @@ namespace Symfony\Component\Finder;
 /**
  * Glob matches globbing patterns against text.
  *
- *   if match_glob("foo.*", "foo.bar") echo "matched\n";
+ *     if match_glob("foo.*", "foo.bar") echo "matched\n";
  *
- * // prints foo.bar and foo.baz
- * $regex = glob_to_regex("foo.*");
- * for (array('foo.bar', 'foo.baz', 'foo', 'bar') as $t)
- * {
- *   if (/$regex/) echo "matched: $car\n";
- * }
+ *     // prints foo.bar and foo.baz
+ *     $regex = glob_to_regex("foo.*");
+ *     for (array('foo.bar', 'foo.baz', 'foo', 'bar') as $t)
+ *     {
+ *         if (/$regex/) echo "matched: $car\n";
+ *     }
  *
  * Glob implements glob(3) style matching that can be used to match
  * against text, rather than fetching names from a filesystem.
@@ -51,7 +51,7 @@ class Glob
         $escaping = false;
         $inCurlies = 0;
         $regex = '';
-        $sizeGlob = strlen($glob);
+        $sizeGlob = \strlen($glob);
         for ($i = 0; $i < $sizeGlob; ++$i) {
             $car = $glob[$i];
             if ($firstByte && $strictLeadingDot && '.' !== $car) {
diff --git a/vendor/symfony/finder/Iterator/CustomFilterIterator.php b/vendor/symfony/finder/Iterator/CustomFilterIterator.php
index 399b6a97..77bd3ac8 100644
--- a/vendor/symfony/finder/Iterator/CustomFilterIterator.php
+++ b/vendor/symfony/finder/Iterator/CustomFilterIterator.php
@@ -19,7 +19,7 @@ namespace Symfony\Component\Finder\Iterator;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class CustomFilterIterator extends FilterIterator
+class CustomFilterIterator extends \FilterIterator
 {
     private $filters = array();
 
@@ -32,7 +32,7 @@ class CustomFilterIterator extends FilterIterator
     public function __construct(\Iterator $iterator, array $filters)
     {
         foreach ($filters as $filter) {
-            if (!is_callable($filter)) {
+            if (!\is_callable($filter)) {
                 throw new \InvalidArgumentException('Invalid PHP callback.');
             }
         }
@@ -51,7 +51,7 @@ class CustomFilterIterator extends FilterIterator
         $fileinfo = $this->current();
 
         foreach ($this->filters as $filter) {
-            if (false === call_user_func($filter, $fileinfo)) {
+            if (false === \call_user_func($filter, $fileinfo)) {
                 return false;
             }
         }
diff --git a/vendor/symfony/finder/Iterator/DateRangeFilterIterator.php b/vendor/symfony/finder/Iterator/DateRangeFilterIterator.php
index b01e5e3f..c08e0a16 100644
--- a/vendor/symfony/finder/Iterator/DateRangeFilterIterator.php
+++ b/vendor/symfony/finder/Iterator/DateRangeFilterIterator.php
@@ -18,7 +18,7 @@ use Symfony\Component\Finder\Comparator\DateComparator;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class DateRangeFilterIterator extends FilterIterator
+class DateRangeFilterIterator extends \FilterIterator
 {
     private $comparators = array();
 
diff --git a/vendor/symfony/finder/Iterator/DepthRangeFilterIterator.php b/vendor/symfony/finder/Iterator/DepthRangeFilterIterator.php
index ce9d3aa7..436a66d8 100644
--- a/vendor/symfony/finder/Iterator/DepthRangeFilterIterator.php
+++ b/vendor/symfony/finder/Iterator/DepthRangeFilterIterator.php
@@ -16,7 +16,7 @@ namespace Symfony\Component\Finder\Iterator;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class DepthRangeFilterIterator extends FilterIterator
+class DepthRangeFilterIterator extends \FilterIterator
 {
     private $minDepth = 0;
 
@@ -25,7 +25,7 @@ class DepthRangeFilterIterator extends FilterIterator
      * @param int                        $minDepth The min depth
      * @param int                        $maxDepth The max depth
      */
-    public function __construct(\RecursiveIteratorIterator $iterator, $minDepth = 0, $maxDepth = PHP_INT_MAX)
+    public function __construct(\RecursiveIteratorIterator $iterator, int $minDepth = 0, int $maxDepth = PHP_INT_MAX)
     {
         $this->minDepth = $minDepth;
         $iterator->setMaxDepth(PHP_INT_MAX === $maxDepth ? -1 : $maxDepth);
diff --git a/vendor/symfony/finder/Iterator/ExcludeDirectoryFilterIterator.php b/vendor/symfony/finder/Iterator/ExcludeDirectoryFilterIterator.php
index c57128c2..d2d41f4a 100644
--- a/vendor/symfony/finder/Iterator/ExcludeDirectoryFilterIterator.php
+++ b/vendor/symfony/finder/Iterator/ExcludeDirectoryFilterIterator.php
@@ -16,7 +16,7 @@ namespace Symfony\Component\Finder\Iterator;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class ExcludeDirectoryFilterIterator extends FilterIterator implements \RecursiveIterator
+class ExcludeDirectoryFilterIterator extends \FilterIterator implements \RecursiveIterator
 {
     private $iterator;
     private $isRecursive;
diff --git a/vendor/symfony/finder/Iterator/FileTypeFilterIterator.php b/vendor/symfony/finder/Iterator/FileTypeFilterIterator.php
index e9811d4a..a4c4eec7 100644
--- a/vendor/symfony/finder/Iterator/FileTypeFilterIterator.php
+++ b/vendor/symfony/finder/Iterator/FileTypeFilterIterator.php
@@ -16,7 +16,7 @@ namespace Symfony\Component\Finder\Iterator;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class FileTypeFilterIterator extends FilterIterator
+class FileTypeFilterIterator extends \FilterIterator
 {
     const ONLY_FILES = 1;
     const ONLY_DIRECTORIES = 2;
@@ -27,7 +27,7 @@ class FileTypeFilterIterator extends FilterIterator
      * @param \Iterator $iterator The Iterator to filter
      * @param int       $mode     The mode (self::ONLY_FILES or self::ONLY_DIRECTORIES)
      */
-    public function __construct(\Iterator $iterator, $mode)
+    public function __construct(\Iterator $iterator, int $mode)
     {
         $this->mode = $mode;
 
diff --git a/vendor/symfony/finder/Iterator/FilterIterator.php b/vendor/symfony/finder/Iterator/FilterIterator.php
deleted file mode 100644
index c16dd8fa..00000000
--- a/vendor/symfony/finder/Iterator/FilterIterator.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Finder\Iterator;
-
-/**
- * This iterator just overrides the rewind method in order to correct a PHP bug,
- * which existed before version 5.5.23/5.6.7.
- *
- * @see https://bugs.php.net/68557
- *
- * @author Alex Bogomazov
- *
- * @deprecated since 3.4, to be removed in 4.0.
- */
-abstract class FilterIterator extends \FilterIterator
-{
-    /**
-     * This is a workaround for the problem with \FilterIterator leaving inner \FilesystemIterator in wrong state after
-     * rewind in some cases.
-     *
-     * @see FilterIterator::rewind()
-     */
-    public function rewind()
-    {
-        if (\PHP_VERSION_ID > 50607 || (\PHP_VERSION_ID > 50523 && \PHP_VERSION_ID < 50600)) {
-            parent::rewind();
-
-            return;
-        }
-
-        $iterator = $this;
-        while ($iterator instanceof \OuterIterator) {
-            $innerIterator = $iterator->getInnerIterator();
-
-            if ($innerIterator instanceof RecursiveDirectoryIterator) {
-                // this condition is necessary for iterators to work properly with non-local filesystems like ftp
-                if ($innerIterator->isRewindable()) {
-                    $innerIterator->next();
-                    $innerIterator->rewind();
-                }
-            } elseif ($innerIterator instanceof \FilesystemIterator) {
-                $innerIterator->next();
-                $innerIterator->rewind();
-            }
-
-            $iterator = $innerIterator;
-        }
-
-        parent::rewind();
-    }
-}
diff --git a/vendor/symfony/finder/Iterator/MultiplePcreFilterIterator.php b/vendor/symfony/finder/Iterator/MultiplePcreFilterIterator.php
index fc885404..b94e1d43 100644
--- a/vendor/symfony/finder/Iterator/MultiplePcreFilterIterator.php
+++ b/vendor/symfony/finder/Iterator/MultiplePcreFilterIterator.php
@@ -16,7 +16,7 @@ namespace Symfony\Component\Finder\Iterator;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-abstract class MultiplePcreFilterIterator extends FilterIterator
+abstract class MultiplePcreFilterIterator extends \FilterIterator
 {
     protected $matchRegexps = array();
     protected $noMatchRegexps = array();
diff --git a/vendor/symfony/finder/Iterator/PathFilterIterator.php b/vendor/symfony/finder/Iterator/PathFilterIterator.php
index dadfc8ed..3fda557b 100644
--- a/vendor/symfony/finder/Iterator/PathFilterIterator.php
+++ b/vendor/symfony/finder/Iterator/PathFilterIterator.php
@@ -28,7 +28,7 @@ class PathFilterIterator extends MultiplePcreFilterIterator
     {
         $filename = $this->current()->getRelativePathname();
 
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $filename = str_replace('\\', '/', $filename);
         }
 
diff --git a/vendor/symfony/finder/Iterator/RecursiveDirectoryIterator.php b/vendor/symfony/finder/Iterator/RecursiveDirectoryIterator.php
index c1c0e2f1..844ba469 100644
--- a/vendor/symfony/finder/Iterator/RecursiveDirectoryIterator.php
+++ b/vendor/symfony/finder/Iterator/RecursiveDirectoryIterator.php
@@ -37,13 +37,9 @@ class RecursiveDirectoryIterator extends \RecursiveDirectoryIterator
     private $directorySeparator = '/';
 
     /**
-     * @param string $path
-     * @param int    $flags
-     * @param bool   $ignoreUnreadableDirs
-     *
      * @throws \RuntimeException
      */
-    public function __construct($path, $flags, $ignoreUnreadableDirs = false)
+    public function __construct(string $path, int $flags, bool $ignoreUnreadableDirs = false)
     {
         if ($flags & (self::CURRENT_AS_PATHNAME | self::CURRENT_AS_SELF)) {
             throw new \RuntimeException('This iterator only support returning current as fileinfo.');
@@ -52,8 +48,8 @@ class RecursiveDirectoryIterator extends \RecursiveDirectoryIterator
         parent::__construct($path, $flags);
         $this->ignoreUnreadableDirs = $ignoreUnreadableDirs;
         $this->rootPath = $path;
-        if ('/' !== DIRECTORY_SEPARATOR && !($flags & self::UNIX_PATHS)) {
-            $this->directorySeparator = DIRECTORY_SEPARATOR;
+        if ('/' !== \DIRECTORY_SEPARATOR && !($flags & self::UNIX_PATHS)) {
+            $this->directorySeparator = \DIRECTORY_SEPARATOR;
         }
     }
 
@@ -116,11 +112,6 @@ class RecursiveDirectoryIterator extends \RecursiveDirectoryIterator
             return;
         }
 
-        // @see https://bugs.php.net/68557
-        if (\PHP_VERSION_ID < 50523 || \PHP_VERSION_ID >= 50600 && \PHP_VERSION_ID < 50607) {
-            parent::next();
-        }
-
         parent::rewind();
     }
 
@@ -135,11 +126,6 @@ class RecursiveDirectoryIterator extends \RecursiveDirectoryIterator
             return $this->rewindable;
         }
 
-        // workaround for an HHVM bug, should be removed when https://github.com/facebook/hhvm/issues/7281 is fixed
-        if ('' === $this->getPath()) {
-            return $this->rewindable = false;
-        }
-
         if (false !== $stream = @opendir($this->getPath())) {
             $infos = stream_get_meta_data($stream);
             closedir($stream);
diff --git a/vendor/symfony/finder/Iterator/SizeRangeFilterIterator.php b/vendor/symfony/finder/Iterator/SizeRangeFilterIterator.php
index bd1a7fb7..a68666b4 100644
--- a/vendor/symfony/finder/Iterator/SizeRangeFilterIterator.php
+++ b/vendor/symfony/finder/Iterator/SizeRangeFilterIterator.php
@@ -18,7 +18,7 @@ use Symfony\Component\Finder\Comparator\NumberComparator;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class SizeRangeFilterIterator extends FilterIterator
+class SizeRangeFilterIterator extends \FilterIterator
 {
     private $comparators = array();
 
diff --git a/vendor/symfony/finder/Iterator/SortableIterator.php b/vendor/symfony/finder/Iterator/SortableIterator.php
index c2f54b93..53f8e31c 100644
--- a/vendor/symfony/finder/Iterator/SortableIterator.php
+++ b/vendor/symfony/finder/Iterator/SortableIterator.php
@@ -63,7 +63,7 @@ class SortableIterator implements \IteratorAggregate
             $this->sort = function ($a, $b) {
                 return $a->getMTime() - $b->getMTime();
             };
-        } elseif (is_callable($sort)) {
+        } elseif (\is_callable($sort)) {
             $this->sort = $sort;
         } else {
             throw new \InvalidArgumentException('The SortableIterator takes a PHP callable or a valid built-in sort algorithm as an argument.');
diff --git a/vendor/symfony/finder/SplFileInfo.php b/vendor/symfony/finder/SplFileInfo.php
index 0f4e025b..b8143ed7 100644
--- a/vendor/symfony/finder/SplFileInfo.php
+++ b/vendor/symfony/finder/SplFileInfo.php
@@ -26,7 +26,7 @@ class SplFileInfo extends \SplFileInfo
      * @param string $relativePath     The relative path
      * @param string $relativePathname The relative path name
      */
-    public function __construct($file, $relativePath, $relativePathname)
+    public function __construct(string $file, string $relativePath, string $relativePathname)
     {
         parent::__construct($file);
         $this->relativePath = $relativePath;
diff --git a/vendor/symfony/finder/Tests/FinderTest.php b/vendor/symfony/finder/Tests/FinderTest.php
index c7908fa8..fbdcc36e 100644
--- a/vendor/symfony/finder/Tests/FinderTest.php
+++ b/vendor/symfony/finder/Tests/FinderTest.php
@@ -58,7 +58,7 @@ class FinderTest extends Iterator\RealIteratorTestCase
 
     public function testSymlinksNotResolved()
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('symlinks are not supported on Windows');
         }
 
@@ -265,7 +265,7 @@ class FinderTest extends Iterator\RealIteratorTestCase
 
     public function testFollowLinks()
     {
-        if ('\\' == DIRECTORY_SEPARATOR) {
+        if ('\\' == \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('symlinks are not supported on Windows');
         }
 
@@ -280,9 +280,9 @@ class FinderTest extends Iterator\RealIteratorTestCase
         $iterator = $finder->files()->name('*.php')->depth('< 1')->in(array(self::$tmpDir, __DIR__))->getIterator();
 
         $expected = array(
-            self::$tmpDir.DIRECTORY_SEPARATOR.'test.php',
-            __DIR__.DIRECTORY_SEPARATOR.'FinderTest.php',
-            __DIR__.DIRECTORY_SEPARATOR.'GlobTest.php',
+            self::$tmpDir.\DIRECTORY_SEPARATOR.'test.php',
+            __DIR__.\DIRECTORY_SEPARATOR.'FinderTest.php',
+            __DIR__.\DIRECTORY_SEPARATOR.'GlobTest.php',
         );
 
         $this->assertIterator($expected, $iterator);
@@ -384,7 +384,7 @@ class FinderTest extends Iterator\RealIteratorTestCase
             $paths[] = $file->getRelativePathname();
         }
 
-        $ref = array('test.php', 'toto', 'test.py', 'foo', 'foo'.DIRECTORY_SEPARATOR.'bar.tmp', 'foo bar');
+        $ref = array('test.php', 'toto', 'test.py', 'foo', 'foo'.\DIRECTORY_SEPARATOR.'bar.tmp', 'foo bar');
 
         sort($paths);
         sort($ref);
@@ -395,7 +395,7 @@ class FinderTest extends Iterator\RealIteratorTestCase
     public function testAppendWithAFinder()
     {
         $finder = $this->buildFinder();
-        $finder->files()->in(self::$tmpDir.DIRECTORY_SEPARATOR.'foo');
+        $finder->files()->in(self::$tmpDir.\DIRECTORY_SEPARATOR.'foo');
 
         $finder1 = $this->buildFinder();
         $finder1->directories()->in(self::$tmpDir);
@@ -408,7 +408,7 @@ class FinderTest extends Iterator\RealIteratorTestCase
     public function testAppendWithAnArray()
     {
         $finder = $this->buildFinder();
-        $finder->files()->in(self::$tmpDir.DIRECTORY_SEPARATOR.'foo');
+        $finder->files()->in(self::$tmpDir.\DIRECTORY_SEPARATOR.'foo');
 
         $finder->append($this->toAbsolute(array('foo', 'toto')));
 
@@ -423,7 +423,7 @@ class FinderTest extends Iterator\RealIteratorTestCase
     public function testAppendDoesNotRequireIn()
     {
         $finder = $this->buildFinder();
-        $finder->in(self::$tmpDir.DIRECTORY_SEPARATOR.'foo');
+        $finder->in(self::$tmpDir.\DIRECTORY_SEPARATOR.'foo');
 
         $finder1 = Finder::create()->append($finder);
 
@@ -444,7 +444,7 @@ class FinderTest extends Iterator\RealIteratorTestCase
 
     public function testCountFiles()
     {
-        $files = Finder::create()->files()->in(__DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $files = Finder::create()->files()->in(__DIR__.\DIRECTORY_SEPARATOR.'Fixtures');
         $i = 0;
 
         foreach ($files as $file) {
@@ -460,7 +460,7 @@ class FinderTest extends Iterator\RealIteratorTestCase
     public function testCountWithoutIn()
     {
         $finder = Finder::create()->files();
-        count($finder);
+        \count($finder);
     }
 
     public function testHasResults()
@@ -483,7 +483,7 @@ class FinderTest extends Iterator\RealIteratorTestCase
     public function testContains($matchPatterns, $noMatchPatterns, $expected)
     {
         $finder = $this->buildFinder();
-        $finder->in(__DIR__.DIRECTORY_SEPARATOR.'Fixtures')
+        $finder->in(__DIR__.\DIRECTORY_SEPARATOR.'Fixtures')
             ->name('*.txt')->sortByName()
             ->contains($matchPatterns)
             ->notContains($noMatchPatterns);
@@ -546,15 +546,15 @@ class FinderTest extends Iterator\RealIteratorTestCase
     {
         $locations = array(
             __DIR__.'/Fixtures/one',
-            self::$tmpDir.DIRECTORY_SEPARATOR.'toto',
+            self::$tmpDir.\DIRECTORY_SEPARATOR.'toto',
         );
 
         $finder = $this->buildFinder();
         $finder->in($locations)->depth('< 10')->name('*.neon');
 
         $expected = array(
-            __DIR__.'/Fixtures/one'.DIRECTORY_SEPARATOR.'b'.DIRECTORY_SEPARATOR.'c.neon',
-            __DIR__.'/Fixtures/one'.DIRECTORY_SEPARATOR.'b'.DIRECTORY_SEPARATOR.'d.neon',
+            __DIR__.'/Fixtures/one'.\DIRECTORY_SEPARATOR.'b'.\DIRECTORY_SEPARATOR.'c.neon',
+            __DIR__.'/Fixtures/one'.\DIRECTORY_SEPARATOR.'b'.\DIRECTORY_SEPARATOR.'d.neon',
         );
 
         $this->assertIterator($expected, $finder);
@@ -575,10 +575,10 @@ class FinderTest extends Iterator\RealIteratorTestCase
     public function testRegexSpecialCharsLocationWithPathRestrictionContainingStartFlag()
     {
         $finder = $this->buildFinder();
-        $finder->in(__DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'r+e.gex[c]a(r)s')
+        $finder->in(__DIR__.\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR.'r+e.gex[c]a(r)s')
             ->path('/^dir/');
 
-        $expected = array('r+e.gex[c]a(r)s'.DIRECTORY_SEPARATOR.'dir', 'r+e.gex[c]a(r)s'.DIRECTORY_SEPARATOR.'dir'.DIRECTORY_SEPARATOR.'bar.dat');
+        $expected = array('r+e.gex[c]a(r)s'.\DIRECTORY_SEPARATOR.'dir', 'r+e.gex[c]a(r)s'.\DIRECTORY_SEPARATOR.'dir'.\DIRECTORY_SEPARATOR.'bar.dat');
         $this->assertIterator($this->toAbsoluteFixtures($expected), $finder);
     }
 
@@ -612,7 +612,7 @@ class FinderTest extends Iterator\RealIteratorTestCase
     public function testPath($matchPatterns, $noMatchPatterns, array $expected)
     {
         $finder = $this->buildFinder();
-        $finder->in(__DIR__.DIRECTORY_SEPARATOR.'Fixtures')
+        $finder->in(__DIR__.\DIRECTORY_SEPARATOR.'Fixtures')
             ->path($matchPatterns)
             ->notPath($noMatchPatterns);
 
@@ -624,41 +624,41 @@ class FinderTest extends Iterator\RealIteratorTestCase
         return array(
             array('', '', array()),
             array('/^A\/B\/C/', '/C$/',
-                array('A'.DIRECTORY_SEPARATOR.'B'.DIRECTORY_SEPARATOR.'C'.DIRECTORY_SEPARATOR.'abc.dat'),
+                array('A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat'),
             ),
             array('/^A\/B/', 'foobar',
                 array(
-                    'A'.DIRECTORY_SEPARATOR.'B',
-                    'A'.DIRECTORY_SEPARATOR.'B'.DIRECTORY_SEPARATOR.'C',
-                    'A'.DIRECTORY_SEPARATOR.'B'.DIRECTORY_SEPARATOR.'ab.dat',
-                    'A'.DIRECTORY_SEPARATOR.'B'.DIRECTORY_SEPARATOR.'C'.DIRECTORY_SEPARATOR.'abc.dat',
+                    'A'.\DIRECTORY_SEPARATOR.'B',
+                    'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C',
+                    'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'ab.dat',
+                    'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat',
                 ),
             ),
             array('A/B/C', 'foobar',
                 array(
-                    'A'.DIRECTORY_SEPARATOR.'B'.DIRECTORY_SEPARATOR.'C',
-                    'A'.DIRECTORY_SEPARATOR.'B'.DIRECTORY_SEPARATOR.'C'.DIRECTORY_SEPARATOR.'abc.dat',
-                    'copy'.DIRECTORY_SEPARATOR.'A'.DIRECTORY_SEPARATOR.'B'.DIRECTORY_SEPARATOR.'C',
-                    'copy'.DIRECTORY_SEPARATOR.'A'.DIRECTORY_SEPARATOR.'B'.DIRECTORY_SEPARATOR.'C'.DIRECTORY_SEPARATOR.'abc.dat.copy',
+                    'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C',
+                    'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat',
+                    'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C',
+                    'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat.copy',
                 ),
             ),
             array('A/B', 'foobar',
                 array(
                     //dirs
-                    'A'.DIRECTORY_SEPARATOR.'B',
-                    'A'.DIRECTORY_SEPARATOR.'B'.DIRECTORY_SEPARATOR.'C',
-                    'copy'.DIRECTORY_SEPARATOR.'A'.DIRECTORY_SEPARATOR.'B',
-                    'copy'.DIRECTORY_SEPARATOR.'A'.DIRECTORY_SEPARATOR.'B'.DIRECTORY_SEPARATOR.'C',
+                    'A'.\DIRECTORY_SEPARATOR.'B',
+                    'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C',
+                    'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B',
+                    'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C',
                     //files
-                    'A'.DIRECTORY_SEPARATOR.'B'.DIRECTORY_SEPARATOR.'ab.dat',
-                    'A'.DIRECTORY_SEPARATOR.'B'.DIRECTORY_SEPARATOR.'C'.DIRECTORY_SEPARATOR.'abc.dat',
-                    'copy'.DIRECTORY_SEPARATOR.'A'.DIRECTORY_SEPARATOR.'B'.DIRECTORY_SEPARATOR.'ab.dat.copy',
-                    'copy'.DIRECTORY_SEPARATOR.'A'.DIRECTORY_SEPARATOR.'B'.DIRECTORY_SEPARATOR.'C'.DIRECTORY_SEPARATOR.'abc.dat.copy',
+                    'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'ab.dat',
+                    'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat',
+                    'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'ab.dat.copy',
+                    'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat.copy',
                 ),
             ),
             array('/^with space\//', 'foobar',
                 array(
-                    'with space'.DIRECTORY_SEPARATOR.'foo.txt',
+                    'with space'.\DIRECTORY_SEPARATOR.'foo.txt',
                 ),
             ),
         );
@@ -666,7 +666,7 @@ class FinderTest extends Iterator\RealIteratorTestCase
 
     public function testAccessDeniedException()
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('chmod is not supported on Windows');
         }
 
@@ -674,7 +674,7 @@ class FinderTest extends Iterator\RealIteratorTestCase
         $finder->files()->in(self::$tmpDir);
 
         // make 'foo' directory non-readable
-        $testDir = self::$tmpDir.DIRECTORY_SEPARATOR.'foo';
+        $testDir = self::$tmpDir.\DIRECTORY_SEPARATOR.'foo';
         chmod($testDir, 0333);
 
         if (false === $couldRead = is_readable($testDir)) {
@@ -706,7 +706,7 @@ class FinderTest extends Iterator\RealIteratorTestCase
 
     public function testIgnoredAccessDeniedException()
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('chmod is not supported on Windows');
         }
 
@@ -714,7 +714,7 @@ class FinderTest extends Iterator\RealIteratorTestCase
         $finder->files()->ignoreUnreadableDirs()->in(self::$tmpDir);
 
         // make 'foo' directory non-readable
-        $testDir = self::$tmpDir.DIRECTORY_SEPARATOR.'foo';
+        $testDir = self::$tmpDir.\DIRECTORY_SEPARATOR.'foo';
         chmod($testDir, 0333);
 
         if (false === ($couldRead = is_readable($testDir))) {
diff --git a/vendor/symfony/finder/Tests/GlobTest.php b/vendor/symfony/finder/Tests/GlobTest.php
index d48ac1fc..3a5aab31 100644
--- a/vendor/symfony/finder/Tests/GlobTest.php
+++ b/vendor/symfony/finder/Tests/GlobTest.php
@@ -32,9 +32,9 @@ class GlobTest extends TestCase
         $regex = Glob::toRegex('/**/*.neon');
 
         foreach ($finder->in(__DIR__) as $k => $v) {
-            $k = str_replace(DIRECTORY_SEPARATOR, '/', $k);
-            if (preg_match($regex, substr($k, strlen(__DIR__)))) {
-                $match[] = substr($k, 10 + strlen(__DIR__));
+            $k = str_replace(\DIRECTORY_SEPARATOR, '/', $k);
+            if (preg_match($regex, substr($k, \strlen(__DIR__)))) {
+                $match[] = substr($k, 10 + \strlen(__DIR__));
             }
         }
         sort($match);
@@ -49,9 +49,9 @@ class GlobTest extends TestCase
         $regex = Glob::toRegex('/**/*.neon', false);
 
         foreach ($finder->in(__DIR__) as $k => $v) {
-            $k = str_replace(DIRECTORY_SEPARATOR, '/', $k);
-            if (preg_match($regex, substr($k, strlen(__DIR__)))) {
-                $match[] = substr($k, 10 + strlen(__DIR__));
+            $k = str_replace(\DIRECTORY_SEPARATOR, '/', $k);
+            if (preg_match($regex, substr($k, \strlen(__DIR__)))) {
+                $match[] = substr($k, 10 + \strlen(__DIR__));
             }
         }
         sort($match);
@@ -66,9 +66,9 @@ class GlobTest extends TestCase
         $regex = Glob::toRegex('/Fixtures/one/**');
 
         foreach ($finder->in(__DIR__) as $k => $v) {
-            $k = str_replace(DIRECTORY_SEPARATOR, '/', $k);
-            if (preg_match($regex, substr($k, strlen(__DIR__)))) {
-                $match[] = substr($k, 10 + strlen(__DIR__));
+            $k = str_replace(\DIRECTORY_SEPARATOR, '/', $k);
+            if (preg_match($regex, substr($k, \strlen(__DIR__)))) {
+                $match[] = substr($k, 10 + \strlen(__DIR__));
             }
         }
         sort($match);
@@ -83,9 +83,9 @@ class GlobTest extends TestCase
         $regex = Glob::toRegex('/Fixtures/one/**', false);
 
         foreach ($finder->in(__DIR__) as $k => $v) {
-            $k = str_replace(DIRECTORY_SEPARATOR, '/', $k);
-            if (preg_match($regex, substr($k, strlen(__DIR__)))) {
-                $match[] = substr($k, 10 + strlen(__DIR__));
+            $k = str_replace(\DIRECTORY_SEPARATOR, '/', $k);
+            if (preg_match($regex, substr($k, \strlen(__DIR__)))) {
+                $match[] = substr($k, 10 + \strlen(__DIR__));
             }
         }
         sort($match);
diff --git a/vendor/symfony/finder/Tests/Iterator/DateRangeFilterIteratorTest.php b/vendor/symfony/finder/Tests/Iterator/DateRangeFilterIteratorTest.php
index 1ec70518..3226f706 100644
--- a/vendor/symfony/finder/Tests/Iterator/DateRangeFilterIteratorTest.php
+++ b/vendor/symfony/finder/Tests/Iterator/DateRangeFilterIteratorTest.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Finder\Tests\Iterator;
 
-use Symfony\Component\Finder\Iterator\DateRangeFilterIterator;
 use Symfony\Component\Finder\Comparator\DateComparator;
+use Symfony\Component\Finder\Iterator\DateRangeFilterIterator;
 
 class DateRangeFilterIteratorTest extends RealIteratorTestCase
 {
diff --git a/vendor/symfony/finder/Tests/Iterator/FilterIteratorTest.php b/vendor/symfony/finder/Tests/Iterator/FilterIteratorTest.php
deleted file mode 100644
index 8b1a4482..00000000
--- a/vendor/symfony/finder/Tests/Iterator/FilterIteratorTest.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Finder\Tests\Iterator;
-
-/**
- * @author Alex Bogomazov
- *
- * @group legacy
- */
-class FilterIteratorTest extends RealIteratorTestCase
-{
-    public function testFilterFilesystemIterators()
-    {
-        $i = new \FilesystemIterator($this->toAbsolute());
-
-        // it is expected that there are test.py test.php in the tmpDir
-        $i = $this->getMockForAbstractClass('Symfony\Component\Finder\Iterator\FilterIterator', array($i));
-        $i->expects($this->any())
-            ->method('accept')
-            ->will($this->returnCallback(function () use ($i) {
-                return (bool) preg_match('/\.php/', (string) $i->current());
-            })
-        );
-
-        $c = 0;
-        foreach ($i as $item) {
-            ++$c;
-        }
-
-        $this->assertEquals(1, $c);
-
-        $i->rewind();
-
-        $c = 0;
-        foreach ($i as $item) {
-            ++$c;
-        }
-
-        // This would fail in php older than 5.5.23/5.6.7 with \FilterIterator
-        // but works with Symfony\Component\Finder\Iterator\FilterIterator
-        // see https://bugs.php.net/68557
-        $this->assertEquals(1, $c);
-    }
-}
diff --git a/vendor/symfony/finder/Tests/Iterator/IteratorTestCase.php b/vendor/symfony/finder/Tests/Iterator/IteratorTestCase.php
index c724a75c..89f042ae 100644
--- a/vendor/symfony/finder/Tests/Iterator/IteratorTestCase.php
+++ b/vendor/symfony/finder/Tests/Iterator/IteratorTestCase.php
@@ -19,9 +19,9 @@ abstract class IteratorTestCase extends TestCase
     {
         // set iterator_to_array $use_key to false to avoid values merge
         // this made FinderTest::testAppendWithAnArray() fail with GnuFinderAdapter
-        $values = array_map(function (\SplFileInfo $fileinfo) { return str_replace('/', DIRECTORY_SEPARATOR, $fileinfo->getPathname()); }, iterator_to_array($iterator, false));
+        $values = array_map(function (\SplFileInfo $fileinfo) { return str_replace('/', \DIRECTORY_SEPARATOR, $fileinfo->getPathname()); }, iterator_to_array($iterator, false));
 
-        $expected = array_map(function ($path) { return str_replace('/', DIRECTORY_SEPARATOR, $path); }, $expected);
+        $expected = array_map(function ($path) { return str_replace('/', \DIRECTORY_SEPARATOR, $path); }, $expected);
 
         sort($values);
         sort($expected);
@@ -52,7 +52,7 @@ abstract class IteratorTestCase extends TestCase
 
         foreach ($expected as $subarray) {
             $temp = array();
-            while (count($values) && count($temp) < count($subarray)) {
+            while (\count($values) && \count($temp) < \count($subarray)) {
                 $temp[] = array_shift($values);
             }
             sort($temp);
diff --git a/vendor/symfony/finder/Tests/Iterator/MockSplFileInfo.php b/vendor/symfony/finder/Tests/Iterator/MockSplFileInfo.php
index cfe31c90..a5ac93a4 100644
--- a/vendor/symfony/finder/Tests/Iterator/MockSplFileInfo.php
+++ b/vendor/symfony/finder/Tests/Iterator/MockSplFileInfo.php
@@ -25,16 +25,16 @@ class MockSplFileInfo extends \SplFileInfo
 
     public function __construct($param)
     {
-        if (is_string($param)) {
+        if (\is_string($param)) {
             parent::__construct($param);
-        } elseif (is_array($param)) {
+        } elseif (\is_array($param)) {
             $defaults = array(
-              'name' => 'file.txt',
-              'contents' => null,
-              'mode' => null,
-              'type' => null,
-              'relativePath' => null,
-              'relativePathname' => null,
+                'name' => 'file.txt',
+                'contents' => null,
+                'mode' => null,
+                'type' => null,
+                'relativePath' => null,
+                'relativePathname' => null,
             );
             $defaults = array_merge($defaults, $param);
             parent::__construct($defaults['name']);
@@ -92,7 +92,7 @@ class MockSplFileInfo extends \SplFileInfo
 
     public function setType($type)
     {
-        if (is_string($type)) {
+        if (\is_string($type)) {
             switch ($type) {
                 case 'directory':
                 case 'd':
diff --git a/vendor/symfony/finder/Tests/Iterator/PathFilterIteratorTest.php b/vendor/symfony/finder/Tests/Iterator/PathFilterIteratorTest.php
index 6e10550c..38ed966a 100644
--- a/vendor/symfony/finder/Tests/Iterator/PathFilterIteratorTest.php
+++ b/vendor/symfony/finder/Tests/Iterator/PathFilterIteratorTest.php
@@ -31,37 +31,37 @@ class PathFilterIteratorTest extends IteratorTestCase
         //PATH:   A/B/C/abc.dat
         $inner[] = new MockSplFileInfo(array(
             'name' => 'abc.dat',
-            'relativePathname' => 'A'.DIRECTORY_SEPARATOR.'B'.DIRECTORY_SEPARATOR.'C'.DIRECTORY_SEPARATOR.'abc.dat',
+            'relativePathname' => 'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat',
         ));
 
         //PATH:   A/B/ab.dat
         $inner[] = new MockSplFileInfo(array(
             'name' => 'ab.dat',
-            'relativePathname' => 'A'.DIRECTORY_SEPARATOR.'B'.DIRECTORY_SEPARATOR.'ab.dat',
+            'relativePathname' => 'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'ab.dat',
         ));
 
         //PATH:   A/a.dat
         $inner[] = new MockSplFileInfo(array(
             'name' => 'a.dat',
-            'relativePathname' => 'A'.DIRECTORY_SEPARATOR.'a.dat',
+            'relativePathname' => 'A'.\DIRECTORY_SEPARATOR.'a.dat',
         ));
 
         //PATH:   copy/A/B/C/abc.dat.copy
         $inner[] = new MockSplFileInfo(array(
             'name' => 'abc.dat.copy',
-            'relativePathname' => 'copy'.DIRECTORY_SEPARATOR.'A'.DIRECTORY_SEPARATOR.'B'.DIRECTORY_SEPARATOR.'C'.DIRECTORY_SEPARATOR.'abc.dat',
+            'relativePathname' => 'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat',
         ));
 
         //PATH:   copy/A/B/ab.dat.copy
         $inner[] = new MockSplFileInfo(array(
             'name' => 'ab.dat.copy',
-            'relativePathname' => 'copy'.DIRECTORY_SEPARATOR.'A'.DIRECTORY_SEPARATOR.'B'.DIRECTORY_SEPARATOR.'ab.dat',
+            'relativePathname' => 'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'ab.dat',
         ));
 
         //PATH:   copy/A/a.dat.copy
         $inner[] = new MockSplFileInfo(array(
             'name' => 'a.dat.copy',
-            'relativePathname' => 'copy'.DIRECTORY_SEPARATOR.'A'.DIRECTORY_SEPARATOR.'a.dat',
+            'relativePathname' => 'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'a.dat',
         ));
 
         return array(
diff --git a/vendor/symfony/finder/Tests/Iterator/RealIteratorTestCase.php b/vendor/symfony/finder/Tests/Iterator/RealIteratorTestCase.php
index 94253c7e..b0223b78 100644
--- a/vendor/symfony/finder/Tests/Iterator/RealIteratorTestCase.php
+++ b/vendor/symfony/finder/Tests/Iterator/RealIteratorTestCase.php
@@ -18,7 +18,7 @@ abstract class RealIteratorTestCase extends IteratorTestCase
 
     public static function setUpBeforeClass()
     {
-        self::$tmpDir = realpath(sys_get_temp_dir()).DIRECTORY_SEPARATOR.'symfony_finder';
+        self::$tmpDir = realpath(sys_get_temp_dir()).\DIRECTORY_SEPARATOR.'symfony_finder';
 
         self::$files = array(
             '.git/',
@@ -44,7 +44,7 @@ abstract class RealIteratorTestCase extends IteratorTestCase
         }
 
         foreach (self::$files as $file) {
-            if (DIRECTORY_SEPARATOR === $file[strlen($file) - 1]) {
+            if (\DIRECTORY_SEPARATOR === $file[\strlen($file) - 1]) {
                 mkdir($file);
             } else {
                 touch($file);
@@ -60,11 +60,20 @@ abstract class RealIteratorTestCase extends IteratorTestCase
 
     public static function tearDownAfterClass()
     {
-        foreach (array_reverse(self::$files) as $file) {
-            if (DIRECTORY_SEPARATOR === $file[strlen($file) - 1]) {
-                @rmdir($file);
+        $paths = new \RecursiveIteratorIterator(
+             new \RecursiveDirectoryIterator(self::$tmpDir, \RecursiveDirectoryIterator::SKIP_DOTS),
+             \RecursiveIteratorIterator::CHILD_FIRST
+         );
+
+        foreach ($paths as $path) {
+            if ($path->isDir()) {
+                if ($path->isLink()) {
+                    @unlink($path);
+                } else {
+                    @rmdir($path);
+                }
             } else {
-                @unlink($file);
+                @unlink($path);
             }
         }
     }
@@ -75,24 +84,24 @@ abstract class RealIteratorTestCase extends IteratorTestCase
          * Without the call to setUpBeforeClass() property can be null.
          */
         if (!self::$tmpDir) {
-            self::$tmpDir = realpath(sys_get_temp_dir()).DIRECTORY_SEPARATOR.'symfony_finder';
+            self::$tmpDir = realpath(sys_get_temp_dir()).\DIRECTORY_SEPARATOR.'symfony_finder';
         }
 
-        if (is_array($files)) {
+        if (\is_array($files)) {
             $f = array();
             foreach ($files as $file) {
-                if (is_array($file)) {
+                if (\is_array($file)) {
                     $f[] = self::toAbsolute($file);
                 } else {
-                    $f[] = self::$tmpDir.DIRECTORY_SEPARATOR.str_replace('/', DIRECTORY_SEPARATOR, $file);
+                    $f[] = self::$tmpDir.\DIRECTORY_SEPARATOR.str_replace('/', \DIRECTORY_SEPARATOR, $file);
                 }
             }
 
             return $f;
         }
 
-        if (is_string($files)) {
-            return self::$tmpDir.DIRECTORY_SEPARATOR.str_replace('/', DIRECTORY_SEPARATOR, $files);
+        if (\is_string($files)) {
+            return self::$tmpDir.\DIRECTORY_SEPARATOR.str_replace('/', \DIRECTORY_SEPARATOR, $files);
         }
 
         return self::$tmpDir;
@@ -102,7 +111,7 @@ abstract class RealIteratorTestCase extends IteratorTestCase
     {
         $f = array();
         foreach ($files as $file) {
-            $f[] = realpath(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.$file);
+            $f[] = realpath(__DIR__.\DIRECTORY_SEPARATOR.'..'.\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR.$file);
         }
 
         return $f;
diff --git a/vendor/symfony/finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php b/vendor/symfony/finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
index 3a3ddc4d..0c9aca24 100644
--- a/vendor/symfony/finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
+++ b/vendor/symfony/finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
@@ -43,8 +43,8 @@ class RecursiveDirectoryIteratorTest extends IteratorTestCase
         }
 
         $contains = array(
-            'ftp://speedtest.tele2.net'.DIRECTORY_SEPARATOR.'1000GB.zip',
-            'ftp://speedtest.tele2.net'.DIRECTORY_SEPARATOR.'100GB.zip',
+            'ftp://speedtest.tele2.net'.\DIRECTORY_SEPARATOR.'1000GB.zip',
+            'ftp://speedtest.tele2.net'.\DIRECTORY_SEPARATOR.'100GB.zip',
         );
         $actual = array();
 
diff --git a/vendor/symfony/finder/Tests/Iterator/SizeRangeFilterIteratorTest.php b/vendor/symfony/finder/Tests/Iterator/SizeRangeFilterIteratorTest.php
index 6d75b0f2..068fc7b0 100644
--- a/vendor/symfony/finder/Tests/Iterator/SizeRangeFilterIteratorTest.php
+++ b/vendor/symfony/finder/Tests/Iterator/SizeRangeFilterIteratorTest.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Finder\Tests\Iterator;
 
-use Symfony\Component\Finder\Iterator\SizeRangeFilterIterator;
 use Symfony\Component\Finder\Comparator\NumberComparator;
+use Symfony\Component\Finder\Iterator\SizeRangeFilterIterator;
 
 class SizeRangeFilterIteratorTest extends RealIteratorTestCase
 {
diff --git a/vendor/symfony/finder/Tests/Iterator/SortableIteratorTest.php b/vendor/symfony/finder/Tests/Iterator/SortableIteratorTest.php
index 444654a2..a35a12b5 100644
--- a/vendor/symfony/finder/Tests/Iterator/SortableIteratorTest.php
+++ b/vendor/symfony/finder/Tests/Iterator/SortableIteratorTest.php
@@ -30,10 +30,10 @@ class SortableIteratorTest extends RealIteratorTestCase
      */
     public function testAccept($mode, $expected)
     {
-        if (!is_callable($mode)) {
+        if (!\is_callable($mode)) {
             switch ($mode) {
                 case SortableIterator::SORT_BY_ACCESSED_TIME:
-                    if ('\\' === DIRECTORY_SEPARATOR) {
+                    if ('\\' === \DIRECTORY_SEPARATOR) {
                         touch(self::toAbsolute('.git'));
                     } else {
                         file_get_contents(self::toAbsolute('.git'));
@@ -62,7 +62,7 @@ class SortableIteratorTest extends RealIteratorTestCase
             || SortableIterator::SORT_BY_CHANGED_TIME === $mode
             || SortableIterator::SORT_BY_MODIFIED_TIME === $mode
         ) {
-            if ('\\' === DIRECTORY_SEPARATOR && SortableIterator::SORT_BY_MODIFIED_TIME !== $mode) {
+            if ('\\' === \DIRECTORY_SEPARATOR && SortableIterator::SORT_BY_MODIFIED_TIME !== $mode) {
                 $this->markTestSkipped('Sorting by atime or ctime is not supported on Windows');
             }
             $this->assertOrderedIteratorForGroups($expected, $iterator);
diff --git a/vendor/symfony/finder/composer.json b/vendor/symfony/finder/composer.json
index de19826f..dd37f2e0 100644
--- a/vendor/symfony/finder/composer.json
+++ b/vendor/symfony/finder/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": "^5.5.9|>=7.0.8"
+        "php": "^7.1.3"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Finder\\": "" },
@@ -27,7 +27,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "3.4-dev"
+            "dev-master": "4.1-dev"
         }
     }
 }
diff --git a/vendor/symfony/http-foundation/AcceptHeader.php b/vendor/symfony/http-foundation/AcceptHeader.php
index d1740266..c702371f 100644
--- a/vendor/symfony/http-foundation/AcceptHeader.php
+++ b/vendor/symfony/http-foundation/AcceptHeader.php
@@ -52,12 +52,17 @@ class AcceptHeader
     {
         $index = 0;
 
-        return new self(array_map(function ($itemValue) use (&$index) {
-            $item = AcceptHeaderItem::fromString($itemValue);
+        $parts = HeaderUtils::split((string) $headerValue, ',;=');
+
+        return new self(array_map(function ($subParts) use (&$index) {
+            $part = array_shift($subParts);
+            $attributes = HeaderUtils::combine($subParts);
+
+            $item = new AcceptHeaderItem($part[0], $attributes);
             $item->setIndex($index++);
 
             return $item;
-        }, preg_split('/\s*(?:,*("[^"]+"),*|,*(\'[^\']+\'),*|,+)\s*/', $headerValue, 0, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE)));
+        }, $parts));
     }
 
     /**
@@ -91,7 +96,7 @@ class AcceptHeader
      */
     public function get($value)
     {
-        return isset($this->items[$value]) ? $this->items[$value] : null;
+        return $this->items[$value] ?? $this->items[explode('/', $value)[0].'/*'] ?? $this->items['*/*'] ?? $this->items['*'] ?? null;
     }
 
     /**
diff --git a/vendor/symfony/http-foundation/AcceptHeaderItem.php b/vendor/symfony/http-foundation/AcceptHeaderItem.php
index c69dbbba..97f60c8a 100644
--- a/vendor/symfony/http-foundation/AcceptHeaderItem.php
+++ b/vendor/symfony/http-foundation/AcceptHeaderItem.php
@@ -23,11 +23,7 @@ class AcceptHeaderItem
     private $index = 0;
     private $attributes = array();
 
-    /**
-     * @param string $value
-     * @param array  $attributes
-     */
-    public function __construct($value, array $attributes = array())
+    public function __construct(string $value, array $attributes = array())
     {
         $this->value = $value;
         foreach ($attributes as $name => $value) {
@@ -44,24 +40,12 @@ class AcceptHeaderItem
      */
     public static function fromString($itemValue)
     {
-        $bits = preg_split('/\s*(?:;*("[^"]+");*|;*(\'[^\']+\');*|;+)\s*/', $itemValue, 0, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
-        $value = array_shift($bits);
-        $attributes = array();
-
-        $lastNullAttribute = null;
-        foreach ($bits as $bit) {
-            if (($start = substr($bit, 0, 1)) === ($end = substr($bit, -1)) && ('"' === $start || '\'' === $start)) {
-                $attributes[$lastNullAttribute] = substr($bit, 1, -1);
-            } elseif ('=' === $end) {
-                $lastNullAttribute = $bit = substr($bit, 0, -1);
-                $attributes[$bit] = null;
-            } else {
-                $parts = explode('=', $bit);
-                $attributes[$parts[0]] = isset($parts[1]) && strlen($parts[1]) > 0 ? $parts[1] : '';
-            }
-        }
+        $parts = HeaderUtils::split($itemValue, ';=');
+
+        $part = array_shift($parts);
+        $attributes = HeaderUtils::combine($parts);
 
-        return new self(($start = substr($value, 0, 1)) === ($end = substr($value, -1)) && ('"' === $start || '\'' === $start) ? substr($value, 1, -1) : $value, $attributes);
+        return new self($part[0], $attributes);
     }
 
     /**
@@ -72,10 +56,8 @@ class AcceptHeaderItem
     public function __toString()
     {
         $string = $this->value.($this->quality < 1 ? ';q='.$this->quality : '');
-        if (count($this->attributes) > 0) {
-            $string .= ';'.implode(';', array_map(function ($name, $value) {
-                return sprintf(preg_match('/[,;=]/', $value) ? '%s="%s"' : '%s=%s', $name, $value);
-            }, array_keys($this->attributes), $this->attributes));
+        if (\count($this->attributes) > 0) {
+            $string .= '; '.HeaderUtils::toString($this->attributes, ';');
         }
 
         return $string;
diff --git a/vendor/symfony/http-foundation/ApacheRequest.php b/vendor/symfony/http-foundation/ApacheRequest.php
index 84803eba..4e99186d 100644
--- a/vendor/symfony/http-foundation/ApacheRequest.php
+++ b/vendor/symfony/http-foundation/ApacheRequest.php
@@ -35,7 +35,7 @@ class ApacheRequest extends Request
 
         if (false === strpos($this->server->get('REQUEST_URI'), $baseUrl)) {
             // assume mod_rewrite
-            return rtrim(dirname($baseUrl), '/\\');
+            return rtrim(\dirname($baseUrl), '/\\');
         }
 
         return $baseUrl;
diff --git a/vendor/symfony/http-foundation/BinaryFileResponse.php b/vendor/symfony/http-foundation/BinaryFileResponse.php
index 10102230..07ef8005 100644
--- a/vendor/symfony/http-foundation/BinaryFileResponse.php
+++ b/vendor/symfony/http-foundation/BinaryFileResponse.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpFoundation;
 
-use Symfony\Component\HttpFoundation\File\File;
 use Symfony\Component\HttpFoundation\File\Exception\FileException;
+use Symfony\Component\HttpFoundation\File\File;
 
 /**
  * BinaryFileResponse represents an HTTP response delivering a file.
@@ -31,8 +31,8 @@ class BinaryFileResponse extends Response
      * @var File
      */
     protected $file;
-    protected $offset;
-    protected $maxlen;
+    protected $offset = 0;
+    protected $maxlen = -1;
     protected $deleteFileAfterSend = false;
 
     /**
@@ -40,11 +40,11 @@ class BinaryFileResponse extends Response
      * @param int                 $status             The response status code
      * @param array               $headers            An array of response headers
      * @param bool                $public             Files are public by default
-     * @param null|string         $contentDisposition The type of Content-Disposition to set automatically with the filename
+     * @param string|null         $contentDisposition The type of Content-Disposition to set automatically with the filename
      * @param bool                $autoEtag           Whether the ETag header should be automatically set
      * @param bool                $autoLastModified   Whether the Last-Modified header should be automatically set
      */
-    public function __construct($file, $status = 200, $headers = array(), $public = true, $contentDisposition = null, $autoEtag = false, $autoLastModified = true)
+    public function __construct($file, int $status = 200, array $headers = array(), bool $public = true, string $contentDisposition = null, bool $autoEtag = false, bool $autoLastModified = true)
     {
         parent::__construct(null, $status, $headers);
 
@@ -60,7 +60,7 @@ class BinaryFileResponse extends Response
      * @param int                 $status             The response status code
      * @param array               $headers            An array of response headers
      * @param bool                $public             Files are public by default
-     * @param null|string         $contentDisposition The type of Content-Disposition to set automatically with the filename
+     * @param string|null         $contentDisposition The type of Content-Disposition to set automatically with the filename
      * @param bool                $autoEtag           Whether the ETag header should be automatically set
      * @param bool                $autoLastModified   Whether the Last-Modified header should be automatically set
      *
@@ -165,7 +165,7 @@ class BinaryFileResponse extends Response
             for ($i = 0, $filenameLength = mb_strlen($filename, $encoding); $i < $filenameLength; ++$i) {
                 $char = mb_substr($filename, $i, 1, $encoding);
 
-                if ('%' === $char || ord($char) < 32 || ord($char) > 126) {
+                if ('%' === $char || \ord($char) < 32 || \ord($char) > 126) {
                     $filenameFallback .= '_';
                 } else {
                     $filenameFallback .= $char;
@@ -218,17 +218,12 @@ class BinaryFileResponse extends Response
             if ('x-accel-redirect' === strtolower($type)) {
                 // Do X-Accel-Mapping substitutions.
                 // @link http://wiki.nginx.org/X-accel#X-Accel-Redirect
-                foreach (explode(',', $request->headers->get('X-Accel-Mapping', '')) as $mapping) {
-                    $mapping = explode('=', $mapping, 2);
-
-                    if (2 === count($mapping)) {
-                        $pathPrefix = trim($mapping[0]);
-                        $location = trim($mapping[1]);
-
-                        if (substr($path, 0, strlen($pathPrefix)) === $pathPrefix) {
-                            $path = $location.substr($path, strlen($pathPrefix));
-                            break;
-                        }
+                $parts = HeaderUtils::split($request->headers->get('X-Accel-Mapping', ''), ',=');
+                foreach ($parts as $part) {
+                    list($pathPrefix, $location) = $part;
+                    if (substr($path, 0, \strlen($pathPrefix)) === $pathPrefix) {
+                        $path = $location.substr($path, \strlen($pathPrefix));
+                        break;
                     }
                 }
             }
@@ -350,7 +345,7 @@ class BinaryFileResponse extends Response
      *
      * @return $this
      */
-    public function deleteFileAfterSend($shouldDelete)
+    public function deleteFileAfterSend($shouldDelete = true)
     {
         $this->deleteFileAfterSend = $shouldDelete;
 
diff --git a/vendor/symfony/http-foundation/CHANGELOG.md b/vendor/symfony/http-foundation/CHANGELOG.md
index ee5b6cec..8d851c6b 100644
--- a/vendor/symfony/http-foundation/CHANGELOG.md
+++ b/vendor/symfony/http-foundation/CHANGELOG.md
@@ -1,6 +1,50 @@
 CHANGELOG
 =========
 
+4.1.3
+-----
+
+ * [BC BREAK] Support for the IIS-only `X_ORIGINAL_URL` and `X_REWRITE_URL`
+   HTTP headers has been dropped for security reasons.
+
+4.1.0
+-----
+
+ * Query string normalization uses `parse_str()` instead of custom parsing logic.
+ * Passing the file size to the constructor of the `UploadedFile` class is deprecated.
+ * The `getClientSize()` method of the `UploadedFile` class is deprecated. Use `getSize()` instead.
+ * added `RedisSessionHandler` to use Redis as a session storage
+ * The `get()` method of the `AcceptHeader` class now takes into account the
+   `*` and `*/*` default values (if they are present in the Accept HTTP header)
+   when looking for items.
+ * deprecated `Request::getSession()` when no session has been set. Use `Request::hasSession()` instead.
+ * added `CannotWriteFileException`, `ExtensionFileException`, `FormSizeFileException`,
+   `IniSizeFileException`, `NoFileException`, `NoTmpDirFileException`, `PartialFileException` to
+   handle failed `UploadedFile`.
+ * added `MigratingSessionHandler` for migrating between two session handlers without losing sessions
+ * added `HeaderUtils`.
+
+4.0.0
+-----
+
+ * the `Request::setTrustedHeaderName()` and `Request::getTrustedHeaderName()`
+   methods have been removed
+ * the `Request::HEADER_CLIENT_IP` constant has been removed, use
+   `Request::HEADER_X_FORWARDED_FOR` instead
+ * the `Request::HEADER_CLIENT_HOST` constant has been removed, use
+   `Request::HEADER_X_FORWARDED_HOST` instead
+ * the `Request::HEADER_CLIENT_PROTO` constant has been removed, use
+   `Request::HEADER_X_FORWARDED_PROTO` instead
+ * the `Request::HEADER_CLIENT_PORT` constant has been removed, use
+   `Request::HEADER_X_FORWARDED_PORT` instead
+ * checking for cacheable HTTP methods using the `Request::isMethodSafe()`
+   method (by not passing `false` as its argument) is not supported anymore and
+   throws a `\BadMethodCallException`
+ * the `WriteCheckSessionHandler`, `NativeSessionHandler` and `NativeProxy` classes have been removed
+ * setting session save handlers that do not implement `\SessionHandlerInterface` in
+   `NativeSessionStorage::setSaveHandler()` is not supported anymore and throws a
+   `\TypeError`
+
 3.4.0
 -----
 
diff --git a/vendor/symfony/http-foundation/Cookie.php b/vendor/symfony/http-foundation/Cookie.php
index d202dc6c..2332bb4d 100644
--- a/vendor/symfony/http-foundation/Cookie.php
+++ b/vendor/symfony/http-foundation/Cookie.php
@@ -50,34 +50,20 @@ class Cookie
             'raw' => !$decode,
             'samesite' => null,
         );
-        foreach (explode(';', $cookie) as $part) {
-            if (false === strpos($part, '=')) {
-                $key = trim($part);
-                $value = true;
-            } else {
-                list($key, $value) = explode('=', trim($part), 2);
-                $key = trim($key);
-                $value = trim($value);
-            }
-            if (!isset($data['name'])) {
-                $data['name'] = $decode ? urldecode($key) : $key;
-                $data['value'] = true === $value ? null : ($decode ? urldecode($value) : $value);
-                continue;
-            }
-            switch ($key = strtolower($key)) {
-                case 'name':
-                case 'value':
-                    break;
-                case 'max-age':
-                    $data['expires'] = time() + (int) $value;
-                    break;
-                default:
-                    $data[$key] = $value;
-                    break;
-            }
+
+        $parts = HeaderUtils::split($cookie, ';=');
+        $part = array_shift($parts);
+
+        $name = $decode ? urldecode($part[0]) : $part[0];
+        $value = isset($part[1]) ? ($decode ? urldecode($part[1]) : $part[1]) : null;
+
+        $data = HeaderUtils::combine($parts) + $data;
+
+        if (isset($data['max-age'])) {
+            $data['expires'] = time() + (int) $data['max-age'];
         }
 
-        return new static($data['name'], $data['value'], $data['expires'], $data['path'], $data['domain'], $data['secure'], $data['httponly'], $data['raw'], $data['samesite']);
+        return new static($name, $value, $data['expires'], $data['path'], $data['domain'], $data['secure'], $data['httponly'], $data['raw'], $data['samesite']);
     }
 
     /**
@@ -93,7 +79,7 @@ class Cookie
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct($name, $value = null, $expire = 0, $path = '/', $domain = null, $secure = false, $httpOnly = true, $raw = false, $sameSite = null)
+    public function __construct(string $name, string $value = null, $expire = 0, ?string $path = '/', string $domain = null, bool $secure = false, bool $httpOnly = true, bool $raw = false, string $sameSite = null)
     {
         // from PHP source code
         if (preg_match("/[=,; \t\r\n\013\014]/", $name)) {
@@ -120,15 +106,15 @@ class Cookie
         $this->domain = $domain;
         $this->expire = 0 < $expire ? (int) $expire : 0;
         $this->path = empty($path) ? '/' : $path;
-        $this->secure = (bool) $secure;
-        $this->httpOnly = (bool) $httpOnly;
-        $this->raw = (bool) $raw;
+        $this->secure = $secure;
+        $this->httpOnly = $httpOnly;
+        $this->raw = $raw;
 
         if (null !== $sameSite) {
             $sameSite = strtolower($sameSite);
         }
 
-        if (!in_array($sameSite, array(self::SAMESITE_LAX, self::SAMESITE_STRICT, null), true)) {
+        if (!\in_array($sameSite, array(self::SAMESITE_LAX, self::SAMESITE_STRICT, null), true)) {
             throw new \InvalidArgumentException('The "sameSite" parameter value is not valid.');
         }
 
@@ -266,7 +252,7 @@ class Cookie
      */
     public function isCleared()
     {
-        return $this->expire < time();
+        return 0 !== $this->expire && $this->expire < time();
     }
 
     /**
diff --git a/vendor/symfony/http-foundation/File/Exception/AccessDeniedException.php b/vendor/symfony/http-foundation/File/Exception/AccessDeniedException.php
index 3b8e41d4..c25c3629 100644
--- a/vendor/symfony/http-foundation/File/Exception/AccessDeniedException.php
+++ b/vendor/symfony/http-foundation/File/Exception/AccessDeniedException.php
@@ -21,7 +21,7 @@ class AccessDeniedException extends FileException
     /**
      * @param string $path The path to the accessed file
      */
-    public function __construct($path)
+    public function __construct(string $path)
     {
         parent::__construct(sprintf('The file %s could not be accessed', $path));
     }
diff --git a/vendor/symfony/http-foundation/File/Exception/CannotWriteFileException.php b/vendor/symfony/http-foundation/File/Exception/CannotWriteFileException.php
new file mode 100644
index 00000000..c49f53a6
--- /dev/null
+++ b/vendor/symfony/http-foundation/File/Exception/CannotWriteFileException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\File\Exception;
+
+/**
+ * Thrown when an UPLOAD_ERR_CANT_WRITE error occurred with UploadedFile.
+ *
+ * @author Florent Mata <florentmata@gmail.com>
+ */
+class CannotWriteFileException extends FileException
+{
+}
diff --git a/vendor/symfony/http-foundation/File/Exception/ExtensionFileException.php b/vendor/symfony/http-foundation/File/Exception/ExtensionFileException.php
new file mode 100644
index 00000000..ed83499c
--- /dev/null
+++ b/vendor/symfony/http-foundation/File/Exception/ExtensionFileException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\File\Exception;
+
+/**
+ * Thrown when an UPLOAD_ERR_EXTENSION error occurred with UploadedFile.
+ *
+ * @author Florent Mata <florentmata@gmail.com>
+ */
+class ExtensionFileException extends FileException
+{
+}
diff --git a/vendor/symfony/http-foundation/File/Exception/FileNotFoundException.php b/vendor/symfony/http-foundation/File/Exception/FileNotFoundException.php
index bfcc37ec..0f1f3f95 100644
--- a/vendor/symfony/http-foundation/File/Exception/FileNotFoundException.php
+++ b/vendor/symfony/http-foundation/File/Exception/FileNotFoundException.php
@@ -21,7 +21,7 @@ class FileNotFoundException extends FileException
     /**
      * @param string $path The path to the file that was not found
      */
-    public function __construct($path)
+    public function __construct(string $path)
     {
         parent::__construct(sprintf('The file "%s" does not exist', $path));
     }
diff --git a/vendor/symfony/http-foundation/File/Exception/FormSizeFileException.php b/vendor/symfony/http-foundation/File/Exception/FormSizeFileException.php
new file mode 100644
index 00000000..8741be08
--- /dev/null
+++ b/vendor/symfony/http-foundation/File/Exception/FormSizeFileException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\File\Exception;
+
+/**
+ * Thrown when an UPLOAD_ERR_FORM_SIZE error occurred with UploadedFile.
+ *
+ * @author Florent Mata <florentmata@gmail.com>
+ */
+class FormSizeFileException extends FileException
+{
+}
diff --git a/vendor/symfony/http-foundation/File/Exception/IniSizeFileException.php b/vendor/symfony/http-foundation/File/Exception/IniSizeFileException.php
new file mode 100644
index 00000000..c8fde610
--- /dev/null
+++ b/vendor/symfony/http-foundation/File/Exception/IniSizeFileException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\File\Exception;
+
+/**
+ * Thrown when an UPLOAD_ERR_INI_SIZE error occurred with UploadedFile.
+ *
+ * @author Florent Mata <florentmata@gmail.com>
+ */
+class IniSizeFileException extends FileException
+{
+}
diff --git a/vendor/symfony/http-foundation/File/Exception/NoFileException.php b/vendor/symfony/http-foundation/File/Exception/NoFileException.php
new file mode 100644
index 00000000..4b48cc77
--- /dev/null
+++ b/vendor/symfony/http-foundation/File/Exception/NoFileException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\File\Exception;
+
+/**
+ * Thrown when an UPLOAD_ERR_NO_FILE error occurred with UploadedFile.
+ *
+ * @author Florent Mata <florentmata@gmail.com>
+ */
+class NoFileException extends FileException
+{
+}
diff --git a/vendor/symfony/http-foundation/File/Exception/NoTmpDirFileException.php b/vendor/symfony/http-foundation/File/Exception/NoTmpDirFileException.php
new file mode 100644
index 00000000..bdead2d9
--- /dev/null
+++ b/vendor/symfony/http-foundation/File/Exception/NoTmpDirFileException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\File\Exception;
+
+/**
+ * Thrown when an UPLOAD_ERR_NO_TMP_DIR error occurred with UploadedFile.
+ *
+ * @author Florent Mata <florentmata@gmail.com>
+ */
+class NoTmpDirFileException extends FileException
+{
+}
diff --git a/vendor/symfony/http-foundation/File/Exception/PartialFileException.php b/vendor/symfony/http-foundation/File/Exception/PartialFileException.php
new file mode 100644
index 00000000..4641efb5
--- /dev/null
+++ b/vendor/symfony/http-foundation/File/Exception/PartialFileException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\File\Exception;
+
+/**
+ * Thrown when an UPLOAD_ERR_PARTIAL error occurred with UploadedFile.
+ *
+ * @author Florent Mata <florentmata@gmail.com>
+ */
+class PartialFileException extends FileException
+{
+}
diff --git a/vendor/symfony/http-foundation/File/Exception/UnexpectedTypeException.php b/vendor/symfony/http-foundation/File/Exception/UnexpectedTypeException.php
index 0444b877..82b982b3 100644
--- a/vendor/symfony/http-foundation/File/Exception/UnexpectedTypeException.php
+++ b/vendor/symfony/http-foundation/File/Exception/UnexpectedTypeException.php
@@ -13,8 +13,8 @@ namespace Symfony\Component\HttpFoundation\File\Exception;
 
 class UnexpectedTypeException extends FileException
 {
-    public function __construct($value, $expectedType)
+    public function __construct($value, string $expectedType)
     {
-        parent::__construct(sprintf('Expected argument of type %s, %s given', $expectedType, is_object($value) ? get_class($value) : gettype($value)));
+        parent::__construct(sprintf('Expected argument of type %s, %s given', $expectedType, \is_object($value) ? \get_class($value) : \gettype($value)));
     }
 }
diff --git a/vendor/symfony/http-foundation/File/File.php b/vendor/symfony/http-foundation/File/File.php
index 65ece983..de7b0809 100644
--- a/vendor/symfony/http-foundation/File/File.php
+++ b/vendor/symfony/http-foundation/File/File.php
@@ -13,8 +13,8 @@ namespace Symfony\Component\HttpFoundation\File;
 
 use Symfony\Component\HttpFoundation\File\Exception\FileException;
 use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
-use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser;
 use Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesser;
+use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser;
 
 /**
  * A file in the file system.
@@ -31,7 +31,7 @@ class File extends \SplFileInfo
      *
      * @throws FileNotFoundException If the given path is not a file
      */
-    public function __construct($path, $checkPath = true)
+    public function __construct(string $path, bool $checkPath = true)
     {
         if ($checkPath && !is_file($path)) {
             throw new FileNotFoundException($path);
@@ -115,7 +115,7 @@ class File extends \SplFileInfo
             throw new FileException(sprintf('Unable to write in the "%s" directory', $directory));
         }
 
-        $target = rtrim($directory, '/\\').DIRECTORY_SEPARATOR.(null === $name ? $this->getBasename() : $this->getName($name));
+        $target = rtrim($directory, '/\\').\DIRECTORY_SEPARATOR.(null === $name ? $this->getBasename() : $this->getName($name));
 
         return new self($target, false);
     }
diff --git a/vendor/symfony/http-foundation/File/MimeType/FileBinaryMimeTypeGuesser.php b/vendor/symfony/http-foundation/File/MimeType/FileBinaryMimeTypeGuesser.php
index 3c358104..31300019 100644
--- a/vendor/symfony/http-foundation/File/MimeType/FileBinaryMimeTypeGuesser.php
+++ b/vendor/symfony/http-foundation/File/MimeType/FileBinaryMimeTypeGuesser.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpFoundation\File\MimeType;
 
-use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
 use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException;
+use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
 
 /**
  * Guesses the mime type with the binary "file" (only available on *nix).
@@ -31,7 +31,7 @@ class FileBinaryMimeTypeGuesser implements MimeTypeGuesserInterface
      *
      * @param string $cmd The command to run to get the mime type of a file
      */
-    public function __construct($cmd = 'file -b --mime %s 2>/dev/null')
+    public function __construct(string $cmd = 'file -b --mime %s 2>/dev/null')
     {
         $this->cmd = $cmd;
     }
@@ -49,7 +49,7 @@ class FileBinaryMimeTypeGuesser implements MimeTypeGuesserInterface
             return $supported;
         }
 
-        if ('\\' === DIRECTORY_SEPARATOR || !function_exists('passthru') || !function_exists('escapeshellarg')) {
+        if ('\\' === \DIRECTORY_SEPARATOR || !\function_exists('passthru') || !\function_exists('escapeshellarg')) {
             return $supported = false;
         }
 
diff --git a/vendor/symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php b/vendor/symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php
index 9b42835e..cee9ef3f 100644
--- a/vendor/symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php
+++ b/vendor/symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpFoundation\File\MimeType;
 
-use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
 use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException;
+use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
 
 /**
  * Guesses the mime type using the PECL extension FileInfo.
@@ -28,7 +28,7 @@ class FileinfoMimeTypeGuesser implements MimeTypeGuesserInterface
      *
      * @see http://www.php.net/manual/en/function.finfo-open.php
      */
-    public function __construct($magicFile = null)
+    public function __construct(string $magicFile = null)
     {
         $this->magicFile = $magicFile;
     }
@@ -40,7 +40,7 @@ class FileinfoMimeTypeGuesser implements MimeTypeGuesserInterface
      */
     public static function isSupported()
     {
-        return function_exists('finfo_open');
+        return \function_exists('finfo_open');
     }
 
     /**
diff --git a/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php b/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php
index d78c7606..dae47a7c 100644
--- a/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php
+++ b/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpFoundation\File\MimeType;
 
-use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
 use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException;
+use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
 
 /**
  * A singleton mime type guesser.
diff --git a/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesserInterface.php b/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesserInterface.php
index f8c3ad22..5ac1acb8 100644
--- a/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesserInterface.php
+++ b/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesserInterface.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpFoundation\File\MimeType;
 
-use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
 use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException;
+use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
 
 /**
  * Guesses the mime type of a file.
diff --git a/vendor/symfony/http-foundation/File/UploadedFile.php b/vendor/symfony/http-foundation/File/UploadedFile.php
index 39b29775..63fa6c73 100644
--- a/vendor/symfony/http-foundation/File/UploadedFile.php
+++ b/vendor/symfony/http-foundation/File/UploadedFile.php
@@ -11,8 +11,15 @@
 
 namespace Symfony\Component\HttpFoundation\File;
 
+use Symfony\Component\HttpFoundation\File\Exception\CannotWriteFileException;
+use Symfony\Component\HttpFoundation\File\Exception\ExtensionFileException;
 use Symfony\Component\HttpFoundation\File\Exception\FileException;
 use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
+use Symfony\Component\HttpFoundation\File\Exception\FormSizeFileException;
+use Symfony\Component\HttpFoundation\File\Exception\IniSizeFileException;
+use Symfony\Component\HttpFoundation\File\Exception\NoFileException;
+use Symfony\Component\HttpFoundation\File\Exception\NoTmpDirFileException;
+use Symfony\Component\HttpFoundation\File\Exception\PartialFileException;
 use Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesser;
 
 /**
@@ -27,7 +34,6 @@ class UploadedFile extends File
     private $test = false;
     private $originalName;
     private $mimeType;
-    private $size;
     private $error;
 
     /**
@@ -47,7 +53,6 @@ class UploadedFile extends File
      * @param string      $path         The full temporary path to the file
      * @param string      $originalName The original file name of the uploaded file
      * @param string|null $mimeType     The type of the file as provided by PHP; null defaults to application/octet-stream
-     * @param int|null    $size         The file size provided by the uploader
      * @param int|null    $error        The error constant of the upload (one of PHP's UPLOAD_ERR_XXX constants); null defaults to UPLOAD_ERR_OK
      * @param bool        $test         Whether the test mode is active
      *                                  Local files are used in test mode hence the code should not enforce HTTP uploads
@@ -55,13 +60,19 @@ class UploadedFile extends File
      * @throws FileException         If file_uploads is disabled
      * @throws FileNotFoundException If the file does not exist
      */
-    public function __construct($path, $originalName, $mimeType = null, $size = null, $error = null, $test = false)
+    public function __construct(string $path, string $originalName, string $mimeType = null, int $error = null, $test = false)
     {
         $this->originalName = $this->getName($originalName);
         $this->mimeType = $mimeType ?: 'application/octet-stream';
-        $this->size = $size;
+
+        if (4 < \func_num_args() ? !\is_bool($test) : null !== $error && @filesize($path) === $error) {
+            @trigger_error(sprintf('Passing a size as 4th argument to the constructor of "%s" is deprecated since Symfony 4.1.', __CLASS__), E_USER_DEPRECATED);
+            $error = $test;
+            $test = 5 < \func_num_args() ? func_get_arg(5) : false;
+        }
+
         $this->error = $error ?: UPLOAD_ERR_OK;
-        $this->test = (bool) $test;
+        $this->test = $test;
 
         parent::__construct($path, UPLOAD_ERR_OK === $this->error);
     }
@@ -141,11 +152,15 @@ class UploadedFile extends File
      * It is extracted from the request from which the file has been uploaded.
      * Then it should not be considered as a safe value.
      *
-     * @return int|null The file size
+     * @deprecated since Symfony 4.1, use getSize() instead.
+     *
+     * @return int|null The file sizes
      */
     public function getClientSize()
     {
-        return $this->size;
+        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1. Use getSize() instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return $this->getSize();
     }
 
     /**
@@ -204,6 +219,23 @@ class UploadedFile extends File
             return $target;
         }
 
+        switch ($this->error) {
+            case UPLOAD_ERR_INI_SIZE:
+                throw new IniSizeFileException($this->getErrorMessage());
+            case UPLOAD_ERR_FORM_SIZE:
+                throw new FormSizeFileException($this->getErrorMessage());
+            case UPLOAD_ERR_PARTIAL:
+                throw new PartialFileException($this->getErrorMessage());
+            case UPLOAD_ERR_NO_FILE:
+                throw new NoFileException($this->getErrorMessage());
+            case UPLOAD_ERR_CANT_WRITE:
+                throw new CannotWriteFileException($this->getErrorMessage());
+            case UPLOAD_ERR_NO_TMP_DIR:
+                throw new NoTmpDirFileException($this->getErrorMessage());
+            case UPLOAD_ERR_EXTENSION:
+                throw new ExtensionFileException($this->getErrorMessage());
+        }
+
         throw new FileException($this->getErrorMessage());
     }
 
@@ -222,9 +254,9 @@ class UploadedFile extends File
 
         $max = ltrim($iniMax, '+');
         if (0 === strpos($max, '0x')) {
-            $max = intval($max, 16);
+            $max = \intval($max, 16);
         } elseif (0 === strpos($max, '0')) {
-            $max = intval($max, 8);
+            $max = \intval($max, 8);
         } else {
             $max = (int) $max;
         }
diff --git a/vendor/symfony/http-foundation/FileBag.php b/vendor/symfony/http-foundation/FileBag.php
index 5edd0e62..f37e10f2 100644
--- a/vendor/symfony/http-foundation/FileBag.php
+++ b/vendor/symfony/http-foundation/FileBag.php
@@ -45,7 +45,7 @@ class FileBag extends ParameterBag
      */
     public function set($key, $value)
     {
-        if (!is_array($value) && !$value instanceof UploadedFile) {
+        if (!\is_array($value) && !$value instanceof UploadedFile) {
             throw new \InvalidArgumentException('An uploaded file must be an array or an instance of UploadedFile.');
         }
 
@@ -76,7 +76,7 @@ class FileBag extends ParameterBag
         }
 
         $file = $this->fixPhpFilesArray($file);
-        if (is_array($file)) {
+        if (\is_array($file)) {
             $keys = array_keys($file);
             sort($keys);
 
@@ -84,7 +84,7 @@ class FileBag extends ParameterBag
                 if (UPLOAD_ERR_NO_FILE == $file['error']) {
                     $file = null;
                 } else {
-                    $file = new UploadedFile($file['tmp_name'], $file['name'], $file['type'], $file['size'], $file['error']);
+                    $file = new UploadedFile($file['tmp_name'], $file['name'], $file['type'], $file['error']);
                 }
             } else {
                 $file = array_map(array($this, 'convertFileInformation'), $file);
@@ -113,14 +113,14 @@ class FileBag extends ParameterBag
      */
     protected function fixPhpFilesArray($data)
     {
-        if (!is_array($data)) {
+        if (!\is_array($data)) {
             return $data;
         }
 
         $keys = array_keys($data);
         sort($keys);
 
-        if (self::$fileKeys != $keys || !isset($data['name']) || !is_array($data['name'])) {
+        if (self::$fileKeys != $keys || !isset($data['name']) || !\is_array($data['name'])) {
             return $data;
         }
 
diff --git a/vendor/symfony/http-foundation/HeaderBag.php b/vendor/symfony/http-foundation/HeaderBag.php
index 7aaa52ae..e1a6ae29 100644
--- a/vendor/symfony/http-foundation/HeaderBag.php
+++ b/vendor/symfony/http-foundation/HeaderBag.php
@@ -46,7 +46,7 @@ class HeaderBag implements \IteratorAggregate, \Countable
         $max = max(array_map('strlen', array_keys($headers))) + 1;
         $content = '';
         foreach ($headers as $name => $values) {
-            $name = implode('-', array_map('ucfirst', explode('-', $name)));
+            $name = ucwords($name, '-');
             foreach ($values as $value) {
                 $content .= sprintf("%-{$max}s %s\r\n", $name.':', $value);
             }
@@ -101,11 +101,11 @@ class HeaderBag implements \IteratorAggregate, \Countable
     /**
      * Returns a header value by name.
      *
-     * @param string          $key     The header name
-     * @param string|string[] $default The default value
-     * @param bool            $first   Whether to return the first value or all header values
+     * @param string               $key     The header name
+     * @param string|string[]|null $default The default value
+     * @param bool                 $first   Whether to return the first value or all header values
      *
-     * @return string|string[] The first header value or default value if $first is true, an array of values otherwise
+     * @return string|string[]|null The first header value or default value if $first is true, an array of values otherwise
      */
     public function get($key, $default = null, $first = true)
     {
@@ -181,7 +181,7 @@ class HeaderBag implements \IteratorAggregate, \Countable
      */
     public function contains($key, $value)
     {
-        return in_array($value, $this->get($key, null, false));
+        return \in_array($value, $this->get($key, null, false));
     }
 
     /**
@@ -206,7 +206,7 @@ class HeaderBag implements \IteratorAggregate, \Countable
      * @param string    $key     The parameter key
      * @param \DateTime $default The default value
      *
-     * @return null|\DateTime The parsed DateTime or the default value if the header does not exist
+     * @return \DateTime|null The parsed DateTime or the default value if the header does not exist
      *
      * @throws \RuntimeException When the HTTP header is not parseable
      */
@@ -289,26 +289,14 @@ class HeaderBag implements \IteratorAggregate, \Countable
      */
     public function count()
     {
-        return count($this->headers);
+        return \count($this->headers);
     }
 
     protected function getCacheControlHeader()
     {
-        $parts = array();
         ksort($this->cacheControl);
-        foreach ($this->cacheControl as $key => $value) {
-            if (true === $value) {
-                $parts[] = $key;
-            } else {
-                if (preg_match('#[^a-zA-Z0-9._-]#', $value)) {
-                    $value = '"'.$value.'"';
-                }
 
-                $parts[] = "$key=$value";
-            }
-        }
-
-        return implode(', ', $parts);
+        return HeaderUtils::toString($this->cacheControl, ',');
     }
 
     /**
@@ -320,12 +308,8 @@ class HeaderBag implements \IteratorAggregate, \Countable
      */
     protected function parseCacheControl($header)
     {
-        $cacheControl = array();
-        preg_match_all('#([a-zA-Z][a-zA-Z_-]*)\s*(?:=(?:"([^"]*)"|([^ \t",;]*)))?#', $header, $matches, PREG_SET_ORDER);
-        foreach ($matches as $match) {
-            $cacheControl[strtolower($match[1])] = isset($match[3]) ? $match[3] : (isset($match[2]) ? $match[2] : true);
-        }
+        $parts = HeaderUtils::split($header, ',=');
 
-        return $cacheControl;
+        return HeaderUtils::combine($parts);
     }
 }
diff --git a/vendor/symfony/http-foundation/HeaderUtils.php b/vendor/symfony/http-foundation/HeaderUtils.php
new file mode 100644
index 00000000..3ee50b87
--- /dev/null
+++ b/vendor/symfony/http-foundation/HeaderUtils.php
@@ -0,0 +1,174 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation;
+
+/**
+ * HTTP header utility functions.
+ *
+ * @author Christian Schmidt <github@chsc.dk>
+ */
+class HeaderUtils
+{
+    /**
+     * This class should not be instantiated.
+     */
+    private function __construct()
+    {
+    }
+
+    /**
+     * Splits an HTTP header by one or more separators.
+     *
+     * Example:
+     *
+     *     HeaderUtils::split("da, en-gb;q=0.8", ",;")
+     *     // => array(array('da'), array('en-gb', 'q=0.8'))
+     *
+     * @param string $header     HTTP header value
+     * @param string $separators List of characters to split on, ordered by
+     *                           precedence, e.g. ",", ";=", or ",;="
+     *
+     * @return array Nested array with as many levels as there are characters in
+     *               $separators
+     */
+    public static function split(string $header, string $separators): array
+    {
+        $quotedSeparators = preg_quote($separators, '/');
+
+        preg_match_all('
+            /
+                (?!\s)
+                    (?:
+                        # quoted-string
+                        "(?:[^"\\\\]|\\\\.)*(?:"|\\\\|$)
+                    |
+                        # token
+                        [^"'.$quotedSeparators.']+
+                    )+
+                (?<!\s)
+            |
+                # separator
+                \s*
+                (?<separator>['.$quotedSeparators.'])
+                \s*
+            /x', trim($header), $matches, PREG_SET_ORDER);
+
+        return self::groupParts($matches, $separators);
+    }
+
+    /**
+     * Combines an array of arrays into one associative array.
+     *
+     * Each of the nested arrays should have one or two elements. The first
+     * value will be used as the keys in the associative array, and the second
+     * will be used as the values, or true if the nested array only contains one
+     * element. Array keys are lowercased.
+     *
+     * Example:
+     *
+     *     HeaderUtils::combine(array(array("foo", "abc"), array("bar")))
+     *     // => array("foo" => "abc", "bar" => true)
+     */
+    public static function combine(array $parts): array
+    {
+        $assoc = array();
+        foreach ($parts as $part) {
+            $name = strtolower($part[0]);
+            $value = $part[1] ?? true;
+            $assoc[$name] = $value;
+        }
+
+        return $assoc;
+    }
+
+    /**
+     * Joins an associative array into a string for use in an HTTP header.
+     *
+     * The key and value of each entry are joined with "=", and all entries
+     * are joined with the specified separator and an additional space (for
+     * readability). Values are quoted if necessary.
+     *
+     * Example:
+     *
+     *     HeaderUtils::toString(array("foo" => "abc", "bar" => true, "baz" => "a b c"), ",")
+     *     // => 'foo=abc, bar, baz="a b c"'
+     */
+    public static function toString(array $assoc, string $separator): string
+    {
+        $parts = array();
+        foreach ($assoc as $name => $value) {
+            if (true === $value) {
+                $parts[] = $name;
+            } else {
+                $parts[] = $name.'='.self::quote($value);
+            }
+        }
+
+        return implode($separator.' ', $parts);
+    }
+
+    /**
+     * Encodes a string as a quoted string, if necessary.
+     *
+     * If a string contains characters not allowed by the "token" construct in
+     * the HTTP specification, it is backslash-escaped and enclosed in quotes
+     * to match the "quoted-string" construct.
+     */
+    public static function quote(string $s): string
+    {
+        if (preg_match('/^[a-z0-9!#$%&\'*.^_`|~-]+$/i', $s)) {
+            return $s;
+        }
+
+        return '"'.addcslashes($s, '"\\"').'"';
+    }
+
+    /**
+     * Decodes a quoted string.
+     *
+     * If passed an unquoted string that matches the "token" construct (as
+     * defined in the HTTP specification), it is passed through verbatimly.
+     */
+    public static function unquote(string $s): string
+    {
+        return preg_replace('/\\\\(.)|"/', '$1', $s);
+    }
+
+    private static function groupParts(array $matches, string $separators): array
+    {
+        $separator = $separators[0];
+        $partSeparators = substr($separators, 1);
+
+        $i = 0;
+        $partMatches = array();
+        foreach ($matches as $match) {
+            if (isset($match['separator']) && $match['separator'] === $separator) {
+                ++$i;
+            } else {
+                $partMatches[$i][] = $match;
+            }
+        }
+
+        $parts = array();
+        if ($partSeparators) {
+            foreach ($partMatches as $matches) {
+                $parts[] = self::groupParts($matches, $partSeparators);
+            }
+        } else {
+            foreach ($partMatches as $matches) {
+                $parts[] = self::unquote($matches[0][0]);
+            }
+        }
+
+        return $parts;
+    }
+}
diff --git a/vendor/symfony/http-foundation/IpUtils.php b/vendor/symfony/http-foundation/IpUtils.php
index 86d135b2..a1bfa908 100644
--- a/vendor/symfony/http-foundation/IpUtils.php
+++ b/vendor/symfony/http-foundation/IpUtils.php
@@ -37,7 +37,7 @@ class IpUtils
      */
     public static function checkIp($requestIp, $ips)
     {
-        if (!is_array($ips)) {
+        if (!\is_array($ips)) {
             $ips = array($ips);
         }
 
@@ -116,7 +116,7 @@ class IpUtils
             return self::$checkedIps[$cacheKey];
         }
 
-        if (!((extension_loaded('sockets') && defined('AF_INET6')) || @inet_pton('::1'))) {
+        if (!((\extension_loaded('sockets') && \defined('AF_INET6')) || @inet_pton('::1'))) {
             throw new \RuntimeException('Unable to check Ipv6. Check that PHP was not compiled with option "disable-ipv6".');
         }
 
diff --git a/vendor/symfony/http-foundation/JsonResponse.php b/vendor/symfony/http-foundation/JsonResponse.php
index 137ac33c..f10262e8 100644
--- a/vendor/symfony/http-foundation/JsonResponse.php
+++ b/vendor/symfony/http-foundation/JsonResponse.php
@@ -39,7 +39,7 @@ class JsonResponse extends Response
      * @param array $headers An array of response headers
      * @param bool  $json    If the data is already a JSON string
      */
-    public function __construct($data = null, $status = 200, $headers = array(), $json = false)
+    public function __construct($data = null, int $status = 200, array $headers = array(), bool $json = false)
     {
         parent::__construct('', $status, $headers);
 
@@ -101,7 +101,7 @@ class JsonResponse extends Response
             );
             $parts = explode('.', $callback);
             foreach ($parts as $part) {
-                if (!preg_match($pattern, $part) || in_array($part, $reserved, true)) {
+                if (!preg_match($pattern, $part) || \in_array($part, $reserved, true)) {
                     throw new \InvalidArgumentException('The callback name is not valid.');
                 }
             }
@@ -139,29 +139,13 @@ class JsonResponse extends Response
      */
     public function setData($data = array())
     {
-        if (defined('HHVM_VERSION')) {
-            // HHVM does not trigger any warnings and let exceptions
-            // thrown from a JsonSerializable object pass through.
-            // If only PHP did the same...
+        try {
             $data = json_encode($data, $this->encodingOptions);
-        } else {
-            if (!interface_exists('JsonSerializable', false)) {
-                set_error_handler(function () { return false; });
-                try {
-                    $data = @json_encode($data, $this->encodingOptions);
-                } finally {
-                    restore_error_handler();
-                }
-            } else {
-                try {
-                    $data = json_encode($data, $this->encodingOptions);
-                } catch (\Exception $e) {
-                    if ('Exception' === get_class($e) && 0 === strpos($e->getMessage(), 'Failed calling ')) {
-                        throw $e->getPrevious() ?: $e;
-                    }
-                    throw $e;
-                }
+        } catch (\Exception $e) {
+            if ('Exception' === \get_class($e) && 0 === strpos($e->getMessage(), 'Failed calling ')) {
+                throw $e->getPrevious() ?: $e;
             }
+            throw $e;
         }
 
         if (JSON_ERROR_NONE !== json_last_error()) {
diff --git a/vendor/symfony/http-foundation/ParameterBag.php b/vendor/symfony/http-foundation/ParameterBag.php
index 257ef8bc..e3be0a9b 100644
--- a/vendor/symfony/http-foundation/ParameterBag.php
+++ b/vendor/symfony/http-foundation/ParameterBag.php
@@ -200,12 +200,12 @@ class ParameterBag implements \IteratorAggregate, \Countable
         $value = $this->get($key, $default);
 
         // Always turn $options into an array - this allows filter_var option shortcuts.
-        if (!is_array($options) && $options) {
+        if (!\is_array($options) && $options) {
             $options = array('flags' => $options);
         }
 
         // Add a convenience check for arrays.
-        if (is_array($value) && !isset($options['flags'])) {
+        if (\is_array($value) && !isset($options['flags'])) {
             $options['flags'] = FILTER_REQUIRE_ARRAY;
         }
 
@@ -229,6 +229,6 @@ class ParameterBag implements \IteratorAggregate, \Countable
      */
     public function count()
     {
-        return count($this->parameters);
+        return \count($this->parameters);
     }
 }
diff --git a/vendor/symfony/http-foundation/RedirectResponse.php b/vendor/symfony/http-foundation/RedirectResponse.php
index 01681dcd..11f71a03 100644
--- a/vendor/symfony/http-foundation/RedirectResponse.php
+++ b/vendor/symfony/http-foundation/RedirectResponse.php
@@ -32,7 +32,7 @@ class RedirectResponse extends Response
      *
      * @see http://tools.ietf.org/html/rfc2616#section-10.3
      */
-    public function __construct($url, $status = 302, $headers = array())
+    public function __construct(?string $url, int $status = 302, array $headers = array())
     {
         parent::__construct('', $status, $headers);
 
diff --git a/vendor/symfony/http-foundation/Request.php b/vendor/symfony/http-foundation/Request.php
index da17df90..f0957328 100644
--- a/vendor/symfony/http-foundation/Request.php
+++ b/vendor/symfony/http-foundation/Request.php
@@ -38,15 +38,6 @@ class Request
     const HEADER_X_FORWARDED_ALL = 0b11110; // All "X-Forwarded-*" headers
     const HEADER_X_FORWARDED_AWS_ELB = 0b11010; // AWS ELB doesn't send X-Forwarded-Host
 
-    /** @deprecated since version 3.3, to be removed in 4.0 */
-    const HEADER_CLIENT_IP = self::HEADER_X_FORWARDED_FOR;
-    /** @deprecated since version 3.3, to be removed in 4.0 */
-    const HEADER_CLIENT_HOST = self::HEADER_X_FORWARDED_HOST;
-    /** @deprecated since version 3.3, to be removed in 4.0 */
-    const HEADER_CLIENT_PROTO = self::HEADER_X_FORWARDED_PROTO;
-    /** @deprecated since version 3.3, to be removed in 4.0 */
-    const HEADER_CLIENT_PORT = self::HEADER_X_FORWARDED_PORT;
-
     const METHOD_HEAD = 'HEAD';
     const METHOD_GET = 'GET';
     const METHOD_POST = 'POST';
@@ -73,25 +64,6 @@ class Request
      */
     protected static $trustedHosts = array();
 
-    /**
-     * Names for headers that can be trusted when
-     * using trusted proxies.
-     *
-     * The FORWARDED header is the standard as of rfc7239.
-     *
-     * The other headers are non-standard, but widely used
-     * by popular reverse proxies (like Apache mod_proxy or Amazon EC2).
-     *
-     * @deprecated since version 3.3, to be removed in 4.0
-     */
-    protected static $trustedHeaders = array(
-        self::HEADER_FORWARDED => 'FORWARDED',
-        self::HEADER_CLIENT_IP => 'X_FORWARDED_FOR',
-        self::HEADER_CLIENT_HOST => 'X_FORWARDED_HOST',
-        self::HEADER_CLIENT_PROTO => 'X_FORWARDED_PROTO',
-        self::HEADER_CLIENT_PORT => 'X_FORWARDED_PORT',
-    );
-
     protected static $httpMethodParameterOverride = false;
 
     /**
@@ -225,15 +197,6 @@ class Request
 
     private static $trustedHeaderSet = -1;
 
-    /** @deprecated since version 3.3, to be removed in 4.0 */
-    private static $trustedHeaderNames = array(
-        self::HEADER_FORWARDED => 'FORWARDED',
-        self::HEADER_CLIENT_IP => 'X_FORWARDED_FOR',
-        self::HEADER_CLIENT_HOST => 'X_FORWARDED_HOST',
-        self::HEADER_CLIENT_PROTO => 'X_FORWARDED_PROTO',
-        self::HEADER_CLIENT_PORT => 'X_FORWARDED_PORT',
-    );
-
     private static $forwardedParams = array(
         self::HEADER_X_FORWARDED_FOR => 'for',
         self::HEADER_X_FORWARDED_HOST => 'host',
@@ -241,6 +204,23 @@ class Request
         self::HEADER_X_FORWARDED_PORT => 'host',
     );
 
+    /**
+     * Names for headers that can be trusted when
+     * using trusted proxies.
+     *
+     * The FORWARDED header is the standard as of rfc7239.
+     *
+     * The other headers are non-standard, but widely used
+     * by popular reverse proxies (like Apache mod_proxy or Amazon EC2).
+     */
+    private static $trustedHeaders = array(
+        self::HEADER_FORWARDED => 'FORWARDED',
+        self::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR',
+        self::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST',
+        self::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
+        self::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
+    );
+
     /**
      * @param array                $query      The GET parameters
      * @param array                $request    The POST parameters
@@ -298,23 +278,10 @@ class Request
      */
     public static function createFromGlobals()
     {
-        // With the php's bug #66606, the php's built-in web server
-        // stores the Content-Type and Content-Length header values in
-        // HTTP_CONTENT_TYPE and HTTP_CONTENT_LENGTH fields.
-        $server = $_SERVER;
-        if ('cli-server' === PHP_SAPI) {
-            if (array_key_exists('HTTP_CONTENT_LENGTH', $_SERVER)) {
-                $server['CONTENT_LENGTH'] = $_SERVER['HTTP_CONTENT_LENGTH'];
-            }
-            if (array_key_exists('HTTP_CONTENT_TYPE', $_SERVER)) {
-                $server['CONTENT_TYPE'] = $_SERVER['HTTP_CONTENT_TYPE'];
-            }
-        }
-
-        $request = self::createRequestFromFactory($_GET, $_POST, array(), $_COOKIE, $_FILES, $server);
+        $request = self::createRequestFromFactory($_GET, $_POST, array(), $_COOKIE, $_FILES, $_SERVER);
 
         if (0 === strpos($request->headers->get('CONTENT_TYPE'), 'application/x-www-form-urlencoded')
-            && in_array(strtoupper($request->server->get('REQUEST_METHOD', 'GET')), array('PUT', 'DELETE', 'PATCH'))
+            && \in_array(strtoupper($request->server->get('REQUEST_METHOD', 'GET')), array('PUT', 'DELETE', 'PATCH'))
         ) {
             parse_str($request->getContent(), $data);
             $request->request = new ParameterBag($data);
@@ -345,7 +312,7 @@ class Request
             'SERVER_NAME' => 'localhost',
             'SERVER_PORT' => 80,
             'HTTP_HOST' => 'localhost',
-            'HTTP_USER_AGENT' => 'Symfony/3.X',
+            'HTTP_USER_AGENT' => 'Symfony',
             'HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
             'HTTP_ACCEPT_LANGUAGE' => 'en-us,en;q=0.5',
             'HTTP_ACCEPT_CHARSET' => 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
@@ -377,7 +344,7 @@ class Request
 
         if (isset($components['port'])) {
             $server['SERVER_PORT'] = $components['port'];
-            $server['HTTP_HOST'] = $server['HTTP_HOST'].':'.$components['port'];
+            $server['HTTP_HOST'] .= ':'.$components['port'];
         }
 
         if (isset($components['user'])) {
@@ -566,7 +533,7 @@ class Request
 
         foreach ($this->headers->all() as $key => $value) {
             $key = strtoupper(str_replace('-', '_', $key));
-            if (in_array($key, array('CONTENT_TYPE', 'CONTENT_LENGTH'))) {
+            if (\in_array($key, array('CONTENT_TYPE', 'CONTENT_LENGTH'))) {
                 $_SERVER[$key] = implode(', ', $value);
             } else {
                 $_SERVER['HTTP_'.$key] = implode(', ', $value);
@@ -594,20 +561,9 @@ class Request
      *
      * @throws \InvalidArgumentException When $trustedHeaderSet is invalid
      */
-    public static function setTrustedProxies(array $proxies/*, int $trustedHeaderSet*/)
+    public static function setTrustedProxies(array $proxies, int $trustedHeaderSet)
     {
         self::$trustedProxies = $proxies;
-
-        if (2 > func_num_args()) {
-            @trigger_error(sprintf('The %s() method expects a bit field of Request::HEADER_* as second argument since Symfony 3.3. Defining it will be required in 4.0. ', __METHOD__), E_USER_DEPRECATED);
-
-            return;
-        }
-        $trustedHeaderSet = (int) func_get_arg(1);
-
-        foreach (self::$trustedHeaderNames as $header => $name) {
-            self::$trustedHeaders[$header] = $header & $trustedHeaderSet ? $name : null;
-        }
         self::$trustedHeaderSet = $trustedHeaderSet;
     }
 
@@ -657,78 +613,6 @@ class Request
         return self::$trustedHostPatterns;
     }
 
-    /**
-     * Sets the name for trusted headers.
-     *
-     * The following header keys are supported:
-     *
-     *  * Request::HEADER_CLIENT_IP:    defaults to X-Forwarded-For   (see getClientIp())
-     *  * Request::HEADER_CLIENT_HOST:  defaults to X-Forwarded-Host  (see getHost())
-     *  * Request::HEADER_CLIENT_PORT:  defaults to X-Forwarded-Port  (see getPort())
-     *  * Request::HEADER_CLIENT_PROTO: defaults to X-Forwarded-Proto (see getScheme() and isSecure())
-     *  * Request::HEADER_FORWARDED:    defaults to Forwarded         (see RFC 7239)
-     *
-     * Setting an empty value allows to disable the trusted header for the given key.
-     *
-     * @param string $key   The header key
-     * @param string $value The header name
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @deprecated since version 3.3, to be removed in 4.0. Use the $trustedHeaderSet argument of the Request::setTrustedProxies() method instead.
-     */
-    public static function setTrustedHeaderName($key, $value)
-    {
-        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the $trustedHeaderSet argument of the Request::setTrustedProxies() method instead.', __METHOD__), E_USER_DEPRECATED);
-
-        if ('forwarded' === $key) {
-            $key = self::HEADER_FORWARDED;
-        } elseif ('client_ip' === $key) {
-            $key = self::HEADER_CLIENT_IP;
-        } elseif ('client_host' === $key) {
-            $key = self::HEADER_CLIENT_HOST;
-        } elseif ('client_proto' === $key) {
-            $key = self::HEADER_CLIENT_PROTO;
-        } elseif ('client_port' === $key) {
-            $key = self::HEADER_CLIENT_PORT;
-        } elseif (!array_key_exists($key, self::$trustedHeaders)) {
-            throw new \InvalidArgumentException(sprintf('Unable to set the trusted header name for key "%s".', $key));
-        }
-
-        self::$trustedHeaders[$key] = $value;
-
-        if (null !== $value) {
-            self::$trustedHeaderNames[$key] = $value;
-            self::$trustedHeaderSet |= $key;
-        } else {
-            self::$trustedHeaderSet &= ~$key;
-        }
-    }
-
-    /**
-     * Gets the trusted proxy header name.
-     *
-     * @param string $key The header key
-     *
-     * @return string The header name
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @deprecated since version 3.3, to be removed in 4.0. Use the Request::getTrustedHeaderSet() method instead.
-     */
-    public static function getTrustedHeaderName($key)
-    {
-        if (2 > func_num_args() || func_get_arg(1)) {
-            @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the Request::getTrustedHeaderSet() method instead.', __METHOD__), E_USER_DEPRECATED);
-        }
-
-        if (!array_key_exists($key, self::$trustedHeaders)) {
-            throw new \InvalidArgumentException(sprintf('Unable to get the trusted header name for key "%s".', $key));
-        }
-
-        return self::$trustedHeaders[$key];
-    }
-
     /**
      * Normalizes a query string.
      *
@@ -745,31 +629,10 @@ class Request
             return '';
         }
 
-        $parts = array();
-        $order = array();
-
-        foreach (explode('&', $qs) as $param) {
-            if ('' === $param || '=' === $param[0]) {
-                // Ignore useless delimiters, e.g. "x=y&".
-                // Also ignore pairs with empty key, even if there was a value, e.g. "=value", as such nameless values cannot be retrieved anyway.
-                // PHP also does not include them when building _GET.
-                continue;
-            }
-
-            $keyValuePair = explode('=', $param, 2);
+        parse_str($qs, $qs);
+        ksort($qs);
 
-            // GET parameters, that are submitted from a HTML form, encode spaces as "+" by default (as defined in enctype application/x-www-form-urlencoded).
-            // PHP also converts "+" to spaces when filling the global _GET or when using the function parse_str. This is why we use urldecode and then normalize to
-            // RFC 3986 with rawurlencode.
-            $parts[] = isset($keyValuePair[1]) ?
-                rawurlencode(urldecode($keyValuePair[0])).'='.rawurlencode(urldecode($keyValuePair[1])) :
-                rawurlencode(urldecode($keyValuePair[0]));
-            $order[] = urldecode($keyValuePair[0]);
-        }
-
-        array_multisort($order, SORT_ASC, $parts);
-
-        return implode('&', $parts);
+        return http_build_query($qs, '', '&', PHP_QUERY_RFC3986);
     }
 
     /**
@@ -836,7 +699,17 @@ class Request
      */
     public function getSession()
     {
-        return $this->session;
+        $session = $this->session;
+        if (!$session instanceof SessionInterface && null !== $session) {
+            $this->setSession($session = $session());
+        }
+
+        if (null === $session) {
+            @trigger_error(sprintf('Calling "%s()" when no session has been set is deprecated since Symfony 4.1 and will throw an exception in 5.0. Use "hasSession()" instead.', __METHOD__), E_USER_DEPRECATED);
+            // throw new \BadMethodCallException('Session has not been set');
+        }
+
+        return $session;
     }
 
     /**
@@ -848,7 +721,7 @@ class Request
     public function hasPreviousSession()
     {
         // the check for $this->session avoids malicious users trying to fake a session cookie with proper name
-        return $this->hasSession() && $this->cookies->has($this->session->getName());
+        return $this->hasSession() && $this->cookies->has($this->getSession()->getName());
     }
 
     /**
@@ -875,6 +748,14 @@ class Request
         $this->session = $session;
     }
 
+    /**
+     * @internal
+     */
+    public function setSessionFactory(callable $factory)
+    {
+        $this->session = $factory;
+    }
+
     /**
      * Returns the client IP addresses.
      *
@@ -896,7 +777,7 @@ class Request
             return array($ip);
         }
 
-        return $this->getTrustedValues(self::HEADER_CLIENT_IP, $ip) ?: array($ip);
+        return $this->getTrustedValues(self::HEADER_X_FORWARDED_FOR, $ip) ?: array($ip);
     }
 
     /**
@@ -908,10 +789,6 @@ class Request
      * being the original client, and each successive proxy that passed the request
      * adding the IP address where it received the request from.
      *
-     * If your reverse proxy uses a different header name than "X-Forwarded-For",
-     * ("Client-Ip" for instance), configure it via the $trustedHeaderSet
-     * argument of the Request::setTrustedProxies() method instead.
-     *
      * @return string|null The client IP address
      *
      * @see getClientIps()
@@ -1015,17 +892,13 @@ class Request
      *
      * The "X-Forwarded-Port" header must contain the client port.
      *
-     * If your reverse proxy uses a different header name than "X-Forwarded-Port",
-     * configure it via via the $trustedHeaderSet argument of the
-     * Request::setTrustedProxies() method instead.
-     *
      * @return int|string can be a string if fetched from the server bag
      */
     public function getPort()
     {
-        if ($this->isFromTrustedProxy() && $host = $this->getTrustedValues(self::HEADER_CLIENT_PORT)) {
+        if ($this->isFromTrustedProxy() && $host = $this->getTrustedValues(self::HEADER_X_FORWARDED_PORT)) {
             $host = $host[0];
-        } elseif ($this->isFromTrustedProxy() && $host = $this->getTrustedValues(self::HEADER_CLIENT_HOST)) {
+        } elseif ($this->isFromTrustedProxy() && $host = $this->getTrustedValues(self::HEADER_X_FORWARDED_HOST)) {
             $host = $host[0];
         } elseif (!$host = $this->headers->get('HOST')) {
             return $this->server->get('SERVER_PORT');
@@ -1186,7 +1059,7 @@ class Request
         }
 
         $sourceDirs = explode('/', isset($basePath[0]) && '/' === $basePath[0] ? substr($basePath, 1) : $basePath);
-        $targetDirs = explode('/', isset($path[0]) && '/' === $path[0] ? substr($path, 1) : $path);
+        $targetDirs = explode('/', substr($path, 1));
         array_pop($sourceDirs);
         $targetFile = array_pop($targetDirs);
 
@@ -1199,7 +1072,7 @@ class Request
         }
 
         $targetDirs[] = $targetFile;
-        $path = str_repeat('../', count($sourceDirs)).implode('/', $targetDirs);
+        $path = str_repeat('../', \count($sourceDirs)).implode('/', $targetDirs);
 
         // A reference to the same base directory or an empty subdirectory must be prefixed with "./".
         // This also applies to a segment with a colon character (e.g., "file:colon") that cannot be used
@@ -1233,16 +1106,12 @@ class Request
      *
      * The "X-Forwarded-Proto" header must contain the protocol: "https" or "http".
      *
-     * If your reverse proxy uses a different header name than "X-Forwarded-Proto"
-     * ("SSL_HTTPS" for instance), configure it via the $trustedHeaderSet
-     * argument of the Request::setTrustedProxies() method instead.
-     *
      * @return bool
      */
     public function isSecure()
     {
-        if ($this->isFromTrustedProxy() && $proto = $this->getTrustedValues(self::HEADER_CLIENT_PROTO)) {
-            return in_array(strtolower($proto[0]), array('https', 'on', 'ssl', '1'), true);
+        if ($this->isFromTrustedProxy() && $proto = $this->getTrustedValues(self::HEADER_X_FORWARDED_PROTO)) {
+            return \in_array(strtolower($proto[0]), array('https', 'on', 'ssl', '1'), true);
         }
 
         $https = $this->server->get('HTTPS');
@@ -1258,17 +1127,13 @@ class Request
      *
      * The "X-Forwarded-Host" header must contain the client host name.
      *
-     * If your reverse proxy uses a different header name than "X-Forwarded-Host",
-     * configure it via the $trustedHeaderSet argument of the
-     * Request::setTrustedProxies() method instead.
-     *
      * @return string
      *
      * @throws SuspiciousOperationException when the host name is invalid or not trusted
      */
     public function getHost()
     {
-        if ($this->isFromTrustedProxy() && $host = $this->getTrustedValues(self::HEADER_CLIENT_HOST)) {
+        if ($this->isFromTrustedProxy() && $host = $this->getTrustedValues(self::HEADER_X_FORWARDED_HOST)) {
             $host = $host[0];
         } elseif (!$host = $this->headers->get('HOST')) {
             if (!$host = $this->server->get('SERVER_NAME')) {
@@ -1292,10 +1157,10 @@ class Request
             throw new SuspiciousOperationException(sprintf('Invalid Host "%s".', $host));
         }
 
-        if (count(self::$trustedHostPatterns) > 0) {
+        if (\count(self::$trustedHostPatterns) > 0) {
             // to avoid host header injection attacks, you should provide a list of trusted host patterns
 
-            if (in_array($host, self::$trustedHosts)) {
+            if (\in_array($host, self::$trustedHosts)) {
                 return $host;
             }
 
@@ -1353,7 +1218,10 @@ class Request
                 if ($method = $this->headers->get('X-HTTP-METHOD-OVERRIDE')) {
                     $this->method = strtoupper($method);
                 } elseif (self::$httpMethodParameterOverride) {
-                    $this->method = strtoupper($this->request->get('_method', $this->query->get('_method', 'POST')));
+                    $method = $this->request->get('_method', $this->query->get('_method', 'POST'));
+                    if (\is_string($method)) {
+                        $this->method = strtoupper($method);
+                    }
                 }
             }
         }
@@ -1424,10 +1292,10 @@ class Request
         }
 
         foreach (static::$formats as $format => $mimeTypes) {
-            if (in_array($mimeType, (array) $mimeTypes)) {
+            if (\in_array($mimeType, (array) $mimeTypes)) {
                 return $format;
             }
-            if (null !== $canonicalMimeType && in_array($canonicalMimeType, (array) $mimeTypes)) {
+            if (null !== $canonicalMimeType && \in_array($canonicalMimeType, (array) $mimeTypes)) {
                 return $format;
             }
         }
@@ -1445,7 +1313,7 @@ class Request
             static::initializeFormats();
         }
 
-        static::$formats[$format] = is_array($mimeTypes) ? $mimeTypes : array($mimeTypes);
+        static::$formats[$format] = \is_array($mimeTypes) ? $mimeTypes : array($mimeTypes);
     }
 
     /**
@@ -1457,7 +1325,7 @@ class Request
      *  * _format request attribute
      *  * $default
      *
-     * @param string $default The default format
+     * @param string|null $default The default format
      *
      * @return string The request format
      */
@@ -1557,15 +1425,12 @@ class Request
      */
     public function isMethodSafe(/* $andCacheable = true */)
     {
-        if (!func_num_args() || func_get_arg(0)) {
-            // This deprecation should be turned into a BadMethodCallException in 4.0 (without adding the argument in the signature)
-            // then setting $andCacheable to false should be deprecated in 4.1
-            @trigger_error('Checking only for cacheable HTTP methods with Symfony\Component\HttpFoundation\Request::isMethodSafe() is deprecated since Symfony 3.2 and will throw an exception in 4.0. Disable checking only for cacheable methods by calling the method with `false` as first argument or use the Request::isMethodCacheable() instead.', E_USER_DEPRECATED);
-
-            return in_array($this->getMethod(), array('GET', 'HEAD'));
+        if (!\func_num_args() || func_get_arg(0)) {
+            // setting $andCacheable to false should be deprecated in 4.1
+            throw new \BadMethodCallException('Checking only for cacheable HTTP methods with Symfony\Component\HttpFoundation\Request::isMethodSafe() is not supported.');
         }
 
-        return in_array($this->getMethod(), array('GET', 'HEAD', 'OPTIONS', 'TRACE'));
+        return \in_array($this->getMethod(), array('GET', 'HEAD', 'OPTIONS', 'TRACE'));
     }
 
     /**
@@ -1575,7 +1440,7 @@ class Request
      */
     public function isMethodIdempotent()
     {
-        return in_array($this->getMethod(), array('HEAD', 'GET', 'PUT', 'DELETE', 'TRACE', 'OPTIONS', 'PURGE'));
+        return \in_array($this->getMethod(), array('HEAD', 'GET', 'PUT', 'DELETE', 'TRACE', 'OPTIONS', 'PURGE'));
     }
 
     /**
@@ -1587,7 +1452,7 @@ class Request
      */
     public function isMethodCacheable()
     {
-        return in_array($this->getMethod(), array('GET', 'HEAD'));
+        return \in_array($this->getMethod(), array('GET', 'HEAD'));
     }
 
     /**
@@ -1625,10 +1490,7 @@ class Request
      */
     public function getContent($asResource = false)
     {
-        $currentContentIsResource = is_resource($this->content);
-        if (\PHP_VERSION_ID < 50600 && false === $this->content) {
-            throw new \LogicException('getContent() can only be called once when using the resource return type and PHP below 5.6.');
-        }
+        $currentContentIsResource = \is_resource($this->content);
 
         if (true === $asResource) {
             if ($currentContentIsResource) {
@@ -1638,7 +1500,7 @@ class Request
             }
 
             // Content passed in parameter (test)
-            if (is_string($this->content)) {
+            if (\is_string($this->content)) {
                 $resource = fopen('php://temp', 'r+');
                 fwrite($resource, $this->content);
                 rewind($resource);
@@ -1706,7 +1568,7 @@ class Request
             $extendedPreferredLanguages[] = $language;
             if (false !== $position = strpos($language, '_')) {
                 $superLanguage = substr($language, 0, $position);
-                if (!in_array($superLanguage, $preferredLanguages)) {
+                if (!\in_array($superLanguage, $preferredLanguages)) {
                     $extendedPreferredLanguages[] = $superLanguage;
                 }
             }
@@ -1737,11 +1599,11 @@ class Request
                     // Language not listed in ISO 639 that are not variants
                     // of any listed language, which can be registered with the
                     // i-prefix, such as i-cherokee
-                    if (count($codes) > 1) {
+                    if (\count($codes) > 1) {
                         $lang = $codes[1];
                     }
                 } else {
-                    for ($i = 0, $max = count($codes); $i < $max; ++$i) {
+                    for ($i = 0, $max = \count($codes); $i < $max; ++$i) {
                         if (0 === $i) {
                             $lang = strtolower($codes[0]);
                         } else {
@@ -1826,18 +1688,7 @@ class Request
     {
         $requestUri = '';
 
-        if ($this->headers->has('X_ORIGINAL_URL')) {
-            // IIS with Microsoft Rewrite Module
-            $requestUri = $this->headers->get('X_ORIGINAL_URL');
-            $this->headers->remove('X_ORIGINAL_URL');
-            $this->server->remove('HTTP_X_ORIGINAL_URL');
-            $this->server->remove('UNENCODED_URL');
-            $this->server->remove('IIS_WasUrlRewritten');
-        } elseif ($this->headers->has('X_REWRITE_URL')) {
-            // IIS with ISAPI_Rewrite
-            $requestUri = $this->headers->get('X_REWRITE_URL');
-            $this->headers->remove('X_REWRITE_URL');
-        } elseif ('1' == $this->server->get('IIS_WasUrlRewritten') && '' != $this->server->get('UNENCODED_URL')) {
+        if ('1' == $this->server->get('IIS_WasUrlRewritten') && '' != $this->server->get('UNENCODED_URL')) {
             // IIS7 with URL Rewrite: make sure we get the unencoded URL (double slash problem)
             $requestUri = $this->server->get('UNENCODED_URL');
             $this->server->remove('UNENCODED_URL');
@@ -1847,7 +1698,7 @@ class Request
             // HTTP proxy reqs setup request URI with scheme and host [and port] + the URL path, only use URL path
             $schemeAndHttpHost = $this->getSchemeAndHttpHost();
             if (0 === strpos($requestUri, $schemeAndHttpHost)) {
-                $requestUri = substr($requestUri, strlen($schemeAndHttpHost));
+                $requestUri = substr($requestUri, \strlen($schemeAndHttpHost));
             }
         } elseif ($this->server->has('ORIG_PATH_INFO')) {
             // IIS 5.0, PHP as CGI
@@ -1887,7 +1738,7 @@ class Request
             $segs = explode('/', trim($file, '/'));
             $segs = array_reverse($segs);
             $index = 0;
-            $last = count($segs);
+            $last = \count($segs);
             $baseUrl = '';
             do {
                 $seg = $segs[$index];
@@ -1907,9 +1758,9 @@ class Request
             return $prefix;
         }
 
-        if ($baseUrl && false !== $prefix = $this->getUrlencodedPrefix($requestUri, rtrim(dirname($baseUrl), '/'.DIRECTORY_SEPARATOR).'/')) {
+        if ($baseUrl && false !== $prefix = $this->getUrlencodedPrefix($requestUri, rtrim(\dirname($baseUrl), '/'.\DIRECTORY_SEPARATOR).'/')) {
             // directory portion of $baseUrl matches
-            return rtrim($prefix, '/'.DIRECTORY_SEPARATOR);
+            return rtrim($prefix, '/'.\DIRECTORY_SEPARATOR);
         }
 
         $truncatedRequestUri = $requestUri;
@@ -1926,11 +1777,11 @@ class Request
         // If using mod_rewrite or ISAPI_Rewrite strip the script filename
         // out of baseUrl. $pos !== 0 makes sure it is not matching a value
         // from PATH_INFO or QUERY_STRING
-        if (strlen($requestUri) >= strlen($baseUrl) && (false !== $pos = strpos($requestUri, $baseUrl)) && 0 !== $pos) {
-            $baseUrl = substr($requestUri, 0, $pos + strlen($baseUrl));
+        if (\strlen($requestUri) >= \strlen($baseUrl) && (false !== $pos = strpos($requestUri, $baseUrl)) && 0 !== $pos) {
+            $baseUrl = substr($requestUri, 0, $pos + \strlen($baseUrl));
         }
 
-        return rtrim($baseUrl, '/'.DIRECTORY_SEPARATOR);
+        return rtrim($baseUrl, '/'.\DIRECTORY_SEPARATOR);
     }
 
     /**
@@ -1947,12 +1798,12 @@ class Request
 
         $filename = basename($this->server->get('SCRIPT_FILENAME'));
         if (basename($baseUrl) === $filename) {
-            $basePath = dirname($baseUrl);
+            $basePath = \dirname($baseUrl);
         } else {
             $basePath = $baseUrl;
         }
 
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $basePath = str_replace('\\', '/', $basePath);
         }
 
@@ -1982,7 +1833,7 @@ class Request
             return $requestUri;
         }
 
-        $pathInfo = substr($requestUri, strlen($baseUrl));
+        $pathInfo = substr($requestUri, \strlen($baseUrl));
         if (false === $pathInfo || '' === $pathInfo) {
             // If substr() returns false then PATH_INFO is set to an empty string
             return '/';
@@ -2011,12 +1862,7 @@ class Request
         );
     }
 
-    /**
-     * Sets the default PHP locale.
-     *
-     * @param string $locale
-     */
-    private function setPhpDefaultLocale($locale)
+    private function setPhpDefaultLocale(string $locale)
     {
         // if either the class Locale doesn't exist, or an exception is thrown when
         // setting the default locale, the intl module is not installed, and
@@ -2033,18 +1879,15 @@ class Request
      * Returns the prefix as encoded in the string when the string starts with
      * the given prefix, false otherwise.
      *
-     * @param string $string The urlencoded string
-     * @param string $prefix The prefix not encoded
-     *
      * @return string|false The prefix as it is encoded in $string, or false
      */
-    private function getUrlencodedPrefix($string, $prefix)
+    private function getUrlencodedPrefix(string $string, string $prefix)
     {
         if (0 !== strpos(rawurldecode($string), $prefix)) {
             return false;
         }
 
-        $len = strlen($prefix);
+        $len = \strlen($prefix);
 
         if (preg_match(sprintf('#^(%%[[:xdigit:]]{2}|.){%d}#', $len), $string, $match)) {
             return $match[0];
@@ -2056,7 +1899,7 @@ class Request
     private static function createRequestFromFactory(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null)
     {
         if (self::$requestFactory) {
-            $request = call_user_func(self::$requestFactory, $query, $request, $attributes, $cookies, $files, $server, $content);
+            $request = \call_user_func(self::$requestFactory, $query, $request, $attributes, $cookies, $files, $server, $content);
 
             if (!$request instanceof self) {
                 throw new \LogicException('The Request factory must return an instance of Symfony\Component\HttpFoundation\Request.');
@@ -2086,15 +1929,29 @@ class Request
         $clientValues = array();
         $forwardedValues = array();
 
-        if (self::$trustedHeaders[$type] && $this->headers->has(self::$trustedHeaders[$type])) {
+        if ((self::$trustedHeaderSet & $type) && $this->headers->has(self::$trustedHeaders[$type])) {
             foreach (explode(',', $this->headers->get(self::$trustedHeaders[$type])) as $v) {
-                $clientValues[] = (self::HEADER_CLIENT_PORT === $type ? '0.0.0.0:' : '').trim($v);
+                $clientValues[] = (self::HEADER_X_FORWARDED_PORT === $type ? '0.0.0.0:' : '').trim($v);
             }
         }
 
-        if (self::$trustedHeaders[self::HEADER_FORWARDED] && $this->headers->has(self::$trustedHeaders[self::HEADER_FORWARDED])) {
-            $forwardedValues = $this->headers->get(self::$trustedHeaders[self::HEADER_FORWARDED]);
-            $forwardedValues = preg_match_all(sprintf('{(?:%s)=(?:"?\[?)([a-zA-Z0-9\.:_\-/]*+)}', self::$forwardedParams[$type]), $forwardedValues, $matches) ? $matches[1] : array();
+        if ((self::$trustedHeaderSet & self::HEADER_FORWARDED) && $this->headers->has(self::$trustedHeaders[self::HEADER_FORWARDED])) {
+            $forwarded = $this->headers->get(self::$trustedHeaders[self::HEADER_FORWARDED]);
+            $parts = HeaderUtils::split($forwarded, ',;=');
+            $forwardedValues = array();
+            $param = self::$forwardedParams[$type];
+            foreach ($parts as $subParts) {
+                if (null === $v = HeaderUtils::combine($subParts)[$param] ?? null) {
+                    continue;
+                }
+                if (self::HEADER_X_FORWARDED_PORT === $type) {
+                    if (']' === substr($v, -1) || false === $v = strrchr($v, ':')) {
+                        $v = $this->isSecure() ? ':443' : ':80';
+                    }
+                    $v = '0.0.0.0'.$v;
+                }
+                $forwardedValues[] = $v;
+            }
         }
 
         if (null !== $ip) {
@@ -2127,9 +1984,17 @@ class Request
         $firstTrustedIp = null;
 
         foreach ($clientIps as $key => $clientIp) {
-            // Remove port (unfortunately, it does happen)
-            if (preg_match('{((?:\d+\.){3}\d+)\:\d+}', $clientIp, $match)) {
-                $clientIps[$key] = $clientIp = $match[1];
+            if (strpos($clientIp, '.')) {
+                // Strip :port from IPv4 addresses. This is allowed in Forwarded
+                // and may occur in X-Forwarded-For.
+                $i = strpos($clientIp, ':');
+                if ($i) {
+                    $clientIps[$key] = $clientIp = substr($clientIp, 0, $i);
+                }
+            } elseif (0 === strpos($clientIp, '[')) {
+                // Strip brackets and :port from IPv6 addresses.
+                $i = strpos($clientIp, ']', 1);
+                $clientIps[$key] = $clientIp = substr($clientIp, 1, $i - 1);
             }
 
             if (!filter_var($clientIp, FILTER_VALIDATE_IP)) {
diff --git a/vendor/symfony/http-foundation/RequestMatcher.php b/vendor/symfony/http-foundation/RequestMatcher.php
index 076d077c..57fa48e4 100644
--- a/vendor/symfony/http-foundation/RequestMatcher.php
+++ b/vendor/symfony/http-foundation/RequestMatcher.php
@@ -56,7 +56,7 @@ class RequestMatcher implements RequestMatcherInterface
      * @param array                $attributes
      * @param string|string[]|null $schemes
      */
-    public function __construct($path = null, $host = null, $methods = null, $ips = null, array $attributes = array(), $schemes = null)
+    public function __construct(string $path = null, string $host = null, $methods = null, $ips = null, array $attributes = array(), $schemes = null)
     {
         $this->matchPath($path);
         $this->matchHost($host);
@@ -145,11 +145,11 @@ class RequestMatcher implements RequestMatcherInterface
      */
     public function matches(Request $request)
     {
-        if ($this->schemes && !in_array($request->getScheme(), $this->schemes, true)) {
+        if ($this->schemes && !\in_array($request->getScheme(), $this->schemes, true)) {
             return false;
         }
 
-        if ($this->methods && !in_array($request->getMethod(), $this->methods, true)) {
+        if ($this->methods && !\in_array($request->getMethod(), $this->methods, true)) {
             return false;
         }
 
@@ -173,6 +173,6 @@ class RequestMatcher implements RequestMatcherInterface
 
         // Note to future implementors: add additional checks above the
         // foreach above or else your check might not be run!
-        return 0 === count($this->ips);
+        return 0 === \count($this->ips);
     }
 }
diff --git a/vendor/symfony/http-foundation/RequestStack.php b/vendor/symfony/http-foundation/RequestStack.php
index 3d9cfd0c..40123f66 100644
--- a/vendor/symfony/http-foundation/RequestStack.php
+++ b/vendor/symfony/http-foundation/RequestStack.php
@@ -92,7 +92,7 @@ class RequestStack
      */
     public function getParentRequest()
     {
-        $pos = count($this->requests) - 2;
+        $pos = \count($this->requests) - 2;
 
         if (!isset($this->requests[$pos])) {
             return;
diff --git a/vendor/symfony/http-foundation/Response.php b/vendor/symfony/http-foundation/Response.php
index e05194b0..7f6ae7cd 100644
--- a/vendor/symfony/http-foundation/Response.php
+++ b/vendor/symfony/http-foundation/Response.php
@@ -64,7 +64,12 @@ class Response
     const HTTP_UNPROCESSABLE_ENTITY = 422;                                        // RFC4918
     const HTTP_LOCKED = 423;                                                      // RFC4918
     const HTTP_FAILED_DEPENDENCY = 424;                                           // RFC4918
+
+    /**
+     * @deprecated
+     */
     const HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL = 425;   // RFC2817
+    const HTTP_TOO_EARLY = 425;                                                   // RFC-ietf-httpbis-replay-04
     const HTTP_UPGRADE_REQUIRED = 426;                                            // RFC2817
     const HTTP_PRECONDITION_REQUIRED = 428;                                       // RFC6585
     const HTTP_TOO_MANY_REQUESTS = 429;                                           // RFC6585
@@ -169,7 +174,7 @@ class Response
         422 => 'Unprocessable Entity',                                        // RFC4918
         423 => 'Locked',                                                      // RFC4918
         424 => 'Failed Dependency',                                           // RFC4918
-        425 => 'Reserved for WebDAV advanced collections expired proposal',   // RFC2817
+        425 => 'Too Early',                                                   // RFC-ietf-httpbis-replay-04
         426 => 'Upgrade Required',                                            // RFC2817
         428 => 'Precondition Required',                                       // RFC6585
         429 => 'Too Many Requests',                                           // RFC6585
@@ -189,13 +194,9 @@ class Response
     );
 
     /**
-     * @param mixed $content The response content, see setContent()
-     * @param int   $status  The response status code
-     * @param array $headers An array of response headers
-     *
      * @throws \InvalidArgumentException When the HTTP status code is not valid
      */
-    public function __construct($content = '', $status = 200, $headers = array())
+    public function __construct($content = '', int $status = 200, array $headers = array())
     {
         $this->headers = new ResponseHeaderBag($headers);
         $this->setContent($content);
@@ -328,12 +329,17 @@ class Response
         }
 
         // headers
-        foreach ($this->headers->allPreserveCase() as $name => $values) {
+        foreach ($this->headers->allPreserveCaseWithoutCookies() as $name => $values) {
             foreach ($values as $value) {
                 header($name.': '.$value, false, $this->statusCode);
             }
         }
 
+        // cookies
+        foreach ($this->headers->getCookies() as $cookie) {
+            header('Set-Cookie: '.$cookie->getName().strstr($cookie, '='), false, $this->statusCode);
+        }
+
         // status
         header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText), true, $this->statusCode);
 
@@ -362,9 +368,9 @@ class Response
         $this->sendHeaders();
         $this->sendContent();
 
-        if (function_exists('fastcgi_finish_request')) {
+        if (\function_exists('fastcgi_finish_request')) {
             fastcgi_finish_request();
-        } elseif (!\in_array(PHP_SAPI, array('cli', 'phpdbg'), true)) {
+        } elseif (!\in_array(\PHP_SAPI, array('cli', 'phpdbg'), true)) {
             static::closeOutputBuffers(0, true);
         }
 
@@ -384,8 +390,8 @@ class Response
      */
     public function setContent($content)
     {
-        if (null !== $content && !is_string($content) && !is_numeric($content) && !is_callable(array($content, '__toString'))) {
-            throw new \UnexpectedValueException(sprintf('The Response content must be a string or object implementing __toString(), "%s" given.', gettype($content)));
+        if (null !== $content && !\is_string($content) && !is_numeric($content) && !\is_callable(array($content, '__toString'))) {
+            throw new \UnexpectedValueException(sprintf('The Response content must be a string or object implementing __toString(), "%s" given.', \gettype($content)));
         }
 
         $this->content = (string) $content;
@@ -406,13 +412,11 @@ class Response
     /**
      * Sets the HTTP protocol version (1.0 or 1.1).
      *
-     * @param string $version The HTTP protocol version
-     *
      * @return $this
      *
-     * @final since version 3.2
+     * @final
      */
-    public function setProtocolVersion($version)
+    public function setProtocolVersion(string $version)
     {
         $this->version = $version;
 
@@ -422,11 +426,9 @@ class Response
     /**
      * Gets the HTTP protocol version.
      *
-     * @return string The HTTP protocol version
-     *
-     * @final since version 3.2
+     * @final
      */
-    public function getProtocolVersion()
+    public function getProtocolVersion(): string
     {
         return $this->version;
     }
@@ -437,18 +439,15 @@ class Response
      * If the status text is null it will be automatically populated for the known
      * status codes and left empty otherwise.
      *
-     * @param int   $code HTTP status code
-     * @param mixed $text HTTP status text
-     *
      * @return $this
      *
      * @throws \InvalidArgumentException When the HTTP status code is not valid
      *
-     * @final since version 3.2
+     * @final
      */
-    public function setStatusCode($code, $text = null)
+    public function setStatusCode(int $code, $text = null)
     {
-        $this->statusCode = $code = (int) $code;
+        $this->statusCode = $code;
         if ($this->isInvalid()) {
             throw new \InvalidArgumentException(sprintf('The HTTP status code "%s" is not valid.', $code));
         }
@@ -473,11 +472,9 @@ class Response
     /**
      * Retrieves the status code for the current web response.
      *
-     * @return int Status code
-     *
-     * @final since version 3.2
+     * @final
      */
-    public function getStatusCode()
+    public function getStatusCode(): int
     {
         return $this->statusCode;
     }
@@ -485,13 +482,11 @@ class Response
     /**
      * Sets the response charset.
      *
-     * @param string $charset Character set
-     *
      * @return $this
      *
-     * @final since version 3.2
+     * @final
      */
-    public function setCharset($charset)
+    public function setCharset(string $charset)
     {
         $this->charset = $charset;
 
@@ -501,11 +496,9 @@ class Response
     /**
      * Retrieves the response charset.
      *
-     * @return string Character set
-     *
-     * @final since version 3.2
+     * @final
      */
-    public function getCharset()
+    public function getCharset(): ?string
     {
         return $this->charset;
     }
@@ -525,13 +518,11 @@ class Response
      * can be reused by a cache with heuristic expiration unless otherwise indicated"
      * (https://tools.ietf.org/html/rfc7231#section-6.1)
      *
-     * @return bool true if the response is worth caching, false otherwise
-     *
-     * @final since version 3.3
+     * @final
      */
-    public function isCacheable()
+    public function isCacheable(): bool
     {
-        if (!in_array($this->statusCode, array(200, 203, 300, 301, 302, 404, 410))) {
+        if (!\in_array($this->statusCode, array(200, 203, 300, 301, 302, 404, 410))) {
             return false;
         }
 
@@ -549,11 +540,9 @@ class Response
      * origin. A response is considered fresh when it includes a Cache-Control/max-age
      * indicator or Expires header and the calculated age is less than the freshness lifetime.
      *
-     * @return bool true if the response is fresh, false otherwise
-     *
-     * @final since version 3.3
+     * @final
      */
-    public function isFresh()
+    public function isFresh(): bool
     {
         return $this->getTtl() > 0;
     }
@@ -562,11 +551,9 @@ class Response
      * Returns true if the response includes headers that can be used to validate
      * the response with the origin server using a conditional GET request.
      *
-     * @return bool true if the response is validateable, false otherwise
-     *
-     * @final since version 3.3
+     * @final
      */
-    public function isValidateable()
+    public function isValidateable(): bool
     {
         return $this->headers->has('Last-Modified') || $this->headers->has('ETag');
     }
@@ -578,7 +565,7 @@ class Response
      *
      * @return $this
      *
-     * @final since version 3.2
+     * @final
      */
     public function setPrivate()
     {
@@ -595,7 +582,7 @@ class Response
      *
      * @return $this
      *
-     * @final since version 3.2
+     * @final
      */
     public function setPublic()
     {
@@ -608,13 +595,11 @@ class Response
     /**
      * Marks the response as "immutable".
      *
-     * @param bool $immutable enables or disables the immutable directive
-     *
      * @return $this
      *
      * @final
      */
-    public function setImmutable($immutable = true)
+    public function setImmutable(bool $immutable = true)
     {
         if ($immutable) {
             $this->headers->addCacheControlDirective('immutable');
@@ -628,11 +613,9 @@ class Response
     /**
      * Returns true if the response is marked as "immutable".
      *
-     * @return bool returns true if the response is marked as "immutable"; otherwise false
-     *
      * @final
      */
-    public function isImmutable()
+    public function isImmutable(): bool
     {
         return $this->headers->hasCacheControlDirective('immutable');
     }
@@ -645,11 +628,9 @@ class Response
      * When present, the TTL of the response should not be overridden to be
      * greater than the value provided by the origin.
      *
-     * @return bool true if the response must be revalidated by a cache, false otherwise
-     *
-     * @final since version 3.3
+     * @final
      */
-    public function mustRevalidate()
+    public function mustRevalidate(): bool
     {
         return $this->headers->hasCacheControlDirective('must-revalidate') || $this->headers->hasCacheControlDirective('proxy-revalidate');
     }
@@ -657,13 +638,11 @@ class Response
     /**
      * Returns the Date header as a DateTime instance.
      *
-     * @return \DateTime A \DateTime instance
-     *
      * @throws \RuntimeException When the header is not parseable
      *
-     * @final since version 3.2
+     * @final
      */
-    public function getDate()
+    public function getDate(): ?\DateTimeInterface
     {
         return $this->headers->getDate('Date');
     }
@@ -673,24 +652,26 @@ class Response
      *
      * @return $this
      *
-     * @final since version 3.2
+     * @final
      */
-    public function setDate(\DateTime $date)
+    public function setDate(\DateTimeInterface $date)
     {
-        $date->setTimezone(new \DateTimeZone('UTC'));
+        if ($date instanceof \DateTime) {
+            $date = \DateTimeImmutable::createFromMutable($date);
+        }
+
+        $date = $date->setTimezone(new \DateTimeZone('UTC'));
         $this->headers->set('Date', $date->format('D, d M Y H:i:s').' GMT');
 
         return $this;
     }
 
     /**
-     * Returns the age of the response.
+     * Returns the age of the response in seconds.
      *
-     * @return int The age of the response in seconds
-     *
-     * @final since version 3.2
+     * @final
      */
-    public function getAge()
+    public function getAge(): int
     {
         if (null !== $age = $this->headers->get('Age')) {
             return (int) $age;
@@ -708,6 +689,7 @@ class Response
     {
         if ($this->isFresh()) {
             $this->headers->set('Age', $this->getMaxAge());
+            $this->headers->remove('Expires');
         }
 
         return $this;
@@ -716,17 +698,15 @@ class Response
     /**
      * Returns the value of the Expires header as a DateTime instance.
      *
-     * @return \DateTime|null A DateTime instance or null if the header does not exist
-     *
-     * @final since version 3.2
+     * @final
      */
-    public function getExpires()
+    public function getExpires(): ?\DateTimeInterface
     {
         try {
             return $this->headers->getDate('Expires');
         } catch (\RuntimeException $e) {
             // according to RFC 2616 invalid date formats (e.g. "0" and "-1") must be treated as in the past
-            return \DateTime::createFromFormat(DATE_RFC2822, 'Sat, 01 Jan 00 00:00:00 +0000');
+            return \DateTime::createFromFormat('U', time() - 172800);
         }
     }
 
@@ -735,22 +715,25 @@ class Response
      *
      * Passing null as value will remove the header.
      *
-     * @param \DateTime|null $date A \DateTime instance or null to remove the header
-     *
      * @return $this
      *
-     * @final since version 3.2
+     * @final
      */
-    public function setExpires(\DateTime $date = null)
+    public function setExpires(\DateTimeInterface $date = null)
     {
         if (null === $date) {
             $this->headers->remove('Expires');
-        } else {
-            $date = clone $date;
-            $date->setTimezone(new \DateTimeZone('UTC'));
-            $this->headers->set('Expires', $date->format('D, d M Y H:i:s').' GMT');
+
+            return $this;
+        }
+
+        if ($date instanceof \DateTime) {
+            $date = \DateTimeImmutable::createFromMutable($date);
         }
 
+        $date = $date->setTimezone(new \DateTimeZone('UTC'));
+        $this->headers->set('Expires', $date->format('D, d M Y H:i:s').' GMT');
+
         return $this;
     }
 
@@ -761,11 +744,9 @@ class Response
      * First, it checks for a s-maxage directive, then a max-age directive, and then it falls
      * back on an expires header. It returns null when no maximum age can be established.
      *
-     * @return int|null Number of seconds
-     *
-     * @final since version 3.2
+     * @final
      */
-    public function getMaxAge()
+    public function getMaxAge(): ?int
     {
         if ($this->headers->hasCacheControlDirective('s-maxage')) {
             return (int) $this->headers->getCacheControlDirective('s-maxage');
@@ -776,8 +757,10 @@ class Response
         }
 
         if (null !== $this->getExpires()) {
-            return $this->getExpires()->format('U') - $this->getDate()->format('U');
+            return (int) ($this->getExpires()->format('U') - $this->getDate()->format('U'));
         }
+
+        return null;
     }
 
     /**
@@ -785,13 +768,11 @@ class Response
      *
      * This methods sets the Cache-Control max-age directive.
      *
-     * @param int $value Number of seconds
-     *
      * @return $this
      *
-     * @final since version 3.2
+     * @final
      */
-    public function setMaxAge($value)
+    public function setMaxAge(int $value)
     {
         $this->headers->addCacheControlDirective('max-age', $value);
 
@@ -803,13 +784,11 @@ class Response
      *
      * This methods sets the Cache-Control s-maxage directive.
      *
-     * @param int $value Number of seconds
-     *
      * @return $this
      *
-     * @final since version 3.2
+     * @final
      */
-    public function setSharedMaxAge($value)
+    public function setSharedMaxAge(int $value)
     {
         $this->setPublic();
         $this->headers->addCacheControlDirective('s-maxage', $value);
@@ -825,29 +804,25 @@ class Response
      * When the responses TTL is <= 0, the response may not be served from cache without first
      * revalidating with the origin.
      *
-     * @return int|null The TTL in seconds
-     *
-     * @final since version 3.2
+     * @final
      */
-    public function getTtl()
+    public function getTtl(): ?int
     {
-        if (null !== $maxAge = $this->getMaxAge()) {
-            return $maxAge - $this->getAge();
-        }
+        $maxAge = $this->getMaxAge();
+
+        return null !== $maxAge ? $maxAge - $this->getAge() : null;
     }
 
     /**
-     * Sets the response's time-to-live for shared caches.
+     * Sets the response's time-to-live for shared caches in seconds.
      *
      * This method adjusts the Cache-Control/s-maxage directive.
      *
-     * @param int $seconds Number of seconds
-     *
      * @return $this
      *
-     * @final since version 3.2
+     * @final
      */
-    public function setTtl($seconds)
+    public function setTtl(int $seconds)
     {
         $this->setSharedMaxAge($this->getAge() + $seconds);
 
@@ -855,17 +830,15 @@ class Response
     }
 
     /**
-     * Sets the response's time-to-live for private/client caches.
+     * Sets the response's time-to-live for private/client caches in seconds.
      *
      * This method adjusts the Cache-Control/max-age directive.
      *
-     * @param int $seconds Number of seconds
-     *
      * @return $this
      *
-     * @final since version 3.2
+     * @final
      */
-    public function setClientTtl($seconds)
+    public function setClientTtl(int $seconds)
     {
         $this->setMaxAge($this->getAge() + $seconds);
 
@@ -875,13 +848,11 @@ class Response
     /**
      * Returns the Last-Modified HTTP header as a DateTime instance.
      *
-     * @return \DateTime|null A DateTime instance or null if the header does not exist
-     *
      * @throws \RuntimeException When the HTTP header is not parseable
      *
-     * @final since version 3.2
+     * @final
      */
-    public function getLastModified()
+    public function getLastModified(): ?\DateTimeInterface
     {
         return $this->headers->getDate('Last-Modified');
     }
@@ -891,33 +862,34 @@ class Response
      *
      * Passing null as value will remove the header.
      *
-     * @param \DateTime|null $date A \DateTime instance or null to remove the header
-     *
      * @return $this
      *
-     * @final since version 3.2
+     * @final
      */
-    public function setLastModified(\DateTime $date = null)
+    public function setLastModified(\DateTimeInterface $date = null)
     {
         if (null === $date) {
             $this->headers->remove('Last-Modified');
-        } else {
-            $date = clone $date;
-            $date->setTimezone(new \DateTimeZone('UTC'));
-            $this->headers->set('Last-Modified', $date->format('D, d M Y H:i:s').' GMT');
+
+            return $this;
+        }
+
+        if ($date instanceof \DateTime) {
+            $date = \DateTimeImmutable::createFromMutable($date);
         }
 
+        $date = $date->setTimezone(new \DateTimeZone('UTC'));
+        $this->headers->set('Last-Modified', $date->format('D, d M Y H:i:s').' GMT');
+
         return $this;
     }
 
     /**
      * Returns the literal value of the ETag HTTP header.
      *
-     * @return string|null The ETag HTTP header or null if it does not exist
-     *
-     * @final since version 3.2
+     * @final
      */
-    public function getEtag()
+    public function getEtag(): ?string
     {
         return $this->headers->get('ETag');
     }
@@ -930,9 +902,9 @@ class Response
      *
      * @return $this
      *
-     * @final since version 3.2
+     * @final
      */
-    public function setEtag($etag = null, $weak = false)
+    public function setEtag(string $etag = null, bool $weak = false)
     {
         if (null === $etag) {
             $this->headers->remove('Etag');
@@ -952,13 +924,11 @@ class Response
      *
      * Available options are: etag, last_modified, max_age, s_maxage, private, public and immutable.
      *
-     * @param array $options An array of cache options
-     *
      * @return $this
      *
      * @throws \InvalidArgumentException
      *
-     * @final since version 3.3
+     * @final
      */
     public function setCache(array $options)
     {
@@ -1015,7 +985,7 @@ class Response
      *
      * @see http://tools.ietf.org/html/rfc2616#section-10.3.5
      *
-     * @final since version 3.3
+     * @final
      */
     public function setNotModified()
     {
@@ -1033,11 +1003,9 @@ class Response
     /**
      * Returns true if the response includes a Vary header.
      *
-     * @return bool true if the response includes a Vary header, false otherwise
-     *
-     * @final since version 3.2
+     * @final
      */
-    public function hasVary()
+    public function hasVary(): bool
     {
         return null !== $this->headers->get('Vary');
     }
@@ -1045,11 +1013,9 @@ class Response
     /**
      * Returns an array of header names given in the Vary header.
      *
-     * @return array An array of Vary names
-     *
-     * @final since version 3.2
+     * @final
      */
-    public function getVary()
+    public function getVary(): array
     {
         if (!$vary = $this->headers->get('Vary', null, false)) {
             return array();
@@ -1071,9 +1037,9 @@ class Response
      *
      * @return $this
      *
-     * @final since version 3.2
+     * @final
      */
-    public function setVary($headers, $replace = true)
+    public function setVary($headers, bool $replace = true)
     {
         $this->headers->set('Vary', $headers, $replace);
 
@@ -1089,9 +1055,9 @@ class Response
      *
      * @return bool true if the Response validators match the Request, false otherwise
      *
-     * @final since version 3.3
+     * @final
      */
-    public function isNotModified(Request $request)
+    public function isNotModified(Request $request): bool
     {
         if (!$request->isMethodCacheable()) {
             return false;
@@ -1102,7 +1068,7 @@ class Response
         $modifiedSince = $request->headers->get('If-Modified-Since');
 
         if ($etags = $request->getETags()) {
-            $notModified = in_array($this->getEtag(), $etags) || in_array('*', $etags);
+            $notModified = \in_array($this->getEtag(), $etags) || \in_array('*', $etags);
         }
 
         if ($modifiedSince && $lastModified) {
@@ -1119,13 +1085,11 @@ class Response
     /**
      * Is response invalid?
      *
-     * @return bool
-     *
      * @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
      *
-     * @final since version 3.2
+     * @final
      */
-    public function isInvalid()
+    public function isInvalid(): bool
     {
         return $this->statusCode < 100 || $this->statusCode >= 600;
     }
@@ -1133,11 +1097,9 @@ class Response
     /**
      * Is response informative?
      *
-     * @return bool
-     *
-     * @final since version 3.3
+     * @final
      */
-    public function isInformational()
+    public function isInformational(): bool
     {
         return $this->statusCode >= 100 && $this->statusCode < 200;
     }
@@ -1145,11 +1107,9 @@ class Response
     /**
      * Is response successful?
      *
-     * @return bool
-     *
-     * @final since version 3.2
+     * @final
      */
-    public function isSuccessful()
+    public function isSuccessful(): bool
     {
         return $this->statusCode >= 200 && $this->statusCode < 300;
     }
@@ -1157,11 +1117,9 @@ class Response
     /**
      * Is the response a redirect?
      *
-     * @return bool
-     *
-     * @final since version 3.2
+     * @final
      */
-    public function isRedirection()
+    public function isRedirection(): bool
     {
         return $this->statusCode >= 300 && $this->statusCode < 400;
     }
@@ -1169,11 +1127,9 @@ class Response
     /**
      * Is there a client error?
      *
-     * @return bool
-     *
-     * @final since version 3.2
+     * @final
      */
-    public function isClientError()
+    public function isClientError(): bool
     {
         return $this->statusCode >= 400 && $this->statusCode < 500;
     }
@@ -1181,11 +1137,9 @@ class Response
     /**
      * Was there a server side error?
      *
-     * @return bool
-     *
-     * @final since version 3.3
+     * @final
      */
-    public function isServerError()
+    public function isServerError(): bool
     {
         return $this->statusCode >= 500 && $this->statusCode < 600;
     }
@@ -1193,11 +1147,9 @@ class Response
     /**
      * Is the response OK?
      *
-     * @return bool
-     *
-     * @final since version 3.2
+     * @final
      */
-    public function isOk()
+    public function isOk(): bool
     {
         return 200 === $this->statusCode;
     }
@@ -1205,11 +1157,9 @@ class Response
     /**
      * Is the response forbidden?
      *
-     * @return bool
-     *
-     * @final since version 3.2
+     * @final
      */
-    public function isForbidden()
+    public function isForbidden(): bool
     {
         return 403 === $this->statusCode;
     }
@@ -1217,11 +1167,9 @@ class Response
     /**
      * Is the response a not found error?
      *
-     * @return bool
-     *
-     * @final since version 3.2
+     * @final
      */
-    public function isNotFound()
+    public function isNotFound(): bool
     {
         return 404 === $this->statusCode;
     }
@@ -1229,27 +1177,21 @@ class Response
     /**
      * Is the response a redirect of some form?
      *
-     * @param string $location
-     *
-     * @return bool
-     *
-     * @final since version 3.2
+     * @final
      */
-    public function isRedirect($location = null)
+    public function isRedirect(string $location = null): bool
     {
-        return in_array($this->statusCode, array(201, 301, 302, 303, 307, 308)) && (null === $location ?: $location == $this->headers->get('Location'));
+        return \in_array($this->statusCode, array(201, 301, 302, 303, 307, 308)) && (null === $location ?: $location == $this->headers->get('Location'));
     }
 
     /**
      * Is the response empty?
      *
-     * @return bool
-     *
-     * @final since version 3.2
+     * @final
      */
-    public function isEmpty()
+    public function isEmpty(): bool
     {
-        return in_array($this->statusCode, array(204, 304));
+        return \in_array($this->statusCode, array(204, 304));
     }
 
     /**
@@ -1257,17 +1199,13 @@ class Response
      *
      * Resulting level can be greater than target level if a non-removable buffer has been encountered.
      *
-     * @param int  $targetLevel The target output buffering level
-     * @param bool $flush       Whether to flush or clean the buffers
-     *
-     * @final since version 3.3
+     * @final
      */
-    public static function closeOutputBuffers($targetLevel, $flush)
+    public static function closeOutputBuffers(int $targetLevel, bool $flush)
     {
         $status = ob_get_status(true);
-        $level = count($status);
-        // PHP_OUTPUT_HANDLER_* are not defined on HHVM 3.3
-        $flags = defined('PHP_OUTPUT_HANDLER_REMOVABLE') ? PHP_OUTPUT_HANDLER_REMOVABLE | ($flush ? PHP_OUTPUT_HANDLER_FLUSHABLE : PHP_OUTPUT_HANDLER_CLEANABLE) : -1;
+        $level = \count($status);
+        $flags = PHP_OUTPUT_HANDLER_REMOVABLE | ($flush ? PHP_OUTPUT_HANDLER_FLUSHABLE : PHP_OUTPUT_HANDLER_CLEANABLE);
 
         while ($level-- > $targetLevel && ($s = $status[$level]) && (!isset($s['del']) ? !isset($s['flags']) || ($s['flags'] & $flags) === $flags : $s['del'])) {
             if ($flush) {
@@ -1283,7 +1221,7 @@ class Response
      *
      * @see http://support.microsoft.com/kb/323308
      *
-     * @final since version 3.3
+     * @final
      */
     protected function ensureIEOverSSLCompatibility(Request $request)
     {
diff --git a/vendor/symfony/http-foundation/ResponseHeaderBag.php b/vendor/symfony/http-foundation/ResponseHeaderBag.php
index 11a85932..ed2e0cfb 100644
--- a/vendor/symfony/http-foundation/ResponseHeaderBag.php
+++ b/vendor/symfony/http-foundation/ResponseHeaderBag.php
@@ -210,13 +210,13 @@ class ResponseHeaderBag extends HeaderBag
      *
      * @param string $format
      *
-     * @return array
+     * @return Cookie[]
      *
      * @throws \InvalidArgumentException When the $format is invalid
      */
     public function getCookies($format = self::COOKIES_FLAT)
     {
-        if (!in_array($format, array(self::COOKIES_FLAT, self::COOKIES_ARRAY))) {
+        if (!\in_array($format, array(self::COOKIES_FLAT, self::COOKIES_ARRAY))) {
             throw new \InvalidArgumentException(sprintf('Format "%s" invalid (%s).', $format, implode(', ', array(self::COOKIES_FLAT, self::COOKIES_ARRAY))));
         }
 
@@ -267,7 +267,7 @@ class ResponseHeaderBag extends HeaderBag
      */
     public function makeDisposition($disposition, $filename, $filenameFallback = '')
     {
-        if (!in_array($disposition, array(self::DISPOSITION_ATTACHMENT, self::DISPOSITION_INLINE))) {
+        if (!\in_array($disposition, array(self::DISPOSITION_ATTACHMENT, self::DISPOSITION_INLINE))) {
             throw new \InvalidArgumentException(sprintf('The disposition must be either "%s" or "%s".', self::DISPOSITION_ATTACHMENT, self::DISPOSITION_INLINE));
         }
 
@@ -290,13 +290,12 @@ class ResponseHeaderBag extends HeaderBag
             throw new \InvalidArgumentException('The filename and the fallback cannot contain the "/" and "\\" characters.');
         }
 
-        $output = sprintf('%s; filename="%s"', $disposition, str_replace('"', '\\"', $filenameFallback));
-
+        $params = array('filename' => $filenameFallback);
         if ($filename !== $filenameFallback) {
-            $output .= sprintf("; filename*=utf-8''%s", rawurlencode($filename));
+            $params['filename*'] = "utf-8''".rawurlencode($filename);
         }
 
-        return $output;
+        return $disposition.'; '.HeaderUtils::toString($params, ';');
     }
 
     /**
diff --git a/vendor/symfony/http-foundation/ServerBag.php b/vendor/symfony/http-foundation/ServerBag.php
index 19d2022e..d8ab561a 100644
--- a/vendor/symfony/http-foundation/ServerBag.php
+++ b/vendor/symfony/http-foundation/ServerBag.php
@@ -68,7 +68,7 @@ class ServerBag extends ParameterBag
                 if (0 === stripos($authorizationHeader, 'basic ')) {
                     // Decode AUTHORIZATION header into PHP_AUTH_USER and PHP_AUTH_PW when authorization header is basic
                     $exploded = explode(':', base64_decode(substr($authorizationHeader, 6)), 2);
-                    if (2 == count($exploded)) {
+                    if (2 == \count($exploded)) {
                         list($headers['PHP_AUTH_USER'], $headers['PHP_AUTH_PW']) = $exploded;
                     }
                 } elseif (empty($this->parameters['PHP_AUTH_DIGEST']) && (0 === stripos($authorizationHeader, 'digest '))) {
diff --git a/vendor/symfony/http-foundation/Session/Attribute/AttributeBag.php b/vendor/symfony/http-foundation/Session/Attribute/AttributeBag.php
index ea1fda29..82577b80 100644
--- a/vendor/symfony/http-foundation/Session/Attribute/AttributeBag.php
+++ b/vendor/symfony/http-foundation/Session/Attribute/AttributeBag.php
@@ -24,7 +24,7 @@ class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Counta
     /**
      * @param string $storageKey The key used to store attributes in the session
      */
-    public function __construct($storageKey = '_sf2_attributes')
+    public function __construct(string $storageKey = '_sf2_attributes')
     {
         $this->storageKey = $storageKey;
     }
@@ -143,6 +143,6 @@ class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Counta
      */
     public function count()
     {
-        return count($this->attributes);
+        return \count($this->attributes);
     }
 }
diff --git a/vendor/symfony/http-foundation/Session/Attribute/NamespacedAttributeBag.php b/vendor/symfony/http-foundation/Session/Attribute/NamespacedAttributeBag.php
index abbf37ee..50cd740d 100644
--- a/vendor/symfony/http-foundation/Session/Attribute/NamespacedAttributeBag.php
+++ b/vendor/symfony/http-foundation/Session/Attribute/NamespacedAttributeBag.php
@@ -25,7 +25,7 @@ class NamespacedAttributeBag extends AttributeBag
      * @param string $storageKey         Session storage key
      * @param string $namespaceCharacter Namespace character to use in keys
      */
-    public function __construct($storageKey = '_sf2_attributes', $namespaceCharacter = '/')
+    public function __construct(string $storageKey = '_sf2_attributes', string $namespaceCharacter = '/')
     {
         $this->namespaceCharacter = $namespaceCharacter;
         parent::__construct($storageKey);
@@ -110,7 +110,7 @@ class NamespacedAttributeBag extends AttributeBag
         }
 
         $parts = explode($this->namespaceCharacter, $name);
-        if (count($parts) < 2) {
+        if (\count($parts) < 2) {
             if (!$writeContext) {
                 return $array;
             }
@@ -120,11 +120,17 @@ class NamespacedAttributeBag extends AttributeBag
             return $array;
         }
 
-        unset($parts[count($parts) - 1]);
+        unset($parts[\count($parts) - 1]);
 
         foreach ($parts as $part) {
             if (null !== $array && !array_key_exists($part, $array)) {
-                $array[$part] = $writeContext ? array() : null;
+                if (!$writeContext) {
+                    $null = null;
+
+                    return $null;
+                }
+
+                $array[$part] = array();
             }
 
             $array = &$array[$part];
diff --git a/vendor/symfony/http-foundation/Session/Flash/AutoExpireFlashBag.php b/vendor/symfony/http-foundation/Session/Flash/AutoExpireFlashBag.php
index 77521c24..ef23457b 100644
--- a/vendor/symfony/http-foundation/Session/Flash/AutoExpireFlashBag.php
+++ b/vendor/symfony/http-foundation/Session/Flash/AutoExpireFlashBag.php
@@ -25,7 +25,7 @@ class AutoExpireFlashBag implements FlashBagInterface
     /**
      * @param string $storageKey The key used to store flashes in the session
      */
-    public function __construct($storageKey = '_symfony_flashes')
+    public function __construct(string $storageKey = '_symfony_flashes')
     {
         $this->storageKey = $storageKey;
     }
diff --git a/vendor/symfony/http-foundation/Session/Flash/FlashBag.php b/vendor/symfony/http-foundation/Session/Flash/FlashBag.php
index 12fb740c..44ddb963 100644
--- a/vendor/symfony/http-foundation/Session/Flash/FlashBag.php
+++ b/vendor/symfony/http-foundation/Session/Flash/FlashBag.php
@@ -25,7 +25,7 @@ class FlashBag implements FlashBagInterface
     /**
      * @param string $storageKey The key used to store flashes in the session
      */
-    public function __construct($storageKey = '_symfony_flashes')
+    public function __construct(string $storageKey = '_symfony_flashes')
     {
         $this->storageKey = $storageKey;
     }
diff --git a/vendor/symfony/http-foundation/Session/Flash/FlashBagInterface.php b/vendor/symfony/http-foundation/Session/Flash/FlashBagInterface.php
index 80e97f17..f53c9dae 100644
--- a/vendor/symfony/http-foundation/Session/Flash/FlashBagInterface.php
+++ b/vendor/symfony/http-foundation/Session/Flash/FlashBagInterface.php
@@ -24,7 +24,7 @@ interface FlashBagInterface extends SessionBagInterface
      * Adds a flash message for type.
      *
      * @param string $type
-     * @param string $message
+     * @param mixed  $message
      */
     public function add($type, $message);
 
diff --git a/vendor/symfony/http-foundation/Session/Session.php b/vendor/symfony/http-foundation/Session/Session.php
index a46cffbb..33499068 100644
--- a/vendor/symfony/http-foundation/Session/Session.php
+++ b/vendor/symfony/http-foundation/Session/Session.php
@@ -11,12 +11,12 @@
 
 namespace Symfony\Component\HttpFoundation\Session;
 
-use Symfony\Component\HttpFoundation\Session\Storage\SessionStorageInterface;
 use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
 use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBagInterface;
 use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
 use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
 use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\SessionStorageInterface;
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
@@ -29,7 +29,7 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable
     private $flashName;
     private $attributeName;
     private $data = array();
-    private $hasBeenStarted;
+    private $usageIndex = 0;
 
     /**
      * @param SessionStorageInterface $storage    A SessionStorageInterface instance
@@ -138,17 +138,17 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable
      */
     public function count()
     {
-        return count($this->getAttributeBag()->all());
+        return \count($this->getAttributeBag()->all());
     }
 
     /**
-     * @return bool
+     * @return int
      *
      * @internal
      */
-    public function hasBeenStarted()
+    public function getUsageIndex()
     {
-        return $this->hasBeenStarted;
+        return $this->usageIndex;
     }
 
     /**
@@ -158,6 +158,9 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable
      */
     public function isEmpty()
     {
+        if ($this->isStarted()) {
+            ++$this->usageIndex;
+        }
         foreach ($this->data as &$data) {
             if (!empty($data)) {
                 return false;
@@ -206,7 +209,9 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable
      */
     public function setId($id)
     {
-        $this->storage->setId($id);
+        if ($this->storage->getId() !== $id) {
+            $this->storage->setId($id);
+        }
     }
 
     /**
@@ -230,6 +235,8 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable
      */
     public function getMetadataBag()
     {
+        ++$this->usageIndex;
+
         return $this->storage->getMetadataBag();
     }
 
@@ -238,7 +245,7 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable
      */
     public function registerBag(SessionBagInterface $bag)
     {
-        $this->storage->registerBag(new SessionBagProxy($bag, $this->data, $this->hasBeenStarted));
+        $this->storage->registerBag(new SessionBagProxy($bag, $this->data, $this->usageIndex));
     }
 
     /**
diff --git a/vendor/symfony/http-foundation/Session/SessionBagProxy.php b/vendor/symfony/http-foundation/Session/SessionBagProxy.php
index 307836d5..3504bdfe 100644
--- a/vendor/symfony/http-foundation/Session/SessionBagProxy.php
+++ b/vendor/symfony/http-foundation/Session/SessionBagProxy.php
@@ -20,13 +20,13 @@ final class SessionBagProxy implements SessionBagInterface
 {
     private $bag;
     private $data;
-    private $hasBeenStarted;
+    private $usageIndex;
 
-    public function __construct(SessionBagInterface $bag, array &$data, &$hasBeenStarted)
+    public function __construct(SessionBagInterface $bag, array &$data, &$usageIndex)
     {
         $this->bag = $bag;
         $this->data = &$data;
-        $this->hasBeenStarted = &$hasBeenStarted;
+        $this->usageIndex = &$usageIndex;
     }
 
     /**
@@ -34,6 +34,8 @@ final class SessionBagProxy implements SessionBagInterface
      */
     public function getBag()
     {
+        ++$this->usageIndex;
+
         return $this->bag;
     }
 
@@ -42,6 +44,11 @@ final class SessionBagProxy implements SessionBagInterface
      */
     public function isEmpty()
     {
+        if (!isset($this->data[$this->bag->getStorageKey()])) {
+            return true;
+        }
+        ++$this->usageIndex;
+
         return empty($this->data[$this->bag->getStorageKey()]);
     }
 
@@ -58,7 +65,7 @@ final class SessionBagProxy implements SessionBagInterface
      */
     public function initialize(array &$array)
     {
-        $this->hasBeenStarted = true;
+        ++$this->usageIndex;
         $this->data[$this->bag->getStorageKey()] = &$array;
 
         $this->bag->initialize($array);
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/AbstractSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/AbstractSessionHandler.php
index 6ae13558..b1465716 100644
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/AbstractSessionHandler.php
+++ b/vendor/symfony/http-foundation/Session/Storage/Handler/AbstractSessionHandler.php
@@ -91,9 +91,6 @@ abstract class AbstractSessionHandler implements \SessionHandlerInterface, \Sess
 
         $data = $this->doRead($sessionId);
         $this->newSessionId = '' === $data ? $sessionId : null;
-        if (\PHP_VERSION_ID < 70000) {
-            $this->prefetchData = $data;
-        }
 
         return $data;
     }
@@ -103,14 +100,6 @@ abstract class AbstractSessionHandler implements \SessionHandlerInterface, \Sess
      */
     public function write($sessionId, $data)
     {
-        if (\PHP_VERSION_ID < 70000 && $this->prefetchData) {
-            $readData = $this->prefetchData;
-            $this->prefetchData = null;
-
-            if ($readData === $data) {
-                return $this->updateTimestamp($sessionId, $data);
-            }
-        }
         if (null === $this->igbinaryEmptyData) {
             // see https://github.com/igbinary/igbinary/issues/146
             $this->igbinaryEmptyData = \function_exists('igbinary_serialize') ? igbinary_serialize(array()) : '';
@@ -128,12 +117,9 @@ abstract class AbstractSessionHandler implements \SessionHandlerInterface, \Sess
      */
     public function destroy($sessionId)
     {
-        if (\PHP_VERSION_ID < 70000) {
-            $this->prefetchData = null;
-        }
         if (!headers_sent() && ini_get('session.use_cookies')) {
             if (!$this->sessionName) {
-                throw new \LogicException(sprintf('Session name cannot be empty, did you forget to call "parent::open()" in "%s"?.', get_class($this)));
+                throw new \LogicException(sprintf('Session name cannot be empty, did you forget to call "parent::open()" in "%s"?.', \get_class($this)));
             }
             $sessionCookie = sprintf(' %s=', urlencode($this->sessionName));
             $sessionCookieWithId = sprintf('%s%s;', $sessionCookie, urlencode($sessionId));
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php
deleted file mode 100644
index 90726beb..00000000
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
-
-@trigger_error(sprintf('The class %s is deprecated since Symfony 3.4 and will be removed in 4.0. Use Symfony\Component\HttpFoundation\Session\Storage\Handler\MemcachedSessionHandler instead.', MemcacheSessionHandler::class), E_USER_DEPRECATED);
-
-/**
- * @author Drak <drak@zikula.org>
- *
- * @deprecated since version 3.4, to be removed in 4.0. Use Symfony\Component\HttpFoundation\Session\Storage\Handler\MemcachedSessionHandler instead.
- */
-class MemcacheSessionHandler implements \SessionHandlerInterface
-{
-    private $memcache;
-
-    /**
-     * @var int Time to live in seconds
-     */
-    private $ttl;
-
-    /**
-     * @var string Key prefix for shared environments
-     */
-    private $prefix;
-
-    /**
-     * Constructor.
-     *
-     * List of available options:
-     *  * prefix: The prefix to use for the memcache keys in order to avoid collision
-     *  * expiretime: The time to live in seconds
-     *
-     * @param \Memcache $memcache A \Memcache instance
-     * @param array     $options  An associative array of Memcache options
-     *
-     * @throws \InvalidArgumentException When unsupported options are passed
-     */
-    public function __construct(\Memcache $memcache, array $options = array())
-    {
-        if ($diff = array_diff(array_keys($options), array('prefix', 'expiretime'))) {
-            throw new \InvalidArgumentException(sprintf(
-                'The following options are not supported "%s"', implode(', ', $diff)
-            ));
-        }
-
-        $this->memcache = $memcache;
-        $this->ttl = isset($options['expiretime']) ? (int) $options['expiretime'] : 86400;
-        $this->prefix = isset($options['prefix']) ? $options['prefix'] : 'sf2s';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function open($savePath, $sessionName)
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function read($sessionId)
-    {
-        return $this->memcache->get($this->prefix.$sessionId) ?: '';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write($sessionId, $data)
-    {
-        return $this->memcache->set($this->prefix.$sessionId, $data, 0, time() + $this->ttl);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function destroy($sessionId)
-    {
-        $this->memcache->delete($this->prefix.$sessionId);
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function gc($maxlifetime)
-    {
-        // not required here because memcache will auto expire the records anyhow.
-        return true;
-    }
-
-    /**
-     * Return a Memcache instance.
-     *
-     * @return \Memcache
-     */
-    protected function getMemcache()
-    {
-        return $this->memcache;
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php
index dd37eae1..61a7afd9 100644
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php
+++ b/vendor/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php
@@ -50,9 +50,7 @@ class MemcachedSessionHandler extends AbstractSessionHandler
         $this->memcached = $memcached;
 
         if ($diff = array_diff(array_keys($options), array('prefix', 'expiretime'))) {
-            throw new \InvalidArgumentException(sprintf(
-                'The following options are not supported "%s"', implode(', ', $diff)
-            ));
+            throw new \InvalidArgumentException(sprintf('The following options are not supported "%s"', implode(', ', $diff)));
         }
 
         $this->ttl = isset($options['expiretime']) ? (int) $options['expiretime'] : 86400;
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/MigratingSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/MigratingSessionHandler.php
new file mode 100644
index 00000000..5293d244
--- /dev/null
+++ b/vendor/symfony/http-foundation/Session/Storage/Handler/MigratingSessionHandler.php
@@ -0,0 +1,124 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
+
+/**
+ * Migrating session handler for migrating from one handler to another. It reads
+ * from the current handler and writes both the current and new ones.
+ *
+ * It ignores errors from the new handler.
+ *
+ * @author Ross Motley <ross.motley@amara.com>
+ * @author Oliver Radwell <oliver.radwell@amara.com>
+ */
+class MigratingSessionHandler implements \SessionHandlerInterface, \SessionUpdateTimestampHandlerInterface
+{
+    private $currentHandler;
+    private $writeOnlyHandler;
+
+    public function __construct(\SessionHandlerInterface $currentHandler, \SessionHandlerInterface $writeOnlyHandler)
+    {
+        if (!$currentHandler instanceof \SessionUpdateTimestampHandlerInterface) {
+            $currentHandler = new StrictSessionHandler($currentHandler);
+        }
+        if (!$writeOnlyHandler instanceof \SessionUpdateTimestampHandlerInterface) {
+            $writeOnlyHandler = new StrictSessionHandler($writeOnlyHandler);
+        }
+
+        $this->currentHandler = $currentHandler;
+        $this->writeOnlyHandler = $writeOnlyHandler;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function close()
+    {
+        $result = $this->currentHandler->close();
+        $this->writeOnlyHandler->close();
+
+        return $result;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function destroy($sessionId)
+    {
+        $result = $this->currentHandler->destroy($sessionId);
+        $this->writeOnlyHandler->destroy($sessionId);
+
+        return $result;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function gc($maxlifetime)
+    {
+        $result = $this->currentHandler->gc($maxlifetime);
+        $this->writeOnlyHandler->gc($maxlifetime);
+
+        return $result;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function open($savePath, $sessionName)
+    {
+        $result = $this->currentHandler->open($savePath, $sessionName);
+        $this->writeOnlyHandler->open($savePath, $sessionName);
+
+        return $result;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function read($sessionId)
+    {
+        // No reading from new handler until switch-over
+        return $this->currentHandler->read($sessionId);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function write($sessionId, $sessionData)
+    {
+        $result = $this->currentHandler->write($sessionId, $sessionData);
+        $this->writeOnlyHandler->write($sessionId, $sessionData);
+
+        return $result;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function validateId($sessionId)
+    {
+        // No reading from new handler until switch-over
+        return $this->currentHandler->validateId($sessionId);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function updateTimestamp($sessionId, $sessionData)
+    {
+        $result = $this->currentHandler->updateTimestamp($sessionId, $sessionData);
+        $this->writeOnlyHandler->updateTimestamp($sessionId, $sessionData);
+
+        return $result;
+    }
+}
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php
index 7d3fa218..853b0bc7 100644
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php
+++ b/vendor/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php
@@ -24,7 +24,7 @@ class MongoDbSessionHandler extends AbstractSessionHandler
     private $mongo;
 
     /**
-     * @var \MongoCollection
+     * @var \MongoDB\Collection
      */
     private $collection;
 
@@ -64,19 +64,10 @@ class MongoDbSessionHandler extends AbstractSessionHandler
      * @param \MongoDB\Client $mongo   A MongoDB\Client instance
      * @param array           $options An associative array of field options
      *
-     * @throws \InvalidArgumentException When MongoClient or Mongo instance not provided
      * @throws \InvalidArgumentException When "database" or "collection" not provided
      */
-    public function __construct($mongo, array $options)
+    public function __construct(\MongoDB\Client $mongo, array $options)
     {
-        if ($mongo instanceof \MongoClient || $mongo instanceof \Mongo) {
-            @trigger_error(sprintf('Using %s with the legacy mongo extension is deprecated as of 3.4 and will be removed in 4.0. Use it with the mongodb/mongodb package and ext-mongodb instead.', __CLASS__), E_USER_DEPRECATED);
-        }
-
-        if (!($mongo instanceof \MongoDB\Client || $mongo instanceof \MongoClient || $mongo instanceof \Mongo)) {
-            throw new \InvalidArgumentException('MongoClient or Mongo instance required');
-        }
-
         if (!isset($options['database']) || !isset($options['collection'])) {
             throw new \InvalidArgumentException('You must provide the "database" and "collection" option for MongoDBSessionHandler');
         }
@@ -104,9 +95,7 @@ class MongoDbSessionHandler extends AbstractSessionHandler
      */
     protected function doDestroy($sessionId)
     {
-        $methodName = $this->mongo instanceof \MongoDB\Client ? 'deleteOne' : 'remove';
-
-        $this->getCollection()->$methodName(array(
+        $this->getCollection()->deleteOne(array(
             $this->options['id_field'] => $sessionId,
         ));
 
@@ -118,10 +107,8 @@ class MongoDbSessionHandler extends AbstractSessionHandler
      */
     public function gc($maxlifetime)
     {
-        $methodName = $this->mongo instanceof \MongoDB\Client ? 'deleteMany' : 'remove';
-
-        $this->getCollection()->$methodName(array(
-            $this->options['expiry_field'] => array('$lt' => $this->createDateTime()),
+        $this->getCollection()->deleteMany(array(
+            $this->options['expiry_field'] => array('$lt' => new \MongoDB\BSON\UTCDateTime()),
         ));
 
         return true;
@@ -132,28 +119,18 @@ class MongoDbSessionHandler extends AbstractSessionHandler
      */
     protected function doWrite($sessionId, $data)
     {
-        $expiry = $this->createDateTime(time() + (int) ini_get('session.gc_maxlifetime'));
+        $expiry = new \MongoDB\BSON\UTCDateTime((time() + (int) ini_get('session.gc_maxlifetime')) * 1000);
 
         $fields = array(
-            $this->options['time_field'] => $this->createDateTime(),
+            $this->options['time_field'] => new \MongoDB\BSON\UTCDateTime(),
             $this->options['expiry_field'] => $expiry,
+            $this->options['data_field'] => new \MongoDB\BSON\Binary($data, \MongoDB\BSON\Binary::TYPE_OLD_BINARY),
         );
 
-        $options = array('upsert' => true);
-
-        if ($this->mongo instanceof \MongoDB\Client) {
-            $fields[$this->options['data_field']] = new \MongoDB\BSON\Binary($data, \MongoDB\BSON\Binary::TYPE_OLD_BINARY);
-        } else {
-            $fields[$this->options['data_field']] = new \MongoBinData($data, \MongoBinData::BYTE_ARRAY);
-            $options['multiple'] = false;
-        }
-
-        $methodName = $this->mongo instanceof \MongoDB\Client ? 'updateOne' : 'update';
-
-        $this->getCollection()->$methodName(
+        $this->getCollection()->updateOne(
             array($this->options['id_field'] => $sessionId),
             array('$set' => $fields),
-            $options
+            array('upsert' => true)
         );
 
         return true;
@@ -164,23 +141,14 @@ class MongoDbSessionHandler extends AbstractSessionHandler
      */
     public function updateTimestamp($sessionId, $data)
     {
-        $expiry = $this->createDateTime(time() + (int) ini_get('session.gc_maxlifetime'));
-
-        if ($this->mongo instanceof \MongoDB\Client) {
-            $methodName = 'updateOne';
-            $options = array();
-        } else {
-            $methodName = 'update';
-            $options = array('multiple' => false);
-        }
+        $expiry = new \MongoDB\BSON\UTCDateTime((time() + (int) ini_get('session.gc_maxlifetime')) * 1000);
 
-        $this->getCollection()->$methodName(
+        $this->getCollection()->updateOne(
             array($this->options['id_field'] => $sessionId),
             array('$set' => array(
-                $this->options['time_field'] => $this->createDateTime(),
+                $this->options['time_field'] => new \MongoDB\BSON\UTCDateTime(),
                 $this->options['expiry_field'] => $expiry,
-            )),
-            $options
+            ))
         );
 
         return true;
@@ -193,24 +161,18 @@ class MongoDbSessionHandler extends AbstractSessionHandler
     {
         $dbData = $this->getCollection()->findOne(array(
             $this->options['id_field'] => $sessionId,
-            $this->options['expiry_field'] => array('$gte' => $this->createDateTime()),
+            $this->options['expiry_field'] => array('$gte' => new \MongoDB\BSON\UTCDateTime()),
         ));
 
         if (null === $dbData) {
             return '';
         }
 
-        if ($dbData[$this->options['data_field']] instanceof \MongoDB\BSON\Binary) {
-            return $dbData[$this->options['data_field']]->getData();
-        }
-
-        return $dbData[$this->options['data_field']]->bin;
+        return $dbData[$this->options['data_field']]->getData();
     }
 
     /**
-     * Return a "MongoCollection" instance.
-     *
-     * @return \MongoCollection
+     * @return \MongoDB\Collection
      */
     private function getCollection()
     {
@@ -222,34 +184,10 @@ class MongoDbSessionHandler extends AbstractSessionHandler
     }
 
     /**
-     * Return a Mongo instance.
-     *
-     * @return \Mongo|\MongoClient|\MongoDB\Client
+     * @return \MongoDB\Client
      */
     protected function getMongo()
     {
         return $this->mongo;
     }
-
-    /**
-     * Create a date object using the class appropriate for the current mongo connection.
-     *
-     * Return an instance of a MongoDate or \MongoDB\BSON\UTCDateTime
-     *
-     * @param int $seconds An integer representing UTC seconds since Jan 1 1970.  Defaults to now.
-     *
-     * @return \MongoDate|\MongoDB\BSON\UTCDateTime
-     */
-    private function createDateTime($seconds = null)
-    {
-        if (null === $seconds) {
-            $seconds = time();
-        }
-
-        if ($this->mongo instanceof \MongoDB\Client) {
-            return new \MongoDB\BSON\UTCDateTime($seconds * 1000);
-        }
-
-        return new \MongoDate($seconds);
-    }
 }
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php
index 4e9704bd..f962965a 100644
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php
+++ b/vendor/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php
@@ -16,7 +16,7 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
  *
  * @author Drak <drak@zikula.org>
  */
-class NativeFileSessionHandler extends NativeSessionHandler
+class NativeFileSessionHandler extends \SessionHandler
 {
     /**
      * @param string $savePath Path of directory to save session files
@@ -28,7 +28,7 @@ class NativeFileSessionHandler extends NativeSessionHandler
      * @throws \InvalidArgumentException On invalid $savePath
      * @throws \RuntimeException         When failing to create the save directory
      */
-    public function __construct($savePath = null)
+    public function __construct(string $savePath = null)
     {
         if (null === $savePath) {
             $savePath = ini_get('session.save_path');
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/NativeSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/NativeSessionHandler.php
deleted file mode 100644
index 9be4528a..00000000
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/NativeSessionHandler.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
-
-/**
- * @deprecated since version 3.4, to be removed in 4.0. Use \SessionHandler instead.
- * @see http://php.net/sessionhandler
- */
-class NativeSessionHandler extends \SessionHandler
-{
-    public function __construct()
-    {
-        @trigger_error('The '.__NAMESPACE__.'\NativeSessionHandler class is deprecated since Symfony 3.4 and will be removed in 4.0. Use the \SessionHandler class instead.', E_USER_DEPRECATED);
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
index 37ec7571..dd1a263f 100644
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
+++ b/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -71,7 +71,7 @@ class PdoSessionHandler extends AbstractSessionHandler
     private $pdo;
 
     /**
-     * @var string|null|false DSN string or null for session.save_path or false when lazy connection disabled
+     * @var string|false|null DSN string or null for session.save_path or false when lazy connection disabled
      */
     private $dsn = false;
 
@@ -178,7 +178,7 @@ class PdoSessionHandler extends AbstractSessionHandler
 
             $this->pdo = $pdoOrDsn;
             $this->driver = $this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME);
-        } elseif (is_string($pdoOrDsn) && false !== strpos($pdoOrDsn, '://')) {
+        } elseif (\is_string($pdoOrDsn) && false !== strpos($pdoOrDsn, '://')) {
             $this->dsn = $this->buildDsnFromUrl($pdoOrDsn);
         } else {
             $this->dsn = $pdoOrDsn;
@@ -629,7 +629,7 @@ class PdoSessionHandler extends AbstractSessionHandler
                     return '';
                 }
 
-                return is_resource($sessionRows[0][0]) ? stream_get_contents($sessionRows[0][0]) : $sessionRows[0][0];
+                return \is_resource($sessionRows[0][0]) ? stream_get_contents($sessionRows[0][0]) : $sessionRows[0][0];
             }
 
             if (null !== $insertStmt) {
@@ -668,8 +668,6 @@ class PdoSessionHandler extends AbstractSessionHandler
     /**
      * Executes an application-level lock on the database.
      *
-     * @param string $sessionId Session ID
-     *
      * @return \PDOStatement The statement that needs to be executed later to release the lock
      *
      * @throws \DomainException When an unsupported PDO driver is used
@@ -678,7 +676,7 @@ class PdoSessionHandler extends AbstractSessionHandler
      *       - for oci using DBMS_LOCK.REQUEST
      *       - for sqlsrv using sp_getapplock with LockOwner = Session
      */
-    private function doAdvisoryLock($sessionId)
+    private function doAdvisoryLock(string $sessionId)
     {
         switch ($this->driver) {
             case 'mysql':
@@ -733,19 +731,15 @@ class PdoSessionHandler extends AbstractSessionHandler
      * Encodes the first 4 (when PHP_INT_SIZE == 4) or 8 characters of the string as an integer.
      *
      * Keep in mind, PHP integers are signed.
-     *
-     * @param string $string
-     *
-     * @return int
      */
-    private function convertStringToInt($string)
+    private function convertStringToInt(string $string): int
     {
         if (4 === \PHP_INT_SIZE) {
-            return (ord($string[3]) << 24) + (ord($string[2]) << 16) + (ord($string[1]) << 8) + ord($string[0]);
+            return (\ord($string[3]) << 24) + (\ord($string[2]) << 16) + (\ord($string[1]) << 8) + \ord($string[0]);
         }
 
-        $int1 = (ord($string[7]) << 24) + (ord($string[6]) << 16) + (ord($string[5]) << 8) + ord($string[4]);
-        $int2 = (ord($string[3]) << 24) + (ord($string[2]) << 16) + (ord($string[1]) << 8) + ord($string[0]);
+        $int1 = (\ord($string[7]) << 24) + (\ord($string[6]) << 16) + (\ord($string[5]) << 8) + \ord($string[4]);
+        $int2 = (\ord($string[3]) << 24) + (\ord($string[2]) << 16) + (\ord($string[1]) << 8) + \ord($string[0]);
 
         return $int2 + ($int1 << 32);
     }
@@ -753,11 +747,9 @@ class PdoSessionHandler extends AbstractSessionHandler
     /**
      * Return a locking or nonlocking SQL query to read session information.
      *
-     * @return string The SQL string
-     *
      * @throws \DomainException When an unsupported PDO driver is used
      */
-    private function getSelectSql()
+    private function getSelectSql(): string
     {
         if (self::LOCK_TRANSACTIONAL === $this->lockMode) {
             $this->beginTransaction();
@@ -848,14 +840,8 @@ class PdoSessionHandler extends AbstractSessionHandler
 
     /**
      * Returns a merge/upsert (i.e. insert or update) statement when supported by the database for writing session data.
-     *
-     * @param string $sessionId   Session ID
-     * @param string $data        Encoded session data
-     * @param int    $maxlifetime session.gc_maxlifetime
-     *
-     * @return \PDOStatement|null The merge statement or null when not supported
      */
-    private function getMergeStatement($sessionId, $data, $maxlifetime)
+    private function getMergeStatement(string $sessionId, string $data, int $maxlifetime): ?\PDOStatement
     {
         switch (true) {
             case 'mysql' === $this->driver:
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/RedisSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/RedisSessionHandler.php
new file mode 100644
index 00000000..36adf242
--- /dev/null
+++ b/vendor/symfony/http-foundation/Session/Storage/Handler/RedisSessionHandler.php
@@ -0,0 +1,112 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
+
+use Predis\Response\ErrorInterface;
+use Symfony\Component\Cache\Traits\RedisProxy;
+
+/**
+ * Redis based session storage handler based on the Redis class
+ * provided by the PHP redis extension.
+ *
+ * @author Dalibor Karlović <dalibor@flexolabs.io>
+ */
+class RedisSessionHandler extends AbstractSessionHandler
+{
+    private $redis;
+
+    /**
+     * @var string Key prefix for shared environments
+     */
+    private $prefix;
+
+    /**
+     * List of available options:
+     *  * prefix: The prefix to use for the keys in order to avoid collision on the Redis server.
+     *
+     * @param \Redis|\RedisArray|\RedisCluster|\Predis\Client|RedisProxy $redis
+     * @param array                                                      $options An associative array of options
+     *
+     * @throws \InvalidArgumentException When unsupported client or options are passed
+     */
+    public function __construct($redis, array $options = array())
+    {
+        if (
+            !$redis instanceof \Redis &&
+            !$redis instanceof \RedisArray &&
+            !$redis instanceof \RedisCluster &&
+            !$redis instanceof \Predis\Client &&
+            !$redis instanceof RedisProxy
+        ) {
+            throw new \InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\Client, %s given', __METHOD__, \is_object($redis) ? \get_class($redis) : \gettype($redis)));
+        }
+
+        if ($diff = array_diff(array_keys($options), array('prefix'))) {
+            throw new \InvalidArgumentException(sprintf('The following options are not supported "%s"', implode(', ', $diff)));
+        }
+
+        $this->redis = $redis;
+        $this->prefix = $options['prefix'] ?? 'sf_s';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doRead($sessionId): string
+    {
+        return $this->redis->get($this->prefix.$sessionId) ?: '';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doWrite($sessionId, $data): bool
+    {
+        $result = $this->redis->setEx($this->prefix.$sessionId, (int) ini_get('session.gc_maxlifetime'), $data);
+
+        return $result && !$result instanceof ErrorInterface;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doDestroy($sessionId): bool
+    {
+        $this->redis->del($this->prefix.$sessionId);
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function close(): bool
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function gc($maxlifetime): bool
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function updateTimestamp($sessionId, $data)
+    {
+        return (bool) $this->redis->expire($this->prefix.$sessionId, (int) ini_get('session.gc_maxlifetime'));
+    }
+}
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/StrictSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/StrictSessionHandler.php
index 22811929..83a1f2c0 100644
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/StrictSessionHandler.php
+++ b/vendor/symfony/http-foundation/Session/Storage/Handler/StrictSessionHandler.php
@@ -24,7 +24,7 @@ class StrictSessionHandler extends AbstractSessionHandler
     public function __construct(\SessionHandlerInterface $handler)
     {
         if ($handler instanceof \SessionUpdateTimestampHandlerInterface) {
-            throw new \LogicException(sprintf('"%s" is already an instance of "SessionUpdateTimestampHandlerInterface", you cannot wrap it with "%s".', get_class($handler), self::class));
+            throw new \LogicException(sprintf('"%s" is already an instance of "SessionUpdateTimestampHandlerInterface", you cannot wrap it with "%s".', \get_class($handler), self::class));
         }
 
         $this->handler = $handler;
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/WriteCheckSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/WriteCheckSessionHandler.php
deleted file mode 100644
index 1541ec4e..00000000
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/WriteCheckSessionHandler.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
-
-@trigger_error(sprintf('The %s class is deprecated since Symfony 3.4 and will be removed in 4.0. Implement `SessionUpdateTimestampHandlerInterface` or extend `AbstractSessionHandler` instead.', WriteCheckSessionHandler::class), E_USER_DEPRECATED);
-
-/**
- * Wraps another SessionHandlerInterface to only write the session when it has been modified.
- *
- * @author Adrien Brault <adrien.brault@gmail.com>
- *
- * @deprecated since version 3.4, to be removed in 4.0. Implement `SessionUpdateTimestampHandlerInterface` or extend `AbstractSessionHandler` instead.
- */
-class WriteCheckSessionHandler implements \SessionHandlerInterface
-{
-    private $wrappedSessionHandler;
-
-    /**
-     * @var array sessionId => session
-     */
-    private $readSessions;
-
-    public function __construct(\SessionHandlerInterface $wrappedSessionHandler)
-    {
-        $this->wrappedSessionHandler = $wrappedSessionHandler;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        return $this->wrappedSessionHandler->close();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function destroy($sessionId)
-    {
-        return $this->wrappedSessionHandler->destroy($sessionId);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function gc($maxlifetime)
-    {
-        return $this->wrappedSessionHandler->gc($maxlifetime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function open($savePath, $sessionName)
-    {
-        return $this->wrappedSessionHandler->open($savePath, $sessionName);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function read($sessionId)
-    {
-        $session = $this->wrappedSessionHandler->read($sessionId);
-
-        $this->readSessions[$sessionId] = $session;
-
-        return $session;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write($sessionId, $data)
-    {
-        if (isset($this->readSessions[$sessionId]) && $data === $this->readSessions[$sessionId]) {
-            return true;
-        }
-
-        return $this->wrappedSessionHandler->write($sessionId, $data);
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Storage/MetadataBag.php b/vendor/symfony/http-foundation/Session/Storage/MetadataBag.php
index 6f59af48..ea0d5ecb 100644
--- a/vendor/symfony/http-foundation/Session/Storage/MetadataBag.php
+++ b/vendor/symfony/http-foundation/Session/Storage/MetadataBag.php
@@ -57,7 +57,7 @@ class MetadataBag implements SessionBagInterface
      * @param string $storageKey      The key used to store bag in the session
      * @param int    $updateThreshold The time to wait between two UPDATED updates
      */
-    public function __construct($storageKey = '_sf2_meta', $updateThreshold = 0)
+    public function __construct(string $storageKey = '_sf2_meta', int $updateThreshold = 0)
     {
         $this->storageKey = $storageKey;
         $this->updateThreshold = $updateThreshold;
diff --git a/vendor/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php b/vendor/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php
index 027f4eff..47cac398 100644
--- a/vendor/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php
+++ b/vendor/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php
@@ -62,11 +62,7 @@ class MockArraySessionStorage implements SessionStorageInterface
      */
     protected $bags = array();
 
-    /**
-     * @param string      $name    Session name
-     * @param MetadataBag $metaBag MetadataBag instance
-     */
-    public function __construct($name = 'MOCKSESSID', MetadataBag $metaBag = null)
+    public function __construct(string $name = 'MOCKSESSID', MetadataBag $metaBag = null)
     {
         $this->name = $name;
         $this->setMetadataBag($metaBag);
diff --git a/vendor/symfony/http-foundation/Session/Storage/MockFileSessionStorage.php b/vendor/symfony/http-foundation/Session/Storage/MockFileSessionStorage.php
index 14f42700..732f92ab 100644
--- a/vendor/symfony/http-foundation/Session/Storage/MockFileSessionStorage.php
+++ b/vendor/symfony/http-foundation/Session/Storage/MockFileSessionStorage.php
@@ -31,7 +31,7 @@ class MockFileSessionStorage extends MockArraySessionStorage
      * @param string      $name     Session name
      * @param MetadataBag $metaBag  MetadataBag instance
      */
-    public function __construct($savePath = null, $name = 'MOCKSESSID', MetadataBag $metaBag = null)
+    public function __construct(string $savePath = null, string $name = 'MOCKSESSID', MetadataBag $metaBag = null)
     {
         if (null === $savePath) {
             $savePath = sys_get_temp_dir();
diff --git a/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php b/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
index 6416a03f..dc4ce44b 100644
--- a/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
+++ b/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
@@ -67,13 +67,9 @@ class NativeSessionStorage implements SessionStorageInterface
      * cookie_lifetime, "0"
      * cookie_path, "/"
      * cookie_secure, ""
-     * entropy_file, ""
-     * entropy_length, "0"
      * gc_divisor, "100"
      * gc_maxlifetime, "1440"
      * gc_probability, "1"
-     * hash_bits_per_character, "4"
-     * hash_function, "0"
      * lazy_write, "1"
      * name, "PHPSESSID"
      * referer_check, ""
@@ -105,6 +101,7 @@ class NativeSessionStorage implements SessionStorageInterface
             'cache_expire' => 0,
             'use_cookies' => 1,
             'lazy_write' => 1,
+            'use_strict_mode' => 1,
         );
 
         session_register_shutdown();
@@ -230,29 +227,22 @@ class NativeSessionStorage implements SessionStorageInterface
             unset($_SESSION[$key]);
         }
 
-        // Register custom error handler to catch a possible failure warning during session write
-        set_error_handler(function ($errno, $errstr, $errfile, $errline) {
-            throw new \ErrorException($errstr, $errno, E_WARNING, $errfile, $errline);
-        }, E_WARNING);
+        // Register error handler to add information about the current save handler
+        $previousHandler = set_error_handler(function ($type, $msg, $file, $line) use (&$previousHandler) {
+            if (E_WARNING === $type && 0 === strpos($msg, 'session_write_close():')) {
+                $handler = $this->saveHandler instanceof SessionHandlerProxy ? $this->saveHandler->getHandler() : $this->saveHandler;
+                $msg = sprintf('session_write_close(): Failed to write session data with "%s" handler', \get_class($handler));
+            }
+
+            return $previousHandler ? $previousHandler($type, $msg, $file, $line) : false;
+        });
 
         try {
-            $e = null;
             session_write_close();
-        } catch (\ErrorException $e) {
         } finally {
             restore_error_handler();
             $_SESSION = $session;
         }
-        if (null !== $e) {
-            // The default PHP error message is not very helpful, as it does not give any information on the current save handler.
-            // Therefore, we catch this error and trigger a warning with a better error message
-            $handler = $this->getSaveHandler();
-            if ($handler instanceof SessionHandlerProxy) {
-                $handler = $handler->getHandler();
-            }
-
-            trigger_error(sprintf('session_write_close(): Failed to write session data with %s handler', get_class($handler)), E_USER_WARNING);
-        }
 
         $this->closed = true;
         $this->started = false;
@@ -351,9 +341,8 @@ class NativeSessionStorage implements SessionStorageInterface
         $validOptions = array_flip(array(
             'cache_expire', 'cache_limiter', 'cookie_domain', 'cookie_httponly',
             'cookie_lifetime', 'cookie_path', 'cookie_secure',
-            'entropy_file', 'entropy_length', 'gc_divisor',
-            'gc_maxlifetime', 'gc_probability', 'hash_bits_per_character',
-            'hash_function', 'lazy_write', 'name', 'referer_check',
+            'gc_divisor', 'gc_maxlifetime', 'gc_probability',
+            'lazy_write', 'name', 'referer_check',
             'serialize_handler', 'use_strict_mode', 'use_cookies',
             'use_only_cookies', 'use_trans_sid', 'upload_progress.enabled',
             'upload_progress.cleanup', 'upload_progress.prefix', 'upload_progress.name',
@@ -411,8 +400,6 @@ class NativeSessionStorage implements SessionStorageInterface
         }
 
         if ($this->saveHandler instanceof SessionHandlerProxy) {
-            session_set_save_handler($this->saveHandler->getHandler(), false);
-        } elseif ($this->saveHandler instanceof \SessionHandlerInterface) {
             session_set_save_handler($this->saveHandler, false);
         }
     }
diff --git a/vendor/symfony/http-foundation/Session/Storage/Proxy/NativeProxy.php b/vendor/symfony/http-foundation/Session/Storage/Proxy/NativeProxy.php
deleted file mode 100644
index 082eed14..00000000
--- a/vendor/symfony/http-foundation/Session/Storage/Proxy/NativeProxy.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpFoundation\Session\Storage\Proxy;
-
-@trigger_error('The '.__NAMESPACE__.'\NativeProxy class is deprecated since Symfony 3.4 and will be removed in 4.0. Use your session handler implementation directly.', E_USER_DEPRECATED);
-
-/**
- * This proxy is built-in session handlers in PHP 5.3.x.
- *
- * @deprecated since version 3.4, to be removed in 4.0. Use your session handler implementation directly.
- *
- * @author Drak <drak@zikula.org>
- */
-class NativeProxy extends AbstractProxy
-{
-    public function __construct()
-    {
-        // this makes an educated guess as to what the handler is since it should already be set.
-        $this->saveHandlerName = ini_get('session.save_handler');
-    }
-
-    /**
-     * Returns true if this handler wraps an internal PHP session save handler using \SessionHandler.
-     *
-     * @return bool False
-     */
-    public function isWrapper()
-    {
-        return false;
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Storage/Proxy/SessionHandlerProxy.php b/vendor/symfony/http-foundation/Session/Storage/Proxy/SessionHandlerProxy.php
index 53c1209a..b11cc397 100644
--- a/vendor/symfony/http-foundation/Session/Storage/Proxy/SessionHandlerProxy.php
+++ b/vendor/symfony/http-foundation/Session/Storage/Proxy/SessionHandlerProxy.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Proxy;
 /**
  * @author Drak <drak@zikula.org>
  */
-class SessionHandlerProxy extends AbstractProxy implements \SessionHandlerInterface
+class SessionHandlerProxy extends AbstractProxy implements \SessionHandlerInterface, \SessionUpdateTimestampHandlerInterface
 {
     protected $handler;
 
@@ -82,4 +82,20 @@ class SessionHandlerProxy extends AbstractProxy implements \SessionHandlerInterf
     {
         return (bool) $this->handler->gc($maxlifetime);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function validateId($sessionId)
+    {
+        return !$this->handler instanceof \SessionUpdateTimestampHandlerInterface || $this->handler->validateId($sessionId);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function updateTimestamp($sessionId, $data)
+    {
+        return $this->handler instanceof \SessionUpdateTimestampHandlerInterface ? $this->handler->updateTimestamp($sessionId, $data) : $this->write($sessionId, $data);
+    }
 }
diff --git a/vendor/symfony/http-foundation/StreamedResponse.php b/vendor/symfony/http-foundation/StreamedResponse.php
index 92868d33..40f785c8 100644
--- a/vendor/symfony/http-foundation/StreamedResponse.php
+++ b/vendor/symfony/http-foundation/StreamedResponse.php
@@ -35,7 +35,7 @@ class StreamedResponse extends Response
      * @param int           $status   The response status code
      * @param array         $headers  An array of response headers
      */
-    public function __construct(callable $callback = null, $status = 200, $headers = array())
+    public function __construct(callable $callback = null, int $status = 200, array $headers = array())
     {
         parent::__construct(null, $status, $headers);
 
@@ -111,7 +111,7 @@ class StreamedResponse extends Response
             throw new \LogicException('The Response callback must not be null.');
         }
 
-        call_user_func($this->callback);
+        \call_user_func($this->callback);
 
         return $this;
     }
@@ -129,6 +129,8 @@ class StreamedResponse extends Response
             throw new \LogicException('The content cannot be set on a StreamedResponse instance.');
         }
 
+        $this->streamed = true;
+
         return $this;
     }
 
diff --git a/vendor/symfony/http-foundation/Tests/AcceptHeaderItemTest.php b/vendor/symfony/http-foundation/Tests/AcceptHeaderItemTest.php
index cb43bb35..1a660247 100644
--- a/vendor/symfony/http-foundation/Tests/AcceptHeaderItemTest.php
+++ b/vendor/symfony/http-foundation/Tests/AcceptHeaderItemTest.php
@@ -66,7 +66,7 @@ class AcceptHeaderItemTest extends TestCase
             ),
             array(
                 'text/plain', array('charset' => 'utf-8', 'param' => 'this;should,not=matter', 'footnotes' => 'true'),
-                'text/plain;charset=utf-8;param="this;should,not=matter";footnotes=true',
+                'text/plain; charset=utf-8; param="this;should,not=matter"; footnotes=true',
             ),
         );
     }
diff --git a/vendor/symfony/http-foundation/Tests/AcceptHeaderTest.php b/vendor/symfony/http-foundation/Tests/AcceptHeaderTest.php
index 9929eac2..1ac6103e 100644
--- a/vendor/symfony/http-foundation/Tests/AcceptHeaderTest.php
+++ b/vendor/symfony/http-foundation/Tests/AcceptHeaderTest.php
@@ -100,4 +100,31 @@ class AcceptHeaderTest extends TestCase
             'order matters when q is equal2' => array('*;q=0.3,utf-8;q=0.7,ISO-8859-1;q=0.7',  array('utf-8', 'ISO-8859-1', '*')),
         );
     }
+
+    /**
+     * @dataProvider provideDefaultValueData
+     */
+    public function testDefaultValue($acceptHeader, $value, $expectedQuality)
+    {
+        $header = AcceptHeader::fromString($acceptHeader);
+        $this->assertSame($expectedQuality, $header->get($value)->getQuality());
+    }
+
+    public function provideDefaultValueData()
+    {
+        yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, *;q=0.3', 'text/xml', 0.3);
+        yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*;q=0.3', 'text/xml', 0.3);
+        yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*;q=0.3', 'text/html', 1.0);
+        yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*;q=0.3', 'text/plain', 0.5);
+        yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*;q=0.3', '*', 0.3);
+        yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*', '*', 1.0);
+        yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*', 'text/xml', 1.0);
+        yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*', 'text/*', 1.0);
+        yield array('text/plain;q=0.5, text/html, text/*;q=0.8, */*', 'text/*', 0.8);
+        yield array('text/plain;q=0.5, text/html, text/*;q=0.8, */*', 'text/html', 1.0);
+        yield array('text/plain;q=0.5, text/html, text/*;q=0.8, */*', 'text/x-dvi', 0.8);
+        yield array('*;q=0.3, ISO-8859-1;q=0.7, utf-8;q=0.7', '*', 0.3);
+        yield array('*;q=0.3, ISO-8859-1;q=0.7, utf-8;q=0.7', 'utf-8', 0.7);
+        yield array('*;q=0.3, ISO-8859-1;q=0.7, utf-8;q=0.7', 'SHIFT_JIS', 0.3);
+    }
 }
diff --git a/vendor/symfony/http-foundation/Tests/BinaryFileResponseTest.php b/vendor/symfony/http-foundation/Tests/BinaryFileResponseTest.php
index 1b9e5899..6bf04e16 100644
--- a/vendor/symfony/http-foundation/Tests/BinaryFileResponseTest.php
+++ b/vendor/symfony/http-foundation/Tests/BinaryFileResponseTest.php
@@ -32,7 +32,7 @@ class BinaryFileResponseTest extends ResponseTestCase
         $response = BinaryFileResponse::create($file, 404, array(), true, ResponseHeaderBag::DISPOSITION_INLINE);
         $this->assertEquals(404, $response->getStatusCode());
         $this->assertFalse($response->headers->has('ETag'));
-        $this->assertEquals('inline; filename="README.md"', $response->headers->get('Content-Disposition'));
+        $this->assertEquals('inline; filename=README.md', $response->headers->get('Content-Disposition'));
     }
 
     public function testConstructWithNonAsciiFilename()
@@ -66,7 +66,7 @@ class BinaryFileResponseTest extends ResponseTestCase
         $response = new BinaryFileResponse(__FILE__);
         $response->setContentDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, 'föö.html');
 
-        $this->assertSame('attachment; filename="f__.html"; filename*=utf-8\'\'f%C3%B6%C3%B6.html', $response->headers->get('Content-Disposition'));
+        $this->assertSame('attachment; filename=f__.html; filename*=utf-8\'\'f%C3%B6%C3%B6.html', $response->headers->get('Content-Disposition'));
     }
 
     public function testSetContentDispositionGeneratesSafeFallbackFilenameForWronglyEncodedFilename()
@@ -77,7 +77,7 @@ class BinaryFileResponseTest extends ResponseTestCase
         $response->setContentDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $iso88591EncodedFilename);
 
         // the parameter filename* is invalid in this case (rawurldecode('f%F6%F6') does not provide a UTF-8 string but an ISO-8859-1 encoded one)
-        $this->assertSame('attachment; filename="f__.html"; filename*=utf-8\'\'f%F6%F6.html', $response->headers->get('Content-Disposition'));
+        $this->assertSame('attachment; filename=f__.html; filename*=utf-8\'\'f%F6%F6.html', $response->headers->get('Content-Disposition'));
     }
 
     /**
@@ -208,6 +208,19 @@ class BinaryFileResponseTest extends ResponseTestCase
         );
     }
 
+    public function testUnpreparedResponseSendsFullFile()
+    {
+        $response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif', 200);
+
+        $data = file_get_contents(__DIR__.'/File/Fixtures/test.gif');
+
+        $this->expectOutputString($data);
+        $response = clone $response;
+        $response->sendContent();
+
+        $this->assertEquals(200, $response->getStatusCode());
+    }
+
     /**
      * @dataProvider provideInvalidRanges
      */
@@ -324,7 +337,8 @@ class BinaryFileResponseTest extends ResponseTestCase
     {
         return array(
             array('/var/www/var/www/files/foo.txt', '/var/www/=/files/', '/files/var/www/files/foo.txt'),
-            array('/home/foo/bar.txt', '/var/www/=/files/,/home/foo/=/baz/', '/baz/bar.txt'),
+            array('/home/Foo/bar.txt', '/var/www/=/files/,/home/Foo/=/baz/', '/baz/bar.txt'),
+            array('/home/Foo/bar.txt', '"/var/www/"="/files/", "/home/Foo/"="/baz/"', '/baz/bar.txt'),
         );
     }
 
diff --git a/vendor/symfony/http-foundation/Tests/CookieTest.php b/vendor/symfony/http-foundation/Tests/CookieTest.php
index a47b71e1..390d42a6 100644
--- a/vendor/symfony/http-foundation/Tests/CookieTest.php
+++ b/vendor/symfony/http-foundation/Tests/CookieTest.php
@@ -104,9 +104,6 @@ class CookieTest extends TestCase
         $this->assertEquals($expire->format('U'), $cookie->getExpiresTime(), '->getExpiresTime() returns the expire date');
     }
 
-    /**
-     * @requires PHP 5.5
-     */
     public function testConstructorWithDateTimeImmutable()
     {
         $expire = new \DateTimeImmutable();
@@ -157,6 +154,18 @@ class CookieTest extends TestCase
         $cookie = new Cookie('foo', 'bar', time() - 20);
 
         $this->assertTrue($cookie->isCleared(), '->isCleared() returns true if the cookie has expired');
+
+        $cookie = new Cookie('foo', 'bar');
+
+        $this->assertFalse($cookie->isCleared());
+
+        $cookie = new Cookie('foo', 'bar', 0);
+
+        $this->assertFalse($cookie->isCleared());
+
+        $cookie = new Cookie('foo', 'bar', -1);
+
+        $this->assertFalse($cookie->isCleared());
     }
 
     public function testToString()
@@ -204,6 +213,9 @@ class CookieTest extends TestCase
 
         $cookie = Cookie::fromString('foo=bar', true);
         $this->assertEquals(new Cookie('foo', 'bar', 0, '/', null, false, false), $cookie);
+
+        $cookie = Cookie::fromString('foo', true);
+        $this->assertEquals(new Cookie('foo', null, 0, '/', null, false, false), $cookie);
     }
 
     public function testFromStringWithHttpOnly()
diff --git a/vendor/symfony/http-foundation/Tests/File/MimeType/MimeTypeTest.php b/vendor/symfony/http-foundation/Tests/File/MimeType/MimeTypeTest.php
index b3f1f026..bb88807a 100644
--- a/vendor/symfony/http-foundation/Tests/File/MimeType/MimeTypeTest.php
+++ b/vendor/symfony/http-foundation/Tests/File/MimeType/MimeTypeTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\HttpFoundation\Tests\File\MimeType;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser;
 use Symfony\Component\HttpFoundation\File\MimeType\FileBinaryMimeTypeGuesser;
+use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser;
 
 /**
  * @requires extension fileinfo
@@ -59,7 +59,7 @@ class MimeTypeTest extends TestCase
 
     public function testGuessWithNonReadablePath()
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('Can not verify chmod operations on Windows');
         }
 
diff --git a/vendor/symfony/http-foundation/Tests/File/UploadedFileTest.php b/vendor/symfony/http-foundation/Tests/File/UploadedFileTest.php
index 36f122fe..6a0b550d 100644
--- a/vendor/symfony/http-foundation/Tests/File/UploadedFileTest.php
+++ b/vendor/symfony/http-foundation/Tests/File/UploadedFileTest.php
@@ -12,6 +12,14 @@
 namespace Symfony\Component\HttpFoundation\Tests\File;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\File\Exception\CannotWriteFileException;
+use Symfony\Component\HttpFoundation\File\Exception\ExtensionFileException;
+use Symfony\Component\HttpFoundation\File\Exception\FileException;
+use Symfony\Component\HttpFoundation\File\Exception\FormSizeFileException;
+use Symfony\Component\HttpFoundation\File\Exception\IniSizeFileException;
+use Symfony\Component\HttpFoundation\File\Exception\NoFileException;
+use Symfony\Component\HttpFoundation\File\Exception\NoTmpDirFileException;
+use Symfony\Component\HttpFoundation\File\Exception\PartialFileException;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class UploadedFileTest extends TestCase
@@ -40,13 +48,12 @@ class UploadedFileTest extends TestCase
             __DIR__.'/Fixtures/test.gif',
             'original.gif',
             null,
-            filesize(__DIR__.'/Fixtures/test.gif'),
             UPLOAD_ERR_OK
         );
 
         $this->assertEquals('application/octet-stream', $file->getClientMimeType());
 
-        if (extension_loaded('fileinfo')) {
+        if (\extension_loaded('fileinfo')) {
             $this->assertEquals('image/gif', $file->getMimeType());
         }
     }
@@ -57,7 +64,6 @@ class UploadedFileTest extends TestCase
             __DIR__.'/Fixtures/.unknownextension',
             'original.gif',
             null,
-            filesize(__DIR__.'/Fixtures/.unknownextension'),
             UPLOAD_ERR_OK
         );
 
@@ -70,7 +76,6 @@ class UploadedFileTest extends TestCase
             __DIR__.'/Fixtures/test.gif',
             'original.gif',
             'image/gif',
-            filesize(__DIR__.'/Fixtures/test.gif'),
             null
         );
 
@@ -83,7 +88,6 @@ class UploadedFileTest extends TestCase
             __DIR__.'/Fixtures/test.gif',
             'original.gif',
             'image/jpeg',
-            filesize(__DIR__.'/Fixtures/test.gif'),
             null
         );
 
@@ -96,7 +100,6 @@ class UploadedFileTest extends TestCase
             __DIR__.'/Fixtures/test.gif',
             'original.gif',
             'image/gif',
-            filesize(__DIR__.'/Fixtures/test.gif'),
             null
         );
 
@@ -109,7 +112,6 @@ class UploadedFileTest extends TestCase
             __DIR__.'/Fixtures/test.gif',
             'original.gif',
             'image/gif',
-            filesize(__DIR__.'/Fixtures/test.gif'),
             null
         );
 
@@ -122,7 +124,6 @@ class UploadedFileTest extends TestCase
             __DIR__.'/Fixtures/test.gif',
             'original.gif',
             'image/gif',
-            filesize(__DIR__.'/Fixtures/test.gif'),
             null
         );
 
@@ -138,13 +139,60 @@ class UploadedFileTest extends TestCase
             __DIR__.'/Fixtures/test.gif',
             'original.gif',
             'image/gif',
-            filesize(__DIR__.'/Fixtures/test.gif'),
             UPLOAD_ERR_OK
         );
 
         $movedFile = $file->move(__DIR__.'/Fixtures/directory');
     }
 
+    public function failedUploadedFile()
+    {
+        foreach (array(UPLOAD_ERR_INI_SIZE, UPLOAD_ERR_FORM_SIZE, UPLOAD_ERR_PARTIAL, UPLOAD_ERR_NO_FILE, UPLOAD_ERR_CANT_WRITE, UPLOAD_ERR_NO_TMP_DIR, UPLOAD_ERR_EXTENSION, -1) as $error) {
+            yield array(new UploadedFile(
+                __DIR__.'/Fixtures/test.gif',
+                'original.gif',
+                'image/gif',
+                $error
+            ));
+        }
+    }
+
+    /**
+     * @dataProvider failedUploadedFile
+     */
+    public function testMoveFailed(UploadedFile $file)
+    {
+        switch ($file->getError()) {
+            case UPLOAD_ERR_INI_SIZE:
+                $exceptionClass = IniSizeFileException::class;
+                break;
+            case UPLOAD_ERR_FORM_SIZE:
+                $exceptionClass = FormSizeFileException::class;
+                break;
+            case UPLOAD_ERR_PARTIAL:
+                $exceptionClass = PartialFileException::class;
+                break;
+            case UPLOAD_ERR_NO_FILE:
+                $exceptionClass = NoFileException::class;
+                break;
+            case UPLOAD_ERR_CANT_WRITE:
+                $exceptionClass = CannotWriteFileException::class;
+                break;
+            case UPLOAD_ERR_NO_TMP_DIR:
+                $exceptionClass = NoTmpDirFileException::class;
+                break;
+            case UPLOAD_ERR_EXTENSION:
+                $exceptionClass = ExtensionFileException::class;
+                break;
+            default:
+                $exceptionClass = FileException::class;
+        }
+
+        $this->expectException($exceptionClass);
+
+        $file->move(__DIR__.'/Fixtures/directory');
+    }
+
     public function testMoveLocalFileIsAllowedInTestMode()
     {
         $path = __DIR__.'/Fixtures/test.copy.gif';
@@ -158,7 +206,6 @@ class UploadedFileTest extends TestCase
             $path,
             'original.gif',
             'image/gif',
-            filesize($path),
             UPLOAD_ERR_OK,
             true
         );
@@ -177,9 +224,7 @@ class UploadedFileTest extends TestCase
         $file = new UploadedFile(
             __DIR__.'/Fixtures/test.gif',
             '../../original.gif',
-            'image/gif',
-            filesize(__DIR__.'/Fixtures/test.gif'),
-            null
+            'image/gif'
         );
 
         $this->assertEquals('original.gif', $file->getClientOriginalName());
@@ -190,9 +235,7 @@ class UploadedFileTest extends TestCase
         $file = new UploadedFile(
             __DIR__.'/Fixtures/test.gif',
             'original.gif',
-            'image/gif',
-            filesize(__DIR__.'/Fixtures/test.gif'),
-            null
+            'image/gif'
         );
 
         $this->assertEquals(filesize(__DIR__.'/Fixtures/test.gif'), $file->getSize());
@@ -206,12 +249,45 @@ class UploadedFileTest extends TestCase
         $this->assertEquals(filesize(__DIR__.'/Fixtures/test'), $file->getSize());
     }
 
-    public function testGetExtension()
+    /**
+     * @group legacy
+     * @expectedDeprecation Passing a size as 4th argument to the constructor of "Symfony\Component\HttpFoundation\File\UploadedFile" is deprecated since Symfony 4.1.
+     */
+    public function testConstructDeprecatedSize()
     {
         $file = new UploadedFile(
             __DIR__.'/Fixtures/test.gif',
             'original.gif',
-            null
+            'image/gif',
+            filesize(__DIR__.'/Fixtures/test.gif'),
+            UPLOAD_ERR_OK,
+            false
+        );
+
+        $this->assertEquals(filesize(__DIR__.'/Fixtures/test.gif'), $file->getSize());
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Passing a size as 4th argument to the constructor of "Symfony\Component\HttpFoundation\File\UploadedFile" is deprecated since Symfony 4.1.
+     */
+    public function testConstructDeprecatedSizeWhenPassingOnlyThe4Needed()
+    {
+        $file = new UploadedFile(
+            __DIR__.'/Fixtures/test.gif',
+            'original.gif',
+            'image/gif',
+            filesize(__DIR__.'/Fixtures/test.gif')
+        );
+
+        $this->assertEquals(filesize(__DIR__.'/Fixtures/test.gif'), $file->getSize());
+    }
+
+    public function testGetExtension()
+    {
+        $file = new UploadedFile(
+            __DIR__.'/Fixtures/test.gif',
+            'original.gif'
         );
 
         $this->assertEquals('gif', $file->getExtension());
@@ -223,7 +299,6 @@ class UploadedFileTest extends TestCase
             __DIR__.'/Fixtures/test.gif',
             'original.gif',
             null,
-            filesize(__DIR__.'/Fixtures/test.gif'),
             UPLOAD_ERR_OK,
             true
         );
@@ -240,7 +315,6 @@ class UploadedFileTest extends TestCase
             __DIR__.'/Fixtures/test.gif',
             'original.gif',
             null,
-            filesize(__DIR__.'/Fixtures/test.gif'),
             $error
         );
 
@@ -264,7 +338,6 @@ class UploadedFileTest extends TestCase
             __DIR__.'/Fixtures/test.gif',
             'original.gif',
             null,
-            filesize(__DIR__.'/Fixtures/test.gif'),
             UPLOAD_ERR_OK
         );
 
diff --git a/vendor/symfony/http-foundation/Tests/FileBagTest.php b/vendor/symfony/http-foundation/Tests/FileBagTest.php
index b1bbba0d..06136e20 100644
--- a/vendor/symfony/http-foundation/Tests/FileBagTest.php
+++ b/vendor/symfony/http-foundation/Tests/FileBagTest.php
@@ -34,14 +34,14 @@ class FileBagTest extends TestCase
     public function testShouldConvertsUploadedFiles()
     {
         $tmpFile = $this->createTempFile();
-        $file = new UploadedFile($tmpFile, basename($tmpFile), 'text/plain', 100, 0);
+        $file = new UploadedFile($tmpFile, basename($tmpFile), 'text/plain');
 
         $bag = new FileBag(array('file' => array(
             'name' => basename($tmpFile),
             'type' => 'text/plain',
             'tmp_name' => $tmpFile,
             'error' => 0,
-            'size' => 100,
+            'size' => null,
         )));
 
         $this->assertEquals($file, $bag->get('file'));
@@ -89,7 +89,7 @@ class FileBagTest extends TestCase
     public function testShouldConvertUploadedFilesWithPhpBug()
     {
         $tmpFile = $this->createTempFile();
-        $file = new UploadedFile($tmpFile, basename($tmpFile), 'text/plain', 100, 0);
+        $file = new UploadedFile($tmpFile, basename($tmpFile), 'text/plain');
 
         $bag = new FileBag(array(
             'child' => array(
@@ -106,7 +106,7 @@ class FileBagTest extends TestCase
                     'file' => 0,
                 ),
                 'size' => array(
-                    'file' => 100,
+                    'file' => null,
                 ),
             ),
         ));
@@ -118,7 +118,7 @@ class FileBagTest extends TestCase
     public function testShouldConvertNestedUploadedFilesWithPhpBug()
     {
         $tmpFile = $this->createTempFile();
-        $file = new UploadedFile($tmpFile, basename($tmpFile), 'text/plain', 100, 0);
+        $file = new UploadedFile($tmpFile, basename($tmpFile), 'text/plain');
 
         $bag = new FileBag(array(
             'child' => array(
@@ -135,7 +135,7 @@ class FileBagTest extends TestCase
                     'sub' => array('file' => 0),
                 ),
                 'size' => array(
-                    'sub' => array('file' => 100),
+                    'sub' => array('file' => null),
                 ),
             ),
         ));
@@ -147,7 +147,7 @@ class FileBagTest extends TestCase
     public function testShouldNotConvertNestedUploadedFiles()
     {
         $tmpFile = $this->createTempFile();
-        $file = new UploadedFile($tmpFile, basename($tmpFile), 'text/plain', 100, 0);
+        $file = new UploadedFile($tmpFile, basename($tmpFile), 'text/plain');
         $bag = new FileBag(array('image' => array('file' => $file)));
 
         $files = $bag->all();
@@ -156,7 +156,10 @@ class FileBagTest extends TestCase
 
     protected function createTempFile()
     {
-        return tempnam(sys_get_temp_dir().'/form_test', 'FormTest');
+        $tempFile = tempnam(sys_get_temp_dir().'/form_test', 'FormTest');
+        file_put_contents($tempFile, '1');
+
+        return $tempFile;
     }
 
     protected function setUp()
diff --git a/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/common.inc b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/common.inc
index ba101d35..f9c40a9a 100644
--- a/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/common.inc
+++ b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/common.inc
@@ -22,6 +22,10 @@ error_reporting(-1);
 ini_set('html_errors', 0);
 ini_set('display_errors', 1);
 
+if (ini_get('xdebug.default_enable')) {
+    xdebug_disable();
+}
+
 header_remove('X-Powered-By');
 header('Content-Type: text/plain; charset=utf-8');
 
diff --git a/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.expected b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.expected
index 4e9c4c07..14e44a39 100644
--- a/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.expected
+++ b/vendor/symfony/http-foundation/Tests/Fixtures/response-functional/cookie_urlencode.expected
@@ -4,7 +4,7 @@ Array
     [0] => Content-Type: text/plain; charset=utf-8
     [1] => Cache-Control: no-cache, private
     [2] => Date: Sat, 12 Nov 1955 20:04:00 GMT
-    [3] => Set-Cookie: %3F%2A%28%29%3A%40%26%2B%24%2F%25%23%5B%5D=%3F%2A%28%29%3A%40%26%2B%24%2F%25%23%5B%5D; path=/
+    [3] => Set-Cookie: ?*():@&+$/%#[]=%3F%2A%28%29%3A%40%26%2B%24%2F%25%23%5B%5D; path=/
     [4] => Set-Cookie: ?*():@&+$/%#[]=%3F%2A%28%29%3A%40%26%2B%24%2F%25%23%5B%5D; path=/
 )
 shutdown
diff --git a/vendor/symfony/http-foundation/Tests/HeaderBagTest.php b/vendor/symfony/http-foundation/Tests/HeaderBagTest.php
index 6d19ceb0..c5a437f9 100644
--- a/vendor/symfony/http-foundation/Tests/HeaderBagTest.php
+++ b/vendor/symfony/http-foundation/Tests/HeaderBagTest.php
@@ -192,7 +192,7 @@ class HeaderBagTest extends TestCase
             $this->assertEquals(array($headers[$key]), $val);
         }
 
-        $this->assertEquals(count($headers), $i);
+        $this->assertEquals(\count($headers), $i);
     }
 
     public function testCount()
@@ -200,6 +200,6 @@ class HeaderBagTest extends TestCase
         $headers = array('foo' => 'bar', 'HELLO' => 'WORLD');
         $headerBag = new HeaderBag($headers);
 
-        $this->assertCount(count($headers), $headerBag);
+        $this->assertCount(\count($headers), $headerBag);
     }
 }
diff --git a/vendor/symfony/http-foundation/Tests/HeaderUtilsTest.php b/vendor/symfony/http-foundation/Tests/HeaderUtilsTest.php
new file mode 100644
index 00000000..2f5fdc21
--- /dev/null
+++ b/vendor/symfony/http-foundation/Tests/HeaderUtilsTest.php
@@ -0,0 +1,85 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\HeaderUtils;
+
+class HeaderUtilsTest extends TestCase
+{
+    public function testSplit()
+    {
+        $this->assertSame(array('foo=123', 'bar'), HeaderUtils::split('foo=123,bar', ','));
+        $this->assertSame(array('foo=123', 'bar'), HeaderUtils::split('foo=123, bar', ','));
+        $this->assertSame(array(array('foo=123', 'bar')), HeaderUtils::split('foo=123; bar', ',;'));
+        $this->assertSame(array(array('foo=123'), array('bar')), HeaderUtils::split('foo=123, bar', ',;'));
+        $this->assertSame(array('foo', '123, bar'), HeaderUtils::split('foo=123, bar', '='));
+        $this->assertSame(array('foo', '123, bar'), HeaderUtils::split(' foo = 123, bar ', '='));
+        $this->assertSame(array(array('foo', '123'), array('bar')), HeaderUtils::split('foo=123, bar', ',='));
+        $this->assertSame(array(array(array('foo', '123')), array(array('bar'), array('foo', '456'))), HeaderUtils::split('foo=123, bar; foo=456', ',;='));
+        $this->assertSame(array(array(array('foo', 'a,b;c=d'))), HeaderUtils::split('foo="a,b;c=d"', ',;='));
+
+        $this->assertSame(array('foo', 'bar'), HeaderUtils::split('foo,,,, bar', ','));
+        $this->assertSame(array('foo', 'bar'), HeaderUtils::split(',foo, bar,', ','));
+        $this->assertSame(array('foo', 'bar'), HeaderUtils::split(' , foo, bar, ', ','));
+        $this->assertSame(array('foo bar'), HeaderUtils::split('foo "bar"', ','));
+        $this->assertSame(array('foo bar'), HeaderUtils::split('"foo" bar', ','));
+        $this->assertSame(array('foo bar'), HeaderUtils::split('"foo" "bar"', ','));
+
+        // These are not a valid header values. We test that they parse anyway,
+        // and that both the valid and invalid parts are returned.
+        $this->assertSame(array(), HeaderUtils::split('', ','));
+        $this->assertSame(array(), HeaderUtils::split(',,,', ','));
+        $this->assertSame(array('foo', 'bar', 'baz'), HeaderUtils::split('foo, "bar", "baz', ','));
+        $this->assertSame(array('foo', 'bar, baz'), HeaderUtils::split('foo, "bar, baz', ','));
+        $this->assertSame(array('foo', 'bar, baz\\'), HeaderUtils::split('foo, "bar, baz\\', ','));
+        $this->assertSame(array('foo', 'bar, baz\\'), HeaderUtils::split('foo, "bar, baz\\\\', ','));
+    }
+
+    public function testCombine()
+    {
+        $this->assertSame(array('foo' => '123'), HeaderUtils::combine(array(array('foo', '123'))));
+        $this->assertSame(array('foo' => true), HeaderUtils::combine(array(array('foo'))));
+        $this->assertSame(array('foo' => true), HeaderUtils::combine(array(array('Foo'))));
+        $this->assertSame(array('foo' => '123', 'bar' => true), HeaderUtils::combine(array(array('foo', '123'), array('bar'))));
+    }
+
+    public function testToString()
+    {
+        $this->assertSame('foo', HeaderUtils::toString(array('foo' => true), ','));
+        $this->assertSame('foo; bar', HeaderUtils::toString(array('foo' => true, 'bar' => true), ';'));
+        $this->assertSame('foo=123', HeaderUtils::toString(array('foo' => '123'), ','));
+        $this->assertSame('foo="1 2 3"', HeaderUtils::toString(array('foo' => '1 2 3'), ','));
+        $this->assertSame('foo="1 2 3", bar', HeaderUtils::toString(array('foo' => '1 2 3', 'bar' => true), ','));
+    }
+
+    public function testQuote()
+    {
+        $this->assertSame('foo', HeaderUtils::quote('foo'));
+        $this->assertSame('az09!#$%&\'*.^_`|~-', HeaderUtils::quote('az09!#$%&\'*.^_`|~-'));
+        $this->assertSame('"foo bar"', HeaderUtils::quote('foo bar'));
+        $this->assertSame('"foo [bar]"', HeaderUtils::quote('foo [bar]'));
+        $this->assertSame('"foo \"bar\""', HeaderUtils::quote('foo "bar"'));
+        $this->assertSame('"foo \\\\ bar"', HeaderUtils::quote('foo \\ bar'));
+    }
+
+    public function testUnquote()
+    {
+        $this->assertEquals('foo', HeaderUtils::unquote('foo'));
+        $this->assertEquals('az09!#$%&\'*.^_`|~-', HeaderUtils::unquote('az09!#$%&\'*.^_`|~-'));
+        $this->assertEquals('foo bar', HeaderUtils::unquote('"foo bar"'));
+        $this->assertEquals('foo [bar]', HeaderUtils::unquote('"foo [bar]"'));
+        $this->assertEquals('foo "bar"', HeaderUtils::unquote('"foo \"bar\""'));
+        $this->assertEquals('foo "bar"', HeaderUtils::unquote('"foo \"\b\a\r\""'));
+        $this->assertEquals('foo \\ bar', HeaderUtils::unquote('"foo \\\\ bar"'));
+    }
+}
diff --git a/vendor/symfony/http-foundation/Tests/IpUtilsTest.php b/vendor/symfony/http-foundation/Tests/IpUtilsTest.php
index 7a93f994..232a2040 100644
--- a/vendor/symfony/http-foundation/Tests/IpUtilsTest.php
+++ b/vendor/symfony/http-foundation/Tests/IpUtilsTest.php
@@ -47,7 +47,7 @@ class IpUtilsTest extends TestCase
      */
     public function testIpv6($matches, $remoteAddr, $cidr)
     {
-        if (!defined('AF_INET6')) {
+        if (!\defined('AF_INET6')) {
             $this->markTestSkipped('Only works when PHP is compiled without the option "disable-ipv6".');
         }
 
@@ -78,7 +78,7 @@ class IpUtilsTest extends TestCase
      */
     public function testAnIpv6WithOptionDisabledIpv6()
     {
-        if (defined('AF_INET6')) {
+        if (\defined('AF_INET6')) {
             $this->markTestSkipped('Only works when PHP is compiled with the option "disable-ipv6".');
         }
 
diff --git a/vendor/symfony/http-foundation/Tests/ParameterBagTest.php b/vendor/symfony/http-foundation/Tests/ParameterBagTest.php
index ab908d8d..dccfd4f3 100644
--- a/vendor/symfony/http-foundation/Tests/ParameterBagTest.php
+++ b/vendor/symfony/http-foundation/Tests/ParameterBagTest.php
@@ -171,7 +171,7 @@ class ParameterBagTest extends TestCase
             $this->assertEquals($parameters[$key], $val);
         }
 
-        $this->assertEquals(count($parameters), $i);
+        $this->assertEquals(\count($parameters), $i);
     }
 
     public function testCount()
@@ -179,7 +179,7 @@ class ParameterBagTest extends TestCase
         $parameters = array('foo' => 'bar', 'hello' => 'world');
         $bag = new ParameterBag($parameters);
 
-        $this->assertCount(count($parameters), $bag);
+        $this->assertCount(\count($parameters), $bag);
     }
 
     public function testGetBoolean()
diff --git a/vendor/symfony/http-foundation/Tests/RequestMatcherTest.php b/vendor/symfony/http-foundation/Tests/RequestMatcherTest.php
index b5d80048..10d764a7 100644
--- a/vendor/symfony/http-foundation/Tests/RequestMatcherTest.php
+++ b/vendor/symfony/http-foundation/Tests/RequestMatcherTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\HttpFoundation\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpFoundation\RequestMatcher;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestMatcher;
 
 class RequestMatcherTest extends TestCase
 {
diff --git a/vendor/symfony/http-foundation/Tests/RequestTest.php b/vendor/symfony/http-foundation/Tests/RequestTest.php
index 4266197a..52392add 100644
--- a/vendor/symfony/http-foundation/Tests/RequestTest.php
+++ b/vendor/symfony/http-foundation/Tests/RequestTest.php
@@ -13,15 +13,14 @@ namespace Symfony\Component\HttpFoundation\Tests;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
-use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
-use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 
 class RequestTest extends TestCase
 {
     protected function tearDown()
     {
-        // reset
         Request::setTrustedProxies(array(), -1);
         Request::setTrustedHosts(array());
     }
@@ -676,7 +675,7 @@ class RequestTest extends TestCase
     public function getQueryStringNormalizationData()
     {
         return array(
-            array('foo', 'foo', 'works with valueless parameters'),
+            array('foo', 'foo=', 'works with valueless parameters'),
             array('foo=', 'foo=', 'includes a dangling equal sign'),
             array('bar=&foo=bar', 'bar=&foo=bar', '->works with empty parameters'),
             array('foo=bar&bar=', 'bar=&foo=bar', 'sorts keys alphabetically'),
@@ -685,18 +684,24 @@ class RequestTest extends TestCase
             // PHP also converts "+" to spaces when filling the global _GET or when using the function parse_str.
             array('him=John%20Doe&her=Jane+Doe', 'her=Jane%20Doe&him=John%20Doe', 'normalizes spaces in both encodings "%20" and "+"'),
 
-            array('foo[]=1&foo[]=2', 'foo%5B%5D=1&foo%5B%5D=2', 'allows array notation'),
-            array('foo=1&foo=2', 'foo=1&foo=2', 'allows repeated parameters'),
+            array('foo[]=1&foo[]=2', 'foo%5B0%5D=1&foo%5B1%5D=2', 'allows array notation'),
+            array('foo=1&foo=2', 'foo=2', 'merges repeated parameters'),
             array('pa%3Dram=foo%26bar%3Dbaz&test=test', 'pa%3Dram=foo%26bar%3Dbaz&test=test', 'works with encoded delimiters'),
-            array('0', '0', 'allows "0"'),
-            array('Jane Doe&John%20Doe', 'Jane%20Doe&John%20Doe', 'normalizes encoding in keys'),
+            array('0', '0=', 'allows "0"'),
+            array('Jane Doe&John%20Doe', 'Jane_Doe=&John_Doe=', 'normalizes encoding in keys'),
             array('her=Jane Doe&him=John%20Doe', 'her=Jane%20Doe&him=John%20Doe', 'normalizes encoding in values'),
-            array('foo=bar&&&test&&', 'foo=bar&test', 'removes unneeded delimiters'),
+            array('foo=bar&&&test&&', 'foo=bar&test=', 'removes unneeded delimiters'),
             array('formula=e=m*c^2', 'formula=e%3Dm%2Ac%5E2', 'correctly treats only the first "=" as delimiter and the next as value'),
 
             // Ignore pairs with empty key, even if there was a value, e.g. "=value", as such nameless values cannot be retrieved anyway.
             // PHP also does not include them when building _GET.
             array('foo=bar&=a=b&=x=y', 'foo=bar', 'removes params with empty key'),
+
+            // Don't reorder nested query string keys
+            array('foo[]=Z&foo[]=A', 'foo%5B0%5D=Z&foo%5B1%5D=A', 'keeps order of values'),
+            array('foo[Z]=B&foo[A]=B', 'foo%5BZ%5D=B&foo%5BA%5D=B', 'keeps order of keys'),
+
+            array('utf8=✓', 'utf8=%E2%9C%93', 'encodes UTF-8'),
         );
     }
 
@@ -849,6 +854,11 @@ class RequestTest extends TestCase
         $request->setMethod('POST');
         $request->headers->set('X-HTTP-METHOD-OVERRIDE', 'delete');
         $this->assertEquals('DELETE', $request->getMethod(), '->getMethod() returns the method from X-HTTP-Method-Override if defined and POST');
+
+        $request = new Request();
+        $request->setMethod('POST');
+        $request->query->set('_method', array('delete', 'patch'));
+        $this->assertSame('POST', $request->getMethod(), '->getMethod() returns the request method if invalid type is defined in query');
     }
 
     /**
@@ -889,14 +899,14 @@ class RequestTest extends TestCase
             array(array('127.0.0.1'),                              '127.0.0.1', 'for="_gazonk"',                                      array('127.0.0.1')),
             array(array('88.88.88.88'),                            '127.0.0.1', 'for="88.88.88.88:80"',                               array('127.0.0.1')),
             array(array('192.0.2.60'),                             '::1',       'for=192.0.2.60;proto=http;by=203.0.113.43',          array('::1')),
-            array(array('2620:0:1cfe:face:b00c::3', '192.0.2.43'), '::1',       'for=192.0.2.43, for=2620:0:1cfe:face:b00c::3',       array('::1')),
+            array(array('2620:0:1cfe:face:b00c::3', '192.0.2.43'), '::1',       'for=192.0.2.43, for="[2620:0:1cfe:face:b00c::3]"',   array('::1')),
             array(array('2001:db8:cafe::17'),                      '::1',       'for="[2001:db8:cafe::17]:4711',                      array('::1')),
         );
     }
 
     public function getClientIpsProvider()
     {
-        //        $expected                   $remoteAddr                $httpForwardedFor            $trustedProxies
+        //        $expected                          $remoteAddr                 $httpForwardedFor            $trustedProxies
         return array(
             // simple IPv4
             array(array('88.88.88.88'),              '88.88.88.88',              null,                        null),
@@ -910,8 +920,8 @@ class RequestTest extends TestCase
 
             // forwarded for with remote IPv4 addr not trusted
             array(array('127.0.0.1'),                '127.0.0.1',                '88.88.88.88',               null),
-            // forwarded for with remote IPv4 addr trusted
-            array(array('88.88.88.88'),              '127.0.0.1',                '88.88.88.88',               array('127.0.0.1')),
+            // forwarded for with remote IPv4 addr trusted + comma
+            array(array('88.88.88.88'),              '127.0.0.1',                '88.88.88.88,',              array('127.0.0.1')),
             // forwarded for with remote IPv4 and all FF addrs trusted
             array(array('88.88.88.88'),              '127.0.0.1',                '88.88.88.88',               array('127.0.0.1', '88.88.88.88')),
             // forwarded for with remote IPv4 range trusted
@@ -1015,7 +1025,7 @@ class RequestTest extends TestCase
             'HTTP_X_FORWARDED_FOR' => $httpXForwardedFor,
         );
 
-        Request::setTrustedProxies(array('88.88.88.88'), Request::HEADER_X_FORWARDED_ALL);
+        Request::setTrustedProxies(array('88.88.88.88'), -1);
 
         $request->initialize(array(), array(), array(), array(), array(), $server);
 
@@ -1073,21 +1083,6 @@ class RequestTest extends TestCase
         $this->assertEquals('My other content', $req->getContent());
     }
 
-    /**
-     * @expectedException \LogicException
-     * @dataProvider getContentCantBeCalledTwiceWithResourcesProvider
-     */
-    public function testGetContentCantBeCalledTwiceWithResources($first, $second)
-    {
-        if (\PHP_VERSION_ID >= 50600) {
-            $this->markTestSkipped('PHP >= 5.6 allows to open php://input several times.');
-        }
-
-        $req = new Request();
-        $req->getContent($first);
-        $req->getContent($second);
-    }
-
     public function getContentCantBeCalledTwiceWithResourcesProvider()
     {
         return array(
@@ -1098,7 +1093,6 @@ class RequestTest extends TestCase
 
     /**
      * @dataProvider getContentCanBeCalledTwiceWithResourcesProvider
-     * @requires PHP 5.6
      */
     public function testGetContentCanBeCalledTwiceWithResources($first, $second)
     {
@@ -1508,6 +1502,15 @@ class RequestTest extends TestCase
         $this->assertObjectHasAttribute('attributeName', $session);
     }
 
+    /**
+     * @group legacy
+     * @expectedDeprecation Calling "Symfony\Component\HttpFoundation\Request::getSession()" when no session has been set is deprecated since Symfony 4.1 and will throw an exception in 5.0. Use "hasSession()" instead.
+     */
+    public function testGetSessionNullable()
+    {
+        (new Request())->getSession();
+    }
+
     public function testHasPreviousSession()
     {
         $request = new Request();
@@ -1765,53 +1768,6 @@ class RequestTest extends TestCase
         $this->assertTrue($request->isSecure());
     }
 
-    /**
-     * @group legacy
-     * @expectedDeprecation The "Symfony\Component\HttpFoundation\Request::setTrustedHeaderName()" method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the $trustedHeaderSet argument of the Request::setTrustedProxies() method instead.
-     */
-    public function testLegacyTrustedProxies()
-    {
-        $request = Request::create('http://example.com/');
-        $request->server->set('REMOTE_ADDR', '3.3.3.3');
-        $request->headers->set('X_FORWARDED_FOR', '1.1.1.1, 2.2.2.2');
-        $request->headers->set('X_FORWARDED_HOST', 'foo.example.com, real.example.com:8080');
-        $request->headers->set('X_FORWARDED_PROTO', 'https');
-        $request->headers->set('X_FORWARDED_PORT', 443);
-        $request->headers->set('X_MY_FOR', '3.3.3.3, 4.4.4.4');
-        $request->headers->set('X_MY_HOST', 'my.example.com');
-        $request->headers->set('X_MY_PROTO', 'http');
-        $request->headers->set('X_MY_PORT', 81);
-
-        Request::setTrustedProxies(array('3.3.3.3', '2.2.2.2'), Request::HEADER_X_FORWARDED_ALL);
-
-        // custom header names
-        Request::setTrustedHeaderName(Request::HEADER_CLIENT_IP, 'X_MY_FOR');
-        Request::setTrustedHeaderName(Request::HEADER_CLIENT_HOST, 'X_MY_HOST');
-        Request::setTrustedHeaderName(Request::HEADER_CLIENT_PORT, 'X_MY_PORT');
-        Request::setTrustedHeaderName(Request::HEADER_CLIENT_PROTO, 'X_MY_PROTO');
-        $this->assertEquals('4.4.4.4', $request->getClientIp());
-        $this->assertEquals('my.example.com', $request->getHost());
-        $this->assertEquals(81, $request->getPort());
-        $this->assertFalse($request->isSecure());
-
-        // disabling via empty header names
-        Request::setTrustedHeaderName(Request::HEADER_CLIENT_IP, null);
-        Request::setTrustedHeaderName(Request::HEADER_CLIENT_HOST, null);
-        Request::setTrustedHeaderName(Request::HEADER_CLIENT_PORT, null);
-        Request::setTrustedHeaderName(Request::HEADER_CLIENT_PROTO, null);
-        $this->assertEquals('3.3.3.3', $request->getClientIp());
-        $this->assertEquals('example.com', $request->getHost());
-        $this->assertEquals(80, $request->getPort());
-        $this->assertFalse($request->isSecure());
-
-        //reset
-        Request::setTrustedHeaderName(Request::HEADER_FORWARDED, 'FORWARDED');
-        Request::setTrustedHeaderName(Request::HEADER_CLIENT_IP, 'X_FORWARDED_FOR');
-        Request::setTrustedHeaderName(Request::HEADER_CLIENT_HOST, 'X_FORWARDED_HOST');
-        Request::setTrustedHeaderName(Request::HEADER_CLIENT_PORT, 'X_FORWARDED_PORT');
-        Request::setTrustedHeaderName(Request::HEADER_CLIENT_PROTO, 'X_FORWARDED_PROTO');
-    }
-
     public function testTrustedProxiesForwarded()
     {
         $request = Request::create('http://example.com/');
@@ -1861,26 +1817,6 @@ class RequestTest extends TestCase
         $this->assertTrue($request->isSecure());
     }
 
-    /**
-     * @group legacy
-     * @expectedException \InvalidArgumentException
-     */
-    public function testSetTrustedProxiesInvalidHeaderName()
-    {
-        Request::create('http://example.com/');
-        Request::setTrustedHeaderName('bogus name', 'X_MY_FOR');
-    }
-
-    /**
-     * @group legacy
-     * @expectedException \InvalidArgumentException
-     */
-    public function testGetTrustedProxiesInvalidHeaderName()
-    {
-        Request::create('http://example.com/');
-        Request::getTrustedHeaderName('bogus name');
-    }
-
     /**
      * @dataProvider iisRequestUriProvider
      */
@@ -1900,20 +1836,6 @@ class RequestTest extends TestCase
     public function iisRequestUriProvider()
     {
         return array(
-            array(
-                array(
-                    'X_ORIGINAL_URL' => '/foo/bar',
-                ),
-                array(),
-                '/foo/bar',
-            ),
-            array(
-                array(
-                    'X_REWRITE_URL' => '/foo/bar',
-                ),
-                array(),
-                '/foo/bar',
-            ),
             array(
                 array(),
                 array(
@@ -1922,36 +1844,6 @@ class RequestTest extends TestCase
                 ),
                 '/foo/bar',
             ),
-            array(
-                array(
-                    'X_ORIGINAL_URL' => '/foo/bar',
-                ),
-                array(
-                    'HTTP_X_ORIGINAL_URL' => '/foo/bar',
-                ),
-                '/foo/bar',
-            ),
-            array(
-                array(
-                    'X_ORIGINAL_URL' => '/foo/bar',
-                ),
-                array(
-                    'IIS_WasUrlRewritten' => '1',
-                    'UNENCODED_URL' => '/foo/bar',
-                ),
-                '/foo/bar',
-            ),
-            array(
-                array(
-                    'X_ORIGINAL_URL' => '/foo/bar',
-                ),
-                array(
-                    'HTTP_X_ORIGINAL_URL' => '/foo/bar',
-                    'IIS_WasUrlRewritten' => '1',
-                    'UNENCODED_URL' => '/foo/bar',
-                ),
-                '/foo/bar',
-            ),
             array(
                 array(),
                 array(
@@ -2142,14 +2034,13 @@ class RequestTest extends TestCase
     }
 
     /**
-     * @group legacy
-     * @expectedDeprecation Checking only for cacheable HTTP methods with Symfony\Component\HttpFoundation\Request::isMethodSafe() is deprecated since Symfony 3.2 and will throw an exception in 4.0. Disable checking only for cacheable methods by calling the method with `false` as first argument or use the Request::isMethodCacheable() instead.
+     * @expectedException \BadMethodCallException
      */
     public function testMethodSafeChecksCacheable()
     {
         $request = new Request();
         $request->setMethod('OPTIONS');
-        $this->assertFalse($request->isMethodSafe());
+        $request->isMethodSafe();
     }
 
     /**
@@ -2178,61 +2069,6 @@ class RequestTest extends TestCase
         );
     }
 
-    /**
-     * @group legacy
-     */
-    public function testGetTrustedHeaderName()
-    {
-        Request::setTrustedProxies(array('8.8.8.8'), Request::HEADER_X_FORWARDED_ALL);
-
-        $this->assertNull(Request::getTrustedHeaderName(Request::HEADER_FORWARDED));
-        $this->assertSame('X_FORWARDED_FOR', Request::getTrustedHeaderName(Request::HEADER_CLIENT_IP));
-        $this->assertSame('X_FORWARDED_HOST', Request::getTrustedHeaderName(Request::HEADER_CLIENT_HOST));
-        $this->assertSame('X_FORWARDED_PORT', Request::getTrustedHeaderName(Request::HEADER_CLIENT_PORT));
-        $this->assertSame('X_FORWARDED_PROTO', Request::getTrustedHeaderName(Request::HEADER_CLIENT_PROTO));
-
-        Request::setTrustedProxies(array('8.8.8.8'), Request::HEADER_FORWARDED);
-
-        $this->assertSame('FORWARDED', Request::getTrustedHeaderName(Request::HEADER_FORWARDED));
-        $this->assertNull(Request::getTrustedHeaderName(Request::HEADER_CLIENT_IP));
-        $this->assertNull(Request::getTrustedHeaderName(Request::HEADER_CLIENT_HOST));
-        $this->assertNull(Request::getTrustedHeaderName(Request::HEADER_CLIENT_PORT));
-        $this->assertNull(Request::getTrustedHeaderName(Request::HEADER_CLIENT_PROTO));
-
-        Request::setTrustedHeaderName(Request::HEADER_FORWARDED, 'A');
-        Request::setTrustedHeaderName(Request::HEADER_CLIENT_IP, 'B');
-        Request::setTrustedHeaderName(Request::HEADER_CLIENT_HOST, 'C');
-        Request::setTrustedHeaderName(Request::HEADER_CLIENT_PORT, 'D');
-        Request::setTrustedHeaderName(Request::HEADER_CLIENT_PROTO, 'E');
-
-        Request::setTrustedProxies(array('8.8.8.8'), Request::HEADER_FORWARDED);
-
-        $this->assertSame('A', Request::getTrustedHeaderName(Request::HEADER_FORWARDED));
-        $this->assertNull(Request::getTrustedHeaderName(Request::HEADER_CLIENT_IP));
-        $this->assertNull(Request::getTrustedHeaderName(Request::HEADER_CLIENT_HOST));
-        $this->assertNull(Request::getTrustedHeaderName(Request::HEADER_CLIENT_PORT));
-        $this->assertNull(Request::getTrustedHeaderName(Request::HEADER_CLIENT_PROTO));
-
-        Request::setTrustedProxies(array('8.8.8.8'), Request::HEADER_X_FORWARDED_ALL);
-
-        $this->assertNull(Request::getTrustedHeaderName(Request::HEADER_FORWARDED));
-        $this->assertSame('B', Request::getTrustedHeaderName(Request::HEADER_CLIENT_IP));
-        $this->assertSame('C', Request::getTrustedHeaderName(Request::HEADER_CLIENT_HOST));
-        $this->assertSame('D', Request::getTrustedHeaderName(Request::HEADER_CLIENT_PORT));
-        $this->assertSame('E', Request::getTrustedHeaderName(Request::HEADER_CLIENT_PROTO));
-
-        Request::setTrustedProxies(array('8.8.8.8'), Request::HEADER_FORWARDED);
-
-        $this->assertSame('A', Request::getTrustedHeaderName(Request::HEADER_FORWARDED));
-
-        //reset
-        Request::setTrustedHeaderName(Request::HEADER_FORWARDED, 'FORWARDED');
-        Request::setTrustedHeaderName(Request::HEADER_CLIENT_IP, 'X_FORWARDED_FOR');
-        Request::setTrustedHeaderName(Request::HEADER_CLIENT_HOST, 'X_FORWARDED_HOST');
-        Request::setTrustedHeaderName(Request::HEADER_CLIENT_PORT, 'X_FORWARDED_PORT');
-        Request::setTrustedHeaderName(Request::HEADER_CLIENT_PROTO, 'X_FORWARDED_PROTO');
-    }
-
     /**
      * @dataProvider protocolVersionProvider
      */
@@ -2317,6 +2153,55 @@ class RequestTest extends TestCase
         $this->assertEquals($expectedBaseUrl, $request->getBaseUrl());
         $this->assertEquals($expectedBasePath, $request->getBasePath());
     }
+
+    public function testTrustedHost()
+    {
+        Request::setTrustedProxies(array('1.1.1.1'), -1);
+
+        $request = Request::create('/');
+        $request->server->set('REMOTE_ADDR', '1.1.1.1');
+        $request->headers->set('Forwarded', 'host=localhost:8080');
+        $request->headers->set('X-Forwarded-Host', 'localhost:8080');
+
+        $this->assertSame('localhost:8080', $request->getHttpHost());
+        $this->assertSame(8080, $request->getPort());
+
+        $request = Request::create('/');
+        $request->server->set('REMOTE_ADDR', '1.1.1.1');
+        $request->headers->set('Forwarded', 'host="[::1]:443"');
+        $request->headers->set('X-Forwarded-Host', '[::1]:443');
+        $request->headers->set('X-Forwarded-Port', 443);
+
+        $this->assertSame('[::1]:443', $request->getHttpHost());
+        $this->assertSame(443, $request->getPort());
+    }
+
+    public function testTrustedPort()
+    {
+        Request::setTrustedProxies(array('1.1.1.1'), -1);
+
+        $request = Request::create('/');
+        $request->server->set('REMOTE_ADDR', '1.1.1.1');
+        $request->headers->set('Forwarded', 'host=localhost:8080');
+        $request->headers->set('X-Forwarded-Port', 8080);
+
+        $this->assertSame(8080, $request->getPort());
+
+        $request = Request::create('/');
+        $request->server->set('REMOTE_ADDR', '1.1.1.1');
+        $request->headers->set('Forwarded', 'host=localhost');
+        $request->headers->set('X-Forwarded-Port', 80);
+
+        $this->assertSame(80, $request->getPort());
+
+        $request = Request::create('/');
+        $request->server->set('REMOTE_ADDR', '1.1.1.1');
+        $request->headers->set('Forwarded', 'host="[::1]"');
+        $request->headers->set('X-Forwarded-Proto', 'https');
+        $request->headers->set('X-Forwarded-Port', 443);
+
+        $this->assertSame(443, $request->getPort());
+    }
 }
 
 class RequestContentProxy extends Request
diff --git a/vendor/symfony/http-foundation/Tests/ResponseHeaderBagTest.php b/vendor/symfony/http-foundation/Tests/ResponseHeaderBagTest.php
index 7b5e720a..e987677d 100644
--- a/vendor/symfony/http-foundation/Tests/ResponseHeaderBagTest.php
+++ b/vendor/symfony/http-foundation/Tests/ResponseHeaderBagTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\HttpFoundation\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 use Symfony\Component\HttpFoundation\Cookie;
+use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 
 /**
  * @group time-sensitive
@@ -287,12 +287,12 @@ class ResponseHeaderBagTest extends TestCase
     public function provideMakeDisposition()
     {
         return array(
-            array('attachment', 'foo.html', 'foo.html', 'attachment; filename="foo.html"'),
-            array('attachment', 'foo.html', '', 'attachment; filename="foo.html"'),
+            array('attachment', 'foo.html', 'foo.html', 'attachment; filename=foo.html'),
+            array('attachment', 'foo.html', '', 'attachment; filename=foo.html'),
             array('attachment', 'foo bar.html', '', 'attachment; filename="foo bar.html"'),
             array('attachment', 'foo "bar".html', '', 'attachment; filename="foo \\"bar\\".html"'),
             array('attachment', 'foo%20bar.html', 'foo bar.html', 'attachment; filename="foo bar.html"; filename*=utf-8\'\'foo%2520bar.html'),
-            array('attachment', 'föö.html', 'foo.html', 'attachment; filename="foo.html"; filename*=utf-8\'\'f%C3%B6%C3%B6.html'),
+            array('attachment', 'föö.html', 'foo.html', 'attachment; filename=foo.html; filename*=utf-8\'\'f%C3%B6%C3%B6.html'),
         );
     }
 
diff --git a/vendor/symfony/http-foundation/Tests/ResponseTest.php b/vendor/symfony/http-foundation/Tests/ResponseTest.php
index 350d972a..f9b5ef4f 100644
--- a/vendor/symfony/http-foundation/Tests/ResponseTest.php
+++ b/vendor/symfony/http-foundation/Tests/ResponseTest.php
@@ -126,7 +126,7 @@ class ResponseTest extends ResponseTestCase
 
     public function testSetNotModified()
     {
-        $response = new Response();
+        $response = new Response('foo');
         $modified = $response->setNotModified();
         $this->assertObjectHasAttribute('headers', $modified);
         $this->assertObjectHasAttribute('content', $modified);
@@ -135,6 +135,11 @@ class ResponseTest extends ResponseTestCase
         $this->assertObjectHasAttribute('statusText', $modified);
         $this->assertObjectHasAttribute('charset', $modified);
         $this->assertEquals(304, $modified->getStatusCode());
+
+        ob_start();
+        $modified->sendContent();
+        $string = ob_get_clean();
+        $this->assertEmpty($string);
     }
 
     public function testIsSuccessful()
@@ -300,7 +305,7 @@ class ResponseTest extends ResponseTestCase
         $response = new Response();
         $response->headers->set('Cache-Control', 'must-revalidate');
         $response->headers->set('Expires', -1);
-        $this->assertEquals('Sat, 01 Jan 00 00:00:00 +0000', $response->getExpires()->format(DATE_RFC822));
+        $this->assertLessThanOrEqual(time() - 2 * 86400, $response->getExpires()->format('U'));
 
         $response = new Response();
         $this->assertNull($response->getMaxAge(), '->getMaxAge() returns null if no freshness information available');
@@ -357,6 +362,11 @@ class ResponseTest extends ResponseTestCase
         $response->headers->set('Expires', -1);
         $response->expire();
         $this->assertNull($response->headers->get('Age'), '->expire() does not set the Age when the response is expired');
+
+        $response = new Response();
+        $response->headers->set('Expires', date(DATE_RFC2822, time() + 600));
+        $response->expire();
+        $this->assertNull($response->headers->get('Expires'), '->expire() removes the Expires header when the response is fresh');
     }
 
     public function testGetTtl()
@@ -653,6 +663,22 @@ class ResponseTest extends ResponseTestCase
         $this->assertTrue($response->isImmutable());
     }
 
+    public function testSetDate()
+    {
+        $response = new Response();
+        $response->setDate(\DateTime::createFromFormat(\DateTime::ATOM, '2013-01-26T09:21:56+0100', new \DateTimeZone('Europe/Berlin')));
+
+        $this->assertEquals('2013-01-26T08:21:56+00:00', $response->getDate()->format(\DateTime::ATOM));
+    }
+
+    public function testSetDateWithImmutable()
+    {
+        $response = new Response();
+        $response->setDate(\DateTimeImmutable::createFromFormat(\DateTime::ATOM, '2013-01-26T09:21:56+0100', new \DateTimeZone('Europe/Berlin')));
+
+        $this->assertEquals('2013-01-26T08:21:56+00:00', $response->getDate()->format(\DateTime::ATOM));
+    }
+
     public function testSetExpires()
     {
         $response = new Response();
@@ -666,6 +692,16 @@ class ResponseTest extends ResponseTestCase
         $this->assertEquals($response->getExpires()->getTimestamp(), $now->getTimestamp());
     }
 
+    public function testSetExpiresWithImmutable()
+    {
+        $response = new Response();
+
+        $now = $this->createDateTimeImmutableNow();
+        $response->setExpires($now);
+
+        $this->assertEquals($response->getExpires()->getTimestamp(), $now->getTimestamp());
+    }
+
     public function testSetLastModified()
     {
         $response = new Response();
@@ -676,6 +712,16 @@ class ResponseTest extends ResponseTestCase
         $this->assertNull($response->getLastModified());
     }
 
+    public function testSetLastModifiedWithImmutable()
+    {
+        $response = new Response();
+        $response->setLastModified($this->createDateTimeImmutableNow());
+        $this->assertNotNull($response->getLastModified());
+
+        $response->setLastModified(null);
+        $this->assertNull($response->getLastModified());
+    }
+
     public function testIsInvalid()
     {
         $response = new Response();
@@ -912,6 +958,13 @@ class ResponseTest extends ResponseTestCase
         return $date->setTimestamp(time());
     }
 
+    protected function createDateTimeImmutableNow()
+    {
+        $date = new \DateTimeImmutable();
+
+        return $date->setTimestamp(time());
+    }
+
     protected function provideResponse()
     {
         return new Response();
@@ -926,7 +979,7 @@ class ResponseTest extends ResponseTestCase
      */
     public function ianaCodesReasonPhrasesProvider()
     {
-        if (!in_array('https', stream_get_wrappers(), true)) {
+        if (!\in_array('https', stream_get_wrappers(), true)) {
             $this->markTestSkipped('The "https" wrapper is not available');
         }
 
@@ -954,7 +1007,7 @@ class ResponseTest extends ResponseTestCase
             $value = $xpath->query('.//ns:value', $record)->item(0)->nodeValue;
             $description = $xpath->query('.//ns:description', $record)->item(0)->nodeValue;
 
-            if (in_array($description, array('Unassigned', '(Unused)'), true)) {
+            if (\in_array($description, array('Unassigned', '(Unused)'), true)) {
                 continue;
             }
 
@@ -990,14 +1043,3 @@ class StringableObject
 class DefaultResponse extends Response
 {
 }
-
-class ExtendedResponse extends Response
-{
-    public function setLastModified(\DateTime $date = null)
-    {
-    }
-
-    public function getDate()
-    {
-    }
-}
diff --git a/vendor/symfony/http-foundation/Tests/Session/Attribute/AttributeBagTest.php b/vendor/symfony/http-foundation/Tests/Session/Attribute/AttributeBagTest.php
index 724a0b98..43644e23 100644
--- a/vendor/symfony/http-foundation/Tests/Session/Attribute/AttributeBagTest.php
+++ b/vendor/symfony/http-foundation/Tests/Session/Attribute/AttributeBagTest.php
@@ -176,11 +176,11 @@ class AttributeBagTest extends TestCase
             ++$i;
         }
 
-        $this->assertEquals(count($this->array), $i);
+        $this->assertEquals(\count($this->array), $i);
     }
 
     public function testCount()
     {
-        $this->assertCount(count($this->array), $this->bag);
+        $this->assertCount(\count($this->array), $this->bag);
     }
 }
diff --git a/vendor/symfony/http-foundation/Tests/Session/Attribute/NamespacedAttributeBagTest.php b/vendor/symfony/http-foundation/Tests/Session/Attribute/NamespacedAttributeBagTest.php
index f074ce1b..ec4cd5ad 100644
--- a/vendor/symfony/http-foundation/Tests/Session/Attribute/NamespacedAttributeBagTest.php
+++ b/vendor/symfony/http-foundation/Tests/Session/Attribute/NamespacedAttributeBagTest.php
@@ -82,6 +82,17 @@ class NamespacedAttributeBagTest extends TestCase
         $this->assertEquals($exists, $this->bag->has($key));
     }
 
+    /**
+     * @dataProvider attributesProvider
+     */
+    public function testHasNoSideEffect($key, $value, $expected)
+    {
+        $expected = json_encode($this->bag->all());
+        $this->bag->has($key);
+
+        $this->assertEquals($expected, json_encode($this->bag->all()));
+    }
+
     /**
      * @dataProvider attributesProvider
      */
@@ -96,6 +107,17 @@ class NamespacedAttributeBagTest extends TestCase
         $this->assertEquals('default', $this->bag->get('user2.login', 'default'));
     }
 
+    /**
+     * @dataProvider attributesProvider
+     */
+    public function testGetNoSideEffect($key, $value, $expected)
+    {
+        $expected = json_encode($this->bag->all());
+        $this->bag->get($key);
+
+        $this->assertEquals($expected, json_encode($this->bag->all()));
+    }
+
     /**
      * @dataProvider attributesProvider
      */
diff --git a/vendor/symfony/http-foundation/Tests/Session/Flash/FlashBagTest.php b/vendor/symfony/http-foundation/Tests/Session/Flash/FlashBagTest.php
index c4e75b1b..905a1f75 100644
--- a/vendor/symfony/http-foundation/Tests/Session/Flash/FlashBagTest.php
+++ b/vendor/symfony/http-foundation/Tests/Session/Flash/FlashBagTest.php
@@ -74,6 +74,18 @@ class FlashBagTest extends TestCase
         $this->assertEquals(array('A previous flash message'), $this->bag->peek('notice'));
     }
 
+    public function testAdd()
+    {
+        $tab = array('bar' => 'baz');
+        $this->bag->add('string_message', 'lorem');
+        $this->bag->add('object_message', new \stdClass());
+        $this->bag->add('array_message', $tab);
+
+        $this->assertEquals(array('lorem'), $this->bag->get('string_message'));
+        $this->assertEquals(array(new \stdClass()), $this->bag->get('object_message'));
+        $this->assertEquals(array($tab), $this->bag->get('array_message'));
+    }
+
     public function testGet()
     {
         $this->assertEquals(array(), $this->bag->get('non_existing'));
@@ -112,6 +124,19 @@ class FlashBagTest extends TestCase
         $this->assertEquals(array('notice'), $this->bag->keys());
     }
 
+    public function testSetAll()
+    {
+        $this->bag->add('one_flash', 'Foo');
+        $this->bag->add('another_flash', 'Bar');
+        $this->assertTrue($this->bag->has('one_flash'));
+        $this->assertTrue($this->bag->has('another_flash'));
+        $this->bag->setAll(array('unique_flash' => 'FooBar'));
+        $this->assertFalse($this->bag->has('one_flash'));
+        $this->assertFalse($this->bag->has('another_flash'));
+        $this->assertSame(array('unique_flash' => 'FooBar'), $this->bag->all());
+        $this->assertSame(array(), $this->bag->all());
+    }
+
     public function testPeekAll()
     {
         $this->bag->set('notice', 'Foo');
diff --git a/vendor/symfony/http-foundation/Tests/Session/SessionTest.php b/vendor/symfony/http-foundation/Tests/Session/SessionTest.php
index 41720e4b..63351e57 100644
--- a/vendor/symfony/http-foundation/Tests/Session/SessionTest.php
+++ b/vendor/symfony/http-foundation/Tests/Session/SessionTest.php
@@ -12,9 +12,9 @@
 namespace Symfony\Component\HttpFoundation\Tests\Session;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpFoundation\Session\Session;
-use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
 use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
+use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
+use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 
 /**
@@ -70,6 +70,27 @@ class SessionTest extends TestCase
         $this->assertEquals('0123456789abcdef', $this->session->getId());
     }
 
+    public function testSetIdAfterStart()
+    {
+        $this->session->start();
+        $id = $this->session->getId();
+
+        $e = null;
+        try {
+            $this->session->setId($id);
+        } catch (\Exception $e) {
+        }
+
+        $this->assertNull($e);
+
+        try {
+            $this->session->setId('different');
+        } catch (\Exception $e) {
+        }
+
+        $this->assertInstanceOf('\LogicException', $e);
+    }
+
     public function testSetName()
     {
         $this->assertEquals('MOCKSESSID', $this->session->getName());
@@ -206,7 +227,7 @@ class SessionTest extends TestCase
             ++$i;
         }
 
-        $this->assertEquals(count($attributes), $i);
+        $this->assertEquals(\count($attributes), $i);
     }
 
     public function testGetCount()
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php
new file mode 100644
index 00000000..a2bf168d
--- /dev/null
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php
@@ -0,0 +1,145 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\RedisSessionHandler;
+
+/**
+ * @requires extension redis
+ * @group time-sensitive
+ */
+abstract class AbstractRedisSessionHandlerTestCase extends TestCase
+{
+    protected const PREFIX = 'prefix_';
+
+    /**
+     * @var RedisSessionHandler
+     */
+    protected $storage;
+
+    /**
+     * @var \Redis|\RedisArray|\RedisCluster|\Predis\Client
+     */
+    protected $redisClient;
+
+    /**
+     * @return \Redis|\RedisArray|\RedisCluster|\Predis\Client
+     */
+    abstract protected function createRedisClient(string $host);
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        if (!\extension_loaded('redis')) {
+            self::markTestSkipped('Extension redis required.');
+        }
+
+        $host = getenv('REDIS_HOST') ?: 'localhost';
+
+        $this->redisClient = $this->createRedisClient($host);
+        $this->storage = new RedisSessionHandler(
+            $this->redisClient,
+            array('prefix' => self::PREFIX)
+        );
+    }
+
+    protected function tearDown()
+    {
+        $this->redisClient = null;
+        $this->storage = null;
+
+        parent::tearDown();
+    }
+
+    public function testOpenSession()
+    {
+        $this->assertTrue($this->storage->open('', ''));
+    }
+
+    public function testCloseSession()
+    {
+        $this->assertTrue($this->storage->close());
+    }
+
+    public function testReadSession()
+    {
+        $this->redisClient->set(self::PREFIX.'id1', null);
+        $this->redisClient->set(self::PREFIX.'id2', 'abc123');
+
+        $this->assertEquals('', $this->storage->read('id1'));
+        $this->assertEquals('abc123', $this->storage->read('id2'));
+    }
+
+    public function testWriteSession()
+    {
+        $this->assertTrue($this->storage->write('id', 'data'));
+
+        $this->assertTrue((bool) $this->redisClient->exists(self::PREFIX.'id'));
+        $this->assertEquals('data', $this->redisClient->get(self::PREFIX.'id'));
+    }
+
+    public function testUseSessionGcMaxLifetimeAsTimeToLive()
+    {
+        $this->storage->write('id', 'data');
+        $ttl = $this->redisClient->ttl(self::PREFIX.'id');
+
+        $this->assertLessThanOrEqual(ini_get('session.gc_maxlifetime'), $ttl);
+        $this->assertGreaterThanOrEqual(0, $ttl);
+    }
+
+    public function testDestroySession()
+    {
+        $this->redisClient->set(self::PREFIX.'id', 'foo');
+
+        $this->assertTrue((bool) $this->redisClient->exists(self::PREFIX.'id'));
+        $this->assertTrue($this->storage->destroy('id'));
+        $this->assertFalse((bool) $this->redisClient->exists(self::PREFIX.'id'));
+    }
+
+    public function testGcSession()
+    {
+        $this->assertTrue($this->storage->gc(123));
+    }
+
+    public function testUpdateTimestamp()
+    {
+        $lowTtl = 10;
+
+        $this->redisClient->setex(self::PREFIX.'id', $lowTtl, 'foo');
+        $this->storage->updateTimestamp('id', array());
+
+        $this->assertGreaterThan($lowTtl, $this->redisClient->ttl(self::PREFIX.'id'));
+    }
+
+    /**
+     * @dataProvider getOptionFixtures
+     */
+    public function testSupportedParam(array $options, bool $supported)
+    {
+        try {
+            new RedisSessionHandler($this->redisClient, $options);
+            $this->assertTrue($supported);
+        } catch (\InvalidArgumentException $e) {
+            $this->assertFalse($supported);
+        }
+    }
+
+    public function getOptionFixtures(): array
+    {
+        return array(
+            array(array('prefix' => 'session'), true),
+            array(array('prefix' => 'sfs', 'foo' => 'bar'), false),
+        );
+    }
+}
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php
index 3ac081e3..6566d6ee 100644
--- a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php
@@ -13,9 +13,6 @@ namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
 
 use PHPUnit\Framework\TestCase;
 
-/**
- * @requires PHP 7.0
- */
 class AbstractSessionHandlerTest extends TestCase
 {
     private static $server;
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php
deleted file mode 100644
index dda43c80..00000000
--- a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpFoundation\Session\Storage\Handler\MemcacheSessionHandler;
-
-/**
- * @requires extension memcache
- * @group time-sensitive
- * @group legacy
- */
-class MemcacheSessionHandlerTest extends TestCase
-{
-    const PREFIX = 'prefix_';
-    const TTL = 1000;
-
-    /**
-     * @var MemcacheSessionHandler
-     */
-    protected $storage;
-
-    protected $memcache;
-
-    protected function setUp()
-    {
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped('PHPUnit_MockObject cannot mock the Memcache class on HHVM. See https://github.com/sebastianbergmann/phpunit-mock-objects/pull/289');
-        }
-
-        parent::setUp();
-        $this->memcache = $this->getMockBuilder('Memcache')->getMock();
-        $this->storage = new MemcacheSessionHandler(
-            $this->memcache,
-            array('prefix' => self::PREFIX, 'expiretime' => self::TTL)
-        );
-    }
-
-    protected function tearDown()
-    {
-        $this->memcache = null;
-        $this->storage = null;
-        parent::tearDown();
-    }
-
-    public function testOpenSession()
-    {
-        $this->assertTrue($this->storage->open('', ''));
-    }
-
-    public function testCloseSession()
-    {
-        $this->assertTrue($this->storage->close());
-    }
-
-    public function testReadSession()
-    {
-        $this->memcache
-            ->expects($this->once())
-            ->method('get')
-            ->with(self::PREFIX.'id')
-        ;
-
-        $this->assertEquals('', $this->storage->read('id'));
-    }
-
-    public function testWriteSession()
-    {
-        $this->memcache
-            ->expects($this->once())
-            ->method('set')
-            ->with(self::PREFIX.'id', 'data', 0, $this->equalTo(time() + self::TTL, 2))
-            ->will($this->returnValue(true))
-        ;
-
-        $this->assertTrue($this->storage->write('id', 'data'));
-    }
-
-    public function testDestroySession()
-    {
-        $this->memcache
-            ->expects($this->once())
-            ->method('delete')
-            ->with(self::PREFIX.'id')
-            ->will($this->returnValue(true))
-        ;
-
-        $this->assertTrue($this->storage->destroy('id'));
-    }
-
-    public function testGcSession()
-    {
-        $this->assertTrue($this->storage->gc(123));
-    }
-
-    /**
-     * @dataProvider getOptionFixtures
-     */
-    public function testSupportedOptions($options, $supported)
-    {
-        try {
-            new MemcacheSessionHandler($this->memcache, $options);
-            $this->assertTrue($supported);
-        } catch (\InvalidArgumentException $e) {
-            $this->assertFalse($supported);
-        }
-    }
-
-    public function getOptionFixtures()
-    {
-        return array(
-            array(array('prefix' => 'session'), true),
-            array(array('expiretime' => 100), true),
-            array(array('prefix' => 'session', 'expiretime' => 200), true),
-            array(array('expiretime' => 100, 'foo' => 'bar'), false),
-        );
-    }
-
-    public function testGetConnection()
-    {
-        $method = new \ReflectionMethod($this->storage, 'getMemcache');
-        $method->setAccessible(true);
-
-        $this->assertInstanceOf('\Memcache', $method->invoke($this->storage));
-    }
-}
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
index 2e7be359..5bb2db06 100644
--- a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
@@ -32,10 +32,6 @@ class MemcachedSessionHandlerTest extends TestCase
 
     protected function setUp()
     {
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped('PHPUnit_MockObject cannot mock the Memcached class on HHVM. See https://github.com/sebastianbergmann/phpunit-mock-objects/pull/289');
-        }
-
         parent::setUp();
 
         if (version_compare(phpversion('memcached'), '2.2.0', '>=') && version_compare(phpversion('memcached'), '3.0.0b1', '<')) {
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/MigratingSessionHandlerTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/MigratingSessionHandlerTest.php
new file mode 100644
index 00000000..1c0f3ca6
--- /dev/null
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/MigratingSessionHandlerTest.php
@@ -0,0 +1,186 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\MigratingSessionHandler;
+
+class MigratingSessionHandlerTest extends TestCase
+{
+    private $dualHandler;
+    private $currentHandler;
+    private $writeOnlyHandler;
+
+    protected function setUp()
+    {
+        $this->currentHandler = $this->createMock(\SessionHandlerInterface::class);
+        $this->writeOnlyHandler = $this->createMock(\SessionHandlerInterface::class);
+
+        $this->dualHandler = new MigratingSessionHandler($this->currentHandler, $this->writeOnlyHandler);
+    }
+
+    public function testInstanceOf()
+    {
+        $this->assertInstanceOf(\SessionHandlerInterface::class, $this->dualHandler);
+        $this->assertInstanceOf(\SessionUpdateTimestampHandlerInterface::class, $this->dualHandler);
+    }
+
+    public function testClose()
+    {
+        $this->currentHandler->expects($this->once())
+            ->method('close')
+            ->will($this->returnValue(true));
+
+        $this->writeOnlyHandler->expects($this->once())
+            ->method('close')
+            ->will($this->returnValue(false));
+
+        $result = $this->dualHandler->close();
+
+        $this->assertTrue($result);
+    }
+
+    public function testDestroy()
+    {
+        $sessionId = 'xyz';
+
+        $this->currentHandler->expects($this->once())
+            ->method('destroy')
+            ->with($sessionId)
+            ->will($this->returnValue(true));
+
+        $this->writeOnlyHandler->expects($this->once())
+            ->method('destroy')
+            ->with($sessionId)
+            ->will($this->returnValue(false));
+
+        $result = $this->dualHandler->destroy($sessionId);
+
+        $this->assertTrue($result);
+    }
+
+    public function testGc()
+    {
+        $maxlifetime = 357;
+
+        $this->currentHandler->expects($this->once())
+            ->method('gc')
+            ->with($maxlifetime)
+            ->will($this->returnValue(true));
+
+        $this->writeOnlyHandler->expects($this->once())
+            ->method('gc')
+            ->with($maxlifetime)
+            ->will($this->returnValue(false));
+
+        $result = $this->dualHandler->gc($maxlifetime);
+        $this->assertTrue($result);
+    }
+
+    public function testOpen()
+    {
+        $savePath = '/path/to/save/location';
+        $sessionName = 'xyz';
+
+        $this->currentHandler->expects($this->once())
+            ->method('open')
+            ->with($savePath, $sessionName)
+            ->will($this->returnValue(true));
+
+        $this->writeOnlyHandler->expects($this->once())
+            ->method('open')
+            ->with($savePath, $sessionName)
+            ->will($this->returnValue(false));
+
+        $result = $this->dualHandler->open($savePath, $sessionName);
+
+        $this->assertTrue($result);
+    }
+
+    public function testRead()
+    {
+        $sessionId = 'xyz';
+        $readValue = 'something';
+
+        $this->currentHandler->expects($this->once())
+            ->method('read')
+            ->with($sessionId)
+            ->will($this->returnValue($readValue));
+
+        $this->writeOnlyHandler->expects($this->never())
+            ->method('read')
+            ->with($this->any());
+
+        $result = $this->dualHandler->read($sessionId);
+
+        $this->assertSame($readValue, $result);
+    }
+
+    public function testWrite()
+    {
+        $sessionId = 'xyz';
+        $data = 'my-serialized-data';
+
+        $this->currentHandler->expects($this->once())
+            ->method('write')
+            ->with($sessionId, $data)
+            ->will($this->returnValue(true));
+
+        $this->writeOnlyHandler->expects($this->once())
+            ->method('write')
+            ->with($sessionId, $data)
+            ->will($this->returnValue(false));
+
+        $result = $this->dualHandler->write($sessionId, $data);
+
+        $this->assertTrue($result);
+    }
+
+    public function testValidateId()
+    {
+        $sessionId = 'xyz';
+        $readValue = 'something';
+
+        $this->currentHandler->expects($this->once())
+            ->method('read')
+            ->with($sessionId)
+            ->will($this->returnValue($readValue));
+
+        $this->writeOnlyHandler->expects($this->never())
+            ->method('read')
+            ->with($this->any());
+
+        $result = $this->dualHandler->validateId($sessionId);
+
+        $this->assertTrue($result);
+    }
+
+    public function testUpdateTimestamp()
+    {
+        $sessionId = 'xyz';
+        $data = 'my-serialized-data';
+
+        $this->currentHandler->expects($this->once())
+            ->method('write')
+            ->with($sessionId, $data)
+            ->will($this->returnValue(true));
+
+        $this->writeOnlyHandler->expects($this->once())
+            ->method('write')
+            ->with($sessionId, $data)
+            ->will($this->returnValue(false));
+
+        $result = $this->dualHandler->updateTimestamp($sessionId, $data);
+
+        $this->assertTrue($result);
+    }
+}
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
index da051096..55a3864a 100644
--- a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
@@ -17,7 +17,7 @@ use Symfony\Component\HttpFoundation\Session\Storage\Handler\MongoDbSessionHandl
 /**
  * @author Markus Bachmann <markus.bachmann@bachi.biz>
  * @group time-sensitive
- * @group legacy
+ * @requires extension mongodb
  */
 class MongoDbSessionHandlerTest extends TestCase
 {
@@ -32,21 +32,11 @@ class MongoDbSessionHandlerTest extends TestCase
     {
         parent::setUp();
 
-        if (extension_loaded('mongodb')) {
-            if (!class_exists('MongoDB\Client')) {
-                $this->markTestSkipped('The mongodb/mongodb package is required.');
-            }
-        } elseif (!extension_loaded('mongo')) {
-            $this->markTestSkipped('The Mongo or MongoDB extension is required.');
+        if (!class_exists(\MongoDB\Client::class)) {
+            $this->markTestSkipped('The mongodb/mongodb package is required.');
         }
 
-        if (phpversion('mongodb')) {
-            $mongoClass = 'MongoDB\Client';
-        } else {
-            $mongoClass = version_compare(phpversion('mongo'), '1.3.0', '<') ? 'Mongo' : 'MongoClient';
-        }
-
-        $this->mongo = $this->getMockBuilder($mongoClass)
+        $this->mongo = $this->getMockBuilder(\MongoDB\Client::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -62,14 +52,6 @@ class MongoDbSessionHandlerTest extends TestCase
         $this->storage = new MongoDbSessionHandler($this->mongo, $this->options);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testConstructorShouldThrowExceptionForInvalidMongo()
-    {
-        new MongoDbSessionHandler(new \stdClass(), $this->options);
-    }
-
     /**
      * @expectedException \InvalidArgumentException
      */
@@ -110,27 +92,14 @@ class MongoDbSessionHandlerTest extends TestCase
                 $this->assertArrayHasKey($this->options['expiry_field'], $criteria);
                 $this->assertArrayHasKey('$gte', $criteria[$this->options['expiry_field']]);
 
-                if (phpversion('mongodb')) {
-                    $this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $criteria[$this->options['expiry_field']]['$gte']);
-                    $this->assertGreaterThanOrEqual(round((string) $criteria[$this->options['expiry_field']]['$gte'] / 1000), $testTimeout);
-                } else {
-                    $this->assertInstanceOf('MongoDate', $criteria[$this->options['expiry_field']]['$gte']);
-                    $this->assertGreaterThanOrEqual($criteria[$this->options['expiry_field']]['$gte']->sec, $testTimeout);
-                }
+                $this->assertInstanceOf(\MongoDB\BSON\UTCDateTime::class, $criteria[$this->options['expiry_field']]['$gte']);
+                $this->assertGreaterThanOrEqual(round((string) $criteria[$this->options['expiry_field']]['$gte'] / 1000), $testTimeout);
 
-                $fields = array(
+                return array(
                     $this->options['id_field'] => 'foo',
+                    $this->options['expiry_field'] => new \MongoDB\BSON\UTCDateTime(),
+                    $this->options['data_field'] => new \MongoDB\BSON\Binary('bar', \MongoDB\BSON\Binary::TYPE_OLD_BINARY),
                 );
-
-                if (phpversion('mongodb')) {
-                    $fields[$this->options['data_field']] = new \MongoDB\BSON\Binary('bar', \MongoDB\BSON\Binary::TYPE_OLD_BINARY);
-                    $fields[$this->options['id_field']] = new \MongoDB\BSON\UTCDateTime(time() * 1000);
-                } else {
-                    $fields[$this->options['data_field']] = new \MongoBinData('bar', \MongoBinData::BYTE_ARRAY);
-                    $fields[$this->options['id_field']] = new \MongoDate();
-                }
-
-                return $fields;
             }));
 
         $this->assertEquals('bar', $this->storage->read('foo'));
@@ -145,89 +114,22 @@ class MongoDbSessionHandlerTest extends TestCase
             ->with($this->options['database'], $this->options['collection'])
             ->will($this->returnValue($collection));
 
-        $data = array();
-
-        $methodName = phpversion('mongodb') ? 'updateOne' : 'update';
-
         $collection->expects($this->once())
-            ->method($methodName)
-            ->will($this->returnCallback(function ($criteria, $updateData, $options) use (&$data) {
+            ->method('updateOne')
+            ->will($this->returnCallback(function ($criteria, $updateData, $options) {
                 $this->assertEquals(array($this->options['id_field'] => 'foo'), $criteria);
-
-                if (phpversion('mongodb')) {
-                    $this->assertEquals(array('upsert' => true), $options);
-                } else {
-                    $this->assertEquals(array('upsert' => true, 'multiple' => false), $options);
-                }
+                $this->assertEquals(array('upsert' => true), $options);
 
                 $data = $updateData['$set'];
+                $expectedExpiry = time() + (int) ini_get('session.gc_maxlifetime');
+                $this->assertInstanceOf(\MongoDB\BSON\Binary::class, $data[$this->options['data_field']]);
+                $this->assertEquals('bar', $data[$this->options['data_field']]->getData());
+                $this->assertInstanceOf(\MongoDB\BSON\UTCDateTime::class, $data[$this->options['time_field']]);
+                $this->assertInstanceOf(\MongoDB\BSON\UTCDateTime::class, $data[$this->options['expiry_field']]);
+                $this->assertGreaterThanOrEqual($expectedExpiry, round((string) $data[$this->options['expiry_field']] / 1000));
             }));
 
-        $expectedExpiry = time() + (int) ini_get('session.gc_maxlifetime');
         $this->assertTrue($this->storage->write('foo', 'bar'));
-
-        if (phpversion('mongodb')) {
-            $this->assertEquals('bar', $data[$this->options['data_field']]->getData());
-            $this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $data[$this->options['time_field']]);
-            $this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $data[$this->options['expiry_field']]);
-            $this->assertGreaterThanOrEqual($expectedExpiry, round((string) $data[$this->options['expiry_field']] / 1000));
-        } else {
-            $this->assertEquals('bar', $data[$this->options['data_field']]->bin);
-            $this->assertInstanceOf('MongoDate', $data[$this->options['time_field']]);
-            $this->assertInstanceOf('MongoDate', $data[$this->options['expiry_field']]);
-            $this->assertGreaterThanOrEqual($expectedExpiry, $data[$this->options['expiry_field']]->sec);
-        }
-    }
-
-    public function testWriteWhenUsingExpiresField()
-    {
-        $this->options = array(
-            'id_field' => '_id',
-            'data_field' => 'data',
-            'time_field' => 'time',
-            'database' => 'sf2-test',
-            'collection' => 'session-test',
-            'expiry_field' => 'expiresAt',
-        );
-
-        $this->storage = new MongoDbSessionHandler($this->mongo, $this->options);
-
-        $collection = $this->createMongoCollectionMock();
-
-        $this->mongo->expects($this->once())
-            ->method('selectCollection')
-            ->with($this->options['database'], $this->options['collection'])
-            ->will($this->returnValue($collection));
-
-        $data = array();
-
-        $methodName = phpversion('mongodb') ? 'updateOne' : 'update';
-
-        $collection->expects($this->once())
-            ->method($methodName)
-            ->will($this->returnCallback(function ($criteria, $updateData, $options) use (&$data) {
-                $this->assertEquals(array($this->options['id_field'] => 'foo'), $criteria);
-
-                if (phpversion('mongodb')) {
-                    $this->assertEquals(array('upsert' => true), $options);
-                } else {
-                    $this->assertEquals(array('upsert' => true, 'multiple' => false), $options);
-                }
-
-                $data = $updateData['$set'];
-            }));
-
-        $this->assertTrue($this->storage->write('foo', 'bar'));
-
-        if (phpversion('mongodb')) {
-            $this->assertEquals('bar', $data[$this->options['data_field']]->getData());
-            $this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $data[$this->options['time_field']]);
-            $this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $data[$this->options['expiry_field']]);
-        } else {
-            $this->assertEquals('bar', $data[$this->options['data_field']]->bin);
-            $this->assertInstanceOf('MongoDate', $data[$this->options['time_field']]);
-            $this->assertInstanceOf('MongoDate', $data[$this->options['expiry_field']]);
-        }
     }
 
     public function testReplaceSessionData()
@@ -241,10 +143,8 @@ class MongoDbSessionHandlerTest extends TestCase
 
         $data = array();
 
-        $methodName = phpversion('mongodb') ? 'updateOne' : 'update';
-
         $collection->expects($this->exactly(2))
-            ->method($methodName)
+            ->method('updateOne')
             ->will($this->returnCallback(function ($criteria, $updateData, $options) use (&$data) {
                 $data = $updateData;
             }));
@@ -252,11 +152,7 @@ class MongoDbSessionHandlerTest extends TestCase
         $this->storage->write('foo', 'bar');
         $this->storage->write('foo', 'foobar');
 
-        if (phpversion('mongodb')) {
-            $this->assertEquals('foobar', $data['$set'][$this->options['data_field']]->getData());
-        } else {
-            $this->assertEquals('foobar', $data['$set'][$this->options['data_field']]->bin);
-        }
+        $this->assertEquals('foobar', $data['$set'][$this->options['data_field']]->getData());
     }
 
     public function testDestroy()
@@ -268,10 +164,8 @@ class MongoDbSessionHandlerTest extends TestCase
             ->with($this->options['database'], $this->options['collection'])
             ->will($this->returnValue($collection));
 
-        $methodName = phpversion('mongodb') ? 'deleteOne' : 'remove';
-
         $collection->expects($this->once())
-            ->method($methodName)
+            ->method('deleteOne')
             ->with(array($this->options['id_field'] => 'foo'));
 
         $this->assertTrue($this->storage->destroy('foo'));
@@ -286,18 +180,11 @@ class MongoDbSessionHandlerTest extends TestCase
             ->with($this->options['database'], $this->options['collection'])
             ->will($this->returnValue($collection));
 
-        $methodName = phpversion('mongodb') ? 'deleteMany' : 'remove';
-
         $collection->expects($this->once())
-            ->method($methodName)
+            ->method('deleteMany')
             ->will($this->returnCallback(function ($criteria) {
-                if (phpversion('mongodb')) {
-                    $this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $criteria[$this->options['expiry_field']]['$lt']);
-                    $this->assertGreaterThanOrEqual(time() - 1, round((string) $criteria[$this->options['expiry_field']]['$lt'] / 1000));
-                } else {
-                    $this->assertInstanceOf('MongoDate', $criteria[$this->options['expiry_field']]['$lt']);
-                    $this->assertGreaterThanOrEqual(time() - 1, $criteria[$this->options['expiry_field']]['$lt']->sec);
-                }
+                $this->assertInstanceOf(\MongoDB\BSON\UTCDateTime::class, $criteria[$this->options['expiry_field']]['$lt']);
+                $this->assertGreaterThanOrEqual(time() - 1, round((string) $criteria[$this->options['expiry_field']]['$lt'] / 1000));
             }));
 
         $this->assertTrue($this->storage->gc(1));
@@ -308,23 +195,12 @@ class MongoDbSessionHandlerTest extends TestCase
         $method = new \ReflectionMethod($this->storage, 'getMongo');
         $method->setAccessible(true);
 
-        if (phpversion('mongodb')) {
-            $mongoClass = 'MongoDB\Client';
-        } else {
-            $mongoClass = version_compare(phpversion('mongo'), '1.3.0', '<') ? 'Mongo' : 'MongoClient';
-        }
-
-        $this->assertInstanceOf($mongoClass, $method->invoke($this->storage));
+        $this->assertInstanceOf(\MongoDB\Client::class, $method->invoke($this->storage));
     }
 
     private function createMongoCollectionMock()
     {
-        $collectionClass = 'MongoCollection';
-        if (phpversion('mongodb')) {
-            $collectionClass = 'MongoDB\Collection';
-        }
-
-        $collection = $this->getMockBuilder($collectionClass)
+        $collection = $this->getMockBuilder(\MongoDB\Collection::class)
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
index a6264e51..95e725f4 100644
--- a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
@@ -29,7 +29,6 @@ class NativeFileSessionHandlerTest extends TestCase
     {
         $storage = new NativeSessionStorage(array('name' => 'TESTING'), new NativeFileSessionHandler(sys_get_temp_dir()));
 
-        $this->assertEquals('files', $storage->getSaveHandler()->getSaveHandlerName());
         $this->assertEquals('user', ini_get('session.save_handler'));
 
         $this->assertEquals(sys_get_temp_dir(), ini_get('session.save_path'));
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php
deleted file mode 100644
index 4a9fb600..00000000
--- a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler;
-
-/**
- * Test class for NativeSessionHandler.
- *
- * @author Drak <drak@zikula.org>
- *
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @group legacy
- */
-class NativeSessionHandlerTest extends TestCase
-{
-    /**
-     * @expectedDeprecation The Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler class is deprecated since Symfony 3.4 and will be removed in 4.0. Use the \SessionHandler class instead.
-     */
-    public function testConstruct()
-    {
-        $handler = new NativeSessionHandler();
-
-        $this->assertInstanceOf('SessionHandler', $handler);
-        $this->assertTrue($handler instanceof NativeSessionHandler);
-    }
-}
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php
index 718fd0f8..9a2212b8 100644
--- a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php
@@ -12,9 +12,9 @@
 namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\Handler\NullSessionHandler;
 use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
-use Symfony\Component\HttpFoundation\Session\Session;
 
 /**
  * Test class for NullSessionHandler.
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
index 0a0e4490..e8478189 100644
--- a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -136,10 +136,6 @@ class PdoSessionHandlerTest extends TestCase
 
     public function testReadConvertsStreamToString()
     {
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped('PHPUnit_MockObject cannot mock the PDOStatement class on HHVM. See https://github.com/sebastianbergmann/phpunit-mock-objects/pull/289');
-        }
-
         $pdo = new MockPdo('pgsql');
         $pdo->prepareResult = $this->getMockBuilder('PDOStatement')->getMock();
 
@@ -157,9 +153,6 @@ class PdoSessionHandlerTest extends TestCase
 
     public function testReadLockedConvertsStreamToString()
     {
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped('PHPUnit_MockObject cannot mock the PDOStatement class on HHVM. See https://github.com/sebastianbergmann/phpunit-mock-objects/pull/289');
-        }
         if (ini_get('session.use_strict_mode')) {
             $this->markTestSkipped('Strict mode needs no locking for new sessions.');
         }
@@ -396,8 +389,8 @@ class MockPdo extends \PDO
 
     public function prepare($statement, $driverOptions = array())
     {
-        return is_callable($this->prepareResult)
-            ? call_user_func($this->prepareResult, $statement, $driverOptions)
+        return \is_callable($this->prepareResult)
+            ? \call_user_func($this->prepareResult, $statement, $driverOptions)
             : $this->prepareResult;
     }
 
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/PredisClusterSessionHandlerTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/PredisClusterSessionHandlerTest.php
new file mode 100644
index 00000000..45810010
--- /dev/null
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/PredisClusterSessionHandlerTest.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
+
+use Predis\Client;
+
+class PredisClusterSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
+{
+    protected function createRedisClient(string $host): Client
+    {
+        return new Client(array(array('host' => $host)));
+    }
+}
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/PredisSessionHandlerTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/PredisSessionHandlerTest.php
new file mode 100644
index 00000000..a9db4eb1
--- /dev/null
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/PredisSessionHandlerTest.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
+
+use Predis\Client;
+
+class PredisSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
+{
+    protected function createRedisClient(string $host): Client
+    {
+        return new Client(array('host' => $host));
+    }
+}
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/RedisArraySessionHandlerTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/RedisArraySessionHandlerTest.php
new file mode 100644
index 00000000..d263e18f
--- /dev/null
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/RedisArraySessionHandlerTest.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
+
+class RedisArraySessionHandlerTest extends AbstractRedisSessionHandlerTestCase
+{
+    protected function createRedisClient(string $host): \RedisArray
+    {
+        return new \RedisArray(array($host));
+    }
+}
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/RedisClusterSessionHandlerTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/RedisClusterSessionHandlerTest.php
new file mode 100644
index 00000000..7d85a59e
--- /dev/null
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/RedisClusterSessionHandlerTest.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
+
+class RedisClusterSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
+{
+    public static function setupBeforeClass()
+    {
+        if (!class_exists('RedisCluster')) {
+            self::markTestSkipped('The RedisCluster class is required.');
+        }
+
+        if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) {
+            self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
+        }
+    }
+
+    protected function createRedisClient(string $host): \RedisCluster
+    {
+        return new \RedisCluster(null, explode(' ', getenv('REDIS_CLUSTER_HOSTS')));
+    }
+}
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/RedisSessionHandlerTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/RedisSessionHandlerTest.php
new file mode 100644
index 00000000..afdb6c50
--- /dev/null
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/RedisSessionHandlerTest.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
+
+class RedisSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
+{
+    protected function createRedisClient(string $host): \Redis
+    {
+        $client = new \Redis();
+        $client->connect($host);
+
+        return $client;
+    }
+}
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/WriteCheckSessionHandlerTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/WriteCheckSessionHandlerTest.php
deleted file mode 100644
index 898a7d11..00000000
--- a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/WriteCheckSessionHandlerTest.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpFoundation\Session\Storage\Handler\WriteCheckSessionHandler;
-
-/**
- * @author Adrien Brault <adrien.brault@gmail.com>
- *
- * @group legacy
- */
-class WriteCheckSessionHandlerTest extends TestCase
-{
-    public function test()
-    {
-        $wrappedSessionHandlerMock = $this->getMockBuilder('SessionHandlerInterface')->getMock();
-        $writeCheckSessionHandler = new WriteCheckSessionHandler($wrappedSessionHandlerMock);
-
-        $wrappedSessionHandlerMock
-            ->expects($this->once())
-            ->method('close')
-            ->with()
-            ->will($this->returnValue(true))
-        ;
-
-        $this->assertTrue($writeCheckSessionHandler->close());
-    }
-
-    public function testWrite()
-    {
-        $wrappedSessionHandlerMock = $this->getMockBuilder('SessionHandlerInterface')->getMock();
-        $writeCheckSessionHandler = new WriteCheckSessionHandler($wrappedSessionHandlerMock);
-
-        $wrappedSessionHandlerMock
-            ->expects($this->once())
-            ->method('write')
-            ->with('foo', 'bar')
-            ->will($this->returnValue(true))
-        ;
-
-        $this->assertTrue($writeCheckSessionHandler->write('foo', 'bar'));
-    }
-
-    public function testSkippedWrite()
-    {
-        $wrappedSessionHandlerMock = $this->getMockBuilder('SessionHandlerInterface')->getMock();
-        $writeCheckSessionHandler = new WriteCheckSessionHandler($wrappedSessionHandlerMock);
-
-        $wrappedSessionHandlerMock
-            ->expects($this->once())
-            ->method('read')
-            ->with('foo')
-            ->will($this->returnValue('bar'))
-        ;
-
-        $wrappedSessionHandlerMock
-            ->expects($this->never())
-            ->method('write')
-        ;
-
-        $this->assertEquals('bar', $writeCheckSessionHandler->read('foo'));
-        $this->assertTrue($writeCheckSessionHandler->write('foo', 'bar'));
-    }
-
-    public function testNonSkippedWrite()
-    {
-        $wrappedSessionHandlerMock = $this->getMockBuilder('SessionHandlerInterface')->getMock();
-        $writeCheckSessionHandler = new WriteCheckSessionHandler($wrappedSessionHandlerMock);
-
-        $wrappedSessionHandlerMock
-            ->expects($this->once())
-            ->method('read')
-            ->with('foo')
-            ->will($this->returnValue('bar'))
-        ;
-
-        $wrappedSessionHandlerMock
-            ->expects($this->once())
-            ->method('write')
-            ->with('foo', 'baZZZ')
-            ->will($this->returnValue(true))
-        ;
-
-        $this->assertEquals('bar', $writeCheckSessionHandler->read('foo'));
-        $this->assertTrue($writeCheckSessionHandler->write('foo', 'baZZZ'));
-    }
-}
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/MockArraySessionStorageTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/MockArraySessionStorageTest.php
index 82df5543..893e120c 100644
--- a/vendor/symfony/http-foundation/Tests/Session/Storage/MockArraySessionStorageTest.php
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/MockArraySessionStorageTest.php
@@ -12,9 +12,9 @@
 namespace Symfony\Component\HttpFoundation\Tests\Session\Storage;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
 use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 
 /**
  * Test class for MockArraySessionStorage.
@@ -48,7 +48,7 @@ class MockArraySessionStorageTest extends TestCase
         $this->data = array(
             $this->attributes->getStorageKey() => array('foo' => 'bar'),
             $this->flashes->getStorageKey() => array('notice' => 'hello'),
-            );
+        );
 
         $this->storage = new MockArraySessionStorage();
         $this->storage->registerBag($this->flashes);
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/MockFileSessionStorageTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/MockFileSessionStorageTest.php
index 53accd38..16957981 100644
--- a/vendor/symfony/http-foundation/Tests/Session/Storage/MockFileSessionStorageTest.php
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/MockFileSessionStorageTest.php
@@ -12,9 +12,9 @@
 namespace Symfony\Component\HttpFoundation\Tests\Session\Storage;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpFoundation\Session\Storage\MockFileSessionStorage;
-use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
 use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
+use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
+use Symfony\Component\HttpFoundation\Session\Storage\MockFileSessionStorage;
 
 /**
  * Test class for MockFileSessionStorage.
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php
index 382707b0..52da2947 100644
--- a/vendor/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php
@@ -184,7 +184,7 @@ class NativeSessionStorageTest extends TestCase
 
     public function testSessionOptions()
     {
-        if (defined('HHVM_VERSION')) {
+        if (\defined('HHVM_VERSION')) {
             $this->markTestSkipped('HHVM is not handled in this test case.');
         }
 
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
index 958dc0bc..303f36d3 100644
--- a/vendor/symfony/http-foundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\HttpFoundation\Tests\Session\Storage;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpFoundation\Session\Storage\PhpBridgeSessionStorage;
 use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
+use Symfony\Component\HttpFoundation\Session\Storage\PhpBridgeSessionStorage;
 
 /**
  * Test class for PhpSessionStorage.
@@ -64,13 +64,12 @@ class PhpBridgeSessionStorageTest extends TestCase
     {
         $storage = $this->getStorage();
 
-        $this->assertFalse($storage->getSaveHandler()->isActive());
+        $this->assertNotSame(\PHP_SESSION_ACTIVE, session_status());
         $this->assertFalse($storage->isStarted());
 
         session_start();
         $this->assertTrue(isset($_SESSION));
-        // in PHP 5.4 we can reliably detect a session started
-        $this->assertTrue($storage->getSaveHandler()->isActive());
+        $this->assertSame(\PHP_SESSION_ACTIVE, session_status());
         // PHP session might have started, but the storage driver has not, so false is correct here
         $this->assertFalse($storage->isStarted());
 
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Proxy/NativeProxyTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/Proxy/NativeProxyTest.php
deleted file mode 100644
index ed4fee6b..00000000
--- a/vendor/symfony/http-foundation/Tests/Session/Storage/Proxy/NativeProxyTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Proxy;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpFoundation\Session\Storage\Proxy\NativeProxy;
-
-/**
- * Test class for NativeProxy.
- *
- * @group legacy
- *
- * @author Drak <drak@zikula.org>
- */
-class NativeProxyTest extends TestCase
-{
-    public function testIsWrapper()
-    {
-        $proxy = new NativeProxy();
-        $this->assertFalse($proxy->isWrapper());
-    }
-
-    public function testGetSaveHandlerName()
-    {
-        $name = ini_get('session.save_handler');
-        $proxy = new NativeProxy();
-        $this->assertEquals($name, $proxy->getSaveHandlerName());
-    }
-}
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
index 68282535..0b48250e 100644
--- a/vendor/symfony/http-foundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
@@ -121,4 +121,37 @@ class SessionHandlerProxyTest extends TestCase
 
         $this->proxy->gc(86400);
     }
+
+    /**
+     * @requires PHPUnit 5.1
+     */
+    public function testValidateId()
+    {
+        $mock = $this->getMockBuilder(array('SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'))->getMock();
+        $mock->expects($this->once())
+            ->method('validateId');
+
+        $proxy = new SessionHandlerProxy($mock);
+        $proxy->validateId('id');
+
+        $this->assertTrue($this->proxy->validateId('id'));
+    }
+
+    /**
+     * @requires PHPUnit 5.1
+     */
+    public function testUpdateTimestamp()
+    {
+        $mock = $this->getMockBuilder(array('SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'))->getMock();
+        $mock->expects($this->once())
+            ->method('updateTimestamp');
+
+        $proxy = new SessionHandlerProxy($mock);
+        $proxy->updateTimestamp('id', 'data');
+
+        $this->mock->expects($this->once())
+            ->method('write');
+
+        $this->proxy->updateTimestamp('id', 'data');
+    }
 }
diff --git a/vendor/symfony/http-foundation/Tests/StreamedResponseTest.php b/vendor/symfony/http-foundation/Tests/StreamedResponseTest.php
index c2ded996..699222e3 100644
--- a/vendor/symfony/http-foundation/Tests/StreamedResponseTest.php
+++ b/vendor/symfony/http-foundation/Tests/StreamedResponseTest.php
@@ -123,4 +123,22 @@ class StreamedResponseTest extends TestCase
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response->sendHeaders());
         $this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response->sendHeaders());
     }
+
+    public function testSetNotModified()
+    {
+        $response = new StreamedResponse(function () { echo 'foo'; });
+        $modified = $response->setNotModified();
+        $this->assertObjectHasAttribute('headers', $modified);
+        $this->assertObjectHasAttribute('content', $modified);
+        $this->assertObjectHasAttribute('version', $modified);
+        $this->assertObjectHasAttribute('statusCode', $modified);
+        $this->assertObjectHasAttribute('statusText', $modified);
+        $this->assertObjectHasAttribute('charset', $modified);
+        $this->assertEquals(304, $modified->getStatusCode());
+
+        ob_start();
+        $modified->sendContent();
+        $string = ob_get_clean();
+        $this->assertEmpty($string);
+    }
 }
diff --git a/vendor/symfony/http-foundation/composer.json b/vendor/symfony/http-foundation/composer.json
index f6c6f2e6..ef4bf826 100644
--- a/vendor/symfony/http-foundation/composer.json
+++ b/vendor/symfony/http-foundation/composer.json
@@ -16,12 +16,12 @@
         }
     ],
     "require": {
-        "php": "^5.5.9|>=7.0.8",
-        "symfony/polyfill-mbstring": "~1.1",
-        "symfony/polyfill-php70": "~1.6"
+        "php": "^7.1.3",
+        "symfony/polyfill-mbstring": "~1.1"
     },
     "require-dev": {
-        "symfony/expression-language": "~2.8|~3.0|~4.0"
+        "predis/predis": "~1.0",
+        "symfony/expression-language": "~3.4|~4.0"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\HttpFoundation\\": "" },
@@ -32,7 +32,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "3.4-dev"
+            "dev-master": "4.1-dev"
         }
     }
 }
diff --git a/vendor/symfony/http-kernel/Bundle/Bundle.php b/vendor/symfony/http-kernel/Bundle/Bundle.php
index cfa576c3..26dea9b2 100644
--- a/vendor/symfony/http-kernel/Bundle/Bundle.php
+++ b/vendor/symfony/http-kernel/Bundle/Bundle.php
@@ -11,11 +11,10 @@
 
 namespace Symfony\Component\HttpKernel\Bundle;
 
+use Symfony\Component\Console\Application;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Container;
-use Symfony\Component\Console\Application;
-use Symfony\Component\Finder\Finder;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 
 /**
@@ -34,23 +33,21 @@ abstract class Bundle implements BundleInterface
     private $namespace;
 
     /**
-     * Boots the Bundle.
+     * {@inheritdoc}
      */
     public function boot()
     {
     }
 
     /**
-     * Shutdowns the Bundle.
+     * {@inheritdoc}
      */
     public function shutdown()
     {
     }
 
     /**
-     * Builds the bundle.
-     *
-     * It is only ever called once when the cache is empty.
+     * {@inheritdoc}
      *
      * This method can be overridden to register compilation passes,
      * other extensions, ...
@@ -73,7 +70,7 @@ abstract class Bundle implements BundleInterface
 
             if (null !== $extension) {
                 if (!$extension instanceof ExtensionInterface) {
-                    throw new \LogicException(sprintf('Extension %s must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface.', get_class($extension)));
+                    throw new \LogicException(sprintf('Extension %s must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface.', \get_class($extension)));
                 }
 
                 // check naming convention
@@ -81,10 +78,7 @@ abstract class Bundle implements BundleInterface
                 $expectedAlias = Container::underscore($basename);
 
                 if ($expectedAlias != $extension->getAlias()) {
-                    throw new \LogicException(sprintf(
-                        'Users will expect the alias of the default extension of a bundle to be the underscored version of the bundle name ("%s"). You can override "Bundle::getContainerExtension()" if you want to use "%s" or another alias.',
-                        $expectedAlias, $extension->getAlias()
-                    ));
+                    throw new \LogicException(sprintf('Users will expect the alias of the default extension of a bundle to be the underscored version of the bundle name ("%s"). You can override "Bundle::getContainerExtension()" if you want to use "%s" or another alias.', $expectedAlias, $extension->getAlias()));
                 }
 
                 $this->extension = $extension;
@@ -99,9 +93,7 @@ abstract class Bundle implements BundleInterface
     }
 
     /**
-     * Gets the Bundle namespace.
-     *
-     * @return string The Bundle namespace
+     * {@inheritdoc}
      */
     public function getNamespace()
     {
@@ -113,29 +105,18 @@ abstract class Bundle implements BundleInterface
     }
 
     /**
-     * Gets the Bundle directory path.
-     *
-     * @return string The Bundle absolute path
+     * {@inheritdoc}
      */
     public function getPath()
     {
         if (null === $this->path) {
             $reflected = new \ReflectionObject($this);
-            $this->path = dirname($reflected->getFileName());
+            $this->path = \dirname($reflected->getFileName());
         }
 
         return $this->path;
     }
 
-    /**
-     * Returns the bundle parent name.
-     *
-     * @return string|null The Bundle parent name it overrides or null if no parent
-     */
-    public function getParent()
-    {
-    }
-
     /**
      * Returns the bundle name (the class short name).
      *
@@ -150,48 +131,8 @@ abstract class Bundle implements BundleInterface
         return $this->name;
     }
 
-    /**
-     * Finds and registers Commands.
-     *
-     * Override this method if your bundle commands do not follow the conventions:
-     *
-     * * Commands are in the 'Command' sub-directory
-     * * Commands extend Symfony\Component\Console\Command\Command
-     */
     public function registerCommands(Application $application)
     {
-        if (!is_dir($dir = $this->getPath().'/Command')) {
-            return;
-        }
-
-        if (!class_exists('Symfony\Component\Finder\Finder')) {
-            throw new \RuntimeException('You need the symfony/finder component to register bundle commands.');
-        }
-
-        $finder = new Finder();
-        $finder->files()->name('*Command.php')->in($dir);
-
-        $prefix = $this->getNamespace().'\\Command';
-        foreach ($finder as $file) {
-            $ns = $prefix;
-            if ($relativePath = $file->getRelativePath()) {
-                $ns .= '\\'.str_replace('/', '\\', $relativePath);
-            }
-            $class = $ns.'\\'.$file->getBasename('.php');
-            if ($this->container) {
-                $commandIds = $this->container->hasParameter('console.command.ids') ? $this->container->getParameter('console.command.ids') : array();
-                $alias = 'console.command.'.strtolower(str_replace('\\', '_', $class));
-                if (isset($commandIds[$alias]) || $this->container->has($alias)) {
-                    continue;
-                }
-            }
-            $r = new \ReflectionClass($class);
-            if ($r->isSubclassOf('Symfony\\Component\\Console\\Command\\Command') && !$r->isAbstract() && !$r->getConstructor()->getNumberOfRequiredParameters()) {
-                @trigger_error(sprintf('Auto-registration of the command "%s" is deprecated since Symfony 3.4 and won\'t be supported in 4.0. Use PSR-4 based service discovery instead.', $class), E_USER_DEPRECATED);
-
-                $application->add($r->newInstance());
-            }
-        }
     }
 
     /**
diff --git a/vendor/symfony/http-kernel/Bundle/BundleInterface.php b/vendor/symfony/http-kernel/Bundle/BundleInterface.php
index 14a7f6f4..88a95d83 100644
--- a/vendor/symfony/http-kernel/Bundle/BundleInterface.php
+++ b/vendor/symfony/http-kernel/Bundle/BundleInterface.php
@@ -46,19 +46,6 @@ interface BundleInterface extends ContainerAwareInterface
      */
     public function getContainerExtension();
 
-    /**
-     * Returns the bundle name that this bundle overrides.
-     *
-     * Despite its name, this method does not imply any parent/child relationship
-     * between the bundles, just a way to extend and override an existing
-     * bundle.
-     *
-     * @return string The Bundle name it overrides or null if no parent
-     *
-     * @deprecated This method is deprecated as of 3.4 and will be removed in 4.0.
-     */
-    public function getParent();
-
     /**
      * Returns the bundle name (the class short name).
      *
diff --git a/vendor/symfony/http-kernel/CHANGELOG.md b/vendor/symfony/http-kernel/CHANGELOG.md
index fb29f769..c98d2235 100644
--- a/vendor/symfony/http-kernel/CHANGELOG.md
+++ b/vendor/symfony/http-kernel/CHANGELOG.md
@@ -1,6 +1,39 @@
 CHANGELOG
 =========
 
+4.1.0
+-----
+
+ * added orphaned events support to `EventDataCollector`
+ * `ExceptionListener` now logs exceptions at priority `0` (previously logged at `-128`)
+ * Deprecated `service:action` syntax with a single colon to reference controllers. Use `service::method` instead.
+ * Added the ability to profile individual argument value resolvers via the
+   `Symfony\Component\HttpKernel\Controller\ArgumentResolver\TraceableValueResolver`
+
+4.0.0
+-----
+
+ * removed the `DataCollector::varToString()` method, use `DataCollector::cloneVar()`
+   instead
+ * using the `DataCollector::cloneVar()` method requires the VarDumper component
+ * removed the `ValueExporter` class
+ * removed `ControllerResolverInterface::getArguments()`
+ * removed `TraceableControllerResolver::getArguments()`
+ * removed `ControllerResolver::getArguments()` and the ability to resolve arguments
+ * removed the `argument_resolver` service dependency from the `debug.controller_resolver`
+ * removed `LazyLoadingFragmentHandler::addRendererService()`
+ * removed `Psr6CacheClearer::addPool()`
+ * removed `Extension::addClassesToCompile()` and `Extension::getClassesToCompile()`
+ * removed `Kernel::loadClassCache()`, `Kernel::doLoadClassCache()`, `Kernel::setClassCache()`,
+   and `Kernel::getEnvParameters()`
+ * support for the `X-Status-Code` when handling exceptions in the `HttpKernel`
+   has been dropped, use the `HttpKernel::allowCustomResponseCode()` method
+   instead
+ * removed convention-based commands registration
+ * removed the `ChainCacheClearer::add()` method
+ * removed the `CacheaWarmerAggregate::add()` and `setWarmers()` methods
+ * made `CacheWarmerAggregate` and `ChainCacheClearer` classes final
+
 3.4.0
 -----
 
diff --git a/vendor/symfony/http-kernel/CacheClearer/ChainCacheClearer.php b/vendor/symfony/http-kernel/CacheClearer/ChainCacheClearer.php
index 8ee4275b..a646119d 100644
--- a/vendor/symfony/http-kernel/CacheClearer/ChainCacheClearer.php
+++ b/vendor/symfony/http-kernel/CacheClearer/ChainCacheClearer.php
@@ -16,18 +16,13 @@ namespace Symfony\Component\HttpKernel\CacheClearer;
  *
  * @author Dustin Dobervich <ddobervich@gmail.com>
  *
- * @final since version 3.4
+ * @final
  */
 class ChainCacheClearer implements CacheClearerInterface
 {
-    protected $clearers;
+    private $clearers;
 
-    /**
-     * Constructs a new instance of ChainCacheClearer.
-     *
-     * @param array $clearers The initial clearers
-     */
-    public function __construct($clearers = array())
+    public function __construct(iterable $clearers = array())
     {
         $this->clearers = $clearers;
     }
@@ -41,16 +36,4 @@ class ChainCacheClearer implements CacheClearerInterface
             $clearer->clear($cacheDir);
         }
     }
-
-    /**
-     * Adds a cache clearer to the aggregate.
-     *
-     * @deprecated since version 3.4, to be removed in 4.0, inject the list of clearers as a constructor argument instead.
-     */
-    public function add(CacheClearerInterface $clearer)
-    {
-        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 3.4 and will be removed in 4.0, inject the list of clearers as a constructor argument instead.', __METHOD__), E_USER_DEPRECATED);
-
-        $this->clearers[] = $clearer;
-    }
 }
diff --git a/vendor/symfony/http-kernel/CacheClearer/Psr6CacheClearer.php b/vendor/symfony/http-kernel/CacheClearer/Psr6CacheClearer.php
index d413d2c9..d7db0270 100644
--- a/vendor/symfony/http-kernel/CacheClearer/Psr6CacheClearer.php
+++ b/vendor/symfony/http-kernel/CacheClearer/Psr6CacheClearer.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\HttpKernel\CacheClearer;
 
-use Psr\Cache\CacheItemPoolInterface;
-
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
@@ -25,16 +23,18 @@ class Psr6CacheClearer implements CacheClearerInterface
         $this->pools = $pools;
     }
 
-    public function addPool(CacheItemPoolInterface $pool)
+    public function hasPool($name)
     {
-        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Pass an array of pools indexed by name to the constructor instead.', __METHOD__), E_USER_DEPRECATED);
-
-        $this->pools[] = $pool;
+        return isset($this->pools[$name]);
     }
 
-    public function hasPool($name)
+    public function getPool($name)
     {
-        return isset($this->pools[$name]);
+        if (!$this->hasPool($name)) {
+            throw new \InvalidArgumentException(sprintf('Cache pool not found: %s.', $name));
+        }
+
+        return $this->pools[$name];
     }
 
     public function clearPool($name)
diff --git a/vendor/symfony/http-kernel/CacheWarmer/CacheWarmer.php b/vendor/symfony/http-kernel/CacheWarmer/CacheWarmer.php
index dba35a63..52dc2ad2 100644
--- a/vendor/symfony/http-kernel/CacheWarmer/CacheWarmer.php
+++ b/vendor/symfony/http-kernel/CacheWarmer/CacheWarmer.php
@@ -20,7 +20,7 @@ abstract class CacheWarmer implements CacheWarmerInterface
 {
     protected function writeCacheFile($file, $content)
     {
-        $tmpFile = @tempnam(dirname($file), basename($file));
+        $tmpFile = @tempnam(\dirname($file), basename($file));
         if (false !== @file_put_contents($tmpFile, $content) && @rename($tmpFile, $file)) {
             @chmod($file, 0666 & ~umask());
 
diff --git a/vendor/symfony/http-kernel/CacheWarmer/CacheWarmerAggregate.php b/vendor/symfony/http-kernel/CacheWarmer/CacheWarmerAggregate.php
index ca3911ed..8a57732b 100644
--- a/vendor/symfony/http-kernel/CacheWarmer/CacheWarmerAggregate.php
+++ b/vendor/symfony/http-kernel/CacheWarmer/CacheWarmerAggregate.php
@@ -16,20 +16,17 @@ namespace Symfony\Component\HttpKernel\CacheWarmer;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since version 3.4
+ * @final
  */
 class CacheWarmerAggregate implements CacheWarmerInterface
 {
-    protected $warmers = array();
-    protected $optionalsEnabled = false;
-    private $triggerDeprecation = false;
+    private $warmers;
+    private $optionalsEnabled = false;
+    private $onlyOptionalsEnabled = false;
 
-    public function __construct($warmers = array())
+    public function __construct(iterable $warmers = array())
     {
-        foreach ($warmers as $warmer) {
-            $this->add($warmer);
-        }
-        $this->triggerDeprecation = true;
+        $this->warmers = $warmers;
     }
 
     public function enableOptionalWarmers()
@@ -37,6 +34,11 @@ class CacheWarmerAggregate implements CacheWarmerInterface
         $this->optionalsEnabled = true;
     }
 
+    public function enableOnlyOptionalWarmers()
+    {
+        $this->onlyOptionalsEnabled = $this->optionalsEnabled = true;
+    }
+
     /**
      * Warms up the cache.
      *
@@ -48,6 +50,9 @@ class CacheWarmerAggregate implements CacheWarmerInterface
             if (!$this->optionalsEnabled && $warmer->isOptional()) {
                 continue;
             }
+            if ($this->onlyOptionalsEnabled && !$warmer->isOptional()) {
+                continue;
+            }
 
             $warmer->warmUp($cacheDir);
         }
@@ -62,29 +67,4 @@ class CacheWarmerAggregate implements CacheWarmerInterface
     {
         return false;
     }
-
-    /**
-     * @deprecated since version 3.4, to be removed in 4.0, inject the list of clearers as a constructor argument instead.
-     */
-    public function setWarmers(array $warmers)
-    {
-        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 3.4 and will be removed in 4.0, inject the list of clearers as a constructor argument instead.', __METHOD__), E_USER_DEPRECATED);
-
-        $this->warmers = array();
-        foreach ($warmers as $warmer) {
-            $this->add($warmer);
-        }
-    }
-
-    /**
-     * @deprecated since version 3.4, to be removed in 4.0, inject the list of clearers as a constructor argument instead.
-     */
-    public function add(CacheWarmerInterface $warmer)
-    {
-        if ($this->triggerDeprecation) {
-            @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 3.4 and will be removed in 4.0, inject the list of clearers as a constructor argument instead.', __METHOD__), E_USER_DEPRECATED);
-        }
-
-        $this->warmers[] = $warmer;
-    }
 }
diff --git a/vendor/symfony/http-kernel/Client.php b/vendor/symfony/http-kernel/Client.php
index 7979722d..62555e9a 100644
--- a/vendor/symfony/http-kernel/Client.php
+++ b/vendor/symfony/http-kernel/Client.php
@@ -12,10 +12,10 @@
 namespace Symfony\Component\HttpKernel;
 
 use Symfony\Component\BrowserKit\Client as BaseClient;
+use Symfony\Component\BrowserKit\CookieJar;
+use Symfony\Component\BrowserKit\History;
 use Symfony\Component\BrowserKit\Request as DomRequest;
 use Symfony\Component\BrowserKit\Response as DomResponse;
-use Symfony\Component\BrowserKit\History;
-use Symfony\Component\BrowserKit\CookieJar;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -25,8 +25,8 @@ use Symfony\Component\HttpFoundation\Response;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @method Request|null  getRequest()  A Request instance
- * @method Response|null getResponse() A Response instance
+ * @method Request  getRequest()  A Request instance
+ * @method Response getResponse() A Response instance
  */
 class Client extends BaseClient
 {
@@ -81,17 +81,18 @@ class Client extends BaseClient
      */
     protected function getScript($request)
     {
-        $kernel = str_replace("'", "\\'", serialize($this->kernel));
-        $request = str_replace("'", "\\'", serialize($request));
+        $kernel = var_export(serialize($this->kernel), true);
+        $request = var_export(serialize($request), true);
+
         $errorReporting = error_reporting();
 
         $requires = '';
         foreach (get_declared_classes() as $class) {
             if (0 === strpos($class, 'ComposerAutoloaderInit')) {
                 $r = new \ReflectionClass($class);
-                $file = dirname(dirname($r->getFileName())).'/autoload.php';
+                $file = \dirname(\dirname($r->getFileName())).'/autoload.php';
                 if (file_exists($file)) {
-                    $requires .= "require_once '".str_replace("'", "\\'", $file)."';\n";
+                    $requires .= 'require_once '.var_export($file, true).";\n";
                 }
             }
         }
@@ -107,8 +108,8 @@ error_reporting($errorReporting);
 
 $requires
 
-\$kernel = unserialize('$kernel');
-\$request = unserialize('$request');
+\$kernel = unserialize($kernel);
+\$request = unserialize($request);
 EOF;
 
         return $code.$this->getHandleScript();
@@ -160,7 +161,7 @@ EOF;
     {
         $filtered = array();
         foreach ($files as $key => $value) {
-            if (is_array($value)) {
+            if (\is_array($value)) {
                 $filtered[$key] = $this->filterFiles($value);
             } elseif ($value instanceof UploadedFile) {
                 if ($value->isValid() && $value->getSize() > UploadedFile::getMaxFilesize()) {
@@ -168,7 +169,6 @@ EOF;
                         '',
                         $value->getClientOriginalName(),
                         $value->getClientMimeType(),
-                        0,
                         UPLOAD_ERR_INI_SIZE,
                         true
                     );
@@ -177,7 +177,6 @@ EOF;
                         $value->getPathname(),
                         $value->getClientOriginalName(),
                         $value->getClientMimeType(),
-                        $value->getClientSize(),
                         $value->getError(),
                         true
                     );
diff --git a/vendor/symfony/http-kernel/Config/EnvParametersResource.php b/vendor/symfony/http-kernel/Config/EnvParametersResource.php
deleted file mode 100644
index f8d2a72b..00000000
--- a/vendor/symfony/http-kernel/Config/EnvParametersResource.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpKernel\Config;
-
-use Symfony\Component\Config\Resource\SelfCheckingResourceInterface;
-
-/**
- * EnvParametersResource represents resources stored in prefixed environment variables.
- *
- * @author Chris Wilkinson <chriswilkinson84@gmail.com>
- *
- * @deprecated since version 3.4, to be removed in 4.0
- */
-class EnvParametersResource implements SelfCheckingResourceInterface, \Serializable
-{
-    /**
-     * @var string
-     */
-    private $prefix;
-
-    /**
-     * @var string
-     */
-    private $variables;
-
-    /**
-     * @param string $prefix
-     */
-    public function __construct($prefix)
-    {
-        $this->prefix = $prefix;
-        $this->variables = $this->findVariables();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString()
-    {
-        return serialize($this->getResource());
-    }
-
-    /**
-     * @return array An array with two keys: 'prefix' for the prefix used and 'variables' containing all the variables watched by this resource
-     */
-    public function getResource()
-    {
-        return array('prefix' => $this->prefix, 'variables' => $this->variables);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isFresh($timestamp)
-    {
-        return $this->findVariables() === $this->variables;
-    }
-
-    public function serialize()
-    {
-        return serialize(array('prefix' => $this->prefix, 'variables' => $this->variables));
-    }
-
-    public function unserialize($serialized)
-    {
-        if (\PHP_VERSION_ID >= 70000) {
-            $unserialized = unserialize($serialized, array('allowed_classes' => false));
-        } else {
-            $unserialized = unserialize($serialized);
-        }
-
-        $this->prefix = $unserialized['prefix'];
-        $this->variables = $unserialized['variables'];
-    }
-
-    private function findVariables()
-    {
-        $variables = array();
-
-        foreach ($_SERVER as $key => $value) {
-            if (0 === strpos($key, $this->prefix)) {
-                $variables[$key] = $value;
-            }
-        }
-
-        ksort($variables);
-
-        return $variables;
-    }
-}
diff --git a/vendor/symfony/http-kernel/Config/FileLocator.php b/vendor/symfony/http-kernel/Config/FileLocator.php
index fb1f913b..20d91b2f 100644
--- a/vendor/symfony/http-kernel/Config/FileLocator.php
+++ b/vendor/symfony/http-kernel/Config/FileLocator.php
@@ -26,10 +26,10 @@ class FileLocator extends BaseFileLocator
 
     /**
      * @param KernelInterface $kernel A KernelInterface instance
-     * @param null|string     $path   The path the global resource directory
+     * @param string|null     $path   The path the global resource directory
      * @param array           $paths  An array of paths where to look for resources
      */
-    public function __construct(KernelInterface $kernel, $path = null, array $paths = array())
+    public function __construct(KernelInterface $kernel, string $path = null, array $paths = array())
     {
         $this->kernel = $kernel;
         if (null !== $path) {
diff --git a/vendor/symfony/http-kernel/Controller/ArgumentResolver.php b/vendor/symfony/http-kernel/Controller/ArgumentResolver.php
index 2c17125c..142a6d54 100644
--- a/vendor/symfony/http-kernel/Controller/ArgumentResolver.php
+++ b/vendor/symfony/http-kernel/Controller/ArgumentResolver.php
@@ -34,7 +34,7 @@ final class ArgumentResolver implements ArgumentResolverInterface
      */
     private $argumentValueResolvers;
 
-    public function __construct(ArgumentMetadataFactoryInterface $argumentMetadataFactory = null, $argumentValueResolvers = array())
+    public function __construct(ArgumentMetadataFactoryInterface $argumentMetadataFactory = null, iterable $argumentValueResolvers = array())
     {
         $this->argumentMetadataFactory = $argumentMetadataFactory ?: new ArgumentMetadataFactory();
         $this->argumentValueResolvers = $argumentValueResolvers ?: self::getDefaultArgumentValueResolvers();
@@ -56,7 +56,7 @@ final class ArgumentResolver implements ArgumentResolverInterface
                 $resolved = $resolver->resolve($request, $metadata);
 
                 if (!$resolved instanceof \Generator) {
-                    throw new \InvalidArgumentException(sprintf('%s::resolve() must yield at least one value.', get_class($resolver)));
+                    throw new \InvalidArgumentException(sprintf('%s::resolve() must yield at least one value.', \get_class($resolver)));
                 }
 
                 foreach ($resolved as $append) {
@@ -69,10 +69,10 @@ final class ArgumentResolver implements ArgumentResolverInterface
 
             $representative = $controller;
 
-            if (is_array($representative)) {
-                $representative = sprintf('%s::%s()', get_class($representative[0]), $representative[1]);
-            } elseif (is_object($representative)) {
-                $representative = get_class($representative);
+            if (\is_array($representative)) {
+                $representative = sprintf('%s::%s()', \get_class($representative[0]), $representative[1]);
+            } elseif (\is_object($representative)) {
+                $representative = \get_class($representative);
             }
 
             throw new \RuntimeException(sprintf('Controller "%s" requires that you provide a value for the "$%s" argument. Either the argument is nullable and no null value has been provided, no default value has been provided or because there is a non optional argument after this one.', $representative, $metadata->getName()));
@@ -81,7 +81,7 @@ final class ArgumentResolver implements ArgumentResolverInterface
         return $arguments;
     }
 
-    public static function getDefaultArgumentValueResolvers()
+    public static function getDefaultArgumentValueResolvers(): iterable
     {
         return array(
             new RequestAttributeValueResolver(),
diff --git a/vendor/symfony/http-kernel/Controller/ArgumentResolver/ServiceValueResolver.php b/vendor/symfony/http-kernel/Controller/ArgumentResolver/ServiceValueResolver.php
index 7bc195f2..e7df546b 100644
--- a/vendor/symfony/http-kernel/Controller/ArgumentResolver/ServiceValueResolver.php
+++ b/vendor/symfony/http-kernel/Controller/ArgumentResolver/ServiceValueResolver.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
 
 use Psr\Container\ContainerInterface;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
@@ -47,6 +48,10 @@ final class ServiceValueResolver implements ArgumentValueResolverInterface
             $controller = ltrim($controller, '\\');
         }
 
+        if (!$this->container->has($controller) && false !== $i = strrpos($controller, ':')) {
+            $controller = substr($controller, 0, $i).strtolower(substr($controller, $i));
+        }
+
         return $this->container->has($controller) && $this->container->get($controller)->has($argument->getName());
     }
 
@@ -63,6 +68,26 @@ final class ServiceValueResolver implements ArgumentValueResolverInterface
             $controller = ltrim($controller, '\\');
         }
 
-        yield $this->container->get($controller)->get($argument->getName());
+        if (!$this->container->has($controller)) {
+            $i = strrpos($controller, ':');
+            $controller = substr($controller, 0, $i).strtolower(substr($controller, $i));
+        }
+
+        try {
+            yield $this->container->get($controller)->get($argument->getName());
+        } catch (RuntimeException $e) {
+            $what = sprintf('argument $%s of "%s()"', $argument->getName(), $controller);
+            $message = preg_replace('/service "\.service_locator\.[^"]++"/', $what, $e->getMessage());
+
+            if ($e->getMessage() === $message) {
+                $message = sprintf('Cannot resolve %s: %s', $what, $message);
+            }
+
+            $r = new \ReflectionProperty($e, 'message');
+            $r->setAccessible(true);
+            $r->setValue($e, $message);
+
+            throw $e;
+        }
     }
 }
diff --git a/vendor/symfony/http-kernel/Controller/ArgumentResolver/SessionValueResolver.php b/vendor/symfony/http-kernel/Controller/ArgumentResolver/SessionValueResolver.php
index 9e656d28..276d6546 100644
--- a/vendor/symfony/http-kernel/Controller/ArgumentResolver/SessionValueResolver.php
+++ b/vendor/symfony/http-kernel/Controller/ArgumentResolver/SessionValueResolver.php
@@ -28,6 +28,10 @@ final class SessionValueResolver implements ArgumentValueResolverInterface
      */
     public function supports(Request $request, ArgumentMetadata $argument)
     {
+        if (!$request->hasSession()) {
+            return false;
+        }
+
         $type = $argument->getType();
         if (SessionInterface::class !== $type && !is_subclass_of($type, SessionInterface::class)) {
             return false;
diff --git a/vendor/symfony/http-kernel/Controller/ArgumentResolver/TraceableValueResolver.php b/vendor/symfony/http-kernel/Controller/ArgumentResolver/TraceableValueResolver.php
new file mode 100644
index 00000000..4d60aa15
--- /dev/null
+++ b/vendor/symfony/http-kernel/Controller/ArgumentResolver/TraceableValueResolver.php
@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Controller\ArgumentResolver;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
+use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
+use Symfony\Component\Stopwatch\Stopwatch;
+
+/**
+ * Provides timing information via the stopwatch.
+ *
+ * @author Iltar van der Berg <kjarli@gmail.com>
+ */
+final class TraceableValueResolver implements ArgumentValueResolverInterface
+{
+    private $inner;
+    private $stopwatch;
+
+    public function __construct(ArgumentValueResolverInterface $inner, Stopwatch $stopwatch)
+    {
+        $this->inner = $inner;
+        $this->stopwatch = $stopwatch;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supports(Request $request, ArgumentMetadata $argument): bool
+    {
+        $method = \get_class($this->inner).'::'.__FUNCTION__;
+        $this->stopwatch->start($method);
+
+        $return = $this->inner->supports($request, $argument);
+
+        $this->stopwatch->stop($method);
+
+        return $return;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function resolve(Request $request, ArgumentMetadata $argument): iterable
+    {
+        $method = \get_class($this->inner).'::'.__FUNCTION__;
+        $this->stopwatch->start($method);
+
+        yield from $this->inner->resolve($request, $argument);
+
+        $this->stopwatch->stop($method);
+    }
+}
diff --git a/vendor/symfony/http-kernel/Controller/ArgumentResolver/VariadicValueResolver.php b/vendor/symfony/http-kernel/Controller/ArgumentResolver/VariadicValueResolver.php
index 56ae5f19..7ee2d7af 100644
--- a/vendor/symfony/http-kernel/Controller/ArgumentResolver/VariadicValueResolver.php
+++ b/vendor/symfony/http-kernel/Controller/ArgumentResolver/VariadicValueResolver.php
@@ -37,8 +37,8 @@ final class VariadicValueResolver implements ArgumentValueResolverInterface
     {
         $values = $request->attributes->get($argument->getName());
 
-        if (!is_array($values)) {
-            throw new \InvalidArgumentException(sprintf('The action argument "...$%1$s" is required to be an array, the request attribute "%1$s" contains a type of "%2$s" instead.', $argument->getName(), gettype($values)));
+        if (!\is_array($values)) {
+            throw new \InvalidArgumentException(sprintf('The action argument "...$%1$s" is required to be an array, the request attribute "%1$s" contains a type of "%2$s" instead.', $argument->getName(), \gettype($values)));
         }
 
         foreach ($values as $value) {
diff --git a/vendor/symfony/http-kernel/Controller/ContainerControllerResolver.php b/vendor/symfony/http-kernel/Controller/ContainerControllerResolver.php
index 186583d7..ed515d24 100644
--- a/vendor/symfony/http-kernel/Controller/ContainerControllerResolver.php
+++ b/vendor/symfony/http-kernel/Controller/ContainerControllerResolver.php
@@ -14,7 +14,6 @@ namespace Symfony\Component\HttpKernel\Controller;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\Container;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * A controller resolver searching for a controller in a psr-11 container when using the "service:method" notation.
@@ -33,58 +32,14 @@ class ContainerControllerResolver extends ControllerResolver
         parent::__construct($logger);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getController(Request $request)
-    {
-        $controller = parent::getController($request);
-
-        if (is_array($controller) && isset($controller[0]) && is_string($controller[0]) && $this->container->has($controller[0])) {
-            $controller[0] = $this->instantiateController($controller[0]);
-        }
-
-        return $controller;
-    }
-
-    /**
-     * Returns a callable for the given controller.
-     *
-     * @param string $controller A Controller string
-     *
-     * @return mixed A PHP callable
-     *
-     * @throws \LogicException           When the name could not be parsed
-     * @throws \InvalidArgumentException When the controller class does not exist
-     */
     protected function createController($controller)
     {
-        if (false !== strpos($controller, '::')) {
-            return parent::createController($controller);
-        }
-
-        $method = null;
-        if (1 == substr_count($controller, ':')) {
-            // controller in the "service:method" notation
-            list($controller, $method) = explode(':', $controller, 2);
-        }
-
-        if (!$this->container->has($controller)) {
-            $this->throwExceptionIfControllerWasRemoved($controller);
-
-            throw new \LogicException(sprintf('Controller not found: service "%s" does not exist.', $controller));
-        }
-
-        $service = $this->container->get($controller);
-        if (null !== $method) {
-            return array($service, $method);
+        if (1 === substr_count($controller, ':')) {
+            $controller = str_replace(':', '::', $controller);
+            @trigger_error(sprintf('Referencing controllers with a single colon is deprecated since Symfony 4.1. Use %s instead.', $controller), E_USER_DEPRECATED);
         }
 
-        if (!method_exists($service, '__invoke')) {
-            throw new \LogicException(sprintf('Controller "%s" cannot be called without a method name. Did you forget an "__invoke" method?', $controller));
-        }
-
-        return $service;
+        return parent::createController($controller);
     }
 
     /**
@@ -98,24 +53,22 @@ class ContainerControllerResolver extends ControllerResolver
 
         try {
             return parent::instantiateController($class);
-        } catch (\ArgumentCountError $e) {
-        } catch (\ErrorException $e) {
-        } catch (\TypeError $e) {
+        } catch (\Error $e) {
         }
 
         $this->throwExceptionIfControllerWasRemoved($class, $e);
 
-        throw $e;
+        if ($e instanceof \ArgumentCountError) {
+            throw new \InvalidArgumentException(sprintf('Controller "%s" has required constructor arguments and does not exist in the container. Did you forget to define such a service?', $class), 0, $e);
+        }
+
+        throw new \InvalidArgumentException(sprintf('Controller "%s" does neither exist as service nor as class', $class), 0, $e);
     }
 
-    /**
-     * @param string                     $controller
-     * @param \Exception|\Throwable|null $previous
-     */
-    private function throwExceptionIfControllerWasRemoved($controller, $previous = null)
+    private function throwExceptionIfControllerWasRemoved(string $controller, \Throwable $previous)
     {
         if ($this->container instanceof Container && isset($this->container->getRemovedIds()[$controller])) {
-            throw new \LogicException(sprintf('Controller "%s" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?', $controller), 0, $previous);
+            throw new \InvalidArgumentException(sprintf('Controller "%s" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?', $controller), 0, $previous);
         }
     }
 }
diff --git a/vendor/symfony/http-kernel/Controller/ControllerReference.php b/vendor/symfony/http-kernel/Controller/ControllerReference.php
index fae4e7fa..f424fdc8 100644
--- a/vendor/symfony/http-kernel/Controller/ControllerReference.php
+++ b/vendor/symfony/http-kernel/Controller/ControllerReference.php
@@ -35,7 +35,7 @@ class ControllerReference
      * @param array  $attributes An array of parameters to add to the Request attributes
      * @param array  $query      An array of parameters to add to the Request query string
      */
-    public function __construct($controller, array $attributes = array(), array $query = array())
+    public function __construct(string $controller, array $attributes = array(), array $query = array())
     {
         $this->controller = $controller;
         $this->attributes = $attributes;
diff --git a/vendor/symfony/http-kernel/Controller/ControllerResolver.php b/vendor/symfony/http-kernel/Controller/ControllerResolver.php
index b9d9f9fa..04c5fcf5 100644
--- a/vendor/symfony/http-kernel/Controller/ControllerResolver.php
+++ b/vendor/symfony/http-kernel/Controller/ControllerResolver.php
@@ -16,44 +16,22 @@ use Symfony\Component\HttpFoundation\Request;
 
 /**
  * This implementation uses the '_controller' request attribute to determine
- * the controller to execute and uses the request attributes to determine
- * the controller method arguments.
+ * the controller to execute.
  *
  * @author Fabien Potencier <fabien@symfony.com>
+ * @author Tobias Schultze <http://tobion.de>
  */
-class ControllerResolver implements ArgumentResolverInterface, ControllerResolverInterface
+class ControllerResolver implements ControllerResolverInterface
 {
     private $logger;
 
-    /**
-     * If the ...$arg functionality is available.
-     *
-     * Requires at least PHP 5.6.0 or HHVM 3.9.1
-     *
-     * @var bool
-     */
-    private $supportsVariadic;
-
-    /**
-     * If scalar types exists.
-     *
-     * @var bool
-     */
-    private $supportsScalarTypes;
-
     public function __construct(LoggerInterface $logger = null)
     {
         $this->logger = $logger;
-
-        $this->supportsVariadic = method_exists('ReflectionParameter', 'isVariadic');
-        $this->supportsScalarTypes = method_exists('ReflectionParameter', 'getType');
     }
 
     /**
      * {@inheritdoc}
-     *
-     * This method looks for a '_controller' request attribute that represents
-     * the controller name (a string like ClassName::MethodName).
      */
     public function getController(Request $request)
     {
@@ -65,122 +43,82 @@ class ControllerResolver implements ArgumentResolverInterface, ControllerResolve
             return false;
         }
 
-        if (is_array($controller)) {
+        if (\is_array($controller)) {
+            if (isset($controller[0]) && \is_string($controller[0]) && isset($controller[1])) {
+                try {
+                    $controller[0] = $this->instantiateController($controller[0]);
+                } catch (\Error | \LogicException $e) {
+                    try {
+                        // We cannot just check is_callable but have to use reflection because a non-static method
+                        // can still be called statically in PHP but we don't want that. This is deprecated in PHP 7, so we
+                        // could simplify this with PHP 8.
+                        if ((new \ReflectionMethod($controller[0], $controller[1]))->isStatic()) {
+                            return $controller;
+                        }
+                    } catch (\ReflectionException $reflectionException) {
+                        throw $e;
+                    }
+
+                    throw $e;
+                }
+            }
+
+            if (!\is_callable($controller)) {
+                throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable. %s', $request->getPathInfo(), $this->getControllerError($controller)));
+            }
+
             return $controller;
         }
 
-        if (is_object($controller)) {
-            if (method_exists($controller, '__invoke')) {
-                return $controller;
+        if (\is_object($controller)) {
+            if (!\is_callable($controller)) {
+                throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable. %s', $request->getPathInfo(), $this->getControllerError($controller)));
             }
 
-            throw new \InvalidArgumentException(sprintf('Controller "%s" for URI "%s" is not callable.', get_class($controller), $request->getPathInfo()));
+            return $controller;
         }
 
-        if (false === strpos($controller, ':')) {
-            if (method_exists($controller, '__invoke')) {
-                return $this->instantiateController($controller);
-            } elseif (function_exists($controller)) {
-                return $controller;
-            }
+        if (\function_exists($controller)) {
+            return $controller;
         }
 
         $callable = $this->createController($controller);
 
-        if (!is_callable($callable)) {
+        if (!\is_callable($callable)) {
             throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable. %s', $request->getPathInfo(), $this->getControllerError($callable)));
         }
 
         return $callable;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated This method is deprecated as of 3.1 and will be removed in 4.0. Implement the ArgumentResolverInterface and inject it in the HttpKernel instead.
-     */
-    public function getArguments(Request $request, $controller)
-    {
-        @trigger_error(sprintf('%s is deprecated as of 3.1 and will be removed in 4.0. Implement the %s and inject it in the HttpKernel instead.', __METHOD__, ArgumentResolverInterface::class), E_USER_DEPRECATED);
-
-        if (is_array($controller)) {
-            $r = new \ReflectionMethod($controller[0], $controller[1]);
-        } elseif (is_object($controller) && !$controller instanceof \Closure) {
-            $r = new \ReflectionObject($controller);
-            $r = $r->getMethod('__invoke');
-        } else {
-            $r = new \ReflectionFunction($controller);
-        }
-
-        return $this->doGetArguments($request, $controller, $r->getParameters());
-    }
-
-    /**
-     * @param Request                $request
-     * @param callable               $controller
-     * @param \ReflectionParameter[] $parameters
-     *
-     * @return array The arguments to use when calling the action
-     *
-     * @deprecated This method is deprecated as of 3.1 and will be removed in 4.0. Implement the ArgumentResolverInterface and inject it in the HttpKernel instead.
-     */
-    protected function doGetArguments(Request $request, $controller, array $parameters)
-    {
-        @trigger_error(sprintf('%s is deprecated as of 3.1 and will be removed in 4.0. Implement the %s and inject it in the HttpKernel instead.', __METHOD__, ArgumentResolverInterface::class), E_USER_DEPRECATED);
-
-        $attributes = $request->attributes->all();
-        $arguments = array();
-        foreach ($parameters as $param) {
-            if (array_key_exists($param->name, $attributes)) {
-                if ($this->supportsVariadic && $param->isVariadic() && is_array($attributes[$param->name])) {
-                    $arguments = array_merge($arguments, array_values($attributes[$param->name]));
-                } else {
-                    $arguments[] = $attributes[$param->name];
-                }
-            } elseif ($param->getClass() && $param->getClass()->isInstance($request)) {
-                $arguments[] = $request;
-            } elseif ($param->isDefaultValueAvailable()) {
-                $arguments[] = $param->getDefaultValue();
-            } elseif ($this->supportsScalarTypes && $param->hasType() && $param->allowsNull()) {
-                $arguments[] = null;
-            } else {
-                if (is_array($controller)) {
-                    $repr = sprintf('%s::%s()', get_class($controller[0]), $controller[1]);
-                } elseif (is_object($controller)) {
-                    $repr = get_class($controller);
-                } else {
-                    $repr = $controller;
-                }
-
-                throw new \RuntimeException(sprintf('Controller "%s" requires that you provide a value for the "$%s" argument (because there is no default value or because there is a non optional argument after this one).', $repr, $param->name));
-            }
-        }
-
-        return $arguments;
-    }
-
     /**
      * Returns a callable for the given controller.
      *
      * @param string $controller A Controller string
      *
      * @return callable A PHP callable
-     *
-     * @throws \InvalidArgumentException
      */
     protected function createController($controller)
     {
         if (false === strpos($controller, '::')) {
-            throw new \InvalidArgumentException(sprintf('Unable to find controller "%s".', $controller));
+            return $this->instantiateController($controller);
         }
 
         list($class, $method) = explode('::', $controller, 2);
 
-        if (!class_exists($class)) {
-            throw new \InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));
-        }
+        try {
+            return array($this->instantiateController($class), $method);
+        } catch (\Error | \LogicException $e) {
+            try {
+                if ((new \ReflectionMethod($class, $method))->isStatic()) {
+                    return $class.'::'.$method;
+                }
+            } catch (\ReflectionException $reflectionException) {
+                throw $e;
+            }
 
-        return array($this->instantiateController($class), $method);
+            throw $e;
+        }
     }
 
     /**
@@ -197,48 +135,49 @@ class ControllerResolver implements ArgumentResolverInterface, ControllerResolve
 
     private function getControllerError($callable)
     {
-        if (is_string($callable)) {
+        if (\is_string($callable)) {
             if (false !== strpos($callable, '::')) {
-                $callable = explode('::', $callable);
+                $callable = explode('::', $callable, 2);
+            } else {
+                return sprintf('Function "%s" does not exist.', $callable);
             }
+        }
 
-            if (class_exists($callable) && !method_exists($callable, '__invoke')) {
-                return sprintf('Class "%s" does not have a method "__invoke".', $callable);
-            }
+        if (\is_object($callable)) {
+            $availableMethods = $this->getClassMethodsWithoutMagicMethods($callable);
+            $alternativeMsg = $availableMethods ? sprintf(' or use one of the available methods: "%s"', implode('", "', $availableMethods)) : '';
 
-            if (!function_exists($callable)) {
-                return sprintf('Function "%s" does not exist.', $callable);
-            }
+            return sprintf('Controller class "%s" cannot be called without a method name. You need to implement "__invoke"%s.', \get_class($callable), $alternativeMsg);
         }
 
-        if (!is_array($callable)) {
-            return sprintf('Invalid type for controller given, expected string or array, got "%s".', gettype($callable));
+        if (!\is_array($callable)) {
+            return sprintf('Invalid type for controller given, expected string, array or object, got "%s".', \gettype($callable));
         }
 
-        if (2 !== count($callable)) {
-            return 'Invalid format for controller, expected array(controller, method) or controller::method.';
+        if (!isset($callable[0]) || !isset($callable[1]) || 2 !== \count($callable)) {
+            return 'Invalid array callable, expected array(controller, method).';
         }
 
         list($controller, $method) = $callable;
 
-        if (is_string($controller) && !class_exists($controller)) {
+        if (\is_string($controller) && !class_exists($controller)) {
             return sprintf('Class "%s" does not exist.', $controller);
         }
 
-        $className = is_object($controller) ? get_class($controller) : $controller;
+        $className = \is_object($controller) ? \get_class($controller) : $controller;
 
         if (method_exists($controller, $method)) {
             return sprintf('Method "%s" on class "%s" should be public and non-abstract.', $method, $className);
         }
 
-        $collection = get_class_methods($controller);
+        $collection = $this->getClassMethodsWithoutMagicMethods($controller);
 
         $alternatives = array();
 
         foreach ($collection as $item) {
             $lev = levenshtein($method, $item);
 
-            if ($lev <= strlen($method) / 3 || false !== strpos($item, $method)) {
+            if ($lev <= \strlen($method) / 3 || false !== strpos($item, $method)) {
                 $alternatives[] = $item;
             }
         }
@@ -247,7 +186,7 @@ class ControllerResolver implements ArgumentResolverInterface, ControllerResolve
 
         $message = sprintf('Expected method "%s" on class "%s"', $method, $className);
 
-        if (count($alternatives) > 0) {
+        if (\count($alternatives) > 0) {
             $message .= sprintf(', did you mean "%s"?', implode('", "', $alternatives));
         } else {
             $message .= sprintf('. Available methods: "%s".', implode('", "', $collection));
@@ -255,4 +194,13 @@ class ControllerResolver implements ArgumentResolverInterface, ControllerResolve
 
         return $message;
     }
+
+    private function getClassMethodsWithoutMagicMethods($classOrObject)
+    {
+        $methods = get_class_methods($classOrObject);
+
+        return array_filter($methods, function (string $method) {
+            return 0 !== strncmp($method, '__', 2);
+        });
+    }
 }
diff --git a/vendor/symfony/http-kernel/Controller/ControllerResolverInterface.php b/vendor/symfony/http-kernel/Controller/ControllerResolverInterface.php
index afe9fb73..a54f8b51 100644
--- a/vendor/symfony/http-kernel/Controller/ControllerResolverInterface.php
+++ b/vendor/symfony/http-kernel/Controller/ControllerResolverInterface.php
@@ -17,8 +17,6 @@ use Symfony\Component\HttpFoundation\Request;
  * A ControllerResolverInterface implementation knows how to determine the
  * controller to execute based on a Request object.
  *
- * It can also determine the arguments to pass to the Controller.
- *
  * A Controller can be any valid PHP callable.
  *
  * @author Fabien Potencier <fabien@symfony.com>
@@ -37,21 +35,7 @@ interface ControllerResolverInterface
      * @return callable|false A PHP callable representing the Controller,
      *                        or false if this resolver is not able to determine the controller
      *
-     * @throws \LogicException If the controller can't be found
+     * @throws \LogicException If a controller was found based on the request but it is not callable
      */
     public function getController(Request $request);
-
-    /**
-     * Returns the arguments to pass to the controller.
-     *
-     * @param Request  $request    A Request instance
-     * @param callable $controller A PHP callable
-     *
-     * @return array An array of arguments to pass to the controller
-     *
-     * @throws \RuntimeException When value for argument given is not provided
-     *
-     * @deprecated This method is deprecated as of 3.1 and will be removed in 4.0. Please use the {@see ArgumentResolverInterface} instead.
-     */
-    public function getArguments(Request $request, $controller);
 }
diff --git a/vendor/symfony/http-kernel/Controller/TraceableArgumentResolver.php b/vendor/symfony/http-kernel/Controller/TraceableArgumentResolver.php
index 6fb0fa66..39848127 100644
--- a/vendor/symfony/http-kernel/Controller/TraceableArgumentResolver.php
+++ b/vendor/symfony/http-kernel/Controller/TraceableArgumentResolver.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\Controller;
 
-use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Stopwatch\Stopwatch;
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
diff --git a/vendor/symfony/http-kernel/Controller/TraceableControllerResolver.php b/vendor/symfony/http-kernel/Controller/TraceableControllerResolver.php
index 75010771..bf6b6aa1 100644
--- a/vendor/symfony/http-kernel/Controller/TraceableControllerResolver.php
+++ b/vendor/symfony/http-kernel/Controller/TraceableControllerResolver.php
@@ -11,32 +11,21 @@
 
 namespace Symfony\Component\HttpKernel\Controller;
 
-use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Stopwatch\Stopwatch;
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class TraceableControllerResolver implements ControllerResolverInterface, ArgumentResolverInterface
+class TraceableControllerResolver implements ControllerResolverInterface
 {
     private $resolver;
     private $stopwatch;
-    private $argumentResolver;
 
-    public function __construct(ControllerResolverInterface $resolver, Stopwatch $stopwatch, ArgumentResolverInterface $argumentResolver = null)
+    public function __construct(ControllerResolverInterface $resolver, Stopwatch $stopwatch)
     {
         $this->resolver = $resolver;
         $this->stopwatch = $stopwatch;
-        $this->argumentResolver = $argumentResolver;
-
-        // BC
-        if (null === $this->argumentResolver) {
-            $this->argumentResolver = $resolver;
-        }
-
-        if (!$this->argumentResolver instanceof TraceableArgumentResolver) {
-            $this->argumentResolver = new TraceableArgumentResolver($this->argumentResolver, $this->stopwatch);
-        }
     }
 
     /**
@@ -52,18 +41,4 @@ class TraceableControllerResolver implements ControllerResolverInterface, Argume
 
         return $ret;
     }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated This method is deprecated as of 3.1 and will be removed in 4.0.
-     */
-    public function getArguments(Request $request, $controller)
-    {
-        @trigger_error(sprintf('The %s method is deprecated as of 3.1 and will be removed in 4.0. Please use the %s instead.', __METHOD__, TraceableArgumentResolver::class), E_USER_DEPRECATED);
-
-        $ret = $this->argumentResolver->getArguments($request, $controller);
-
-        return $ret;
-    }
 }
diff --git a/vendor/symfony/http-kernel/ControllerMetadata/ArgumentMetadata.php b/vendor/symfony/http-kernel/ControllerMetadata/ArgumentMetadata.php
index 32316a8d..4ea8ea64 100644
--- a/vendor/symfony/http-kernel/ControllerMetadata/ArgumentMetadata.php
+++ b/vendor/symfony/http-kernel/ControllerMetadata/ArgumentMetadata.php
@@ -25,15 +25,7 @@ class ArgumentMetadata
     private $defaultValue;
     private $isNullable;
 
-    /**
-     * @param string $name
-     * @param string $type
-     * @param bool   $isVariadic
-     * @param bool   $hasDefaultValue
-     * @param mixed  $defaultValue
-     * @param bool   $isNullable
-     */
-    public function __construct($name, $type, $isVariadic, $hasDefaultValue, $defaultValue, $isNullable = false)
+    public function __construct(string $name, ?string $type, bool $isVariadic, bool $hasDefaultValue, $defaultValue, bool $isNullable = false)
     {
         $this->name = $name;
         $this->type = $type;
diff --git a/vendor/symfony/http-kernel/ControllerMetadata/ArgumentMetadataFactory.php b/vendor/symfony/http-kernel/ControllerMetadata/ArgumentMetadataFactory.php
index 0424850e..cc2ed9f2 100644
--- a/vendor/symfony/http-kernel/ControllerMetadata/ArgumentMetadataFactory.php
+++ b/vendor/symfony/http-kernel/ControllerMetadata/ArgumentMetadataFactory.php
@@ -18,30 +18,6 @@ namespace Symfony\Component\HttpKernel\ControllerMetadata;
  */
 final class ArgumentMetadataFactory implements ArgumentMetadataFactoryInterface
 {
-    /**
-     * If the ...$arg functionality is available.
-     *
-     * Requires at least PHP 5.6.0 or HHVM 3.9.1
-     *
-     * @var bool
-     */
-    private $supportsVariadic;
-
-    /**
-     * If the reflection supports the getType() method to resolve types.
-     *
-     * Requires at least PHP 7.0.0 or HHVM 3.11.0
-     *
-     * @var bool
-     */
-    private $supportsParameterType;
-
-    public function __construct()
-    {
-        $this->supportsVariadic = method_exists('ReflectionParameter', 'isVariadic');
-        $this->supportsParameterType = method_exists('ReflectionParameter', 'getType');
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -49,80 +25,34 @@ final class ArgumentMetadataFactory implements ArgumentMetadataFactoryInterface
     {
         $arguments = array();
 
-        if (is_array($controller)) {
+        if (\is_array($controller)) {
             $reflection = new \ReflectionMethod($controller[0], $controller[1]);
-        } elseif (is_object($controller) && !$controller instanceof \Closure) {
+        } elseif (\is_object($controller) && !$controller instanceof \Closure) {
             $reflection = (new \ReflectionObject($controller))->getMethod('__invoke');
         } else {
             $reflection = new \ReflectionFunction($controller);
         }
 
         foreach ($reflection->getParameters() as $param) {
-            $arguments[] = new ArgumentMetadata($param->getName(), $this->getType($param, $reflection), $this->isVariadic($param), $this->hasDefaultValue($param), $this->getDefaultValue($param), $param->allowsNull());
+            $arguments[] = new ArgumentMetadata($param->getName(), $this->getType($param, $reflection), $param->isVariadic(), $param->isDefaultValueAvailable(), $param->isDefaultValueAvailable() ? $param->getDefaultValue() : null, $param->allowsNull());
         }
 
         return $arguments;
     }
 
-    /**
-     * Returns whether an argument is variadic.
-     *
-     * @param \ReflectionParameter $parameter
-     *
-     * @return bool
-     */
-    private function isVariadic(\ReflectionParameter $parameter)
-    {
-        return $this->supportsVariadic && $parameter->isVariadic();
-    }
-
-    /**
-     * Determines whether an argument has a default value.
-     *
-     * @param \ReflectionParameter $parameter
-     *
-     * @return bool
-     */
-    private function hasDefaultValue(\ReflectionParameter $parameter)
-    {
-        return $parameter->isDefaultValueAvailable();
-    }
-
-    /**
-     * Returns a default value if available.
-     *
-     * @param \ReflectionParameter $parameter
-     *
-     * @return mixed|null
-     */
-    private function getDefaultValue(\ReflectionParameter $parameter)
-    {
-        return $this->hasDefaultValue($parameter) ? $parameter->getDefaultValue() : null;
-    }
-
     /**
      * Returns an associated type to the given parameter if available.
      *
      * @param \ReflectionParameter $parameter
      *
-     * @return null|string
+     * @return string|null
      */
     private function getType(\ReflectionParameter $parameter, \ReflectionFunctionAbstract $function)
     {
-        if ($this->supportsParameterType) {
-            if (!$type = $parameter->getType()) {
-                return;
-            }
-            $name = $type instanceof \ReflectionNamedType ? $type->getName() : $type->__toString();
-            if ('array' === $name && !$type->isBuiltin()) {
-                // Special case for HHVM with variadics
-                return;
-            }
-        } elseif (preg_match('/^(?:[^ ]++ ){4}([a-zA-Z_\x7F-\xFF][^ ]++)/', $parameter, $name)) {
-            $name = $name[1];
-        } else {
+        if (!$type = $parameter->getType()) {
             return;
         }
+        $name = $type->getName();
         $lcName = strtolower($name);
 
         if ('self' !== $lcName && 'parent' !== $lcName) {
diff --git a/vendor/symfony/http-kernel/DataCollector/ConfigDataCollector.php b/vendor/symfony/http-kernel/DataCollector/ConfigDataCollector.php
index 5675f073..76ad4a8c 100644
--- a/vendor/symfony/http-kernel/DataCollector/ConfigDataCollector.php
+++ b/vendor/symfony/http-kernel/DataCollector/ConfigDataCollector.php
@@ -11,10 +11,10 @@
 
 namespace Symfony\Component\HttpKernel\DataCollector;
 
-use Symfony\Component\HttpKernel\KernelInterface;
-use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\VarDumper\Caster\LinkStub;
 
 /**
@@ -34,7 +34,7 @@ class ConfigDataCollector extends DataCollector implements LateDataCollectorInte
      * @param string $name    The name of the application using the web profiler
      * @param string $version The version of the application using the web profiler
      */
-    public function __construct($name = null, $version = null)
+    public function __construct(string $name = null, string $version = null)
     {
         $this->name = $name;
         $this->version = $version;
@@ -67,11 +67,11 @@ class ConfigDataCollector extends DataCollector implements LateDataCollectorInte
             'php_architecture' => PHP_INT_SIZE * 8,
             'php_intl_locale' => class_exists('Locale', false) && \Locale::getDefault() ? \Locale::getDefault() : 'n/a',
             'php_timezone' => date_default_timezone_get(),
-            'xdebug_enabled' => extension_loaded('xdebug'),
-            'apcu_enabled' => extension_loaded('apcu') && ini_get('apc.enabled'),
-            'zend_opcache_enabled' => extension_loaded('Zend OPcache') && ini_get('opcache.enable'),
+            'xdebug_enabled' => \extension_loaded('xdebug'),
+            'apcu_enabled' => \extension_loaded('apcu') && ini_get('apc.enabled'),
+            'zend_opcache_enabled' => \extension_loaded('Zend OPcache') && ini_get('opcache.enable'),
             'bundles' => array(),
-            'sapi_name' => PHP_SAPI,
+            'sapi_name' => \PHP_SAPI,
         );
 
         if (isset($this->kernel)) {
diff --git a/vendor/symfony/http-kernel/DataCollector/DataCollector.php b/vendor/symfony/http-kernel/DataCollector/DataCollector.php
index 30887ab9..a3d8c99d 100644
--- a/vendor/symfony/http-kernel/DataCollector/DataCollector.php
+++ b/vendor/symfony/http-kernel/DataCollector/DataCollector.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\HttpKernel\DataCollector;
 
-use Symfony\Component\HttpKernel\DataCollector\Util\ValueExporter;
 use Symfony\Component\VarDumper\Caster\CutStub;
 use Symfony\Component\VarDumper\Cloner\ClonerInterface;
 use Symfony\Component\VarDumper\Cloner\Data;
@@ -30,11 +29,6 @@ abstract class DataCollector implements DataCollectorInterface, \Serializable
 {
     protected $data = array();
 
-    /**
-     * @var ValueExporter
-     */
-    private $valueExporter;
-
     /**
      * @var ClonerInterface
      */
@@ -66,46 +60,17 @@ abstract class DataCollector implements DataCollectorInterface, \Serializable
             return $var;
         }
         if (null === $this->cloner) {
-            if (class_exists(CutStub::class)) {
-                $this->cloner = new VarCloner();
-                $this->cloner->setMaxItems(-1);
-                $this->cloner->addCasters($this->getCasters());
-            } else {
-                @trigger_error(sprintf('Using the %s() method without the VarDumper component is deprecated since Symfony 3.2 and won\'t be supported in 4.0. Install symfony/var-dumper version 3.2 or above.', __METHOD__), E_USER_DEPRECATED);
-                $this->cloner = false;
+            if (!class_exists(CutStub::class)) {
+                throw new \LogicException(sprintf('The VarDumper component is needed for the %s() method. Install symfony/var-dumper version 3.4 or above.', __METHOD__));
             }
-        }
-        if (false === $this->cloner) {
-            if (null === $this->valueExporter) {
-                $this->valueExporter = new ValueExporter();
-            }
-
-            return $this->valueExporter->exportValue($var);
+            $this->cloner = new VarCloner();
+            $this->cloner->setMaxItems(-1);
+            $this->cloner->addCasters($this->getCasters());
         }
 
         return $this->cloner->cloneVar($var);
     }
 
-    /**
-     * Converts a PHP variable to a string.
-     *
-     * @param mixed $var A PHP variable
-     *
-     * @return string The string representation of the variable
-     *
-     * @deprecated since version 3.2, to be removed in 4.0. Use cloneVar() instead.
-     */
-    protected function varToString($var)
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.2 and will be removed in 4.0. Use cloneVar() instead.', __METHOD__), E_USER_DEPRECATED);
-
-        if (null === $this->valueExporter) {
-            $this->valueExporter = new ValueExporter();
-        }
-
-        return $this->valueExporter->exportValue($var);
-    }
-
     /**
      * @return callable[] The casters to add to the cloner
      */
@@ -115,7 +80,7 @@ abstract class DataCollector implements DataCollectorInterface, \Serializable
             '*' => function ($v, array $a, Stub $s, $isNested) {
                 if (!$v instanceof Stub) {
                     foreach ($a as $k => $v) {
-                        if (is_object($v) && !$v instanceof \DateTimeInterface && !$v instanceof Stub) {
+                        if (\is_object($v) && !$v instanceof \DateTimeInterface && !$v instanceof Stub) {
                             $a[$k] = new CutStub($v);
                         }
                     }
diff --git a/vendor/symfony/http-kernel/DataCollector/DataCollectorInterface.php b/vendor/symfony/http-kernel/DataCollector/DataCollectorInterface.php
index 2470089b..549fd5d3 100644
--- a/vendor/symfony/http-kernel/DataCollector/DataCollectorInterface.php
+++ b/vendor/symfony/http-kernel/DataCollector/DataCollectorInterface.php
@@ -18,8 +18,6 @@ use Symfony\Component\HttpFoundation\Response;
  * DataCollectorInterface.
  *
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @method reset() Resets this data collector to its initial state.
  */
 interface DataCollectorInterface
 {
@@ -34,4 +32,9 @@ interface DataCollectorInterface
      * @return string The collector name
      */
     public function getName();
+
+    /**
+     * Resets this data collector to its initial state.
+     */
+    public function reset();
 }
diff --git a/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php b/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php
index 27a9a825..1ca85255 100644
--- a/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php
+++ b/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php
@@ -18,9 +18,10 @@ use Symfony\Component\Stopwatch\Stopwatch;
 use Symfony\Component\VarDumper\Cloner\Data;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
 use Symfony\Component\VarDumper\Dumper\CliDumper;
-use Symfony\Component\VarDumper\Dumper\HtmlDumper;
+use Symfony\Component\VarDumper\Dumper\ContextProvider\SourceContextProvider;
 use Symfony\Component\VarDumper\Dumper\DataDumperInterface;
-use Twig\Template;
+use Symfony\Component\VarDumper\Dumper\HtmlDumper;
+use Symfony\Component\VarDumper\Server\Connection;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
@@ -37,16 +38,18 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
     private $charset;
     private $requestStack;
     private $dumper;
-    private $dumperIsInjected;
+    private $sourceContextProvider;
 
-    public function __construct(Stopwatch $stopwatch = null, $fileLinkFormat = null, $charset = null, RequestStack $requestStack = null, DataDumperInterface $dumper = null)
+    /**
+     * @param DataDumperInterface|Connection|null $dumper
+     */
+    public function __construct(Stopwatch $stopwatch = null, $fileLinkFormat = null, string $charset = null, RequestStack $requestStack = null, $dumper = null)
     {
         $this->stopwatch = $stopwatch;
         $this->fileLinkFormat = $fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
         $this->charset = $charset ?: ini_get('php.output_encoding') ?: ini_get('default_charset') ?: 'UTF-8';
         $this->requestStack = $requestStack;
         $this->dumper = $dumper;
-        $this->dumperIsInjected = null !== $dumper;
 
         // All clones share these properties by reference:
         $this->rootRefs = array(
@@ -55,6 +58,8 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
             &$this->isCollected,
             &$this->clonesCount,
         );
+
+        $this->sourceContextProvider = $dumper instanceof Connection && isset($dumper->getContextProviders()['source']) ? $dumper->getContextProviders()['source'] : new SourceContextProvider($this->charset);
     }
 
     public function __clone()
@@ -67,65 +72,17 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
         if ($this->stopwatch) {
             $this->stopwatch->start('dump');
         }
-        if ($this->isCollected && !$this->dumper) {
-            $this->isCollected = false;
-        }
-
-        $trace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT | DEBUG_BACKTRACE_IGNORE_ARGS, 7);
-
-        $file = $trace[0]['file'];
-        $line = $trace[0]['line'];
-        $name = false;
-        $fileExcerpt = false;
-
-        for ($i = 1; $i < 7; ++$i) {
-            if (isset($trace[$i]['class'], $trace[$i]['function'])
-                && 'dump' === $trace[$i]['function']
-                && 'Symfony\Component\VarDumper\VarDumper' === $trace[$i]['class']
-            ) {
-                $file = $trace[$i]['file'];
-                $line = $trace[$i]['line'];
-
-                while (++$i < 7) {
-                    if (isset($trace[$i]['function'], $trace[$i]['file']) && empty($trace[$i]['class']) && 0 !== strpos($trace[$i]['function'], 'call_user_func')) {
-                        $file = $trace[$i]['file'];
-                        $line = $trace[$i]['line'];
-
-                        break;
-                    } elseif (isset($trace[$i]['object']) && $trace[$i]['object'] instanceof Template) {
-                        $template = $trace[$i]['object'];
-                        $name = $template->getTemplateName();
-                        $src = method_exists($template, 'getSourceContext') ? $template->getSourceContext()->getCode() : (method_exists($template, 'getSource') ? $template->getSource() : false);
-                        $info = $template->getDebugInfo();
-                        if (isset($info[$trace[$i - 1]['line']])) {
-                            $line = $info[$trace[$i - 1]['line']];
-                            $file = method_exists($template, 'getSourceContext') ? $template->getSourceContext()->getPath() : null;
-
-                            if ($src) {
-                                $src = explode("\n", $src);
-                                $fileExcerpt = array();
-
-                                for ($i = max($line - 3, 1), $max = min($line + 3, count($src)); $i <= $max; ++$i) {
-                                    $fileExcerpt[] = '<li'.($i === $line ? ' class="selected"' : '').'><code>'.$this->htmlEncode($src[$i - 1]).'</code></li>';
-                                }
-
-                                $fileExcerpt = '<ol start="'.max($line - 3, 1).'">'.implode("\n", $fileExcerpt).'</ol>';
-                            }
-                        }
-                        break;
-                    }
-                }
-                break;
-            }
-        }
 
-        if (false === $name) {
-            $name = str_replace('\\', '/', $file);
-            $name = substr($name, strrpos($name, '/') + 1);
-        }
+        list('name' => $name, 'file' => $file, 'line' => $line, 'file_excerpt' => $fileExcerpt) = $this->sourceContextProvider->getContext();
 
-        if ($this->dumper) {
-            $this->doDump($data, $name, $file, $line);
+        if ($this->dumper instanceof Connection) {
+            if (!$this->dumper->write($data)) {
+                $this->isCollected = false;
+            }
+        } elseif ($this->dumper) {
+            $this->doDump($this->dumper, $data, $name, $file, $line);
+        } else {
+            $this->isCollected = false;
         }
 
         $this->data[] = compact('data', 'name', 'file', 'line', 'fileExcerpt');
@@ -152,14 +109,14 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
             || false === strripos($response->getContent(), '</body>')
         ) {
             if ($response->headers->has('Content-Type') && false !== strpos($response->headers->get('Content-Type'), 'html')) {
-                $this->dumper = new HtmlDumper('php://output', $this->charset);
-                $this->dumper->setDisplayOptions(array('fileLinkFormat' => $this->fileLinkFormat));
+                $dumper = new HtmlDumper('php://output', $this->charset);
+                $dumper->setDisplayOptions(array('fileLinkFormat' => $this->fileLinkFormat));
             } else {
-                $this->dumper = new CliDumper('php://output', $this->charset);
+                $dumper = new CliDumper('php://output', $this->charset);
             }
 
             foreach ($this->data as $dump) {
-                $this->doDump($dump['data'], $dump['name'], $dump['file'], $dump['line']);
+                $this->doDump($dumper, $dump['data'], $dump['name'], $dump['file'], $dump['line']);
             }
         }
     }
@@ -171,7 +128,7 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
         }
         $this->data = array();
         $this->dataCount = 0;
-        $this->isCollected = false;
+        $this->isCollected = true;
         $this->clonesCount = 0;
         $this->clonesIndex = 0;
     }
@@ -188,9 +145,6 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
         $this->data = array();
         $this->dataCount = 0;
         $this->isCollected = true;
-        if (!$this->dumperIsInjected) {
-            $this->dumper = null;
-        }
 
         return $ser;
     }
@@ -200,7 +154,7 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
         parent::unserialize($data);
         $charset = array_pop($this->data);
         $fileLinkFormat = array_pop($this->data);
-        $this->dataCount = count($this->data);
+        $this->dataCount = \count($this->data);
         self::__construct($this->stopwatch, $fileLinkFormat, $charset);
     }
 
@@ -244,22 +198,22 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
             $this->isCollected = true;
 
             $h = headers_list();
-            $i = count($h);
+            $i = \count($h);
             array_unshift($h, 'Content-Type: '.ini_get('default_mimetype'));
             while (0 !== stripos($h[$i], 'Content-Type:')) {
                 --$i;
             }
 
-            if (!\in_array(PHP_SAPI, array('cli', 'phpdbg'), true) && stripos($h[$i], 'html')) {
-                $this->dumper = new HtmlDumper('php://output', $this->charset);
-                $this->dumper->setDisplayOptions(array('fileLinkFormat' => $this->fileLinkFormat));
+            if (!\in_array(\PHP_SAPI, array('cli', 'phpdbg'), true) && stripos($h[$i], 'html')) {
+                $dumper = new HtmlDumper('php://output', $this->charset);
+                $dumper->setDisplayOptions(array('fileLinkFormat' => $this->fileLinkFormat));
             } else {
-                $this->dumper = new CliDumper('php://output', $this->charset);
+                $dumper = new CliDumper('php://output', $this->charset);
             }
 
             foreach ($this->data as $i => $dump) {
                 $this->data[$i] = null;
-                $this->doDump($dump['data'], $dump['name'], $dump['file'], $dump['line']);
+                $this->doDump($dumper, $dump['data'], $dump['name'], $dump['file'], $dump['line']);
             }
 
             $this->data = array();
@@ -267,16 +221,16 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
         }
     }
 
-    private function doDump($data, $name, $file, $line)
+    private function doDump(DataDumperInterface $dumper, $data, $name, $file, $line)
     {
-        if ($this->dumper instanceof CliDumper) {
+        if ($dumper instanceof CliDumper) {
             $contextDumper = function ($name, $file, $line, $fmt) {
                 if ($this instanceof HtmlDumper) {
                     if ($file) {
                         $s = $this->style('meta', '%s');
                         $f = strip_tags($this->style('', $file));
                         $name = strip_tags($this->style('', $name));
-                        if ($fmt && $link = is_string($fmt) ? strtr($fmt, array('%f' => $file, '%l' => $line)) : $fmt->format($file, $line)) {
+                        if ($fmt && $link = \is_string($fmt) ? strtr($fmt, array('%f' => $file, '%l' => $line)) : $fmt->format($file, $line)) {
                             $name = sprintf('<a href="%s" title="%s">'.$s.'</a>', strip_tags($this->style('', $link)), $f, $name);
                         } else {
                             $name = sprintf('<abbr title="%s">'.$s.'</abbr>', $f, $name);
@@ -290,26 +244,12 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
                 }
                 $this->dumpLine(0);
             };
-            $contextDumper = $contextDumper->bindTo($this->dumper, $this->dumper);
+            $contextDumper = $contextDumper->bindTo($dumper, $dumper);
             $contextDumper($name, $file, $line, $this->fileLinkFormat);
         } else {
             $cloner = new VarCloner();
-            $this->dumper->dump($cloner->cloneVar($name.' on line '.$line.':'));
+            $dumper->dump($cloner->cloneVar($name.' on line '.$line.':'));
         }
-        $this->dumper->dump($data);
-    }
-
-    private function htmlEncode($s)
-    {
-        $html = '';
-
-        $dumper = new HtmlDumper(function ($line) use (&$html) { $html .= $line; }, $this->charset);
-        $dumper->setDumpHeader('');
-        $dumper->setDumpBoundaries('', '');
-
-        $cloner = new VarCloner();
-        $dumper->dump($cloner->cloneVar($s));
-
-        return substr(strip_tags($html), 1, -1);
+        $dumper->dump($data);
     }
 }
diff --git a/vendor/symfony/http-kernel/DataCollector/EventDataCollector.php b/vendor/symfony/http-kernel/DataCollector/EventDataCollector.php
index 0a095ab6..f9d5bed1 100644
--- a/vendor/symfony/http-kernel/DataCollector/EventDataCollector.php
+++ b/vendor/symfony/http-kernel/DataCollector/EventDataCollector.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\HttpKernel\DataCollector;
 
+use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcher;
+use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcherInterface;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcherInterface;
 
 /**
  * EventDataCollector.
@@ -27,9 +28,6 @@ class EventDataCollector extends DataCollector implements LateDataCollectorInter
 
     public function __construct(EventDispatcherInterface $dispatcher = null)
     {
-        if ($dispatcher instanceof TraceableEventDispatcherInterface && !method_exists($dispatcher, 'reset')) {
-            @trigger_error(sprintf('Implementing "%s" without the "reset()" method is deprecated since Symfony 3.4 and will be unsupported in 4.0 for class "%s".', TraceableEventDispatcherInterface::class, \get_class($dispatcher)), E_USER_DEPRECATED);
-        }
         $this->dispatcher = $dispatcher;
     }
 
@@ -41,6 +39,7 @@ class EventDataCollector extends DataCollector implements LateDataCollectorInter
         $this->data = array(
             'called_listeners' => array(),
             'not_called_listeners' => array(),
+            'orphaned_events' => array(),
         );
     }
 
@@ -49,10 +48,6 @@ class EventDataCollector extends DataCollector implements LateDataCollectorInter
         $this->data = array();
 
         if ($this->dispatcher instanceof TraceableEventDispatcherInterface) {
-            if (!method_exists($this->dispatcher, 'reset')) {
-                return; // @deprecated
-            }
-
             $this->dispatcher->reset();
         }
     }
@@ -63,6 +58,11 @@ class EventDataCollector extends DataCollector implements LateDataCollectorInter
             $this->setCalledListeners($this->dispatcher->getCalledListeners());
             $this->setNotCalledListeners($this->dispatcher->getNotCalledListeners());
         }
+
+        if ($this->dispatcher instanceof TraceableEventDispatcher) {
+            $this->setOrphanedEvents($this->dispatcher->getOrphanedEvents());
+        }
+
         $this->data = $this->cloneVar($this->data);
     }
 
@@ -71,7 +71,7 @@ class EventDataCollector extends DataCollector implements LateDataCollectorInter
      *
      * @param array $listeners An array of called listeners
      *
-     * @see TraceableEventDispatcherInterface
+     * @see TraceableEventDispatcher
      */
     public function setCalledListeners(array $listeners)
     {
@@ -83,7 +83,7 @@ class EventDataCollector extends DataCollector implements LateDataCollectorInter
      *
      * @return array An array of called listeners
      *
-     * @see TraceableEventDispatcherInterface
+     * @see TraceableEventDispatcher
      */
     public function getCalledListeners()
     {
@@ -93,9 +93,9 @@ class EventDataCollector extends DataCollector implements LateDataCollectorInter
     /**
      * Sets the not called listeners.
      *
-     * @param array $listeners An array of not called listeners
+     * @param array $listeners
      *
-     * @see TraceableEventDispatcherInterface
+     * @see TraceableEventDispatcher
      */
     public function setNotCalledListeners(array $listeners)
     {
@@ -105,15 +105,39 @@ class EventDataCollector extends DataCollector implements LateDataCollectorInter
     /**
      * Gets the not called listeners.
      *
-     * @return array An array of not called listeners
+     * @return array
      *
-     * @see TraceableEventDispatcherInterface
+     * @see TraceableEventDispatcher
      */
     public function getNotCalledListeners()
     {
         return $this->data['not_called_listeners'];
     }
 
+    /**
+     * Sets the orphaned events.
+     *
+     * @param array $events An array of orphaned events
+     *
+     * @see TraceableEventDispatcher
+     */
+    public function setOrphanedEvents(array $events)
+    {
+        $this->data['orphaned_events'] = $events;
+    }
+
+    /**
+     * Gets the orphaned events.
+     *
+     * @return array An array of orphaned events
+     *
+     * @see TraceableEventDispatcher
+     */
+    public function getOrphanedEvents()
+    {
+        return $this->data['orphaned_events'];
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/vendor/symfony/http-kernel/DataCollector/LoggerDataCollector.php b/vendor/symfony/http-kernel/DataCollector/LoggerDataCollector.php
index 03bfa5d8..533d3217 100644
--- a/vendor/symfony/http-kernel/DataCollector/LoggerDataCollector.php
+++ b/vendor/symfony/http-kernel/DataCollector/LoggerDataCollector.php
@@ -13,6 +13,7 @@ namespace Symfony\Component\HttpKernel\DataCollector;
 
 use Symfony\Component\Debug\Exception\SilencedErrorContext;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
 
@@ -25,18 +26,17 @@ class LoggerDataCollector extends DataCollector implements LateDataCollectorInte
 {
     private $logger;
     private $containerPathPrefix;
+    private $currentRequest;
+    private $requestStack;
 
-    public function __construct($logger = null, $containerPathPrefix = null)
+    public function __construct($logger = null, string $containerPathPrefix = null, RequestStack $requestStack = null)
     {
         if (null !== $logger && $logger instanceof DebugLoggerInterface) {
-            if (!method_exists($logger, 'clear')) {
-                @trigger_error(sprintf('Implementing "%s" without the "clear()" method is deprecated since Symfony 3.4 and will be unsupported in 4.0 for class "%s".', DebugLoggerInterface::class, \get_class($logger)), E_USER_DEPRECATED);
-            }
-
             $this->logger = $logger;
         }
 
         $this->containerPathPrefix = $containerPathPrefix;
+        $this->requestStack = $requestStack;
     }
 
     /**
@@ -44,7 +44,7 @@ class LoggerDataCollector extends DataCollector implements LateDataCollectorInte
      */
     public function collect(Request $request, Response $response, \Exception $exception = null)
     {
-        // everything is done as late as possible
+        $this->currentRequest = $this->requestStack && $this->requestStack->getMasterRequest() !== $request ? $request : null;
     }
 
     /**
@@ -52,7 +52,7 @@ class LoggerDataCollector extends DataCollector implements LateDataCollectorInte
      */
     public function reset()
     {
-        if ($this->logger && method_exists($this->logger, 'clear')) {
+        if ($this->logger instanceof DebugLoggerInterface) {
             $this->logger->clear();
         }
         $this->data = array();
@@ -67,9 +67,10 @@ class LoggerDataCollector extends DataCollector implements LateDataCollectorInte
             $containerDeprecationLogs = $this->getContainerDeprecationLogs();
             $this->data = $this->computeErrorsCount($containerDeprecationLogs);
             $this->data['compiler_logs'] = $this->getContainerCompilerLogs();
-            $this->data['logs'] = $this->sanitizeLogs(array_merge($this->logger->getLogs(), $containerDeprecationLogs));
+            $this->data['logs'] = $this->sanitizeLogs(array_merge($this->logger->getLogs($this->currentRequest), $containerDeprecationLogs));
             $this->data = $this->cloneVar($this->data);
         }
+        $this->currentRequest = null;
     }
 
     /**
@@ -222,7 +223,7 @@ class LoggerDataCollector extends DataCollector implements LateDataCollectorInte
             return true;
         }
 
-        if ($exception instanceof \ErrorException && in_array($exception->getSeverity(), array(E_DEPRECATED, E_USER_DEPRECATED), true)) {
+        if ($exception instanceof \ErrorException && \in_array($exception->getSeverity(), array(E_DEPRECATED, E_USER_DEPRECATED), true)) {
             return true;
         }
 
@@ -233,14 +234,14 @@ class LoggerDataCollector extends DataCollector implements LateDataCollectorInte
     {
         $silencedLogs = array();
         $count = array(
-            'error_count' => $this->logger->countErrors(),
+            'error_count' => $this->logger->countErrors($this->currentRequest),
             'deprecation_count' => 0,
             'warning_count' => 0,
             'scream_count' => 0,
             'priorities' => array(),
         );
 
-        foreach ($this->logger->getLogs() as $log) {
+        foreach ($this->logger->getLogs($this->currentRequest) as $log) {
             if (isset($count['priorities'][$log['priority']])) {
                 ++$count['priorities'][$log['priority']]['count'];
             } else {
diff --git a/vendor/symfony/http-kernel/DataCollector/MemoryDataCollector.php b/vendor/symfony/http-kernel/DataCollector/MemoryDataCollector.php
index 8d8cc1a0..310b2f91 100644
--- a/vendor/symfony/http-kernel/DataCollector/MemoryDataCollector.php
+++ b/vendor/symfony/http-kernel/DataCollector/MemoryDataCollector.php
@@ -98,9 +98,9 @@ class MemoryDataCollector extends DataCollector implements LateDataCollectorInte
         $memoryLimit = strtolower($memoryLimit);
         $max = strtolower(ltrim($memoryLimit, '+'));
         if (0 === strpos($max, '0x')) {
-            $max = intval($max, 16);
+            $max = \intval($max, 16);
         } elseif (0 === strpos($max, '0')) {
-            $max = intval($max, 8);
+            $max = \intval($max, 8);
         } else {
             $max = (int) $max;
         }
diff --git a/vendor/symfony/http-kernel/DataCollector/RequestDataCollector.php b/vendor/symfony/http-kernel/DataCollector/RequestDataCollector.php
index 54d17d28..4c34cf90 100644
--- a/vendor/symfony/http-kernel/DataCollector/RequestDataCollector.php
+++ b/vendor/symfony/http-kernel/DataCollector/RequestDataCollector.php
@@ -11,14 +11,14 @@
 
 namespace Symfony\Component\HttpKernel\DataCollector;
 
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Cookie;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
@@ -42,7 +42,7 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
         $route = '';
         foreach ($request->attributes->all() as $key => $value) {
             if ('_route' === $key) {
-                $route = is_object($value) ? $value->getPath() : $value;
+                $route = \is_object($value) ? $value->getPath() : $value;
                 $attributes[$key] = $route;
             } else {
                 $attributes[$key] = $value;
@@ -79,6 +79,13 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
             $responseCookies[$cookie->getName()] = $cookie;
         }
 
+        $dotenvVars = array();
+        foreach (explode(',', getenv('SYMFONY_DOTENV_VARS')) as $name) {
+            if ('' !== $name && false !== $value = getenv($name)) {
+                $dotenvVars[$name] = $value;
+            }
+        }
+
         $this->data = array(
             'method' => $request->getMethod(),
             'format' => $request->getRequestFormat(),
@@ -101,6 +108,7 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
             'path_info' => $request->getPathInfo(),
             'controller' => 'n/a',
             'locale' => $request->getLocale(),
+            'dotenv_vars' => $dotenvVars,
         );
 
         if (isset($this->data['request_headers']['php-auth-pw'])) {
@@ -116,7 +124,7 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
         }
 
         foreach ($this->data as $key => $value) {
-            if (!is_array($value)) {
+            if (!\is_array($value)) {
                 continue;
             }
             if ('request_headers' === $key || 'response_headers' === $key) {
@@ -149,7 +157,11 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
             ));
         }
 
-        $this->data['identifier'] = $this->data['route'] ?: (is_array($this->data['controller']) ? $this->data['controller']['class'].'::'.$this->data['controller']['method'].'()' : $this->data['controller']);
+        $this->data['identifier'] = $this->data['route'] ?: (\is_array($this->data['controller']) ? $this->data['controller']['class'].'::'.$this->data['controller']['method'].'()' : $this->data['controller']);
+
+        if ($response->headers->has('x-previous-debug-token')) {
+            $this->data['forward_token'] = $response->headers->get('x-previous-debug-token');
+        }
     }
 
     public function lateCollect()
@@ -258,6 +270,11 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
         return $this->data['locale'];
     }
 
+    public function getDotenvVars()
+    {
+        return new ParameterBag($this->data['dotenv_vars']->getValue());
+    }
+
     /**
      * Gets the route name.
      *
@@ -309,6 +326,11 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
         return isset($this->data['redirect']) ? $this->data['redirect'] : false;
     }
 
+    public function getForwardToken()
+    {
+        return isset($this->data['forward_token']) ? $this->data['forward_token'] : null;
+    }
+
     public function onKernelController(FilterControllerEvent $event)
     {
         $this->controllers[$event->getRequest()] = $event->getController();
@@ -350,25 +372,25 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
      */
     protected function parseController($controller)
     {
-        if (is_string($controller) && false !== strpos($controller, '::')) {
+        if (\is_string($controller) && false !== strpos($controller, '::')) {
             $controller = explode('::', $controller);
         }
 
-        if (is_array($controller)) {
+        if (\is_array($controller)) {
             try {
                 $r = new \ReflectionMethod($controller[0], $controller[1]);
 
                 return array(
-                    'class' => is_object($controller[0]) ? get_class($controller[0]) : $controller[0],
+                    'class' => \is_object($controller[0]) ? \get_class($controller[0]) : $controller[0],
                     'method' => $controller[1],
                     'file' => $r->getFileName(),
                     'line' => $r->getStartLine(),
                 );
             } catch (\ReflectionException $e) {
-                if (is_callable($controller)) {
+                if (\is_callable($controller)) {
                     // using __call or  __callStatic
                     return array(
-                        'class' => is_object($controller[0]) ? get_class($controller[0]) : $controller[0],
+                        'class' => \is_object($controller[0]) ? \get_class($controller[0]) : $controller[0],
                         'method' => $controller[1],
                         'file' => 'n/a',
                         'line' => 'n/a',
@@ -388,7 +410,7 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
             );
         }
 
-        if (is_object($controller)) {
+        if (\is_object($controller)) {
             $r = new \ReflectionClass($controller);
 
             return array(
@@ -399,6 +421,6 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
             );
         }
 
-        return is_string($controller) ? $controller : 'n/a';
+        return \is_string($controller) ? $controller : 'n/a';
     }
 }
diff --git a/vendor/symfony/http-kernel/DataCollector/RouterDataCollector.php b/vendor/symfony/http-kernel/DataCollector/RouterDataCollector.php
index afd34f8a..481747b3 100644
--- a/vendor/symfony/http-kernel/DataCollector/RouterDataCollector.php
+++ b/vendor/symfony/http-kernel/DataCollector/RouterDataCollector.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\HttpKernel\DataCollector;
 
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 
 /**
diff --git a/vendor/symfony/http-kernel/DataCollector/Util/ValueExporter.php b/vendor/symfony/http-kernel/DataCollector/Util/ValueExporter.php
deleted file mode 100644
index a71c00db..00000000
--- a/vendor/symfony/http-kernel/DataCollector/Util/ValueExporter.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpKernel\DataCollector\Util;
-
-@trigger_error('The '.__NAMESPACE__.'\ValueExporter class is deprecated since Symfony 3.2 and will be removed in 4.0. Use the VarDumper component instead.', E_USER_DEPRECATED);
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 3.2, to be removed in 4.0. Use the VarDumper component instead.
- */
-class ValueExporter
-{
-    /**
-     * Converts a PHP value to a string.
-     *
-     * @param mixed $value The PHP value
-     * @param int   $depth Only for internal usage
-     * @param bool  $deep  Only for internal usage
-     *
-     * @return string The string representation of the given value
-     */
-    public function exportValue($value, $depth = 1, $deep = false)
-    {
-        if ($value instanceof \__PHP_Incomplete_Class) {
-            return sprintf('__PHP_Incomplete_Class(%s)', $this->getClassNameFromIncomplete($value));
-        }
-
-        if (is_object($value)) {
-            if ($value instanceof \DateTimeInterface) {
-                return sprintf('Object(%s) - %s', get_class($value), $value->format(\DateTime::ATOM));
-            }
-
-            return sprintf('Object(%s)', get_class($value));
-        }
-
-        if (is_array($value)) {
-            if (empty($value)) {
-                return '[]';
-            }
-
-            $indent = str_repeat('  ', $depth);
-
-            $a = array();
-            foreach ($value as $k => $v) {
-                if (is_array($v)) {
-                    $deep = true;
-                }
-                $a[] = sprintf('%s => %s', $k, $this->exportValue($v, $depth + 1, $deep));
-            }
-
-            if ($deep) {
-                return sprintf("[\n%s%s\n%s]", $indent, implode(sprintf(", \n%s", $indent), $a), str_repeat('  ', $depth - 1));
-            }
-
-            $s = sprintf('[%s]', implode(', ', $a));
-
-            if (80 > strlen($s)) {
-                return $s;
-            }
-
-            return sprintf("[\n%s%s\n]", $indent, implode(sprintf(",\n%s", $indent), $a));
-        }
-
-        if (is_resource($value)) {
-            return sprintf('Resource(%s#%d)', get_resource_type($value), $value);
-        }
-
-        if (null === $value) {
-            return 'null';
-        }
-
-        if (false === $value) {
-            return 'false';
-        }
-
-        if (true === $value) {
-            return 'true';
-        }
-
-        return (string) $value;
-    }
-
-    private function getClassNameFromIncomplete(\__PHP_Incomplete_Class $value)
-    {
-        $array = new \ArrayObject($value);
-
-        return $array['__PHP_Incomplete_Class_Name'];
-    }
-}
diff --git a/vendor/symfony/http-kernel/Debug/FileLinkFormatter.php b/vendor/symfony/http-kernel/Debug/FileLinkFormatter.php
index 1a72ac7e..e187022b 100644
--- a/vendor/symfony/http-kernel/Debug/FileLinkFormatter.php
+++ b/vendor/symfony/http-kernel/Debug/FileLinkFormatter.php
@@ -31,11 +31,11 @@ class FileLinkFormatter implements \Serializable
     /**
      * @param string|\Closure $urlFormat the URL format, or a closure that returns it on-demand
      */
-    public function __construct($fileLinkFormat = null, RequestStack $requestStack = null, $baseDir = null, $urlFormat = null)
+    public function __construct($fileLinkFormat = null, RequestStack $requestStack = null, string $baseDir = null, $urlFormat = null)
     {
         $fileLinkFormat = $fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
-        if ($fileLinkFormat && !is_array($fileLinkFormat)) {
-            $i = strpos($f = $fileLinkFormat, '&', max(strrpos($f, '%f'), strrpos($f, '%l'))) ?: strlen($f);
+        if ($fileLinkFormat && !\is_array($fileLinkFormat)) {
+            $i = strpos($f = $fileLinkFormat, '&', max(strrpos($f, '%f'), strrpos($f, '%l'))) ?: \strlen($f);
             $fileLinkFormat = array(substr($f, 0, $i)) + preg_split('/&([^>]++)>/', substr($f, $i), -1, PREG_SPLIT_DELIM_CAPTURE);
         }
 
@@ -50,7 +50,7 @@ class FileLinkFormatter implements \Serializable
         if ($fmt = $this->getFileLinkFormat()) {
             for ($i = 1; isset($fmt[$i]); ++$i) {
                 if (0 === strpos($file, $k = $fmt[$i++])) {
-                    $file = substr_replace($file, $fmt[$i], 0, strlen($k));
+                    $file = substr_replace($file, $fmt[$i], 0, \strlen($k));
                     break;
                 }
             }
@@ -68,11 +68,7 @@ class FileLinkFormatter implements \Serializable
 
     public function unserialize($serialized)
     {
-        if (\PHP_VERSION_ID >= 70000) {
-            $this->fileLinkFormat = unserialize($serialized, array('allowed_classes' => false));
-        } else {
-            $this->fileLinkFormat = unserialize($serialized);
-        }
+        $this->fileLinkFormat = unserialize($serialized, array('allowed_classes' => false));
     }
 
     /**
@@ -100,8 +96,8 @@ class FileLinkFormatter implements \Serializable
                 }
 
                 return array(
-                    $request->getSchemeAndHttpHost().$request->getBaseUrl().$this->urlFormat,
-                    $this->baseDir.DIRECTORY_SEPARATOR, '',
+                    $request->getSchemeAndHttpHost().$request->getBasePath().$this->urlFormat,
+                    $this->baseDir.\DIRECTORY_SEPARATOR, '',
                 );
             }
         }
diff --git a/vendor/symfony/http-kernel/Debug/TraceableEventDispatcher.php b/vendor/symfony/http-kernel/Debug/TraceableEventDispatcher.php
index fbc49dff..ddf4fa7c 100644
--- a/vendor/symfony/http-kernel/Debug/TraceableEventDispatcher.php
+++ b/vendor/symfony/http-kernel/Debug/TraceableEventDispatcher.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\HttpKernel\Debug;
 
 use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcher as BaseTraceableEventDispatcher;
-use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
  * Collects some data about event listeners.
diff --git a/vendor/symfony/http-kernel/DependencyInjection/AddAnnotatedClassesToCachePass.php b/vendor/symfony/http-kernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
index b1ecebdc..54f87edd 100644
--- a/vendor/symfony/http-kernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
+++ b/vendor/symfony/http-kernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
@@ -13,8 +13,8 @@ namespace Symfony\Component\HttpKernel\DependencyInjection;
 
 use Composer\Autoload\ClassLoader;
 use Symfony\Component\Debug\DebugClassLoader;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel;
 
 /**
@@ -36,23 +36,15 @@ class AddAnnotatedClassesToCachePass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        $classes = array();
-        $annotatedClasses = array();
+        $annotatedClasses = $this->kernel->getAnnotatedClassesToCompile();
         foreach ($container->getExtensions() as $extension) {
             if ($extension instanceof Extension) {
-                if (\PHP_VERSION_ID < 70000) {
-                    $classes = array_merge($classes, $extension->getClassesToCompile());
-                }
                 $annotatedClasses = array_merge($annotatedClasses, $extension->getAnnotatedClassesToCompile());
             }
         }
 
         $existingClasses = $this->getClassesInComposerClassMaps();
 
-        if (\PHP_VERSION_ID < 70000) {
-            $classes = $container->getParameterBag()->resolveValue($classes);
-            $this->kernel->setClassCache($this->expandClasses($classes, $existingClasses));
-        }
         $annotatedClasses = $container->getParameterBag()->resolveValue($annotatedClasses);
         $this->kernel->setAnnotatedClassCache($this->expandClasses($annotatedClasses, $existingClasses));
     }
@@ -96,7 +88,7 @@ class AddAnnotatedClassesToCachePass implements CompilerPassInterface
         $classes = array();
 
         foreach (spl_autoload_functions() as $function) {
-            if (!is_array($function)) {
+            if (!\is_array($function)) {
                 continue;
             }
 
@@ -104,7 +96,7 @@ class AddAnnotatedClassesToCachePass implements CompilerPassInterface
                 $function = $function[0]->getClassLoader();
             }
 
-            if (is_array($function) && $function[0] instanceof ClassLoader) {
+            if (\is_array($function) && $function[0] instanceof ClassLoader) {
                 $classes += array_filter($function[0]->getClassMap());
             }
         }
diff --git a/vendor/symfony/http-kernel/DependencyInjection/AddClassesToCachePass.php b/vendor/symfony/http-kernel/DependencyInjection/AddClassesToCachePass.php
deleted file mode 100644
index 8ae78e0d..00000000
--- a/vendor/symfony/http-kernel/DependencyInjection/AddClassesToCachePass.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpKernel\DependencyInjection;
-
-@trigger_error('The '.__NAMESPACE__.'\AddClassesToCachePass class is deprecated since Symfony 3.3 and will be removed in 4.0.', E_USER_DEPRECATED);
-
-/**
- * Sets the classes to compile in the cache for the container.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since version 3.3, to be removed in 4.0.
- */
-class AddClassesToCachePass extends AddAnnotatedClassesToCachePass
-{
-}
diff --git a/vendor/symfony/http-kernel/DependencyInjection/ControllerArgumentValueResolverPass.php b/vendor/symfony/http-kernel/DependencyInjection/ControllerArgumentValueResolverPass.php
index 343e217b..77c0e479 100644
--- a/vendor/symfony/http-kernel/DependencyInjection/ControllerArgumentValueResolverPass.php
+++ b/vendor/symfony/http-kernel/DependencyInjection/ControllerArgumentValueResolverPass.php
@@ -15,6 +15,9 @@ use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver\TraceableValueResolver;
+use Symfony\Component\Stopwatch\Stopwatch;
 
 /**
  * Gathers and configures the argument value resolvers.
@@ -27,11 +30,13 @@ class ControllerArgumentValueResolverPass implements CompilerPassInterface
 
     private $argumentResolverService;
     private $argumentValueResolverTag;
+    private $traceableResolverStopwatch;
 
-    public function __construct($argumentResolverService = 'argument_resolver', $argumentValueResolverTag = 'controller.argument_value_resolver')
+    public function __construct(string $argumentResolverService = 'argument_resolver', string $argumentValueResolverTag = 'controller.argument_value_resolver', string $traceableResolverStopwatch = 'debug.stopwatch')
     {
         $this->argumentResolverService = $argumentResolverService;
         $this->argumentValueResolverTag = $argumentValueResolverTag;
+        $this->traceableResolverStopwatch = $traceableResolverStopwatch;
     }
 
     public function process(ContainerBuilder $container)
@@ -40,9 +45,20 @@ class ControllerArgumentValueResolverPass implements CompilerPassInterface
             return;
         }
 
+        $resolvers = $this->findAndSortTaggedServices($this->argumentValueResolverTag, $container);
+
+        if ($container->getParameter('kernel.debug') && class_exists(Stopwatch::class) && $container->has($this->traceableResolverStopwatch)) {
+            foreach ($resolvers as $resolverReference) {
+                $id = (string) $resolverReference;
+                $container->register("debug.$id", TraceableValueResolver::class)
+                    ->setDecoratedService($id)
+                    ->setArguments(array(new Reference("debug.$id.inner"), new Reference($this->traceableResolverStopwatch)));
+            }
+        }
+
         $container
             ->getDefinition($this->argumentResolverService)
-            ->replaceArgument(1, new IteratorArgument($this->findAndSortTaggedServices($this->argumentValueResolverTag, $container)))
+            ->replaceArgument(1, new IteratorArgument($resolvers))
         ;
     }
 }
diff --git a/vendor/symfony/http-kernel/DependencyInjection/Extension.php b/vendor/symfony/http-kernel/DependencyInjection/Extension.php
index a382c15d..64787555 100644
--- a/vendor/symfony/http-kernel/DependencyInjection/Extension.php
+++ b/vendor/symfony/http-kernel/DependencyInjection/Extension.php
@@ -20,25 +20,8 @@ use Symfony\Component\DependencyInjection\Extension\Extension as BaseExtension;
  */
 abstract class Extension extends BaseExtension
 {
-    private $classes = array();
     private $annotatedClasses = array();
 
-    /**
-     * Gets the classes to cache.
-     *
-     * @return array An array of classes
-     *
-     * @deprecated since version 3.3, to be removed in 4.0.
-     */
-    public function getClassesToCompile()
-    {
-        if (\PHP_VERSION_ID >= 70000) {
-            @trigger_error(__METHOD__.'() is deprecated since Symfony 3.3, to be removed in 4.0.', E_USER_DEPRECATED);
-        }
-
-        return $this->classes;
-    }
-
     /**
      * Gets the annotated classes to cache.
      *
@@ -49,22 +32,6 @@ abstract class Extension extends BaseExtension
         return $this->annotatedClasses;
     }
 
-    /**
-     * Adds classes to the class cache.
-     *
-     * @param array $classes An array of class patterns
-     *
-     * @deprecated since version 3.3, to be removed in 4.0.
-     */
-    public function addClassesToCompile(array $classes)
-    {
-        if (\PHP_VERSION_ID >= 70000) {
-            @trigger_error(__METHOD__.'() is deprecated since Symfony 3.3, to be removed in 4.0.', E_USER_DEPRECATED);
-        }
-
-        $this->classes = array_merge($this->classes, $classes);
-    }
-
     /**
      * Adds annotated classes to the class cache.
      *
diff --git a/vendor/symfony/http-kernel/DependencyInjection/FragmentRendererPass.php b/vendor/symfony/http-kernel/DependencyInjection/FragmentRendererPass.php
index ac52c873..2a8c1b1b 100644
--- a/vendor/symfony/http-kernel/DependencyInjection/FragmentRendererPass.php
+++ b/vendor/symfony/http-kernel/DependencyInjection/FragmentRendererPass.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\HttpKernel\DependencyInjection;
 
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface;
@@ -28,11 +28,7 @@ class FragmentRendererPass implements CompilerPassInterface
     private $handlerService;
     private $rendererTag;
 
-    /**
-     * @param string $handlerService Service name of the fragment handler in the container
-     * @param string $rendererTag    Tag name used for fragments
-     */
-    public function __construct($handlerService = 'fragment.handler', $rendererTag = 'kernel.fragment_renderer')
+    public function __construct(string $handlerService = 'fragment.handler', string $rendererTag = 'kernel.fragment_renderer')
     {
         $this->handlerService = $handlerService;
         $this->rendererTag = $rendererTag;
diff --git a/vendor/symfony/http-kernel/DependencyInjection/LazyLoadingFragmentHandler.php b/vendor/symfony/http-kernel/DependencyInjection/LazyLoadingFragmentHandler.php
index 00b05959..4bb47902 100644
--- a/vendor/symfony/http-kernel/DependencyInjection/LazyLoadingFragmentHandler.php
+++ b/vendor/symfony/http-kernel/DependencyInjection/LazyLoadingFragmentHandler.php
@@ -23,52 +23,20 @@ use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
 class LazyLoadingFragmentHandler extends FragmentHandler
 {
     private $container;
-    /**
-     * @deprecated since version 3.3, to be removed in 4.0
-     */
-    private $rendererIds = array();
     private $initialized = array();
 
-    /**
-     * @param ContainerInterface $container    A container
-     * @param RequestStack       $requestStack The Request stack that controls the lifecycle of requests
-     * @param bool               $debug        Whether the debug mode is enabled or not
-     */
-    public function __construct(ContainerInterface $container, RequestStack $requestStack, $debug = false)
+    public function __construct(ContainerInterface $container, RequestStack $requestStack, bool $debug = false)
     {
         $this->container = $container;
 
         parent::__construct($requestStack, array(), $debug);
     }
 
-    /**
-     * Adds a service as a fragment renderer.
-     *
-     * @param string $name     The service name
-     * @param string $renderer The render service id
-     *
-     * @deprecated since version 3.3, to be removed in 4.0
-     */
-    public function addRendererService($name, $renderer)
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
-
-        $this->rendererIds[$name] = $renderer;
-    }
-
     /**
      * {@inheritdoc}
      */
     public function render($uri, $renderer = 'inline', array $options = array())
     {
-        // BC 3.x, to be removed in 4.0
-        if (isset($this->rendererIds[$renderer])) {
-            $this->addRenderer($this->container->get($this->rendererIds[$renderer]));
-            unset($this->rendererIds[$renderer]);
-
-            return parent::render($uri, $renderer, $options);
-        }
-
         if (!isset($this->initialized[$renderer]) && $this->container->has($renderer)) {
             $this->addRenderer($this->container->get($renderer));
             $this->initialized[$renderer] = true;
diff --git a/vendor/symfony/http-kernel/DependencyInjection/LoggerPass.php b/vendor/symfony/http-kernel/DependencyInjection/LoggerPass.php
index 2ad7f322..b6df1f6e 100644
--- a/vendor/symfony/http-kernel/DependencyInjection/LoggerPass.php
+++ b/vendor/symfony/http-kernel/DependencyInjection/LoggerPass.php
@@ -12,9 +12,9 @@
 namespace Symfony\Component\HttpKernel\DependencyInjection;
 
 use Psr\Log\LoggerInterface;
-use Symfony\Component\HttpKernel\Log\Logger;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Log\Logger;
 
 /**
  * Registers the default logger if necessary.
diff --git a/vendor/symfony/http-kernel/DependencyInjection/MergeExtensionConfigurationPass.php b/vendor/symfony/http-kernel/DependencyInjection/MergeExtensionConfigurationPass.php
index dcd73828..1dbf7f7b 100644
--- a/vendor/symfony/http-kernel/DependencyInjection/MergeExtensionConfigurationPass.php
+++ b/vendor/symfony/http-kernel/DependencyInjection/MergeExtensionConfigurationPass.php
@@ -31,7 +31,7 @@ class MergeExtensionConfigurationPass extends BaseMergeExtensionConfigurationPas
     public function process(ContainerBuilder $container)
     {
         foreach ($this->extensions as $extension) {
-            if (!count($container->getExtensionConfig($extension))) {
+            if (!\count($container->getExtensionConfig($extension))) {
                 $container->loadFromExtension($extension, array());
             }
         }
diff --git a/vendor/symfony/http-kernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/vendor/symfony/http-kernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
index cb88594e..06adfe4a 100644
--- a/vendor/symfony/http-kernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
+++ b/vendor/symfony/http-kernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
@@ -33,11 +33,13 @@ class RegisterControllerArgumentLocatorsPass implements CompilerPassInterface
 {
     private $resolverServiceId;
     private $controllerTag;
+    private $controllerLocator;
 
-    public function __construct($resolverServiceId = 'argument_resolver.service', $controllerTag = 'controller.service_arguments')
+    public function __construct(string $resolverServiceId = 'argument_resolver.service', string $controllerTag = 'controller.service_arguments', string $controllerLocator = 'argument_resolver.controller_locator')
     {
         $this->resolverServiceId = $resolverServiceId;
         $this->controllerTag = $controllerTag;
+        $this->controllerLocator = $controllerLocator;
     }
 
     public function process(ContainerBuilder $container)
@@ -60,7 +62,7 @@ class RegisterControllerArgumentLocatorsPass implements CompilerPassInterface
             while ($def instanceof ChildDefinition) {
                 $def = $container->findDefinition($def->getParent());
                 $class = $class ?: $def->getClass();
-                $bindings = $def->getBindings();
+                $bindings += $def->getBindings();
             }
             $class = $parameterBag->resolveValue($class);
 
@@ -126,7 +128,7 @@ class RegisterControllerArgumentLocatorsPass implements CompilerPassInterface
                     if (isset($arguments[$r->name][$p->name])) {
                         $target = $arguments[$r->name][$p->name];
                         if ('?' !== $target[0]) {
-                            $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE;
+                            $invalidBehavior = ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE;
                         } elseif ('' === $target = (string) substr($target, 1)) {
                             throw new InvalidArgumentException(sprintf('A "%s" tag must have non-empty "id" attributes for service "%s".', $this->controllerTag, $id));
                         } elseif ($p->allowsNull() && !$p->isOptional()) {
@@ -136,17 +138,22 @@ class RegisterControllerArgumentLocatorsPass implements CompilerPassInterface
                         $binding = $bindings[$bindingName];
 
                         list($bindingValue, $bindingId) = $binding->getValues();
+                        $binding->setValues(array($bindingValue, $bindingId, true));
 
                         if (!$bindingValue instanceof Reference) {
-                            continue;
+                            $args[$p->name] = new Reference('.value.'.$container->hash($bindingValue));
+                            $container->register((string) $args[$p->name], 'mixed')
+                                ->setFactory('current')
+                                ->addArgument(array($bindingValue));
+                        } else {
+                            $args[$p->name] = $bindingValue;
                         }
 
-                        $binding->setValues(array($bindingValue, $bindingId, true));
-                        $args[$p->name] = $bindingValue;
-
                         continue;
                     } elseif (!$type || !$autowire) {
                         continue;
+                    } elseif (!$p->allowsNull()) {
+                        $invalidBehavior = ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE;
                     }
 
                     if (Request::class === $type) {
@@ -164,16 +171,18 @@ class RegisterControllerArgumentLocatorsPass implements CompilerPassInterface
                         throw new InvalidArgumentException($message);
                     }
 
-                    $args[$p->name] = $type ? new TypedReference($target, $type, $r->class, $invalidBehavior) : new Reference($target, $invalidBehavior);
+                    $args[$p->name] = $type ? new TypedReference($target, $type, $invalidBehavior) : new Reference($target, $invalidBehavior);
                 }
                 // register the maps as a per-method service-locators
                 if ($args) {
-                    $controllers[$id.':'.$r->name] = ServiceLocatorTagPass::register($container, $args);
+                    $controllers[$id.'::'.$r->name] = ServiceLocatorTagPass::register($container, $args);
                 }
             }
         }
 
         $container->getDefinition($this->resolverServiceId)
-            ->replaceArgument(0, ServiceLocatorTagPass::register($container, $controllers));
+            ->replaceArgument(0, $controllerLocatorRef = ServiceLocatorTagPass::register($container, $controllers));
+
+        $container->setAlias($this->controllerLocator, (string) $controllerLocatorRef);
     }
 }
diff --git a/vendor/symfony/http-kernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php b/vendor/symfony/http-kernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php
index ab50cec3..596b6188 100644
--- a/vendor/symfony/http-kernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php
+++ b/vendor/symfony/http-kernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php
@@ -21,21 +21,16 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
  */
 class RemoveEmptyControllerArgumentLocatorsPass implements CompilerPassInterface
 {
-    private $resolverServiceId;
+    private $controllerLocator;
 
-    public function __construct($resolverServiceId = 'argument_resolver.service')
+    public function __construct(string $controllerLocator = 'argument_resolver.controller_locator')
     {
-        $this->resolverServiceId = $resolverServiceId;
+        $this->controllerLocator = $controllerLocator;
     }
 
     public function process(ContainerBuilder $container)
     {
-        if (false === $container->hasDefinition($this->resolverServiceId)) {
-            return;
-        }
-
-        $serviceResolver = $container->getDefinition($this->resolverServiceId);
-        $controllerLocator = $container->getDefinition((string) $serviceResolver->getArgument(0));
+        $controllerLocator = $container->findDefinition($this->controllerLocator);
         $controllers = $controllerLocator->getArgument(0);
 
         foreach ($controllers as $controller => $argumentRef) {
@@ -47,8 +42,7 @@ class RemoveEmptyControllerArgumentLocatorsPass implements CompilerPassInterface
             } else {
                 // any methods listed for call-at-instantiation cannot be actions
                 $reason = false;
-                $action = substr(strrchr($controller, ':'), 1);
-                $id = substr($controller, 0, -1 - strlen($action));
+                list($id, $action) = explode('::', $controller);
                 $controllerDef = $container->getDefinition($id);
                 foreach ($controllerDef->getMethodCalls() as list($method)) {
                     if (0 === strcasecmp($action, $method)) {
@@ -57,9 +51,9 @@ class RemoveEmptyControllerArgumentLocatorsPass implements CompilerPassInterface
                     }
                 }
                 if (!$reason) {
-                    if ($controllerDef->getClass() === $id) {
-                        $controllers[$id.'::'.$action] = $argumentRef;
-                    }
+                    // Deprecated since Symfony 4.1. See Symfony\Component\HttpKernel\Controller\ContainerControllerResolver
+                    $controllers[$id.':'.$action] = $argumentRef;
+
                     if ('__invoke' === $action) {
                         $controllers[$id] = $argumentRef;
                     }
diff --git a/vendor/symfony/http-kernel/DependencyInjection/ResettableServicePass.php b/vendor/symfony/http-kernel/DependencyInjection/ResettableServicePass.php
index 29433a6d..564f879c 100644
--- a/vendor/symfony/http-kernel/DependencyInjection/ResettableServicePass.php
+++ b/vendor/symfony/http-kernel/DependencyInjection/ResettableServicePass.php
@@ -25,7 +25,7 @@ class ResettableServicePass implements CompilerPassInterface
 {
     private $tagName;
 
-    public function __construct($tagName = 'kernel.reset')
+    public function __construct(string $tagName = 'kernel.reset')
     {
         $this->tagName = $tagName;
     }
diff --git a/vendor/symfony/http-kernel/Event/FilterControllerArgumentsEvent.php b/vendor/symfony/http-kernel/Event/FilterControllerArgumentsEvent.php
index 2b08f2d7..5e178f2b 100644
--- a/vendor/symfony/http-kernel/Event/FilterControllerArgumentsEvent.php
+++ b/vendor/symfony/http-kernel/Event/FilterControllerArgumentsEvent.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\Event;
 
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
  * Allows filtering of controller arguments.
@@ -30,7 +30,7 @@ class FilterControllerArgumentsEvent extends FilterControllerEvent
 {
     private $arguments;
 
-    public function __construct(HttpKernelInterface $kernel, callable $controller, array $arguments, Request $request, $requestType)
+    public function __construct(HttpKernelInterface $kernel, callable $controller, array $arguments, Request $request, ?int $requestType)
     {
         parent::__construct($kernel, $controller, $request, $requestType);
 
diff --git a/vendor/symfony/http-kernel/Event/FilterControllerEvent.php b/vendor/symfony/http-kernel/Event/FilterControllerEvent.php
index 84cbc2ea..7eab4493 100644
--- a/vendor/symfony/http-kernel/Event/FilterControllerEvent.php
+++ b/vendor/symfony/http-kernel/Event/FilterControllerEvent.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\Event;
 
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
  * Allows filtering of a controller callable.
@@ -29,7 +29,7 @@ class FilterControllerEvent extends KernelEvent
 {
     private $controller;
 
-    public function __construct(HttpKernelInterface $kernel, callable $controller, Request $request, $requestType)
+    public function __construct(HttpKernelInterface $kernel, callable $controller, Request $request, ?int $requestType)
     {
         parent::__construct($kernel, $request, $requestType);
 
diff --git a/vendor/symfony/http-kernel/Event/FilterResponseEvent.php b/vendor/symfony/http-kernel/Event/FilterResponseEvent.php
index 53a7efce..04589f7b 100644
--- a/vendor/symfony/http-kernel/Event/FilterResponseEvent.php
+++ b/vendor/symfony/http-kernel/Event/FilterResponseEvent.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\HttpKernel\Event;
 
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
  * Allows to filter a Response object.
@@ -28,7 +28,7 @@ class FilterResponseEvent extends KernelEvent
 {
     private $response;
 
-    public function __construct(HttpKernelInterface $kernel, Request $request, $requestType, Response $response)
+    public function __construct(HttpKernelInterface $kernel, Request $request, int $requestType, Response $response)
     {
         parent::__construct($kernel, $request, $requestType);
 
diff --git a/vendor/symfony/http-kernel/Event/GetResponseEvent.php b/vendor/symfony/http-kernel/Event/GetResponseEvent.php
index f7745ea3..c25a0f1c 100644
--- a/vendor/symfony/http-kernel/Event/GetResponseEvent.php
+++ b/vendor/symfony/http-kernel/Event/GetResponseEvent.php
@@ -29,7 +29,7 @@ class GetResponseEvent extends KernelEvent
     /**
      * Returns the response object.
      *
-     * @return Response
+     * @return Response|null
      */
     public function getResponse()
     {
diff --git a/vendor/symfony/http-kernel/Event/GetResponseForControllerResultEvent.php b/vendor/symfony/http-kernel/Event/GetResponseForControllerResultEvent.php
index f70ce09e..a0082821 100644
--- a/vendor/symfony/http-kernel/Event/GetResponseForControllerResultEvent.php
+++ b/vendor/symfony/http-kernel/Event/GetResponseForControllerResultEvent.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\Event;
 
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
  * Allows to create a response for the return value of a controller.
@@ -32,7 +32,7 @@ class GetResponseForControllerResultEvent extends GetResponseEvent
      */
     private $controllerResult;
 
-    public function __construct(HttpKernelInterface $kernel, Request $request, $requestType, $controllerResult)
+    public function __construct(HttpKernelInterface $kernel, Request $request, int $requestType, $controllerResult)
     {
         parent::__construct($kernel, $request, $requestType);
 
diff --git a/vendor/symfony/http-kernel/Event/GetResponseForExceptionEvent.php b/vendor/symfony/http-kernel/Event/GetResponseForExceptionEvent.php
index 751b7451..7fab006d 100644
--- a/vendor/symfony/http-kernel/Event/GetResponseForExceptionEvent.php
+++ b/vendor/symfony/http-kernel/Event/GetResponseForExceptionEvent.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\Event;
 
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
  * Allows to create a response for a thrown exception.
@@ -41,7 +41,7 @@ class GetResponseForExceptionEvent extends GetResponseEvent
      */
     private $allowCustomResponseCode = false;
 
-    public function __construct(HttpKernelInterface $kernel, Request $request, $requestType, \Exception $e)
+    public function __construct(HttpKernelInterface $kernel, Request $request, int $requestType, \Exception $e)
     {
         parent::__construct($kernel, $request, $requestType);
 
diff --git a/vendor/symfony/http-kernel/Event/KernelEvent.php b/vendor/symfony/http-kernel/Event/KernelEvent.php
index 992f6b4d..f3db8a60 100644
--- a/vendor/symfony/http-kernel/Event/KernelEvent.php
+++ b/vendor/symfony/http-kernel/Event/KernelEvent.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\HttpKernel\Event;
 
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
  * Base class for events thrown in the HttpKernel component.
@@ -32,7 +32,7 @@ class KernelEvent extends Event
      * @param int                 $requestType The request type the kernel is currently processing; one of
      *                                         HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST
      */
-    public function __construct(HttpKernelInterface $kernel, Request $request, $requestType)
+    public function __construct(HttpKernelInterface $kernel, Request $request, ?int $requestType)
     {
         $this->kernel = $kernel;
         $this->request = $request;
diff --git a/vendor/symfony/http-kernel/Event/PostResponseEvent.php b/vendor/symfony/http-kernel/Event/PostResponseEvent.php
index 2406fddb..0981e64c 100644
--- a/vendor/symfony/http-kernel/Event/PostResponseEvent.php
+++ b/vendor/symfony/http-kernel/Event/PostResponseEvent.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\HttpKernel\Event;
 
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
  * Allows to execute logic after a response was sent.
diff --git a/vendor/symfony/http-kernel/EventListener/AbstractSessionListener.php b/vendor/symfony/http-kernel/EventListener/AbstractSessionListener.php
index dff29ee8..08a6ac63 100644
--- a/vendor/symfony/http-kernel/EventListener/AbstractSessionListener.php
+++ b/vendor/symfony/http-kernel/EventListener/AbstractSessionListener.php
@@ -11,33 +11,58 @@
 
 namespace Symfony\Component\HttpKernel\EventListener;
 
+use Psr\Container\ContainerInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
- * Sets the session in the request.
+ * Sets the session onto the request on the "kernel.request" event and saves
+ * it on the "kernel.response" event.
+ *
+ * In addition, if the session has been started it overrides the Cache-Control
+ * header in such a way that all caching is disabled in that case.
+ * If you have a scenario where caching responses with session information in
+ * them makes sense, you can disable this behaviour by setting the header
+ * AbstractSessionListener::NO_AUTO_CACHE_CONTROL_HEADER on the response.
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
+ * @author Tobias Schultze <http://tobion.de>
  */
 abstract class AbstractSessionListener implements EventSubscriberInterface
 {
+    const NO_AUTO_CACHE_CONTROL_HEADER = 'Symfony-Session-NoAutoCacheControl';
+
+    protected $container;
+    private $sessionUsageStack = array();
+
+    public function __construct(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
     public function onKernelRequest(GetResponseEvent $event)
     {
         if (!$event->isMasterRequest()) {
             return;
         }
 
+        $session = null;
         $request = $event->getRequest();
-        $session = $this->getSession();
-        if (null === $session || $request->hasSession()) {
-            return;
+        if ($request->hasSession()) {
+            // no-op
+        } elseif (method_exists($request, 'setSessionFactory')) {
+            $request->setSessionFactory(function () { return $this->getSession(); });
+        } elseif ($session = $this->getSession()) {
+            $request->setSession($session);
         }
 
-        $request->setSession($session);
+        $session = $session ?? ($this->container && $this->container->has('initialized_session') ? $this->container->get('initialized_session') : null);
+        $this->sessionUsageStack[] = $session instanceof Session ? $session->getUsageIndex() : 0;
     }
 
     public function onKernelResponse(FilterResponseEvent $event)
@@ -46,15 +71,61 @@ abstract class AbstractSessionListener implements EventSubscriberInterface
             return;
         }
 
-        if (!$session = $event->getRequest()->getSession()) {
+        if (!$session = $this->container && $this->container->has('initialized_session') ? $this->container->get('initialized_session') : $event->getRequest()->getSession()) {
             return;
         }
 
-        if ($session->isStarted() || ($session instanceof Session && $session->hasBeenStarted())) {
-            $event->getResponse()
-                ->setPrivate()
-                ->setMaxAge(0)
-                ->headers->addCacheControlDirective('must-revalidate');
+        $response = $event->getResponse();
+
+        if ($session instanceof Session ? $session->getUsageIndex() !== end($this->sessionUsageStack) : $session->isStarted()) {
+            if (!$response->headers->has(self::NO_AUTO_CACHE_CONTROL_HEADER)) {
+                $response
+                    ->setPrivate()
+                    ->setMaxAge(0)
+                    ->headers->addCacheControlDirective('must-revalidate');
+            }
+        }
+
+        // Always remove the internal header if present
+        $response->headers->remove(self::NO_AUTO_CACHE_CONTROL_HEADER);
+
+        if ($session->isStarted()) {
+            /*
+             * Saves the session, in case it is still open, before sending the response/headers.
+             *
+             * This ensures several things in case the developer did not save the session explicitly:
+             *
+             *  * If a session save handler without locking is used, it ensures the data is available
+             *    on the next request, e.g. after a redirect. PHPs auto-save at script end via
+             *    session_register_shutdown is executed after fastcgi_finish_request. So in this case
+             *    the data could be missing the next request because it might not be saved the moment
+             *    the new request is processed.
+             *  * A locking save handler (e.g. the native 'files') circumvents concurrency problems like
+             *    the one above. But by saving the session before long-running things in the terminate event,
+             *    we ensure the session is not blocked longer than needed.
+             *  * When regenerating the session ID no locking is involved in PHPs session design. See
+             *    https://bugs.php.net/bug.php?id=61470 for a discussion. So in this case, the session must
+             *    be saved anyway before sending the headers with the new session ID. Otherwise session
+             *    data could get lost again for concurrent requests with the new ID. One result could be
+             *    that you get logged out after just logging in.
+             *
+             * This listener should be executed as one of the last listeners, so that previous listeners
+             * can still operate on the open session. This prevents the overhead of restarting it.
+             * Listeners after closing the session can still work with the session as usual because
+             * Symfonys session implementation starts the session on demand. So writing to it after
+             * it is saved will just restart it.
+             */
+            $session->save();
+        }
+    }
+
+    /**
+     * @internal
+     */
+    public function onFinishRequest(FinishRequestEvent $event)
+    {
+        if ($event->isMasterRequest()) {
+            array_pop($this->sessionUsageStack);
         }
     }
 
@@ -62,8 +133,9 @@ abstract class AbstractSessionListener implements EventSubscriberInterface
     {
         return array(
             KernelEvents::REQUEST => array('onKernelRequest', 128),
-            // low priority to come after regular response listeners, same as SaveSessionListener
+            // low priority to come after regular response listeners, but higher than StreamedResponseListener
             KernelEvents::RESPONSE => array('onKernelResponse', -1000),
+            KernelEvents::FINISH_REQUEST => array('onFinishRequest'),
         );
     }
 
diff --git a/vendor/symfony/http-kernel/EventListener/AbstractTestSessionListener.php b/vendor/symfony/http-kernel/EventListener/AbstractTestSessionListener.php
index 82061fd6..7f07e7f1 100644
--- a/vendor/symfony/http-kernel/EventListener/AbstractTestSessionListener.php
+++ b/vendor/symfony/http-kernel/EventListener/AbstractTestSessionListener.php
@@ -11,13 +11,13 @@
 
 namespace Symfony\Component\HttpKernel\EventListener;
 
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Cookie;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
-use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
  * TestSessionListener.
@@ -61,16 +61,25 @@ abstract class AbstractTestSessionListener implements EventSubscriberInterface
             return;
         }
 
-        if (!$session = $event->getRequest()->getSession()) {
+        $request = $event->getRequest();
+        if (!$request->hasSession()) {
             return;
         }
 
+        $session = $request->getSession();
         if ($wasStarted = $session->isStarted()) {
             $session->save();
         }
 
         if ($session instanceof Session ? !$session->isEmpty() || (null !== $this->sessionId && $session->getId() !== $this->sessionId) : $wasStarted) {
             $params = session_get_cookie_params();
+
+            foreach ($event->getResponse()->headers->getCookies() as $cookie) {
+                if ($session->getName() === $cookie->getName() && $params['path'] === $cookie->getPath() && $params['domain'] == $cookie->getDomain()) {
+                    return;
+                }
+            }
+
             $event->getResponse()->headers->setCookie(new Cookie($session->getName(), $session->getId(), 0 === $params['lifetime'] ? 0 : time() + $params['lifetime'], $params['path'], $params['domain'], $params['secure'], $params['httponly']));
             $this->sessionId = $session->getId();
         }
diff --git a/vendor/symfony/http-kernel/EventListener/AddRequestFormatsListener.php b/vendor/symfony/http-kernel/EventListener/AddRequestFormatsListener.php
index f21fc6ab..5ec52841 100644
--- a/vendor/symfony/http-kernel/EventListener/AddRequestFormatsListener.php
+++ b/vendor/symfony/http-kernel/EventListener/AddRequestFormatsListener.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\HttpKernel\EventListener;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
  * Adds configured formats to each request.
diff --git a/vendor/symfony/http-kernel/EventListener/DebugHandlersListener.php b/vendor/symfony/http-kernel/EventListener/DebugHandlersListener.php
index 2911caa1..47fe05c5 100644
--- a/vendor/symfony/http-kernel/EventListener/DebugHandlersListener.php
+++ b/vendor/symfony/http-kernel/EventListener/DebugHandlersListener.php
@@ -12,15 +12,15 @@
 namespace Symfony\Component\HttpKernel\EventListener;
 
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Console\ConsoleEvents;
+use Symfony\Component\Console\Event\ConsoleEvent;
+use Symfony\Component\Console\Output\ConsoleOutputInterface;
 use Symfony\Component\Debug\ErrorHandler;
 use Symfony\Component\Debug\ExceptionHandler;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\KernelEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\Console\ConsoleEvents;
-use Symfony\Component\Console\Event\ConsoleEvent;
-use Symfony\Component\Console\Output\ConsoleOutputInterface;
 
 /**
  * Configures errors and exceptions handlers.
@@ -48,15 +48,15 @@ class DebugHandlersListener implements EventSubscriberInterface
      * @param string|array         $fileLinkFormat   The format for links to source files
      * @param bool                 $scope            Enables/disables scoping mode
      */
-    public function __construct(callable $exceptionHandler = null, LoggerInterface $logger = null, $levels = E_ALL, $throwAt = E_ALL, $scream = true, $fileLinkFormat = null, $scope = true)
+    public function __construct(callable $exceptionHandler = null, LoggerInterface $logger = null, $levels = E_ALL, ?int $throwAt = E_ALL, bool $scream = true, $fileLinkFormat = null, bool $scope = true)
     {
         $this->exceptionHandler = $exceptionHandler;
         $this->logger = $logger;
         $this->levels = null === $levels ? E_ALL : $levels;
-        $this->throwAt = is_numeric($throwAt) ? (int) $throwAt : (null === $throwAt ? null : ($throwAt ? E_ALL : null));
-        $this->scream = (bool) $scream;
+        $this->throwAt = \is_int($throwAt) ? $throwAt : (null === $throwAt ? null : ($throwAt ? E_ALL : null));
+        $this->scream = $scream;
         $this->fileLinkFormat = $fileLinkFormat;
-        $this->scope = (bool) $scope;
+        $this->scope = $scope;
     }
 
     /**
@@ -70,14 +70,14 @@ class DebugHandlersListener implements EventSubscriberInterface
         $this->firstCall = $this->hasTerminatedWithException = false;
 
         $handler = set_exception_handler('var_dump');
-        $handler = is_array($handler) ? $handler[0] : null;
+        $handler = \is_array($handler) ? $handler[0] : null;
         restore_exception_handler();
 
         if ($this->logger || null !== $this->throwAt) {
             if ($handler instanceof ErrorHandler) {
                 if ($this->logger) {
                     $handler->setDefaultLogger($this->logger, $this->levels);
-                    if (is_array($this->levels)) {
+                    if (\is_array($this->levels)) {
                         $levels = 0;
                         foreach ($this->levels as $type => $log) {
                             $levels |= $type;
@@ -126,7 +126,7 @@ class DebugHandlersListener implements EventSubscriberInterface
         if ($this->exceptionHandler) {
             if ($handler instanceof ErrorHandler) {
                 $h = $handler->setExceptionHandler('var_dump');
-                if (is_array($h) && $h[0] instanceof ExceptionHandler) {
+                if (\is_array($h) && $h[0] instanceof ExceptionHandler) {
                     $handler->setExceptionHandler($h);
                     $handler = $h[0];
                 } else {
@@ -147,7 +147,7 @@ class DebugHandlersListener implements EventSubscriberInterface
     {
         $events = array(KernelEvents::REQUEST => array('configure', 2048));
 
-        if ('cli' === PHP_SAPI && defined('Symfony\Component\Console\ConsoleEvents::COMMAND')) {
+        if ('cli' === \PHP_SAPI && \defined('Symfony\Component\Console\ConsoleEvents::COMMAND')) {
             $events[ConsoleEvents::COMMAND] = array('configure', 2048);
         }
 
diff --git a/vendor/symfony/http-kernel/EventListener/DumpListener.php b/vendor/symfony/http-kernel/EventListener/DumpListener.php
index de19e131..3acbe7d4 100644
--- a/vendor/symfony/http-kernel/EventListener/DumpListener.php
+++ b/vendor/symfony/http-kernel/EventListener/DumpListener.php
@@ -15,6 +15,7 @@ use Symfony\Component\Console\ConsoleEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\VarDumper\Cloner\ClonerInterface;
 use Symfony\Component\VarDumper\Dumper\DataDumperInterface;
+use Symfony\Component\VarDumper\Server\Connection;
 use Symfony\Component\VarDumper\VarDumper;
 
 /**
@@ -26,20 +27,27 @@ class DumpListener implements EventSubscriberInterface
 {
     private $cloner;
     private $dumper;
+    private $connection;
 
-    public function __construct(ClonerInterface $cloner, DataDumperInterface $dumper)
+    public function __construct(ClonerInterface $cloner, DataDumperInterface $dumper, Connection $connection = null)
     {
         $this->cloner = $cloner;
         $this->dumper = $dumper;
+        $this->connection = $connection;
     }
 
     public function configure()
     {
         $cloner = $this->cloner;
         $dumper = $this->dumper;
+        $connection = $this->connection;
 
-        VarDumper::setHandler(function ($var) use ($cloner, $dumper) {
-            $dumper->dump($cloner->cloneVar($var));
+        VarDumper::setHandler(static function ($var) use ($cloner, $dumper, $connection) {
+            $data = $cloner->cloneVar($var);
+
+            if (!$connection || !$connection->write($data)) {
+                $dumper->dump($data);
+            }
         });
     }
 
diff --git a/vendor/symfony/http-kernel/EventListener/ExceptionListener.php b/vendor/symfony/http-kernel/EventListener/ExceptionListener.php
index 3dfa4cd8..559872a1 100644
--- a/vendor/symfony/http-kernel/EventListener/ExceptionListener.php
+++ b/vendor/symfony/http-kernel/EventListener/ExceptionListener.php
@@ -12,18 +12,16 @@
 namespace Symfony\Component\HttpKernel\EventListener;
 
 use Psr\Log\LoggerInterface;
-use Symfony\Component\Debug\ExceptionHandler;
 use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
-use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
 
 /**
  * ExceptionListener.
@@ -35,30 +33,31 @@ class ExceptionListener implements EventSubscriberInterface
     protected $controller;
     protected $logger;
     protected $debug;
-    private $charset;
 
-    public function __construct($controller, LoggerInterface $logger = null, $debug = false, $charset = null)
+    public function __construct($controller, LoggerInterface $logger = null, $debug = false)
     {
         $this->controller = $controller;
         $this->logger = $logger;
         $this->debug = $debug;
-        $this->charset = $charset;
     }
 
-    public function onKernelException(GetResponseForExceptionEvent $event)
+    public function logKernelException(GetResponseForExceptionEvent $event)
     {
         $exception = $event->getException();
-        $request = $event->getRequest();
-        $eventDispatcher = func_num_args() > 2 ? func_get_arg(2) : null;
 
-        $this->logException($exception, sprintf('Uncaught PHP Exception %s: "%s" at %s line %s', get_class($exception), $exception->getMessage(), $exception->getFile(), $exception->getLine()));
+        $this->logException($exception, sprintf('Uncaught PHP Exception %s: "%s" at %s line %s', \get_class($exception), $exception->getMessage(), $exception->getFile(), $exception->getLine()));
+    }
 
-        $request = $this->duplicateRequest($exception, $request);
+    public function onKernelException(GetResponseForExceptionEvent $event)
+    {
+        $exception = $event->getException();
+        $request = $this->duplicateRequest($exception, $event->getRequest());
+        $eventDispatcher = \func_num_args() > 2 ? func_get_arg(2) : null;
 
         try {
             $response = $event->getKernel()->handle($request, HttpKernelInterface::SUB_REQUEST, false);
         } catch (\Exception $e) {
-            $this->logException($e, sprintf('Exception thrown when handling an exception (%s: %s at %s line %s)', get_class($e), $e->getMessage(), $e->getFile(), $e->getLine()));
+            $this->logException($e, sprintf('Exception thrown when handling an exception (%s: %s at %s line %s)', \get_class($e), $e->getMessage(), $e->getFile(), $e->getLine()));
 
             $wrapper = $e;
 
@@ -68,7 +67,7 @@ class ExceptionListener implements EventSubscriberInterface
                 }
             }
 
-            $prev = new \ReflectionProperty('Exception', 'previous');
+            $prev = new \ReflectionProperty($wrapper instanceof \Exception ? \Exception::class : \Error::class, 'previous');
             $prev->setAccessible(true);
             $prev->setValue($wrapper, $exception);
 
@@ -89,7 +88,10 @@ class ExceptionListener implements EventSubscriberInterface
     public static function getSubscribedEvents()
     {
         return array(
-            KernelEvents::EXCEPTION => array('onKernelException', -128),
+            KernelEvents::EXCEPTION => array(
+                array('logKernelException', 0),
+                array('onKernelException', -128),
+            ),
         );
     }
 
@@ -121,12 +123,8 @@ class ExceptionListener implements EventSubscriberInterface
     protected function duplicateRequest(\Exception $exception, Request $request)
     {
         $attributes = array(
-            'exception' => $exception = FlattenException::create($exception),
-            '_controller' => $this->controller ?: function () use ($exception) {
-                $handler = new ExceptionHandler($this->debug, $this->charset);
-
-                return new Response($handler->getHtml($exception), $exception->getStatusCode(), $exception->getHeaders());
-            },
+            '_controller' => $this->controller,
+            'exception' => FlattenException::create($exception),
             'logger' => $this->logger instanceof DebugLoggerInterface ? $this->logger : null,
         );
         $request = $request->duplicate(null, null, $attributes);
diff --git a/vendor/symfony/http-kernel/EventListener/FragmentListener.php b/vendor/symfony/http-kernel/EventListener/FragmentListener.php
index da518fcc..b47aa7cc 100644
--- a/vendor/symfony/http-kernel/EventListener/FragmentListener.php
+++ b/vendor/symfony/http-kernel/EventListener/FragmentListener.php
@@ -11,12 +11,12 @@
 
 namespace Symfony\Component\HttpKernel\EventListener;
 
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\UriSigner;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
  * Handles content fragments represented by special URIs.
@@ -38,7 +38,7 @@ class FragmentListener implements EventSubscriberInterface
      * @param UriSigner $signer       A UriSigner instance
      * @param string    $fragmentPath The path that triggers this listener
      */
-    public function __construct(UriSigner $signer, $fragmentPath = '/_fragment')
+    public function __construct(UriSigner $signer, string $fragmentPath = '/_fragment')
     {
         $this->signer = $signer;
         $this->fragmentPath = $fragmentPath;
diff --git a/vendor/symfony/http-kernel/EventListener/LocaleListener.php b/vendor/symfony/http-kernel/EventListener/LocaleListener.php
index 427ea82f..1067e8a0 100644
--- a/vendor/symfony/http-kernel/EventListener/LocaleListener.php
+++ b/vendor/symfony/http-kernel/EventListener/LocaleListener.php
@@ -11,13 +11,13 @@
 
 namespace Symfony\Component\HttpKernel\EventListener;
 
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\RequestContextAwareInterface;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
  * Initializes the locale based on the current request.
@@ -35,7 +35,7 @@ class LocaleListener implements EventSubscriberInterface
      * @param string                            $defaultLocale The default locale
      * @param RequestContextAwareInterface|null $router        The router
      */
-    public function __construct(RequestStack $requestStack, $defaultLocale = 'en', RequestContextAwareInterface $router = null)
+    public function __construct(RequestStack $requestStack, string $defaultLocale = 'en', RequestContextAwareInterface $router = null)
     {
         $this->defaultLocale = $defaultLocale;
         $this->requestStack = $requestStack;
diff --git a/vendor/symfony/http-kernel/EventListener/ProfilerListener.php b/vendor/symfony/http-kernel/EventListener/ProfilerListener.php
index e3e4e762..03344be7 100644
--- a/vendor/symfony/http-kernel/EventListener/ProfilerListener.php
+++ b/vendor/symfony/http-kernel/EventListener/ProfilerListener.php
@@ -11,14 +11,14 @@
 
 namespace Symfony\Component\HttpKernel\EventListener;
 
-use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\RequestMatcherInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 use Symfony\Component\HttpKernel\Event\PostResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Profiler\Profiler;
-use Symfony\Component\HttpFoundation\RequestMatcherInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
  * ProfilerListener collects data for the current request by listening to the kernel events.
@@ -43,12 +43,12 @@ class ProfilerListener implements EventSubscriberInterface
      * @param bool                         $onlyException      True if the profiler only collects data when an exception occurs, false otherwise
      * @param bool                         $onlyMasterRequests True if the profiler only collects data when the request is a master request, false otherwise
      */
-    public function __construct(Profiler $profiler, RequestStack $requestStack, RequestMatcherInterface $matcher = null, $onlyException = false, $onlyMasterRequests = false)
+    public function __construct(Profiler $profiler, RequestStack $requestStack, RequestMatcherInterface $matcher = null, bool $onlyException = false, bool $onlyMasterRequests = false)
     {
         $this->profiler = $profiler;
         $this->matcher = $matcher;
-        $this->onlyException = (bool) $onlyException;
-        $this->onlyMasterRequests = (bool) $onlyMasterRequests;
+        $this->onlyException = $onlyException;
+        $this->onlyMasterRequests = $onlyMasterRequests;
         $this->profiles = new \SplObjectStorage();
         $this->parents = new \SplObjectStorage();
         $this->requestStack = $requestStack;
@@ -121,7 +121,7 @@ class ProfilerListener implements EventSubscriberInterface
     {
         return array(
             KernelEvents::RESPONSE => array('onKernelResponse', -100),
-            KernelEvents::EXCEPTION => 'onKernelException',
+            KernelEvents::EXCEPTION => array('onKernelException', 0),
             KernelEvents::TERMINATE => array('onKernelTerminate', -1024),
         );
     }
diff --git a/vendor/symfony/http-kernel/EventListener/ResponseListener.php b/vendor/symfony/http-kernel/EventListener/ResponseListener.php
index 6d56197a..0550c023 100644
--- a/vendor/symfony/http-kernel/EventListener/ResponseListener.php
+++ b/vendor/symfony/http-kernel/EventListener/ResponseListener.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\HttpKernel\EventListener;
 
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
  * ResponseListener fixes the Response headers based on the Request.
@@ -24,7 +24,7 @@ class ResponseListener implements EventSubscriberInterface
 {
     private $charset;
 
-    public function __construct($charset)
+    public function __construct(string $charset)
     {
         $this->charset = $charset;
     }
diff --git a/vendor/symfony/http-kernel/EventListener/RouterListener.php b/vendor/symfony/http-kernel/EventListener/RouterListener.php
index 959f2ba0..39192845 100644
--- a/vendor/symfony/http-kernel/EventListener/RouterListener.php
+++ b/vendor/symfony/http-kernel/EventListener/RouterListener.php
@@ -12,25 +12,25 @@
 namespace Symfony\Component\HttpKernel\EventListener;
 
 use Psr\Log\LoggerInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
-use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
-use Symfony\Component\HttpKernel\Kernel;
-use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\Exception\NoConfigurationException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
 use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
+use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\RequestContextAwareInterface;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Initializes the context from the request and sets request attributes based on a matching route.
@@ -57,7 +57,7 @@ class RouterListener implements EventSubscriberInterface
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct($matcher, RequestStack $requestStack, RequestContext $context = null, LoggerInterface $logger = null, $projectDir = null, $debug = true)
+    public function __construct($matcher, RequestStack $requestStack, RequestContext $context = null, LoggerInterface $logger = null, string $projectDir = null, bool $debug = true)
     {
         if (!$matcher instanceof UrlMatcherInterface && !$matcher instanceof RequestMatcherInterface) {
             throw new \InvalidArgumentException('Matcher must either implement UrlMatcherInterface or RequestMatcherInterface.');
@@ -167,7 +167,7 @@ class RouterListener implements EventSubscriberInterface
     private function createWelcomeResponse()
     {
         $version = Kernel::VERSION;
-        $baseDir = realpath($this->projectDir).DIRECTORY_SEPARATOR;
+        $baseDir = realpath($this->projectDir).\DIRECTORY_SEPARATOR;
         $docVersion = substr(Kernel::VERSION, 0, 3);
 
         ob_start();
diff --git a/vendor/symfony/http-kernel/EventListener/SaveSessionListener.php b/vendor/symfony/http-kernel/EventListener/SaveSessionListener.php
index 36809b59..99382ea3 100644
--- a/vendor/symfony/http-kernel/EventListener/SaveSessionListener.php
+++ b/vendor/symfony/http-kernel/EventListener/SaveSessionListener.php
@@ -11,36 +11,16 @@
 
 namespace Symfony\Component\HttpKernel\EventListener;
 
+@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.1, use AbstractSessionListener instead.', SaveSessionListener::class), E_USER_DEPRECATED);
+
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
- * Saves the session, in case it is still open, before sending the response/headers.
- *
- * This ensures several things in case the developer did not save the session explicitly:
- *
- *  * If a session save handler without locking is used, it ensures the data is available
- *    on the next request, e.g. after a redirect. PHPs auto-save at script end via
- *    session_register_shutdown is executed after fastcgi_finish_request. So in this case
- *    the data could be missing the next request because it might not be saved the moment
- *    the new request is processed.
- *  * A locking save handler (e.g. the native 'files') circumvents concurrency problems like
- *    the one above. But by saving the session before long-running things in the terminate event,
- *    we ensure the session is not blocked longer than needed.
- *  * When regenerating the session ID no locking is involved in PHPs session design. See
- *    https://bugs.php.net/bug.php?id=61470 for a discussion. So in this case, the session must
- *    be saved anyway before sending the headers with the new session ID. Otherwise session
- *    data could get lost again for concurrent requests with the new ID. One result could be
- *    that you get logged out after just logging in.
- *
- * This listener should be executed as one of the last listeners, so that previous listeners
- * can still operate on the open session. This prevents the overhead of restarting it.
- * Listeners after closing the session can still work with the session as usual because
- * Symfonys session implementation starts the session on demand. So writing to it after
- * it is saved will just restart it.
- *
  * @author Tobias Schultze <http://tobion.de>
+ *
+ * @deprecated since Symfony 4.1, use AbstractSessionListener instead
  */
 class SaveSessionListener implements EventSubscriberInterface
 {
diff --git a/vendor/symfony/http-kernel/EventListener/SessionListener.php b/vendor/symfony/http-kernel/EventListener/SessionListener.php
index 39ebfd92..5ede7c3f 100644
--- a/vendor/symfony/http-kernel/EventListener/SessionListener.php
+++ b/vendor/symfony/http-kernel/EventListener/SessionListener.php
@@ -18,12 +18,10 @@ use Psr\Container\ContainerInterface;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since version 3.3
+ * @final
  */
 class SessionListener extends AbstractSessionListener
 {
-    private $container;
-
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
diff --git a/vendor/symfony/http-kernel/EventListener/StreamedResponseListener.php b/vendor/symfony/http-kernel/EventListener/StreamedResponseListener.php
index 671db5d8..2c616b91 100644
--- a/vendor/symfony/http-kernel/EventListener/StreamedResponseListener.php
+++ b/vendor/symfony/http-kernel/EventListener/StreamedResponseListener.php
@@ -11,10 +11,10 @@
 
 namespace Symfony\Component\HttpKernel\EventListener;
 
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
  * StreamedResponseListener is responsible for sending the Response
diff --git a/vendor/symfony/http-kernel/EventListener/SurrogateListener.php b/vendor/symfony/http-kernel/EventListener/SurrogateListener.php
index 37d1b9d0..63435338 100644
--- a/vendor/symfony/http-kernel/EventListener/SurrogateListener.php
+++ b/vendor/symfony/http-kernel/EventListener/SurrogateListener.php
@@ -11,11 +11,11 @@
 
 namespace Symfony\Component\HttpKernel\EventListener;
 
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\HttpCache\HttpCache;
 use Symfony\Component\HttpKernel\HttpCache\SurrogateInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
  * SurrogateListener adds a Surrogate-Control HTTP header when the Response needs to be parsed for Surrogates.
diff --git a/vendor/symfony/http-kernel/EventListener/TestSessionListener.php b/vendor/symfony/http-kernel/EventListener/TestSessionListener.php
index 36abb422..f859d097 100644
--- a/vendor/symfony/http-kernel/EventListener/TestSessionListener.php
+++ b/vendor/symfony/http-kernel/EventListener/TestSessionListener.php
@@ -18,7 +18,7 @@ use Psr\Container\ContainerInterface;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since version 3.3
+ * @final
  */
 class TestSessionListener extends AbstractTestSessionListener
 {
diff --git a/vendor/symfony/http-kernel/EventListener/TranslatorListener.php b/vendor/symfony/http-kernel/EventListener/TranslatorListener.php
index 6967ad02..2a5fc712 100644
--- a/vendor/symfony/http-kernel/EventListener/TranslatorListener.php
+++ b/vendor/symfony/http-kernel/EventListener/TranslatorListener.php
@@ -13,10 +13,10 @@ namespace Symfony\Component\HttpKernel\EventListener;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
diff --git a/vendor/symfony/http-kernel/Exception/AccessDeniedHttpException.php b/vendor/symfony/http-kernel/Exception/AccessDeniedHttpException.php
index 39418842..3aedbf97 100644
--- a/vendor/symfony/http-kernel/Exception/AccessDeniedHttpException.php
+++ b/vendor/symfony/http-kernel/Exception/AccessDeniedHttpException.php
@@ -21,9 +21,10 @@ class AccessDeniedHttpException extends HttpException
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
      * @param int        $code     The internal exception code
+     * @param array      $headers
      */
-    public function __construct($message = null, \Exception $previous = null, $code = 0)
+    public function __construct(string $message = null, \Exception $previous = null, int $code = 0, array $headers = array())
     {
-        parent::__construct(403, $message, $previous, array(), $code);
+        parent::__construct(403, $message, $previous, $headers, $code);
     }
 }
diff --git a/vendor/symfony/http-kernel/Exception/BadRequestHttpException.php b/vendor/symfony/http-kernel/Exception/BadRequestHttpException.php
index c28d8373..ff215db4 100644
--- a/vendor/symfony/http-kernel/Exception/BadRequestHttpException.php
+++ b/vendor/symfony/http-kernel/Exception/BadRequestHttpException.php
@@ -20,9 +20,10 @@ class BadRequestHttpException extends HttpException
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
      * @param int        $code     The internal exception code
+     * @param array      $headers
      */
-    public function __construct($message = null, \Exception $previous = null, $code = 0)
+    public function __construct(string $message = null, \Exception $previous = null, int $code = 0, array $headers = array())
     {
-        parent::__construct(400, $message, $previous, array(), $code);
+        parent::__construct(400, $message, $previous, $headers, $code);
     }
 }
diff --git a/vendor/symfony/http-kernel/Exception/ConflictHttpException.php b/vendor/symfony/http-kernel/Exception/ConflictHttpException.php
index 79f24f2e..60195daf 100644
--- a/vendor/symfony/http-kernel/Exception/ConflictHttpException.php
+++ b/vendor/symfony/http-kernel/Exception/ConflictHttpException.php
@@ -20,9 +20,10 @@ class ConflictHttpException extends HttpException
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
      * @param int        $code     The internal exception code
+     * @param array      $headers
      */
-    public function __construct($message = null, \Exception $previous = null, $code = 0)
+    public function __construct(string $message = null, \Exception $previous = null, int $code = 0, array $headers = array())
     {
-        parent::__construct(409, $message, $previous, array(), $code);
+        parent::__construct(409, $message, $previous, $headers, $code);
     }
 }
diff --git a/vendor/symfony/http-kernel/Exception/GoneHttpException.php b/vendor/symfony/http-kernel/Exception/GoneHttpException.php
index 84e6915d..f2f3515f 100644
--- a/vendor/symfony/http-kernel/Exception/GoneHttpException.php
+++ b/vendor/symfony/http-kernel/Exception/GoneHttpException.php
@@ -20,9 +20,10 @@ class GoneHttpException extends HttpException
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
      * @param int        $code     The internal exception code
+     * @param array      $headers
      */
-    public function __construct($message = null, \Exception $previous = null, $code = 0)
+    public function __construct(string $message = null, \Exception $previous = null, int $code = 0, array $headers = array())
     {
-        parent::__construct(410, $message, $previous, array(), $code);
+        parent::__construct(410, $message, $previous, $headers, $code);
     }
 }
diff --git a/vendor/symfony/http-kernel/Exception/HttpException.php b/vendor/symfony/http-kernel/Exception/HttpException.php
index e8e37605..dab73120 100644
--- a/vendor/symfony/http-kernel/Exception/HttpException.php
+++ b/vendor/symfony/http-kernel/Exception/HttpException.php
@@ -21,7 +21,7 @@ class HttpException extends \RuntimeException implements HttpExceptionInterface
     private $statusCode;
     private $headers;
 
-    public function __construct($statusCode, $message = null, \Exception $previous = null, array $headers = array(), $code = 0)
+    public function __construct(int $statusCode, string $message = null, \Exception $previous = null, array $headers = array(), ?int $code = 0)
     {
         $this->statusCode = $statusCode;
         $this->headers = $headers;
diff --git a/vendor/symfony/http-kernel/Exception/LengthRequiredHttpException.php b/vendor/symfony/http-kernel/Exception/LengthRequiredHttpException.php
index 645efe87..46b76ba6 100644
--- a/vendor/symfony/http-kernel/Exception/LengthRequiredHttpException.php
+++ b/vendor/symfony/http-kernel/Exception/LengthRequiredHttpException.php
@@ -20,9 +20,10 @@ class LengthRequiredHttpException extends HttpException
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
      * @param int        $code     The internal exception code
+     * @param array      $headers
      */
-    public function __construct($message = null, \Exception $previous = null, $code = 0)
+    public function __construct(string $message = null, \Exception $previous = null, int $code = 0, array $headers = array())
     {
-        parent::__construct(411, $message, $previous, array(), $code);
+        parent::__construct(411, $message, $previous, $headers, $code);
     }
 }
diff --git a/vendor/symfony/http-kernel/Exception/MethodNotAllowedHttpException.php b/vendor/symfony/http-kernel/Exception/MethodNotAllowedHttpException.php
index e308a5fe..b0085c16 100644
--- a/vendor/symfony/http-kernel/Exception/MethodNotAllowedHttpException.php
+++ b/vendor/symfony/http-kernel/Exception/MethodNotAllowedHttpException.php
@@ -21,10 +21,11 @@ class MethodNotAllowedHttpException extends HttpException
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
      * @param int        $code     The internal exception code
+     * @param array      $headers
      */
-    public function __construct(array $allow, $message = null, \Exception $previous = null, $code = 0)
+    public function __construct(array $allow, string $message = null, \Exception $previous = null, ?int $code = 0, array $headers = array())
     {
-        $headers = array('Allow' => strtoupper(implode(', ', $allow)));
+        $headers['Allow'] = strtoupper(implode(', ', $allow));
 
         parent::__construct(405, $message, $previous, $headers, $code);
     }
diff --git a/vendor/symfony/http-kernel/Exception/NotAcceptableHttpException.php b/vendor/symfony/http-kernel/Exception/NotAcceptableHttpException.php
index 097a13fd..32c30893 100644
--- a/vendor/symfony/http-kernel/Exception/NotAcceptableHttpException.php
+++ b/vendor/symfony/http-kernel/Exception/NotAcceptableHttpException.php
@@ -20,9 +20,10 @@ class NotAcceptableHttpException extends HttpException
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
      * @param int        $code     The internal exception code
+     * @param array      $headers
      */
-    public function __construct($message = null, \Exception $previous = null, $code = 0)
+    public function __construct(string $message = null, \Exception $previous = null, int $code = 0, array $headers = array())
     {
-        parent::__construct(406, $message, $previous, array(), $code);
+        parent::__construct(406, $message, $previous, $headers, $code);
     }
 }
diff --git a/vendor/symfony/http-kernel/Exception/NotFoundHttpException.php b/vendor/symfony/http-kernel/Exception/NotFoundHttpException.php
index 878173cc..433ff9b9 100644
--- a/vendor/symfony/http-kernel/Exception/NotFoundHttpException.php
+++ b/vendor/symfony/http-kernel/Exception/NotFoundHttpException.php
@@ -20,9 +20,10 @@ class NotFoundHttpException extends HttpException
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
      * @param int        $code     The internal exception code
+     * @param array      $headers
      */
-    public function __construct($message = null, \Exception $previous = null, $code = 0)
+    public function __construct(string $message = null, \Exception $previous = null, int $code = 0, array $headers = array())
     {
-        parent::__construct(404, $message, $previous, array(), $code);
+        parent::__construct(404, $message, $previous, $headers, $code);
     }
 }
diff --git a/vendor/symfony/http-kernel/Exception/PreconditionFailedHttpException.php b/vendor/symfony/http-kernel/Exception/PreconditionFailedHttpException.php
index 9f13a624..10817888 100644
--- a/vendor/symfony/http-kernel/Exception/PreconditionFailedHttpException.php
+++ b/vendor/symfony/http-kernel/Exception/PreconditionFailedHttpException.php
@@ -20,9 +20,10 @@ class PreconditionFailedHttpException extends HttpException
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
      * @param int        $code     The internal exception code
+     * @param array      $headers
      */
-    public function __construct($message = null, \Exception $previous = null, $code = 0)
+    public function __construct(string $message = null, \Exception $previous = null, int $code = 0, array $headers = array())
     {
-        parent::__construct(412, $message, $previous, array(), $code);
+        parent::__construct(412, $message, $previous, $headers, $code);
     }
 }
diff --git a/vendor/symfony/http-kernel/Exception/PreconditionRequiredHttpException.php b/vendor/symfony/http-kernel/Exception/PreconditionRequiredHttpException.php
index 9d0a36d7..30783282 100644
--- a/vendor/symfony/http-kernel/Exception/PreconditionRequiredHttpException.php
+++ b/vendor/symfony/http-kernel/Exception/PreconditionRequiredHttpException.php
@@ -22,9 +22,10 @@ class PreconditionRequiredHttpException extends HttpException
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
      * @param int        $code     The internal exception code
+     * @param array      $headers
      */
-    public function __construct($message = null, \Exception $previous = null, $code = 0)
+    public function __construct(string $message = null, \Exception $previous = null, int $code = 0, array $headers = array())
     {
-        parent::__construct(428, $message, $previous, array(), $code);
+        parent::__construct(428, $message, $previous, $headers, $code);
     }
 }
diff --git a/vendor/symfony/http-kernel/Exception/ServiceUnavailableHttpException.php b/vendor/symfony/http-kernel/Exception/ServiceUnavailableHttpException.php
index b2767c3f..66776477 100644
--- a/vendor/symfony/http-kernel/Exception/ServiceUnavailableHttpException.php
+++ b/vendor/symfony/http-kernel/Exception/ServiceUnavailableHttpException.php
@@ -21,12 +21,12 @@ class ServiceUnavailableHttpException extends HttpException
      * @param string     $message    The internal exception message
      * @param \Exception $previous   The previous exception
      * @param int        $code       The internal exception code
+     * @param array      $headers
      */
-    public function __construct($retryAfter = null, $message = null, \Exception $previous = null, $code = 0)
+    public function __construct($retryAfter = null, string $message = null, \Exception $previous = null, ?int $code = 0, array $headers = array())
     {
-        $headers = array();
         if ($retryAfter) {
-            $headers = array('Retry-After' => $retryAfter);
+            $headers['Retry-After'] = $retryAfter;
         }
 
         parent::__construct(503, $message, $previous, $headers, $code);
diff --git a/vendor/symfony/http-kernel/Exception/TooManyRequestsHttpException.php b/vendor/symfony/http-kernel/Exception/TooManyRequestsHttpException.php
index 7d8a8033..60b024c3 100644
--- a/vendor/symfony/http-kernel/Exception/TooManyRequestsHttpException.php
+++ b/vendor/symfony/http-kernel/Exception/TooManyRequestsHttpException.php
@@ -23,12 +23,12 @@ class TooManyRequestsHttpException extends HttpException
      * @param string     $message    The internal exception message
      * @param \Exception $previous   The previous exception
      * @param int        $code       The internal exception code
+     * @param array      $headers
      */
-    public function __construct($retryAfter = null, $message = null, \Exception $previous = null, $code = 0)
+    public function __construct($retryAfter = null, string $message = null, \Exception $previous = null, ?int $code = 0, array $headers = array())
     {
-        $headers = array();
         if ($retryAfter) {
-            $headers = array('Retry-After' => $retryAfter);
+            $headers['Retry-After'] = $retryAfter;
         }
 
         parent::__construct(429, $message, $previous, $headers, $code);
diff --git a/vendor/symfony/http-kernel/Exception/UnauthorizedHttpException.php b/vendor/symfony/http-kernel/Exception/UnauthorizedHttpException.php
index 05ac875c..17ebb254 100644
--- a/vendor/symfony/http-kernel/Exception/UnauthorizedHttpException.php
+++ b/vendor/symfony/http-kernel/Exception/UnauthorizedHttpException.php
@@ -21,10 +21,11 @@ class UnauthorizedHttpException extends HttpException
      * @param string     $message   The internal exception message
      * @param \Exception $previous  The previous exception
      * @param int        $code      The internal exception code
+     * @param array      $headers
      */
-    public function __construct($challenge, $message = null, \Exception $previous = null, $code = 0)
+    public function __construct(string $challenge, string $message = null, \Exception $previous = null, ?int $code = 0, array $headers = array())
     {
-        $headers = array('WWW-Authenticate' => $challenge);
+        $headers['WWW-Authenticate'] = $challenge;
 
         parent::__construct(401, $message, $previous, $headers, $code);
     }
diff --git a/vendor/symfony/http-kernel/Exception/UnprocessableEntityHttpException.php b/vendor/symfony/http-kernel/Exception/UnprocessableEntityHttpException.php
index 01b8b846..3a4b40c9 100644
--- a/vendor/symfony/http-kernel/Exception/UnprocessableEntityHttpException.php
+++ b/vendor/symfony/http-kernel/Exception/UnprocessableEntityHttpException.php
@@ -20,9 +20,10 @@ class UnprocessableEntityHttpException extends HttpException
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
      * @param int        $code     The internal exception code
+     * @param array      $headers
      */
-    public function __construct($message = null, \Exception $previous = null, $code = 0)
+    public function __construct(string $message = null, \Exception $previous = null, int $code = 0, array $headers = array())
     {
-        parent::__construct(422, $message, $previous, array(), $code);
+        parent::__construct(422, $message, $previous, $headers, $code);
     }
 }
diff --git a/vendor/symfony/http-kernel/Exception/UnsupportedMediaTypeHttpException.php b/vendor/symfony/http-kernel/Exception/UnsupportedMediaTypeHttpException.php
index 6913504e..ed686115 100644
--- a/vendor/symfony/http-kernel/Exception/UnsupportedMediaTypeHttpException.php
+++ b/vendor/symfony/http-kernel/Exception/UnsupportedMediaTypeHttpException.php
@@ -20,9 +20,10 @@ class UnsupportedMediaTypeHttpException extends HttpException
      * @param string     $message  The internal exception message
      * @param \Exception $previous The previous exception
      * @param int        $code     The internal exception code
+     * @param array      $headers
      */
-    public function __construct($message = null, \Exception $previous = null, $code = 0)
+    public function __construct(string $message = null, \Exception $previous = null, int $code = 0, array $headers = array())
     {
-        parent::__construct(415, $message, $previous, array(), $code);
+        parent::__construct(415, $message, $previous, $headers, $code);
     }
 }
diff --git a/vendor/symfony/http-kernel/Fragment/AbstractSurrogateFragmentRenderer.php b/vendor/symfony/http-kernel/Fragment/AbstractSurrogateFragmentRenderer.php
index a8dca41b..6ab6ec1f 100644
--- a/vendor/symfony/http-kernel/Fragment/AbstractSurrogateFragmentRenderer.php
+++ b/vendor/symfony/http-kernel/Fragment/AbstractSurrogateFragmentRenderer.php
@@ -63,7 +63,7 @@ abstract class AbstractSurrogateFragmentRenderer extends RoutableFragmentRendere
     {
         if (!$this->surrogate || !$this->surrogate->hasSurrogateCapability($request)) {
             if ($uri instanceof ControllerReference && $this->containsNonScalars($uri->attributes)) {
-                @trigger_error('Passing non-scalar values as part of URI attributes to the ESI and SSI rendering strategies is deprecated since Symfony 3.1, and will be removed in 4.0. Use a different rendering strategy or pass scalar values.', E_USER_DEPRECATED);
+                throw new \InvalidArgumentException('Passing non-scalar values as part of URI attributes to the ESI and SSI rendering strategies is not supported. Use a different rendering strategy or pass scalar values.');
             }
 
             return $this->inlineStrategy->render($uri, $request, $options);
@@ -83,7 +83,7 @@ abstract class AbstractSurrogateFragmentRenderer extends RoutableFragmentRendere
         return new Response($tag);
     }
 
-    private function generateSignedFragmentUri($uri, Request $request)
+    private function generateSignedFragmentUri($uri, Request $request): string
     {
         if (null === $this->signer) {
             throw new \LogicException('You must use a URI when using the ESI rendering strategy or set a URL signer.');
@@ -92,13 +92,13 @@ abstract class AbstractSurrogateFragmentRenderer extends RoutableFragmentRendere
         // we need to sign the absolute URI, but want to return the path only.
         $fragmentUri = $this->signer->sign($this->generateFragmentUri($uri, $request, true));
 
-        return substr($fragmentUri, strlen($request->getSchemeAndHttpHost()));
+        return substr($fragmentUri, \strlen($request->getSchemeAndHttpHost()));
     }
 
-    private function containsNonScalars(array $values)
+    private function containsNonScalars(array $values): bool
     {
         foreach ($values as $value) {
-            if (is_array($value)) {
+            if (\is_array($value)) {
                 return $this->containsNonScalars($value);
             } elseif (!is_scalar($value) && null !== $value) {
                 return true;
diff --git a/vendor/symfony/http-kernel/Fragment/FragmentHandler.php b/vendor/symfony/http-kernel/Fragment/FragmentHandler.php
index c9d952ff..0c31826b 100644
--- a/vendor/symfony/http-kernel/Fragment/FragmentHandler.php
+++ b/vendor/symfony/http-kernel/Fragment/FragmentHandler.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\HttpKernel\Fragment;
 
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\StreamedResponse;
-use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Controller\ControllerReference;
 
 /**
@@ -37,7 +37,7 @@ class FragmentHandler
      * @param FragmentRendererInterface[] $renderers    An array of FragmentRendererInterface instances
      * @param bool                        $debug        Whether the debug mode is enabled or not
      */
-    public function __construct(RequestStack $requestStack, array $renderers = array(), $debug = false)
+    public function __construct(RequestStack $requestStack, array $renderers = array(), bool $debug = false)
     {
         $this->requestStack = $requestStack;
         foreach ($renderers as $renderer) {
diff --git a/vendor/symfony/http-kernel/Fragment/FragmentRendererInterface.php b/vendor/symfony/http-kernel/Fragment/FragmentRendererInterface.php
index b177c3ac..bcf4e994 100644
--- a/vendor/symfony/http-kernel/Fragment/FragmentRendererInterface.php
+++ b/vendor/symfony/http-kernel/Fragment/FragmentRendererInterface.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\HttpKernel\Fragment;
 
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Controller\ControllerReference;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Controller\ControllerReference;
 
 /**
  * Interface implemented by all rendering strategies.
diff --git a/vendor/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php b/vendor/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php
index 7e957d4c..3ee0cfa2 100644
--- a/vendor/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php
+++ b/vendor/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php
@@ -13,9 +13,9 @@ namespace Symfony\Component\HttpKernel\Fragment;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Component\HttpKernel\Controller\ControllerReference;
 use Symfony\Component\HttpKernel\UriSigner;
+use Symfony\Component\Templating\EngineInterface;
 use Twig\Environment;
 use Twig\Error\LoaderError;
 use Twig\Loader\ExistsLoaderInterface;
@@ -38,7 +38,7 @@ class HIncludeFragmentRenderer extends RoutableFragmentRenderer
      * @param string                      $globalDefaultTemplate The global default content (it can be a template name or the content)
      * @param string                      $charset
      */
-    public function __construct($templating = null, UriSigner $signer = null, $globalDefaultTemplate = null, $charset = 'utf-8')
+    public function __construct($templating = null, UriSigner $signer = null, string $globalDefaultTemplate = null, string $charset = 'utf-8')
     {
         $this->setTemplating($templating);
         $this->globalDefaultTemplate = $globalDefaultTemplate;
@@ -89,7 +89,7 @@ class HIncludeFragmentRenderer extends RoutableFragmentRenderer
             }
 
             // we need to sign the absolute URI, but want to return the path only.
-            $uri = substr($this->signer->sign($this->generateFragmentUri($uri, $request, true)), strlen($request->getSchemeAndHttpHost()));
+            $uri = substr($this->signer->sign($this->generateFragmentUri($uri, $request, true)), \strlen($request->getSchemeAndHttpHost()));
         }
 
         // We need to replace ampersands in the URI with the encoded form in order to return valid html/xml content.
@@ -102,12 +102,12 @@ class HIncludeFragmentRenderer extends RoutableFragmentRenderer
             $content = $template;
         }
 
-        $attributes = isset($options['attributes']) && is_array($options['attributes']) ? $options['attributes'] : array();
+        $attributes = isset($options['attributes']) && \is_array($options['attributes']) ? $options['attributes'] : array();
         if (isset($options['id']) && $options['id']) {
             $attributes['id'] = $options['id'];
         }
         $renderedAttributes = '';
-        if (count($attributes) > 0) {
+        if (\count($attributes) > 0) {
             $flags = ENT_QUOTES | ENT_SUBSTITUTE;
             foreach ($attributes as $attribute => $value) {
                 $renderedAttributes .= sprintf(
@@ -121,17 +121,12 @@ class HIncludeFragmentRenderer extends RoutableFragmentRenderer
         return new Response(sprintf('<hx:include src="%s"%s>%s</hx:include>', $uri, $renderedAttributes, $content));
     }
 
-    /**
-     * @param string $template
-     *
-     * @return bool
-     */
-    private function templateExists($template)
+    private function templateExists(string $template): bool
     {
         if ($this->templating instanceof EngineInterface) {
             try {
                 return $this->templating->exists($template);
-            } catch (\InvalidArgumentException $e) {
+            } catch (\Exception $e) {
                 return false;
             }
         }
diff --git a/vendor/symfony/http-kernel/Fragment/InlineFragmentRenderer.php b/vendor/symfony/http-kernel/Fragment/InlineFragmentRenderer.php
index 3f3a51a5..ecf12f21 100644
--- a/vendor/symfony/http-kernel/Fragment/InlineFragmentRenderer.php
+++ b/vendor/symfony/http-kernel/Fragment/InlineFragmentRenderer.php
@@ -11,13 +11,14 @@
 
 namespace Symfony\Component\HttpKernel\Fragment;
 
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\Controller\ControllerReference;
-use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\HttpKernel\HttpCache\SubRequestHandler;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
  * Implements the inline rendering strategy where the Request is rendered by the current HTTP kernel.
@@ -76,7 +77,7 @@ class InlineFragmentRenderer extends RoutableFragmentRenderer
 
         $level = ob_get_level();
         try {
-            return $this->kernel->handle($subRequest, HttpKernelInterface::SUB_REQUEST, false);
+            return SubRequestHandler::handle($this->kernel, $subRequest, HttpKernelInterface::SUB_REQUEST, false);
         } catch (\Exception $e) {
             // we dispatch the exception event to trigger the logging
             // the response that comes back is simply ignored
@@ -109,24 +110,6 @@ class InlineFragmentRenderer extends RoutableFragmentRenderer
         $cookies = $request->cookies->all();
         $server = $request->server->all();
 
-        // Override the arguments to emulate a sub-request.
-        // Sub-request object will point to localhost as client ip and real client ip
-        // will be included into trusted header for client ip
-        try {
-            if (Request::HEADER_X_FORWARDED_FOR & Request::getTrustedHeaderSet()) {
-                $currentXForwardedFor = $request->headers->get('X_FORWARDED_FOR', '');
-
-                $server['HTTP_X_FORWARDED_FOR'] = ($currentXForwardedFor ? $currentXForwardedFor.', ' : '').$request->getClientIp();
-            } elseif (method_exists(Request::class, 'getTrustedHeaderName') && $trustedHeaderName = Request::getTrustedHeaderName(Request::HEADER_CLIENT_IP, false)) {
-                $currentXForwardedFor = $request->headers->get($trustedHeaderName, '');
-
-                $server['HTTP_'.$trustedHeaderName] = ($currentXForwardedFor ? $currentXForwardedFor.', ' : '').$request->getClientIp();
-            }
-        } catch (\InvalidArgumentException $e) {
-            // Do nothing
-        }
-
-        $server['REMOTE_ADDR'] = '127.0.0.1';
         unset($server['HTTP_IF_MODIFIED_SINCE']);
         unset($server['HTTP_IF_NONE_MATCH']);
 
@@ -135,8 +118,18 @@ class InlineFragmentRenderer extends RoutableFragmentRenderer
             $subRequest->headers->set('Surrogate-Capability', $request->headers->get('Surrogate-Capability'));
         }
 
-        if ($session = $request->getSession()) {
-            $subRequest->setSession($session);
+        static $setSession;
+
+        if (null === $setSession) {
+            $setSession = \Closure::bind(function ($subRequest, $request) { $subRequest->session = $request->session; }, null, Request::class);
+        }
+        $setSession($subRequest, $request);
+
+        if ($request->get('_format')) {
+            $subRequest->attributes->set('_format', $request->get('_format'));
+        }
+        if ($request->getDefaultLocale() !== $request->getLocale()) {
+            $subRequest->setLocale($request->getLocale());
         }
 
         return $subRequest;
diff --git a/vendor/symfony/http-kernel/Fragment/RoutableFragmentRenderer.php b/vendor/symfony/http-kernel/Fragment/RoutableFragmentRenderer.php
index d7eeb89a..0c1b95d4 100644
--- a/vendor/symfony/http-kernel/Fragment/RoutableFragmentRenderer.php
+++ b/vendor/symfony/http-kernel/Fragment/RoutableFragmentRenderer.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\Fragment;
 
-use Symfony\Component\HttpKernel\Controller\ControllerReference;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Controller\ControllerReference;
 use Symfony\Component\HttpKernel\EventListener\FragmentListener;
 
 /**
@@ -80,7 +80,7 @@ abstract class RoutableFragmentRenderer implements FragmentRendererInterface
     private function checkNonScalar($values)
     {
         foreach ($values as $key => $value) {
-            if (is_array($value)) {
+            if (\is_array($value)) {
                 $this->checkNonScalar($value);
             } elseif (!is_scalar($value) && null !== $value) {
                 throw new \LogicException(sprintf('Controller attributes cannot contain non-scalar/non-null values (value for key "%s" is not a scalar or null).', $key));
diff --git a/vendor/symfony/http-kernel/HttpCache/Esi.php b/vendor/symfony/http-kernel/HttpCache/Esi.php
index d09907ea..69134c71 100644
--- a/vendor/symfony/http-kernel/HttpCache/Esi.php
+++ b/vendor/symfony/http-kernel/HttpCache/Esi.php
@@ -71,7 +71,7 @@ class Esi extends AbstractSurrogate
         }
 
         $parts = explode(';', $type);
-        if (!in_array($parts[0], $this->contentTypes)) {
+        if (!\in_array($parts[0], $this->contentTypes)) {
             return $response;
         }
 
diff --git a/vendor/symfony/http-kernel/HttpCache/HttpCache.php b/vendor/symfony/http-kernel/HttpCache/HttpCache.php
index 7c5a44f0..fa3be46c 100644
--- a/vendor/symfony/http-kernel/HttpCache/HttpCache.php
+++ b/vendor/symfony/http-kernel/HttpCache/HttpCache.php
@@ -15,10 +15,10 @@
 
 namespace Symfony\Component\HttpKernel\HttpCache;
 
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpKernel\TerminableInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\TerminableInterface;
 
 /**
  * Cache provides HTTP caching.
@@ -165,7 +165,11 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
         // FIXME: catch exceptions and implement a 500 error page here? -> in Varnish, there is a built-in error page mechanism
         if (HttpKernelInterface::MASTER_REQUEST === $type) {
             $this->traces = array();
-            $this->request = $request;
+            // Keep a clone of the original request for surrogates so they can access it.
+            // We must clone here to get a separate instance because the application will modify the request during
+            // the application flow (we know it always does because we do ourselves by setting REMOTE_ADDR to 127.0.0.1
+            // and adding the X-Forwarded-For header, see HttpCache::forward()).
+            $this->request = clone $request;
             if (null !== $this->surrogate) {
                 $this->surrogateCacheStrategy = $this->surrogate->createCacheStrategy();
             }
@@ -366,7 +370,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
 
             // return the response and not the cache entry if the response is valid but not cached
             $etag = $response->getEtag();
-            if ($etag && in_array($etag, $requestEtags) && !in_array($etag, $cachedEtags)) {
+            if ($etag && \in_array($etag, $requestEtags) && !\in_array($etag, $cachedEtags)) {
                 return $response;
             }
 
@@ -440,30 +444,11 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
             $this->surrogate->addSurrogateCapability($request);
         }
 
-        // modify the X-Forwarded-For header if needed
-        $forwardedFor = $request->headers->get('X-Forwarded-For');
-        if ($forwardedFor) {
-            $request->headers->set('X-Forwarded-For', $forwardedFor.', '.$request->server->get('REMOTE_ADDR'));
-        } else {
-            $request->headers->set('X-Forwarded-For', $request->server->get('REMOTE_ADDR'));
-        }
-
-        // fix the client IP address by setting it to 127.0.0.1 as HttpCache
-        // is always called from the same process as the backend.
-        $request->server->set('REMOTE_ADDR', '127.0.0.1');
-
-        // make sure HttpCache is a trusted proxy
-        if (!in_array('127.0.0.1', $trustedProxies = Request::getTrustedProxies())) {
-            $trustedProxies[] = '127.0.0.1';
-            Request::setTrustedProxies($trustedProxies, Request::HEADER_X_FORWARDED_ALL);
-        }
-
         // always a "master" request (as the real master request can be in cache)
-        $response = $this->kernel->handle($request, HttpKernelInterface::MASTER_REQUEST, $catch);
-        // FIXME: we probably need to also catch exceptions if raw === true
+        $response = SubRequestHandler::handle($this->kernel, $request, HttpKernelInterface::MASTER_REQUEST, $catch);
 
         // we don't implement the stale-if-error on Requests, which is nonetheless part of the RFC
-        if (null !== $entry && in_array($response->getStatusCode(), array(500, 502, 503, 504))) {
+        if (null !== $entry && \in_array($response->getStatusCode(), array(500, 502, 503, 504))) {
             if (null === $age = $entry->headers->getCacheControlDirective('stale-if-error')) {
                 $age = $this->options['stale_if_error'];
             }
@@ -602,7 +587,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
             $response->setContent(ob_get_clean());
             $response->headers->remove('X-Body-Eval');
             if (!$response->headers->has('Transfer-Encoding')) {
-                $response->headers->set('Content-Length', strlen($response->getContent()));
+                $response->headers->set('Content-Length', \strlen($response->getContent()));
             }
         } elseif ($response->headers->has('X-Body-File')) {
             // Response does not include possibly dynamic content (ESI, SSI), so we need
@@ -636,7 +621,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
             $key = strtolower(str_replace('HTTP_', '', $key));
 
             if ('cookie' === $key) {
-                if (count($request->cookies->all())) {
+                if (\count($request->cookies->all())) {
                     return true;
                 }
             } elseif ($request->headers->has($key)) {
@@ -649,23 +634,16 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
 
     /**
      * Records that an event took place.
-     *
-     * @param Request $request A Request instance
-     * @param string  $event   The event name
      */
-    private function record(Request $request, $event)
+    private function record(Request $request, string $event)
     {
         $this->traces[$this->getTraceKey($request)][] = $event;
     }
 
     /**
      * Calculates the key we use in the "trace" array for a given request.
-     *
-     * @param Request $request
-     *
-     * @return string
      */
-    private function getTraceKey(Request $request)
+    private function getTraceKey(Request $request): string
     {
         $path = $request->getPathInfo();
         if ($qs = $request->getQueryString()) {
@@ -678,12 +656,8 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
     /**
      * Checks whether the given (cached) response may be served as "stale" when a revalidation
      * is currently in progress.
-     *
-     * @param Response $entry
-     *
-     * @return bool true when the stale response may be served, false otherwise
      */
-    private function mayServeStaleWhileRevalidate(Response $entry)
+    private function mayServeStaleWhileRevalidate(Response $entry): bool
     {
         $timeout = $entry->headers->getCacheControlDirective('stale-while-revalidate');
 
@@ -696,12 +670,8 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
 
     /**
      * Waits for the store to release a locked entry.
-     *
-     * @param Request $request The request to wait for
-     *
-     * @return bool true if the lock was released before the internal timeout was hit; false if the wait timeout was exceeded
      */
-    private function waitForLock(Request $request)
+    private function waitForLock(Request $request): bool
     {
         $wait = 0;
         while ($this->store->isLocked($request) && $wait < 100) {
diff --git a/vendor/symfony/http-kernel/HttpCache/Ssi.php b/vendor/symfony/http-kernel/HttpCache/Ssi.php
index 3178c335..58df1760 100644
--- a/vendor/symfony/http-kernel/HttpCache/Ssi.php
+++ b/vendor/symfony/http-kernel/HttpCache/Ssi.php
@@ -58,7 +58,7 @@ class Ssi extends AbstractSurrogate
         }
 
         $parts = explode(';', $type);
-        if (!in_array($parts[0], $this->contentTypes)) {
+        if (!\in_array($parts[0], $this->contentTypes)) {
             return $response;
         }
 
diff --git a/vendor/symfony/http-kernel/HttpCache/Store.php b/vendor/symfony/http-kernel/HttpCache/Store.php
index d20bfaa1..925ca96f 100644
--- a/vendor/symfony/http-kernel/HttpCache/Store.php
+++ b/vendor/symfony/http-kernel/HttpCache/Store.php
@@ -29,11 +29,9 @@ class Store implements StoreInterface
     private $locks;
 
     /**
-     * @param string $root The path to the cache directory
-     *
      * @throws \RuntimeException
      */
-    public function __construct($root)
+    public function __construct(string $root)
     {
         $this->root = $root;
         if (!file_exists($this->root) && !@mkdir($this->root, 0777, true) && !is_dir($this->root)) {
@@ -68,7 +66,7 @@ class Store implements StoreInterface
 
         if (!isset($this->locks[$key])) {
             $path = $this->getPath($key);
-            if (!file_exists(dirname($path)) && false === @mkdir(dirname($path), 0777, true) && !is_dir(dirname($path))) {
+            if (!file_exists(\dirname($path)) && false === @mkdir(\dirname($path), 0777, true) && !is_dir(\dirname($path))) {
                 return $path;
             }
             $h = fopen($path, 'cb');
@@ -187,7 +185,7 @@ class Store implements StoreInterface
             $response->headers->set('X-Content-Digest', $digest);
 
             if (!$response->headers->has('Transfer-Encoding')) {
-                $response->headers->set('Content-Length', strlen($response->getContent()));
+                $response->headers->set('Content-Length', \strlen($response->getContent()));
             }
         }
 
@@ -375,17 +373,17 @@ class Store implements StoreInterface
             @ftruncate($fp, 0);
             @fseek($fp, 0);
             $len = @fwrite($fp, $data);
-            if (strlen($data) !== $len) {
+            if (\strlen($data) !== $len) {
                 @ftruncate($fp, 0);
 
                 return false;
             }
         } else {
-            if (!file_exists(dirname($path)) && false === @mkdir(dirname($path), 0777, true) && !is_dir(dirname($path))) {
+            if (!file_exists(\dirname($path)) && false === @mkdir(\dirname($path), 0777, true) && !is_dir(\dirname($path))) {
                 return false;
             }
 
-            $tmpFile = tempnam(dirname($path), basename($path));
+            $tmpFile = tempnam(\dirname($path), basename($path));
             if (false === $fp = @fopen($tmpFile, 'wb')) {
                 @unlink($tmpFile);
 
@@ -412,7 +410,7 @@ class Store implements StoreInterface
 
     public function getPath($key)
     {
-        return $this->root.DIRECTORY_SEPARATOR.substr($key, 0, 2).DIRECTORY_SEPARATOR.substr($key, 2, 2).DIRECTORY_SEPARATOR.substr($key, 4, 2).DIRECTORY_SEPARATOR.substr($key, 6);
+        return $this->root.\DIRECTORY_SEPARATOR.substr($key, 0, 2).\DIRECTORY_SEPARATOR.substr($key, 2, 2).\DIRECTORY_SEPARATOR.substr($key, 4, 2).\DIRECTORY_SEPARATOR.substr($key, 6);
     }
 
     /**
diff --git a/vendor/symfony/http-kernel/HttpCache/SubRequestHandler.php b/vendor/symfony/http-kernel/HttpCache/SubRequestHandler.php
new file mode 100644
index 00000000..84d7a84e
--- /dev/null
+++ b/vendor/symfony/http-kernel/HttpCache/SubRequestHandler.php
@@ -0,0 +1,91 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\HttpCache;
+
+use Symfony\Component\HttpFoundation\IpUtils;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @internal
+ */
+class SubRequestHandler
+{
+    public static function handle(HttpKernelInterface $kernel, Request $request, $type, $catch): Response
+    {
+        // save global state related to trusted headers and proxies
+        $trustedProxies = Request::getTrustedProxies();
+        $trustedHeaderSet = Request::getTrustedHeaderSet();
+
+        // remove untrusted values
+        $remoteAddr = $request->server->get('REMOTE_ADDR');
+        if (!IpUtils::checkIp($remoteAddr, $trustedProxies)) {
+            $trustedHeaders = array(
+                'FORWARDED' => $trustedHeaderSet & Request::HEADER_FORWARDED,
+                'X_FORWARDED_FOR' => $trustedHeaderSet & Request::HEADER_X_FORWARDED_FOR,
+                'X_FORWARDED_HOST' => $trustedHeaderSet & Request::HEADER_X_FORWARDED_HOST,
+                'X_FORWARDED_PROTO' => $trustedHeaderSet & Request::HEADER_X_FORWARDED_PROTO,
+                'X_FORWARDED_PORT' => $trustedHeaderSet & Request::HEADER_X_FORWARDED_PORT,
+            );
+            foreach (array_filter($trustedHeaders) as $name => $key) {
+                $request->headers->remove($name);
+                $request->server->remove('HTTP_'.$name);
+            }
+        }
+
+        // compute trusted values, taking any trusted proxies into account
+        $trustedIps = array();
+        $trustedValues = array();
+        foreach (array_reverse($request->getClientIps()) as $ip) {
+            $trustedIps[] = $ip;
+            $trustedValues[] = sprintf('for="%s"', $ip);
+        }
+        if ($ip !== $remoteAddr) {
+            $trustedIps[] = $remoteAddr;
+            $trustedValues[] = sprintf('for="%s"', $remoteAddr);
+        }
+
+        // set trusted values, reusing as much as possible the global trusted settings
+        if (Request::HEADER_FORWARDED & $trustedHeaderSet) {
+            $trustedValues[0] .= sprintf(';host="%s";proto=%s', $request->getHttpHost(), $request->getScheme());
+            $request->headers->set('Forwarded', $v = implode(', ', $trustedValues));
+            $request->server->set('HTTP_FORWARDED', $v);
+        }
+        if (Request::HEADER_X_FORWARDED_FOR & $trustedHeaderSet) {
+            $request->headers->set('X-Forwarded-For', $v = implode(', ', $trustedIps));
+            $request->server->set('HTTP_X_FORWARDED_FOR', $v);
+        } elseif (!(Request::HEADER_FORWARDED & $trustedHeaderSet)) {
+            Request::setTrustedProxies($trustedProxies, $trustedHeaderSet | Request::HEADER_X_FORWARDED_FOR);
+            $request->headers->set('X-Forwarded-For', $v = implode(', ', $trustedIps));
+            $request->server->set('HTTP_X_FORWARDED_FOR', $v);
+        }
+
+        // fix the client IP address by setting it to 127.0.0.1,
+        // which is the core responsibility of this method
+        $request->server->set('REMOTE_ADDR', '127.0.0.1');
+
+        // ensure 127.0.0.1 is set as trusted proxy
+        if (!IpUtils::checkIp('127.0.0.1', $trustedProxies)) {
+            Request::setTrustedProxies(array_merge($trustedProxies, array('127.0.0.1')), Request::getTrustedHeaderSet());
+        }
+
+        try {
+            return $kernel->handle($request, $type, $catch);
+        } finally {
+            // restore global state
+            Request::setTrustedProxies($trustedProxies, $trustedHeaderSet);
+        }
+    }
+}
diff --git a/vendor/symfony/http-kernel/HttpKernel.php b/vendor/symfony/http-kernel/HttpKernel.php
index 41f8913b..06d21005 100644
--- a/vendor/symfony/http-kernel/HttpKernel.php
+++ b/vendor/symfony/http-kernel/HttpKernel.php
@@ -11,13 +11,15 @@
 
 namespace Symfony\Component\HttpKernel;
 
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\HttpFoundation\Exception\RequestExceptionInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
 use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
 use Symfony\Component\HttpKernel\Event\FilterControllerArgumentsEvent;
-use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
@@ -25,11 +27,9 @@ use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 use Symfony\Component\HttpKernel\Event\PostResponseEvent;
-use Symfony\Component\HttpFoundation\Exception\RequestExceptionInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * HttpKernel notifies events to convert a Request object to a Response one.
@@ -51,9 +51,7 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
         $this->argumentResolver = $argumentResolver;
 
         if (null === $this->argumentResolver) {
-            @trigger_error(sprintf('As of 3.1 an %s is used to resolve arguments. In 4.0 the $argumentResolver becomes the %s if no other is provided instead of using the $resolver argument.', ArgumentResolverInterface::class, ArgumentResolver::class), E_USER_DEPRECATED);
-            // fallback in case of deprecations
-            $this->argumentResolver = $resolver;
+            $this->argumentResolver = new ArgumentResolver();
         }
     }
 
@@ -118,7 +116,7 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
      * @throws \LogicException       If one of the listener does not behave as expected
      * @throws NotFoundHttpException When controller cannot be found
      */
-    private function handleRaw(Request $request, $type = self::MASTER_REQUEST)
+    private function handleRaw(Request $request, int $type = self::MASTER_REQUEST)
     {
         $this->requestStack->push($request);
 
@@ -157,9 +155,7 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
 
             if ($event->hasResponse()) {
                 $response = $event->getResponse();
-            }
-
-            if (!$response instanceof Response) {
+            } else {
                 $msg = sprintf('The controller must return a response (%s given).', $this->varToString($response));
 
                 // the user may have forgotten to return something
@@ -184,7 +180,7 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
      *
      * @throws \RuntimeException if the passed object is not a Response instance
      */
-    private function filterResponse(Response $response, Request $request, $type)
+    private function filterResponse(Response $response, Request $request, int $type)
     {
         $event = new FilterResponseEvent($this, $request, $type, $response);
 
@@ -201,11 +197,8 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
      * Note that the order of the operations is important here, otherwise
      * operations such as {@link RequestStack::getParentRequest()} can lead to
      * weird results.
-     *
-     * @param Request $request
-     * @param int     $type
      */
-    private function finishRequest(Request $request, $type)
+    private function finishRequest(Request $request, int $type)
     {
         $this->dispatcher->dispatch(KernelEvents::FINISH_REQUEST, new FinishRequestEvent($this, $request, $type));
         $this->requestStack->pop();
@@ -216,13 +209,11 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
      *
      * @param \Exception $e       An \Exception instance
      * @param Request    $request A Request instance
-     * @param int        $type    The type of the request
-     *
-     * @return Response A Response instance
+     * @param int        $type    The type of the request (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST)
      *
      * @throws \Exception
      */
-    private function handleException(\Exception $e, $request, $type)
+    private function handleException(\Exception $e, Request $request, int $type): Response
     {
         $event = new GetResponseForExceptionEvent($this, $request, $type, $e);
         $this->dispatcher->dispatch(KernelEvents::EXCEPTION, $event);
@@ -239,13 +230,7 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
         $response = $event->getResponse();
 
         // the developer asked for a specific status code
-        if ($response->headers->has('X-Status-Code')) {
-            @trigger_error(sprintf('Using the X-Status-Code header is deprecated since Symfony 3.3 and will be removed in 4.0. Use %s::allowCustomResponseCode() instead.', GetResponseForExceptionEvent::class), E_USER_DEPRECATED);
-
-            $response->setStatusCode($response->headers->get('X-Status-Code'));
-
-            $response->headers->remove('X-Status-Code');
-        } elseif (!$event->isAllowingCustomResponseCode() && !$response->isClientError() && !$response->isServerError() && !$response->isRedirect()) {
+        if (!$event->isAllowingCustomResponseCode() && !$response->isClientError() && !$response->isServerError() && !$response->isRedirect()) {
             // ensure that we actually have an error response
             if ($e instanceof HttpExceptionInterface) {
                 // keep the HTTP status code and headers
@@ -263,13 +248,13 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
         }
     }
 
-    private function varToString($var)
+    private function varToString($var): string
     {
-        if (is_object($var)) {
-            return sprintf('Object(%s)', get_class($var));
+        if (\is_object($var)) {
+            return sprintf('Object(%s)', \get_class($var));
         }
 
-        if (is_array($var)) {
+        if (\is_array($var)) {
             $a = array();
             foreach ($var as $k => $v) {
                 $a[] = sprintf('%s => %s', $k, $this->varToString($v));
@@ -278,7 +263,7 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface
             return sprintf('Array(%s)', implode(', ', $a));
         }
 
-        if (is_resource($var)) {
+        if (\is_resource($var)) {
             return sprintf('Resource(%s)', get_resource_type($var));
         }
 
diff --git a/vendor/symfony/http-kernel/Kernel.php b/vendor/symfony/http-kernel/Kernel.php
index ca0f0b95..23e82059 100644
--- a/vendor/symfony/http-kernel/Kernel.php
+++ b/vendor/symfony/http-kernel/Kernel.php
@@ -13,30 +13,28 @@ namespace Symfony\Component\HttpKernel;
 
 use Symfony\Bridge\ProxyManager\LazyProxy\Instantiator\RuntimeInstantiator;
 use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
+use Symfony\Component\Config\ConfigCache;
+use Symfony\Component\Config\Loader\DelegatingLoader;
+use Symfony\Component\Config\Loader\LoaderResolver;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\PassConfig;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
+use Symfony\Component\DependencyInjection\Loader\DirectoryLoader;
+use Symfony\Component\DependencyInjection\Loader\GlobFileLoader;
 use Symfony\Component\DependencyInjection\Loader\IniFileLoader;
 use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
-use Symfony\Component\DependencyInjection\Loader\GlobFileLoader;
-use Symfony\Component\DependencyInjection\Loader\DirectoryLoader;
-use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
-use Symfony\Component\HttpKernel\Config\EnvParametersResource;
 use Symfony\Component\HttpKernel\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\MergeExtensionConfigurationPass;
 use Symfony\Component\HttpKernel\DependencyInjection\AddAnnotatedClassesToCachePass;
-use Symfony\Component\Config\Loader\LoaderResolver;
-use Symfony\Component\Config\Loader\DelegatingLoader;
-use Symfony\Component\Config\ConfigCache;
-use Symfony\Component\ClassLoader\ClassCollectionLoader;
+use Symfony\Component\HttpKernel\DependencyInjection\MergeExtensionConfigurationPass;
 
 /**
  * The Kernel is the heart of the Symfony system.
@@ -52,7 +50,6 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
      */
     protected $bundles = array();
 
-    protected $bundleMap;
     protected $container;
     protected $rootDir;
     protected $environment;
@@ -60,45 +57,32 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
     protected $booted = false;
     protected $name;
     protected $startTime;
-    protected $loadClassCache;
 
     private $projectDir;
     private $warmupDir;
     private $requestStackSize = 0;
     private $resetServices = false;
 
-    const VERSION = '3.4.11';
-    const VERSION_ID = 30411;
-    const MAJOR_VERSION = 3;
-    const MINOR_VERSION = 4;
-    const RELEASE_VERSION = 11;
+    const VERSION = '4.1.6';
+    const VERSION_ID = 40106;
+    const MAJOR_VERSION = 4;
+    const MINOR_VERSION = 1;
+    const RELEASE_VERSION = 6;
     const EXTRA_VERSION = '';
 
-    const END_OF_MAINTENANCE = '11/2020';
-    const END_OF_LIFE = '11/2021';
+    const END_OF_MAINTENANCE = '01/2019';
+    const END_OF_LIFE = '07/2019';
 
-    /**
-     * @param string $environment The environment
-     * @param bool   $debug       Whether to enable debugging or not
-     */
-    public function __construct($environment, $debug)
+    public function __construct(string $environment, bool $debug)
     {
         $this->environment = $environment;
-        $this->debug = (bool) $debug;
+        $this->debug = $debug;
         $this->rootDir = $this->getRootDir();
         $this->name = $this->getName();
-
-        if ($this->debug) {
-            $this->startTime = microtime(true);
-        }
     }
 
     public function __clone()
     {
-        if ($this->debug) {
-            $this->startTime = microtime(true);
-        }
-
         $this->booted = false;
         $this->container = null;
         $this->requestStackSize = 0;
@@ -106,7 +90,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
     }
 
     /**
-     * Boots the current kernel.
+     * {@inheritdoc}
      */
     public function boot()
     {
@@ -116,20 +100,22 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
                     $this->container->get('services_resetter')->reset();
                 }
                 $this->resetServices = false;
+                if ($this->debug) {
+                    $this->startTime = microtime(true);
+                }
             }
 
             return;
         }
+        if ($this->debug) {
+            $this->startTime = microtime(true);
+        }
         if ($this->debug && !isset($_ENV['SHELL_VERBOSITY']) && !isset($_SERVER['SHELL_VERBOSITY'])) {
             putenv('SHELL_VERBOSITY=3');
             $_ENV['SHELL_VERBOSITY'] = 3;
             $_SERVER['SHELL_VERBOSITY'] = 3;
         }
 
-        if ($this->loadClassCache) {
-            $this->doLoadClassCache($this->loadClassCache[0], $this->loadClassCache[1]);
-        }
-
         // init bundles
         $this->initializeBundles();
 
@@ -226,26 +212,13 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
     /**
      * {@inheritdoc}
      */
-    public function getBundle($name, $first = true/*, $noDeprecation = false */)
+    public function getBundle($name)
     {
-        $noDeprecation = false;
-        if (func_num_args() >= 3) {
-            $noDeprecation = func_get_arg(2);
-        }
-
-        if (!$first && !$noDeprecation) {
-            @trigger_error(sprintf('Passing "false" as the second argument to %s() is deprecated as of 3.4 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
-        }
-
-        if (!isset($this->bundleMap[$name])) {
-            throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the registerBundles() method of your %s.php file?', $name, get_class($this)));
-        }
-
-        if (true === $first) {
-            return $this->bundleMap[$name][0];
+        if (!isset($this->bundles[$name])) {
+            throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the registerBundles() method of your %s.php file?', $name, \get_class($this)));
         }
 
-        return $this->bundleMap[$name];
+        return $this->bundles[$name];
     }
 
     /**
@@ -272,35 +245,26 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
         $isResource = 0 === strpos($path, 'Resources') && null !== $dir;
         $overridePath = substr($path, 9);
         $resourceBundle = null;
-        $bundles = $this->getBundle($bundleName, false, true);
+        $bundle = $this->getBundle($bundleName);
         $files = array();
 
-        foreach ($bundles as $bundle) {
-            if ($isResource && file_exists($file = $dir.'/'.$bundle->getName().$overridePath)) {
-                if (null !== $resourceBundle) {
-                    throw new \RuntimeException(sprintf('"%s" resource is hidden by a resource from the "%s" derived bundle. Create a "%s" file to override the bundle resource.',
-                        $file,
-                        $resourceBundle,
-                        $dir.'/'.$bundles[0]->getName().$overridePath
-                    ));
-                }
-
-                if ($first) {
-                    return $file;
-                }
-                $files[] = $file;
+        if ($isResource && file_exists($file = $dir.'/'.$bundle->getName().$overridePath)) {
+            if (null !== $resourceBundle) {
+                throw new \RuntimeException(sprintf('"%s" resource is hidden by a resource from the "%s" derived bundle. Create a "%s" file to override the bundle resource.', $file, $resourceBundle, $dir.'/'.$bundle->getName().$overridePath));
             }
 
-            if (file_exists($file = $bundle->getPath().'/'.$path)) {
-                if ($first && !$isResource) {
-                    return $file;
-                }
-                $files[] = $file;
-                $resourceBundle = $bundle->getName();
+            $files[] = $file;
+        }
+
+        if (file_exists($file = $bundle->getPath().'/'.$path)) {
+            if ($first && !$isResource) {
+                return $file;
             }
+            $files[] = $file;
+            $resourceBundle = $bundle->getName();
         }
 
-        if (count($files) > 0) {
+        if (\count($files) > 0) {
             return $first && $isResource ? $files[0] : $files;
         }
 
@@ -345,7 +309,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
     {
         if (null === $this->rootDir) {
             $r = new \ReflectionObject($this);
-            $this->rootDir = dirname($r->getFileName());
+            $this->rootDir = \dirname($r->getFileName());
         }
 
         return $this->rootDir;
@@ -360,12 +324,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
     {
         if (null === $this->projectDir) {
             $r = new \ReflectionObject($this);
-            $dir = $rootDir = dirname($r->getFileName());
+            $dir = $rootDir = \dirname($r->getFileName());
             while (!file_exists($dir.'/composer.json')) {
-                if ($dir === dirname($dir)) {
+                if ($dir === \dirname($dir)) {
                     return $this->projectDir = $rootDir;
                 }
-                $dir = dirname($dir);
+                $dir = \dirname($dir);
             }
             $this->projectDir = $dir;
         }
@@ -381,43 +345,6 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
         return $this->container;
     }
 
-    /**
-     * Loads the PHP class cache.
-     *
-     * This methods only registers the fact that you want to load the cache classes.
-     * The cache will actually only be loaded when the Kernel is booted.
-     *
-     * That optimization is mainly useful when using the HttpCache class in which
-     * case the class cache is not loaded if the Response is in the cache.
-     *
-     * @param string $name      The cache name prefix
-     * @param string $extension File extension of the resulting file
-     *
-     * @deprecated since version 3.3, to be removed in 4.0. The class cache is not needed anymore when using PHP 7.0.
-     */
-    public function loadClassCache($name = 'classes', $extension = '.php')
-    {
-        if (\PHP_VERSION_ID >= 70000) {
-            @trigger_error(__METHOD__.'() is deprecated since Symfony 3.3, to be removed in 4.0.', E_USER_DEPRECATED);
-        }
-
-        $this->loadClassCache = array($name, $extension);
-    }
-
-    /**
-     * @internal
-     *
-     * @deprecated since version 3.3, to be removed in 4.0.
-     */
-    public function setClassCache(array $classes)
-    {
-        if (\PHP_VERSION_ID >= 70000) {
-            @trigger_error(__METHOD__.'() is deprecated since Symfony 3.3, to be removed in 4.0.', E_USER_DEPRECATED);
-        }
-
-        file_put_contents(($this->warmupDir ?: $this->getCacheDir()).'/classes.map', sprintf('<?php return %s;', var_export($classes, true)));
-    }
-
     /**
      * @internal
      */
@@ -459,83 +386,28 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
     }
 
     /**
-     * @deprecated since version 3.3, to be removed in 4.0.
+     * Gets the patterns defining the classes to parse and cache for annotations.
      */
-    protected function doLoadClassCache($name, $extension)
+    public function getAnnotatedClassesToCompile(): array
     {
-        if (\PHP_VERSION_ID >= 70000) {
-            @trigger_error(__METHOD__.'() is deprecated since Symfony 3.3, to be removed in 4.0.', E_USER_DEPRECATED);
-        }
-        $cacheDir = $this->warmupDir ?: $this->getCacheDir();
-
-        if (!$this->booted && is_file($cacheDir.'/classes.map')) {
-            ClassCollectionLoader::load(include($cacheDir.'/classes.map'), $cacheDir, $name, $this->debug, false, $extension);
-        }
+        return array();
     }
 
     /**
-     * Initializes the data structures related to the bundle management.
-     *
-     *  - the bundles property maps a bundle name to the bundle instance,
-     *  - the bundleMap property maps a bundle name to the bundle inheritance hierarchy (most derived bundle first).
+     * Initializes bundles.
      *
      * @throws \LogicException if two bundles share a common name
-     * @throws \LogicException if a bundle tries to extend a non-registered bundle
-     * @throws \LogicException if a bundle tries to extend itself
-     * @throws \LogicException if two bundles extend the same ancestor
      */
     protected function initializeBundles()
     {
         // init bundles
         $this->bundles = array();
-        $topMostBundles = array();
-        $directChildren = array();
-
         foreach ($this->registerBundles() as $bundle) {
             $name = $bundle->getName();
             if (isset($this->bundles[$name])) {
                 throw new \LogicException(sprintf('Trying to register two bundles with the same name "%s"', $name));
             }
             $this->bundles[$name] = $bundle;
-
-            if ($parentName = $bundle->getParent()) {
-                @trigger_error('Bundle inheritance is deprecated as of 3.4 and will be removed in 4.0.', E_USER_DEPRECATED);
-
-                if (isset($directChildren[$parentName])) {
-                    throw new \LogicException(sprintf('Bundle "%s" is directly extended by two bundles "%s" and "%s".', $parentName, $name, $directChildren[$parentName]));
-                }
-                if ($parentName == $name) {
-                    throw new \LogicException(sprintf('Bundle "%s" can not extend itself.', $name));
-                }
-                $directChildren[$parentName] = $name;
-            } else {
-                $topMostBundles[$name] = $bundle;
-            }
-        }
-
-        // look for orphans
-        if (!empty($directChildren) && count($diff = array_diff_key($directChildren, $this->bundles))) {
-            $diff = array_keys($diff);
-
-            throw new \LogicException(sprintf('Bundle "%s" extends bundle "%s", which is not registered.', $directChildren[$diff[0]], $diff[0]));
-        }
-
-        // inheritance
-        $this->bundleMap = array();
-        foreach ($topMostBundles as $name => $bundle) {
-            $bundleMap = array($bundle);
-            $hierarchy = array($name);
-
-            while (isset($directChildren[$name])) {
-                $name = $directChildren[$name];
-                array_unshift($bundleMap, $this->bundles[$name]);
-                $hierarchy[] = $name;
-            }
-
-            foreach ($hierarchy as $hierarchyBundle) {
-                $this->bundleMap[$hierarchyBundle] = $bundleMap;
-                array_pop($bundleMap);
-            }
         }
     }
 
@@ -605,7 +477,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
 
         if ($this->debug) {
             $collectedLogs = array();
-            $previousHandler = defined('PHPUNIT_COMPOSER_INSTALL');
+            $previousHandler = \defined('PHPUNIT_COMPOSER_INSTALL');
             $previousHandler = $previousHandler ?: set_error_handler(function ($type, $message, $file, $line) use (&$collectedLogs, &$previousHandler) {
                 if (E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) {
                     return $previousHandler ? $previousHandler($type, $message, $file, $line) : false;
@@ -621,7 +493,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
                 // Clean the trace by removing first frames added by the error handler itself.
                 for ($i = 0; isset($backtrace[$i]); ++$i) {
                     if (isset($backtrace[$i]['file'], $backtrace[$i]['line']) && $backtrace[$i]['line'] === $line && $backtrace[$i]['file'] === $file) {
-                        $backtrace = array_slice($backtrace, 1 + $i);
+                        $backtrace = \array_slice($backtrace, 1 + $i);
                         break;
                     }
                 }
@@ -660,20 +532,20 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
                 error_reporting($errorLevel);
             }
         }
-        $oldContainer = is_object($oldContainer) ? new \ReflectionClass($oldContainer) : false;
+        $oldContainer = \is_object($oldContainer) ? new \ReflectionClass($oldContainer) : false;
 
         $this->dumpContainer($cache, $container, $class, $this->getContainerBaseClass());
         $this->container = require $cache->getPath();
         $this->container->set('kernel', $this);
 
-        if ($oldContainer && get_class($this->container) !== $oldContainer->name) {
+        if ($oldContainer && \get_class($this->container) !== $oldContainer->name) {
             // Because concurrent requests might still be using them,
             // old container files are not removed immediately,
             // but on a next dump of the container.
             static $legacyContainers = array();
-            $oldContainerDir = dirname($oldContainer->getFileName());
+            $oldContainerDir = \dirname($oldContainer->getFileName());
             $legacyContainers[$oldContainerDir.'.legacy'] = true;
-            foreach (glob(dirname($oldContainerDir).DIRECTORY_SEPARATOR.'*.legacy') as $legacyContainer) {
+            foreach (glob(\dirname($oldContainerDir).\DIRECTORY_SEPARATOR.'*.legacy') as $legacyContainer) {
                 if (!isset($legacyContainers[$legacyContainer]) && @unlink($legacyContainer)) {
                     (new Filesystem())->remove(substr($legacyContainer, 0, -7));
                 }
@@ -698,58 +570,28 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
         $bundlesMetadata = array();
 
         foreach ($this->bundles as $name => $bundle) {
-            $bundles[$name] = get_class($bundle);
+            $bundles[$name] = \get_class($bundle);
             $bundlesMetadata[$name] = array(
-                'parent' => $bundle->getParent(),
                 'path' => $bundle->getPath(),
                 'namespace' => $bundle->getNamespace(),
             );
         }
 
-        return array_merge(
-            array(
-                'kernel.root_dir' => realpath($this->rootDir) ?: $this->rootDir,
-                'kernel.project_dir' => realpath($this->getProjectDir()) ?: $this->getProjectDir(),
-                'kernel.environment' => $this->environment,
-                'kernel.debug' => $this->debug,
-                'kernel.name' => $this->name,
-                'kernel.cache_dir' => realpath($cacheDir = $this->warmupDir ?: $this->getCacheDir()) ?: $cacheDir,
-                'kernel.logs_dir' => realpath($this->getLogDir()) ?: $this->getLogDir(),
-                'kernel.bundles' => $bundles,
-                'kernel.bundles_metadata' => $bundlesMetadata,
-                'kernel.charset' => $this->getCharset(),
-                'kernel.container_class' => $this->getContainerClass(),
-            ),
-            $this->getEnvParameters(false)
+        return array(
+            'kernel.root_dir' => realpath($this->rootDir) ?: $this->rootDir,
+            'kernel.project_dir' => realpath($this->getProjectDir()) ?: $this->getProjectDir(),
+            'kernel.environment' => $this->environment,
+            'kernel.debug' => $this->debug,
+            'kernel.name' => $this->name,
+            'kernel.cache_dir' => realpath($cacheDir = $this->warmupDir ?: $this->getCacheDir()) ?: $cacheDir,
+            'kernel.logs_dir' => realpath($this->getLogDir()) ?: $this->getLogDir(),
+            'kernel.bundles' => $bundles,
+            'kernel.bundles_metadata' => $bundlesMetadata,
+            'kernel.charset' => $this->getCharset(),
+            'kernel.container_class' => $this->getContainerClass(),
         );
     }
 
-    /**
-     * Gets the environment parameters.
-     *
-     * Only the parameters starting with "SYMFONY__" are considered.
-     *
-     * @return array An array of parameters
-     *
-     * @deprecated since version 3.3, to be removed in 4.0
-     */
-    protected function getEnvParameters()
-    {
-        if (0 === func_num_args() || func_get_arg(0)) {
-            @trigger_error(sprintf('The %s() method is deprecated as of 3.3 and will be removed in 4.0. Use the %%env()%% syntax to get the value of any environment variable from configuration files instead.', __METHOD__), E_USER_DEPRECATED);
-        }
-
-        $parameters = array();
-        foreach ($_SERVER as $key => $value) {
-            if (0 === strpos($key, 'SYMFONY__')) {
-                @trigger_error(sprintf('The support of special environment variables that start with SYMFONY__ (such as "%s") is deprecated as of 3.3 and will be removed in 4.0. Use the %%env()%% syntax instead to get the value of environment variables in configuration files.', $key), E_USER_DEPRECATED);
-                $parameters[strtolower(str_replace('__', '.', substr($key, 9)))] = $value;
-            }
-        }
-
-        return $parameters;
-    }
-
     /**
      * Builds the service container.
      *
@@ -778,7 +620,6 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
         }
 
         $container->addCompilerPass(new AddAnnotatedClassesToCachePass($this));
-        $container->addResource(new EnvParametersResource('SYMFONY__'));
 
         return $container;
     }
@@ -856,19 +697,18 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
             'file' => $cache->getPath(),
             'as_files' => true,
             'debug' => $this->debug,
-            'inline_class_loader_parameter' => \PHP_VERSION_ID >= 70000 && !$this->loadClassCache && !class_exists(ClassCollectionLoader::class, false) ? 'container.dumper.inline_class_loader' : null,
             'build_time' => $container->hasParameter('kernel.container_build_time') ? $container->getParameter('kernel.container_build_time') : time(),
         ));
 
         $rootCode = array_pop($content);
-        $dir = dirname($cache->getPath()).'/';
+        $dir = \dirname($cache->getPath()).'/';
         $fs = new Filesystem();
 
         foreach ($content as $file => $code) {
             $fs->dumpFile($dir.$file, $code);
             @chmod($dir.$file, 0666 & ~umask());
         }
-        @unlink(dirname($dir.$file).'.legacy');
+        @unlink(\dirname($dir.$file).'.legacy');
 
         $cache->write($rootCode, $container->getResources());
     }
@@ -906,7 +746,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
      */
     public static function stripComments($source)
     {
-        if (!function_exists('token_get_all')) {
+        if (!\function_exists('token_get_all')) {
             return $source;
         }
 
@@ -934,7 +774,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
 
                 // replace multiple new lines with a single newline
                 $rawChunk .= preg_replace(array('/\n{2,}/S'), "\n", $token[1]);
-            } elseif (in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) {
+            } elseif (\in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) {
                 $ignoreSpace = true;
             } else {
                 $rawChunk .= $token[1];
@@ -948,11 +788,9 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
 
         $output .= $rawChunk;
 
-        if (\PHP_VERSION_ID >= 70000) {
-            // PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
-            unset($tokens, $rawChunk);
-            gc_mem_caches();
-        }
+        // PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
+        unset($tokens, $rawChunk);
+        gc_mem_caches();
 
         return $output;
     }
@@ -964,11 +802,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
 
     public function unserialize($data)
     {
-        if (\PHP_VERSION_ID >= 70000) {
-            list($environment, $debug) = unserialize($data, array('allowed_classes' => false));
-        } else {
-            list($environment, $debug) = unserialize($data);
-        }
+        list($environment, $debug) = unserialize($data, array('allowed_classes' => false));
 
         $this->__construct($environment, $debug);
     }
diff --git a/vendor/symfony/http-kernel/KernelInterface.php b/vendor/symfony/http-kernel/KernelInterface.php
index 9ec4e7a9..485f3bf8 100644
--- a/vendor/symfony/http-kernel/KernelInterface.php
+++ b/vendor/symfony/http-kernel/KernelInterface.php
@@ -11,14 +11,14 @@
 
 namespace Symfony\Component\HttpKernel;
 
+use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
-use Symfony\Component\Config\Loader\LoaderInterface;
 
 /**
  * The Kernel is the heart of the Symfony system.
  *
- * It manages an environment made of bundles.
+ * It manages an environment made of application kernel and bundles.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
@@ -56,22 +56,18 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
     public function getBundles();
 
     /**
-     * Returns a bundle and optionally its descendants by its name.
-     *
-     * The second argument is deprecated as of 3.4 and will be removed in 4.0. This method
-     * will always return an instance of BundleInterface in 4.0.
+     * Returns a bundle.
      *
-     * @param string $name  Bundle name
-     * @param bool   $first Whether to return the first bundle only or together with its descendants
+     * @param string $name Bundle name
      *
-     * @return BundleInterface|BundleInterface[] A BundleInterface instance or an array of BundleInterface instances if $first is false
+     * @return BundleInterface A BundleInterface instance
      *
      * @throws \InvalidArgumentException when the bundle is not enabled
      */
-    public function getBundle($name, $first = true);
+    public function getBundle($name);
 
     /**
-     * Returns the file path for a given resource.
+     * Returns the file path for a given bundle resource.
      *
      * A Resource can be a file or a directory.
      *
@@ -131,7 +127,7 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
     /**
      * Gets the current container.
      *
-     * @return ContainerInterface A ContainerInterface instance
+     * @return ContainerInterface|null A ContainerInterface instance or null when the Kernel is shutdown
      */
     public function getContainer();
 
diff --git a/vendor/symfony/http-kernel/Log/DebugLoggerInterface.php b/vendor/symfony/http-kernel/Log/DebugLoggerInterface.php
index f0606d3b..2a27992e 100644
--- a/vendor/symfony/http-kernel/Log/DebugLoggerInterface.php
+++ b/vendor/symfony/http-kernel/Log/DebugLoggerInterface.php
@@ -11,12 +11,12 @@
 
 namespace Symfony\Component\HttpKernel\Log;
 
+use Symfony\Component\HttpFoundation\Request;
+
 /**
  * DebugLoggerInterface.
  *
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @method clear() Removes all log records.
  */
 interface DebugLoggerInterface
 {
@@ -27,14 +27,23 @@ interface DebugLoggerInterface
      * timestamp, message, priority, and priorityName.
      * It can also have an optional context key containing an array.
      *
+     * @param Request|null $request The request to get logs for
+     *
      * @return array An array of logs
      */
-    public function getLogs();
+    public function getLogs(/* Request $request = null */);
 
     /**
      * Returns the number of errors.
      *
+     * @param Request|null $request The request to count logs for
+     *
      * @return int The number of errors
      */
-    public function countErrors();
+    public function countErrors(/* Request $request = null */);
+
+    /**
+     * Removes all log records.
+     */
+    public function clear();
 }
diff --git a/vendor/symfony/http-kernel/Log/Logger.php b/vendor/symfony/http-kernel/Log/Logger.php
index 617efcf1..8b671d84 100644
--- a/vendor/symfony/http-kernel/Log/Logger.php
+++ b/vendor/symfony/http-kernel/Log/Logger.php
@@ -37,7 +37,7 @@ class Logger extends AbstractLogger
     private $formatter;
     private $handle;
 
-    public function __construct($minLevel = null, $output = 'php://stderr', callable $formatter = null)
+    public function __construct(string $minLevel = null, $output = 'php://stderr', callable $formatter = null)
     {
         if (null === $minLevel) {
             $minLevel = LogLevel::WARNING;
@@ -58,7 +58,7 @@ class Logger extends AbstractLogger
 
         $this->minLevelIndex = self::$levels[$minLevel];
         $this->formatter = $formatter ?: array($this, 'format');
-        if (false === $this->handle = is_resource($output) ? $output : @fopen($output, 'a')) {
+        if (false === $this->handle = \is_resource($output) ? $output : @fopen($output, 'a')) {
             throw new InvalidArgumentException(sprintf('Unable to open "%s".', $output));
         }
     }
@@ -80,14 +80,7 @@ class Logger extends AbstractLogger
         fwrite($this->handle, $formatter($level, $message, $context));
     }
 
-    /**
-     * @param string $level
-     * @param string $message
-     * @param array  $context
-     *
-     * @return string
-     */
-    private function format($level, $message, array $context)
+    private function format(string $level, string $message, array $context): string
     {
         if (false !== strpos($message, '{')) {
             $replacements = array();
diff --git a/vendor/symfony/http-kernel/Profiler/FileProfilerStorage.php b/vendor/symfony/http-kernel/Profiler/FileProfilerStorage.php
index e24b2e01..955afed5 100644
--- a/vendor/symfony/http-kernel/Profiler/FileProfilerStorage.php
+++ b/vendor/symfony/http-kernel/Profiler/FileProfilerStorage.php
@@ -30,11 +30,9 @@ class FileProfilerStorage implements ProfilerStorageInterface
      *
      * Example : "file:/path/to/the/storage/folder"
      *
-     * @param string $dsn The DSN
-     *
      * @throws \RuntimeException
      */
-    public function __construct($dsn)
+    public function __construct(string $dsn)
     {
         if (0 !== strpos($dsn, 'file:')) {
             throw new \RuntimeException(sprintf('Please check your configuration. You are trying to use FileStorage with an invalid dsn "%s". The expected format is "file:/path/to/the/storage/folder".', $dsn));
@@ -61,7 +59,7 @@ class FileProfilerStorage implements ProfilerStorageInterface
         fseek($file, 0, SEEK_END);
 
         $result = array();
-        while (count($result) < $limit && $line = $this->readLineFromFile($file)) {
+        while (\count($result) < $limit && $line = $this->readLineFromFile($file)) {
             $values = str_getcsv($line);
             list($csvToken, $csvIp, $csvMethod, $csvUrl, $csvTime, $csvParent, $csvStatusCode) = $values;
             $csvTime = (int) $csvTime;
@@ -136,7 +134,7 @@ class FileProfilerStorage implements ProfilerStorageInterface
         $profileIndexed = is_file($file);
         if (!$profileIndexed) {
             // Create directory
-            $dir = dirname($file);
+            $dir = \dirname($file);
             if (!is_dir($dir) && false === @mkdir($dir, 0777, true) && !is_dir($dir)) {
                 throw new \RuntimeException(sprintf('Unable to create the storage directory (%s).', $dir));
             }
@@ -146,7 +144,7 @@ class FileProfilerStorage implements ProfilerStorageInterface
         // when there are errors in sub-requests, the parent and/or children tokens
         // may equal the profile token, resulting in infinite loops
         $parentToken = $profile->getParentToken() !== $profileToken ? $profile->getParentToken() : null;
-        $childrenToken = array_filter(array_map(function ($p) use ($profileToken) {
+        $childrenToken = array_filter(array_map(function (Profile $p) use ($profileToken) {
             return $profileToken !== $p->getToken() ? $p->getToken() : null;
         }, $profile->getChildren()));
 
diff --git a/vendor/symfony/http-kernel/Profiler/Profile.php b/vendor/symfony/http-kernel/Profiler/Profile.php
index c21c9d38..4716a229 100644
--- a/vendor/symfony/http-kernel/Profiler/Profile.php
+++ b/vendor/symfony/http-kernel/Profiler/Profile.php
@@ -43,10 +43,7 @@ class Profile
      */
     private $children = array();
 
-    /**
-     * @param string $token The token
-     */
-    public function __construct($token)
+    public function __construct(string $token)
     {
         $this->token = $token;
     }
@@ -74,7 +71,7 @@ class Profile
     /**
      * Sets the parent token.
      */
-    public function setParent(Profile $parent)
+    public function setParent(self $parent)
     {
         $this->parent = $parent;
     }
@@ -92,7 +89,7 @@ class Profile
     /**
      * Returns the parent token.
      *
-     * @return null|string The parent token
+     * @return string|null The parent token
      */
     public function getParentToken()
     {
@@ -213,12 +210,23 @@ class Profile
     /**
      * Adds the child token.
      */
-    public function addChild(Profile $child)
+    public function addChild(self $child)
     {
         $this->children[] = $child;
         $child->setParent($this);
     }
 
+    public function getChildByToken(string $token): ?self
+    {
+        foreach ($this->children as $child) {
+            if ($token === $child->getToken()) {
+                return $child;
+            }
+        }
+
+        return null;
+    }
+
     /**
      * Gets a Collector by name.
      *
diff --git a/vendor/symfony/http-kernel/Profiler/Profiler.php b/vendor/symfony/http-kernel/Profiler/Profiler.php
index 6245a21b..b4b0681b 100644
--- a/vendor/symfony/http-kernel/Profiler/Profiler.php
+++ b/vendor/symfony/http-kernel/Profiler/Profiler.php
@@ -11,12 +11,12 @@
 
 namespace Symfony\Component\HttpKernel\Profiler;
 
+use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface;
 use Symfony\Component\HttpKernel\DataCollector\LateDataCollectorInterface;
-use Psr\Log\LoggerInterface;
 
 /**
  * Profiler.
@@ -36,14 +36,11 @@ class Profiler
     private $initiallyEnabled = true;
     private $enabled = true;
 
-    /**
-     * @param bool $enable The initial enabled state
-     */
-    public function __construct(ProfilerStorageInterface $storage, LoggerInterface $logger = null, $enable = true)
+    public function __construct(ProfilerStorageInterface $storage, LoggerInterface $logger = null, bool $enable = true)
     {
         $this->storage = $storage;
         $this->logger = $logger;
-        $this->initiallyEnabled = $this->enabled = (bool) $enable;
+        $this->initiallyEnabled = $this->enabled = $enable;
     }
 
     /**
@@ -103,7 +100,7 @@ class Profiler
         }
 
         if (!($ret = $this->storage->write($profile)) && null !== $this->logger) {
-            $this->logger->warning('Unable to store the profiler information.', array('configured_storage' => get_class($this->storage)));
+            $this->logger->warning('Unable to store the profiler information.', array('configured_storage' => \get_class($this->storage)));
         }
 
         return $ret;
@@ -159,6 +156,10 @@ class Profiler
             $profile->setIp('Unknown');
         }
 
+        if ($prevToken = $response->headers->get('X-Debug-Token')) {
+            $response->headers->set('X-Previous-Debug-Token', $prevToken);
+        }
+
         $response->headers->set('X-Debug-Token', $profile->getToken());
 
         foreach ($this->collectors as $collector) {
@@ -174,10 +175,6 @@ class Profiler
     public function reset()
     {
         foreach ($this->collectors as $collector) {
-            if (!method_exists($collector, 'reset')) {
-                continue;
-            }
-
             $collector->reset();
         }
         $this->enabled = $this->initiallyEnabled;
@@ -211,10 +208,6 @@ class Profiler
      */
     public function add(DataCollectorInterface $collector)
     {
-        if (!method_exists($collector, 'reset')) {
-            @trigger_error(sprintf('Implementing "%s" without the "reset()" method is deprecated since Symfony 3.4 and will be unsupported in 4.0 for class "%s".', DataCollectorInterface::class, \get_class($collector)), E_USER_DEPRECATED);
-        }
-
         $this->collectors[$collector->getName()] = $collector;
     }
 
diff --git a/vendor/symfony/http-kernel/Tests/Bundle/BundleTest.php b/vendor/symfony/http-kernel/Tests/Bundle/BundleTest.php
index 8e52b097..394e7ed7 100644
--- a/vendor/symfony/http-kernel/Tests/Bundle/BundleTest.php
+++ b/vendor/symfony/http-kernel/Tests/Bundle/BundleTest.php
@@ -12,12 +12,9 @@
 namespace Symfony\Component\HttpKernel\Tests\Bundle;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionNotValidBundle\ExtensionNotValidBundle;
 use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\ExtensionPresentBundle;
-use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionAbsentBundle\ExtensionAbsentBundle;
-use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\FooCommand;
 
 class BundleTest extends TestCase
 {
@@ -31,24 +28,6 @@ class BundleTest extends TestCase
         );
     }
 
-    /**
-     * @group legacy
-     * @expectedDeprecation Auto-registration of the command "Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\FooCommand" is deprecated since Symfony 3.4 and won't be supported in 4.0. Use PSR-4 based service discovery instead.
-     */
-    public function testRegisterCommands()
-    {
-        $cmd = new FooCommand();
-        $app = $this->getMockBuilder('Symfony\Component\Console\Application')->getMock();
-        $app->expects($this->once())->method('add')->with($this->equalTo($cmd));
-
-        $bundle = new ExtensionPresentBundle();
-        $bundle->registerCommands($app);
-
-        $bundle2 = new ExtensionAbsentBundle();
-
-        $this->assertNull($bundle2->registerCommands($app));
-    }
-
     /**
      * @expectedException \LogicException
      * @expectedExceptionMessage must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface
@@ -59,20 +38,6 @@ class BundleTest extends TestCase
         $bundle->getContainerExtension();
     }
 
-    public function testHttpKernelRegisterCommandsIgnoresCommandsThatAreRegisteredAsServices()
-    {
-        $container = new ContainerBuilder();
-        $container->register('console.command.symfony_component_httpkernel_tests_fixtures_extensionpresentbundle_command_foocommand', 'Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\FooCommand');
-
-        $application = $this->getMockBuilder('Symfony\Component\Console\Application')->getMock();
-        // add() is never called when the found command classes are already registered as services
-        $application->expects($this->never())->method('add');
-
-        $bundle = new ExtensionPresentBundle();
-        $bundle->setContainer($container);
-        $bundle->registerCommands($application);
-    }
-
     public function testBundleNameIsGuessedFromClass()
     {
         $bundle = new GuessedNameBundle();
diff --git a/vendor/symfony/http-kernel/Tests/CacheClearer/ChainCacheClearerTest.php b/vendor/symfony/http-kernel/Tests/CacheClearer/ChainCacheClearerTest.php
index ec2ecff9..06400b44 100644
--- a/vendor/symfony/http-kernel/Tests/CacheClearer/ChainCacheClearerTest.php
+++ b/vendor/symfony/http-kernel/Tests/CacheClearer/ChainCacheClearerTest.php
@@ -39,21 +39,6 @@ class ChainCacheClearerTest extends TestCase
         $chainClearer->clear(self::$cacheDir);
     }
 
-    /**
-     * @group legacy
-     */
-    public function testInjectClearerUsingAdd()
-    {
-        $clearer = $this->getMockClearer();
-        $clearer
-            ->expects($this->once())
-            ->method('clear');
-
-        $chainClearer = new ChainCacheClearer();
-        $chainClearer->add($clearer);
-        $chainClearer->clear(self::$cacheDir);
-    }
-
     protected function getMockClearer()
     {
         return $this->getMockBuilder('Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface')->getMock();
diff --git a/vendor/symfony/http-kernel/Tests/CacheClearer/Psr6CacheClearerTest.php b/vendor/symfony/http-kernel/Tests/CacheClearer/Psr6CacheClearerTest.php
index 3e20efbf..e1d2fe82 100644
--- a/vendor/symfony/http-kernel/Tests/CacheClearer/Psr6CacheClearerTest.php
+++ b/vendor/symfony/http-kernel/Tests/CacheClearer/Psr6CacheClearerTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\HttpKernel\Tests\CacheClearer;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer;
 use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer;
 
 class Psr6CacheClearerTest extends TestCase
 {
@@ -45,25 +45,4 @@ class Psr6CacheClearerTest extends TestCase
     {
         (new Psr6CacheClearer())->clearPool('unknown');
     }
-
-    /**
-     * @group legacy
-     * @expectedDeprecation The Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer::addPool() method is deprecated since Symfony 3.3 and will be removed in 4.0. Pass an array of pools indexed by name to the constructor instead.
-     */
-    public function testClearPoolsInjectedByAdder()
-    {
-        $pool1 = $this->getMockBuilder(CacheItemPoolInterface::class)->getMock();
-        $pool1
-            ->expects($this->once())
-            ->method('clear');
-
-        $pool2 = $this->getMockBuilder(CacheItemPoolInterface::class)->getMock();
-        $pool2
-            ->expects($this->once())
-            ->method('clear');
-
-        $clearer = new Psr6CacheClearer(array('pool1' => $pool1));
-        $clearer->addPool($pool2);
-        $clearer->clear('');
-    }
 }
diff --git a/vendor/symfony/http-kernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php b/vendor/symfony/http-kernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php
index ba159124..cfa998c1 100644
--- a/vendor/symfony/http-kernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php
+++ b/vendor/symfony/http-kernel/Tests/CacheWarmer/CacheWarmerAggregateTest.php
@@ -38,34 +38,6 @@ class CacheWarmerAggregateTest extends TestCase
         $aggregate->warmUp(self::$cacheDir);
     }
 
-    /**
-     * @group legacy
-     */
-    public function testInjectWarmersUsingAdd()
-    {
-        $warmer = $this->getCacheWarmerMock();
-        $warmer
-            ->expects($this->once())
-            ->method('warmUp');
-        $aggregate = new CacheWarmerAggregate();
-        $aggregate->add($warmer);
-        $aggregate->warmUp(self::$cacheDir);
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testInjectWarmersUsingSetWarmers()
-    {
-        $warmer = $this->getCacheWarmerMock();
-        $warmer
-            ->expects($this->once())
-            ->method('warmUp');
-        $aggregate = new CacheWarmerAggregate();
-        $aggregate->setWarmers(array($warmer));
-        $aggregate->warmUp(self::$cacheDir);
-    }
-
     public function testWarmupDoesCallWarmupOnOptionalWarmersWhenEnableOptionalWarmersIsEnabled()
     {
         $warmer = $this->getCacheWarmerMock();
diff --git a/vendor/symfony/http-kernel/Tests/CacheWarmer/CacheWarmerTest.php b/vendor/symfony/http-kernel/Tests/CacheWarmer/CacheWarmerTest.php
index 05666cb0..4d34e7bf 100644
--- a/vendor/symfony/http-kernel/Tests/CacheWarmer/CacheWarmerTest.php
+++ b/vendor/symfony/http-kernel/Tests/CacheWarmer/CacheWarmerTest.php
@@ -31,7 +31,7 @@ class CacheWarmerTest extends TestCase
     public function testWriteCacheFileCreatesTheFile()
     {
         $warmer = new TestCacheWarmer(self::$cacheFile);
-        $warmer->warmUp(dirname(self::$cacheFile));
+        $warmer->warmUp(\dirname(self::$cacheFile));
 
         $this->assertFileExists(self::$cacheFile);
     }
@@ -43,7 +43,7 @@ class CacheWarmerTest extends TestCase
     {
         $nonWritableFile = '/this/file/is/very/probably/not/writable';
         $warmer = new TestCacheWarmer($nonWritableFile);
-        $warmer->warmUp(dirname($nonWritableFile));
+        $warmer->warmUp(\dirname($nonWritableFile));
     }
 }
 
diff --git a/vendor/symfony/http-kernel/Tests/ClientTest.php b/vendor/symfony/http-kernel/Tests/ClientTest.php
index b774d8ec..17cbe368 100644
--- a/vendor/symfony/http-kernel/Tests/ClientTest.php
+++ b/vendor/symfony/http-kernel/Tests/ClientTest.php
@@ -12,11 +12,11 @@
 namespace Symfony\Component\HttpKernel\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpKernel\Client;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\StreamedResponse;
 use Symfony\Component\HttpFoundation\Cookie;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpKernel\Client;
 use Symfony\Component\HttpKernel\Tests\Fixtures\TestClient;
 
 /**
@@ -100,8 +100,8 @@ class ClientTest extends TestCase
         $client = new Client($kernel);
 
         $files = array(
-            array('tmp_name' => $source, 'name' => 'original', 'type' => 'mime/original', 'size' => 1, 'error' => UPLOAD_ERR_OK),
-            new UploadedFile($source, 'original', 'mime/original', 1, UPLOAD_ERR_OK, true),
+            array('tmp_name' => $source, 'name' => 'original', 'type' => 'mime/original', 'size' => null, 'error' => UPLOAD_ERR_OK),
+            new UploadedFile($source, 'original', 'mime/original', UPLOAD_ERR_OK, true),
         );
 
         $file = null;
@@ -116,11 +116,10 @@ class ClientTest extends TestCase
 
             $this->assertEquals('original', $file->getClientOriginalName());
             $this->assertEquals('mime/original', $file->getClientMimeType());
-            $this->assertSame(1, $file->getClientSize());
-            $this->assertTrue($file->isValid());
+            $this->assertEquals(1, $file->getSize());
         }
 
-        $file->move(dirname($target), basename($target));
+        $file->move(\dirname($target), basename($target));
 
         $this->assertFileExists($target);
         unlink($target);
@@ -150,15 +149,19 @@ class ClientTest extends TestCase
 
         $file = $this
             ->getMockBuilder('Symfony\Component\HttpFoundation\File\UploadedFile')
-            ->setConstructorArgs(array($source, 'original', 'mime/original', 123, UPLOAD_ERR_OK, true))
-            ->setMethods(array('getSize'))
+            ->setConstructorArgs(array($source, 'original', 'mime/original', UPLOAD_ERR_OK, true))
+            ->setMethods(array('getSize', 'getClientSize'))
             ->getMock()
         ;
-
-        $file->expects($this->once())
+        /* should be modified when the getClientSize will be removed */
+        $file->expects($this->any())
             ->method('getSize')
             ->will($this->returnValue(INF))
         ;
+        $file->expects($this->any())
+            ->method('getClientSize')
+            ->will($this->returnValue(INF))
+        ;
 
         $client->request('POST', '/', array(), array($file));
 
@@ -172,7 +175,7 @@ class ClientTest extends TestCase
         $this->assertEquals(UPLOAD_ERR_INI_SIZE, $file->getError());
         $this->assertEquals('mime/original', $file->getClientMimeType());
         $this->assertEquals('original', $file->getClientOriginalName());
-        $this->assertEquals(0, $file->getClientSize());
+        $this->assertEquals(0, $file->getSize());
 
         unlink($source);
     }
diff --git a/vendor/symfony/http-kernel/Tests/Config/EnvParametersResourceTest.php b/vendor/symfony/http-kernel/Tests/Config/EnvParametersResourceTest.php
deleted file mode 100644
index 986e05d8..00000000
--- a/vendor/symfony/http-kernel/Tests/Config/EnvParametersResourceTest.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpKernel\Tests\Config;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpKernel\Config\EnvParametersResource;
-
-/**
- * @group legacy
- */
-class EnvParametersResourceTest extends TestCase
-{
-    protected $prefix = '__DUMMY_';
-    protected $initialEnv;
-    protected $resource;
-
-    protected function setUp()
-    {
-        $this->initialEnv = array(
-            $this->prefix.'1' => 'foo',
-            $this->prefix.'2' => 'bar',
-        );
-
-        foreach ($this->initialEnv as $key => $value) {
-            $_SERVER[$key] = $value;
-        }
-
-        $this->resource = new EnvParametersResource($this->prefix);
-    }
-
-    protected function tearDown()
-    {
-        foreach ($_SERVER as $key => $value) {
-            if (0 === strpos($key, $this->prefix)) {
-                unset($_SERVER[$key]);
-            }
-        }
-    }
-
-    public function testGetResource()
-    {
-        $this->assertSame(
-            array('prefix' => $this->prefix, 'variables' => $this->initialEnv),
-            $this->resource->getResource(),
-            '->getResource() returns the resource'
-        );
-    }
-
-    public function testToString()
-    {
-        $this->assertSame(
-            serialize(array('prefix' => $this->prefix, 'variables' => $this->initialEnv)),
-            (string) $this->resource
-        );
-    }
-
-    public function testIsFreshNotChanged()
-    {
-        $this->assertTrue(
-            $this->resource->isFresh(time()),
-            '->isFresh() returns true if the variables have not changed'
-        );
-    }
-
-    public function testIsFreshValueChanged()
-    {
-        reset($this->initialEnv);
-        $_SERVER[key($this->initialEnv)] = 'baz';
-
-        $this->assertFalse(
-            $this->resource->isFresh(time()),
-            '->isFresh() returns false if a variable has been changed'
-        );
-    }
-
-    public function testIsFreshValueRemoved()
-    {
-        reset($this->initialEnv);
-        unset($_SERVER[key($this->initialEnv)]);
-
-        $this->assertFalse(
-            $this->resource->isFresh(time()),
-            '->isFresh() returns false if a variable has been removed'
-        );
-    }
-
-    public function testIsFreshValueAdded()
-    {
-        $_SERVER[$this->prefix.'3'] = 'foo';
-
-        $this->assertFalse(
-            $this->resource->isFresh(time()),
-            '->isFresh() returns false if a variable has been added'
-        );
-    }
-
-    public function testSerializeUnserialize()
-    {
-        $this->assertEquals($this->resource, unserialize(serialize($this->resource)));
-    }
-}
diff --git a/vendor/symfony/http-kernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php b/vendor/symfony/http-kernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php
index 7d34172c..0b38af95 100644
--- a/vendor/symfony/http-kernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php
+++ b/vendor/symfony/http-kernel/Tests/Controller/ArgumentResolver/ServiceValueResolverTest.php
@@ -12,10 +12,12 @@
 namespace Symfony\Component\HttpKernel\Tests\Controller\ArgumentResolver;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\ServiceValueResolver;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
+use Symfony\Component\HttpKernel\DependencyInjection\RegisterControllerArgumentLocatorsPass;
 
 class ServiceValueResolverTest extends TestCase
 {
@@ -66,6 +68,24 @@ class ServiceValueResolverTest extends TestCase
         $this->assertYieldEquals(array(new DummyService()), $resolver->resolve($request, $argument));
     }
 
+    public function testExistingControllerWithMethodNameStartUppercase()
+    {
+        $resolver = new ServiceValueResolver(new ServiceLocator(array(
+            'App\\Controller\\Mine::method' => function () {
+                return new ServiceLocator(array(
+                    'dummy' => function () {
+                        return new DummyService();
+                    },
+                ));
+            },
+        )));
+        $request = $this->requestWithAttributes(array('_controller' => 'App\\Controller\\Mine::Method'));
+        $argument = new ArgumentMetadata('dummy', DummyService::class, false, false, null);
+
+        $this->assertTrue($resolver->supports($request, $argument));
+        $this->assertYieldEquals(array(new DummyService()), $resolver->resolve($request, $argument));
+    }
+
     public function testControllerNameIsAnArray()
     {
         $resolver = new ServiceValueResolver(new ServiceLocator(array(
@@ -85,6 +105,25 @@ class ServiceValueResolverTest extends TestCase
         $this->assertYieldEquals(array(new DummyService()), $resolver->resolve($request, $argument));
     }
 
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
+     * @expectedExceptionMessage Cannot autowire argument $dummy of "Symfony\Component\HttpKernel\Tests\Controller\ArgumentResolver\DummyController::index()": it references class "Symfony\Component\HttpKernel\Tests\Controller\ArgumentResolver\DummyService" but no such service exists.
+     */
+    public function testErrorIsTruncated()
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new RegisterControllerArgumentLocatorsPass());
+
+        $container->register('argument_resolver.service', ServiceValueResolver::class)->addArgument(null)->setPublic(true);
+        $container->register(DummyController::class)->addTag('controller.service_arguments')->setPublic(true);
+
+        $container->compile();
+
+        $request = $this->requestWithAttributes(array('_controller' => array(DummyController::class, 'index')));
+        $argument = new ArgumentMetadata('dummy', DummyService::class, false, false, null);
+        $container->get('argument_resolver.service')->resolve($request, $argument)->current();
+    }
+
     private function requestWithAttributes(array $attributes)
     {
         $request = Request::create('/');
@@ -110,3 +149,10 @@ class ServiceValueResolverTest extends TestCase
 class DummyService
 {
 }
+
+class DummyController
+{
+    public function index(DummyService $dummy)
+    {
+    }
+}
diff --git a/vendor/symfony/http-kernel/Tests/Controller/ArgumentResolver/TraceableValueResolverTest.php b/vendor/symfony/http-kernel/Tests/Controller/ArgumentResolver/TraceableValueResolverTest.php
new file mode 100644
index 00000000..3c2cc3f7
--- /dev/null
+++ b/vendor/symfony/http-kernel/Tests/Controller/ArgumentResolver/TraceableValueResolverTest.php
@@ -0,0 +1,76 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Tests\Controller\ArgumentResolver;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver\TraceableValueResolver;
+use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
+use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
+use Symfony\Component\Stopwatch\Stopwatch;
+
+class TraceableValueResolverTest extends TestCase
+{
+    public function testTimingsInSupports()
+    {
+        $stopwatch = new Stopwatch();
+        $resolver = new TraceableValueResolver(new ResolverStub(), $stopwatch);
+        $argument = new ArgumentMetadata('dummy', 'string', false, false, null);
+        $request = new Request();
+
+        $this->assertTrue($resolver->supports($request, $argument));
+
+        $event = $stopwatch->getEvent(ResolverStub::class.'::supports');
+        $this->assertCount(1, $event->getPeriods());
+    }
+
+    public function testTimingsInResolve()
+    {
+        $stopwatch = new Stopwatch();
+        $resolver = new TraceableValueResolver(new ResolverStub(), $stopwatch);
+        $argument = new ArgumentMetadata('dummy', 'string', false, false, null);
+        $request = new Request();
+
+        $iterable = $resolver->resolve($request, $argument);
+
+        foreach ($iterable as $index => $resolved) {
+            $event = $stopwatch->getEvent(ResolverStub::class.'::resolve');
+            $this->assertTrue($event->isStarted());
+            $this->assertEmpty($event->getPeriods());
+            switch ($index) {
+                case 0:
+                    $this->assertEquals('first', $resolved);
+                    break;
+                case 1:
+                    $this->assertEquals('second', $resolved);
+                    break;
+            }
+        }
+
+        $event = $stopwatch->getEvent(ResolverStub::class.'::resolve');
+        $this->assertCount(1, $event->getPeriods());
+    }
+}
+
+class ResolverStub implements ArgumentValueResolverInterface
+{
+    public function supports(Request $request, ArgumentMetadata $argument)
+    {
+        return true;
+    }
+
+    public function resolve(Request $request, ArgumentMetadata $argument)
+    {
+        yield 'first';
+        yield 'second';
+    }
+}
diff --git a/vendor/symfony/http-kernel/Tests/Controller/ArgumentResolverTest.php b/vendor/symfony/http-kernel/Tests/Controller/ArgumentResolverTest.php
index 08041390..bb4e0661 100644
--- a/vendor/symfony/http-kernel/Tests/Controller/ArgumentResolverTest.php
+++ b/vendor/symfony/http-kernel/Tests/Controller/ArgumentResolverTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpKernel\Tests\Controller;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
@@ -23,7 +24,6 @@ use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\ExtendingRequest;
 use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\ExtendingSession;
 use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\NullableController;
 use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\VariadicController;
-use Symfony\Component\HttpFoundation\Request;
 
 class ArgumentResolverTest extends TestCase
 {
@@ -152,9 +152,6 @@ class ArgumentResolverTest extends TestCase
         $this->assertEquals(array($request), self::$resolver->getArguments($request, $controller), '->getArguments() injects the request when extended');
     }
 
-    /**
-     * @requires PHP 5.6
-     */
     public function testGetVariadicArguments()
     {
         $request = Request::create('/');
@@ -166,7 +163,6 @@ class ArgumentResolverTest extends TestCase
     }
 
     /**
-     * @requires PHP 5.6
      * @expectedException \InvalidArgumentException
      */
     public function testGetVariadicArgumentsWithoutArrayInRequest()
@@ -180,7 +176,6 @@ class ArgumentResolverTest extends TestCase
     }
 
     /**
-     * @requires PHP 5.6
      * @expectedException \InvalidArgumentException
      */
     public function testGetArgumentWithoutArray()
@@ -210,9 +205,6 @@ class ArgumentResolverTest extends TestCase
         self::$resolver->getArguments($request, $controller);
     }
 
-    /**
-     * @requires PHP 7.1
-     */
     public function testGetNullableArguments()
     {
         $request = Request::create('/');
@@ -224,9 +216,6 @@ class ArgumentResolverTest extends TestCase
         $this->assertEquals(array('foo', new \stdClass(), 'value', 'mandatory'), self::$resolver->getArguments($request, $controller));
     }
 
-    /**
-     * @requires PHP 7.1
-     */
     public function testGetNullableArgumentsWithDefaults()
     {
         $request = Request::create('/');
diff --git a/vendor/symfony/http-kernel/Tests/Controller/ContainerControllerResolverTest.php b/vendor/symfony/http-kernel/Tests/Controller/ContainerControllerResolverTest.php
index 0019123b..57414d00 100644
--- a/vendor/symfony/http-kernel/Tests/Controller/ContainerControllerResolverTest.php
+++ b/vendor/symfony/http-kernel/Tests/Controller/ContainerControllerResolverTest.php
@@ -13,15 +13,20 @@ namespace Symfony\Component\HttpKernel\Tests\Controller;
 
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\Debug\ErrorHandler;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Controller\ContainerControllerResolver;
 
 class ContainerControllerResolverTest extends ControllerResolverTest
 {
-    public function testGetControllerService()
+    /**
+     * @group legacy
+     * @expectedDeprecation Referencing controllers with a single colon is deprecated since Symfony 4.1. Use foo::action instead.
+     */
+    public function testGetControllerServiceWithSingleColon()
     {
+        $service = new ControllerTestService('foo');
+
         $container = $this->createMockContainer();
         $container->expects($this->once())
             ->method('has')
@@ -30,163 +35,132 @@ class ContainerControllerResolverTest extends ControllerResolverTest
         $container->expects($this->once())
             ->method('get')
             ->with('foo')
-            ->will($this->returnValue($this))
+            ->will($this->returnValue($service))
         ;
 
         $resolver = $this->createControllerResolver(null, $container);
         $request = Request::create('/');
-        $request->attributes->set('_controller', 'foo:controllerMethod1');
+        $request->attributes->set('_controller', 'foo:action');
 
         $controller = $resolver->getController($request);
 
-        $this->assertInstanceOf(get_class($this), $controller[0]);
-        $this->assertSame('controllerMethod1', $controller[1]);
+        $this->assertSame($service, $controller[0]);
+        $this->assertSame('action', $controller[1]);
     }
 
-    public function testGetControllerInvokableService()
+    public function testGetControllerService()
     {
-        $invokableController = new InvokableController('bar');
+        $service = new ControllerTestService('foo');
 
         $container = $this->createMockContainer();
         $container->expects($this->once())
             ->method('has')
             ->with('foo')
-            ->will($this->returnValue(true))
-        ;
+            ->will($this->returnValue(true));
         $container->expects($this->once())
             ->method('get')
             ->with('foo')
-            ->will($this->returnValue($invokableController))
+            ->will($this->returnValue($service))
         ;
 
         $resolver = $this->createControllerResolver(null, $container);
         $request = Request::create('/');
-        $request->attributes->set('_controller', 'foo');
+        $request->attributes->set('_controller', 'foo::action');
 
         $controller = $resolver->getController($request);
 
-        $this->assertEquals($invokableController, $controller);
+        $this->assertSame($service, $controller[0]);
+        $this->assertSame('action', $controller[1]);
     }
 
-    public function testGetControllerInvokableServiceWithClassNameAsName()
+    public function testGetControllerInvokableService()
     {
-        $invokableController = new InvokableController('bar');
-        $className = __NAMESPACE__.'\InvokableController';
+        $service = new InvokableControllerService('bar');
 
         $container = $this->createMockContainer();
         $container->expects($this->once())
             ->method('has')
-            ->with($className)
+            ->with('foo')
             ->will($this->returnValue(true))
         ;
         $container->expects($this->once())
             ->method('get')
-            ->with($className)
-            ->will($this->returnValue($invokableController))
+            ->with('foo')
+            ->will($this->returnValue($service))
         ;
 
         $resolver = $this->createControllerResolver(null, $container);
         $request = Request::create('/');
-        $request->attributes->set('_controller', $className);
+        $request->attributes->set('_controller', 'foo');
 
         $controller = $resolver->getController($request);
 
-        $this->assertEquals($invokableController, $controller);
+        $this->assertSame($service, $controller);
     }
 
-    public function testNonInstantiableController()
+    public function testGetControllerInvokableServiceWithClassNameAsName()
     {
+        $service = new InvokableControllerService('bar');
+
         $container = $this->createMockContainer();
         $container->expects($this->once())
             ->method('has')
-            ->with(NonInstantiableController::class)
-            ->will($this->returnValue(false))
+            ->with(InvokableControllerService::class)
+            ->will($this->returnValue(true))
+        ;
+        $container->expects($this->once())
+            ->method('get')
+            ->with(InvokableControllerService::class)
+            ->will($this->returnValue($service))
         ;
 
         $resolver = $this->createControllerResolver(null, $container);
         $request = Request::create('/');
-        $request->attributes->set('_controller', array(NonInstantiableController::class, 'action'));
+        $request->attributes->set('_controller', InvokableControllerService::class);
 
         $controller = $resolver->getController($request);
 
-        $this->assertSame(array(NonInstantiableController::class, 'action'), $controller);
+        $this->assertSame($service, $controller);
     }
 
     /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Controller "Symfony\Component\HttpKernel\Tests\Controller\ImpossibleConstructController" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?
+     * Tests where the fallback instantiation fails due to required constructor arguments.
+     *
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Controller "Symfony\Component\HttpKernel\Tests\Controller\ControllerTestService" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?
      */
-    public function testNonConstructController()
+    public function testExceptionWhenUsingRemovedControllerServiceWithClassNameAsName()
     {
         $container = $this->getMockBuilder(Container::class)->getMock();
-        $container->expects($this->at(0))
-            ->method('has')
-            ->with(ImpossibleConstructController::class)
-            ->will($this->returnValue(true))
-        ;
-
-        $container->expects($this->at(1))
+        $container->expects($this->once())
             ->method('has')
-            ->with(ImpossibleConstructController::class)
+            ->with(ControllerTestService::class)
             ->will($this->returnValue(false))
         ;
 
         $container->expects($this->atLeastOnce())
             ->method('getRemovedIds')
             ->with()
-            ->will($this->returnValue(array(ImpossibleConstructController::class => true)))
-        ;
-
-        $resolver = $this->createControllerResolver(null, $container);
-        $request = Request::create('/');
-        $request->attributes->set('_controller', array(ImpossibleConstructController::class, 'action'));
-
-        if (\PHP_VERSION_ID < 70100) {
-            ErrorHandler::register();
-            try {
-                $resolver->getController($request);
-            } finally {
-                restore_error_handler();
-                restore_exception_handler();
-            }
-        } else {
-            $resolver->getController($request);
-        }
-    }
-
-    public function testNonInstantiableControllerWithCorrespondingService()
-    {
-        $service = new \stdClass();
-
-        $container = $this->createMockContainer();
-        $container->expects($this->atLeastOnce())
-            ->method('has')
-            ->with(NonInstantiableController::class)
-            ->will($this->returnValue(true))
-        ;
-        $container->expects($this->atLeastOnce())
-            ->method('get')
-            ->with(NonInstantiableController::class)
-            ->will($this->returnValue($service))
+            ->will($this->returnValue(array(ControllerTestService::class => true)))
         ;
 
         $resolver = $this->createControllerResolver(null, $container);
         $request = Request::create('/');
-        $request->attributes->set('_controller', array(NonInstantiableController::class, 'action'));
+        $request->attributes->set('_controller', array(ControllerTestService::class, 'action'));
 
-        $controller = $resolver->getController($request);
-
-        $this->assertSame(array($service, 'action'), $controller);
+        $resolver->getController($request);
     }
 
     /**
-     * @expectedException \LogicException
+     * Tests where the fallback instantiation fails due to non-existing class.
+     *
+     * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Controller "app.my_controller" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?
      */
     public function testExceptionWhenUsingRemovedControllerService()
     {
         $container = $this->getMockBuilder(Container::class)->getMock();
-        $container->expects($this->at(0))
+        $container->expects($this->once())
             ->method('has')
             ->with('app.my_controller')
             ->will($this->returnValue(false))
@@ -205,62 +179,28 @@ class ContainerControllerResolverTest extends ControllerResolverTest
         $resolver->getController($request);
     }
 
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Controller "app.my_controller" cannot be called without a method name. Did you forget an "__invoke" method?
-     */
-    public function testExceptionWhenUsingControllerWithoutAnInvokeMethod()
-    {
-        $container = $this->getMockBuilder(Container::class)->getMock();
-        $container->expects($this->once())
-            ->method('has')
-            ->with('app.my_controller')
-            ->will($this->returnValue(true))
-        ;
-        $container->expects($this->once())
-            ->method('get')
-            ->with('app.my_controller')
-            ->will($this->returnValue(new ImpossibleConstructController('toto', 'controller')))
-        ;
-
-        $resolver = $this->createControllerResolver(null, $container);
-
-        $request = Request::create('/');
-        $request->attributes->set('_controller', 'app.my_controller');
-        $resolver->getController($request);
-    }
-
-    /**
-     * @dataProvider getUndefinedControllers
-     */
-    public function testGetControllerOnNonUndefinedFunction($controller, $exceptionName = null, $exceptionMessage = null)
-    {
-        // All this logic needs to be duplicated, since calling parent::testGetControllerOnNonUndefinedFunction will override the expected excetion and not use the regex
-        $resolver = $this->createControllerResolver();
-        if (method_exists($this, 'expectException')) {
-            $this->expectException($exceptionName);
-            $this->expectExceptionMessageRegExp($exceptionMessage);
-        } else {
-            $this->setExpectedExceptionRegExp($exceptionName, $exceptionMessage);
-        }
-
-        $request = Request::create('/');
-        $request->attributes->set('_controller', $controller);
-        $resolver->getController($request);
-    }
-
     public function getUndefinedControllers()
     {
-        return array(
-            array('foo', \LogicException::class, '/Controller not found: service "foo" does not exist\./'),
-            array('oof::bar', \InvalidArgumentException::class, '/Class "oof" does not exist\./'),
-            array('stdClass', \LogicException::class, '/Controller not found: service "stdClass" does not exist\./'),
-            array(
-                'Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::bar',
-                \InvalidArgumentException::class,
-                '/.?[cC]ontroller(.*?) for URI "\/" is not callable\.( Expected method(.*) Available methods)?/',
-            ),
+        $tests = parent::getUndefinedControllers();
+        $tests[0] = array('foo', \InvalidArgumentException::class, 'Controller "foo" does neither exist as service nor as class');
+        $tests[1] = array('oof::bar', \InvalidArgumentException::class, 'Controller "oof" does neither exist as service nor as class');
+        $tests[2] = array(array('oof', 'bar'), \InvalidArgumentException::class, 'Controller "oof" does neither exist as service nor as class');
+        $tests[] = array(
+            array(ControllerTestService::class, 'action'),
+            \InvalidArgumentException::class,
+            'Controller "Symfony\Component\HttpKernel\Tests\Controller\ControllerTestService" has required constructor arguments and does not exist in the container. Did you forget to define such a service?',
         );
+        $tests[] = array(
+            ControllerTestService::class.'::action',
+            \InvalidArgumentException::class, 'Controller "Symfony\Component\HttpKernel\Tests\Controller\ControllerTestService" has required constructor arguments and does not exist in the container. Did you forget to define such a service?',
+        );
+        $tests[] = array(
+            InvokableControllerService::class,
+            \InvalidArgumentException::class,
+            'Controller "Symfony\Component\HttpKernel\Tests\Controller\InvokableControllerService" has required constructor arguments and does not exist in the container. Did you forget to define such a service?',
+        );
+
+        return $tests;
     }
 
     protected function createControllerResolver(LoggerInterface $logger = null, ContainerInterface $container = null)
@@ -278,7 +218,7 @@ class ContainerControllerResolverTest extends ControllerResolverTest
     }
 }
 
-class InvokableController
+class InvokableControllerService
 {
     public function __construct($bar) // mandatory argument to prevent automatic instantiation
     {
@@ -289,16 +229,9 @@ class InvokableController
     }
 }
 
-abstract class NonInstantiableController
-{
-    public static function action()
-    {
-    }
-}
-
-class ImpossibleConstructController
+class ControllerTestService
 {
-    public function __construct($toto, $controller)
+    public function __construct($foo)
     {
     }
 
diff --git a/vendor/symfony/http-kernel/Tests/Controller/ControllerResolverTest.php b/vendor/symfony/http-kernel/Tests/Controller/ControllerResolverTest.php
index 190e15ad..fe624f7b 100644
--- a/vendor/symfony/http-kernel/Tests/Controller/ControllerResolverTest.php
+++ b/vendor/symfony/http-kernel/Tests/Controller/ControllerResolverTest.php
@@ -13,10 +13,8 @@ namespace Symfony\Component\HttpKernel\Tests\Controller;
 
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\HttpKernel\Controller\ControllerResolver;
-use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\NullableController;
-use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\VariadicController;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Controller\ControllerResolver;
 
 class ControllerResolverTest extends TestCase
 {
@@ -43,51 +41,55 @@ class ControllerResolverTest extends TestCase
     public function testGetControllerWithObjectAndInvokeMethod()
     {
         $resolver = $this->createControllerResolver();
+        $object = new InvokableController();
 
         $request = Request::create('/');
-        $request->attributes->set('_controller', $this);
+        $request->attributes->set('_controller', $object);
         $controller = $resolver->getController($request);
-        $this->assertSame($this, $controller);
+        $this->assertSame($object, $controller);
     }
 
     public function testGetControllerWithObjectAndMethod()
     {
         $resolver = $this->createControllerResolver();
+        $object = new ControllerTest();
 
         $request = Request::create('/');
-        $request->attributes->set('_controller', array($this, 'controllerMethod1'));
+        $request->attributes->set('_controller', array($object, 'publicAction'));
         $controller = $resolver->getController($request);
-        $this->assertSame(array($this, 'controllerMethod1'), $controller);
+        $this->assertSame(array($object, 'publicAction'), $controller);
     }
 
-    public function testGetControllerWithClassAndMethod()
+    public function testGetControllerWithClassAndMethodAsArray()
     {
         $resolver = $this->createControllerResolver();
 
         $request = Request::create('/');
-        $request->attributes->set('_controller', array('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest', 'controllerMethod4'));
+        $request->attributes->set('_controller', array(ControllerTest::class, 'publicAction'));
         $controller = $resolver->getController($request);
-        $this->assertSame(array('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest', 'controllerMethod4'), $controller);
+        $this->assertInstanceOf(ControllerTest::class, $controller[0]);
+        $this->assertSame('publicAction', $controller[1]);
     }
 
-    public function testGetControllerWithObjectAndMethodAsString()
+    public function testGetControllerWithClassAndMethodAsString()
     {
         $resolver = $this->createControllerResolver();
 
         $request = Request::create('/');
-        $request->attributes->set('_controller', 'Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::controllerMethod1');
+        $request->attributes->set('_controller', ControllerTest::class.'::publicAction');
         $controller = $resolver->getController($request);
-        $this->assertInstanceOf('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest', $controller[0], '->getController() returns a PHP callable');
+        $this->assertInstanceOf(ControllerTest::class, $controller[0]);
+        $this->assertSame('publicAction', $controller[1]);
     }
 
-    public function testGetControllerWithClassAndInvokeMethod()
+    public function testGetControllerWithInvokableClass()
     {
         $resolver = $this->createControllerResolver();
 
         $request = Request::create('/');
-        $request->attributes->set('_controller', 'Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest');
+        $request->attributes->set('_controller', InvokableController::class);
         $controller = $resolver->getController($request);
-        $this->assertInstanceOf('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest', $controller);
+        $this->assertInstanceOf(InvokableController::class, $controller);
     }
 
     /**
@@ -112,220 +114,146 @@ class ControllerResolverTest extends TestCase
         $this->assertSame('Symfony\Component\HttpKernel\Tests\Controller\some_controller_function', $controller);
     }
 
-    /**
-     * @dataProvider getUndefinedControllers
-     */
-    public function testGetControllerOnNonUndefinedFunction($controller, $exceptionName = null, $exceptionMessage = null)
+    public function testGetControllerWithClosure()
     {
         $resolver = $this->createControllerResolver();
-        if (method_exists($this, 'expectException')) {
-            $this->expectException($exceptionName);
-            $this->expectExceptionMessage($exceptionMessage);
-        } else {
-            $this->setExpectedException($exceptionName, $exceptionMessage);
-        }
-
-        $request = Request::create('/');
-        $request->attributes->set('_controller', $controller);
-        $resolver->getController($request);
-    }
 
-    public function getUndefinedControllers()
-    {
-        return array(
-            array(1, 'InvalidArgumentException', 'Unable to find controller "1".'),
-            array('foo', 'InvalidArgumentException', 'Unable to find controller "foo".'),
-            array('oof::bar', 'InvalidArgumentException', 'Class "oof" does not exist.'),
-            array('stdClass', 'InvalidArgumentException', 'Unable to find controller "stdClass".'),
-            array('Symfony\Component\HttpKernel\Tests\Controller\ControllerTest::staticsAction', 'InvalidArgumentException', 'The controller for URI "/" is not callable. Expected method "staticsAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest", did you mean "staticAction"?'),
-            array('Symfony\Component\HttpKernel\Tests\Controller\ControllerTest::privateAction', 'InvalidArgumentException', 'The controller for URI "/" is not callable. Method "privateAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest" should be public and non-abstract'),
-            array('Symfony\Component\HttpKernel\Tests\Controller\ControllerTest::protectedAction', 'InvalidArgumentException', 'The controller for URI "/" is not callable. Method "protectedAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest" should be public and non-abstract'),
-            array('Symfony\Component\HttpKernel\Tests\Controller\ControllerTest::undefinedAction', 'InvalidArgumentException', 'The controller for URI "/" is not callable. Expected method "undefinedAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest". Available methods: "publicAction", "staticAction"'),
-        );
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testGetArguments()
-    {
-        $resolver = $this->createControllerResolver();
+        $closure = function () {
+            return 'test';
+        };
 
         $request = Request::create('/');
-        $controller = array(new self(), 'testGetArguments');
-        $this->assertEquals(array(), $resolver->getArguments($request, $controller), '->getArguments() returns an empty array if the method takes no arguments');
-
-        $request = Request::create('/');
-        $request->attributes->set('foo', 'foo');
-        $controller = array(new self(), 'controllerMethod1');
-        $this->assertEquals(array('foo'), $resolver->getArguments($request, $controller), '->getArguments() returns an array of arguments for the controller method');
-
-        $request = Request::create('/');
-        $request->attributes->set('foo', 'foo');
-        $controller = array(new self(), 'controllerMethod2');
-        $this->assertEquals(array('foo', null), $resolver->getArguments($request, $controller), '->getArguments() uses default values if present');
-
-        $request->attributes->set('bar', 'bar');
-        $this->assertEquals(array('foo', 'bar'), $resolver->getArguments($request, $controller), '->getArguments() overrides default values if provided in the request attributes');
-
-        $request = Request::create('/');
-        $request->attributes->set('foo', 'foo');
-        $controller = function ($foo) {};
-        $this->assertEquals(array('foo'), $resolver->getArguments($request, $controller));
-
-        $request = Request::create('/');
-        $request->attributes->set('foo', 'foo');
-        $controller = function ($foo, $bar = 'bar') {};
-        $this->assertEquals(array('foo', 'bar'), $resolver->getArguments($request, $controller));
-
-        $request = Request::create('/');
-        $request->attributes->set('foo', 'foo');
-        $controller = new self();
-        $this->assertEquals(array('foo', null), $resolver->getArguments($request, $controller));
-        $request->attributes->set('bar', 'bar');
-        $this->assertEquals(array('foo', 'bar'), $resolver->getArguments($request, $controller));
-
-        $request = Request::create('/');
-        $request->attributes->set('foo', 'foo');
-        $request->attributes->set('foobar', 'foobar');
-        $controller = 'Symfony\Component\HttpKernel\Tests\Controller\some_controller_function';
-        $this->assertEquals(array('foo', 'foobar'), $resolver->getArguments($request, $controller));
-
-        $request = Request::create('/');
-        $request->attributes->set('foo', 'foo');
-        $request->attributes->set('foobar', 'foobar');
-        $controller = array(new self(), 'controllerMethod3');
-
-        try {
-            $resolver->getArguments($request, $controller);
-            $this->fail('->getArguments() throws a \RuntimeException exception if it cannot determine the argument value');
-        } catch (\Exception $e) {
-            $this->assertInstanceOf('\RuntimeException', $e, '->getArguments() throws a \RuntimeException exception if it cannot determine the argument value');
-        }
-
-        $request = Request::create('/');
-        $controller = array(new self(), 'controllerMethod5');
-        $this->assertEquals(array($request), $resolver->getArguments($request, $controller), '->getArguments() injects the request');
+        $request->attributes->set('_controller', $closure);
+        $controller = $resolver->getController($request);
+        $this->assertInstanceOf(\Closure::class, $controller);
+        $this->assertSame('test', $controller());
     }
 
     /**
-     * @requires PHP 5.6
-     * @group legacy
+     * @dataProvider getStaticControllers
      */
-    public function testGetVariadicArguments()
+    public function testGetControllerWithStaticController($staticController, $returnValue)
     {
-        $resolver = new ControllerResolver();
-
-        $request = Request::create('/');
-        $request->attributes->set('foo', 'foo');
-        $request->attributes->set('bar', array('foo', 'bar'));
-        $controller = array(new VariadicController(), 'action');
-        $this->assertEquals(array('foo', 'foo', 'bar'), $resolver->getArguments($request, $controller));
-    }
-
-    public function testCreateControllerCanReturnAnyCallable()
-    {
-        $mock = $this->getMockBuilder('Symfony\Component\HttpKernel\Controller\ControllerResolver')->setMethods(array('createController'))->getMock();
-        $mock->expects($this->once())->method('createController')->will($this->returnValue('Symfony\Component\HttpKernel\Tests\Controller\some_controller_function'));
+        $resolver = $this->createControllerResolver();
 
         $request = Request::create('/');
-        $request->attributes->set('_controller', 'foobar');
-        $mock->getController($request);
+        $request->attributes->set('_controller', $staticController);
+        $controller = $resolver->getController($request);
+        $this->assertSame($staticController, $controller);
+        $this->assertSame($returnValue, $controller());
     }
 
-    /**
-     * @expectedException \RuntimeException
-     * @group legacy
-     */
-    public function testIfExceptionIsThrownWhenMissingAnArgument()
+    public function getStaticControllers()
     {
-        $resolver = new ControllerResolver();
-        $request = Request::create('/');
-
-        $controller = array($this, 'controllerMethod1');
-
-        $resolver->getArguments($request, $controller);
+        return array(
+            array(TestAbstractController::class.'::staticAction', 'foo'),
+            array(array(TestAbstractController::class, 'staticAction'), 'foo'),
+            array(PrivateConstructorController::class.'::staticAction', 'bar'),
+            array(array(PrivateConstructorController::class, 'staticAction'), 'bar'),
+        );
     }
 
     /**
-     * @requires PHP 7.1
-     * @group legacy
+     * @dataProvider getUndefinedControllers
      */
-    public function testGetNullableArguments()
+    public function testGetControllerWithUndefinedController($controller, $exceptionName = null, $exceptionMessage = null)
     {
-        $resolver = new ControllerResolver();
+        $resolver = $this->createControllerResolver();
+        if (method_exists($this, 'expectException')) {
+            $this->expectException($exceptionName);
+            $this->expectExceptionMessage($exceptionMessage);
+        } else {
+            $this->setExpectedException($exceptionName, $exceptionMessage);
+        }
 
         $request = Request::create('/');
-        $request->attributes->set('foo', 'foo');
-        $request->attributes->set('bar', new \stdClass());
-        $request->attributes->set('mandatory', 'mandatory');
-        $controller = array(new NullableController(), 'action');
-        $this->assertEquals(array('foo', new \stdClass(), 'value', 'mandatory'), $resolver->getArguments($request, $controller));
+        $request->attributes->set('_controller', $controller);
+        $resolver->getController($request);
     }
 
-    /**
-     * @requires PHP 7.1
-     * @group legacy
-     */
-    public function testGetNullableArgumentsWithDefaults()
+    public function getUndefinedControllers()
     {
-        $resolver = new ControllerResolver();
+        $controller = new ControllerTest();
 
-        $request = Request::create('/');
-        $request->attributes->set('mandatory', 'mandatory');
-        $controller = array(new NullableController(), 'action');
-        $this->assertEquals(array(null, null, 'value', 'mandatory'), $resolver->getArguments($request, $controller));
+        return array(
+            array('foo', \Error::class, 'Class \'foo\' not found'),
+            array('oof::bar', \Error::class, 'Class \'oof\' not found'),
+            array(array('oof', 'bar'), \Error::class, 'Class \'oof\' not found'),
+            array('Symfony\Component\HttpKernel\Tests\Controller\ControllerTest::staticsAction', \InvalidArgumentException::class, 'The controller for URI "/" is not callable. Expected method "staticsAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest", did you mean "staticAction"?'),
+            array('Symfony\Component\HttpKernel\Tests\Controller\ControllerTest::privateAction', \InvalidArgumentException::class, 'The controller for URI "/" is not callable. Method "privateAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest" should be public and non-abstract'),
+            array('Symfony\Component\HttpKernel\Tests\Controller\ControllerTest::protectedAction', \InvalidArgumentException::class, 'The controller for URI "/" is not callable. Method "protectedAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest" should be public and non-abstract'),
+            array('Symfony\Component\HttpKernel\Tests\Controller\ControllerTest::undefinedAction', \InvalidArgumentException::class, 'The controller for URI "/" is not callable. Expected method "undefinedAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest". Available methods: "publicAction", "staticAction"'),
+            array('Symfony\Component\HttpKernel\Tests\Controller\ControllerTest', \InvalidArgumentException::class, 'The controller for URI "/" is not callable. Controller class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest" cannot be called without a method name. You need to implement "__invoke" or use one of the available methods: "publicAction", "staticAction".'),
+            array(array($controller, 'staticsAction'), \InvalidArgumentException::class, 'The controller for URI "/" is not callable. Expected method "staticsAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest", did you mean "staticAction"?'),
+            array(array($controller, 'privateAction'), \InvalidArgumentException::class, 'The controller for URI "/" is not callable. Method "privateAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest" should be public and non-abstract'),
+            array(array($controller, 'protectedAction'), \InvalidArgumentException::class, 'The controller for URI "/" is not callable. Method "protectedAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest" should be public and non-abstract'),
+            array(array($controller, 'undefinedAction'), \InvalidArgumentException::class, 'The controller for URI "/" is not callable. Expected method "undefinedAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest". Available methods: "publicAction", "staticAction"'),
+            array($controller, \InvalidArgumentException::class, 'The controller for URI "/" is not callable. Controller class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest" cannot be called without a method name. You need to implement "__invoke" or use one of the available methods: "publicAction", "staticAction".'),
+            array(array('a' => 'foo', 'b' => 'bar'), \InvalidArgumentException::class, 'The controller for URI "/" is not callable. Invalid array callable, expected array(controller, method).'),
+        );
     }
 
     protected function createControllerResolver(LoggerInterface $logger = null)
     {
         return new ControllerResolver($logger);
     }
+}
 
-    public function __invoke($foo, $bar = null)
+function some_controller_function($foo, $foobar)
+{
+}
+
+class ControllerTest
+{
+    public function __construct()
     {
     }
 
-    public function controllerMethod1($foo)
+    public function __toString()
     {
+        return '';
     }
 
-    protected function controllerMethod2($foo, $bar = null)
+    public function publicAction()
     {
     }
 
-    protected function controllerMethod3($foo, $bar, $foobar)
+    private function privateAction()
     {
     }
 
-    protected static function controllerMethod4()
+    protected function protectedAction()
     {
     }
 
-    protected function controllerMethod5(Request $request)
+    public static function staticAction()
     {
     }
 }
 
-function some_controller_function($foo, $foobar)
+class InvokableController
 {
-}
-
-class ControllerTest
-{
-    public function publicAction()
+    public function __invoke($foo, $bar = null)
     {
     }
+}
 
-    private function privateAction()
+abstract class TestAbstractController
+{
+    public static function staticAction()
     {
+        return 'foo';
     }
+}
 
-    protected function protectedAction()
+class PrivateConstructorController
+{
+    private function __construct()
     {
     }
 
     public static function staticAction()
     {
+        return 'bar';
     }
 }
diff --git a/vendor/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php b/vendor/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php
index bf0db5ad..a667705f 100644
--- a/vendor/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php
+++ b/vendor/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php
@@ -84,9 +84,6 @@ class ArgumentMetadataFactoryTest extends TestCase
         ), $arguments);
     }
 
-    /**
-     * @requires PHP 5.6
-     */
     public function testVariadicSignature()
     {
         $arguments = $this->factory->createArgumentMetadata(array(new VariadicController(), 'action'));
@@ -97,9 +94,6 @@ class ArgumentMetadataFactoryTest extends TestCase
         ), $arguments);
     }
 
-    /**
-     * @requires PHP 7.0
-     */
     public function testBasicTypesSignature()
     {
         $arguments = $this->factory->createArgumentMetadata(array(new BasicTypesController(), 'action'));
@@ -111,9 +105,6 @@ class ArgumentMetadataFactoryTest extends TestCase
         ), $arguments);
     }
 
-    /**
-     * @requires PHP 7.1
-     */
     public function testNullableTypesSignature()
     {
         $arguments = $this->factory->createArgumentMetadata(array(new NullableController(), 'action'));
diff --git a/vendor/symfony/http-kernel/Tests/DataCollector/ConfigDataCollectorTest.php b/vendor/symfony/http-kernel/Tests/DataCollector/ConfigDataCollectorTest.php
index 4fb36afd..a99e34ad 100644
--- a/vendor/symfony/http-kernel/Tests/DataCollector/ConfigDataCollectorTest.php
+++ b/vendor/symfony/http-kernel/Tests/DataCollector/ConfigDataCollectorTest.php
@@ -12,11 +12,11 @@
 namespace Symfony\Component\HttpKernel\Tests\DataCollector;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector;
-use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector;
+use Symfony\Component\HttpKernel\Kernel;
 
 class ConfigDataCollectorTest extends TestCase
 {
@@ -38,9 +38,9 @@ class ConfigDataCollectorTest extends TestCase
         $this->assertSame(date_default_timezone_get(), $c->getPhpTimezone());
         $this->assertSame(Kernel::VERSION, $c->getSymfonyVersion());
         $this->assertNull($c->getToken());
-        $this->assertSame(extension_loaded('xdebug'), $c->hasXDebug());
-        $this->assertSame(extension_loaded('Zend OPcache') && ini_get('opcache.enable'), $c->hasZendOpcache());
-        $this->assertSame(extension_loaded('apcu') && ini_get('apc.enabled'), $c->hasApcu());
+        $this->assertSame(\extension_loaded('xdebug'), $c->hasXDebug());
+        $this->assertSame(\extension_loaded('Zend OPcache') && ini_get('opcache.enable'), $c->hasZendOpcache());
+        $this->assertSame(\extension_loaded('apcu') && ini_get('apc.enabled'), $c->hasApcu());
     }
 }
 
diff --git a/vendor/symfony/http-kernel/Tests/DataCollector/DumpDataCollectorTest.php b/vendor/symfony/http-kernel/Tests/DataCollector/DumpDataCollectorTest.php
index d809331c..57384a79 100644
--- a/vendor/symfony/http-kernel/Tests/DataCollector/DumpDataCollectorTest.php
+++ b/vendor/symfony/http-kernel/Tests/DataCollector/DumpDataCollectorTest.php
@@ -12,11 +12,12 @@
 namespace Symfony\Component\HttpKernel\Tests\DataCollector;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpKernel\DataCollector\DumpDataCollector;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\DataCollector\DumpDataCollector;
 use Symfony\Component\VarDumper\Cloner\Data;
 use Symfony\Component\VarDumper\Dumper\CliDumper;
+use Symfony\Component\VarDumper\Server\Connection;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
@@ -56,6 +57,24 @@ class DumpDataCollectorTest extends TestCase
         $this->assertSame('a:2:{i:0;b:0;i:1;s:5:"UTF-8";}', $collector->serialize());
     }
 
+    public function testDumpWithServerConnection()
+    {
+        $data = new Data(array(array(123)));
+
+        // Server is up, server dumper is used
+        $serverDumper = $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();
+        $serverDumper->expects($this->once())->method('write')->willReturn(true);
+
+        $collector = new DumpDataCollector(null, null, null, null, $serverDumper);
+        $collector->dump($data);
+
+        // Collect doesn't re-trigger dump
+        ob_start();
+        $collector->collect(new Request(), new Response());
+        $this->assertEmpty(ob_get_clean());
+        $this->assertStringMatchesFormat('a:3:{i:0;a:5:{s:4:"data";%c:39:"Symfony\Component\VarDumper\Cloner\Data":%a', $collector->serialize());
+    }
+
     public function testCollectDefault()
     {
         $data = new Data(array(array(123)));
diff --git a/vendor/symfony/http-kernel/Tests/DataCollector/ExceptionDataCollectorTest.php b/vendor/symfony/http-kernel/Tests/DataCollector/ExceptionDataCollectorTest.php
index 178f1f01..1e8d186c 100644
--- a/vendor/symfony/http-kernel/Tests/DataCollector/ExceptionDataCollectorTest.php
+++ b/vendor/symfony/http-kernel/Tests/DataCollector/ExceptionDataCollectorTest.php
@@ -13,9 +13,9 @@ namespace Symfony\Component\HttpKernel\Tests\DataCollector;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Debug\Exception\FlattenException;
-use Symfony\Component\HttpKernel\DataCollector\ExceptionDataCollector;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\DataCollector\ExceptionDataCollector;
 
 class ExceptionDataCollectorTest extends TestCase
 {
diff --git a/vendor/symfony/http-kernel/Tests/DataCollector/LoggerDataCollectorTest.php b/vendor/symfony/http-kernel/Tests/DataCollector/LoggerDataCollectorTest.php
index 3dec3bd7..b5c7057f 100644
--- a/vendor/symfony/http-kernel/Tests/DataCollector/LoggerDataCollectorTest.php
+++ b/vendor/symfony/http-kernel/Tests/DataCollector/LoggerDataCollectorTest.php
@@ -13,7 +13,11 @@ namespace Symfony\Component\HttpKernel\Tests\DataCollector;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Debug\Exception\SilencedErrorContext;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\DataCollector\LoggerDataCollector;
+use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
 
 class LoggerDataCollectorTest extends TestCase
 {
@@ -41,6 +45,46 @@ class LoggerDataCollectorTest extends TestCase
         ), $compilerLogs['Unknown Compiler Pass']);
     }
 
+    public function testWithMasterRequest()
+    {
+        $masterRequest = new Request();
+        $stack = new RequestStack();
+        $stack->push($masterRequest);
+
+        $logger = $this
+            ->getMockBuilder(DebugLoggerInterface::class)
+            ->setMethods(array('countErrors', 'getLogs', 'clear'))
+            ->getMock();
+        $logger->expects($this->once())->method('countErrors')->with(null);
+        $logger->expects($this->exactly(2))->method('getLogs')->with(null)->will($this->returnValue(array()));
+
+        $c = new LoggerDataCollector($logger, __DIR__.'/', $stack);
+
+        $c->collect($masterRequest, new Response());
+        $c->lateCollect();
+    }
+
+    public function testWithSubRequest()
+    {
+        $masterRequest = new Request();
+        $subRequest = new Request();
+        $stack = new RequestStack();
+        $stack->push($masterRequest);
+        $stack->push($subRequest);
+
+        $logger = $this
+            ->getMockBuilder(DebugLoggerInterface::class)
+            ->setMethods(array('countErrors', 'getLogs', 'clear'))
+            ->getMock();
+        $logger->expects($this->once())->method('countErrors')->with($subRequest);
+        $logger->expects($this->exactly(2))->method('getLogs')->with($subRequest)->will($this->returnValue(array()));
+
+        $c = new LoggerDataCollector($logger, __DIR__.'/', $stack);
+
+        $c->collect($subRequest, new Response());
+        $c->lateCollect();
+    }
+
     /**
      * @dataProvider getCollectTestData
      */
diff --git a/vendor/symfony/http-kernel/Tests/DataCollector/MemoryDataCollectorTest.php b/vendor/symfony/http-kernel/Tests/DataCollector/MemoryDataCollectorTest.php
index ab78e9e8..1435d05e 100644
--- a/vendor/symfony/http-kernel/Tests/DataCollector/MemoryDataCollectorTest.php
+++ b/vendor/symfony/http-kernel/Tests/DataCollector/MemoryDataCollectorTest.php
@@ -12,9 +12,9 @@
 namespace Symfony\Component\HttpKernel\Tests\DataCollector;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpKernel\DataCollector\MemoryDataCollector;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\DataCollector\MemoryDataCollector;
 
 class MemoryDataCollectorTest extends TestCase
 {
diff --git a/vendor/symfony/http-kernel/Tests/DataCollector/RequestDataCollectorTest.php b/vendor/symfony/http-kernel/Tests/DataCollector/RequestDataCollectorTest.php
index 69bef76d..cce08e27 100644
--- a/vendor/symfony/http-kernel/Tests/DataCollector/RequestDataCollectorTest.php
+++ b/vendor/symfony/http-kernel/Tests/DataCollector/RequestDataCollectorTest.php
@@ -12,20 +12,20 @@
 namespace Symfony\Component\HttpKernel\Tests\DataCollector;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpFoundation\Cookie;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
+use Symfony\Component\HttpKernel\DataCollector\RequestDataCollector;
+use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernel;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpKernel\DataCollector\RequestDataCollector;
-use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Cookie;
-use Symfony\Component\EventDispatcher\EventDispatcher;
 
 class RequestDataCollectorTest extends TestCase
 {
diff --git a/vendor/symfony/http-kernel/Tests/DataCollector/TimeDataCollectorTest.php b/vendor/symfony/http-kernel/Tests/DataCollector/TimeDataCollectorTest.php
index 8048cc37..cf6a8669 100644
--- a/vendor/symfony/http-kernel/Tests/DataCollector/TimeDataCollectorTest.php
+++ b/vendor/symfony/http-kernel/Tests/DataCollector/TimeDataCollectorTest.php
@@ -12,9 +12,9 @@
 namespace Symfony\Component\HttpKernel\Tests\DataCollector;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpKernel\DataCollector\TimeDataCollector;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\DataCollector\TimeDataCollector;
 
 /**
  * @group time-sensitive
diff --git a/vendor/symfony/http-kernel/Tests/DataCollector/Util/ValueExporterTest.php b/vendor/symfony/http-kernel/Tests/DataCollector/Util/ValueExporterTest.php
deleted file mode 100644
index 5fe92d60..00000000
--- a/vendor/symfony/http-kernel/Tests/DataCollector/Util/ValueExporterTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpKernel\Tests\DataCollector\Util;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpKernel\DataCollector\Util\ValueExporter;
-
-/**
- * @group legacy
- */
-class ValueExporterTest extends TestCase
-{
-    /**
-     * @var ValueExporter
-     */
-    private $valueExporter;
-
-    protected function setUp()
-    {
-        $this->valueExporter = new ValueExporter();
-    }
-
-    public function testDateTime()
-    {
-        $dateTime = new \DateTime('2014-06-10 07:35:40', new \DateTimeZone('UTC'));
-        $this->assertSame('Object(DateTime) - 2014-06-10T07:35:40+00:00', $this->valueExporter->exportValue($dateTime));
-    }
-
-    public function testDateTimeImmutable()
-    {
-        $dateTime = new \DateTimeImmutable('2014-06-10 07:35:40', new \DateTimeZone('UTC'));
-        $this->assertSame('Object(DateTimeImmutable) - 2014-06-10T07:35:40+00:00', $this->valueExporter->exportValue($dateTime));
-    }
-
-    public function testIncompleteClass()
-    {
-        $foo = new \__PHP_Incomplete_Class();
-        $array = new \ArrayObject($foo);
-        $array['__PHP_Incomplete_Class_Name'] = 'AppBundle/Foo';
-        $this->assertSame('__PHP_Incomplete_Class(AppBundle/Foo)', $this->valueExporter->exportValue($foo));
-    }
-}
diff --git a/vendor/symfony/http-kernel/Tests/Debug/FileLinkFormatterTest.php b/vendor/symfony/http-kernel/Tests/Debug/FileLinkFormatterTest.php
index d616098a..5c93bd90 100644
--- a/vendor/symfony/http-kernel/Tests/Debug/FileLinkFormatterTest.php
+++ b/vendor/symfony/http-kernel/Tests/Debug/FileLinkFormatterTest.php
@@ -27,7 +27,7 @@ class FileLinkFormatterTest extends TestCase
 
     public function testWhenFileLinkFormatAndNoRequest()
     {
-        $file = __DIR__.DIRECTORY_SEPARATOR.'file.php';
+        $file = __DIR__.\DIRECTORY_SEPARATOR.'file.php';
 
         $sut = new FileLinkFormatter('debug://open?url=file://%f&line=%l', new RequestStack());
 
@@ -36,8 +36,7 @@ class FileLinkFormatterTest extends TestCase
 
     public function testWhenFileLinkFormatAndRequest()
     {
-        $file = __DIR__.DIRECTORY_SEPARATOR.'file.php';
-        $baseDir = __DIR__;
+        $file = __DIR__.\DIRECTORY_SEPARATOR.'file.php';
         $requestStack = new RequestStack();
         $request = new Request();
         $requestStack->push($request);
@@ -49,19 +48,19 @@ class FileLinkFormatterTest extends TestCase
 
     public function testWhenNoFileLinkFormatAndRequest()
     {
-        $file = __DIR__.DIRECTORY_SEPARATOR.'file.php';
+        $file = __DIR__.\DIRECTORY_SEPARATOR.'file.php';
         $requestStack = new RequestStack();
         $request = new Request();
         $requestStack->push($request);
 
         $request->server->set('SERVER_NAME', 'www.example.org');
         $request->server->set('SERVER_PORT', 80);
-        $request->server->set('SCRIPT_NAME', '/app.php');
-        $request->server->set('SCRIPT_FILENAME', '/web/app.php');
-        $request->server->set('REQUEST_URI', '/app.php/example');
+        $request->server->set('SCRIPT_NAME', '/index.php');
+        $request->server->set('SCRIPT_FILENAME', '/public/index.php');
+        $request->server->set('REQUEST_URI', '/index.php/example');
 
         $sut = new FileLinkFormatter(null, $requestStack, __DIR__, '/_profiler/open?file=%f&line=%l#line%l');
 
-        $this->assertSame('http://www.example.org/app.php/_profiler/open?file=file.php&line=3#line3', $sut->format($file, 3));
+        $this->assertSame('http://www.example.org/_profiler/open?file=file.php&line=3#line3', $sut->format($file, 3));
     }
 }
diff --git a/vendor/symfony/http-kernel/Tests/Debug/TraceableEventDispatcherTest.php b/vendor/symfony/http-kernel/Tests/Debug/TraceableEventDispatcherTest.php
index aaa82d52..3de147c7 100644
--- a/vendor/symfony/http-kernel/Tests/Debug/TraceableEventDispatcherTest.php
+++ b/vendor/symfony/http-kernel/Tests/Debug/TraceableEventDispatcherTest.php
@@ -13,11 +13,11 @@ namespace Symfony\Component\HttpKernel\Tests\Debug;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher;
 use Symfony\Component\HttpKernel\HttpKernel;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Stopwatch\Stopwatch;
 
 class TraceableEventDispatcherTest extends TestCase
diff --git a/vendor/symfony/http-kernel/Tests/DependencyInjection/ControllerArgumentValueResolverPassTest.php b/vendor/symfony/http-kernel/Tests/DependencyInjection/ControllerArgumentValueResolverPassTest.php
index df8977de..49bbd0f9 100644
--- a/vendor/symfony/http-kernel/Tests/DependencyInjection/ControllerArgumentValueResolverPassTest.php
+++ b/vendor/symfony/http-kernel/Tests/DependencyInjection/ControllerArgumentValueResolverPassTest.php
@@ -17,6 +17,7 @@ use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
 use Symfony\Component\HttpKernel\DependencyInjection\ControllerArgumentValueResolverPass;
+use Symfony\Component\Stopwatch\Stopwatch;
 
 class ControllerArgumentValueResolverPassTest extends TestCase
 {
@@ -42,8 +43,69 @@ class ControllerArgumentValueResolverPassTest extends TestCase
             $container->register($id)->addTag('controller.argument_value_resolver', $tag);
         }
 
+        $container->setParameter('kernel.debug', false);
+
         (new ControllerArgumentValueResolverPass())->process($container);
         $this->assertEquals($expected, $definition->getArgument(1)->getValues());
+
+        $this->assertFalse($container->hasDefinition('n1.traceable'));
+        $this->assertFalse($container->hasDefinition('n2.traceable'));
+        $this->assertFalse($container->hasDefinition('n3.traceable'));
+    }
+
+    public function testInDebugWithStopWatchDefinition()
+    {
+        $services = array(
+            'n3' => array(array()),
+            'n1' => array(array('priority' => 200)),
+            'n2' => array(array('priority' => 100)),
+        );
+
+        $expected = array(
+            new Reference('n1'),
+            new Reference('n2'),
+            new Reference('n3'),
+        );
+
+        $definition = new Definition(ArgumentResolver::class, array(null, array()));
+        $container = new ContainerBuilder();
+        $container->register('debug.stopwatch', Stopwatch::class);
+        $container->setDefinition('argument_resolver', $definition);
+
+        foreach ($services as $id => list($tag)) {
+            $container->register($id)->addTag('controller.argument_value_resolver', $tag);
+        }
+
+        $container->setParameter('kernel.debug', true);
+
+        (new ControllerArgumentValueResolverPass())->process($container);
+        $this->assertEquals($expected, $definition->getArgument(1)->getValues());
+
+        $this->assertTrue($container->hasDefinition('debug.n1'));
+        $this->assertTrue($container->hasDefinition('debug.n2'));
+        $this->assertTrue($container->hasDefinition('debug.n3'));
+
+        $this->assertTrue($container->hasDefinition('n1'));
+        $this->assertTrue($container->hasDefinition('n2'));
+        $this->assertTrue($container->hasDefinition('n3'));
+    }
+
+    public function testInDebugWithouStopWatchDefinition()
+    {
+        $expected = array(new Reference('n1'));
+
+        $definition = new Definition(ArgumentResolver::class, array(null, array()));
+        $container = new ContainerBuilder();
+        $container->register('n1')->addTag('controller.argument_value_resolver');
+        $container->setDefinition('argument_resolver', $definition);
+
+        $container->setParameter('kernel.debug', true);
+
+        (new ControllerArgumentValueResolverPass())->process($container);
+        $this->assertEquals($expected, $definition->getArgument(1)->getValues());
+
+        $this->assertFalse($container->hasDefinition('debug.n1'));
+        $this->assertTrue($container->hasDefinition('n1'));
     }
 
     public function testReturningEmptyArrayWhenNoService()
@@ -52,6 +114,8 @@ class ControllerArgumentValueResolverPassTest extends TestCase
         $container = new ContainerBuilder();
         $container->setDefinition('argument_resolver', $definition);
 
+        $container->setParameter('kernel.debug', false);
+
         (new ControllerArgumentValueResolverPass())->process($container);
         $this->assertEquals(array(), $definition->getArgument(1)->getValues());
     }
diff --git a/vendor/symfony/http-kernel/Tests/DependencyInjection/LazyLoadingFragmentHandlerTest.php b/vendor/symfony/http-kernel/Tests/DependencyInjection/LazyLoadingFragmentHandlerTest.php
index 73021483..2bc84a53 100644
--- a/vendor/symfony/http-kernel/Tests/DependencyInjection/LazyLoadingFragmentHandlerTest.php
+++ b/vendor/symfony/http-kernel/Tests/DependencyInjection/LazyLoadingFragmentHandlerTest.php
@@ -12,37 +12,12 @@
 namespace Symfony\Component\HttpKernel\Tests\DependencyInjection;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpKernel\DependencyInjection\LazyLoadingFragmentHandler;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\DependencyInjection\LazyLoadingFragmentHandler;
 
 class LazyLoadingFragmentHandlerTest extends TestCase
 {
-    /**
-     * @group legacy
-     * @expectedDeprecation The Symfony\Component\HttpKernel\DependencyInjection\LazyLoadingFragmentHandler::addRendererService() method is deprecated since Symfony 3.3 and will be removed in 4.0.
-     */
-    public function testRenderWithLegacyMapping()
-    {
-        $renderer = $this->getMockBuilder('Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface')->getMock();
-        $renderer->expects($this->once())->method('getName')->will($this->returnValue('foo'));
-        $renderer->expects($this->any())->method('render')->will($this->returnValue(new Response()));
-
-        $requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock();
-        $requestStack->expects($this->any())->method('getCurrentRequest')->will($this->returnValue(Request::create('/')));
-
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
-        $container->expects($this->once())->method('get')->will($this->returnValue($renderer));
-
-        $handler = new LazyLoadingFragmentHandler($container, $requestStack, false);
-        $handler->addRendererService('foo', 'foo');
-
-        $handler->render('/foo', 'foo');
-
-        // second call should not lazy-load anymore (see once() above on the get() method)
-        $handler->render('/foo', 'foo');
-    }
-
     public function testRender()
     {
         $renderer = $this->getMockBuilder('Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface')->getMock();
diff --git a/vendor/symfony/http-kernel/Tests/DependencyInjection/LoggerPassTest.php b/vendor/symfony/http-kernel/Tests/DependencyInjection/LoggerPassTest.php
index b199e11d..cb504877 100644
--- a/vendor/symfony/http-kernel/Tests/DependencyInjection/LoggerPassTest.php
+++ b/vendor/symfony/http-kernel/Tests/DependencyInjection/LoggerPassTest.php
@@ -13,9 +13,9 @@ namespace Symfony\Component\HttpKernel\Tests\DependencyInjection;
 
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\DependencyInjection\LoggerPass;
 use Symfony\Component\HttpKernel\Log\Logger;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
diff --git a/vendor/symfony/http-kernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/vendor/symfony/http-kernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
index 4016deb4..6c036e88 100644
--- a/vendor/symfony/http-kernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
+++ b/vendor/symfony/http-kernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
@@ -13,13 +13,14 @@ namespace Symfony\Component\HttpKernel\Tests\DependencyInjection;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\DependencyInjection\TypedReference;
-use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\RegisterControllerArgumentLocatorsPass;
 
 class RegisterControllerArgumentLocatorsPassTest extends TestCase
@@ -140,15 +141,15 @@ class RegisterControllerArgumentLocatorsPassTest extends TestCase
 
         $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
 
-        $this->assertEquals(array('foo:fooAction'), array_keys($locator));
-        $this->assertInstanceof(ServiceClosureArgument::class, $locator['foo:fooAction']);
+        $this->assertEquals(array('foo::fooAction'), array_keys($locator));
+        $this->assertInstanceof(ServiceClosureArgument::class, $locator['foo::fooAction']);
 
-        $locator = $container->getDefinition((string) $locator['foo:fooAction']->getValues()[0]);
+        $locator = $container->getDefinition((string) $locator['foo::fooAction']->getValues()[0]);
 
         $this->assertSame(ServiceLocator::class, $locator->getClass());
         $this->assertFalse($locator->isPublic());
 
-        $expected = array('bar' => new ServiceClosureArgument(new TypedReference(ControllerDummy::class, ControllerDummy::class, RegisterTestController::class, ContainerInterface::IGNORE_ON_INVALID_REFERENCE)));
+        $expected = array('bar' => new ServiceClosureArgument(new TypedReference(ControllerDummy::class, ControllerDummy::class, ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE)));
         $this->assertEquals($expected, $locator->getArgument(0));
     }
 
@@ -166,9 +167,9 @@ class RegisterControllerArgumentLocatorsPassTest extends TestCase
         $pass->process($container);
 
         $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
-        $locator = $container->getDefinition((string) $locator['foo:fooAction']->getValues()[0]);
+        $locator = $container->getDefinition((string) $locator['foo::fooAction']->getValues()[0]);
 
-        $expected = array('bar' => new ServiceClosureArgument(new TypedReference('bar', ControllerDummy::class, RegisterTestController::class)));
+        $expected = array('bar' => new ServiceClosureArgument(new TypedReference('bar', ControllerDummy::class, ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE)));
         $this->assertEquals($expected, $locator->getArgument(0));
     }
 
@@ -185,9 +186,9 @@ class RegisterControllerArgumentLocatorsPassTest extends TestCase
         $pass->process($container);
 
         $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
-        $locator = $container->getDefinition((string) $locator['foo:fooAction']->getValues()[0]);
+        $locator = $container->getDefinition((string) $locator['foo::fooAction']->getValues()[0]);
 
-        $expected = array('bar' => new ServiceClosureArgument(new TypedReference('bar', ControllerDummy::class, RegisterTestController::class, ContainerInterface::IGNORE_ON_INVALID_REFERENCE)));
+        $expected = array('bar' => new ServiceClosureArgument(new TypedReference('bar', ControllerDummy::class, ContainerInterface::IGNORE_ON_INVALID_REFERENCE)));
         $this->assertEquals($expected, $locator->getArgument(0));
     }
 
@@ -203,7 +204,7 @@ class RegisterControllerArgumentLocatorsPassTest extends TestCase
         $pass->process($container);
 
         $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
-        $this->assertSame(array('foo:fooAction'), array_keys($locator));
+        $this->assertSame(array('foo::fooAction'), array_keys($locator));
     }
 
     /**
@@ -250,7 +251,7 @@ class RegisterControllerArgumentLocatorsPassTest extends TestCase
         $pass->process($container);
 
         $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
-        $this->assertSame(array('foo:barAction', 'foo:fooAction'), array_keys($locator));
+        $this->assertSame(array('foo::barAction', 'foo::fooAction'), array_keys($locator));
     }
 
     public function testArgumentWithNoTypeHintIsOk()
@@ -300,7 +301,7 @@ class RegisterControllerArgumentLocatorsPassTest extends TestCase
 
         $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
 
-        $locator = $container->getDefinition((string) $locator['foo:fooAction']->getValues()[0]);
+        $locator = $container->getDefinition((string) $locator['foo::fooAction']->getValues()[0]);
 
         $expected = array('bar' => new ServiceClosureArgument(new Reference('foo')));
         $this->assertEquals($expected, $locator->getArgument(0));
@@ -311,7 +312,7 @@ class RegisterControllerArgumentLocatorsPassTest extends TestCase
         return array(array(ControllerDummy::class), array('$bar'));
     }
 
-    public function testDoNotBindScalarValueToControllerArgument()
+    public function testBindScalarValueToControllerArgument()
     {
         $container = new ContainerBuilder();
         $resolver = $container->register('argument_resolver.service')->addArgument(array());
@@ -320,11 +321,47 @@ class RegisterControllerArgumentLocatorsPassTest extends TestCase
             ->setBindings(array('$someArg' => '%foo%'))
             ->addTag('controller.service_arguments');
 
+        $container->setParameter('foo', 'foo_val');
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+
+        $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
+
+        $locator = $container->getDefinition((string) $locator['foo::fooAction']->getValues()[0]);
+
+        // assert the locator has a someArg key
+        $arguments = $locator->getArgument(0);
+        $this->assertArrayHasKey('someArg', $arguments);
+        $this->assertInstanceOf(ServiceClosureArgument::class, $arguments['someArg']);
+        // get the Reference that someArg points to
+        $reference = $arguments['someArg']->getValues()[0];
+        // make sure this service *does* exist and returns the correct value
+        $this->assertTrue($container->has((string) $reference));
+        $this->assertSame('foo_val', $container->get((string) $reference));
+    }
+
+    public function testBindingsOnChildDefinitions()
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service')->addArgument(array());
+
+        $container->register('parent', ArgumentWithoutTypeController::class);
+
+        $container->setDefinition('child', (new ChildDefinition('parent'))
+            ->setBindings(array('$someArg' => new Reference('parent')))
+            ->addTag('controller.service_arguments')
+        );
+
         $pass = new RegisterControllerArgumentLocatorsPass();
         $pass->process($container);
 
         $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
-        $this->assertEmpty($locator);
+        $this->assertInstanceOf(ServiceClosureArgument::class, $locator['child::fooAction']);
+
+        $locator = $container->getDefinition((string) $locator['child::fooAction']->getValues()[0])->getArgument(0);
+        $this->assertInstanceOf(ServiceClosureArgument::class, $locator['someArg']);
+        $this->assertEquals(new Reference('parent'), $locator['someArg']->getValues()[0]);
     }
 }
 
diff --git a/vendor/symfony/http-kernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php b/vendor/symfony/http-kernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php
index 9cac9681..dfec3834 100644
--- a/vendor/symfony/http-kernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php
+++ b/vendor/symfony/http-kernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php
@@ -36,49 +36,30 @@ class RemoveEmptyControllerArgumentLocatorsPassTest extends TestCase
 
         $controllers = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
 
-        $this->assertCount(2, $container->getDefinition((string) $controllers['c1:fooAction']->getValues()[0])->getArgument(0));
-        $this->assertCount(1, $container->getDefinition((string) $controllers['c2:setTestCase']->getValues()[0])->getArgument(0));
-        $this->assertCount(1, $container->getDefinition((string) $controllers['c2:fooAction']->getValues()[0])->getArgument(0));
+        $this->assertCount(2, $container->getDefinition((string) $controllers['c1::fooAction']->getValues()[0])->getArgument(0));
+        $this->assertCount(1, $container->getDefinition((string) $controllers['c2::setTestCase']->getValues()[0])->getArgument(0));
+        $this->assertCount(1, $container->getDefinition((string) $controllers['c2::fooAction']->getValues()[0])->getArgument(0));
 
         (new ResolveInvalidReferencesPass())->process($container);
 
-        $this->assertCount(1, $container->getDefinition((string) $controllers['c2:setTestCase']->getValues()[0])->getArgument(0));
-        $this->assertSame(array(), $container->getDefinition((string) $controllers['c2:fooAction']->getValues()[0])->getArgument(0));
+        $this->assertCount(1, $container->getDefinition((string) $controllers['c2::setTestCase']->getValues()[0])->getArgument(0));
+        $this->assertSame(array(), $container->getDefinition((string) $controllers['c2::fooAction']->getValues()[0])->getArgument(0));
 
         (new RemoveEmptyControllerArgumentLocatorsPass())->process($container);
 
         $controllers = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
 
-        $this->assertSame(array('c1:fooAction'), array_keys($controllers));
-        $this->assertSame(array('bar'), array_keys($container->getDefinition((string) $controllers['c1:fooAction']->getValues()[0])->getArgument(0)));
+        $this->assertSame(array('c1::fooAction', 'c1:fooAction'), array_keys($controllers));
+        $this->assertSame(array('bar'), array_keys($container->getDefinition((string) $controllers['c1::fooAction']->getValues()[0])->getArgument(0)));
 
         $expectedLog = array(
-            'Symfony\Component\HttpKernel\DependencyInjection\RemoveEmptyControllerArgumentLocatorsPass: Removing service-argument resolver for controller "c2:fooAction": no corresponding services exist for the referenced types.',
+            'Symfony\Component\HttpKernel\DependencyInjection\RemoveEmptyControllerArgumentLocatorsPass: Removing service-argument resolver for controller "c2::fooAction": no corresponding services exist for the referenced types.',
             'Symfony\Component\HttpKernel\DependencyInjection\RemoveEmptyControllerArgumentLocatorsPass: Removing method "setTestCase" of service "c2" from controller candidates: the method is called at instantiation, thus cannot be an action.',
         );
 
         $this->assertSame($expectedLog, $container->getCompiler()->getLog());
     }
 
-    public function testSameIdClass()
-    {
-        $container = new ContainerBuilder();
-        $resolver = $container->register('argument_resolver.service')->addArgument(array());
-
-        $container->register(RegisterTestController::class, RegisterTestController::class)
-            ->addTag('controller.service_arguments')
-        ;
-
-        (new RegisterControllerArgumentLocatorsPass())->process($container);
-        (new RemoveEmptyControllerArgumentLocatorsPass())->process($container);
-
-        $expected = array(
-            RegisterTestController::class.':fooAction',
-            RegisterTestController::class.'::fooAction',
-        );
-        $this->assertEquals($expected, array_keys($container->getDefinition((string) $resolver->getArgument(0))->getArgument(0)));
-    }
-
     public function testInvoke()
     {
         $container = new ContainerBuilder();
@@ -92,35 +73,15 @@ class RemoveEmptyControllerArgumentLocatorsPassTest extends TestCase
         (new RemoveEmptyControllerArgumentLocatorsPass())->process($container);
 
         $this->assertEquals(
-            array('invokable:__invoke', 'invokable'),
+            array('invokable::__invoke', 'invokable:__invoke', 'invokable'),
             array_keys($container->getDefinition((string) $resolver->getArgument(0))->getArgument(0))
         );
     }
-
-    public function testInvokeSameIdClass()
-    {
-        $container = new ContainerBuilder();
-        $resolver = $container->register('argument_resolver.service')->addArgument(array());
-
-        $container->register(InvokableRegisterTestController::class, InvokableRegisterTestController::class)
-            ->addTag('controller.service_arguments')
-        ;
-
-        (new RegisterControllerArgumentLocatorsPass())->process($container);
-        (new RemoveEmptyControllerArgumentLocatorsPass())->process($container);
-
-        $expected = array(
-            InvokableRegisterTestController::class.':__invoke',
-            InvokableRegisterTestController::class.'::__invoke',
-            InvokableRegisterTestController::class,
-        );
-        $this->assertEquals($expected, array_keys($container->getDefinition((string) $resolver->getArgument(0))->getArgument(0)));
-    }
 }
 
 class RemoveTestController1
 {
-    public function fooAction(\stdClass $bar, ClassNotInContainer $baz)
+    public function fooAction(\stdClass $bar, ClassNotInContainer $baz = null)
     {
     }
 }
@@ -131,7 +92,7 @@ class RemoveTestController2
     {
     }
 
-    public function fooAction(ClassNotInContainer $bar)
+    public function fooAction(ClassNotInContainer $bar = null)
     {
     }
 }
diff --git a/vendor/symfony/http-kernel/Tests/Event/FilterControllerArgumentsEventTest.php b/vendor/symfony/http-kernel/Tests/Event/FilterControllerArgumentsEventTest.php
index 9165d31f..f1e440b2 100644
--- a/vendor/symfony/http-kernel/Tests/Event/FilterControllerArgumentsEventTest.php
+++ b/vendor/symfony/http-kernel/Tests/Event/FilterControllerArgumentsEventTest.php
@@ -2,9 +2,9 @@
 
 namespace Symfony\Component\HttpKernel\Tests\Event;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\FilterControllerArgumentsEvent;
-use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpKernel\Tests\TestHttpKernel;
 
 class FilterControllerArgumentsEventTest extends TestCase
diff --git a/vendor/symfony/http-kernel/Tests/EventListener/AddRequestFormatsListenerTest.php b/vendor/symfony/http-kernel/Tests/EventListener/AddRequestFormatsListenerTest.php
index f4878f62..3ffb9f3d 100644
--- a/vendor/symfony/http-kernel/Tests/EventListener/AddRequestFormatsListenerTest.php
+++ b/vendor/symfony/http-kernel/Tests/EventListener/AddRequestFormatsListenerTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\HttpKernel\Tests\EventListener;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpKernel\EventListener\AddRequestFormatsListener;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\EventListener\AddRequestFormatsListener;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
diff --git a/vendor/symfony/http-kernel/Tests/EventListener/DebugHandlersListenerTest.php b/vendor/symfony/http-kernel/Tests/EventListener/DebugHandlersListenerTest.php
index 467b8dde..9a9c17ed 100644
--- a/vendor/symfony/http-kernel/Tests/EventListener/DebugHandlersListenerTest.php
+++ b/vendor/symfony/http-kernel/Tests/EventListener/DebugHandlersListenerTest.php
@@ -13,9 +13,9 @@ namespace Symfony\Component\HttpKernel\Tests\EventListener;
 
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LogLevel;
-use Symfony\Component\Console\Event\ConsoleEvent;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\ConsoleEvents;
+use Symfony\Component\Console\Event\ConsoleEvent;
 use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Output\ConsoleOutput;
diff --git a/vendor/symfony/http-kernel/Tests/EventListener/ExceptionListenerTest.php b/vendor/symfony/http-kernel/Tests/EventListener/ExceptionListenerTest.php
index b607bf90..5743696c 100644
--- a/vendor/symfony/http-kernel/Tests/EventListener/ExceptionListenerTest.php
+++ b/vendor/symfony/http-kernel/Tests/EventListener/ExceptionListenerTest.php
@@ -13,14 +13,14 @@ namespace Symfony\Component\HttpKernel\Tests\EventListener;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 use Symfony\Component\HttpKernel\EventListener\ExceptionListener;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
-use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Tests\Logger;
 
 /**
@@ -37,9 +37,9 @@ class ExceptionListenerTest extends TestCase
         $logger = new TestLogger();
         $l = new ExceptionListener('foo', $logger);
 
-        $_logger = new \ReflectionProperty(get_class($l), 'logger');
+        $_logger = new \ReflectionProperty(\get_class($l), 'logger');
         $_logger->setAccessible(true);
-        $_controller = new \ReflectionProperty(get_class($l), 'controller');
+        $_controller = new \ReflectionProperty(\get_class($l), 'controller');
         $_controller->setAccessible(true);
 
         $this->assertSame($logger, $_logger->getValue($l));
@@ -54,11 +54,13 @@ class ExceptionListenerTest extends TestCase
         $this->iniSet('error_log', file_exists('/dev/null') ? '/dev/null' : 'nul');
 
         $l = new ExceptionListener('foo');
+        $l->logKernelException($event);
         $l->onKernelException($event);
 
         $this->assertEquals(new Response('foo'), $event->getResponse());
 
         try {
+            $l->logKernelException($event2);
             $l->onKernelException($event2);
             $this->fail('RuntimeException expected');
         } catch (\RuntimeException $e) {
@@ -75,11 +77,13 @@ class ExceptionListenerTest extends TestCase
         $logger = new TestLogger();
 
         $l = new ExceptionListener('foo', $logger);
+        $l->logKernelException($event);
         $l->onKernelException($event);
 
         $this->assertEquals(new Response('foo'), $event->getResponse());
 
         try {
+            $l->logKernelException($event2);
             $l->onKernelException($event2);
             $this->fail('RuntimeException expected');
         } catch (\RuntimeException $e) {
@@ -151,30 +155,13 @@ class ExceptionListenerTest extends TestCase
         $this->assertFalse($response->headers->has('content-security-policy'), 'CSP header has been removed');
         $this->assertFalse($dispatcher->hasListeners(KernelEvents::RESPONSE), 'CSP removal listener has been removed');
     }
-
-    public function testNullController()
-    {
-        $listener = new ExceptionListener(null);
-        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
-        $kernel->expects($this->once())->method('handle')->will($this->returnCallback(function (Request $request) {
-            $controller = $request->attributes->get('_controller');
-
-            return $controller();
-        }));
-        $request = Request::create('/');
-        $event = new GetResponseForExceptionEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST, new \Exception('foo'));
-
-        $listener->onKernelException($event);
-
-        $this->assertContains('Whoops, looks like something went wrong.', $event->getResponse()->getContent());
-    }
 }
 
 class TestLogger extends Logger implements DebugLoggerInterface
 {
     public function countErrors()
     {
-        return count($this->logs['critical']);
+        return \count($this->logs['critical']);
     }
 }
 
diff --git a/vendor/symfony/http-kernel/Tests/EventListener/FragmentListenerTest.php b/vendor/symfony/http-kernel/Tests/EventListener/FragmentListenerTest.php
index 464b2ab4..edf04982 100644
--- a/vendor/symfony/http-kernel/Tests/EventListener/FragmentListenerTest.php
+++ b/vendor/symfony/http-kernel/Tests/EventListener/FragmentListenerTest.php
@@ -12,10 +12,10 @@
 namespace Symfony\Component\HttpKernel\Tests\EventListener;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpKernel\EventListener\FragmentListener;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\EventListener\FragmentListener;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\UriSigner;
 
 class FragmentListenerTest extends TestCase
diff --git a/vendor/symfony/http-kernel/Tests/EventListener/LocaleListenerTest.php b/vendor/symfony/http-kernel/Tests/EventListener/LocaleListenerTest.php
index 332393ee..f442235a 100644
--- a/vendor/symfony/http-kernel/Tests/EventListener/LocaleListenerTest.php
+++ b/vendor/symfony/http-kernel/Tests/EventListener/LocaleListenerTest.php
@@ -13,9 +13,9 @@ namespace Symfony\Component\HttpKernel\Tests\EventListener;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\EventListener\LocaleListener;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 
 class LocaleListenerTest extends TestCase
 {
diff --git a/vendor/symfony/http-kernel/Tests/EventListener/ProfilerListenerTest.php b/vendor/symfony/http-kernel/Tests/EventListener/ProfilerListenerTest.php
index 751aee86..526b3aa7 100644
--- a/vendor/symfony/http-kernel/Tests/EventListener/ProfilerListenerTest.php
+++ b/vendor/symfony/http-kernel/Tests/EventListener/ProfilerListenerTest.php
@@ -13,10 +13,10 @@ namespace Symfony\Component\HttpKernel\Tests\EventListener;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpKernel\EventListener\ProfilerListener;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 use Symfony\Component\HttpKernel\Event\PostResponseEvent;
+use Symfony\Component\HttpKernel\EventListener\ProfilerListener;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Kernel;
 
diff --git a/vendor/symfony/http-kernel/Tests/EventListener/ResponseListenerTest.php b/vendor/symfony/http-kernel/Tests/EventListener/ResponseListenerTest.php
index 12a31eb3..1d896026 100644
--- a/vendor/symfony/http-kernel/Tests/EventListener/ResponseListenerTest.php
+++ b/vendor/symfony/http-kernel/Tests/EventListener/ResponseListenerTest.php
@@ -12,13 +12,13 @@
 namespace Symfony\Component\HttpKernel\Tests\EventListener;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpKernel\EventListener\ResponseListener;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\EventListener\ResponseListener;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\EventDispatcher\EventDispatcher;
 
 class ResponseListenerTest extends TestCase
 {
diff --git a/vendor/symfony/http-kernel/Tests/EventListener/RouterListenerTest.php b/vendor/symfony/http-kernel/Tests/EventListener/RouterListenerTest.php
index 342dfc36..92e72729 100644
--- a/vendor/symfony/http-kernel/Tests/EventListener/RouterListenerTest.php
+++ b/vendor/symfony/http-kernel/Tests/EventListener/RouterListenerTest.php
@@ -18,12 +18,12 @@ use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
 use Symfony\Component\HttpKernel\Controller\ControllerResolver;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\EventListener\ExceptionListener;
 use Symfony\Component\HttpKernel\EventListener\RouterListener;
 use Symfony\Component\HttpKernel\EventListener\ValidateRequestListener;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\HttpKernel;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\Routing\Exception\NoConfigurationException;
 use Symfony\Component\Routing\RequestContext;
 
@@ -70,12 +70,7 @@ class RouterListenerTest extends TestCase
         );
     }
 
-    /**
-     * @param string $uri
-     *
-     * @return GetResponseEvent
-     */
-    private function createGetResponseEventForUri($uri)
+    private function createGetResponseEventForUri(string $uri): GetResponseEvent
     {
         $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
         $request = Request::create($uri);
diff --git a/vendor/symfony/http-kernel/Tests/EventListener/SaveSessionListenerTest.php b/vendor/symfony/http-kernel/Tests/EventListener/SaveSessionListenerTest.php
index 5492c3d7..a903fd58 100644
--- a/vendor/symfony/http-kernel/Tests/EventListener/SaveSessionListenerTest.php
+++ b/vendor/symfony/http-kernel/Tests/EventListener/SaveSessionListenerTest.php
@@ -19,6 +19,9 @@ use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\EventListener\SaveSessionListener;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 
+/**
+ * @group legacy
+ */
 class SaveSessionListenerTest extends TestCase
 {
     public function testOnlyTriggeredOnMasterRequest()
diff --git a/vendor/symfony/http-kernel/Tests/EventListener/SessionListenerTest.php b/vendor/symfony/http-kernel/Tests/EventListener/SessionListenerTest.php
index 34598363..03fb3763 100644
--- a/vendor/symfony/http-kernel/Tests/EventListener/SessionListenerTest.php
+++ b/vendor/symfony/http-kernel/Tests/EventListener/SessionListenerTest.php
@@ -13,11 +13,13 @@ namespace Symfony\Component\HttpKernel\Tests\EventListener;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Session;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\EventListener\AbstractSessionListener;
 use Symfony\Component\HttpKernel\EventListener\SessionListener;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -55,13 +57,75 @@ class SessionListenerTest extends TestCase
         $this->assertSame($session, $request->getSession());
     }
 
-    public function testResponseIsPrivate()
+    public function testResponseIsPrivateIfSessionStarted()
     {
         $session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
-        $session->expects($this->once())->method('isStarted')->willReturn(false);
-        $session->expects($this->once())->method('hasBeenStarted')->willReturn(true);
+        $session->expects($this->exactly(2))->method('getUsageIndex')->will($this->onConsecutiveCalls(0, 1));
 
         $container = new Container();
+        $container->set('initialized_session', $session);
+
+        $listener = new SessionListener($container);
+        $kernel = $this->getMockBuilder(HttpKernelInterface::class)->disableOriginalConstructor()->getMock();
+
+        $request = new Request();
+        $listener->onKernelRequest(new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST));
+
+        $response = new Response();
+        $listener->onKernelResponse(new FilterResponseEvent($kernel, new Request(), HttpKernelInterface::MASTER_REQUEST, $response));
+
+        $this->assertTrue($response->headers->hasCacheControlDirective('private'));
+        $this->assertTrue($response->headers->hasCacheControlDirective('must-revalidate'));
+        $this->assertSame('0', $response->headers->getCacheControlDirective('max-age'));
+        $this->assertFalse($response->headers->has(AbstractSessionListener::NO_AUTO_CACHE_CONTROL_HEADER));
+    }
+
+    public function testResponseIsStillPublicIfSessionStartedAndHeaderPresent()
+    {
+        $session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
+        $session->expects($this->exactly(2))->method('getUsageIndex')->will($this->onConsecutiveCalls(0, 1));
+
+        $container = new Container();
+        $container->set('initialized_session', $session);
+
+        $listener = new SessionListener($container);
+        $kernel = $this->getMockBuilder(HttpKernelInterface::class)->disableOriginalConstructor()->getMock();
+
+        $request = new Request();
+        $listener->onKernelRequest(new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST));
+
+        $response = new Response();
+        $response->setSharedMaxAge(60);
+        $response->headers->set(AbstractSessionListener::NO_AUTO_CACHE_CONTROL_HEADER, 'true');
+        $listener->onKernelResponse(new FilterResponseEvent($kernel, new Request(), HttpKernelInterface::MASTER_REQUEST, $response));
+
+        $this->assertTrue($response->headers->hasCacheControlDirective('public'));
+        $this->assertFalse($response->headers->hasCacheControlDirective('private'));
+        $this->assertFalse($response->headers->hasCacheControlDirective('must-revalidate'));
+        $this->assertSame('60', $response->headers->getCacheControlDirective('s-maxage'));
+        $this->assertFalse($response->headers->has(AbstractSessionListener::NO_AUTO_CACHE_CONTROL_HEADER));
+    }
+
+    public function testUninitilizedSession()
+    {
+        $event = $this->getMockBuilder(FilterResponseEvent::class)->disableOriginalConstructor()->getMock();
+        $event->expects($this->once())->method('isMasterRequest')->willReturn(true);
+
+        $container = new ServiceLocator(array(
+            'initialized_session' => function () {},
+        ));
+
+        $listener = new SessionListener($container);
+        $listener->onKernelResponse($event);
+    }
+
+    public function testSurrogateMasterRequestIsPublic()
+    {
+        $session = $this->getMockBuilder(Session::class)->disableOriginalConstructor()->getMock();
+        $session->expects($this->exactly(4))->method('getUsageIndex')->will($this->onConsecutiveCalls(0, 1, 1, 1));
+
+        $container = new Container();
+        $container->set('initialized_session', $session);
         $container->set('session', $session);
 
         $listener = new SessionListener($container);
@@ -69,7 +133,20 @@ class SessionListenerTest extends TestCase
 
         $request = new Request();
         $response = new Response();
+        $response->setCache(array('public' => true, 'max_age' => '30'));
         $listener->onKernelRequest(new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST));
+        $this->assertTrue($request->hasSession());
+
+        $subRequest = clone $request;
+        $this->assertSame($request->getSession(), $subRequest->getSession());
+        $listener->onKernelRequest(new GetResponseEvent($kernel, $subRequest, HttpKernelInterface::MASTER_REQUEST));
+        $listener->onKernelResponse(new FilterResponseEvent($kernel, $subRequest, HttpKernelInterface::MASTER_REQUEST, $response));
+        $listener->onFinishRequest(new FinishRequestEvent($kernel, $subRequest, HttpKernelInterface::MASTER_REQUEST));
+
+        $this->assertFalse($response->headers->hasCacheControlDirective('private'));
+        $this->assertFalse($response->headers->hasCacheControlDirective('must-revalidate'));
+        $this->assertSame('30', $response->headers->getCacheControlDirective('max-age'));
+
         $listener->onKernelResponse(new FilterResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST, $response));
 
         $this->assertTrue($response->headers->hasCacheControlDirective('private'));
diff --git a/vendor/symfony/http-kernel/Tests/EventListener/SurrogateListenerTest.php b/vendor/symfony/http-kernel/Tests/EventListener/SurrogateListenerTest.php
index 1e79ebe0..b955c07d 100644
--- a/vendor/symfony/http-kernel/Tests/EventListener/SurrogateListenerTest.php
+++ b/vendor/symfony/http-kernel/Tests/EventListener/SurrogateListenerTest.php
@@ -12,14 +12,14 @@
 namespace Symfony\Component\HttpKernel\Tests\EventListener;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpKernel\HttpCache\Esi;
-use Symfony\Component\HttpKernel\EventListener\SurrogateListener;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\HttpKernel\EventListener\SurrogateListener;
+use Symfony\Component\HttpKernel\HttpCache\Esi;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpKernel\KernelEvents;
 
 class SurrogateListenerTest extends TestCase
 {
diff --git a/vendor/symfony/http-kernel/Tests/EventListener/TestSessionListenerTest.php b/vendor/symfony/http-kernel/Tests/EventListener/TestSessionListenerTest.php
index 22a2b712..b06dca3c 100644
--- a/vendor/symfony/http-kernel/Tests/EventListener/TestSessionListenerTest.php
+++ b/vendor/symfony/http-kernel/Tests/EventListener/TestSessionListenerTest.php
@@ -13,14 +13,14 @@ namespace Symfony\Component\HttpKernel\Tests\EventListener;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\EventListener\SessionListener;
 use Symfony\Component\HttpKernel\EventListener\TestSessionListener;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
  * SessionListenerTest.
@@ -106,6 +106,36 @@ class TestSessionListenerTest extends TestCase
         $this->assertNotEmpty($response->headers->getCookies());
     }
 
+    /**
+     * @dataProvider anotherCookieProvider
+     */
+    public function testSessionWithNewSessionIdAndNewCookieDoesNotSendAnotherCookie($existing, array $expected)
+    {
+        $this->sessionHasBeenStarted();
+        $this->sessionIsEmpty();
+        $this->fixSessionId('456');
+
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $request = Request::create('/', 'GET', array(), array('MOCKSESSID' => '123'));
+        $event = new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
+        $this->listener->onKernelRequest($event);
+
+        $response = new Response('', 200, array('Set-Cookie' => $existing));
+
+        $response = $this->filterResponse(new Request(), HttpKernelInterface::MASTER_REQUEST, $response);
+
+        $this->assertSame($expected, $response->headers->get('Set-Cookie', null, false));
+    }
+
+    public function anotherCookieProvider()
+    {
+        return array(
+            'same' => array('MOCKSESSID=789; path=/', array('MOCKSESSID=789; path=/')),
+            'different domain' => array('MOCKSESSID=789; path=/; domain=example.com', array('MOCKSESSID=789; path=/; domain=example.com', 'MOCKSESSID=456; path=/')),
+            'different path' => array('MOCKSESSID=789; path=/foo', array('MOCKSESSID=789; path=/foo', 'MOCKSESSID=456; path=/')),
+        );
+    }
+
     public function testUnstartedSessionIsNotSave()
     {
         $this->sessionHasNotBeenStarted();
@@ -123,10 +153,20 @@ class TestSessionListenerTest extends TestCase
         $this->assertFalse(is_subclass_of(TestSessionListener::class, ServiceSubscriberInterface::class, 'Implementing ServiceSubscriberInterface would create a dep on the DI component, which eg Silex cannot afford'));
     }
 
-    private function filterResponse(Request $request, $type = HttpKernelInterface::MASTER_REQUEST)
+    public function testDoesNotThrowIfRequestDoesNotHaveASession()
+    {
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $event = new FilterResponseEvent($kernel, new Request(), HttpKernelInterface::MASTER_REQUEST, new Response());
+
+        $this->listener->onKernelResponse($event);
+
+        $this->assertTrue(true);
+    }
+
+    private function filterResponse(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, Response $response = null)
     {
         $request->setSession($this->session);
-        $response = new Response();
+        $response = $response ?: new Response();
         $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
         $event = new FilterResponseEvent($kernel, $request, $type, $response);
 
diff --git a/vendor/symfony/http-kernel/Tests/EventListener/ValidateRequestListenerTest.php b/vendor/symfony/http-kernel/Tests/EventListener/ValidateRequestListenerTest.php
index d0609432..bdab742c 100644
--- a/vendor/symfony/http-kernel/Tests/EventListener/ValidateRequestListenerTest.php
+++ b/vendor/symfony/http-kernel/Tests/EventListener/ValidateRequestListenerTest.php
@@ -14,13 +14,18 @@ namespace Symfony\Component\HttpKernel\Tests\EventListener;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\EventListener\ValidateRequestListener;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\EventListener\ValidateRequestListener;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 class ValidateRequestListenerTest extends TestCase
 {
+    protected function tearDown()
+    {
+        Request::setTrustedProxies(array(), -1);
+    }
+
     /**
      * @expectedException \Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException
      */
diff --git a/vendor/symfony/http-kernel/Tests/Exception/MethodNotAllowedHttpExceptionTest.php b/vendor/symfony/http-kernel/Tests/Exception/MethodNotAllowedHttpExceptionTest.php
index b5def13c..ea820149 100644
--- a/vendor/symfony/http-kernel/Tests/Exception/MethodNotAllowedHttpExceptionTest.php
+++ b/vendor/symfony/http-kernel/Tests/Exception/MethodNotAllowedHttpExceptionTest.php
@@ -12,6 +12,19 @@ class MethodNotAllowedHttpExceptionTest extends HttpExceptionTest
         $this->assertSame(array('Allow' => 'GET, PUT'), $exception->getHeaders());
     }
 
+    public function testWithHeaderConstruct()
+    {
+        $headers = array(
+            'Cache-Control' => 'public, s-maxage=1200',
+        );
+
+        $exception = new MethodNotAllowedHttpException(array('get'), null, null, null, $headers);
+
+        $headers['Allow'] = 'GET';
+
+        $this->assertSame($headers, $exception->getHeaders());
+    }
+
     /**
      * @dataProvider headerDataProvider
      */
diff --git a/vendor/symfony/http-kernel/Tests/Exception/ServiceUnavailableHttpExceptionTest.php b/vendor/symfony/http-kernel/Tests/Exception/ServiceUnavailableHttpExceptionTest.php
index e41a23d4..83cbdc2b 100644
--- a/vendor/symfony/http-kernel/Tests/Exception/ServiceUnavailableHttpExceptionTest.php
+++ b/vendor/symfony/http-kernel/Tests/Exception/ServiceUnavailableHttpExceptionTest.php
@@ -12,6 +12,19 @@ class ServiceUnavailableHttpExceptionTest extends HttpExceptionTest
         $this->assertSame(array('Retry-After' => 10), $exception->getHeaders());
     }
 
+    public function testWithHeaderConstruct()
+    {
+        $headers = array(
+            'Cache-Control' => 'public, s-maxage=1337',
+        );
+
+        $exception = new ServiceUnavailableHttpException(1337, null, null, null, $headers);
+
+        $headers['Retry-After'] = 1337;
+
+        $this->assertSame($headers, $exception->getHeaders());
+    }
+
     /**
      * @dataProvider headerDataProvider
      */
diff --git a/vendor/symfony/http-kernel/Tests/Exception/TooManyRequestsHttpExceptionTest.php b/vendor/symfony/http-kernel/Tests/Exception/TooManyRequestsHttpExceptionTest.php
index 2079bb33..6ec7f3d0 100644
--- a/vendor/symfony/http-kernel/Tests/Exception/TooManyRequestsHttpExceptionTest.php
+++ b/vendor/symfony/http-kernel/Tests/Exception/TooManyRequestsHttpExceptionTest.php
@@ -12,6 +12,19 @@ class TooManyRequestsHttpExceptionTest extends HttpExceptionTest
         $this->assertSame(array('Retry-After' => 10), $exception->getHeaders());
     }
 
+    public function testWithHeaderConstruct()
+    {
+        $headers = array(
+            'Cache-Control' => 'public, s-maxage=69',
+        );
+
+        $exception = new TooManyRequestsHttpException(69, null, null, null, $headers);
+
+        $headers['Retry-After'] = 69;
+
+        $this->assertSame($headers, $exception->getHeaders());
+    }
+
     /**
      * @dataProvider headerDataProvider
      */
diff --git a/vendor/symfony/http-kernel/Tests/Exception/UnauthorizedHttpExceptionTest.php b/vendor/symfony/http-kernel/Tests/Exception/UnauthorizedHttpExceptionTest.php
index 37a0028d..1e93d25b 100644
--- a/vendor/symfony/http-kernel/Tests/Exception/UnauthorizedHttpExceptionTest.php
+++ b/vendor/symfony/http-kernel/Tests/Exception/UnauthorizedHttpExceptionTest.php
@@ -12,6 +12,19 @@ class UnauthorizedHttpExceptionTest extends HttpExceptionTest
         $this->assertSame(array('WWW-Authenticate' => 'Challenge'), $exception->getHeaders());
     }
 
+    public function testWithHeaderConstruct()
+    {
+        $headers = array(
+            'Cache-Control' => 'public, s-maxage=1200',
+        );
+
+        $exception = new UnauthorizedHttpException('Challenge', null, null, null, $headers);
+
+        $headers['WWW-Authenticate'] = 'Challenge';
+
+        $this->assertSame($headers, $exception->getHeaders());
+    }
+
     /**
      * @dataProvider headerDataProvider
      */
diff --git a/vendor/symfony/http-kernel/Tests/Fixtures/123/Kernel123.php b/vendor/symfony/http-kernel/Tests/Fixtures/123/Kernel123.php
index b6cf1cba..d3a76684 100644
--- a/vendor/symfony/http-kernel/Tests/Fixtures/123/Kernel123.php
+++ b/vendor/symfony/http-kernel/Tests/Fixtures/123/Kernel123.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\Tests\Fixtures\_123;
 
-use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpKernel\Kernel;
 
 class Kernel123 extends Kernel
 {
diff --git a/vendor/symfony/http-kernel/Tests/Fixtures/KernelForOverrideName.php b/vendor/symfony/http-kernel/Tests/Fixtures/KernelForOverrideName.php
index a1102ab7..f7baaa63 100644
--- a/vendor/symfony/http-kernel/Tests/Fixtures/KernelForOverrideName.php
+++ b/vendor/symfony/http-kernel/Tests/Fixtures/KernelForOverrideName.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\Tests\Fixtures;
 
-use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpKernel\Kernel;
 
 class KernelForOverrideName extends Kernel
 {
diff --git a/vendor/symfony/http-kernel/Tests/Fixtures/KernelForTest.php b/vendor/symfony/http-kernel/Tests/Fixtures/KernelForTest.php
index 5fd61bbc..9acee4ca 100644
--- a/vendor/symfony/http-kernel/Tests/Fixtures/KernelForTest.php
+++ b/vendor/symfony/http-kernel/Tests/Fixtures/KernelForTest.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\HttpKernel\Tests\Fixtures;
 
-use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpKernel\Kernel;
 
 class KernelForTest extends Kernel
 {
diff --git a/vendor/symfony/http-kernel/Tests/Fixtures/TestEventDispatcher.php b/vendor/symfony/http-kernel/Tests/Fixtures/TestEventDispatcher.php
index ca2e6a69..d5456fe5 100644
--- a/vendor/symfony/http-kernel/Tests/Fixtures/TestEventDispatcher.php
+++ b/vendor/symfony/http-kernel/Tests/Fixtures/TestEventDispatcher.php
@@ -11,10 +11,9 @@
 
 namespace Symfony\Component\HttpKernel\Tests\Fixtures;
 
-use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcherInterface;
-use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcher;
 
-class TestEventDispatcher extends EventDispatcher implements TraceableEventDispatcherInterface
+class TestEventDispatcher extends TraceableEventDispatcher
 {
     public function getCalledListeners()
     {
@@ -29,4 +28,9 @@ class TestEventDispatcher extends EventDispatcher implements TraceableEventDispa
     public function reset()
     {
     }
+
+    public function getOrphanedEvents()
+    {
+        return array();
+    }
 }
diff --git a/vendor/symfony/http-kernel/Tests/Fragment/EsiFragmentRendererTest.php b/vendor/symfony/http-kernel/Tests/Fragment/EsiFragmentRendererTest.php
index 7099b4d7..7ac1f4fa 100644
--- a/vendor/symfony/http-kernel/Tests/Fragment/EsiFragmentRendererTest.php
+++ b/vendor/symfony/http-kernel/Tests/Fragment/EsiFragmentRendererTest.php
@@ -12,10 +12,10 @@
 namespace Symfony\Component\HttpKernel\Tests\Fragment;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Controller\ControllerReference;
 use Symfony\Component\HttpKernel\Fragment\EsiFragmentRenderer;
 use Symfony\Component\HttpKernel\HttpCache\Esi;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\UriSigner;
 
 class EsiFragmentRendererTest extends TestCase
@@ -26,19 +26,7 @@ class EsiFragmentRendererTest extends TestCase
         $strategy->render('/', Request::create('/'));
     }
 
-    /**
-     * @group legacy
-     * @expectedDeprecation Passing non-scalar values as part of URI attributes to the ESI and SSI rendering strategies is deprecated %s.
-     */
-    public function testRenderFallbackWithObjectAttributesIsDeprecated()
-    {
-        $strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy(true), new UriSigner('foo'));
-        $request = Request::create('/');
-        $reference = new ControllerReference('main_controller', array('foo' => new \stdClass()), array());
-        $strategy->render($reference, $request);
-    }
-
-    public function testRenderFallbackWithScalarIsNotDeprecated()
+    public function testRenderFallbackWithScalar()
     {
         $strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy(true), new UriSigner('foo'));
         $request = Request::create('/');
diff --git a/vendor/symfony/http-kernel/Tests/Fragment/FragmentHandlerTest.php b/vendor/symfony/http-kernel/Tests/Fragment/FragmentHandlerTest.php
index 9c906b50..a296aa0e 100644
--- a/vendor/symfony/http-kernel/Tests/Fragment/FragmentHandlerTest.php
+++ b/vendor/symfony/http-kernel/Tests/Fragment/FragmentHandlerTest.php
@@ -12,9 +12,9 @@
 namespace Symfony\Component\HttpKernel\Tests\Fragment;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
 
 /**
  * @group time-sensitive
@@ -88,7 +88,7 @@ class FragmentHandlerTest extends TestCase
         ;
 
         if ($arguments) {
-            call_user_func_array(array($e, 'with'), $arguments);
+            \call_user_func_array(array($e, 'with'), $arguments);
         }
 
         $handler = new FragmentHandler($this->requestStack);
diff --git a/vendor/symfony/http-kernel/Tests/Fragment/HIncludeFragmentRendererTest.php b/vendor/symfony/http-kernel/Tests/Fragment/HIncludeFragmentRendererTest.php
index 1be052e5..10fbccf0 100644
--- a/vendor/symfony/http-kernel/Tests/Fragment/HIncludeFragmentRendererTest.php
+++ b/vendor/symfony/http-kernel/Tests/Fragment/HIncludeFragmentRendererTest.php
@@ -12,10 +12,10 @@
 namespace Symfony\Component\HttpKernel\Tests\Fragment;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Controller\ControllerReference;
 use Symfony\Component\HttpKernel\Fragment\HIncludeFragmentRenderer;
 use Symfony\Component\HttpKernel\UriSigner;
-use Symfony\Component\HttpFoundation\Request;
 
 class HIncludeFragmentRendererTest extends TestCase
 {
@@ -86,4 +86,17 @@ class HIncludeFragmentRendererTest extends TestCase
         $strategy = new HIncludeFragmentRenderer($engine);
         $this->assertEquals('<hx:include src="/foo">default</hx:include>', $strategy->render('/foo', Request::create('/'), array('default' => 'default'))->getContent());
     }
+
+    public function testRenderWithEngineAndDefaultText()
+    {
+        $engine = $this->getMockBuilder('Symfony\\Component\\Templating\\EngineInterface')->getMock();
+        $engine->expects($this->once())
+            ->method('exists')
+            ->with('loading...')
+            ->will($this->throwException(new \RuntimeException()));
+
+        // only default
+        $strategy = new HIncludeFragmentRenderer($engine);
+        $this->assertEquals('<hx:include src="/foo">loading...</hx:include>', $strategy->render('/foo', Request::create('/'), array('default' => 'loading...'))->getContent());
+    }
 }
diff --git a/vendor/symfony/http-kernel/Tests/Fragment/InlineFragmentRendererTest.php b/vendor/symfony/http-kernel/Tests/Fragment/InlineFragmentRendererTest.php
index 18e55a5b..ceaa249a 100644
--- a/vendor/symfony/http-kernel/Tests/Fragment/InlineFragmentRendererTest.php
+++ b/vendor/symfony/http-kernel/Tests/Fragment/InlineFragmentRendererTest.php
@@ -12,16 +12,14 @@
 namespace Symfony\Component\HttpKernel\Tests\Fragment;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
-use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Controller\ControllerReference;
-use Symfony\Component\HttpKernel\HttpKernel;
 use Symfony\Component\HttpKernel\Fragment\InlineFragmentRenderer;
+use Symfony\Component\HttpKernel\HttpKernel;
 use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\EventDispatcher\EventDispatcher;
 
 class InlineFragmentRendererTest extends TestCase
 {
@@ -46,60 +44,24 @@ class InlineFragmentRendererTest extends TestCase
         $subRequest = Request::create('/_fragment?_path=_format%3Dhtml%26_locale%3Den%26_controller%3Dmain_controller');
         $subRequest->attributes->replace(array('object' => $object, '_format' => 'html', '_controller' => 'main_controller', '_locale' => 'en'));
         $subRequest->headers->set('x-forwarded-for', array('127.0.0.1'));
+        $subRequest->headers->set('forwarded', array('for="127.0.0.1";host="localhost";proto=http'));
         $subRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
+        $subRequest->server->set('HTTP_FORWARDED', 'for="127.0.0.1";host="localhost";proto=http');
 
         $strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest($subRequest));
 
         $this->assertSame('foo', $strategy->render(new ControllerReference('main_controller', array('object' => $object), array()), Request::create('/'))->getContent());
     }
 
-    /**
-     * @group legacy
-     */
-    public function testRenderWithObjectsAsAttributesPassedAsObjectsInTheControllerLegacy()
-    {
-        $resolver = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolver')->setMethods(array('getController'))->getMock();
-        $resolver
-            ->expects($this->once())
-            ->method('getController')
-            ->will($this->returnValue(function (\stdClass $object, Bar $object1) {
-                return new Response($object1->getBar());
-            }))
-        ;
-
-        $kernel = new HttpKernel(new EventDispatcher(), $resolver, new RequestStack());
-        $renderer = new InlineFragmentRenderer($kernel);
-
-        $response = $renderer->render(new ControllerReference('main_controller', array('object' => new \stdClass(), 'object1' => new Bar()), array()), Request::create('/'));
-        $this->assertEquals('bar', $response->getContent());
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testRenderWithObjectsAsAttributesPassedAsObjectsInTheController()
-    {
-        $resolver = $this->getMockBuilder(ControllerResolverInterface::class)->getMock();
-        $resolver
-            ->expects($this->once())
-            ->method('getController')
-            ->will($this->returnValue(function (\stdClass $object, Bar $object1) {
-                return new Response($object1->getBar());
-            }))
-        ;
-
-        $kernel = new HttpKernel(new EventDispatcher(), $resolver, new RequestStack(), new ArgumentResolver());
-        $renderer = new InlineFragmentRenderer($kernel);
-
-        $response = $renderer->render(new ControllerReference('main_controller', array('object' => new \stdClass(), 'object1' => new Bar()), array()), Request::create('/'));
-        $this->assertEquals('bar', $response->getContent());
-    }
-
     public function testRenderWithTrustedHeaderDisabled()
     {
         Request::setTrustedProxies(array(), 0);
 
-        $strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest(Request::create('/')));
+        $expectedSubRequest = Request::create('/');
+        $expectedSubRequest->headers->set('x-forwarded-for', array('127.0.0.1'));
+        $expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
+
+        $strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest($expectedSubRequest));
         $this->assertSame('foo', $strategy->render('/', Request::create('/'))->getContent());
 
         Request::setTrustedProxies(array(), -1);
@@ -183,6 +145,26 @@ class InlineFragmentRendererTest extends TestCase
         $this->assertEquals('Foo', ob_get_clean());
     }
 
+    public function testLocaleAndFormatAreIsKeptInSubrequest()
+    {
+        $expectedSubRequest = Request::create('/');
+        $expectedSubRequest->attributes->set('_format', 'foo');
+        $expectedSubRequest->setLocale('fr');
+        if (Request::HEADER_X_FORWARDED_FOR & Request::getTrustedHeaderSet()) {
+            $expectedSubRequest->headers->set('x-forwarded-for', array('127.0.0.1'));
+            $expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
+        }
+        $expectedSubRequest->headers->set('forwarded', array('for="127.0.0.1";host="localhost";proto=http'));
+        $expectedSubRequest->server->set('HTTP_FORWARDED', 'for="127.0.0.1";host="localhost";proto=http');
+
+        $strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest($expectedSubRequest));
+
+        $request = Request::create('/');
+        $request->attributes->set('_format', 'foo');
+        $request->setLocale('fr');
+        $strategy->render('/', $request);
+    }
+
     public function testESIHeaderIsKeptInSubrequest()
     {
         $expectedSubRequest = Request::create('/');
@@ -192,6 +174,8 @@ class InlineFragmentRendererTest extends TestCase
             $expectedSubRequest->headers->set('x-forwarded-for', array('127.0.0.1'));
             $expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
         }
+        $expectedSubRequest->headers->set('forwarded', array('for="127.0.0.1";host="localhost";proto=http'));
+        $expectedSubRequest->server->set('HTTP_FORWARDED', 'for="127.0.0.1";host="localhost";proto=http');
 
         $strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest($expectedSubRequest));
 
@@ -202,7 +186,7 @@ class InlineFragmentRendererTest extends TestCase
 
     public function testESIHeaderIsKeptInSubrequestWithTrustedHeaderDisabled()
     {
-        Request::setTrustedProxies(array(), 0);
+        Request::setTrustedProxies(array(), Request::HEADER_FORWARDED);
 
         $this->testESIHeaderIsKeptInSubrequest();
 
@@ -212,16 +196,58 @@ class InlineFragmentRendererTest extends TestCase
     public function testHeadersPossiblyResultingIn304AreNotAssignedToSubrequest()
     {
         $expectedSubRequest = Request::create('/');
-        if (Request::HEADER_X_FORWARDED_FOR & Request::getTrustedHeaderSet()) {
-            $expectedSubRequest->headers->set('x-forwarded-for', array('127.0.0.1'));
-            $expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
-        }
+        $expectedSubRequest->headers->set('x-forwarded-for', array('127.0.0.1'));
+        $expectedSubRequest->headers->set('forwarded', array('for="127.0.0.1";host="localhost";proto=http'));
+        $expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
+        $expectedSubRequest->server->set('HTTP_FORWARDED', 'for="127.0.0.1";host="localhost";proto=http');
 
         $strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest($expectedSubRequest));
         $request = Request::create('/', 'GET', array(), array(), array(), array('HTTP_IF_MODIFIED_SINCE' => 'Fri, 01 Jan 2016 00:00:00 GMT', 'HTTP_IF_NONE_MATCH' => '*'));
         $strategy->render('/', $request);
     }
 
+    public function testFirstTrustedProxyIsSetAsRemote()
+    {
+        Request::setTrustedProxies(array('1.1.1.1'), -1);
+
+        $expectedSubRequest = Request::create('/');
+        $expectedSubRequest->headers->set('Surrogate-Capability', 'abc="ESI/1.0"');
+        $expectedSubRequest->server->set('REMOTE_ADDR', '127.0.0.1');
+        $expectedSubRequest->headers->set('x-forwarded-for', array('127.0.0.1'));
+        $expectedSubRequest->headers->set('forwarded', array('for="127.0.0.1";host="localhost";proto=http'));
+        $expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
+        $expectedSubRequest->server->set('HTTP_FORWARDED', 'for="127.0.0.1";host="localhost";proto=http');
+
+        $strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest($expectedSubRequest));
+
+        $request = Request::create('/');
+        $request->headers->set('Surrogate-Capability', 'abc="ESI/1.0"');
+        $strategy->render('/', $request);
+
+        Request::setTrustedProxies(array(), -1);
+    }
+
+    public function testIpAddressOfRangedTrustedProxyIsSetAsRemote()
+    {
+        $expectedSubRequest = Request::create('/');
+        $expectedSubRequest->headers->set('Surrogate-Capability', 'abc="ESI/1.0"');
+        $expectedSubRequest->server->set('REMOTE_ADDR', '127.0.0.1');
+        $expectedSubRequest->headers->set('x-forwarded-for', array('127.0.0.1'));
+        $expectedSubRequest->headers->set('forwarded', array('for="127.0.0.1";host="localhost";proto=http'));
+        $expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
+        $expectedSubRequest->server->set('HTTP_FORWARDED', 'for="127.0.0.1";host="localhost";proto=http');
+
+        Request::setTrustedProxies(array('1.1.1.1/24'), -1);
+
+        $strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest($expectedSubRequest));
+
+        $request = Request::create('/');
+        $request->headers->set('Surrogate-Capability', 'abc="ESI/1.0"');
+        $strategy->render('/', $request);
+
+        Request::setTrustedProxies(array(), -1);
+    }
+
     /**
      * Creates a Kernel expecting a request equals to $request
      * Allows delta in comparison in case REQUEST_TIME changed by 1 second.
diff --git a/vendor/symfony/http-kernel/Tests/Fragment/SsiFragmentRendererTest.php b/vendor/symfony/http-kernel/Tests/Fragment/SsiFragmentRendererTest.php
index b537625f..f7258031 100644
--- a/vendor/symfony/http-kernel/Tests/Fragment/SsiFragmentRendererTest.php
+++ b/vendor/symfony/http-kernel/Tests/Fragment/SsiFragmentRendererTest.php
@@ -12,10 +12,10 @@
 namespace Symfony\Component\HttpKernel\Tests\Fragment;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Controller\ControllerReference;
 use Symfony\Component\HttpKernel\Fragment\SsiFragmentRenderer;
 use Symfony\Component\HttpKernel\HttpCache\Ssi;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\UriSigner;
 
 class SsiFragmentRendererTest extends TestCase
diff --git a/vendor/symfony/http-kernel/Tests/HttpCache/EsiTest.php b/vendor/symfony/http-kernel/Tests/HttpCache/EsiTest.php
index a8662b2a..863ad761 100644
--- a/vendor/symfony/http-kernel/Tests/HttpCache/EsiTest.php
+++ b/vendor/symfony/http-kernel/Tests/HttpCache/EsiTest.php
@@ -12,9 +12,9 @@
 namespace Symfony\Component\HttpKernel\Tests\HttpCache;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\HttpKernel\HttpCache\Esi;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpCache\Esi;
 
 class EsiTest extends TestCase
 {
@@ -231,10 +231,10 @@ class EsiTest extends TestCase
               ->method('getRequest')
               ->will($this->returnValue($request))
         ;
-        if (is_array($response)) {
+        if (\is_array($response)) {
             $cache->expects($this->any())
                   ->method('handle')
-                  ->will(call_user_func_array(array($this, 'onConsecutiveCalls'), $response))
+                  ->will(\call_user_func_array(array($this, 'onConsecutiveCalls'), $response))
             ;
         } else {
             $cache->expects($this->any())
diff --git a/vendor/symfony/http-kernel/Tests/HttpCache/HttpCacheTest.php b/vendor/symfony/http-kernel/Tests/HttpCache/HttpCacheTest.php
index 2a9a30d9..a41d8665 100644
--- a/vendor/symfony/http-kernel/Tests/HttpCache/HttpCacheTest.php
+++ b/vendor/symfony/http-kernel/Tests/HttpCache/HttpCacheTest.php
@@ -11,9 +11,11 @@
 
 namespace Symfony\Component\HttpKernel\Tests\HttpCache;
 
-use Symfony\Component\HttpKernel\HttpCache\HttpCache;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpCache\Esi;
+use Symfony\Component\HttpKernel\HttpCache\HttpCache;
+use Symfony\Component\HttpKernel\HttpCache\Store;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
@@ -213,7 +215,7 @@ class HttpCacheTest extends HttpCacheTestCase
             if ($request->cookies->has('authenticated')) {
                 $response->headers->set('Cache-Control', 'private, no-store');
                 $response->setETag('"private tag"');
-                if (in_array('"private tag"', $etags)) {
+                if (\in_array('"private tag"', $etags)) {
                     $response->setStatusCode(304);
                 } else {
                     $response->setStatusCode(200);
@@ -223,7 +225,7 @@ class HttpCacheTest extends HttpCacheTestCase
             } else {
                 $response->headers->set('Cache-Control', 'public');
                 $response->setETag('"public tag"');
-                if (in_array('"public tag"', $etags)) {
+                if (\in_array('"public tag"', $etags)) {
                     $response->setStatusCode(304);
                 } else {
                     $response->setStatusCode(200);
@@ -564,7 +566,7 @@ class HttpCacheTest extends HttpCacheTestCase
 
     public function testDegradationWhenCacheLocked()
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('Skips on windows to avoid permissions issues.');
         }
 
@@ -992,7 +994,7 @@ class HttpCacheTest extends HttpCacheTestCase
         $this->assertHttpKernelIsNotCalled();
         $this->assertEquals(200, $this->response->getStatusCode());
         $this->assertEquals('', $this->response->getContent());
-        $this->assertEquals(strlen('Hello World'), $this->response->headers->get('Content-Length'));
+        $this->assertEquals(\strlen('Hello World'), $this->response->headers->get('Content-Length'));
     }
 
     public function testSendsNoContentWhenFresh()
@@ -1336,64 +1338,69 @@ class HttpCacheTest extends HttpCacheTestCase
         $this->setNextResponse();
         $this->request('GET', '/', array('REMOTE_ADDR' => '10.0.0.1'));
 
-        $this->assertEquals('127.0.0.1', $this->kernel->getBackendRequest()->server->get('REMOTE_ADDR'));
+        $this->kernel->assert(function ($backendRequest) {
+            $this->assertSame('127.0.0.1', $backendRequest->server->get('REMOTE_ADDR'));
+        });
     }
 
     /**
      * @dataProvider getTrustedProxyData
      */
-    public function testHttpCacheIsSetAsATrustedProxy(array $existing, array $expected)
+    public function testHttpCacheIsSetAsATrustedProxy(array $existing)
     {
         Request::setTrustedProxies($existing, Request::HEADER_X_FORWARDED_ALL);
 
         $this->setNextResponse();
         $this->request('GET', '/', array('REMOTE_ADDR' => '10.0.0.1'));
+        $this->assertSame($existing, Request::getTrustedProxies());
 
-        $this->assertEquals($expected, Request::getTrustedProxies());
+        $existing = array_unique(array_merge($existing, array('127.0.0.1')));
+        $this->kernel->assert(function ($backendRequest) use ($existing) {
+            $this->assertSame($existing, Request::getTrustedProxies());
+            $this->assertsame('10.0.0.1', $backendRequest->getClientIp());
+        });
+
+        Request::setTrustedProxies(array(), -1);
     }
 
     public function getTrustedProxyData()
     {
         return array(
-            array(array(), array('127.0.0.1')),
-            array(array('10.0.0.2'), array('10.0.0.2', '127.0.0.1')),
-            array(array('10.0.0.2', '127.0.0.1'), array('10.0.0.2', '127.0.0.1')),
+            array(array()),
+            array(array('10.0.0.2')),
+            array(array('10.0.0.2', '127.0.0.1')),
         );
     }
 
     /**
-     * @dataProvider getXForwardedForData
+     * @dataProvider getForwardedData
      */
-    public function testXForwarderForHeaderForForwardedRequests($xForwardedFor, $expected)
+    public function testForwarderHeaderForForwardedRequests($forwarded, $expected)
     {
         $this->setNextResponse();
         $server = array('REMOTE_ADDR' => '10.0.0.1');
-        if (false !== $xForwardedFor) {
-            $server['HTTP_X_FORWARDED_FOR'] = $xForwardedFor;
+        if (null !== $forwarded) {
+            Request::setTrustedProxies($server, -1);
+            $server['HTTP_FORWARDED'] = $forwarded;
         }
         $this->request('GET', '/', $server);
 
-        $this->assertEquals($expected, $this->kernel->getBackendRequest()->headers->get('X-Forwarded-For'));
+        $this->kernel->assert(function ($backendRequest) use ($expected) {
+            $this->assertSame($expected, $backendRequest->headers->get('Forwarded'));
+        });
+
+        Request::setTrustedProxies(array(), -1);
     }
 
-    public function getXForwardedForData()
+    public function getForwardedData()
     {
         return array(
-            array(false, '10.0.0.1'),
-            array('10.0.0.2', '10.0.0.2, 10.0.0.1'),
-            array('10.0.0.2, 10.0.0.3', '10.0.0.2, 10.0.0.3, 10.0.0.1'),
+            array(null, 'for="10.0.0.1";host="localhost";proto=http'),
+            array('for=10.0.0.2', 'for="10.0.0.2";host="localhost";proto=http, for="10.0.0.1"'),
+            array('for=10.0.0.2, for=10.0.0.3', 'for="10.0.0.2";host="localhost";proto=http, for="10.0.0.3", for="10.0.0.1"'),
         );
     }
 
-    public function testXForwarderForHeaderForPassRequests()
-    {
-        $this->setNextResponse();
-        $server = array('REMOTE_ADDR' => '10.0.0.1');
-        $this->request('POST', '/', $server);
-
-        $this->assertEquals('10.0.0.1', $this->kernel->getBackendRequest()->headers->get('X-Forwarded-For'));
-    }
-
     public function testEsiCacheRemoveValidationHeadersIfEmbeddedResponses()
     {
         $time = \DateTime::createFromFormat('U', time());
@@ -1465,6 +1472,42 @@ class HttpCacheTest extends HttpCacheTestCase
         $this->assertHttpKernelIsNotCalled();
         $this->assertSame('get', $this->response->getContent());
     }
+
+    public function testUsesOriginalRequestForSurrogate()
+    {
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $store = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpCache\StoreInterface')->getMock();
+
+        $kernel
+            ->expects($this->exactly(2))
+            ->method('handle')
+            ->willReturnCallback(function (Request $request) {
+                $this->assertSame('127.0.0.1', $request->server->get('REMOTE_ADDR'));
+
+                return new Response();
+            });
+
+        $cache = new HttpCache($kernel,
+            $store,
+            new Esi()
+        );
+
+        $request = Request::create('/');
+        $request->server->set('REMOTE_ADDR', '10.0.0.1');
+
+        // Main request
+        $cache->handle($request, HttpKernelInterface::MASTER_REQUEST);
+
+        // Main request was now modified by HttpCache
+        // The surrogate will ask for the request using $this->cache->getRequest()
+        // which MUST return the original request so the surrogate
+        // can actually behave like a reverse proxy like e.g. Varnish would.
+        $this->assertSame('10.0.0.1', $cache->getRequest()->getClientIp());
+        $this->assertSame('10.0.0.1', $cache->getRequest()->server->get('REMOTE_ADDR'));
+
+        // Surrogate request
+        $cache->handle($request, HttpKernelInterface::SUB_REQUEST);
+    }
 }
 
 class TestKernel implements HttpKernelInterface
diff --git a/vendor/symfony/http-kernel/Tests/HttpCache/HttpCacheTestCase.php b/vendor/symfony/http-kernel/Tests/HttpCache/HttpCacheTestCase.php
index ed5c690d..b3aa2be2 100644
--- a/vendor/symfony/http-kernel/Tests/HttpCache/HttpCacheTestCase.php
+++ b/vendor/symfony/http-kernel/Tests/HttpCache/HttpCacheTestCase.php
@@ -168,7 +168,7 @@ class HttpCacheTestCase extends TestCase
 
         $fp = opendir($directory);
         while (false !== $file = readdir($fp)) {
-            if (!in_array($file, array('.', '..'))) {
+            if (!\in_array($file, array('.', '..'))) {
                 if (is_link($directory.'/'.$file)) {
                     unlink($directory.'/'.$file);
                 } elseif (is_dir($directory.'/'.$file)) {
diff --git a/vendor/symfony/http-kernel/Tests/HttpCache/SsiTest.php b/vendor/symfony/http-kernel/Tests/HttpCache/SsiTest.php
index 1079d37a..26ef6cb2 100644
--- a/vendor/symfony/http-kernel/Tests/HttpCache/SsiTest.php
+++ b/vendor/symfony/http-kernel/Tests/HttpCache/SsiTest.php
@@ -198,10 +198,10 @@ class SsiTest extends TestCase
               ->method('getRequest')
               ->will($this->returnValue($request))
         ;
-        if (is_array($response)) {
+        if (\is_array($response)) {
             $cache->expects($this->any())
                   ->method('handle')
-                  ->will(call_user_func_array(array($this, 'onConsecutiveCalls'), $response))
+                  ->will(\call_user_func_array(array($this, 'onConsecutiveCalls'), $response))
             ;
         } else {
             $cache->expects($this->any())
diff --git a/vendor/symfony/http-kernel/Tests/HttpCache/SubRequestHandlerTest.php b/vendor/symfony/http-kernel/Tests/HttpCache/SubRequestHandlerTest.php
new file mode 100644
index 00000000..dfe0a734
--- /dev/null
+++ b/vendor/symfony/http-kernel/Tests/HttpCache/SubRequestHandlerTest.php
@@ -0,0 +1,153 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Tests\HttpCache;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpCache\SubRequestHandler;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+class SubRequestHandlerTest extends TestCase
+{
+    private static $globalState;
+
+    protected function setUp()
+    {
+        self::$globalState = $this->getGlobalState();
+    }
+
+    protected function tearDown()
+    {
+        Request::setTrustedProxies(self::$globalState[0], self::$globalState[1]);
+    }
+
+    public function testTrustedHeadersAreKept()
+    {
+        Request::setTrustedProxies(array('10.0.0.1'), -1);
+        $globalState = $this->getGlobalState();
+
+        $request = Request::create('/');
+        $request->server->set('REMOTE_ADDR', '10.0.0.1');
+        $request->headers->set('X-Forwarded-For', '10.0.0.2');
+        $request->headers->set('X-Forwarded-Host', 'Good');
+        $request->headers->set('X-Forwarded-Port', '1234');
+        $request->headers->set('X-Forwarded-Proto', 'https');
+
+        $kernel = new TestSubRequestHandlerKernel(function ($request, $type, $catch) {
+            $this->assertSame('127.0.0.1', $request->server->get('REMOTE_ADDR'));
+            $this->assertSame('10.0.0.2', $request->getClientIp());
+            $this->assertSame('Good', $request->headers->get('X-Forwarded-Host'));
+            $this->assertSame('1234', $request->headers->get('X-Forwarded-Port'));
+            $this->assertSame('https', $request->headers->get('X-Forwarded-Proto'));
+        });
+
+        SubRequestHandler::handle($kernel, $request, HttpKernelInterface::MASTER_REQUEST, true);
+
+        $this->assertSame($globalState, $this->getGlobalState());
+    }
+
+    public function testUntrustedHeadersAreRemoved()
+    {
+        $request = Request::create('/');
+        $request->server->set('REMOTE_ADDR', '10.0.0.1');
+        $request->headers->set('X-Forwarded-For', '10.0.0.2');
+        $request->headers->set('X-Forwarded-Host', 'Evil');
+        $request->headers->set('X-Forwarded-Port', '1234');
+        $request->headers->set('X-Forwarded-Proto', 'http');
+        $request->headers->set('Forwarded', 'Evil2');
+
+        $kernel = new TestSubRequestHandlerKernel(function ($request, $type, $catch) {
+            $this->assertSame('127.0.0.1', $request->server->get('REMOTE_ADDR'));
+            $this->assertSame('10.0.0.1', $request->getClientIp());
+            $this->assertFalse($request->headers->has('X-Forwarded-Host'));
+            $this->assertFalse($request->headers->has('X-Forwarded-Port'));
+            $this->assertFalse($request->headers->has('X-Forwarded-Proto'));
+            $this->assertSame('for="10.0.0.1";host="localhost";proto=http', $request->headers->get('Forwarded'));
+        });
+
+        SubRequestHandler::handle($kernel, $request, HttpKernelInterface::MASTER_REQUEST, true);
+
+        $this->assertSame(self::$globalState, $this->getGlobalState());
+    }
+
+    public function testTrustedForwardedHeader()
+    {
+        Request::setTrustedProxies(array('10.0.0.1'), -1);
+        $globalState = $this->getGlobalState();
+
+        $request = Request::create('/');
+        $request->server->set('REMOTE_ADDR', '10.0.0.1');
+        $request->headers->set('Forwarded', 'for="10.0.0.2";host="foo.bar:1234";proto=https');
+
+        $kernel = new TestSubRequestHandlerKernel(function ($request, $type, $catch) {
+            $this->assertSame('127.0.0.1', $request->server->get('REMOTE_ADDR'));
+            $this->assertSame('10.0.0.2', $request->getClientIp());
+            $this->assertSame('foo.bar:1234', $request->getHttpHost());
+            $this->assertSame('https', $request->getScheme());
+            $this->assertSame(1234, $request->getPort());
+        });
+
+        SubRequestHandler::handle($kernel, $request, HttpKernelInterface::MASTER_REQUEST, true);
+
+        $this->assertSame($globalState, $this->getGlobalState());
+    }
+
+    public function testTrustedXForwardedForHeader()
+    {
+        Request::setTrustedProxies(array('10.0.0.1'), -1);
+        $globalState = $this->getGlobalState();
+
+        $request = Request::create('/');
+        $request->server->set('REMOTE_ADDR', '10.0.0.1');
+        $request->headers->set('X-Forwarded-For', '10.0.0.2');
+        $request->headers->set('X-Forwarded-Host', 'foo.bar');
+        $request->headers->set('X-Forwarded-Proto', 'https');
+
+        $kernel = new TestSubRequestHandlerKernel(function ($request, $type, $catch) {
+            $this->assertSame('127.0.0.1', $request->server->get('REMOTE_ADDR'));
+            $this->assertSame('10.0.0.2', $request->getClientIp());
+            $this->assertSame('foo.bar', $request->getHttpHost());
+            $this->assertSame('https', $request->getScheme());
+        });
+
+        SubRequestHandler::handle($kernel, $request, HttpKernelInterface::MASTER_REQUEST, true);
+
+        $this->assertSame($globalState, $this->getGlobalState());
+    }
+
+    private function getGlobalState()
+    {
+        return array(
+            Request::getTrustedProxies(),
+            Request::getTrustedHeaderSet(),
+        );
+    }
+}
+
+class TestSubRequestHandlerKernel implements HttpKernelInterface
+{
+    private $assertCallback;
+
+    public function __construct(\Closure $assertCallback)
+    {
+        $this->assertCallback = $assertCallback;
+    }
+
+    public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true)
+    {
+        $assertCallback = $this->assertCallback;
+        $assertCallback($request, $type, $catch);
+
+        return new Response();
+    }
+}
diff --git a/vendor/symfony/http-kernel/Tests/HttpCache/TestHttpKernel.php b/vendor/symfony/http-kernel/Tests/HttpCache/TestHttpKernel.php
index 946c7a31..5dbf02c9 100644
--- a/vendor/symfony/http-kernel/Tests/HttpCache/TestHttpKernel.php
+++ b/vendor/symfony/http-kernel/Tests/HttpCache/TestHttpKernel.php
@@ -11,13 +11,13 @@
 
 namespace Symfony\Component\HttpKernel\Tests\HttpCache;
 
-use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
-use Symfony\Component\HttpKernel\HttpKernel;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
 use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
-use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpKernel\HttpKernel;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 class TestHttpKernel extends HttpKernel implements ControllerResolverInterface, ArgumentResolverInterface
 {
@@ -39,15 +39,25 @@ class TestHttpKernel extends HttpKernel implements ControllerResolverInterface,
         parent::__construct(new EventDispatcher(), $this, null, $this);
     }
 
-    public function getBackendRequest()
+    public function assert(\Closure $callback)
     {
-        return $this->backendRequest;
+        $trustedConfig = array(Request::getTrustedProxies(), Request::getTrustedHeaderSet());
+
+        list($trustedProxies, $trustedHeaderSet, $backendRequest) = $this->backendRequest;
+        Request::setTrustedProxies($trustedProxies, $trustedHeaderSet);
+
+        try {
+            $callback($backendRequest);
+        } finally {
+            list($trustedProxies, $trustedHeaderSet) = $trustedConfig;
+            Request::setTrustedProxies($trustedProxies, $trustedHeaderSet);
+        }
     }
 
     public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = false)
     {
         $this->catch = $catch;
-        $this->backendRequest = $request;
+        $this->backendRequest = array(Request::getTrustedProxies(), Request::getTrustedHeaderSet(), $request);
 
         return parent::handle($request, $type, $catch);
     }
diff --git a/vendor/symfony/http-kernel/Tests/HttpCache/TestMultipleHttpKernel.php b/vendor/symfony/http-kernel/Tests/HttpCache/TestMultipleHttpKernel.php
index 926d8daf..712132bd 100644
--- a/vendor/symfony/http-kernel/Tests/HttpCache/TestMultipleHttpKernel.php
+++ b/vendor/symfony/http-kernel/Tests/HttpCache/TestMultipleHttpKernel.php
@@ -11,13 +11,13 @@
 
 namespace Symfony\Component\HttpKernel\Tests\HttpCache;
 
-use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
-use Symfony\Component\HttpKernel\HttpKernel;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
 use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
-use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpKernel\HttpKernel;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 class TestMultipleHttpKernel extends HttpKernel implements ControllerResolverInterface, ArgumentResolverInterface
 {
diff --git a/vendor/symfony/http-kernel/Tests/HttpKernelTest.php b/vendor/symfony/http-kernel/Tests/HttpKernelTest.php
index 7aed26aa..c5326a33 100644
--- a/vendor/symfony/http-kernel/Tests/HttpKernelTest.php
+++ b/vendor/symfony/http-kernel/Tests/HttpKernelTest.php
@@ -12,21 +12,21 @@
 namespace Symfony\Component\HttpKernel\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
 use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
 use Symfony\Component\HttpKernel\Event\FilterControllerArgumentsEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 use Symfony\Component\HttpKernel\HttpKernel;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
-use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\EventDispatcher\EventDispatcher;
 
 class HttpKernelTest extends TestCase
 {
@@ -111,24 +111,6 @@ class HttpKernelTest extends TestCase
         $this->assertEquals('POST', $response->headers->get('Allow'));
     }
 
-    /**
-     * @group legacy
-     * @dataProvider getStatusCodes
-     */
-    public function testLegacyHandleWhenAnExceptionIsHandledWithASpecificStatusCode($responseStatusCode, $expectedStatusCode)
-    {
-        $dispatcher = new EventDispatcher();
-        $dispatcher->addListener(KernelEvents::EXCEPTION, function ($event) use ($responseStatusCode, $expectedStatusCode) {
-            $event->setResponse(new Response('', $responseStatusCode, array('X-Status-Code' => $expectedStatusCode)));
-        });
-
-        $kernel = $this->getHttpKernel($dispatcher, function () { throw new \RuntimeException(); });
-        $response = $kernel->handle(new Request());
-
-        $this->assertEquals($expectedStatusCode, $response->getStatusCode());
-        $this->assertFalse($response->headers->has('X-Status-Code'));
-    }
-
     public function getStatusCodes()
     {
         return array(
@@ -283,7 +265,7 @@ class HttpKernelTest extends TestCase
             $oldArguments = $event->getArguments();
 
             $newController = function ($id) use ($oldController, $oldArguments) {
-                $response = call_user_func_array($oldController, $oldArguments);
+                $response = \call_user_func_array($oldController, $oldArguments);
 
                 $response->headers->set('X-Id', $id);
 
@@ -349,6 +331,8 @@ class HttpKernelTest extends TestCase
 
         $kernel = $this->getHttpKernel($dispatcher);
         $kernel->handle($request, $kernel::MASTER_REQUEST, false);
+
+        Request::setTrustedProxies(array(), -1);
     }
 
     private function getHttpKernel(EventDispatcherInterface $eventDispatcher, $controller = null, RequestStack $requestStack = null, array $arguments = array())
diff --git a/vendor/symfony/http-kernel/Tests/KernelTest.php b/vendor/symfony/http-kernel/Tests/KernelTest.php
index a16ac37d..8926f208 100644
--- a/vendor/symfony/http-kernel/Tests/KernelTest.php
+++ b/vendor/symfony/http-kernel/Tests/KernelTest.php
@@ -16,16 +16,15 @@ use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
-use Symfony\Component\HttpKernel\Config\EnvParametersResource;
 use Symfony\Component\HttpKernel\DependencyInjection\ResettableServicePass;
 use Symfony\Component\HttpKernel\DependencyInjection\ServicesResetter;
-use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Tests\Fixtures\KernelForTest;
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpKernel\Tests\Fixtures\KernelForOverrideName;
+use Symfony\Component\HttpKernel\Tests\Fixtures\KernelForTest;
 use Symfony\Component\HttpKernel\Tests\Fixtures\KernelWithoutBundles;
 use Symfony\Component\HttpKernel\Tests\Fixtures\ResettableService;
 
@@ -75,7 +74,7 @@ class KernelTest extends TestCase
         $kernel = new CustomProjectDirKernel();
         $kernel->boot();
 
-        $containerDir = __DIR__.'/Fixtures/cache/custom/'.substr(get_class($kernel->getContainer()), 0, 16);
+        $containerDir = __DIR__.'/Fixtures/cache/custom/'.substr(\get_class($kernel->getContainer()), 0, 16);
         $this->assertTrue(unlink(__DIR__.'/Fixtures/cache/custom/FixturesCustomDebugProjectContainer.php.meta'));
         $this->assertFileExists($containerDir);
         $this->assertFileNotExists($containerDir.'.legacy');
@@ -124,20 +123,6 @@ class KernelTest extends TestCase
         $this->assertTrue($kernel->isBooted());
     }
 
-    /**
-     * @group legacy
-     */
-    public function testClassCacheIsLoaded()
-    {
-        $kernel = $this->getKernel(array('initializeBundles', 'initializeContainer', 'doLoadClassCache'));
-        $kernel->loadClassCache('name', '.extension');
-        $kernel->expects($this->once())
-            ->method('doLoadClassCache')
-            ->with('name', '.extension');
-
-        $kernel->boot();
-    }
-
     public function testClassCacheIsNotLoadedByDefault()
     {
         $kernel = $this->getKernel(array('initializeBundles', 'initializeContainer', 'doLoadClassCache'));
@@ -147,53 +132,6 @@ class KernelTest extends TestCase
         $kernel->boot();
     }
 
-    /**
-     * @group legacy
-     */
-    public function testClassCacheIsNotLoadedWhenKernelIsNotBooted()
-    {
-        $kernel = $this->getKernel(array('initializeBundles', 'initializeContainer', 'doLoadClassCache'));
-        $kernel->loadClassCache();
-        $kernel->expects($this->never())
-            ->method('doLoadClassCache');
-    }
-
-    public function testEnvParametersResourceIsAdded()
-    {
-        $container = new ContainerBuilder();
-        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\Tests\Fixtures\KernelForTest')
-            ->disableOriginalConstructor()
-            ->setMethods(array('getContainerBuilder', 'prepareContainer', 'getCacheDir', 'getLogDir'))
-            ->getMock();
-        $kernel->expects($this->any())
-            ->method('getContainerBuilder')
-            ->will($this->returnValue($container));
-        $kernel->expects($this->any())
-            ->method('prepareContainer')
-            ->will($this->returnValue(null));
-        $kernel->expects($this->any())
-            ->method('getCacheDir')
-            ->will($this->returnValue(sys_get_temp_dir()));
-        $kernel->expects($this->any())
-            ->method('getLogDir')
-            ->will($this->returnValue(sys_get_temp_dir()));
-
-        $reflection = new \ReflectionClass(get_class($kernel));
-        $method = $reflection->getMethod('buildContainer');
-        $method->setAccessible(true);
-        $method->invoke($kernel);
-
-        $found = false;
-        foreach ($container->getResources() as $resource) {
-            if ($resource instanceof EnvParametersResource) {
-                $found = true;
-                break;
-            }
-        }
-
-        $this->assertTrue($found);
-    }
-
     public function testBootKernelSeveralTimesOnlyInitializesBundlesOnce()
     {
         $kernel = $this->getKernel(array('initializeBundles', 'initializeContainer'));
@@ -349,7 +287,7 @@ EOF;
 
         // Heredocs are preserved, making the output mixing Unix and Windows line
         // endings, switching to "\n" everywhere on Windows to avoid failure.
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $expected = str_replace("\r\n", "\n", $expected);
             $output = str_replace("\r\n", "\n", $output);
         }
@@ -361,7 +299,7 @@ EOF;
     {
         $kernel = new KernelForTest('test', true);
 
-        $this->assertEquals(__DIR__.DIRECTORY_SEPARATOR.'Fixtures', realpath($kernel->getRootDir()));
+        $this->assertEquals(__DIR__.\DIRECTORY_SEPARATOR.'Fixtures', realpath($kernel->getRootDir()));
     }
 
     public function testGetName()
@@ -421,7 +359,7 @@ EOF;
         $kernel
             ->expects($this->once())
             ->method('getBundle')
-            ->will($this->returnValue(array($this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle'))))
+            ->will($this->returnValue($this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle')))
         ;
 
         $kernel->locateResource('@Bundle1Bundle/config/routing.xml');
@@ -433,80 +371,19 @@ EOF;
         $kernel
             ->expects($this->once())
             ->method('getBundle')
-            ->will($this->returnValue(array($this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle'))))
+            ->will($this->returnValue($this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle')))
         ;
 
         $this->assertEquals(__DIR__.'/Fixtures/Bundle1Bundle/foo.txt', $kernel->locateResource('@Bundle1Bundle/foo.txt'));
     }
 
-    /**
-     * @group legacy
-     */
-    public function testLocateResourceReturnsTheFirstThatMatchesWithParent()
-    {
-        $parent = $this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle');
-        $child = $this->getBundle(__DIR__.'/Fixtures/Bundle2Bundle');
-
-        $kernel = $this->getKernel(array('getBundle'));
-        $kernel
-            ->expects($this->exactly(2))
-            ->method('getBundle')
-            ->will($this->returnValue(array($child, $parent)))
-        ;
-
-        $this->assertEquals(__DIR__.'/Fixtures/Bundle2Bundle/foo.txt', $kernel->locateResource('@ParentAABundle/foo.txt'));
-        $this->assertEquals(__DIR__.'/Fixtures/Bundle1Bundle/bar.txt', $kernel->locateResource('@ParentAABundle/bar.txt'));
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testLocateResourceReturnsAllMatches()
-    {
-        $parent = $this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle');
-        $child = $this->getBundle(__DIR__.'/Fixtures/Bundle2Bundle');
-
-        $kernel = $this->getKernel(array('getBundle'));
-        $kernel
-            ->expects($this->once())
-            ->method('getBundle')
-            ->will($this->returnValue(array($child, $parent)))
-        ;
-
-        $this->assertEquals(array(
-            __DIR__.'/Fixtures/Bundle2Bundle/foo.txt',
-            __DIR__.'/Fixtures/Bundle1Bundle/foo.txt', ),
-            $kernel->locateResource('@Bundle1Bundle/foo.txt', null, false));
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testLocateResourceReturnsAllMatchesBis()
-    {
-        $kernel = $this->getKernel(array('getBundle'));
-        $kernel
-            ->expects($this->once())
-            ->method('getBundle')
-            ->will($this->returnValue(array(
-                $this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle'),
-                $this->getBundle(__DIR__.'/Foobar'),
-            )))
-        ;
-
-        $this->assertEquals(
-            array(__DIR__.'/Fixtures/Bundle1Bundle/foo.txt'),
-            $kernel->locateResource('@Bundle1Bundle/foo.txt', null, false)
-        );
-    }
-
     public function testLocateResourceIgnoresDirOnNonResource()
     {
         $kernel = $this->getKernel(array('getBundle'));
         $kernel
             ->expects($this->once())
             ->method('getBundle')
-            ->will($this->returnValue(array($this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle'))))
+            ->will($this->returnValue($this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle')))
         ;
 
         $this->assertEquals(
@@ -521,7 +398,7 @@ EOF;
         $kernel
             ->expects($this->once())
             ->method('getBundle')
-            ->will($this->returnValue(array($this->getBundle(__DIR__.'/Fixtures/FooBundle', null, null, 'FooBundle'))))
+            ->will($this->returnValue($this->getBundle(__DIR__.'/Fixtures/FooBundle', null, null, 'FooBundle')))
         ;
 
         $this->assertEquals(
@@ -530,73 +407,13 @@ EOF;
         );
     }
 
-    /**
-     * @group legacy
-     */
-    public function testLocateResourceReturnsTheDirOneForResourcesAndBundleOnes()
-    {
-        $kernel = $this->getKernel(array('getBundle'));
-        $kernel
-            ->expects($this->once())
-            ->method('getBundle')
-            ->will($this->returnValue(array($this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle', null, null, 'Bundle1Bundle'))))
-        ;
-
-        $this->assertEquals(array(
-            __DIR__.'/Fixtures/Resources/Bundle1Bundle/foo.txt',
-            __DIR__.'/Fixtures/Bundle1Bundle/Resources/foo.txt', ),
-            $kernel->locateResource('@Bundle1Bundle/Resources/foo.txt', __DIR__.'/Fixtures/Resources', false)
-        );
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testLocateResourceOverrideBundleAndResourcesFolders()
-    {
-        $parent = $this->getBundle(__DIR__.'/Fixtures/BaseBundle', null, 'BaseBundle', 'BaseBundle');
-        $child = $this->getBundle(__DIR__.'/Fixtures/ChildBundle', 'ParentBundle', 'ChildBundle', 'ChildBundle');
-
-        $kernel = $this->getKernel(array('getBundle'));
-        $kernel
-            ->expects($this->exactly(4))
-            ->method('getBundle')
-            ->will($this->returnValue(array($child, $parent)))
-        ;
-
-        $this->assertEquals(array(
-            __DIR__.'/Fixtures/Resources/ChildBundle/foo.txt',
-            __DIR__.'/Fixtures/ChildBundle/Resources/foo.txt',
-            __DIR__.'/Fixtures/BaseBundle/Resources/foo.txt',
-            ),
-            $kernel->locateResource('@BaseBundle/Resources/foo.txt', __DIR__.'/Fixtures/Resources', false)
-        );
-
-        $this->assertEquals(
-            __DIR__.'/Fixtures/Resources/ChildBundle/foo.txt',
-            $kernel->locateResource('@BaseBundle/Resources/foo.txt', __DIR__.'/Fixtures/Resources')
-        );
-
-        try {
-            $kernel->locateResource('@BaseBundle/Resources/hide.txt', __DIR__.'/Fixtures/Resources', false);
-            $this->fail('Hidden resources should raise an exception when returning an array of matching paths');
-        } catch (\RuntimeException $e) {
-        }
-
-        try {
-            $kernel->locateResource('@BaseBundle/Resources/hide.txt', __DIR__.'/Fixtures/Resources', true);
-            $this->fail('Hidden resources should raise an exception when returning the first matching path');
-        } catch (\RuntimeException $e) {
-        }
-    }
-
     public function testLocateResourceOnDirectories()
     {
         $kernel = $this->getKernel(array('getBundle'));
         $kernel
             ->expects($this->exactly(2))
             ->method('getBundle')
-            ->will($this->returnValue(array($this->getBundle(__DIR__.'/Fixtures/FooBundle', null, null, 'FooBundle'))))
+            ->will($this->returnValue($this->getBundle(__DIR__.'/Fixtures/FooBundle', null, null, 'FooBundle')))
         ;
 
         $this->assertEquals(
@@ -612,7 +429,7 @@ EOF;
         $kernel
             ->expects($this->exactly(2))
             ->method('getBundle')
-            ->will($this->returnValue(array($this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle', null, null, 'Bundle1Bundle'))))
+            ->will($this->returnValue($this->getBundle(__DIR__.'/Fixtures/Bundle1Bundle', null, null, 'Bundle1Bundle')))
         ;
 
         $this->assertEquals(
@@ -626,103 +443,6 @@ EOF;
     }
 
     /**
-     * @group legacy
-     */
-    public function testInitializeBundles()
-    {
-        $parent = $this->getBundle(null, null, 'ParentABundle');
-        $child = $this->getBundle(null, 'ParentABundle', 'ChildABundle');
-
-        // use test kernel so we can access getBundleMap()
-        $kernel = $this->getKernelForTest(array('registerBundles'));
-        $kernel
-            ->expects($this->once())
-            ->method('registerBundles')
-            ->will($this->returnValue(array($parent, $child)))
-        ;
-        $kernel->boot();
-
-        $map = $kernel->getBundleMap();
-        $this->assertEquals(array($child, $parent), $map['ParentABundle']);
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testInitializeBundlesSupportInheritanceCascade()
-    {
-        $grandparent = $this->getBundle(null, null, 'GrandParentBBundle');
-        $parent = $this->getBundle(null, 'GrandParentBBundle', 'ParentBBundle');
-        $child = $this->getBundle(null, 'ParentBBundle', 'ChildBBundle');
-
-        // use test kernel so we can access getBundleMap()
-        $kernel = $this->getKernelForTest(array('registerBundles'));
-        $kernel
-            ->expects($this->once())
-            ->method('registerBundles')
-            ->will($this->returnValue(array($grandparent, $parent, $child)))
-        ;
-        $kernel->boot();
-
-        $map = $kernel->getBundleMap();
-        $this->assertEquals(array($child, $parent, $grandparent), $map['GrandParentBBundle']);
-        $this->assertEquals(array($child, $parent), $map['ParentBBundle']);
-        $this->assertEquals(array($child), $map['ChildBBundle']);
-    }
-
-    /**
-     * @group legacy
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Bundle "ChildCBundle" extends bundle "FooBar", which is not registered.
-     */
-    public function testInitializeBundlesThrowsExceptionWhenAParentDoesNotExists()
-    {
-        $child = $this->getBundle(null, 'FooBar', 'ChildCBundle');
-        $kernel = $this->getKernel(array(), array($child));
-        $kernel->boot();
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testInitializeBundlesSupportsArbitraryBundleRegistrationOrder()
-    {
-        $grandparent = $this->getBundle(null, null, 'GrandParentCBundle');
-        $parent = $this->getBundle(null, 'GrandParentCBundle', 'ParentCBundle');
-        $child = $this->getBundle(null, 'ParentCBundle', 'ChildCBundle');
-
-        // use test kernel so we can access getBundleMap()
-        $kernel = $this->getKernelForTest(array('registerBundles'));
-        $kernel
-            ->expects($this->once())
-            ->method('registerBundles')
-            ->will($this->returnValue(array($parent, $grandparent, $child)))
-        ;
-        $kernel->boot();
-
-        $map = $kernel->getBundleMap();
-        $this->assertEquals(array($child, $parent, $grandparent), $map['GrandParentCBundle']);
-        $this->assertEquals(array($child, $parent), $map['ParentCBundle']);
-        $this->assertEquals(array($child), $map['ChildCBundle']);
-    }
-
-    /**
-     * @group legacy
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Bundle "ParentCBundle" is directly extended by two bundles "ChildC2Bundle" and "ChildC1Bundle".
-     */
-    public function testInitializeBundlesThrowsExceptionWhenABundleIsDirectlyExtendedByTwoBundles()
-    {
-        $parent = $this->getBundle(null, null, 'ParentCBundle');
-        $child1 = $this->getBundle(null, 'ParentCBundle', 'ChildC1Bundle');
-        $child2 = $this->getBundle(null, 'ParentCBundle', 'ChildC2Bundle');
-
-        $kernel = $this->getKernel(array(), array($parent, $child1, $child2));
-        $kernel->boot();
-    }
-
-    /**
-     * @group legacy
      * @expectedException \LogicException
      * @expectedExceptionMessage Trying to register two bundles with the same name "DuplicateName"
      */
@@ -735,19 +455,6 @@ EOF;
         $kernel->boot();
     }
 
-    /**
-     * @group legacy
-     * @expectedException \LogicException
-     * @expectedExceptionMessage Bundle "CircularRefBundle" can not extend itself.
-     */
-    public function testInitializeBundleThrowsExceptionWhenABundleExtendsItself()
-    {
-        $circularRef = $this->getBundle(null, 'CircularRefBundle', 'CircularRefBundle');
-
-        $kernel = $this->getKernel(array(), array($circularRef));
-        $kernel->boot();
-    }
-
     public function testTerminateReturnsSilentlyIfKernelIsNotBooted()
     {
         $kernel = $this->getKernel(array('getHttpKernel'));
@@ -807,25 +514,6 @@ EOF;
         $this->assertEquals('_123', $kernel->getName());
     }
 
-    /**
-     * @group legacy
-     * @expectedDeprecation The Symfony\Component\HttpKernel\Kernel::getEnvParameters() method is deprecated as of 3.3 and will be removed in 4.0. Use the %cenv()%c syntax to get the value of any environment variable from configuration files instead.
-     * @expectedDeprecation The support of special environment variables that start with SYMFONY__ (such as "SYMFONY__FOO__BAR") is deprecated as of 3.3 and will be removed in 4.0. Use the %cenv()%c syntax instead to get the value of environment variables in configuration files.
-     */
-    public function testSymfonyEnvironmentVariables()
-    {
-        $_SERVER['SYMFONY__FOO__BAR'] = 'baz';
-
-        $kernel = $this->getKernel();
-        $method = new \ReflectionMethod($kernel, 'getEnvParameters');
-        $method->setAccessible(true);
-
-        $envParameters = $method->invoke($kernel);
-        $this->assertSame('baz', $envParameters['foo.bar']);
-
-        unset($_SERVER['SYMFONY__FOO__BAR']);
-    }
-
     public function testProjectDirExtension()
     {
         $kernel = new CustomProjectDirKernel();
@@ -842,7 +530,7 @@ EOF;
         $kernel = new CustomProjectDirKernel();
         $kernel->boot();
 
-        $containerClass = get_class($kernel->getContainer());
+        $containerClass = \get_class($kernel->getContainer());
         $containerFile = (new \ReflectionClass($kernel->getContainer()))->getFileName();
         unlink(__DIR__.'/Fixtures/cache/custom/FixturesCustomDebugProjectContainer.php.meta');
 
@@ -858,7 +546,7 @@ EOF;
 
         $this->assertNotInstanceOf($containerClass, $kernel->getContainer());
         $this->assertFileExists($containerFile);
-        $this->assertFileExists(dirname($containerFile).'.legacy');
+        $this->assertFileExists(\dirname($containerFile).'.legacy');
     }
 
     public function testKernelPass()
@@ -901,6 +589,21 @@ EOF;
         $this->assertEquals(1, ResettableService::$counter);
     }
 
+    /**
+     * @group time-sensitive
+     */
+    public function testKernelStartTimeIsResetWhileBootingAlreadyBootedKernel()
+    {
+        $kernel = $this->getKernelForTest(array('initializeBundles'), true);
+        $kernel->boot();
+        $preReBoot = $kernel->getStartTime();
+
+        sleep(3600); //Intentionally large value to detect if ClockMock ever breaks
+        $kernel->reboot(null);
+
+        $this->assertGreaterThan($preReBoot, $kernel->getStartTime());
+    }
+
     /**
      * Returns a mock for the BundleInterface.
      *
@@ -923,7 +626,7 @@ EOF;
         $bundle
             ->expects($this->any())
             ->method('getName')
-            ->will($this->returnValue(null === $bundleName ? get_class($bundle) : $bundleName))
+            ->will($this->returnValue(null === $bundleName ? \get_class($bundle) : $bundleName))
         ;
 
         $bundle
@@ -970,10 +673,10 @@ EOF;
         return $kernel;
     }
 
-    protected function getKernelForTest(array $methods = array())
+    protected function getKernelForTest(array $methods = array(), $debug = false)
     {
         $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\Tests\Fixtures\KernelForTest')
-            ->setConstructorArgs(array('test', false))
+            ->setConstructorArgs(array('test', $debug))
             ->setMethods($methods)
             ->getMock();
         $p = new \ReflectionProperty($kernel, 'rootDir');
diff --git a/vendor/symfony/http-kernel/Tests/Log/LoggerTest.php b/vendor/symfony/http-kernel/Tests/Log/LoggerTest.php
index ecf67af7..a5d070c8 100644
--- a/vendor/symfony/http-kernel/Tests/Log/LoggerTest.php
+++ b/vendor/symfony/http-kernel/Tests/Log/LoggerTest.php
@@ -34,7 +34,7 @@ class LoggerTest extends TestCase
 
     protected function setUp()
     {
-        $this->tmpFile = sys_get_temp_dir().DIRECTORY_SEPARATOR.'log';
+        $this->tmpFile = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'log';
         $this->logger = new Logger(LogLevel::DEBUG, $this->tmpFile);
     }
 
diff --git a/vendor/symfony/http-kernel/Tests/Profiler/ProfilerTest.php b/vendor/symfony/http-kernel/Tests/Profiler/ProfilerTest.php
index 2d5f0ca5..cff133c1 100644
--- a/vendor/symfony/http-kernel/Tests/Profiler/ProfilerTest.php
+++ b/vendor/symfony/http-kernel/Tests/Profiler/ProfilerTest.php
@@ -12,12 +12,12 @@
 namespace Symfony\Component\HttpKernel\Tests\Profiler;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface;
 use Symfony\Component\HttpKernel\DataCollector\RequestDataCollector;
 use Symfony\Component\HttpKernel\Profiler\FileProfilerStorage;
 use Symfony\Component\HttpKernel\Profiler\Profiler;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 
 class ProfilerTest extends TestCase
 {
diff --git a/vendor/symfony/http-kernel/Tests/TestHttpKernel.php b/vendor/symfony/http-kernel/Tests/TestHttpKernel.php
index 3ec59272..fb95aa03 100644
--- a/vendor/symfony/http-kernel/Tests/TestHttpKernel.php
+++ b/vendor/symfony/http-kernel/Tests/TestHttpKernel.php
@@ -11,12 +11,12 @@
 
 namespace Symfony\Component\HttpKernel\Tests;
 
-use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
-use Symfony\Component\HttpKernel\HttpKernel;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
 use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
-use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpKernel\HttpKernel;
 
 class TestHttpKernel extends HttpKernel implements ControllerResolverInterface, ArgumentResolverInterface
 {
diff --git a/vendor/symfony/http-kernel/UriSigner.php b/vendor/symfony/http-kernel/UriSigner.php
index 28459b4e..de73039b 100644
--- a/vendor/symfony/http-kernel/UriSigner.php
+++ b/vendor/symfony/http-kernel/UriSigner.php
@@ -25,7 +25,7 @@ class UriSigner
      * @param string $secret    A secret
      * @param string $parameter Query string parameter to use
      */
-    public function __construct($secret, $parameter = '_hash')
+    public function __construct(string $secret, string $parameter = '_hash')
     {
         $this->secret = $secret;
         $this->parameter = $parameter;
diff --git a/vendor/symfony/http-kernel/composer.json b/vendor/symfony/http-kernel/composer.json
index 17c0544c..4d7ab116 100644
--- a/vendor/symfony/http-kernel/composer.json
+++ b/vendor/symfony/http-kernel/composer.json
@@ -16,38 +16,37 @@
         }
     ],
     "require": {
-        "php": "^5.5.9|>=7.0.8",
-        "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
-        "symfony/http-foundation": "^3.4.4|^4.0.4",
-        "symfony/debug": "~2.8|~3.0|~4.0",
+        "php": "^7.1.3",
+        "symfony/event-dispatcher": "~4.1",
+        "symfony/http-foundation": "^4.1.1",
+        "symfony/debug": "~3.4|~4.0",
         "symfony/polyfill-ctype": "~1.8",
         "psr/log": "~1.0"
     },
     "require-dev": {
-        "symfony/browser-kit": "~2.8|~3.0|~4.0",
-        "symfony/class-loader": "~2.8|~3.0",
-        "symfony/config": "~2.8|~3.0|~4.0",
-        "symfony/console": "~2.8|~3.0|~4.0",
-        "symfony/css-selector": "~2.8|~3.0|~4.0",
-        "symfony/dependency-injection": "^3.4.5|^4.0.5",
-        "symfony/dom-crawler": "~2.8|~3.0|~4.0",
-        "symfony/expression-language": "~2.8|~3.0|~4.0",
-        "symfony/finder": "~2.8|~3.0|~4.0",
-        "symfony/process": "~2.8|~3.0|~4.0",
+        "symfony/browser-kit": "~3.4|~4.0",
+        "symfony/config": "~3.4|~4.0",
+        "symfony/console": "~3.4|~4.0",
+        "symfony/css-selector": "~3.4|~4.0",
+        "symfony/dependency-injection": "^4.1",
+        "symfony/dom-crawler": "~3.4|~4.0",
+        "symfony/expression-language": "~3.4|~4.0",
+        "symfony/finder": "~3.4|~4.0",
+        "symfony/process": "~3.4|~4.0",
         "symfony/routing": "~3.4|~4.0",
-        "symfony/stopwatch": "~2.8|~3.0|~4.0",
-        "symfony/templating": "~2.8|~3.0|~4.0",
-        "symfony/translation": "~2.8|~3.0|~4.0",
-        "symfony/var-dumper": "~3.3|~4.0",
+        "symfony/stopwatch": "~3.4|~4.0",
+        "symfony/templating": "~3.4|~4.0",
+        "symfony/translation": "~3.4|~4.0",
+        "symfony/var-dumper": "^4.1.1",
         "psr/cache": "~1.0"
     },
     "provide": {
         "psr/log-implementation": "1.0"
     },
     "conflict": {
-        "symfony/config": "<2.8",
-        "symfony/dependency-injection": "<3.4.5|<4.0.5,>=4",
-        "symfony/var-dumper": "<3.3",
+        "symfony/config": "<3.4",
+        "symfony/dependency-injection": "<4.1",
+        "symfony/var-dumper": "<4.1.1",
         "twig/twig": "<1.34|<2.4,>=2"
     },
     "suggest": {
@@ -55,7 +54,6 @@
         "symfony/config": "",
         "symfony/console": "",
         "symfony/dependency-injection": "",
-        "symfony/finder": "",
         "symfony/var-dumper": ""
     },
     "autoload": {
@@ -67,7 +65,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "3.4-dev"
+            "dev-master": "4.1-dev"
         }
     }
 }
diff --git a/vendor/symfony/polyfill-ctype/composer.json b/vendor/symfony/polyfill-ctype/composer.json
index 0504dda0..094f8d86 100644
--- a/vendor/symfony/polyfill-ctype/composer.json
+++ b/vendor/symfony/polyfill-ctype/composer.json
@@ -22,10 +22,13 @@
         "psr-4": { "Symfony\\Polyfill\\Ctype\\": "" },
         "files": [ "bootstrap.php" ]
     },
+    "suggest": {
+        "ext-ctype": "For best performance"
+    },
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.8-dev"
+            "dev-master": "1.9-dev"
         }
     }
 }
diff --git a/vendor/symfony/polyfill-mbstring/Mbstring.php b/vendor/symfony/polyfill-mbstring/Mbstring.php
index 4bd326e5..1f568b40 100644
--- a/vendor/symfony/polyfill-mbstring/Mbstring.php
+++ b/vendor/symfony/polyfill-mbstring/Mbstring.php
@@ -44,7 +44,7 @@ namespace Symfony\Polyfill\Mbstring;
  * - mb_strrchr              - Finds the last occurrence of a character in a string within another
  * - mb_strrichr             - Finds the last occurrence of a character in a string within another, case insensitive
  * - mb_strripos             - Finds position of last occurrence of a string within another, case insensitive
- * - mb_strstr               - Finds first occurrence of a string within anothers
+ * - mb_strstr               - Finds first occurrence of a string within another
  * - mb_strwidth             - Return width of string
  * - mb_substr_count         - Count the number of substring occurrences
  *
@@ -281,8 +281,11 @@ final class Mbstring
         }
 
         if (MB_CASE_TITLE == $mode) {
-            $s = preg_replace_callback('/\b\p{Ll}/u', array(__CLASS__, 'title_case_upper'), $s);
-            $s = preg_replace_callback('/\B[\p{Lu}\p{Lt}]+/u', array(__CLASS__, 'title_case_lower'), $s);
+            static $titleRegexp = null;
+            if (null === $titleRegexp) {
+                $titleRegexp = self::getData('titleCaseRegexp');
+            }
+            $s = preg_replace_callback($titleRegexp, array(__CLASS__, 'title_case'), $s);
         } else {
             if (MB_CASE_UPPER == $mode) {
                 static $upper = null;
@@ -752,14 +755,9 @@ final class Mbstring
         return $entities;
     }
 
-    private static function title_case_lower(array $s)
-    {
-        return self::mb_convert_case($s[0], MB_CASE_LOWER, 'UTF-8');
-    }
-
-    private static function title_case_upper(array $s)
+    private static function title_case(array $s)
     {
-        return self::mb_convert_case($s[0], MB_CASE_UPPER, 'UTF-8');
+        return self::mb_convert_case($s[1], MB_CASE_UPPER, 'UTF-8').self::mb_convert_case($s[2], MB_CASE_LOWER, 'UTF-8');
     }
 
     private static function getData($file)
diff --git a/vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php b/vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php
new file mode 100644
index 00000000..2a8f6e73
--- /dev/null
+++ b/vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php
@@ -0,0 +1,5 @@
+<?php
+
+// from Case_Ignorable in https://unicode.org/Public/UNIDATA/DerivedCoreProperties.txt
+
+return '/(?<![\x{0027}\x{002E}\x{003A}\x{005E}\x{0060}\x{00A8}\x{00AD}\x{00AF}\x{00B4}\x{00B7}\x{00B8}\x{02B0}-\x{02C1}\x{02C2}-\x{02C5}\x{02C6}-\x{02D1}\x{02D2}-\x{02DF}\x{02E0}-\x{02E4}\x{02E5}-\x{02EB}\x{02EC}\x{02ED}\x{02EE}\x{02EF}-\x{02FF}\x{0300}-\x{036F}\x{0374}\x{0375}\x{037A}\x{0384}-\x{0385}\x{0387}\x{0483}-\x{0487}\x{0488}-\x{0489}\x{0559}\x{0591}-\x{05BD}\x{05BF}\x{05C1}-\x{05C2}\x{05C4}-\x{05C5}\x{05C7}\x{05F4}\x{0600}-\x{0605}\x{0610}-\x{061A}\x{061C}\x{0640}\x{064B}-\x{065F}\x{0670}\x{06D6}-\x{06DC}\x{06DD}\x{06DF}-\x{06E4}\x{06E5}-\x{06E6}\x{06E7}-\x{06E8}\x{06EA}-\x{06ED}\x{070F}\x{0711}\x{0730}-\x{074A}\x{07A6}-\x{07B0}\x{07EB}-\x{07F3}\x{07F4}-\x{07F5}\x{07FA}\x{07FD}\x{0816}-\x{0819}\x{081A}\x{081B}-\x{0823}\x{0824}\x{0825}-\x{0827}\x{0828}\x{0829}-\x{082D}\x{0859}-\x{085B}\x{08D3}-\x{08E1}\x{08E2}\x{08E3}-\x{0902}\x{093A}\x{093C}\x{0941}-\x{0948}\x{094D}\x{0951}-\x{0957}\x{0962}-\x{0963}\x{0971}\x{0981}\x{09BC}\x{09C1}-\x{09C4}\x{09CD}\x{09E2}-\x{09E3}\x{09FE}\x{0A01}-\x{0A02}\x{0A3C}\x{0A41}-\x{0A42}\x{0A47}-\x{0A48}\x{0A4B}-\x{0A4D}\x{0A51}\x{0A70}-\x{0A71}\x{0A75}\x{0A81}-\x{0A82}\x{0ABC}\x{0AC1}-\x{0AC5}\x{0AC7}-\x{0AC8}\x{0ACD}\x{0AE2}-\x{0AE3}\x{0AFA}-\x{0AFF}\x{0B01}\x{0B3C}\x{0B3F}\x{0B41}-\x{0B44}\x{0B4D}\x{0B56}\x{0B62}-\x{0B63}\x{0B82}\x{0BC0}\x{0BCD}\x{0C00}\x{0C04}\x{0C3E}-\x{0C40}\x{0C46}-\x{0C48}\x{0C4A}-\x{0C4D}\x{0C55}-\x{0C56}\x{0C62}-\x{0C63}\x{0C81}\x{0CBC}\x{0CBF}\x{0CC6}\x{0CCC}-\x{0CCD}\x{0CE2}-\x{0CE3}\x{0D00}-\x{0D01}\x{0D3B}-\x{0D3C}\x{0D41}-\x{0D44}\x{0D4D}\x{0D62}-\x{0D63}\x{0DCA}\x{0DD2}-\x{0DD4}\x{0DD6}\x{0E31}\x{0E34}-\x{0E3A}\x{0E46}\x{0E47}-\x{0E4E}\x{0EB1}\x{0EB4}-\x{0EB9}\x{0EBB}-\x{0EBC}\x{0EC6}\x{0EC8}-\x{0ECD}\x{0F18}-\x{0F19}\x{0F35}\x{0F37}\x{0F39}\x{0F71}-\x{0F7E}\x{0F80}-\x{0F84}\x{0F86}-\x{0F87}\x{0F8D}-\x{0F97}\x{0F99}-\x{0FBC}\x{0FC6}\x{102D}-\x{1030}\x{1032}-\x{1037}\x{1039}-\x{103A}\x{103D}-\x{103E}\x{1058}-\x{1059}\x{105E}-\x{1060}\x{1071}-\x{1074}\x{1082}\x{1085}-\x{1086}\x{108D}\x{109D}\x{10FC}\x{135D}-\x{135F}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}-\x{1753}\x{1772}-\x{1773}\x{17B4}-\x{17B5}\x{17B7}-\x{17BD}\x{17C6}\x{17C9}-\x{17D3}\x{17D7}\x{17DD}\x{180B}-\x{180D}\x{180E}\x{1843}\x{1885}-\x{1886}\x{18A9}\x{1920}-\x{1922}\x{1927}-\x{1928}\x{1932}\x{1939}-\x{193B}\x{1A17}-\x{1A18}\x{1A1B}\x{1A56}\x{1A58}-\x{1A5E}\x{1A60}\x{1A62}\x{1A65}-\x{1A6C}\x{1A73}-\x{1A7C}\x{1A7F}\x{1AA7}\x{1AB0}-\x{1ABD}\x{1ABE}\x{1B00}-\x{1B03}\x{1B34}\x{1B36}-\x{1B3A}\x{1B3C}\x{1B42}\x{1B6B}-\x{1B73}\x{1B80}-\x{1B81}\x{1BA2}-\x{1BA5}\x{1BA8}-\x{1BA9}\x{1BAB}-\x{1BAD}\x{1BE6}\x{1BE8}-\x{1BE9}\x{1BED}\x{1BEF}-\x{1BF1}\x{1C2C}-\x{1C33}\x{1C36}-\x{1C37}\x{1C78}-\x{1C7D}\x{1CD0}-\x{1CD2}\x{1CD4}-\x{1CE0}\x{1CE2}-\x{1CE8}\x{1CED}\x{1CF4}\x{1CF8}-\x{1CF9}\x{1D2C}-\x{1D6A}\x{1D78}\x{1D9B}-\x{1DBF}\x{1DC0}-\x{1DF9}\x{1DFB}-\x{1DFF}\x{1FBD}\x{1FBF}-\x{1FC1}\x{1FCD}-\x{1FCF}\x{1FDD}-\x{1FDF}\x{1FED}-\x{1FEF}\x{1FFD}-\x{1FFE}\x{200B}-\x{200F}\x{2018}\x{2019}\x{2024}\x{2027}\x{202A}-\x{202E}\x{2060}-\x{2064}\x{2066}-\x{206F}\x{2071}\x{207F}\x{2090}-\x{209C}\x{20D0}-\x{20DC}\x{20DD}-\x{20E0}\x{20E1}\x{20E2}-\x{20E4}\x{20E5}-\x{20F0}\x{2C7C}-\x{2C7D}\x{2CEF}-\x{2CF1}\x{2D6F}\x{2D7F}\x{2DE0}-\x{2DFF}\x{2E2F}\x{3005}\x{302A}-\x{302D}\x{3031}-\x{3035}\x{303B}\x{3099}-\x{309A}\x{309B}-\x{309C}\x{309D}-\x{309E}\x{30FC}-\x{30FE}\x{A015}\x{A4F8}-\x{A4FD}\x{A60C}\x{A66F}\x{A670}-\x{A672}\x{A674}-\x{A67D}\x{A67F}\x{A69C}-\x{A69D}\x{A69E}-\x{A69F}\x{A6F0}-\x{A6F1}\x{A700}-\x{A716}\x{A717}-\x{A71F}\x{A720}-\x{A721}\x{A770}\x{A788}\x{A789}-\x{A78A}\x{A7F8}-\x{A7F9}\x{A802}\x{A806}\x{A80B}\x{A825}-\x{A826}\x{A8C4}-\x{A8C5}\x{A8E0}-\x{A8F1}\x{A8FF}\x{A926}-\x{A92D}\x{A947}-\x{A951}\x{A980}-\x{A982}\x{A9B3}\x{A9B6}-\x{A9B9}\x{A9BC}\x{A9CF}\x{A9E5}\x{A9E6}\x{AA29}-\x{AA2E}\x{AA31}-\x{AA32}\x{AA35}-\x{AA36}\x{AA43}\x{AA4C}\x{AA70}\x{AA7C}\x{AAB0}\x{AAB2}-\x{AAB4}\x{AAB7}-\x{AAB8}\x{AABE}-\x{AABF}\x{AAC1}\x{AADD}\x{AAEC}-\x{AAED}\x{AAF3}-\x{AAF4}\x{AAF6}\x{AB5B}\x{AB5C}-\x{AB5F}\x{ABE5}\x{ABE8}\x{ABED}\x{FB1E}\x{FBB2}-\x{FBC1}\x{FE00}-\x{FE0F}\x{FE13}\x{FE20}-\x{FE2F}\x{FE52}\x{FE55}\x{FEFF}\x{FF07}\x{FF0E}\x{FF1A}\x{FF3E}\x{FF40}\x{FF70}\x{FF9E}-\x{FF9F}\x{FFE3}\x{FFF9}-\x{FFFB}\x{101FD}\x{102E0}\x{10376}-\x{1037A}\x{10A01}-\x{10A03}\x{10A05}-\x{10A06}\x{10A0C}-\x{10A0F}\x{10A38}-\x{10A3A}\x{10A3F}\x{10AE5}-\x{10AE6}\x{10D24}-\x{10D27}\x{10F46}-\x{10F50}\x{11001}\x{11038}-\x{11046}\x{1107F}-\x{11081}\x{110B3}-\x{110B6}\x{110B9}-\x{110BA}\x{110BD}\x{110CD}\x{11100}-\x{11102}\x{11127}-\x{1112B}\x{1112D}-\x{11134}\x{11173}\x{11180}-\x{11181}\x{111B6}-\x{111BE}\x{111C9}-\x{111CC}\x{1122F}-\x{11231}\x{11234}\x{11236}-\x{11237}\x{1123E}\x{112DF}\x{112E3}-\x{112EA}\x{11300}-\x{11301}\x{1133B}-\x{1133C}\x{11340}\x{11366}-\x{1136C}\x{11370}-\x{11374}\x{11438}-\x{1143F}\x{11442}-\x{11444}\x{11446}\x{1145E}\x{114B3}-\x{114B8}\x{114BA}\x{114BF}-\x{114C0}\x{114C2}-\x{114C3}\x{115B2}-\x{115B5}\x{115BC}-\x{115BD}\x{115BF}-\x{115C0}\x{115DC}-\x{115DD}\x{11633}-\x{1163A}\x{1163D}\x{1163F}-\x{11640}\x{116AB}\x{116AD}\x{116B0}-\x{116B5}\x{116B7}\x{1171D}-\x{1171F}\x{11722}-\x{11725}\x{11727}-\x{1172B}\x{1182F}-\x{11837}\x{11839}-\x{1183A}\x{11A01}-\x{11A0A}\x{11A33}-\x{11A38}\x{11A3B}-\x{11A3E}\x{11A47}\x{11A51}-\x{11A56}\x{11A59}-\x{11A5B}\x{11A8A}-\x{11A96}\x{11A98}-\x{11A99}\x{11C30}-\x{11C36}\x{11C38}-\x{11C3D}\x{11C3F}\x{11C92}-\x{11CA7}\x{11CAA}-\x{11CB0}\x{11CB2}-\x{11CB3}\x{11CB5}-\x{11CB6}\x{11D31}-\x{11D36}\x{11D3A}\x{11D3C}-\x{11D3D}\x{11D3F}-\x{11D45}\x{11D47}\x{11D90}-\x{11D91}\x{11D95}\x{11D97}\x{11EF3}-\x{11EF4}\x{16AF0}-\x{16AF4}\x{16B30}-\x{16B36}\x{16B40}-\x{16B43}\x{16F8F}-\x{16F92}\x{16F93}-\x{16F9F}\x{16FE0}-\x{16FE1}\x{1BC9D}-\x{1BC9E}\x{1BCA0}-\x{1BCA3}\x{1D167}-\x{1D169}\x{1D173}-\x{1D17A}\x{1D17B}-\x{1D182}\x{1D185}-\x{1D18B}\x{1D1AA}-\x{1D1AD}\x{1D242}-\x{1D244}\x{1DA00}-\x{1DA36}\x{1DA3B}-\x{1DA6C}\x{1DA75}\x{1DA84}\x{1DA9B}-\x{1DA9F}\x{1DAA1}-\x{1DAAF}\x{1E000}-\x{1E006}\x{1E008}-\x{1E018}\x{1E01B}-\x{1E021}\x{1E023}-\x{1E024}\x{1E026}-\x{1E02A}\x{1E8D0}-\x{1E8D6}\x{1E944}-\x{1E94A}\x{1F3FB}-\x{1F3FF}\x{E0001}\x{E0020}-\x{E007F}\x{E0100}-\x{E01EF}])(\pL)(\pL*+)/u';
diff --git a/vendor/symfony/polyfill-mbstring/composer.json b/vendor/symfony/polyfill-mbstring/composer.json
index 49b720dd..50ea12f1 100644
--- a/vendor/symfony/polyfill-mbstring/composer.json
+++ b/vendor/symfony/polyfill-mbstring/composer.json
@@ -28,7 +28,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.8-dev"
+            "dev-master": "1.9-dev"
         }
     }
 }
diff --git a/vendor/symfony/polyfill-php70/Php70.php b/vendor/symfony/polyfill-php70/Php70.php
deleted file mode 100644
index 39e66450..00000000
--- a/vendor/symfony/polyfill-php70/Php70.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Polyfill\Php70;
-
-/**
- * @author Nicolas Grekas <p@tchwork.com>
- *
- * @internal
- */
-final class Php70
-{
-    public static function intdiv($dividend, $divisor)
-    {
-        $dividend = self::intArg($dividend, __FUNCTION__, 1);
-        $divisor = self::intArg($divisor, __FUNCTION__, 2);
-
-        if (0 === $divisor) {
-            throw new \DivisionByZeroError('Division by zero');
-        }
-        if (-1 === $divisor && ~PHP_INT_MAX === $dividend) {
-            throw new \ArithmeticError('Division of PHP_INT_MIN by -1 is not an integer');
-        }
-
-        return ($dividend - ($dividend % $divisor)) / $divisor;
-    }
-
-    public static function preg_replace_callback_array(array $patterns, $subject, $limit = -1, &$count = 0)
-    {
-        $count = 0;
-        $result = (string) $subject;
-        if (0 === $limit = self::intArg($limit, __FUNCTION__, 3)) {
-            return $result;
-        }
-
-        foreach ($patterns as $pattern => $callback) {
-            $result = preg_replace_callback($pattern, $callback, $result, $limit, $c);
-            $count += $c;
-        }
-
-        return $result;
-    }
-
-    public static function error_clear_last()
-    {
-        static $handler;
-        if (!$handler) {
-             $handler = function() { return false; };
-        }
-        set_error_handler($handler);
-        @trigger_error('');
-        restore_error_handler();
-    }
-
-    private static function intArg($value, $caller, $pos)
-    {
-        if (\is_int($value)) {
-            return $value;
-        }
-        if (!\is_numeric($value) || PHP_INT_MAX <= ($value += 0) || ~PHP_INT_MAX >= $value) {
-            throw new \TypeError(sprintf('%s() expects parameter %d to be integer, %s given', $caller, $pos, gettype($value)));
-        }
-
-        return (int) $value;
-    }
-}
diff --git a/vendor/symfony/polyfill-php70/README.md b/vendor/symfony/polyfill-php70/README.md
deleted file mode 100644
index 04988c6f..00000000
--- a/vendor/symfony/polyfill-php70/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-Symfony Polyfill / Php70
-========================
-
-This component provides features unavailable in releases prior to PHP 7.0:
-
-- [`intdiv`](http://php.net/intdiv)
-- [`preg_replace_callback_array`](http://php.net/preg_replace_callback_array)
-- [`error_clear_last`](http://php.net/error_clear_last)
-- `random_bytes` and `random_int` (from [paragonie/random_compat](https://github.com/paragonie/random_compat))
-- [`*Error` throwable classes](http://php.net/Error)
-- [`PHP_INT_MIN`](http://php.net/manual/en/reserved.constants.php#constant.php-int-min)
-- `SessionUpdateTimestampHandlerInterface`
-
-More information can be found in the
-[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
-
-Compatibility notes
-===================
-
-To write portable code between PHP5 and PHP7, some care must be taken:
-- `\*Error` exceptions must be caught before `\Exception`;
-- after calling `error_clear_last()`, the result of `$e = error_get_last()` must be
-  verified using `isset($e['message'][0])` instead of `null !== $e`.
-
-License
-=======
-
-This library is released under the [MIT license](LICENSE).
diff --git a/vendor/symfony/polyfill-php70/Resources/stubs/ArithmeticError.php b/vendor/symfony/polyfill-php70/Resources/stubs/ArithmeticError.php
deleted file mode 100644
index 68191244..00000000
--- a/vendor/symfony/polyfill-php70/Resources/stubs/ArithmeticError.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class ArithmeticError extends Error
-{
-}
diff --git a/vendor/symfony/polyfill-php70/Resources/stubs/AssertionError.php b/vendor/symfony/polyfill-php70/Resources/stubs/AssertionError.php
deleted file mode 100644
index acb12508..00000000
--- a/vendor/symfony/polyfill-php70/Resources/stubs/AssertionError.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class AssertionError extends Error
-{
-}
diff --git a/vendor/symfony/polyfill-php70/Resources/stubs/DivisionByZeroError.php b/vendor/symfony/polyfill-php70/Resources/stubs/DivisionByZeroError.php
deleted file mode 100644
index c99278b3..00000000
--- a/vendor/symfony/polyfill-php70/Resources/stubs/DivisionByZeroError.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class DivisionByZeroError extends Error
-{
-}
diff --git a/vendor/symfony/polyfill-php70/Resources/stubs/Error.php b/vendor/symfony/polyfill-php70/Resources/stubs/Error.php
deleted file mode 100644
index 405847fb..00000000
--- a/vendor/symfony/polyfill-php70/Resources/stubs/Error.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class Error extends Exception
-{
-}
diff --git a/vendor/symfony/polyfill-php70/Resources/stubs/ParseError.php b/vendor/symfony/polyfill-php70/Resources/stubs/ParseError.php
deleted file mode 100644
index 2dd447dd..00000000
--- a/vendor/symfony/polyfill-php70/Resources/stubs/ParseError.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class ParseError extends Error
-{
-}
diff --git a/vendor/symfony/polyfill-php70/Resources/stubs/SessionUpdateTimestampHandlerInterface.php b/vendor/symfony/polyfill-php70/Resources/stubs/SessionUpdateTimestampHandlerInterface.php
deleted file mode 100644
index 0cc02c8f..00000000
--- a/vendor/symfony/polyfill-php70/Resources/stubs/SessionUpdateTimestampHandlerInterface.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-interface SessionUpdateTimestampHandlerInterface
-{
-    /**
-     * Checks if a session identifier already exists or not.
-     *
-     * @param string $key
-     *
-     * @return bool
-     */
-    public function validateId($key);
-
-    /**
-     * Updates the timestamp of a session when its data didn't change.
-     *
-     * @param string $key
-     * @param string $val
-     *
-     * @return bool
-     */
-    public function updateTimestamp($key, $val);
-}
diff --git a/vendor/symfony/polyfill-php70/Resources/stubs/TypeError.php b/vendor/symfony/polyfill-php70/Resources/stubs/TypeError.php
deleted file mode 100644
index 2bed1b48..00000000
--- a/vendor/symfony/polyfill-php70/Resources/stubs/TypeError.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class TypeError extends Error
-{
-}
diff --git a/vendor/symfony/polyfill-php70/bootstrap.php b/vendor/symfony/polyfill-php70/bootstrap.php
deleted file mode 100644
index 445c3983..00000000
--- a/vendor/symfony/polyfill-php70/bootstrap.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Symfony\Polyfill\Php70 as p;
-
-if (PHP_VERSION_ID < 70000) {
-    if (!defined('PHP_INT_MIN')) {
-        define('PHP_INT_MIN', ~PHP_INT_MAX);
-    }
-    if (!function_exists('intdiv')) {
-        function intdiv($dividend, $divisor) { return p\Php70::intdiv($dividend, $divisor); }
-    }
-    if (!function_exists('preg_replace_callback_array')) {
-        function preg_replace_callback_array(array $patterns, $subject, $limit = -1, &$count = 0) { return p\Php70::preg_replace_callback_array($patterns, $subject, $limit, $count); }
-    }
-    if (!function_exists('error_clear_last')) {
-        function error_clear_last() { return p\Php70::error_clear_last(); }
-    }
-}
diff --git a/vendor/symfony/polyfill-php70/LICENSE b/vendor/symfony/polyfill-php72/LICENSE
similarity index 100%
rename from vendor/symfony/polyfill-php70/LICENSE
rename to vendor/symfony/polyfill-php72/LICENSE
diff --git a/vendor/symfony/polyfill-php72/Php72.php b/vendor/symfony/polyfill-php72/Php72.php
new file mode 100644
index 00000000..5f122a24
--- /dev/null
+++ b/vendor/symfony/polyfill-php72/Php72.php
@@ -0,0 +1,165 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Php72;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ * @author Dariusz Rumiński <dariusz.ruminski@gmail.com>
+ *
+ * @internal
+ */
+final class Php72
+{
+    private static $hashMask;
+
+    public static function utf8_encode($s)
+    {
+        $s .= $s;
+        $len = \strlen($s);
+
+        for ($i = $len >> 1, $j = 0; $i < $len; ++$i, ++$j) {
+            switch (true) {
+                case $s[$i] < "\x80": $s[$j] = $s[$i]; break;
+                case $s[$i] < "\xC0": $s[$j] = "\xC2"; $s[++$j] = $s[$i]; break;
+                default: $s[$j] = "\xC3"; $s[++$j] = \chr(\ord($s[$i]) - 64); break;
+            }
+        }
+
+        return substr($s, 0, $j);
+    }
+
+    public static function utf8_decode($s)
+    {
+        $s = (string) $s;
+        $len = \strlen($s);
+
+        for ($i = 0, $j = 0; $i < $len; ++$i, ++$j) {
+            switch ($s[$i] & "\xF0") {
+                case "\xC0":
+                case "\xD0":
+                    $c = (\ord($s[$i] & "\x1F") << 6) | \ord($s[++$i] & "\x3F");
+                    $s[$j] = $c < 256 ? \chr($c) : '?';
+                    break;
+
+                case "\xF0": ++$i;
+                case "\xE0":
+                    $s[$j] = '?';
+                    $i += 2;
+                    break;
+
+                default:
+                    $s[$j] = $s[$i];
+            }
+        }
+
+        return substr($s, 0, $j);
+    }
+
+    public static function php_os_family()
+    {
+        if ('\\' === DIRECTORY_SEPARATOR) {
+            return 'Windows';
+        }
+
+        $map = array(
+            'Darwin' => 'Darwin',
+            'DragonFly' => 'BSD',
+            'FreeBSD' => 'BSD',
+            'NetBSD' => 'BSD',
+            'OpenBSD' => 'BSD',
+            'Linux' => 'Linux',
+            'SunOS' => 'Solaris',
+        );
+
+        return isset($map[PHP_OS]) ? $map[PHP_OS] : 'Unknown';
+    }
+
+    public static function spl_object_id($object)
+    {
+        if (null === self::$hashMask) {
+            self::initHashMask();
+        }
+        if (null === $hash = spl_object_hash($object)) {
+            return;
+        }
+
+        return self::$hashMask ^ hexdec(substr($hash, 16 - \PHP_INT_SIZE, \PHP_INT_SIZE));
+    }
+
+    public static function sapi_windows_vt100_support($stream, $enable = null)
+    {
+        if (!\is_resource($stream)) {
+            trigger_error('sapi_windows_vt100_support() expects parameter 1 to be resource, '.gettype($stream).' given', E_USER_WARNING);
+            return false;
+        }
+
+        $meta = stream_get_meta_data($stream);
+
+        if ('STDIO' !== $meta['stream_type']) {
+            trigger_error('sapi_windows_vt100_support() was not able to analyze the specified stream', E_USER_WARNING);
+            return false;
+        }
+
+        // We cannot actually disable vt100 support if it is set
+        if (false === $enable || !self::stream_isatty($stream)) {
+            return false;
+        }
+
+        // The native function does not apply to stdin
+        $meta = array_map('strtolower', $meta);
+        $stdin = 'php://stdin' === $meta['uri'] || 'php://fd/0' === $meta['uri'];
+
+        return !$stdin
+            && (false !== getenv('ANSICON')
+            || 'ON' === getenv('ConEmuANSI')
+            || 'xterm' === getenv('TERM')
+            || 'Hyper' === getenv('TERM_PROGRAM'));
+    }
+
+    public static function stream_isatty($stream)
+    {
+        if (!\is_resource($stream)) {
+            trigger_error('stream_isatty() expects parameter 1 to be resource, '.gettype($stream).' given', E_USER_WARNING);
+            return false;
+        }
+
+        if ('\\' === DIRECTORY_SEPARATOR) {
+            $stat = @fstat($stream);
+            // Check if formatted mode is S_IFCHR
+            return $stat ? 0020000 === ($stat['mode'] & 0170000) : false;
+        }
+
+        return function_exists('posix_isatty') && @posix_isatty($stream);
+    }
+
+    private static function initHashMask()
+    {
+        $obj = (object) array();
+        self::$hashMask = -1;
+
+        // check if we are nested in an output buffering handler to prevent a fatal error with ob_start() below
+        $obFuncs = array('ob_clean', 'ob_end_clean', 'ob_flush', 'ob_end_flush', 'ob_get_contents', 'ob_get_flush');
+        foreach (debug_backtrace(\PHP_VERSION_ID >= 50400 ? DEBUG_BACKTRACE_IGNORE_ARGS : false) as $frame) {
+            if (isset($frame['function'][0]) && !isset($frame['class']) && 'o' === $frame['function'][0] && \in_array($frame['function'], $obFuncs)) {
+                $frame['line'] = 0;
+                break;
+            }
+        }
+        if (!empty($frame['line'])) {
+            ob_start();
+            debug_zval_dump($obj);
+            self::$hashMask = (int) substr(ob_get_clean(), 17);
+        }
+
+        self::$hashMask ^= hexdec(substr(spl_object_hash($obj), 16 - \PHP_INT_SIZE, \PHP_INT_SIZE));
+    }
+}
diff --git a/vendor/symfony/polyfill-php72/README.md b/vendor/symfony/polyfill-php72/README.md
new file mode 100644
index 00000000..82c45f7a
--- /dev/null
+++ b/vendor/symfony/polyfill-php72/README.md
@@ -0,0 +1,27 @@
+Symfony Polyfill / Php72
+========================
+
+This component provides functions added to PHP 7.2 core:
+
+- [`spl_object_id`](https://php.net/spl_object_id)
+- [`stream_isatty`](https://php.net/stream_isatty)
+
+On Windows only:
+
+- [`sapi_windows_vt100_support`](https://php.net/sapi_windows_vt100_support)
+
+Moved to core since 7.2 (was in the optional XML extension earlier):
+
+- [`utf8_encode`](https://php.net/utf8_encode)
+- [`utf8_decode`](https://php.net/utf8_decode)
+
+Also, it provides a constant added to PHP 7.2:
+- [`PHP_OS_FAMILY`](http://php.net/manual/en/reserved.constants.php#constant.php-os-family)
+
+More information can be found in the
+[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
+
+License
+=======
+
+This library is released under the [MIT license](LICENSE).
diff --git a/vendor/symfony/polyfill-php72/bootstrap.php b/vendor/symfony/polyfill-php72/bootstrap.php
new file mode 100644
index 00000000..9ccea829
--- /dev/null
+++ b/vendor/symfony/polyfill-php72/bootstrap.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Polyfill\Php72 as p;
+
+if (PHP_VERSION_ID < 70200) {
+    if ('\\' === DIRECTORY_SEPARATOR && !function_exists('sapi_windows_vt100_support')) {
+        function sapi_windows_vt100_support($stream, $enable = null) { return p\Php72::sapi_windows_vt100_support($stream, $enable); }
+    }
+    if (!function_exists('stream_isatty')) {
+        function stream_isatty($stream) { return p\Php72::stream_isatty($stream); }
+    }
+    if (!function_exists('utf8_encode')) {
+        function utf8_encode($s) { return p\Php72::utf8_encode($s); }
+        function utf8_decode($s) { return p\Php72::utf8_decode($s); }
+    }
+    if (!function_exists('spl_object_id')) {
+        function spl_object_id($s) { return p\Php72::spl_object_id($s); }
+    }
+    if (!defined('PHP_OS_FAMILY')) {
+        define('PHP_OS_FAMILY', p\Php72::php_os_family());
+    }
+}
diff --git a/vendor/symfony/polyfill-php70/composer.json b/vendor/symfony/polyfill-php72/composer.json
similarity index 62%
rename from vendor/symfony/polyfill-php70/composer.json
rename to vendor/symfony/polyfill-php72/composer.json
index 871045d2..5d66ef7e 100644
--- a/vendor/symfony/polyfill-php70/composer.json
+++ b/vendor/symfony/polyfill-php72/composer.json
@@ -1,7 +1,7 @@
 {
-    "name": "symfony/polyfill-php70",
+    "name": "symfony/polyfill-php72",
     "type": "library",
-    "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
+    "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
     "keywords": ["polyfill", "shim", "compatibility", "portable"],
     "homepage": "https://symfony.com",
     "license": "MIT",
@@ -16,18 +16,16 @@
         }
     ],
     "require": {
-        "php": ">=5.3.3",
-        "paragonie/random_compat": "~1.0|~2.0"
+        "php": ">=5.3.3"
     },
     "autoload": {
-        "psr-4": { "Symfony\\Polyfill\\Php70\\": "" },
-        "files": [ "bootstrap.php" ],
-        "classmap": [ "Resources/stubs" ]
+        "psr-4": { "Symfony\\Polyfill\\Php72\\": "" },
+        "files": [ "bootstrap.php" ]
     },
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.8-dev"
+            "dev-master": "1.9-dev"
         }
     }
 }
diff --git a/vendor/symfony/process/CHANGELOG.md b/vendor/symfony/process/CHANGELOG.md
index c5cdb994..354db592 100644
--- a/vendor/symfony/process/CHANGELOG.md
+++ b/vendor/symfony/process/CHANGELOG.md
@@ -1,6 +1,30 @@
 CHANGELOG
 =========
 
+4.1.0
+-----
+
+ * added the `Process::isTtySupported()` method that allows to check for TTY support
+ * made `PhpExecutableFinder` look for the `PHP_BINARY` env var when searching the php binary
+ * added the `ProcessSignaledException` class to properly catch signaled process errors
+
+4.0.0
+-----
+
+ * environment variables will always be inherited
+ * added a second `array $env = array()` argument to the `start()`, `run()`,
+   `mustRun()`, and `restart()` methods of the `Process` class
+ * added a second `array $env = array()` argument to the `start()` method of the
+   `PhpProcess` class
+ * the `ProcessUtils::escapeArgument()` method has been removed
+ * the `areEnvironmentVariablesInherited()`, `getOptions()`, and `setOptions()`
+   methods of the `Process` class have been removed
+ * support for passing `proc_open()` options has been removed
+ * removed the `ProcessBuilder` class, use the `Process` class instead
+ * removed the `getEnhanceWindowsCompatibility()` and `setEnhanceWindowsCompatibility()` methods of the `Process` class
+ * passing a not existing working directory to the constructor of the `Symfony\Component\Process\Process` class is not
+   supported anymore
+
 3.4.0
 -----
 
diff --git a/vendor/symfony/process/Exception/ProcessSignaledException.php b/vendor/symfony/process/Exception/ProcessSignaledException.php
new file mode 100644
index 00000000..d4d32275
--- /dev/null
+++ b/vendor/symfony/process/Exception/ProcessSignaledException.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Process\Exception;
+
+use Symfony\Component\Process\Process;
+
+/**
+ * Exception that is thrown when a process has been signaled.
+ *
+ * @author Sullivan Senechal <soullivaneuh@gmail.com>
+ */
+final class ProcessSignaledException extends RuntimeException
+{
+    private $process;
+
+    public function __construct(Process $process)
+    {
+        $this->process = $process;
+
+        parent::__construct(sprintf('The process has been signaled with signal "%s".', $process->getTermSignal()));
+    }
+
+    public function getProcess(): Process
+    {
+        return $this->process;
+    }
+
+    public function getSignal(): int
+    {
+        return $this->getProcess()->getTermSignal();
+    }
+}
diff --git a/vendor/symfony/process/Exception/ProcessTimedOutException.php b/vendor/symfony/process/Exception/ProcessTimedOutException.php
index fef4a8ae..e1f6445a 100644
--- a/vendor/symfony/process/Exception/ProcessTimedOutException.php
+++ b/vendor/symfony/process/Exception/ProcessTimedOutException.php
@@ -26,7 +26,7 @@ class ProcessTimedOutException extends RuntimeException
     private $process;
     private $timeoutType;
 
-    public function __construct(Process $process, $timeoutType)
+    public function __construct(Process $process, int $timeoutType)
     {
         $this->process = $process;
         $this->timeoutType = $timeoutType;
diff --git a/vendor/symfony/process/ExecutableFinder.php b/vendor/symfony/process/ExecutableFinder.php
index 1ec6526d..ccfa4c09 100644
--- a/vendor/symfony/process/ExecutableFinder.php
+++ b/vendor/symfony/process/ExecutableFinder.php
@@ -71,13 +71,13 @@ class ExecutableFinder
         }
 
         $suffixes = array('');
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $pathExt = getenv('PATHEXT');
-            $suffixes = array_merge($suffixes, $pathExt ? explode(PATH_SEPARATOR, $pathExt) : $this->suffixes);
+            $suffixes = array_merge($pathExt ? explode(PATH_SEPARATOR, $pathExt) : $this->suffixes, $suffixes);
         }
         foreach ($suffixes as $suffix) {
             foreach ($dirs as $dir) {
-                if (@is_file($file = $dir.DIRECTORY_SEPARATOR.$name.$suffix) && ('\\' === DIRECTORY_SEPARATOR || @is_executable($file))) {
+                if (@is_file($file = $dir.\DIRECTORY_SEPARATOR.$name.$suffix) && ('\\' === \DIRECTORY_SEPARATOR || @is_executable($file))) {
                     return $file;
                 }
             }
diff --git a/vendor/symfony/process/InputStream.php b/vendor/symfony/process/InputStream.php
index 9bd917a7..0b830c1a 100644
--- a/vendor/symfony/process/InputStream.php
+++ b/vendor/symfony/process/InputStream.php
@@ -20,7 +20,7 @@ use Symfony\Component\Process\Exception\RuntimeException;
  */
 class InputStream implements \IteratorAggregate
 {
-    /** @var null|callable */
+    /** @var callable|null */
     private $onEmpty = null;
     private $input = array();
     private $open = true;
diff --git a/vendor/symfony/process/PhpExecutableFinder.php b/vendor/symfony/process/PhpExecutableFinder.php
index 67015902..ee7203c9 100644
--- a/vendor/symfony/process/PhpExecutableFinder.php
+++ b/vendor/symfony/process/PhpExecutableFinder.php
@@ -35,16 +35,19 @@ class PhpExecutableFinder
      */
     public function find($includeArgs = true)
     {
-        $args = $this->findArguments();
-        $args = $includeArgs && $args ? ' '.implode(' ', $args) : '';
+        if ($php = getenv('PHP_BINARY')) {
+            if (!is_executable($php)) {
+                return false;
+            }
 
-        // HHVM support
-        if (defined('HHVM_VERSION')) {
-            return (getenv('PHP_BINARY') ?: PHP_BINARY).$args;
+            return $php;
         }
 
+        $args = $this->findArguments();
+        $args = $includeArgs && $args ? ' '.implode(' ', $args) : '';
+
         // PHP_BINARY return the current sapi executable
-        if (PHP_BINARY && \in_array(PHP_SAPI, array('cli', 'cli-server', 'phpdbg'), true)) {
+        if (PHP_BINARY && \in_array(\PHP_SAPI, array('cli', 'cli-server', 'phpdbg'), true)) {
             return PHP_BINARY.$args;
         }
 
@@ -62,12 +65,12 @@ class PhpExecutableFinder
             }
         }
 
-        if (@is_executable($php = PHP_BINDIR.('\\' === DIRECTORY_SEPARATOR ? '\\php.exe' : '/php'))) {
+        if (@is_executable($php = PHP_BINDIR.('\\' === \DIRECTORY_SEPARATOR ? '\\php.exe' : '/php'))) {
             return $php;
         }
 
         $dirs = array(PHP_BINDIR);
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $dirs[] = 'C:\xampp\php\\';
         }
 
@@ -82,10 +85,7 @@ class PhpExecutableFinder
     public function findArguments()
     {
         $arguments = array();
-
-        if (defined('HHVM_VERSION')) {
-            $arguments[] = '--php';
-        } elseif ('phpdbg' === PHP_SAPI) {
+        if ('phpdbg' === \PHP_SAPI) {
             $arguments[] = '-qrr';
         }
 
diff --git a/vendor/symfony/process/PhpProcess.php b/vendor/symfony/process/PhpProcess.php
index d3fd384a..6cf02a2f 100644
--- a/vendor/symfony/process/PhpProcess.php
+++ b/vendor/symfony/process/PhpProcess.php
@@ -16,9 +16,9 @@ use Symfony\Component\Process\Exception\RuntimeException;
 /**
  * PhpProcess runs a PHP script in an independent process.
  *
- * $p = new PhpProcess('<?php echo "foo"; ?>');
- * $p->run();
- * print $p->getOutput()."\n";
+ *     $p = new PhpProcess('<?php echo "foo"; ?>');
+ *     $p->run();
+ *     print $p->getOutput()."\n";
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
@@ -29,9 +29,8 @@ class PhpProcess extends Process
      * @param string|null $cwd     The working directory or null to use the working dir of the current PHP process
      * @param array|null  $env     The environment variables or null to use the same environment as the current PHP process
      * @param int         $timeout The timeout in seconds
-     * @param array       $options An array of options for proc_open
      */
-    public function __construct($script, $cwd = null, array $env = null, $timeout = 60, array $options = null)
+    public function __construct(string $script, string $cwd = null, array $env = null, int $timeout = 60)
     {
         $executableFinder = new PhpExecutableFinder();
         if (false === $php = $executableFinder->find(false)) {
@@ -39,18 +38,15 @@ class PhpProcess extends Process
         } else {
             $php = array_merge(array($php), $executableFinder->findArguments());
         }
-        if ('phpdbg' === PHP_SAPI) {
+        if ('phpdbg' === \PHP_SAPI) {
             $file = tempnam(sys_get_temp_dir(), 'dbg');
             file_put_contents($file, $script);
             register_shutdown_function('unlink', $file);
             $php[] = $file;
             $script = null;
         }
-        if (null !== $options) {
-            @trigger_error(sprintf('The $options parameter of the %s constructor is deprecated since Symfony 3.3 and will be removed in 4.0.', __CLASS__), E_USER_DEPRECATED);
-        }
 
-        parent::__construct($php, $cwd, $env, $script, $timeout, $options);
+        parent::__construct($php, $cwd, $env, $script, $timeout);
     }
 
     /**
@@ -64,12 +60,11 @@ class PhpProcess extends Process
     /**
      * {@inheritdoc}
      */
-    public function start(callable $callback = null/*, array $env = array()*/)
+    public function start(callable $callback = null, array $env = array())
     {
         if (null === $this->getCommandLine()) {
             throw new RuntimeException('Unable to find the PHP executable.');
         }
-        $env = 1 < func_num_args() ? func_get_arg(1) : null;
 
         parent::start($callback, $env);
     }
diff --git a/vendor/symfony/process/Pipes/AbstractPipes.php b/vendor/symfony/process/Pipes/AbstractPipes.php
index 9a7d88be..e5e26866 100644
--- a/vendor/symfony/process/Pipes/AbstractPipes.php
+++ b/vendor/symfony/process/Pipes/AbstractPipes.php
@@ -32,9 +32,9 @@ abstract class AbstractPipes implements PipesInterface
      */
     public function __construct($input)
     {
-        if (is_resource($input) || $input instanceof \Iterator) {
+        if (\is_resource($input) || $input instanceof \Iterator) {
             $this->input = $input;
-        } elseif (is_string($input)) {
+        } elseif (\is_string($input)) {
             $this->inputBuffer = $input;
         } else {
             $this->inputBuffer = (string) $input;
@@ -78,7 +78,7 @@ abstract class AbstractPipes implements PipesInterface
         foreach ($this->pipes as $pipe) {
             stream_set_blocking($pipe, 0);
         }
-        if (is_resource($this->input)) {
+        if (\is_resource($this->input)) {
             stream_set_blocking($this->input, 0);
         }
 
@@ -100,12 +100,12 @@ abstract class AbstractPipes implements PipesInterface
         if ($input instanceof \Iterator) {
             if (!$input->valid()) {
                 $input = null;
-            } elseif (is_resource($input = $input->current())) {
+            } elseif (\is_resource($input = $input->current())) {
                 stream_set_blocking($input, 0);
             } elseif (!isset($this->inputBuffer[0])) {
-                if (!is_string($input)) {
+                if (!\is_string($input)) {
                     if (!is_scalar($input)) {
-                        throw new InvalidArgumentException(sprintf('%s yielded a value of type "%s", but only scalars and stream resources are supported', get_class($this->input), gettype($input)));
+                        throw new InvalidArgumentException(sprintf('%s yielded a value of type "%s", but only scalars and stream resources are supported', \get_class($this->input), \gettype($input)));
                     }
                     $input = (string) $input;
                 }
diff --git a/vendor/symfony/process/Pipes/UnixPipes.php b/vendor/symfony/process/Pipes/UnixPipes.php
index 254df519..23f87347 100644
--- a/vendor/symfony/process/Pipes/UnixPipes.php
+++ b/vendor/symfony/process/Pipes/UnixPipes.php
@@ -26,11 +26,11 @@ class UnixPipes extends AbstractPipes
     private $ptyMode;
     private $haveReadSupport;
 
-    public function __construct($ttyMode, $ptyMode, $input, $haveReadSupport)
+    public function __construct(?bool $ttyMode, bool $ptyMode, $input, bool $haveReadSupport)
     {
-        $this->ttyMode = (bool) $ttyMode;
-        $this->ptyMode = (bool) $ptyMode;
-        $this->haveReadSupport = (bool) $haveReadSupport;
+        $this->ttyMode = $ttyMode;
+        $this->ptyMode = $ptyMode;
+        $this->haveReadSupport = $haveReadSupport;
 
         parent::__construct($input);
     }
diff --git a/vendor/symfony/process/Pipes/WindowsPipes.php b/vendor/symfony/process/Pipes/WindowsPipes.php
index d5fa2fde..9240102a 100644
--- a/vendor/symfony/process/Pipes/WindowsPipes.php
+++ b/vendor/symfony/process/Pipes/WindowsPipes.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Process\Pipes;
 
-use Symfony\Component\Process\Process;
 use Symfony\Component\Process\Exception\RuntimeException;
+use Symfony\Component\Process\Process;
 
 /**
  * WindowsPipes implementation uses temporary files as handles.
@@ -34,9 +34,9 @@ class WindowsPipes extends AbstractPipes
     );
     private $haveReadSupport;
 
-    public function __construct($input, $haveReadSupport)
+    public function __construct($input, bool $haveReadSupport)
     {
-        $this->haveReadSupport = (bool) $haveReadSupport;
+        $this->haveReadSupport = $haveReadSupport;
 
         if ($this->haveReadSupport) {
             // Fix for PHP bug #51800: reading from STDOUT pipe hangs forever on Windows if the output is too big.
@@ -141,7 +141,7 @@ class WindowsPipes extends AbstractPipes
             $data = stream_get_contents($fileHandle, -1, $this->readBytes[$type]);
 
             if (isset($data[0])) {
-                $this->readBytes[$type] += strlen($data);
+                $this->readBytes[$type] += \strlen($data);
                 $read[$type] = $data;
             }
             if ($close) {
diff --git a/vendor/symfony/process/Process.php b/vendor/symfony/process/Process.php
index 830c623e..cf551ef5 100644
--- a/vendor/symfony/process/Process.php
+++ b/vendor/symfony/process/Process.php
@@ -14,6 +14,7 @@ namespace Symfony\Component\Process;
 use Symfony\Component\Process\Exception\InvalidArgumentException;
 use Symfony\Component\Process\Exception\LogicException;
 use Symfony\Component\Process\Exception\ProcessFailedException;
+use Symfony\Component\Process\Exception\ProcessSignaledException;
 use Symfony\Component\Process\Exception\ProcessTimedOutException;
 use Symfony\Component\Process\Exception\RuntimeException;
 use Symfony\Component\Process\Pipes\PipesInterface;
@@ -58,22 +59,18 @@ class Process implements \IteratorAggregate
     private $lastOutputTime;
     private $timeout;
     private $idleTimeout;
-    private $options = array('suppress_errors' => true);
     private $exitcode;
     private $fallbackStatus = array();
     private $processInformation;
     private $outputDisabled = false;
     private $stdout;
     private $stderr;
-    private $enhanceWindowsCompatibility = true;
-    private $enhanceSigchildCompatibility;
     private $process;
     private $status = self::STATUS_READY;
     private $incrementalOutputOffset = 0;
     private $incrementalErrorOutputOffset = 0;
     private $tty;
     private $pty;
-    private $inheritEnv = false;
 
     private $useFileHandles = false;
     /** @var PipesInterface */
@@ -137,13 +134,12 @@ class Process implements \IteratorAggregate
      * @param array|null     $env         The environment variables or null to use the same environment as the current PHP process
      * @param mixed|null     $input       The input as stream resource, scalar or \Traversable, or null for no input
      * @param int|float|null $timeout     The timeout in seconds or null to disable
-     * @param array          $options     An array of options for proc_open
      *
      * @throws RuntimeException When proc_open is not installed
      */
-    public function __construct($commandline, $cwd = null, array $env = null, $input = null, $timeout = 60, array $options = null)
+    public function __construct($commandline, string $cwd = null, array $env = null, $input = null, ?float $timeout = 60)
     {
-        if (!function_exists('proc_open')) {
+        if (!\function_exists('proc_open')) {
             throw new RuntimeException('The Process class relies on proc_open, which is not available on your PHP installation.');
         }
 
@@ -154,7 +150,7 @@ class Process implements \IteratorAggregate
         // on Gnu/Linux, PHP builds with --enable-maintainer-zts are also affected
         // @see : https://bugs.php.net/bug.php?id=51800
         // @see : https://bugs.php.net/bug.php?id=50524
-        if (null === $this->cwd && (defined('ZEND_THREAD_SAFE') || '\\' === DIRECTORY_SEPARATOR)) {
+        if (null === $this->cwd && (\defined('ZEND_THREAD_SAFE') || '\\' === \DIRECTORY_SEPARATOR)) {
             $this->cwd = getcwd();
         }
         if (null !== $env) {
@@ -163,13 +159,8 @@ class Process implements \IteratorAggregate
 
         $this->setInput($input);
         $this->setTimeout($timeout);
-        $this->useFileHandles = '\\' === DIRECTORY_SEPARATOR;
+        $this->useFileHandles = '\\' === \DIRECTORY_SEPARATOR;
         $this->pty = false;
-        $this->enhanceSigchildCompatibility = '\\' !== DIRECTORY_SEPARATOR && $this->isSigchildEnabled();
-        if (null !== $options) {
-            @trigger_error(sprintf('The $options parameter of the %s constructor is deprecated since Symfony 3.3 and will be removed in 4.0.', __CLASS__), E_USER_DEPRECATED);
-            $this->options = array_replace($this->options, $options);
-        }
     }
 
     public function __destruct()
@@ -202,11 +193,10 @@ class Process implements \IteratorAggregate
      * @throws RuntimeException When process stopped after receiving signal
      * @throws LogicException   In case a callback is provided and output has been disabled
      *
-     * @final since version 3.3
+     * @final
      */
-    public function run($callback = null/*, array $env = array()*/)
+    public function run(callable $callback = null, array $env = array()): int
     {
-        $env = 1 < func_num_args() ? func_get_arg(1) : null;
         $this->start($callback, $env);
 
         return $this->wait();
@@ -223,18 +213,12 @@ class Process implements \IteratorAggregate
      *
      * @return self
      *
-     * @throws RuntimeException       if PHP was compiled with --enable-sigchild and the enhanced sigchild compatibility mode is not enabled
      * @throws ProcessFailedException if the process didn't terminate successfully
      *
-     * @final since version 3.3
+     * @final
      */
-    public function mustRun(callable $callback = null/*, array $env = array()*/)
+    public function mustRun(callable $callback = null, array $env = array())
     {
-        if (!$this->enhanceSigchildCompatibility && $this->isSigchildEnabled()) {
-            throw new RuntimeException('This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.');
-        }
-        $env = 1 < func_num_args() ? func_get_arg(1) : null;
-
         if (0 !== $this->run($callback, $env)) {
             throw new ProcessFailedException($this);
         }
@@ -262,59 +246,38 @@ class Process implements \IteratorAggregate
      * @throws RuntimeException When process is already running
      * @throws LogicException   In case a callback is provided and output has been disabled
      */
-    public function start(callable $callback = null/*, array $env = array()*/)
+    public function start(callable $callback = null, array $env = array())
     {
         if ($this->isRunning()) {
             throw new RuntimeException('Process is already running');
         }
-        if (2 <= func_num_args()) {
-            $env = func_get_arg(1);
-        } else {
-            if (__CLASS__ !== static::class) {
-                $r = new \ReflectionMethod($this, __FUNCTION__);
-                if (__CLASS__ !== $r->getDeclaringClass()->getName() && (2 > $r->getNumberOfParameters() || 'env' !== $r->getParameters()[0]->name)) {
-                    @trigger_error(sprintf('The %s::start() method expects a second "$env" argument since Symfony 3.3. It will be made mandatory in 4.0.', static::class), E_USER_DEPRECATED);
-                }
-            }
-            $env = null;
-        }
 
         $this->resetProcessData();
         $this->starttime = $this->lastOutputTime = microtime(true);
         $this->callback = $this->buildCallback($callback);
         $this->hasCallback = null !== $callback;
         $descriptors = $this->getDescriptors();
-        $inheritEnv = $this->inheritEnv;
 
-        if (is_array($commandline = $this->commandline)) {
+        if (\is_array($commandline = $this->commandline)) {
             $commandline = implode(' ', array_map(array($this, 'escapeArgument'), $commandline));
 
-            if ('\\' !== DIRECTORY_SEPARATOR) {
+            if ('\\' !== \DIRECTORY_SEPARATOR) {
                 // exec is mandatory to deal with sending a signal to the process
                 $commandline = 'exec '.$commandline;
             }
         }
 
-        if (null === $env) {
-            $env = $this->env;
-        } else {
-            if ($this->env) {
-                $env += $this->env;
-            }
-            $inheritEnv = true;
+        if ($this->env) {
+            $env += $this->env;
         }
+        $env += $this->getDefaultEnv();
 
-        if (null !== $env && $inheritEnv) {
-            $env += $this->getDefaultEnv();
-        } elseif (null !== $env) {
-            @trigger_error('Not inheriting environment variables is deprecated since Symfony 3.3 and will always happen in 4.0. Set "Process::inheritEnvironmentVariables()" to true instead.', E_USER_DEPRECATED);
-        } else {
-            $env = $this->getDefaultEnv();
-        }
-        if ('\\' === DIRECTORY_SEPARATOR && $this->enhanceWindowsCompatibility) {
-            $this->options['bypass_shell'] = true;
+        $options = array('suppress_errors' => true);
+
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $options['bypass_shell'] = true;
             $commandline = $this->prepareWindowsCommandLine($commandline, $env);
-        } elseif (!$this->useFileHandles && $this->enhanceSigchildCompatibility && $this->isSigchildEnabled()) {
+        } elseif (!$this->useFileHandles && $this->isSigchildEnabled()) {
             // last exit code is output on the fourth pipe and caught to work around --enable-sigchild
             $descriptors[3] = array('pipe', 'w');
 
@@ -326,24 +289,21 @@ class Process implements \IteratorAggregate
             // @see : https://bugs.php.net/69442
             $ptsWorkaround = fopen(__FILE__, 'r');
         }
-        if (defined('HHVM_VERSION')) {
-            $envPairs = $env;
-        } else {
-            $envPairs = array();
-            foreach ($env as $k => $v) {
-                if (false !== $v) {
-                    $envPairs[] = $k.'='.$v;
-                }
+
+        $envPairs = array();
+        foreach ($env as $k => $v) {
+            if (false !== $v) {
+                $envPairs[] = $k.'='.$v;
             }
         }
 
         if (!is_dir($this->cwd)) {
-            @trigger_error('The provided cwd does not exist. Command is currently ran against getcwd(). This behavior is deprecated since Symfony 3.4 and will be removed in 4.0.', E_USER_DEPRECATED);
+            throw new RuntimeException('The provided cwd does not exist.');
         }
 
-        $this->process = proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $envPairs, $this->options);
+        $this->process = proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $envPairs, $options);
 
-        if (!is_resource($this->process)) {
+        if (!\is_resource($this->process)) {
             throw new RuntimeException('Unable to launch a new process.');
         }
         $this->status = self::STATUS_STARTED;
@@ -376,14 +336,13 @@ class Process implements \IteratorAggregate
      *
      * @see start()
      *
-     * @final since version 3.3
+     * @final
      */
-    public function restart(callable $callback = null/*, array $env = array()*/)
+    public function restart(callable $callback = null, array $env = array())
     {
         if ($this->isRunning()) {
             throw new RuntimeException('Process is already running');
         }
-        $env = 1 < func_num_args() ? func_get_arg(1) : null;
 
         $process = clone $this;
         $process->start($callback, $env);
@@ -422,8 +381,8 @@ class Process implements \IteratorAggregate
 
         do {
             $this->checkTimeout();
-            $running = '\\' === DIRECTORY_SEPARATOR ? $this->isRunning() : $this->processPipes->areOpen();
-            $this->readPipes($running, '\\' !== DIRECTORY_SEPARATOR || !$running);
+            $running = '\\' === \DIRECTORY_SEPARATOR ? $this->isRunning() : $this->processPipes->areOpen();
+            $this->readPipes($running, '\\' !== \DIRECTORY_SEPARATOR || !$running);
         } while ($running);
 
         while ($this->isRunning()) {
@@ -431,7 +390,7 @@ class Process implements \IteratorAggregate
         }
 
         if ($this->processInformation['signaled'] && $this->processInformation['termsig'] !== $this->latestSignal) {
-            throw new RuntimeException(sprintf('The process has been signaled with signal "%s".', $this->processInformation['termsig']));
+            throw new ProcessSignaledException($this);
         }
 
         return $this->exitcode;
@@ -692,16 +651,10 @@ class Process implements \IteratorAggregate
     /**
      * Returns the exit code returned by the process.
      *
-     * @return null|int The exit status code, null if the Process is not terminated
-     *
-     * @throws RuntimeException In case --enable-sigchild is activated and the sigchild compatibility mode is disabled
+     * @return int|null The exit status code, null if the Process is not terminated
      */
     public function getExitCode()
     {
-        if (!$this->enhanceSigchildCompatibility && $this->isSigchildEnabled()) {
-            throw new RuntimeException('This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.');
-        }
-
         $this->updateStatus(false);
 
         return $this->exitcode;
@@ -713,7 +666,7 @@ class Process implements \IteratorAggregate
      * This method relies on the Unix exit code status standardization
      * and might not be relevant for other operating systems.
      *
-     * @return null|string A string representation for the exit status code, null if the Process is not terminated
+     * @return string|null A string representation for the exit status code, null if the Process is not terminated
      *
      * @see http://tldp.org/LDP/abs/html/exitcodes.html
      * @see http://en.wikipedia.org/wiki/Unix_signal
@@ -744,17 +697,12 @@ class Process implements \IteratorAggregate
      *
      * @return bool
      *
-     * @throws RuntimeException In case --enable-sigchild is activated
-     * @throws LogicException   In case the process is not terminated
+     * @throws LogicException In case the process is not terminated
      */
     public function hasBeenSignaled()
     {
         $this->requireProcessIsTerminated(__FUNCTION__);
 
-        if (!$this->enhanceSigchildCompatibility && $this->isSigchildEnabled()) {
-            throw new RuntimeException('This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved.');
-        }
-
         return $this->processInformation['signaled'];
     }
 
@@ -772,7 +720,7 @@ class Process implements \IteratorAggregate
     {
         $this->requireProcessIsTerminated(__FUNCTION__);
 
-        if ($this->isSigchildEnabled() && (!$this->enhanceSigchildCompatibility || -1 === $this->processInformation['termsig'])) {
+        if ($this->isSigchildEnabled() && -1 === $this->processInformation['termsig']) {
             throw new RuntimeException('This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved.');
         }
 
@@ -904,10 +852,8 @@ class Process implements \IteratorAggregate
      * Adds a line to the STDOUT stream.
      *
      * @internal
-     *
-     * @param string $line The line to append
      */
-    public function addOutput($line)
+    public function addOutput(string $line)
     {
         $this->lastOutputTime = microtime(true);
 
@@ -920,10 +866,8 @@ class Process implements \IteratorAggregate
      * Adds a line to the STDERR stream.
      *
      * @internal
-     *
-     * @param string $line The line to append
      */
-    public function addErrorOutput($line)
+    public function addErrorOutput(string $line)
     {
         $this->lastOutputTime = microtime(true);
 
@@ -939,7 +883,7 @@ class Process implements \IteratorAggregate
      */
     public function getCommandLine()
     {
-        return is_array($this->commandline) ? implode(' ', array_map(array($this, 'escapeArgument'), $this->commandline)) : $this->commandline;
+        return \is_array($this->commandline) ? implode(' ', array_map(array($this, 'escapeArgument'), $this->commandline)) : $this->commandline;
     }
 
     /**
@@ -1028,19 +972,12 @@ class Process implements \IteratorAggregate
      */
     public function setTty($tty)
     {
-        if ('\\' === DIRECTORY_SEPARATOR && $tty) {
+        if ('\\' === \DIRECTORY_SEPARATOR && $tty) {
             throw new RuntimeException('TTY mode is not supported on Windows platform.');
         }
-        if ($tty) {
-            static $isTtySupported;
 
-            if (null === $isTtySupported) {
-                $isTtySupported = (bool) @proc_open('echo 1 >/dev/null', array(array('file', '/dev/tty', 'r'), array('file', '/dev/tty', 'w'), array('file', '/dev/tty', 'w')), $pipes);
-            }
-
-            if (!$isTtySupported) {
-                throw new RuntimeException('TTY mode requires /dev/tty to be read/writable.');
-            }
+        if ($tty && !self::isTtySupported()) {
+            throw new RuntimeException('TTY mode requires /dev/tty to be read/writable.');
         }
 
         $this->tty = (bool) $tty;
@@ -1141,7 +1078,7 @@ class Process implements \IteratorAggregate
     {
         // Process can not handle env values that are arrays
         $env = array_filter($env, function ($value) {
-            return !is_array($value);
+            return !\is_array($value);
         });
 
         $this->env = $env;
@@ -1181,108 +1118,6 @@ class Process implements \IteratorAggregate
         return $this;
     }
 
-    /**
-     * Gets the options for proc_open.
-     *
-     * @return array The current options
-     *
-     * @deprecated since version 3.3, to be removed in 4.0.
-     */
-    public function getOptions()
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->options;
-    }
-
-    /**
-     * Sets the options for proc_open.
-     *
-     * @param array $options The new options
-     *
-     * @return self The current Process instance
-     *
-     * @deprecated since version 3.3, to be removed in 4.0.
-     */
-    public function setOptions(array $options)
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
-
-        $this->options = $options;
-
-        return $this;
-    }
-
-    /**
-     * Gets whether or not Windows compatibility is enabled.
-     *
-     * This is true by default.
-     *
-     * @return bool
-     *
-     * @deprecated since version 3.3, to be removed in 4.0. Enhanced Windows compatibility will always be enabled.
-     */
-    public function getEnhanceWindowsCompatibility()
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Enhanced Windows compatibility will always be enabled.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->enhanceWindowsCompatibility;
-    }
-
-    /**
-     * Sets whether or not Windows compatibility is enabled.
-     *
-     * @param bool $enhance
-     *
-     * @return self The current Process instance
-     *
-     * @deprecated since version 3.3, to be removed in 4.0. Enhanced Windows compatibility will always be enabled.
-     */
-    public function setEnhanceWindowsCompatibility($enhance)
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Enhanced Windows compatibility will always be enabled.', __METHOD__), E_USER_DEPRECATED);
-
-        $this->enhanceWindowsCompatibility = (bool) $enhance;
-
-        return $this;
-    }
-
-    /**
-     * Returns whether sigchild compatibility mode is activated or not.
-     *
-     * @return bool
-     *
-     * @deprecated since version 3.3, to be removed in 4.0. Sigchild compatibility will always be enabled.
-     */
-    public function getEnhanceSigchildCompatibility()
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Sigchild compatibility will always be enabled.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->enhanceSigchildCompatibility;
-    }
-
-    /**
-     * Activates sigchild compatibility mode.
-     *
-     * Sigchild compatibility mode is required to get the exit code and
-     * determine the success of a process when PHP has been compiled with
-     * the --enable-sigchild option
-     *
-     * @param bool $enhance
-     *
-     * @return self The current Process instance
-     *
-     * @deprecated since version 3.3, to be removed in 4.0.
-     */
-    public function setEnhanceSigchildCompatibility($enhance)
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Sigchild compatibility will always be enabled.', __METHOD__), E_USER_DEPRECATED);
-
-        $this->enhanceSigchildCompatibility = (bool) $enhance;
-
-        return $this;
-    }
-
     /**
      * Sets whether environment variables will be inherited or not.
      *
@@ -1293,28 +1128,12 @@ class Process implements \IteratorAggregate
     public function inheritEnvironmentVariables($inheritEnv = true)
     {
         if (!$inheritEnv) {
-            @trigger_error('Not inheriting environment variables is deprecated since Symfony 3.3 and will always happen in 4.0. Set "Process::inheritEnvironmentVariables()" to true instead.', E_USER_DEPRECATED);
+            throw new InvalidArgumentException('Not inheriting environment variables is not supported.');
         }
 
-        $this->inheritEnv = (bool) $inheritEnv;
-
         return $this;
     }
 
-    /**
-     * Returns whether environment variables will be inherited or not.
-     *
-     * @return bool
-     *
-     * @deprecated since version 3.3, to be removed in 4.0. Environment variables will always be inherited.
-     */
-    public function areEnvironmentVariablesInherited()
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Environment variables will always be inherited.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->inheritEnv;
-    }
-
     /**
      * Performs a check between the timeout definition and the time the process started.
      *
@@ -1342,6 +1161,20 @@ class Process implements \IteratorAggregate
         }
     }
 
+    /**
+     * Returns whether TTY is supported on the current operating system.
+     */
+    public static function isTtySupported(): bool
+    {
+        static $isTtySupported;
+
+        if (null === $isTtySupported) {
+            $isTtySupported = (bool) @proc_open('echo 1 >/dev/null', array(array('file', '/dev/tty', 'r'), array('file', '/dev/tty', 'w'), array('file', '/dev/tty', 'w')), $pipes);
+        }
+
+        return $isTtySupported;
+    }
+
     /**
      * Returns whether PTY is supported on the current operating system.
      *
@@ -1355,7 +1188,7 @@ class Process implements \IteratorAggregate
             return $result;
         }
 
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             return $result = false;
         }
 
@@ -1364,15 +1197,13 @@ class Process implements \IteratorAggregate
 
     /**
      * Creates the descriptors needed by the proc_open.
-     *
-     * @return array
      */
-    private function getDescriptors()
+    private function getDescriptors(): array
     {
         if ($this->input instanceof \Iterator) {
             $this->input->rewind();
         }
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->processPipes = new WindowsPipes($this->input, !$this->outputDisabled || $this->hasCallback);
         } else {
             $this->processPipes = new UnixPipes($this->isTty(), $this->isPty(), $this->input, !$this->outputDisabled || $this->hasCallback);
@@ -1396,7 +1227,7 @@ class Process implements \IteratorAggregate
         if ($this->outputDisabled) {
             return function ($type, $data) use ($callback) {
                 if (null !== $callback) {
-                    call_user_func($callback, $type, $data);
+                    \call_user_func($callback, $type, $data);
                 }
             };
         }
@@ -1411,7 +1242,7 @@ class Process implements \IteratorAggregate
             }
 
             if (null !== $callback) {
-                call_user_func($callback, $type, $data);
+                \call_user_func($callback, $type, $data);
             }
         };
     }
@@ -1430,9 +1261,9 @@ class Process implements \IteratorAggregate
         $this->processInformation = proc_get_status($this->process);
         $running = $this->processInformation['running'];
 
-        $this->readPipes($running && $blocking, '\\' !== DIRECTORY_SEPARATOR || !$running);
+        $this->readPipes($running && $blocking, '\\' !== \DIRECTORY_SEPARATOR || !$running);
 
-        if ($this->fallbackStatus && $this->enhanceSigchildCompatibility && $this->isSigchildEnabled()) {
+        if ($this->fallbackStatus && $this->isSigchildEnabled()) {
             $this->processInformation = $this->fallbackStatus + $this->processInformation;
         }
 
@@ -1452,7 +1283,7 @@ class Process implements \IteratorAggregate
             return self::$sigchild;
         }
 
-        if (!function_exists('phpinfo') || defined('HHVM_VERSION')) {
+        if (!\function_exists('phpinfo')) {
             return self::$sigchild = false;
         }
 
@@ -1470,7 +1301,7 @@ class Process implements \IteratorAggregate
      *
      * @throws LogicException in case output has been disabled or process is not started
      */
-    private function readPipesForOutput($caller, $blocking = false)
+    private function readPipesForOutput(string $caller, bool $blocking = false)
     {
         if ($this->outputDisabled) {
             throw new LogicException('Output has been disabled.');
@@ -1484,13 +1315,9 @@ class Process implements \IteratorAggregate
     /**
      * Validates and returns the filtered timeout.
      *
-     * @param int|float|null $timeout
-     *
-     * @return float|null
-     *
      * @throws InvalidArgumentException if the given timeout is a negative number
      */
-    private function validateTimeout($timeout)
+    private function validateTimeout(?float $timeout): ?float
     {
         $timeout = (float) $timeout;
 
@@ -1509,7 +1336,7 @@ class Process implements \IteratorAggregate
      * @param bool $blocking Whether to use blocking calls or not
      * @param bool $close    Whether to close file handles or not
      */
-    private function readPipes($blocking, $close)
+    private function readPipes(bool $blocking, bool $close)
     {
         $result = $this->processPipes->readAndWrite($blocking, $close);
 
@@ -1528,10 +1355,10 @@ class Process implements \IteratorAggregate
      *
      * @return int The exitcode
      */
-    private function close()
+    private function close(): int
     {
         $this->processPipes->close();
-        if (is_resource($this->process)) {
+        if (\is_resource($this->process)) {
             proc_close($this->process);
         }
         $this->exitcode = $this->processInformation['exitcode'];
@@ -1541,7 +1368,7 @@ class Process implements \IteratorAggregate
             if ($this->processInformation['signaled'] && 0 < $this->processInformation['termsig']) {
                 // if process has been signaled, no exitcode but a valid termsig, apply Unix convention
                 $this->exitcode = 128 + $this->processInformation['termsig'];
-            } elseif ($this->enhanceSigchildCompatibility && $this->isSigchildEnabled()) {
+            } elseif ($this->isSigchildEnabled()) {
                 $this->processInformation['signaled'] = true;
                 $this->processInformation['termsig'] = -1;
             }
@@ -1565,8 +1392,8 @@ class Process implements \IteratorAggregate
         $this->exitcode = null;
         $this->fallbackStatus = array();
         $this->processInformation = null;
-        $this->stdout = fopen('php://temp/maxmemory:'.(1024 * 1024), 'wb+');
-        $this->stderr = fopen('php://temp/maxmemory:'.(1024 * 1024), 'wb+');
+        $this->stdout = fopen('php://temp/maxmemory:'.(1024 * 1024), 'w+b');
+        $this->stderr = fopen('php://temp/maxmemory:'.(1024 * 1024), 'w+b');
         $this->process = null;
         $this->latestSignal = null;
         $this->status = self::STATUS_READY;
@@ -1586,7 +1413,7 @@ class Process implements \IteratorAggregate
      * @throws RuntimeException In case --enable-sigchild is activated and the process can't be killed
      * @throws RuntimeException In case of failure
      */
-    private function doSignal($signal, $throwException)
+    private function doSignal(int $signal, bool $throwException): bool
     {
         if (null === $pid = $this->getPid()) {
             if ($throwException) {
@@ -1596,7 +1423,7 @@ class Process implements \IteratorAggregate
             return false;
         }
 
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             exec(sprintf('taskkill /F /T /PID %d 2>&1', $pid), $output, $exitCode);
             if ($exitCode && $this->isRunning()) {
                 if ($throwException) {
@@ -1606,9 +1433,9 @@ class Process implements \IteratorAggregate
                 return false;
             }
         } else {
-            if (!$this->enhanceSigchildCompatibility || !$this->isSigchildEnabled()) {
+            if (!$this->isSigchildEnabled()) {
                 $ok = @proc_terminate($this->process, $signal);
-            } elseif (function_exists('posix_kill')) {
+            } elseif (\function_exists('posix_kill')) {
                 $ok = @posix_kill($pid, $signal);
             } elseif ($ok = proc_open(sprintf('kill -%d %d', $signal, $pid), array(2 => array('pipe', 'w')), $pipes)) {
                 $ok = false === fgets($pipes[2]);
@@ -1622,7 +1449,7 @@ class Process implements \IteratorAggregate
             }
         }
 
-        $this->latestSignal = (int) $signal;
+        $this->latestSignal = $signal;
         $this->fallbackStatus['signaled'] = true;
         $this->fallbackStatus['exitcode'] = -1;
         $this->fallbackStatus['termsig'] = $this->latestSignal;
@@ -1630,7 +1457,7 @@ class Process implements \IteratorAggregate
         return true;
     }
 
-    private function prepareWindowsCommandLine($cmd, array &$env)
+    private function prepareWindowsCommandLine(string $cmd, array &$env)
     {
         $uid = uniqid('', true);
         $varCount = 0;
@@ -1679,11 +1506,9 @@ class Process implements \IteratorAggregate
     /**
      * Ensures the process is running or terminated, throws a LogicException if the process has a not started.
      *
-     * @param string $functionName The function name that was called
-     *
      * @throws LogicException if the process has not run
      */
-    private function requireProcessIsStarted($functionName)
+    private function requireProcessIsStarted(string $functionName)
     {
         if (!$this->isStarted()) {
             throw new LogicException(sprintf('Process must be started before calling %s.', $functionName));
@@ -1693,11 +1518,9 @@ class Process implements \IteratorAggregate
     /**
      * Ensures the process is terminated, throws a LogicException if the process has a status different than `terminated`.
      *
-     * @param string $functionName The function name that was called
-     *
      * @throws LogicException if the process is not yet terminated
      */
-    private function requireProcessIsTerminated($functionName)
+    private function requireProcessIsTerminated(string $functionName)
     {
         if (!$this->isTerminated()) {
             throw new LogicException(sprintf('Process must be terminated before calling %s.', $functionName));
@@ -1706,14 +1529,10 @@ class Process implements \IteratorAggregate
 
     /**
      * Escapes a string to be used as a shell argument.
-     *
-     * @param string $argument The argument that will be escaped
-     *
-     * @return string The escaped argument
      */
-    private function escapeArgument($argument)
+    private function escapeArgument(string $argument): string
     {
-        if ('\\' !== DIRECTORY_SEPARATOR) {
+        if ('\\' !== \DIRECTORY_SEPARATOR) {
             return "'".str_replace("'", "'\\''", $argument)."'";
         }
         if ('' === $argument = (string) $argument) {
@@ -1735,13 +1554,13 @@ class Process implements \IteratorAggregate
         $env = array();
 
         foreach ($_SERVER as $k => $v) {
-            if (is_string($v) && false !== $v = getenv($k)) {
+            if (\is_string($v) && false !== $v = getenv($k)) {
                 $env[$k] = $v;
             }
         }
 
         foreach ($_ENV as $k => $v) {
-            if (is_string($v)) {
+            if (\is_string($v)) {
                 $env[$k] = $v;
             }
         }
diff --git a/vendor/symfony/process/ProcessBuilder.php b/vendor/symfony/process/ProcessBuilder.php
deleted file mode 100644
index a91147cb..00000000
--- a/vendor/symfony/process/ProcessBuilder.php
+++ /dev/null
@@ -1,280 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Process;
-
-@trigger_error(sprintf('The %s class is deprecated since Symfony 3.4 and will be removed in 4.0. Use the Process class instead.', ProcessBuilder::class), E_USER_DEPRECATED);
-
-use Symfony\Component\Process\Exception\InvalidArgumentException;
-use Symfony\Component\Process\Exception\LogicException;
-
-/**
- * @author Kris Wallsmith <kris@symfony.com>
- *
- * @deprecated since version 3.4, to be removed in 4.0. Use the Process class instead.
- */
-class ProcessBuilder
-{
-    private $arguments;
-    private $cwd;
-    private $env = array();
-    private $input;
-    private $timeout = 60;
-    private $options;
-    private $inheritEnv = true;
-    private $prefix = array();
-    private $outputDisabled = false;
-
-    /**
-     * @param string[] $arguments An array of arguments
-     */
-    public function __construct(array $arguments = array())
-    {
-        $this->arguments = $arguments;
-    }
-
-    /**
-     * Creates a process builder instance.
-     *
-     * @param string[] $arguments An array of arguments
-     *
-     * @return static
-     */
-    public static function create(array $arguments = array())
-    {
-        return new static($arguments);
-    }
-
-    /**
-     * Adds an unescaped argument to the command string.
-     *
-     * @param string $argument A command argument
-     *
-     * @return $this
-     */
-    public function add($argument)
-    {
-        $this->arguments[] = $argument;
-
-        return $this;
-    }
-
-    /**
-     * Adds a prefix to the command string.
-     *
-     * The prefix is preserved when resetting arguments.
-     *
-     * @param string|array $prefix A command prefix or an array of command prefixes
-     *
-     * @return $this
-     */
-    public function setPrefix($prefix)
-    {
-        $this->prefix = is_array($prefix) ? $prefix : array($prefix);
-
-        return $this;
-    }
-
-    /**
-     * Sets the arguments of the process.
-     *
-     * Arguments must not be escaped.
-     * Previous arguments are removed.
-     *
-     * @param string[] $arguments
-     *
-     * @return $this
-     */
-    public function setArguments(array $arguments)
-    {
-        $this->arguments = $arguments;
-
-        return $this;
-    }
-
-    /**
-     * Sets the working directory.
-     *
-     * @param null|string $cwd The working directory
-     *
-     * @return $this
-     */
-    public function setWorkingDirectory($cwd)
-    {
-        $this->cwd = $cwd;
-
-        return $this;
-    }
-
-    /**
-     * Sets whether environment variables will be inherited or not.
-     *
-     * @param bool $inheritEnv
-     *
-     * @return $this
-     */
-    public function inheritEnvironmentVariables($inheritEnv = true)
-    {
-        $this->inheritEnv = $inheritEnv;
-
-        return $this;
-    }
-
-    /**
-     * Sets an environment variable.
-     *
-     * Setting a variable overrides its previous value. Use `null` to unset a
-     * defined environment variable.
-     *
-     * @param string      $name  The variable name
-     * @param null|string $value The variable value
-     *
-     * @return $this
-     */
-    public function setEnv($name, $value)
-    {
-        $this->env[$name] = $value;
-
-        return $this;
-    }
-
-    /**
-     * Adds a set of environment variables.
-     *
-     * Already existing environment variables with the same name will be
-     * overridden by the new values passed to this method. Pass `null` to unset
-     * a variable.
-     *
-     * @param array $variables The variables
-     *
-     * @return $this
-     */
-    public function addEnvironmentVariables(array $variables)
-    {
-        $this->env = array_replace($this->env, $variables);
-
-        return $this;
-    }
-
-    /**
-     * Sets the input of the process.
-     *
-     * @param resource|string|int|float|bool|\Traversable|null $input The input content
-     *
-     * @return $this
-     *
-     * @throws InvalidArgumentException In case the argument is invalid
-     */
-    public function setInput($input)
-    {
-        $this->input = ProcessUtils::validateInput(__METHOD__, $input);
-
-        return $this;
-    }
-
-    /**
-     * Sets the process timeout.
-     *
-     * To disable the timeout, set this value to null.
-     *
-     * @param float|null $timeout
-     *
-     * @return $this
-     *
-     * @throws InvalidArgumentException
-     */
-    public function setTimeout($timeout)
-    {
-        if (null === $timeout) {
-            $this->timeout = null;
-
-            return $this;
-        }
-
-        $timeout = (float) $timeout;
-
-        if ($timeout < 0) {
-            throw new InvalidArgumentException('The timeout value must be a valid positive integer or float number.');
-        }
-
-        $this->timeout = $timeout;
-
-        return $this;
-    }
-
-    /**
-     * Adds a proc_open option.
-     *
-     * @param string $name  The option name
-     * @param string $value The option value
-     *
-     * @return $this
-     */
-    public function setOption($name, $value)
-    {
-        $this->options[$name] = $value;
-
-        return $this;
-    }
-
-    /**
-     * Disables fetching output and error output from the underlying process.
-     *
-     * @return $this
-     */
-    public function disableOutput()
-    {
-        $this->outputDisabled = true;
-
-        return $this;
-    }
-
-    /**
-     * Enables fetching output and error output from the underlying process.
-     *
-     * @return $this
-     */
-    public function enableOutput()
-    {
-        $this->outputDisabled = false;
-
-        return $this;
-    }
-
-    /**
-     * Creates a Process instance and returns it.
-     *
-     * @return Process
-     *
-     * @throws LogicException In case no arguments have been provided
-     */
-    public function getProcess()
-    {
-        if (0 === count($this->prefix) && 0 === count($this->arguments)) {
-            throw new LogicException('You must add() command arguments before calling getProcess().');
-        }
-
-        $arguments = array_merge($this->prefix, $this->arguments);
-        $process = new Process($arguments, $this->cwd, $this->env, $this->input, $this->timeout, $this->options);
-        // to preserve the BC with symfony <3.3, we convert the array structure
-        // to a string structure to avoid the prefixing with the exec command
-        $process->setCommandLine($process->getCommandLine());
-
-        if ($this->inheritEnv) {
-            $process->inheritEnvironmentVariables();
-        }
-        if ($this->outputDisabled) {
-            $process->disableOutput();
-        }
-
-        return $process;
-    }
-}
diff --git a/vendor/symfony/process/ProcessUtils.php b/vendor/symfony/process/ProcessUtils.php
index c30950c1..2f9c4be4 100644
--- a/vendor/symfony/process/ProcessUtils.php
+++ b/vendor/symfony/process/ProcessUtils.php
@@ -29,55 +29,6 @@ class ProcessUtils
     {
     }
 
-    /**
-     * Escapes a string to be used as a shell argument.
-     *
-     * @param string $argument The argument that will be escaped
-     *
-     * @return string The escaped argument
-     *
-     * @deprecated since version 3.3, to be removed in 4.0. Use a command line array or give env vars to the `Process::start/run()` method instead.
-     */
-    public static function escapeArgument($argument)
-    {
-        @trigger_error('The '.__METHOD__.'() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use a command line array or give env vars to the Process::start/run() method instead.', E_USER_DEPRECATED);
-
-        //Fix for PHP bug #43784 escapeshellarg removes % from given string
-        //Fix for PHP bug #49446 escapeshellarg doesn't work on Windows
-        //@see https://bugs.php.net/bug.php?id=43784
-        //@see https://bugs.php.net/bug.php?id=49446
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            if ('' === $argument) {
-                return escapeshellarg($argument);
-            }
-
-            $escapedArgument = '';
-            $quote = false;
-            foreach (preg_split('/(")/', $argument, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE) as $part) {
-                if ('"' === $part) {
-                    $escapedArgument .= '\\"';
-                } elseif (self::isSurroundedBy($part, '%')) {
-                    // Avoid environment variable expansion
-                    $escapedArgument .= '^%"'.substr($part, 1, -1).'"^%';
-                } else {
-                    // escape trailing backslash
-                    if ('\\' === substr($part, -1)) {
-                        $part .= '\\';
-                    }
-                    $quote = true;
-                    $escapedArgument .= $part;
-                }
-            }
-            if ($quote) {
-                $escapedArgument = '"'.$escapedArgument.'"';
-            }
-
-            return $escapedArgument;
-        }
-
-        return "'".str_replace("'", "'\\''", $argument)."'";
-    }
-
     /**
      * Validates and normalizes a Process input.
      *
@@ -91,10 +42,10 @@ class ProcessUtils
     public static function validateInput($caller, $input)
     {
         if (null !== $input) {
-            if (is_resource($input)) {
+            if (\is_resource($input)) {
                 return $input;
             }
-            if (is_string($input)) {
+            if (\is_string($input)) {
                 return $input;
             }
             if (is_scalar($input)) {
@@ -115,9 +66,4 @@ class ProcessUtils
 
         return $input;
     }
-
-    private static function isSurroundedBy($arg, $char)
-    {
-        return 2 < strlen($arg) && $char === $arg[0] && $char === $arg[strlen($arg) - 1];
-    }
 }
diff --git a/vendor/symfony/process/Tests/ExecutableFinderTest.php b/vendor/symfony/process/Tests/ExecutableFinderTest.php
index bc692f6a..c6d063c0 100644
--- a/vendor/symfony/process/Tests/ExecutableFinderTest.php
+++ b/vendor/symfony/process/Tests/ExecutableFinderTest.php
@@ -41,7 +41,7 @@ class ExecutableFinderTest extends TestCase
             $this->markTestSkipped('Cannot test when open_basedir is set');
         }
 
-        $this->setPath(dirname(PHP_BINARY));
+        $this->setPath(\dirname(PHP_BINARY));
 
         $finder = new ExecutableFinder();
         $result = $finder->find($this->getPhpBinaryName());
@@ -73,7 +73,7 @@ class ExecutableFinderTest extends TestCase
 
         $this->setPath('');
 
-        $extraDirs = array(dirname(PHP_BINARY));
+        $extraDirs = array(\dirname(PHP_BINARY));
 
         $finder = new ExecutableFinder();
         $result = $finder->find($this->getPhpBinaryName(), null, $extraDirs);
@@ -83,7 +83,7 @@ class ExecutableFinderTest extends TestCase
 
     public function testFindWithOpenBaseDir()
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('Cannot run test on windows');
         }
 
@@ -91,7 +91,7 @@ class ExecutableFinderTest extends TestCase
             $this->markTestSkipped('Cannot test when open_basedir is set');
         }
 
-        $this->iniSet('open_basedir', dirname(PHP_BINARY).(!defined('HHVM_VERSION') || HHVM_VERSION_ID >= 30800 ? PATH_SEPARATOR.'/' : ''));
+        $this->iniSet('open_basedir', \dirname(PHP_BINARY).PATH_SEPARATOR.'/');
 
         $finder = new ExecutableFinder();
         $result = $finder->find($this->getPhpBinaryName());
@@ -104,12 +104,12 @@ class ExecutableFinderTest extends TestCase
         if (ini_get('open_basedir')) {
             $this->markTestSkipped('Cannot test when open_basedir is set');
         }
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('Cannot run test on windows');
         }
 
         $this->setPath('');
-        $this->iniSet('open_basedir', PHP_BINARY.(!defined('HHVM_VERSION') || HHVM_VERSION_ID >= 30800 ? PATH_SEPARATOR.'/' : ''));
+        $this->iniSet('open_basedir', PHP_BINARY.PATH_SEPARATOR.'/');
 
         $finder = new ExecutableFinder();
         $result = $finder->find($this->getPhpBinaryName(), false);
@@ -117,9 +117,39 @@ class ExecutableFinderTest extends TestCase
         $this->assertSamePath(PHP_BINARY, $result);
     }
 
+    /**
+     * @requires PHP 5.4
+     */
+    public function testFindBatchExecutableOnWindows()
+    {
+        if (ini_get('open_basedir')) {
+            $this->markTestSkipped('Cannot test when open_basedir is set');
+        }
+        if ('\\' !== \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('Can be only tested on windows');
+        }
+
+        $target = tempnam(sys_get_temp_dir(), 'example-windows-executable');
+
+        touch($target);
+        touch($target.'.BAT');
+
+        $this->assertFalse(is_executable($target));
+
+        $this->setPath(sys_get_temp_dir());
+
+        $finder = new ExecutableFinder();
+        $result = $finder->find(basename($target), false);
+
+        unlink($target);
+        unlink($target.'.BAT');
+
+        $this->assertSamePath($target.'.BAT', $result);
+    }
+
     private function assertSamePath($expected, $tested)
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->assertEquals(strtolower($expected), strtolower($tested));
         } else {
             $this->assertEquals($expected, $tested);
@@ -128,6 +158,6 @@ class ExecutableFinderTest extends TestCase
 
     private function getPhpBinaryName()
     {
-        return basename(PHP_BINARY, '\\' === DIRECTORY_SEPARATOR ? '.exe' : '');
+        return basename(PHP_BINARY, '\\' === \DIRECTORY_SEPARATOR ? '.exe' : '');
     }
 }
diff --git a/vendor/symfony/process/Tests/PhpExecutableFinderTest.php b/vendor/symfony/process/Tests/PhpExecutableFinderTest.php
index b08ad5d3..df2560df 100644
--- a/vendor/symfony/process/Tests/PhpExecutableFinderTest.php
+++ b/vendor/symfony/process/Tests/PhpExecutableFinderTest.php
@@ -24,36 +24,15 @@ class PhpExecutableFinderTest extends TestCase
      */
     public function testFind()
     {
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped('Should not be executed in HHVM context.');
-        }
-
         $f = new PhpExecutableFinder();
 
         $current = PHP_BINARY;
-        $args = 'phpdbg' === PHP_SAPI ? ' -qrr' : '';
+        $args = 'phpdbg' === \PHP_SAPI ? ' -qrr' : '';
 
         $this->assertEquals($current.$args, $f->find(), '::find() returns the executable PHP');
         $this->assertEquals($current, $f->find(false), '::find() returns the executable PHP');
     }
 
-    /**
-     * tests find() with the env var / constant PHP_BINARY with HHVM.
-     */
-    public function testFindWithHHVM()
-    {
-        if (!defined('HHVM_VERSION')) {
-            $this->markTestSkipped('Should be executed in HHVM context.');
-        }
-
-        $f = new PhpExecutableFinder();
-
-        $current = getenv('PHP_BINARY') ?: PHP_BINARY;
-
-        $this->assertEquals($current.' --php', $f->find(), '::find() returns the executable PHP');
-        $this->assertEquals($current, $f->find(false), '::find() returns the executable PHP');
-    }
-
     /**
      * tests find() with the env var PHP_PATH.
      */
@@ -61,9 +40,7 @@ class PhpExecutableFinderTest extends TestCase
     {
         $f = new PhpExecutableFinder();
 
-        if (defined('HHVM_VERSION')) {
-            $this->assertEquals($f->findArguments(), array('--php'), '::findArguments() returns HHVM arguments');
-        } elseif ('phpdbg' === PHP_SAPI) {
+        if ('phpdbg' === \PHP_SAPI) {
             $this->assertEquals($f->findArguments(), array('-qrr'), '::findArguments() returns phpdbg arguments');
         } else {
             $this->assertEquals($f->findArguments(), array(), '::findArguments() returns no arguments');
diff --git a/vendor/symfony/process/Tests/PhpProcessTest.php b/vendor/symfony/process/Tests/PhpProcessTest.php
index f67368c7..b0f0a57a 100644
--- a/vendor/symfony/process/Tests/PhpProcessTest.php
+++ b/vendor/symfony/process/Tests/PhpProcessTest.php
@@ -43,6 +43,6 @@ PHP
         $process->wait();
         $this->assertContains($commandLine, $process->getCommandLine(), '::getCommandLine() returns the command line of PHP after wait');
 
-        $this->assertSame(PHP_VERSION.PHP_SAPI, $process->getOutput());
+        $this->assertSame(PHP_VERSION.\PHP_SAPI, $process->getOutput());
     }
 }
diff --git a/vendor/symfony/process/Tests/PipeStdinInStdoutStdErrStreamSelect.php b/vendor/symfony/process/Tests/PipeStdinInStdoutStdErrStreamSelect.php
index bbd7ddfe..1ea0e127 100644
--- a/vendor/symfony/process/Tests/PipeStdinInStdoutStdErrStreamSelect.php
+++ b/vendor/symfony/process/Tests/PipeStdinInStdoutStdErrStreamSelect.php
@@ -35,22 +35,22 @@ while ($read || $write) {
     }
 
     if (in_array(STDOUT, $w) && strlen($out) > 0) {
-        $written = fwrite(STDOUT, (binary) $out, 32768);
+        $written = fwrite(STDOUT, (string) $out, 32768);
         if (false === $written) {
             die(ERR_WRITE_FAILED);
         }
-        $out = (binary) substr($out, $written);
+        $out = (string) substr($out, $written);
     }
     if (null === $read && '' === $out) {
         $write = array_diff($write, array(STDOUT));
     }
 
     if (in_array(STDERR, $w) && strlen($err) > 0) {
-        $written = fwrite(STDERR, (binary) $err, 32768);
+        $written = fwrite(STDERR, (string) $err, 32768);
         if (false === $written) {
             die(ERR_WRITE_FAILED);
         }
-        $err = (binary) substr($err, $written);
+        $err = (string) substr($err, $written);
     }
     if (null === $read && '' === $err) {
         $write = array_diff($write, array(STDERR));
diff --git a/vendor/symfony/process/Tests/ProcessBuilderTest.php b/vendor/symfony/process/Tests/ProcessBuilderTest.php
deleted file mode 100644
index 36c40bf0..00000000
--- a/vendor/symfony/process/Tests/ProcessBuilderTest.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Process\Tests;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\Process\ProcessBuilder;
-
-/**
- * @group legacy
- */
-class ProcessBuilderTest extends TestCase
-{
-    public function testInheritEnvironmentVars()
-    {
-        $proc = ProcessBuilder::create()
-            ->add('foo')
-            ->getProcess();
-
-        $this->assertTrue($proc->areEnvironmentVariablesInherited());
-
-        $proc = ProcessBuilder::create()
-            ->add('foo')
-            ->inheritEnvironmentVariables(false)
-            ->getProcess();
-
-        $this->assertFalse($proc->areEnvironmentVariablesInherited());
-    }
-
-    public function testAddEnvironmentVariables()
-    {
-        $pb = new ProcessBuilder();
-        $env = array(
-            'foo' => 'bar',
-            'foo2' => 'bar2',
-        );
-        $proc = $pb
-            ->add('command')
-            ->setEnv('foo', 'bar2')
-            ->addEnvironmentVariables($env)
-            ->getProcess()
-        ;
-
-        $this->assertSame($env, $proc->getEnv());
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Process\Exception\InvalidArgumentException
-     */
-    public function testNegativeTimeoutFromSetter()
-    {
-        $pb = new ProcessBuilder();
-        $pb->setTimeout(-1);
-    }
-
-    public function testNullTimeout()
-    {
-        $pb = new ProcessBuilder();
-        $pb->setTimeout(10);
-        $pb->setTimeout(null);
-
-        $r = new \ReflectionObject($pb);
-        $p = $r->getProperty('timeout');
-        $p->setAccessible(true);
-
-        $this->assertNull($p->getValue($pb));
-    }
-
-    public function testShouldSetArguments()
-    {
-        $pb = new ProcessBuilder(array('initial'));
-        $pb->setArguments(array('second'));
-
-        $proc = $pb->getProcess();
-
-        $this->assertContains('second', $proc->getCommandLine());
-    }
-
-    public function testPrefixIsPrependedToAllGeneratedProcess()
-    {
-        $pb = new ProcessBuilder();
-        $pb->setPrefix('/usr/bin/php');
-
-        $proc = $pb->setArguments(array('-v'))->getProcess();
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $this->assertEquals('"/usr/bin/php" -v', $proc->getCommandLine());
-        } else {
-            $this->assertEquals("'/usr/bin/php' '-v'", $proc->getCommandLine());
-        }
-
-        $proc = $pb->setArguments(array('-i'))->getProcess();
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $this->assertEquals('"/usr/bin/php" -i', $proc->getCommandLine());
-        } else {
-            $this->assertEquals("'/usr/bin/php' '-i'", $proc->getCommandLine());
-        }
-    }
-
-    public function testArrayPrefixesArePrependedToAllGeneratedProcess()
-    {
-        $pb = new ProcessBuilder();
-        $pb->setPrefix(array('/usr/bin/php', 'composer.phar'));
-
-        $proc = $pb->setArguments(array('-v'))->getProcess();
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $this->assertEquals('"/usr/bin/php" composer.phar -v', $proc->getCommandLine());
-        } else {
-            $this->assertEquals("'/usr/bin/php' 'composer.phar' '-v'", $proc->getCommandLine());
-        }
-
-        $proc = $pb->setArguments(array('-i'))->getProcess();
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $this->assertEquals('"/usr/bin/php" composer.phar -i', $proc->getCommandLine());
-        } else {
-            $this->assertEquals("'/usr/bin/php' 'composer.phar' '-i'", $proc->getCommandLine());
-        }
-    }
-
-    public function testShouldEscapeArguments()
-    {
-        $pb = new ProcessBuilder(array('%path%', 'foo " bar', '%baz%baz'));
-        $proc = $pb->getProcess();
-
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $this->assertSame('""^%"path"^%"" "foo "" bar" ""^%"baz"^%"baz"', $proc->getCommandLine());
-        } else {
-            $this->assertSame("'%path%' 'foo \" bar' '%baz%baz'", $proc->getCommandLine());
-        }
-    }
-
-    public function testShouldEscapeArgumentsAndPrefix()
-    {
-        $pb = new ProcessBuilder(array('arg'));
-        $pb->setPrefix('%prefix%');
-        $proc = $pb->getProcess();
-
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $this->assertSame('""^%"prefix"^%"" arg', $proc->getCommandLine());
-        } else {
-            $this->assertSame("'%prefix%' 'arg'", $proc->getCommandLine());
-        }
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Process\Exception\LogicException
-     */
-    public function testShouldThrowALogicExceptionIfNoPrefixAndNoArgument()
-    {
-        ProcessBuilder::create()->getProcess();
-    }
-
-    public function testShouldNotThrowALogicExceptionIfNoArgument()
-    {
-        $process = ProcessBuilder::create()
-            ->setPrefix('/usr/bin/php')
-            ->getProcess();
-
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $this->assertEquals('"/usr/bin/php"', $process->getCommandLine());
-        } else {
-            $this->assertEquals("'/usr/bin/php'", $process->getCommandLine());
-        }
-    }
-
-    public function testShouldNotThrowALogicExceptionIfNoPrefix()
-    {
-        $process = ProcessBuilder::create(array('/usr/bin/php'))
-            ->getProcess();
-
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $this->assertEquals('"/usr/bin/php"', $process->getCommandLine());
-        } else {
-            $this->assertEquals("'/usr/bin/php'", $process->getCommandLine());
-        }
-    }
-
-    public function testShouldReturnProcessWithDisabledOutput()
-    {
-        $process = ProcessBuilder::create(array('/usr/bin/php'))
-            ->disableOutput()
-            ->getProcess();
-
-        $this->assertTrue($process->isOutputDisabled());
-    }
-
-    public function testShouldReturnProcessWithEnabledOutput()
-    {
-        $process = ProcessBuilder::create(array('/usr/bin/php'))
-            ->disableOutput()
-            ->enableOutput()
-            ->getProcess();
-
-        $this->assertFalse($process->isOutputDisabled());
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Process\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Symfony\Component\Process\ProcessBuilder::setInput only accepts strings, Traversable objects or stream resources.
-     */
-    public function testInvalidInput()
-    {
-        $builder = ProcessBuilder::create();
-        $builder->setInput(array());
-    }
-
-    public function testDoesNotPrefixExec()
-    {
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $this->markTestSkipped('This test cannot run on Windows.');
-        }
-
-        $builder = ProcessBuilder::create(array('command', '-v', 'ls'));
-        $process = $builder->getProcess();
-        $process->run();
-
-        $this->assertTrue($process->isSuccessful());
-    }
-}
diff --git a/vendor/symfony/process/Tests/ProcessTest.php b/vendor/symfony/process/Tests/ProcessTest.php
index bca7ddd9..f7d4fc82 100644
--- a/vendor/symfony/process/Tests/ProcessTest.php
+++ b/vendor/symfony/process/Tests/ProcessTest.php
@@ -28,12 +28,11 @@ class ProcessTest extends TestCase
     private static $phpBin;
     private static $process;
     private static $sigchild;
-    private static $notEnhancedSigchild = false;
 
     public static function setUpBeforeClass()
     {
         $phpBin = new PhpExecutableFinder();
-        self::$phpBin = getenv('SYMFONY_PROCESS_PHP_TEST_BINARY') ?: ('phpdbg' === PHP_SAPI ? 'php' : $phpBin->find());
+        self::$phpBin = getenv('SYMFONY_PROCESS_PHP_TEST_BINARY') ?: ('phpdbg' === \PHP_SAPI ? 'php' : $phpBin->find());
 
         ob_start();
         phpinfo(INFO_GENERAL);
@@ -49,26 +48,26 @@ class ProcessTest extends TestCase
     }
 
     /**
-     * @group legacy
-     * @expectedDeprecation The provided cwd does not exist. Command is currently ran against getcwd(). This behavior is deprecated since Symfony 3.4 and will be removed in 4.0.
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
+     * @expectedExceptionMessage The provided cwd does not exist.
      */
     public function testInvalidCwd()
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $this->markTestSkipped('False-positive on Windows/appveyor.');
+        try {
+            // Check that it works fine if the CWD exists
+            $cmd = new Process('echo test', __DIR__);
+            $cmd->run();
+        } catch (\Exception $e) {
+            $this->fail($e);
         }
 
-        // Check that it works fine if the CWD exists
-        $cmd = new Process('echo test', __DIR__);
-        $cmd->run();
-
         $cmd = new Process('echo test', __DIR__.'/notfound/');
         $cmd->run();
     }
 
     public function testThatProcessDoesNotThrowWarningDuringRun()
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('This test is transient on Windows');
         }
         @trigger_error('Test Error', E_USER_NOTICE);
@@ -118,9 +117,14 @@ class ProcessTest extends TestCase
         $p = $this->getProcess(array(self::$phpBin, __DIR__.'/NonStopableProcess.php', 30));
         $p->start();
 
-        while (false === strpos($p->getOutput(), 'received')) {
+        while ($p->isRunning() && false === strpos($p->getOutput(), 'received')) {
             usleep(1000);
         }
+
+        if (!$p->isRunning()) {
+            throw new \LogicException('Process is not running: '.$p->getErrorOutput());
+        }
+
         $start = microtime(true);
         $p->stop(0.1);
 
@@ -158,7 +162,7 @@ class ProcessTest extends TestCase
 
         $o = $p->getOutput();
 
-        $this->assertEquals($expectedOutputSize, strlen($o));
+        $this->assertEquals($expectedOutputSize, \strlen($o));
     }
 
     public function testCallbacksAreExecutedWithStart()
@@ -200,8 +204,8 @@ class ProcessTest extends TestCase
         $p->setInput($expected);
         $p->run();
 
-        $this->assertEquals($expectedLength, strlen($p->getOutput()));
-        $this->assertEquals($expectedLength, strlen($p->getErrorOutput()));
+        $this->assertEquals($expectedLength, \strlen($p->getOutput()));
+        $this->assertEquals($expectedLength, \strlen($p->getErrorOutput()));
     }
 
     /**
@@ -222,8 +226,8 @@ class ProcessTest extends TestCase
 
         fclose($stream);
 
-        $this->assertEquals($expectedLength, strlen($p->getOutput()));
-        $this->assertEquals($expectedLength, strlen($p->getErrorOutput()));
+        $this->assertEquals($expectedLength, \strlen($p->getOutput()));
+        $this->assertEquals($expectedLength, \strlen($p->getErrorOutput()));
     }
 
     public function testLiveStreamAsInput()
@@ -303,7 +307,7 @@ class ProcessTest extends TestCase
 
     public function chainedCommandsOutputProvider()
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             return array(
                 array("2 \r\n2\r\n", '&&', '2'),
             );
@@ -422,7 +426,7 @@ class ProcessTest extends TestCase
 
     public function testZeroAsOutput()
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             // see http://stackoverflow.com/questions/7105433/windows-batch-echo-without-new-line
             $p = $this->getProcess('echo | set /p dummyName=0');
         } else {
@@ -435,10 +439,9 @@ class ProcessTest extends TestCase
 
     public function testExitCodeCommandFailed()
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('Windows does not support POSIX exit code');
         }
-        $this->skipIfNotEnhancedSigchild();
 
         // such command run in bash return an exitcode 127
         $process = $this->getProcess('nonexistingcommandIhopeneversomeonewouldnameacommandlikethis');
@@ -447,12 +450,9 @@ class ProcessTest extends TestCase
         $this->assertGreaterThan(0, $process->getExitCode());
     }
 
-    /**
-     * @group tty
-     */
     public function testTTYCommand()
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('Windows does not have /dev/tty support');
         }
 
@@ -465,15 +465,11 @@ class ProcessTest extends TestCase
         $this->assertSame(Process::STATUS_TERMINATED, $process->getStatus());
     }
 
-    /**
-     * @group tty
-     */
     public function testTTYCommandExitCode()
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('Windows does have /dev/tty support');
         }
-        $this->skipIfNotEnhancedSigchild();
 
         $process = $this->getProcess('echo "foo" >> /dev/null');
         $process->setTty(true);
@@ -488,7 +484,7 @@ class ProcessTest extends TestCase
      */
     public function testTTYInWindowsEnvironment()
     {
-        if ('\\' !== DIRECTORY_SEPARATOR) {
+        if ('\\' !== \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('This test is for Windows platform only');
         }
 
@@ -499,8 +495,6 @@ class ProcessTest extends TestCase
 
     public function testExitCodeTextIsNullWhenExitCodeIsNull()
     {
-        $this->skipIfNotEnhancedSigchild();
-
         $process = $this->getProcess('');
         $this->assertNull($process->getExitCodeText());
     }
@@ -521,8 +515,6 @@ class ProcessTest extends TestCase
 
     public function testMustRun()
     {
-        $this->skipIfNotEnhancedSigchild();
-
         $process = $this->getProcess('echo foo');
 
         $this->assertSame($process, $process->mustRun());
@@ -531,8 +523,6 @@ class ProcessTest extends TestCase
 
     public function testSuccessfulMustRunHasCorrectExitCode()
     {
-        $this->skipIfNotEnhancedSigchild();
-
         $process = $this->getProcess('echo foo')->mustRun();
         $this->assertEquals(0, $process->getExitCode());
     }
@@ -542,16 +532,12 @@ class ProcessTest extends TestCase
      */
     public function testMustRunThrowsException()
     {
-        $this->skipIfNotEnhancedSigchild();
-
         $process = $this->getProcess('exit 1');
         $process->mustRun();
     }
 
     public function testExitCodeText()
     {
-        $this->skipIfNotEnhancedSigchild();
-
         $process = $this->getProcess('');
         $r = new \ReflectionObject($process);
         $p = $r->getProperty('exitcode');
@@ -575,13 +561,11 @@ class ProcessTest extends TestCase
     {
         $process = $this->getProcess('echo foo');
         $process->run();
-        $this->assertGreaterThan(0, strlen($process->getOutput()));
+        $this->assertGreaterThan(0, \strlen($process->getOutput()));
     }
 
     public function testGetExitCodeIsNullOnStart()
     {
-        $this->skipIfNotEnhancedSigchild();
-
         $process = $this->getProcessForCode('usleep(100000);');
         $this->assertNull($process->getExitCode());
         $process->start();
@@ -592,8 +576,6 @@ class ProcessTest extends TestCase
 
     public function testGetExitCodeIsNullOnWhenStartingAgain()
     {
-        $this->skipIfNotEnhancedSigchild();
-
         $process = $this->getProcessForCode('usleep(100000);');
         $process->run();
         $this->assertEquals(0, $process->getExitCode());
@@ -605,8 +587,6 @@ class ProcessTest extends TestCase
 
     public function testGetExitCode()
     {
-        $this->skipIfNotEnhancedSigchild();
-
         $process = $this->getProcess('echo foo');
         $process->run();
         $this->assertSame(0, $process->getExitCode());
@@ -642,8 +622,6 @@ class ProcessTest extends TestCase
 
     public function testIsSuccessful()
     {
-        $this->skipIfNotEnhancedSigchild();
-
         $process = $this->getProcess('echo foo');
         $process->run();
         $this->assertTrue($process->isSuccessful());
@@ -651,8 +629,6 @@ class ProcessTest extends TestCase
 
     public function testIsSuccessfulOnlyAfterTerminated()
     {
-        $this->skipIfNotEnhancedSigchild();
-
         $process = $this->getProcessForCode('usleep(100000);');
         $process->start();
 
@@ -665,8 +641,6 @@ class ProcessTest extends TestCase
 
     public function testIsNotSuccessful()
     {
-        $this->skipIfNotEnhancedSigchild();
-
         $process = $this->getProcessForCode('throw new \Exception(\'BOUM\');');
         $process->run();
         $this->assertFalse($process->isSuccessful());
@@ -674,10 +648,9 @@ class ProcessTest extends TestCase
 
     public function testProcessIsNotSignaled()
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('Windows does not support POSIX signals');
         }
-        $this->skipIfNotEnhancedSigchild();
 
         $process = $this->getProcess('echo foo');
         $process->run();
@@ -686,10 +659,9 @@ class ProcessTest extends TestCase
 
     public function testProcessWithoutTermSignal()
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('Windows does not support POSIX signals');
         }
-        $this->skipIfNotEnhancedSigchild();
 
         $process = $this->getProcess('echo foo');
         $process->run();
@@ -698,10 +670,9 @@ class ProcessTest extends TestCase
 
     public function testProcessIsSignaledIfStopped()
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('Windows does not support POSIX signals');
         }
-        $this->skipIfNotEnhancedSigchild();
 
         $process = $this->getProcessForCode('sleep(32);');
         $process->start();
@@ -711,15 +682,18 @@ class ProcessTest extends TestCase
     }
 
     /**
-     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
-     * @expectedExceptionMessage The process has been signaled
+     * @expectedException \Symfony\Component\Process\Exception\ProcessSignaledException
+     * @expectedExceptionMessage The process has been signaled with signal "9".
      */
     public function testProcessThrowsExceptionWhenExternallySignaled()
     {
-        if (!function_exists('posix_kill')) {
+        if (!\function_exists('posix_kill')) {
             $this->markTestSkipped('Function posix_kill is required.');
         }
-        $this->skipIfNotEnhancedSigchild(false);
+
+        if (self::$sigchild) {
+            $this->markTestSkipped('PHP is compiled with --enable-sigchild.');
+        }
 
         $process = $this->getProcessForCode('sleep(32.1);');
         $process->start();
@@ -930,8 +904,6 @@ class ProcessTest extends TestCase
      */
     public function testExitCodeIsAvailableAfterSignal()
     {
-        $this->skipIfNotEnhancedSigchild();
-
         $process = $this->getProcess('sleep 4');
         $process->start();
         $process->signal(SIGKILL);
@@ -1015,19 +987,18 @@ class ProcessTest extends TestCase
     }
 
     /**
-     * @dataProvider provideWrongSignal
      * @expectedException \Symfony\Component\Process\Exception\RuntimeException
      */
-    public function testWrongSignal($signal)
+    public function testWrongSignal()
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('POSIX signals do not work on Windows');
         }
 
         $process = $this->getProcessForCode('sleep(38);');
         $process->start();
         try {
-            $process->signal($signal);
+            $process->signal(-4);
             $this->fail('A RuntimeException must have been thrown');
         } catch (RuntimeException $e) {
             $process->stop(0);
@@ -1036,14 +1007,6 @@ class ProcessTest extends TestCase
         throw $e;
     }
 
-    public function provideWrongSignal()
-    {
-        return array(
-            array(-4),
-            array('Céphalopodes'),
-        );
-    }
-
     public function testDisableOutputDisablesTheOutput()
     {
         $p = $this->getProcess('foo');
@@ -1183,7 +1146,7 @@ class ProcessTest extends TestCase
             'include \''.__DIR__.'/PipeStdinInStdoutStdErrStreamSelect.php\';',
         );
 
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
             // Avoid XL buffers on Windows because of https://bugs.php.net/bug.php?id=65650
             $sizes = array(1, 2, 4, 8);
         } else {
@@ -1457,36 +1420,11 @@ class ProcessTest extends TestCase
         unset($_ENV['FOO']);
     }
 
-    /**
-     * @group legacy
-     */
-    public function testInheritEnvDisabled()
-    {
-        $process = $this->getProcessForCode('echo serialize($_SERVER);', null, array('BAR' => 'BAZ'));
-
-        putenv('FOO=BAR');
-        $_ENV['FOO'] = 'BAR';
-
-        $this->assertSame($process, $process->inheritEnvironmentVariables(false));
-        $this->assertFalse($process->areEnvironmentVariablesInherited());
-
-        $process->run();
-
-        $expected = array('BAR' => 'BAZ', 'FOO' => 'BAR');
-        $env = array_intersect_key(unserialize($process->getOutput()), $expected);
-        unset($expected['FOO']);
-
-        $this->assertSame($expected, $env);
-
-        putenv('FOO');
-        unset($_ENV['FOO']);
-    }
-
     public function testGetCommandLine()
     {
         $p = new Process(array('/usr/bin/php'));
 
-        $expected = '\\' === DIRECTORY_SEPARATOR ? '"/usr/bin/php"' : "'/usr/bin/php'";
+        $expected = '\\' === \DIRECTORY_SEPARATOR ? '"/usr/bin/php"' : "'/usr/bin/php'";
         $this->assertSame($expected, $p->getCommandLine());
     }
 
@@ -1501,19 +1439,6 @@ class ProcessTest extends TestCase
         $this->assertSame($arg, $p->getOutput());
     }
 
-    /**
-     * @dataProvider provideEscapeArgument
-     * @group legacy
-     */
-    public function testEscapeArgumentWhenInheritEnvDisabled($arg)
-    {
-        $p = new Process(array(self::$phpBin, '-r', 'echo $argv[1];', $arg), null, array('BAR' => 'BAZ'));
-        $p->inheritEnvironmentVariables(false);
-        $p->run();
-
-        $this->assertSame($arg, $p->getOutput());
-    }
-
     public function testRawCommandLine()
     {
         $p = new Process(sprintf('"%s" -r %s "a" "" "b"', self::$phpBin, escapeshellarg('print_r($argv);')));
@@ -1546,7 +1471,7 @@ EOTXT;
     public function testEnvArgument()
     {
         $env = array('FOO' => 'Foo', 'BAR' => 'Bar');
-        $cmd = '\\' === DIRECTORY_SEPARATOR ? 'echo !FOO! !BAR! !BAZ!' : 'echo $FOO $BAR $BAZ';
+        $cmd = '\\' === \DIRECTORY_SEPARATOR ? 'echo !FOO! !BAR! !BAZ!' : 'echo $FOO $BAR $BAZ';
         $p = new Process($cmd, null, $env);
         $p->run(null, array('BAR' => 'baR', 'BAZ' => 'baZ'));
 
@@ -1556,9 +1481,9 @@ EOTXT;
 
     /**
      * @param string      $commandline
-     * @param null|string $cwd
-     * @param null|array  $env
-     * @param null|string $input
+     * @param string|null $cwd
+     * @param array|null  $env
+     * @param string|null $input
      * @param int         $timeout
      * @param array       $options
      *
@@ -1569,21 +1494,6 @@ EOTXT;
         $process = new Process($commandline, $cwd, $env, $input, $timeout);
         $process->inheritEnvironmentVariables();
 
-        if (false !== $enhance = getenv('ENHANCE_SIGCHLD')) {
-            try {
-                $process->setEnhanceSigchildCompatibility(false);
-                $process->getExitCode();
-                $this->fail('ENHANCE_SIGCHLD must be used together with a sigchild-enabled PHP.');
-            } catch (RuntimeException $e) {
-                $this->assertSame('This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.', $e->getMessage());
-                if ($enhance) {
-                    $process->setEnhanceSigchildCompatibility(true);
-                } else {
-                    self::$notEnhancedSigchild = true;
-                }
-            }
-        }
-
         if (self::$process) {
             self::$process->stop(0);
         }
@@ -1598,22 +1508,6 @@ EOTXT;
     {
         return $this->getProcess(array(self::$phpBin, '-r', $code), $cwd, $env, $input, $timeout);
     }
-
-    private function skipIfNotEnhancedSigchild($expectException = true)
-    {
-        if (self::$sigchild) {
-            if (!$expectException) {
-                $this->markTestSkipped('PHP is compiled with --enable-sigchild.');
-            } elseif (self::$notEnhancedSigchild) {
-                if (method_exists($this, 'expectException')) {
-                    $this->expectException('Symfony\Component\Process\Exception\RuntimeException');
-                    $this->expectExceptionMessage('This PHP has been compiled with --enable-sigchild.');
-                } else {
-                    $this->setExpectedException('Symfony\Component\Process\Exception\RuntimeException', 'This PHP has been compiled with --enable-sigchild.');
-                }
-            }
-        }
-    }
 }
 
 class NonStringifiable
diff --git a/vendor/symfony/process/Tests/ProcessUtilsTest.php b/vendor/symfony/process/Tests/ProcessUtilsTest.php
deleted file mode 100644
index 82fd8cfa..00000000
--- a/vendor/symfony/process/Tests/ProcessUtilsTest.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Process\Tests;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\Process\ProcessUtils;
-
-/**
- * @group legacy
- */
-class ProcessUtilsTest extends TestCase
-{
-    /**
-     * @dataProvider dataArguments
-     */
-    public function testEscapeArgument($result, $argument)
-    {
-        $this->assertSame($result, ProcessUtils::escapeArgument($argument));
-    }
-
-    public function dataArguments()
-    {
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            return array(
-                array('"\"php\" \"-v\""', '"php" "-v"'),
-                array('"foo bar"', 'foo bar'),
-                array('^%"path"^%', '%path%'),
-                array('"<|>\\" \\"\'f"', '<|>" "\'f'),
-                array('""', ''),
-                array('"with\trailingbs\\\\"', 'with\trailingbs\\'),
-            );
-        }
-
-        return array(
-            array("'\"php\" \"-v\"'", '"php" "-v"'),
-            array("'foo bar'", 'foo bar'),
-            array("'%path%'", '%path%'),
-            array("'<|>\" \"'\\''f'", '<|>" "\'f'),
-            array("''", ''),
-            array("'with\\trailingbs\\'", 'with\trailingbs\\'),
-            array("'withNonAsciiAccentLikeéÉèÈàÀöä'", 'withNonAsciiAccentLikeéÉèÈàÀöä'),
-        );
-    }
-}
diff --git a/vendor/symfony/process/composer.json b/vendor/symfony/process/composer.json
index b8867db3..58f4005b 100644
--- a/vendor/symfony/process/composer.json
+++ b/vendor/symfony/process/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": "^5.5.9|>=7.0.8"
+        "php": "^7.1.3"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Process\\": "" },
@@ -27,7 +27,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "3.4-dev"
+            "dev-master": "4.1-dev"
         }
     }
 }
diff --git a/vendor/symfony/routing/Annotation/Route.php b/vendor/symfony/routing/Annotation/Route.php
index 5b3cbeaa..62ad8c8b 100644
--- a/vendor/symfony/routing/Annotation/Route.php
+++ b/vendor/symfony/routing/Annotation/Route.php
@@ -22,6 +22,7 @@ namespace Symfony\Component\Routing\Annotation;
 class Route
 {
     private $path;
+    private $localizedPaths = array();
     private $name;
     private $requirements = array();
     private $options = array();
@@ -38,15 +39,24 @@ class Route
      */
     public function __construct(array $data)
     {
+        if (isset($data['localized_paths'])) {
+            throw new \BadMethodCallException(sprintf('Unknown property "localized_paths" on annotation "%s".', \get_class($this)));
+        }
+
         if (isset($data['value'])) {
-            $data['path'] = $data['value'];
+            $data[\is_array($data['value']) ? 'localized_paths' : 'path'] = $data['value'];
             unset($data['value']);
         }
 
+        if (isset($data['path']) && \is_array($data['path'])) {
+            $data['localized_paths'] = $data['path'];
+            unset($data['path']);
+        }
+
         foreach ($data as $key => $value) {
             $method = 'set'.str_replace('_', '', $key);
             if (!method_exists($this, $method)) {
-                throw new \BadMethodCallException(sprintf('Unknown property "%s" on annotation "%s".', $key, get_class($this)));
+                throw new \BadMethodCallException(sprintf('Unknown property "%s" on annotation "%s".', $key, \get_class($this)));
             }
             $this->$method($value);
         }
@@ -62,6 +72,16 @@ class Route
         return $this->path;
     }
 
+    public function setLocalizedPaths(array $localizedPaths)
+    {
+        $this->localizedPaths = $localizedPaths;
+    }
+
+    public function getLocalizedPaths(): array
+    {
+        return $this->localizedPaths;
+    }
+
     public function setHost($pattern)
     {
         $this->host = $pattern;
@@ -114,7 +134,7 @@ class Route
 
     public function setSchemes($schemes)
     {
-        $this->schemes = is_array($schemes) ? $schemes : array($schemes);
+        $this->schemes = \is_array($schemes) ? $schemes : array($schemes);
     }
 
     public function getSchemes()
@@ -124,7 +144,7 @@ class Route
 
     public function setMethods($methods)
     {
-        $this->methods = is_array($methods) ? $methods : array($methods);
+        $this->methods = \is_array($methods) ? $methods : array($methods);
     }
 
     public function getMethods()
diff --git a/vendor/symfony/routing/CHANGELOG.md b/vendor/symfony/routing/CHANGELOG.md
index e278f8b1..d088e2ed 100644
--- a/vendor/symfony/routing/CHANGELOG.md
+++ b/vendor/symfony/routing/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+4.0.0
+-----
+
+ * dropped support for using UTF-8 route patterns without using the `utf8` option
+ * dropped support for using UTF-8 route requirements without using the `utf8` option
+
 3.4.0
 -----
 
diff --git a/vendor/symfony/routing/CompiledRoute.php b/vendor/symfony/routing/CompiledRoute.php
index 8ecf5153..44484c0e 100644
--- a/vendor/symfony/routing/CompiledRoute.php
+++ b/vendor/symfony/routing/CompiledRoute.php
@@ -37,9 +37,9 @@ class CompiledRoute implements \Serializable
      * @param array       $hostVariables An array of host variables
      * @param array       $variables     An array of variables (variables defined in the path and in the host patterns)
      */
-    public function __construct($staticPrefix, $regex, array $tokens, array $pathVariables, $hostRegex = null, array $hostTokens = array(), array $hostVariables = array(), array $variables = array())
+    public function __construct(string $staticPrefix, string $regex, array $tokens, array $pathVariables, string $hostRegex = null, array $hostTokens = array(), array $hostVariables = array(), array $variables = array())
     {
-        $this->staticPrefix = (string) $staticPrefix;
+        $this->staticPrefix = $staticPrefix;
         $this->regex = $regex;
         $this->tokens = $tokens;
         $this->pathVariables = $pathVariables;
@@ -71,11 +71,7 @@ class CompiledRoute implements \Serializable
      */
     public function unserialize($serialized)
     {
-        if (\PHP_VERSION_ID >= 70000) {
-            $data = unserialize($serialized, array('allowed_classes' => false));
-        } else {
-            $data = unserialize($serialized);
-        }
+        $data = unserialize($serialized, array('allowed_classes' => false));
 
         $this->variables = $data['vars'];
         $this->staticPrefix = $data['path_prefix'];
diff --git a/vendor/symfony/routing/DependencyInjection/RoutingResolverPass.php b/vendor/symfony/routing/DependencyInjection/RoutingResolverPass.php
index 4af0a5a2..ab0b7d8e 100644
--- a/vendor/symfony/routing/DependencyInjection/RoutingResolverPass.php
+++ b/vendor/symfony/routing/DependencyInjection/RoutingResolverPass.php
@@ -11,10 +11,10 @@
 
 namespace Symfony\Component\Routing\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
 
 /**
  * Adds tagged routing.loader services to routing.resolver service.
@@ -28,7 +28,7 @@ class RoutingResolverPass implements CompilerPassInterface
     private $resolverServiceId;
     private $loaderTag;
 
-    public function __construct($resolverServiceId = 'routing.resolver', $loaderTag = 'routing.loader')
+    public function __construct(string $resolverServiceId = 'routing.resolver', string $loaderTag = 'routing.loader')
     {
         $this->resolverServiceId = $resolverServiceId;
         $this->loaderTag = $loaderTag;
diff --git a/vendor/symfony/routing/Exception/MethodNotAllowedException.php b/vendor/symfony/routing/Exception/MethodNotAllowedException.php
index 712412fe..22ca6c39 100644
--- a/vendor/symfony/routing/Exception/MethodNotAllowedException.php
+++ b/vendor/symfony/routing/Exception/MethodNotAllowedException.php
@@ -22,7 +22,7 @@ class MethodNotAllowedException extends \RuntimeException implements ExceptionIn
 {
     protected $allowedMethods = array();
 
-    public function __construct(array $allowedMethods, $message = null, $code = 0, \Exception $previous = null)
+    public function __construct(array $allowedMethods, string $message = null, int $code = 0, \Exception $previous = null)
     {
         $this->allowedMethods = array_map('strtoupper', $allowedMethods);
 
diff --git a/vendor/symfony/routing/Generator/Dumper/PhpGeneratorDumper.php b/vendor/symfony/routing/Generator/Dumper/PhpGeneratorDumper.php
index 60bdf1da..97e03350 100644
--- a/vendor/symfony/routing/Generator/Dumper/PhpGeneratorDumper.php
+++ b/vendor/symfony/routing/Generator/Dumper/PhpGeneratorDumper.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Routing\Generator\Dumper;
 
+use Symfony\Component\Routing\Matcher\Dumper\PhpMatcherDumper;
+
 /**
  * PhpGeneratorDumper creates a PHP class able to generate URLs for a given set of routes.
  *
@@ -52,11 +54,13 @@ use Psr\Log\LoggerInterface;
 class {$options['class']} extends {$options['base_class']}
 {
     private static \$declaredRoutes;
+    private \$defaultLocale;
 
-    public function __construct(RequestContext \$context, LoggerInterface \$logger = null)
+    public function __construct(RequestContext \$context, LoggerInterface \$logger = null, string \$defaultLocale = null)
     {
         \$this->context = \$context;
         \$this->logger = \$logger;
+        \$this->defaultLocale = \$defaultLocale;
         if (null === self::\$declaredRoutes) {
             self::\$declaredRoutes = {$this->generateDeclaredRoutes()};
         }
@@ -88,7 +92,7 @@ EOF;
             $properties[] = $compiledRoute->getHostTokens();
             $properties[] = $route->getSchemes();
 
-            $routes .= sprintf("        '%s' => %s,\n", $name, str_replace("\n", '', var_export($properties, true)));
+            $routes .= sprintf("        '%s' => %s,\n", $name, PhpMatcherDumper::export($properties));
         }
         $routes .= '    )';
 
@@ -105,7 +109,14 @@ EOF;
         return <<<'EOF'
     public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH)
     {
-        if (!isset(self::$declaredRoutes[$name])) {
+        $locale = $parameters['_locale']
+            ?? $this->context->getParameter('_locale')
+            ?: $this->defaultLocale;
+
+        if (null !== $locale && (self::$declaredRoutes[$name.'.'.$locale][1]['_canonical_route'] ?? null) === $name) {
+            unset($parameters['_locale']);
+            $name .= '.'.$locale;
+        } elseif (!isset(self::$declaredRoutes[$name])) {
             throw new RouteNotFoundException(sprintf('Unable to generate a URL for the named route "%s" as such route does not exist.', $name));
         }
 
diff --git a/vendor/symfony/routing/Generator/UrlGenerator.php b/vendor/symfony/routing/Generator/UrlGenerator.php
index 02a59a92..38dd1384 100644
--- a/vendor/symfony/routing/Generator/UrlGenerator.php
+++ b/vendor/symfony/routing/Generator/UrlGenerator.php
@@ -11,12 +11,12 @@
 
 namespace Symfony\Component\Routing\Generator;
 
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\RequestContext;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\Routing\Exception\InvalidParameterException;
-use Symfony\Component\Routing\Exception\RouteNotFoundException;
 use Symfony\Component\Routing\Exception\MissingMandatoryParametersException;
-use Psr\Log\LoggerInterface;
+use Symfony\Component\Routing\Exception\RouteNotFoundException;
+use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\RouteCollection;
 
 /**
  * UrlGenerator can generate a URL or a path for any route in the RouteCollection
@@ -37,6 +37,8 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
 
     protected $logger;
 
+    private $defaultLocale;
+
     /**
      * This array defines the characters (besides alphanumeric ones) that will not be percent-encoded in the path segment of the generated URL.
      *
@@ -65,11 +67,12 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
         '%7C' => '|',
     );
 
-    public function __construct(RouteCollection $routes, RequestContext $context, LoggerInterface $logger = null)
+    public function __construct(RouteCollection $routes, RequestContext $context, LoggerInterface $logger = null, string $defaultLocale = null)
     {
         $this->routes = $routes;
         $this->context = $context;
         $this->logger = $logger;
+        $this->defaultLocale = $defaultLocale;
     }
 
     /**
@@ -109,7 +112,13 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
      */
     public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH)
     {
-        if (null === $route = $this->routes->get($name)) {
+        $locale = $parameters['_locale']
+            ?? $this->context->getParameter('_locale')
+            ?: $this->defaultLocale;
+
+        if (null !== $locale && null !== ($route = $this->routes->get($name.'.'.$locale)) && $route->getDefault('_canonical_route') === $name) {
+            unset($parameters['_locale']);
+        } elseif (null === $route = $this->routes->get($name)) {
             throw new RouteNotFoundException(sprintf('Unable to generate a URL for the named route "%s" as such route does not exist.', $name));
         }
 
@@ -185,7 +194,7 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
         $scheme = $this->context->getScheme();
 
         if ($requiredSchemes) {
-            if (!in_array($scheme, $requiredSchemes, true)) {
+            if (!\in_array($scheme, $requiredSchemes, true)) {
                 $referenceType = self::ABSOLUTE_URL;
                 $scheme = current($requiredSchemes);
             }
@@ -308,7 +317,7 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
         }
 
         $targetDirs[] = $targetFile;
-        $path = str_repeat('../', count($sourceDirs)).implode('/', $targetDirs);
+        $path = str_repeat('../', \count($sourceDirs)).implode('/', $targetDirs);
 
         // A reference to the same base directory or an empty subdirectory must be prefixed with "./".
         // This also applies to a segment with a colon character (e.g., "file:colon") that cannot be used
diff --git a/vendor/symfony/routing/Loader/AnnotationClassLoader.php b/vendor/symfony/routing/Loader/AnnotationClassLoader.php
index fd1d2b65..958217fc 100644
--- a/vendor/symfony/routing/Loader/AnnotationClassLoader.php
+++ b/vendor/symfony/routing/Loader/AnnotationClassLoader.php
@@ -12,11 +12,11 @@
 namespace Symfony\Component\Routing\Loader;
 
 use Doctrine\Common\Annotations\Reader;
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\Config\Loader\LoaderResolverInterface;
 use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\Config\Loader\LoaderResolverInterface;
 
 /**
  * AnnotationClassLoader loads routing information from a PHP class and its methods.
@@ -124,6 +124,7 @@ abstract class AnnotationClassLoader implements LoaderInterface
                 if ($annot instanceof $this->routeAnnotationClass) {
                     $globals['path'] = '';
                     $globals['name'] = '';
+                    $globals['localized_paths'] = array();
 
                     $this->addRoute($collection, $annot, $globals, $class, $class->getMethod('__invoke'));
                 }
@@ -142,11 +143,6 @@ abstract class AnnotationClassLoader implements LoaderInterface
         $name = $globals['name'].$name;
 
         $defaults = array_replace($globals['defaults'], $annot->getDefaults());
-        foreach ($method->getParameters() as $param) {
-            if (false !== strpos($globals['path'].$annot->getPath(), sprintf('{%s}', $param->getName())) && !isset($defaults[$param->getName()]) && $param->isDefaultValueAvailable()) {
-                $defaults[$param->getName()] = $param->getDefaultValue();
-            }
-        }
         $requirements = array_replace($globals['requirements'], $annot->getRequirements());
         $options = array_replace($globals['options'], $annot->getOptions());
         $schemes = array_merge($globals['schemes'], $annot->getSchemes());
@@ -162,11 +158,57 @@ abstract class AnnotationClassLoader implements LoaderInterface
             $condition = $globals['condition'];
         }
 
-        $route = $this->createRoute($globals['path'].$annot->getPath(), $defaults, $requirements, $options, $host, $schemes, $methods, $condition);
+        $path = $annot->getLocalizedPaths() ?: $annot->getPath();
+        $prefix = $globals['localized_paths'] ?: $globals['path'];
+        $paths = array();
 
-        $this->configureRoute($route, $class, $method, $annot);
+        if (\is_array($path)) {
+            if (!\is_array($prefix)) {
+                foreach ($path as $locale => $localePath) {
+                    $paths[$locale] = $prefix.$localePath;
+                }
+            } elseif ($missing = array_diff_key($prefix, $path)) {
+                throw new \LogicException(sprintf('Route to "%s" is missing paths for locale(s) "%s".', $class->name.'::'.$method->name, implode('", "', array_keys($missing))));
+            } else {
+                foreach ($path as $locale => $localePath) {
+                    if (!isset($prefix[$locale])) {
+                        throw new \LogicException(sprintf('Route to "%s" with locale "%s" is missing a corresponding prefix in class "%s".', $method->name, $locale, $class->name));
+                    }
+
+                    $paths[$locale] = $prefix[$locale].$localePath;
+                }
+            }
+        } elseif (\is_array($prefix)) {
+            foreach ($prefix as $locale => $localePrefix) {
+                $paths[$locale] = $localePrefix.$path;
+            }
+        } else {
+            $paths[] = $prefix.$path;
+        }
+
+        foreach ($method->getParameters() as $param) {
+            if (isset($defaults[$param->name]) || !$param->isDefaultValueAvailable()) {
+                continue;
+            }
+            foreach ($paths as $locale => $path) {
+                if (false !== strpos($path, sprintf('{%s}', $param->name))) {
+                    $defaults[$param->name] = $param->getDefaultValue();
+                    break;
+                }
+            }
+        }
 
-        $collection->add($name, $route);
+        foreach ($paths as $locale => $path) {
+            $route = $this->createRoute($path, $defaults, $requirements, $options, $host, $schemes, $methods, $condition);
+            $this->configureRoute($route, $class, $method, $annot);
+            if (0 !== $locale) {
+                $route->setDefault('_locale', $locale);
+                $route->setDefault('_canonical_route', $name);
+                $collection->add($name.'.'.$locale, $route);
+            } else {
+                $collection->add($name, $route);
+            }
+        }
     }
 
     /**
@@ -174,7 +216,7 @@ abstract class AnnotationClassLoader implements LoaderInterface
      */
     public function supports($resource, $type = null)
     {
-        return is_string($resource) && preg_match('/^(?:\\\\?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)+$/', $resource) && (!$type || 'annotation' === $type);
+        return \is_string($resource) && preg_match('/^(?:\\\\?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)+$/', $resource) && (!$type || 'annotation' === $type);
     }
 
     /**
@@ -213,7 +255,8 @@ abstract class AnnotationClassLoader implements LoaderInterface
     protected function getGlobals(\ReflectionClass $class)
     {
         $globals = array(
-            'path' => '',
+            'path' => null,
+            'localized_paths' => array(),
             'requirements' => array(),
             'options' => array(),
             'defaults' => array(),
@@ -233,6 +276,8 @@ abstract class AnnotationClassLoader implements LoaderInterface
                 $globals['path'] = $annot->getPath();
             }
 
+            $globals['localized_paths'] = $annot->getLocalizedPaths();
+
             if (null !== $annot->getRequirements()) {
                 $globals['requirements'] = $annot->getRequirements();
             }
diff --git a/vendor/symfony/routing/Loader/AnnotationDirectoryLoader.php b/vendor/symfony/routing/Loader/AnnotationDirectoryLoader.php
index 4574a020..3fb70ea2 100644
--- a/vendor/symfony/routing/Loader/AnnotationDirectoryLoader.php
+++ b/vendor/symfony/routing/Loader/AnnotationDirectoryLoader.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Routing\Loader;
 
-use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Config\Resource\DirectoryResource;
+use Symfony\Component\Routing\RouteCollection;
 
 /**
  * AnnotationDirectoryLoader loads routing information from annotations set
@@ -80,7 +80,7 @@ class AnnotationDirectoryLoader extends AnnotationFileLoader
             return true;
         }
 
-        if ($type || !is_string($resource)) {
+        if ($type || !\is_string($resource)) {
             return false;
         }
 
diff --git a/vendor/symfony/routing/Loader/AnnotationFileLoader.php b/vendor/symfony/routing/Loader/AnnotationFileLoader.php
index cf9f0704..ecd68e04 100644
--- a/vendor/symfony/routing/Loader/AnnotationFileLoader.php
+++ b/vendor/symfony/routing/Loader/AnnotationFileLoader.php
@@ -11,10 +11,10 @@
 
 namespace Symfony\Component\Routing\Loader;
 
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Config\Resource\FileResource;
-use Symfony\Component\Config\Loader\FileLoader;
 use Symfony\Component\Config\FileLocatorInterface;
+use Symfony\Component\Config\Loader\FileLoader;
+use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Routing\RouteCollection;
 
 /**
  * AnnotationFileLoader loads routing information from annotations set
@@ -31,7 +31,7 @@ class AnnotationFileLoader extends FileLoader
      */
     public function __construct(FileLocatorInterface $locator, AnnotationClassLoader $loader)
     {
-        if (!function_exists('token_get_all')) {
+        if (!\function_exists('token_get_all')) {
             throw new \RuntimeException('The Tokenizer extension is required for the routing annotation loaders.');
         }
 
@@ -59,10 +59,9 @@ class AnnotationFileLoader extends FileLoader
             $collection->addResource(new FileResource($path));
             $collection->addCollection($this->loader->load($class, $type));
         }
-        if (\PHP_VERSION_ID >= 70000) {
-            // PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
-            gc_mem_caches();
-        }
+
+        // PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
+        gc_mem_caches();
 
         return $collection;
     }
@@ -72,7 +71,7 @@ class AnnotationFileLoader extends FileLoader
      */
     public function supports($resource, $type = null)
     {
-        return is_string($resource) && 'php' === pathinfo($resource, PATHINFO_EXTENSION) && (!$type || 'annotation' === $type);
+        return \is_string($resource) && 'php' === pathinfo($resource, PATHINFO_EXTENSION) && (!$type || 'annotation' === $type);
     }
 
     /**
@@ -88,7 +87,7 @@ class AnnotationFileLoader extends FileLoader
         $namespace = false;
         $tokens = token_get_all(file_get_contents($file));
 
-        if (1 === count($tokens) && T_INLINE_HTML === $tokens[0][0]) {
+        if (1 === \count($tokens) && T_INLINE_HTML === $tokens[0][0]) {
             throw new \InvalidArgumentException(sprintf('The file "%s" does not contain PHP code. Did you forgot to add the "<?php" start tag at the beginning of the file?', $file));
         }
 
@@ -105,7 +104,7 @@ class AnnotationFileLoader extends FileLoader
 
             if (true === $namespace && T_STRING === $token[0]) {
                 $namespace = $token[1];
-                while (isset($tokens[++$i][1]) && in_array($tokens[$i][0], array(T_NS_SEPARATOR, T_STRING))) {
+                while (isset($tokens[++$i][1]) && \in_array($tokens[$i][0], array(T_NS_SEPARATOR, T_STRING))) {
                     $namespace .= $tokens[$i][1];
                 }
                 $token = $tokens[$i];
@@ -122,7 +121,7 @@ class AnnotationFileLoader extends FileLoader
                     if (T_DOUBLE_COLON === $tokens[$j][0] || T_NEW === $tokens[$j][0]) {
                         $skipClassToken = true;
                         break;
-                    } elseif (!in_array($tokens[$j][0], array(T_WHITESPACE, T_DOC_COMMENT, T_COMMENT))) {
+                    } elseif (!\in_array($tokens[$j][0], array(T_WHITESPACE, T_DOC_COMMENT, T_COMMENT))) {
                         break;
                     }
                 }
diff --git a/vendor/symfony/routing/Loader/Configurator/CollectionConfigurator.php b/vendor/symfony/routing/Loader/Configurator/CollectionConfigurator.php
index 8baefdd5..e1de75e0 100644
--- a/vendor/symfony/routing/Loader/Configurator/CollectionConfigurator.php
+++ b/vendor/symfony/routing/Loader/Configurator/CollectionConfigurator.php
@@ -24,35 +24,25 @@ class CollectionConfigurator
 
     private $parent;
     private $parentConfigurator;
+    private $parentPrefixes;
 
-    public function __construct(RouteCollection $parent, $name, self $parentConfigurator = null)
+    public function __construct(RouteCollection $parent, string $name, self $parentConfigurator = null, array $parentPrefixes = null)
     {
         $this->parent = $parent;
         $this->name = $name;
         $this->collection = new RouteCollection();
         $this->route = new Route('');
         $this->parentConfigurator = $parentConfigurator; // for GC control
+        $this->parentPrefixes = $parentPrefixes;
     }
 
     public function __destruct()
     {
-        $this->collection->addPrefix(rtrim($this->route->getPath(), '/'));
-        $this->parent->addCollection($this->collection);
-    }
+        if (null === $this->prefixes) {
+            $this->collection->addPrefix($this->route->getPath());
+        }
 
-    /**
-     * Adds a route.
-     *
-     * @param string $name
-     * @param string $path
-     *
-     * @return RouteConfigurator
-     */
-    final public function add($name, $path)
-    {
-        $this->collection->add($this->name.$name, $route = clone $this->route);
-
-        return new RouteConfigurator($this->collection, $route->setPath($path), $this->name, $this);
+        $this->parent->addCollection($this->collection);
     }
 
     /**
@@ -62,20 +52,44 @@ class CollectionConfigurator
      */
     final public function collection($name = '')
     {
-        return new self($this->collection, $this->name.$name, $this);
+        return new self($this->collection, $this->name.$name, $this, $this->prefixes);
     }
 
     /**
      * Sets the prefix to add to the path of all child routes.
      *
-     * @param string $prefix
+     * @param string|array $prefix the prefix, or the localized prefixes
      *
      * @return $this
      */
     final public function prefix($prefix)
     {
-        $this->route->setPath($prefix);
+        if (\is_array($prefix)) {
+            if (null === $this->parentPrefixes) {
+                // no-op
+            } elseif ($missing = array_diff_key($this->parentPrefixes, $prefix)) {
+                throw new \LogicException(sprintf('Collection "%s" is missing prefixes for locale(s) "%s".', $this->name, implode('", "', array_keys($missing))));
+            } else {
+                foreach ($prefix as $locale => $localePrefix) {
+                    if (!isset($this->parentPrefixes[$locale])) {
+                        throw new \LogicException(sprintf('Collection "%s" with locale "%s" is missing a corresponding prefix in its parent collection.', $this->name, $locale));
+                    }
+
+                    $prefix[$locale] = $this->parentPrefixes[$locale].$localePrefix;
+                }
+            }
+            $this->prefixes = $prefix;
+            $this->route->setPath('/');
+        } else {
+            $this->prefixes = null;
+            $this->route->setPath($prefix);
+        }
 
         return $this;
     }
+
+    private function createRoute($path): Route
+    {
+        return (clone $this->route)->setPath($path);
+    }
 }
diff --git a/vendor/symfony/routing/Loader/Configurator/ImportConfigurator.php b/vendor/symfony/routing/Loader/Configurator/ImportConfigurator.php
index d0a3c373..92e7efde 100644
--- a/vendor/symfony/routing/Loader/Configurator/ImportConfigurator.php
+++ b/vendor/symfony/routing/Loader/Configurator/ImportConfigurator.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Routing\Loader\Configurator;
 
+use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
 /**
@@ -36,13 +37,56 @@ class ImportConfigurator
     /**
      * Sets the prefix to add to the path of all child routes.
      *
-     * @param string $prefix
+     * @param string|array $prefix the prefix, or the localized prefixes
      *
      * @return $this
      */
-    final public function prefix($prefix)
+    final public function prefix($prefix, bool $trailingSlashOnRoot = true)
     {
-        $this->route->addPrefix($prefix);
+        if (!\is_array($prefix)) {
+            $this->route->addPrefix($prefix);
+            if (!$trailingSlashOnRoot) {
+                $rootPath = (new Route(trim(trim($prefix), '/').'/'))->getPath();
+                foreach ($this->route->all() as $route) {
+                    if ($route->getPath() === $rootPath) {
+                        $route->setPath(rtrim($rootPath, '/'));
+                    }
+                }
+            }
+        } else {
+            foreach ($prefix as $locale => $localePrefix) {
+                $prefix[$locale] = trim(trim($localePrefix), '/');
+            }
+            foreach ($this->route->all() as $name => $route) {
+                if (null === $locale = $route->getDefault('_locale')) {
+                    $this->route->remove($name);
+                    foreach ($prefix as $locale => $localePrefix) {
+                        $localizedRoute = clone $route;
+                        $localizedRoute->setDefault('_locale', $locale);
+                        $localizedRoute->setDefault('_canonical_route', $name);
+                        $localizedRoute->setPath($localePrefix.(!$trailingSlashOnRoot && '/' === $route->getPath() ? '' : $route->getPath()));
+                        $this->route->add($name.'.'.$locale, $localizedRoute);
+                    }
+                } elseif (!isset($prefix[$locale])) {
+                    throw new \InvalidArgumentException(sprintf('Route "%s" with locale "%s" is missing a corresponding prefix in its parent collection.', $name, $locale));
+                } else {
+                    $route->setPath($prefix[$locale].(!$trailingSlashOnRoot && '/' === $route->getPath() ? '' : $route->getPath()));
+                    $this->route->add($name, $route);
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Sets the prefix to add to the name of all child routes.
+     *
+     * @return $this
+     */
+    final public function namePrefix(string $namePrefix)
+    {
+        $this->route->addNamePrefix($namePrefix);
 
         return $this;
     }
diff --git a/vendor/symfony/routing/Loader/Configurator/RouteConfigurator.php b/vendor/symfony/routing/Loader/Configurator/RouteConfigurator.php
index 6422bbf6..e700f8de 100644
--- a/vendor/symfony/routing/Loader/Configurator/RouteConfigurator.php
+++ b/vendor/symfony/routing/Loader/Configurator/RouteConfigurator.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Routing\Loader\Configurator;
 
-use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
 /**
@@ -24,11 +23,12 @@ class RouteConfigurator
 
     private $parentConfigurator;
 
-    public function __construct(RouteCollection $collection, Route $route, $name = '', CollectionConfigurator $parentConfigurator = null)
+    public function __construct(RouteCollection $collection, $route, string $name = '', CollectionConfigurator $parentConfigurator = null, array $prefixes = null)
     {
         $this->collection = $collection;
         $this->route = $route;
         $this->name = $name;
         $this->parentConfigurator = $parentConfigurator; // for GC control
+        $this->prefixes = $prefixes;
     }
 }
diff --git a/vendor/symfony/routing/Loader/Configurator/RoutingConfigurator.php b/vendor/symfony/routing/Loader/Configurator/RoutingConfigurator.php
index d992cef8..a315cfb4 100644
--- a/vendor/symfony/routing/Loader/Configurator/RoutingConfigurator.php
+++ b/vendor/symfony/routing/Loader/Configurator/RoutingConfigurator.php
@@ -25,7 +25,7 @@ class RoutingConfigurator
     private $path;
     private $file;
 
-    public function __construct(RouteCollection $collection, PhpFileLoader $loader, $path, $file)
+    public function __construct(RouteCollection $collection, PhpFileLoader $loader, string $path, string $file)
     {
         $this->collection = $collection;
         $this->loader = $loader;
@@ -38,9 +38,9 @@ class RoutingConfigurator
      */
     final public function import($resource, $type = null, $ignoreErrors = false)
     {
-        $this->loader->setCurrentDir(dirname($this->path));
+        $this->loader->setCurrentDir(\dirname($this->path));
         $imported = $this->loader->import($resource, $type, $ignoreErrors, $this->file);
-        if (!is_array($imported)) {
+        if (!\is_array($imported)) {
             return new ImportConfigurator($this->collection, $imported);
         }
 
diff --git a/vendor/symfony/routing/Loader/Configurator/Traits/AddTrait.php b/vendor/symfony/routing/Loader/Configurator/Traits/AddTrait.php
index e8b8fa26..57dd71f2 100644
--- a/vendor/symfony/routing/Loader/Configurator/Traits/AddTrait.php
+++ b/vendor/symfony/routing/Loader/Configurator/Traits/AddTrait.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Routing\Loader\Configurator\Traits;
 
+use Symfony\Component\Routing\Loader\Configurator\CollectionConfigurator;
 use Symfony\Component\Routing\Loader\Configurator\RouteConfigurator;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
@@ -24,32 +25,66 @@ trait AddTrait
 
     private $name = '';
 
+    private $prefixes;
+
     /**
      * Adds a route.
      *
-     * @param string $name
-     * @param string $path
-     *
-     * @return RouteConfigurator
+     * @param string|array $path the path, or the localized paths of the route
      */
-    final public function add($name, $path)
+    final public function add(string $name, $path): RouteConfigurator
     {
-        $parentConfigurator = $this instanceof RouteConfigurator ? $this->parentConfigurator : null;
-        $this->collection->add($this->name.$name, $route = new Route($path));
+        $paths = array();
+        $parentConfigurator = $this instanceof CollectionConfigurator ? $this : ($this instanceof RouteConfigurator ? $this->parentConfigurator : null);
+
+        if (\is_array($path)) {
+            if (null === $this->prefixes) {
+                $paths = $path;
+            } elseif ($missing = array_diff_key($this->prefixes, $path)) {
+                throw new \LogicException(sprintf('Route "%s" is missing routes for locale(s) "%s".', $name, implode('", "', array_keys($missing))));
+            } else {
+                foreach ($path as $locale => $localePath) {
+                    if (!isset($this->prefixes[$locale])) {
+                        throw new \LogicException(sprintf('Route "%s" with locale "%s" is missing a corresponding prefix in its parent collection.', $name, $locale));
+                    }
+
+                    $paths[$locale] = $this->prefixes[$locale].$localePath;
+                }
+            }
+        } elseif (null !== $this->prefixes) {
+            foreach ($this->prefixes as $locale => $prefix) {
+                $paths[$locale] = $prefix.$path;
+            }
+        } else {
+            $this->collection->add($this->name.$name, $route = $this->createRoute($path));
+
+            return new RouteConfigurator($this->collection, $route, $this->name, $parentConfigurator, $this->prefixes);
+        }
+
+        $routes = new RouteCollection();
 
-        return new RouteConfigurator($this->collection, $route, '', $parentConfigurator);
+        foreach ($paths as $locale => $path) {
+            $routes->add($name.'.'.$locale, $route = $this->createRoute($path));
+            $this->collection->add($this->name.$name.'.'.$locale, $route);
+            $route->setDefault('_locale', $locale);
+            $route->setDefault('_canonical_route', $this->name.$name);
+        }
+
+        return new RouteConfigurator($this->collection, $routes, $this->name, $parentConfigurator, $this->prefixes);
     }
 
     /**
      * Adds a route.
      *
-     * @param string $name
-     * @param string $path
-     *
-     * @return RouteConfigurator
+     * @param string|array $path the path, or the localized paths of the route
      */
-    final public function __invoke($name, $path)
+    final public function __invoke(string $name, $path): RouteConfigurator
     {
         return $this->add($name, $path);
     }
+
+    private function createRoute($path): Route
+    {
+        return new Route($path);
+    }
 }
diff --git a/vendor/symfony/routing/Loader/Configurator/Traits/RouteTrait.php b/vendor/symfony/routing/Loader/Configurator/Traits/RouteTrait.php
index 4d2e255b..3613f252 100644
--- a/vendor/symfony/routing/Loader/Configurator/Traits/RouteTrait.php
+++ b/vendor/symfony/routing/Loader/Configurator/Traits/RouteTrait.php
@@ -60,11 +60,9 @@ trait RouteTrait
     /**
      * Sets the condition.
      *
-     * @param string $condition
-     *
      * @return $this
      */
-    final public function condition($condition)
+    final public function condition(string $condition)
     {
         $this->route->setCondition($condition);
 
@@ -74,11 +72,9 @@ trait RouteTrait
     /**
      * Sets the pattern for the host.
      *
-     * @param string $pattern
-     *
      * @return $this
      */
-    final public function host($pattern)
+    final public function host(string $pattern)
     {
         $this->route->setHost($pattern);
 
diff --git a/vendor/symfony/routing/Loader/DirectoryLoader.php b/vendor/symfony/routing/Loader/DirectoryLoader.php
index 4bb5b31b..08e833e0 100644
--- a/vendor/symfony/routing/Loader/DirectoryLoader.php
+++ b/vendor/symfony/routing/Loader/DirectoryLoader.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Routing\Loader;
 
 use Symfony\Component\Config\Loader\FileLoader;
-use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Config\Resource\DirectoryResource;
+use Symfony\Component\Routing\RouteCollection;
 
 class DirectoryLoader extends FileLoader
 {
diff --git a/vendor/symfony/routing/Loader/ObjectRouteLoader.php b/vendor/symfony/routing/Loader/ObjectRouteLoader.php
index 0899a818..dd14487c 100644
--- a/vendor/symfony/routing/Loader/ObjectRouteLoader.php
+++ b/vendor/symfony/routing/Loader/ObjectRouteLoader.php
@@ -44,9 +44,14 @@ abstract class ObjectRouteLoader extends Loader
      */
     public function load($resource, $type = null)
     {
-        $parts = explode(':', $resource);
-        if (2 != count($parts)) {
-            throw new \InvalidArgumentException(sprintf('Invalid resource "%s" passed to the "service" route loader: use the format "service_name:methodName"', $resource));
+        if (1 === substr_count($resource, ':')) {
+            $resource = str_replace(':', '::', $resource);
+            @trigger_error(sprintf('Referencing service route loaders with a single colon is deprecated since Symfony 4.1. Use %s instead.', $resource), E_USER_DEPRECATED);
+        }
+
+        $parts = explode('::', $resource);
+        if (2 != \count($parts)) {
+            throw new \InvalidArgumentException(sprintf('Invalid resource "%s" passed to the "service" route loader: use the format "service::method"', $resource));
         }
 
         $serviceString = $parts[0];
@@ -54,20 +59,20 @@ abstract class ObjectRouteLoader extends Loader
 
         $loaderObject = $this->getServiceObject($serviceString);
 
-        if (!is_object($loaderObject)) {
-            throw new \LogicException(sprintf('%s:getServiceObject() must return an object: %s returned', get_class($this), gettype($loaderObject)));
+        if (!\is_object($loaderObject)) {
+            throw new \LogicException(sprintf('%s:getServiceObject() must return an object: %s returned', \get_class($this), \gettype($loaderObject)));
         }
 
-        if (!method_exists($loaderObject, $method)) {
-            throw new \BadMethodCallException(sprintf('Method "%s" not found on "%s" when importing routing resource "%s"', $method, get_class($loaderObject), $resource));
+        if (!\is_callable(array($loaderObject, $method))) {
+            throw new \BadMethodCallException(sprintf('Method "%s" not found on "%s" when importing routing resource "%s"', $method, \get_class($loaderObject), $resource));
         }
 
-        $routeCollection = call_user_func(array($loaderObject, $method), $this);
+        $routeCollection = \call_user_func(array($loaderObject, $method), $this);
 
         if (!$routeCollection instanceof RouteCollection) {
-            $type = is_object($routeCollection) ? get_class($routeCollection) : gettype($routeCollection);
+            $type = \is_object($routeCollection) ? \get_class($routeCollection) : \gettype($routeCollection);
 
-            throw new \LogicException(sprintf('The %s::%s method must return a RouteCollection: %s returned', get_class($loaderObject), $method, $type));
+            throw new \LogicException(sprintf('The %s::%s method must return a RouteCollection: %s returned', \get_class($loaderObject), $method, $type));
         }
 
         // make the service file tracked so that if it changes, the cache rebuilds
diff --git a/vendor/symfony/routing/Loader/PhpFileLoader.php b/vendor/symfony/routing/Loader/PhpFileLoader.php
index 3fcd692f..8d7b0cb3 100644
--- a/vendor/symfony/routing/Loader/PhpFileLoader.php
+++ b/vendor/symfony/routing/Loader/PhpFileLoader.php
@@ -36,7 +36,7 @@ class PhpFileLoader extends FileLoader
     public function load($file, $type = null)
     {
         $path = $this->locator->locate($file);
-        $this->setCurrentDir(dirname($path));
+        $this->setCurrentDir(\dirname($path));
 
         // the closure forbids access to the private scope in the included file
         $loader = $this;
@@ -46,7 +46,7 @@ class PhpFileLoader extends FileLoader
 
         $result = $load($path);
 
-        if ($result instanceof \Closure) {
+        if (\is_object($result) && \is_callable($result)) {
             $collection = new RouteCollection();
             $result(new RoutingConfigurator($collection, $this, $path, $file), $this);
         } else {
@@ -63,7 +63,7 @@ class PhpFileLoader extends FileLoader
      */
     public function supports($resource, $type = null)
     {
-        return is_string($resource) && 'php' === pathinfo($resource, PATHINFO_EXTENSION) && (!$type || 'php' === $type);
+        return \is_string($resource) && 'php' === pathinfo($resource, PATHINFO_EXTENSION) && (!$type || 'php' === $type);
     }
 }
 
diff --git a/vendor/symfony/routing/Loader/XmlFileLoader.php b/vendor/symfony/routing/Loader/XmlFileLoader.php
index f3f66055..54b0c65c 100644
--- a/vendor/symfony/routing/Loader/XmlFileLoader.php
+++ b/vendor/symfony/routing/Loader/XmlFileLoader.php
@@ -11,11 +11,11 @@
 
 namespace Symfony\Component\Routing\Loader;
 
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Config\Loader\FileLoader;
+use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Config\Util\XmlUtils;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
 
 /**
  * XmlFileLoader loads XML routing files.
@@ -93,7 +93,7 @@ class XmlFileLoader extends FileLoader
      */
     public function supports($resource, $type = null)
     {
-        return is_string($resource) && 'xml' === pathinfo($resource, PATHINFO_EXTENSION) && (!$type || 'xml' === $type);
+        return \is_string($resource) && 'xml' === pathinfo($resource, PATHINFO_EXTENSION) && (!$type || 'xml' === $type);
     }
 
     /**
@@ -107,17 +107,34 @@ class XmlFileLoader extends FileLoader
      */
     protected function parseRoute(RouteCollection $collection, \DOMElement $node, $path)
     {
-        if ('' === ($id = $node->getAttribute('id')) || !$node->hasAttribute('path')) {
-            throw new \InvalidArgumentException(sprintf('The <route> element in file "%s" must have an "id" and a "path" attribute.', $path));
+        if ('' === $id = $node->getAttribute('id')) {
+            throw new \InvalidArgumentException(sprintf('The <route> element in file "%s" must have an "id" attribute.', $path));
         }
 
         $schemes = preg_split('/[\s,\|]++/', $node->getAttribute('schemes'), -1, PREG_SPLIT_NO_EMPTY);
         $methods = preg_split('/[\s,\|]++/', $node->getAttribute('methods'), -1, PREG_SPLIT_NO_EMPTY);
 
-        list($defaults, $requirements, $options, $condition) = $this->parseConfigs($node, $path);
+        list($defaults, $requirements, $options, $condition, $paths) = $this->parseConfigs($node, $path);
 
-        $route = new Route($node->getAttribute('path'), $defaults, $requirements, $options, $node->getAttribute('host'), $schemes, $methods, $condition);
-        $collection->add($id, $route);
+        if (!$paths && '' === $node->getAttribute('path')) {
+            throw new \InvalidArgumentException(sprintf('The <route> element in file "%s" must have a "path" attribute or <path> child nodes.', $path));
+        }
+
+        if ($paths && '' !== $node->getAttribute('path')) {
+            throw new \InvalidArgumentException(sprintf('The <route> element in file "%s" must not have both a "path" attribute and <path> child nodes.', $path));
+        }
+
+        if (!$paths) {
+            $route = new Route($node->getAttribute('path'), $defaults, $requirements, $options, $node->getAttribute('host'), $schemes, $methods, $condition);
+            $collection->add($id, $route);
+        } else {
+            foreach ($paths as $locale => $p) {
+                $defaults['_locale'] = $locale;
+                $defaults['_canonical_route'] = $id;
+                $route = new Route($p, $defaults, $requirements, $options, $node->getAttribute('host'), $schemes, $methods, $condition);
+                $collection->add($id.'.'.$locale, $route);
+            }
+        }
     }
 
     /**
@@ -141,20 +158,57 @@ class XmlFileLoader extends FileLoader
         $host = $node->hasAttribute('host') ? $node->getAttribute('host') : null;
         $schemes = $node->hasAttribute('schemes') ? preg_split('/[\s,\|]++/', $node->getAttribute('schemes'), -1, PREG_SPLIT_NO_EMPTY) : null;
         $methods = $node->hasAttribute('methods') ? preg_split('/[\s,\|]++/', $node->getAttribute('methods'), -1, PREG_SPLIT_NO_EMPTY) : null;
+        $trailingSlashOnRoot = $node->hasAttribute('trailing-slash-on-root') ? XmlUtils::phpize($node->getAttribute('trailing-slash-on-root')) : true;
+
+        list($defaults, $requirements, $options, $condition, /* $paths */, $prefixes) = $this->parseConfigs($node, $path);
 
-        list($defaults, $requirements, $options, $condition) = $this->parseConfigs($node, $path);
+        if ('' !== $prefix && $prefixes) {
+            throw new \InvalidArgumentException(sprintf('The <route> element in file "%s" must not have both a "prefix" attribute and <prefix> child nodes.', $path));
+        }
 
-        $this->setCurrentDir(dirname($path));
+        $this->setCurrentDir(\dirname($path));
 
         $imported = $this->import($resource, ('' !== $type ? $type : null), false, $file);
 
-        if (!is_array($imported)) {
+        if (!\is_array($imported)) {
             $imported = array($imported);
         }
 
         foreach ($imported as $subCollection) {
             /* @var $subCollection RouteCollection */
-            $subCollection->addPrefix($prefix);
+            if ('' !== $prefix || !$prefixes) {
+                $subCollection->addPrefix($prefix);
+                if (!$trailingSlashOnRoot) {
+                    $rootPath = (new Route(trim(trim($prefix), '/').'/'))->getPath();
+                    foreach ($subCollection->all() as $route) {
+                        if ($route->getPath() === $rootPath) {
+                            $route->setPath(rtrim($rootPath, '/'));
+                        }
+                    }
+                }
+            } else {
+                foreach ($prefixes as $locale => $localePrefix) {
+                    $prefixes[$locale] = trim(trim($localePrefix), '/');
+                }
+                foreach ($subCollection->all() as $name => $route) {
+                    if (null === $locale = $route->getDefault('_locale')) {
+                        $subCollection->remove($name);
+                        foreach ($prefixes as $locale => $localePrefix) {
+                            $localizedRoute = clone $route;
+                            $localizedRoute->setPath($localePrefix.(!$trailingSlashOnRoot && '/' === $route->getPath() ? '' : $route->getPath()));
+                            $localizedRoute->setDefault('_locale', $locale);
+                            $localizedRoute->setDefault('_canonical_route', $name);
+                            $subCollection->add($name.'.'.$locale, $localizedRoute);
+                        }
+                    } elseif (!isset($prefixes[$locale])) {
+                        throw new \InvalidArgumentException(sprintf('Route "%s" with locale "%s" is missing a corresponding prefix when imported in "%s".', $name, $locale, $path));
+                    } else {
+                        $route->setPath($prefixes[$locale].(!$trailingSlashOnRoot && '/' === $route->getPath() ? '' : $route->getPath()));
+                        $subCollection->add($name, $route);
+                    }
+                }
+            }
+
             if (null !== $host) {
                 $subCollection->setHost($host);
             }
@@ -171,6 +225,10 @@ class XmlFileLoader extends FileLoader
             $subCollection->addRequirements($requirements);
             $subCollection->addOptions($options);
 
+            if ($namePrefix = $node->getAttribute('name-prefix')) {
+                $subCollection->addNamePrefix($namePrefix);
+            }
+
             $collection->addCollection($subCollection);
         }
     }
@@ -207,6 +265,8 @@ class XmlFileLoader extends FileLoader
         $requirements = array();
         $options = array();
         $condition = null;
+        $prefixes = array();
+        $paths = array();
 
         foreach ($node->getElementsByTagNameNS(self::NAMESPACE_URI, '*') as $n) {
             if ($node !== $n->parentNode) {
@@ -214,6 +274,12 @@ class XmlFileLoader extends FileLoader
             }
 
             switch ($n->localName) {
+                case 'path':
+                    $paths[$n->getAttribute('locale')] = trim($n->textContent);
+                    break;
+                case 'prefix':
+                    $prefixes[$n->getAttribute('locale')] = trim($n->textContent);
+                    break;
                 case 'default':
                     if ($this->isElementValueNull($n)) {
                         $defaults[$n->getAttribute('key')] = null;
@@ -246,7 +312,7 @@ class XmlFileLoader extends FileLoader
             $defaults['_controller'] = $controller;
         }
 
-        return array($defaults, $requirements, $options, $condition);
+        return array($defaults, $requirements, $options, $condition, $paths, $prefixes);
     }
 
     /**
diff --git a/vendor/symfony/routing/Loader/YamlFileLoader.php b/vendor/symfony/routing/Loader/YamlFileLoader.php
index f59f9097..bd35c75a 100644
--- a/vendor/symfony/routing/Loader/YamlFileLoader.php
+++ b/vendor/symfony/routing/Loader/YamlFileLoader.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\Routing\Loader;
 
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\Route;
+use Symfony\Component\Config\Loader\FileLoader;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Yaml\Exception\ParseException;
 use Symfony\Component\Yaml\Parser as YamlParser;
-use Symfony\Component\Config\Loader\FileLoader;
+use Symfony\Component\Yaml\Yaml;
 
 /**
  * YamlFileLoader loads Yaml routing files.
@@ -27,7 +28,7 @@ use Symfony\Component\Config\Loader\FileLoader;
 class YamlFileLoader extends FileLoader
 {
     private static $availableKeys = array(
-        'resource', 'type', 'prefix', 'path', 'host', 'schemes', 'methods', 'defaults', 'requirements', 'options', 'condition', 'controller',
+        'resource', 'type', 'prefix', 'path', 'host', 'schemes', 'methods', 'defaults', 'requirements', 'options', 'condition', 'controller', 'name_prefix', 'trailing_slash_on_root',
     );
     private $yamlParser;
 
@@ -57,18 +58,10 @@ class YamlFileLoader extends FileLoader
             $this->yamlParser = new YamlParser();
         }
 
-        $prevErrorHandler = set_error_handler(function ($level, $message, $script, $line) use ($file, &$prevErrorHandler) {
-            $message = E_USER_DEPRECATED === $level ? preg_replace('/ on line \d+/', ' in "'.$file.'"$0', $message) : $message;
-
-            return $prevErrorHandler ? $prevErrorHandler($level, $message, $script, $line) : false;
-        });
-
         try {
-            $parsedConfig = $this->yamlParser->parseFile($path);
+            $parsedConfig = $this->yamlParser->parseFile($path, Yaml::PARSE_CONSTANT);
         } catch (ParseException $e) {
             throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);
-        } finally {
-            restore_error_handler();
         }
 
         $collection = new RouteCollection();
@@ -80,7 +73,7 @@ class YamlFileLoader extends FileLoader
         }
 
         // not an array
-        if (!is_array($parsedConfig)) {
+        if (!\is_array($parsedConfig)) {
             throw new \InvalidArgumentException(sprintf('The file "%s" must contain a YAML array.', $path));
         }
 
@@ -102,7 +95,7 @@ class YamlFileLoader extends FileLoader
      */
     public function supports($resource, $type = null)
     {
-        return is_string($resource) && in_array(pathinfo($resource, PATHINFO_EXTENSION), array('yml', 'yaml'), true) && (!$type || 'yaml' === $type);
+        return \is_string($resource) && \in_array(pathinfo($resource, PATHINFO_EXTENSION), array('yml', 'yaml'), true) && (!$type || 'yaml' === $type);
     }
 
     /**
@@ -127,9 +120,20 @@ class YamlFileLoader extends FileLoader
             $defaults['_controller'] = $config['controller'];
         }
 
-        $route = new Route($config['path'], $defaults, $requirements, $options, $host, $schemes, $methods, $condition);
+        if (\is_array($config['path'])) {
+            $route = new Route('', $defaults, $requirements, $options, $host, $schemes, $methods, $condition);
 
-        $collection->add($name, $route);
+            foreach ($config['path'] as $locale => $path) {
+                $localizedRoute = clone $route;
+                $localizedRoute->setDefault('_locale', $locale);
+                $localizedRoute->setDefault('_canonical_route', $name);
+                $localizedRoute->setPath($path);
+                $collection->add($name.'.'.$locale, $localizedRoute);
+            }
+        } else {
+            $route = new Route($config['path'], $defaults, $requirements, $options, $host, $schemes, $methods, $condition);
+            $collection->add($name, $route);
+        }
     }
 
     /**
@@ -151,22 +155,55 @@ class YamlFileLoader extends FileLoader
         $condition = isset($config['condition']) ? $config['condition'] : null;
         $schemes = isset($config['schemes']) ? $config['schemes'] : null;
         $methods = isset($config['methods']) ? $config['methods'] : null;
+        $trailingSlashOnRoot = $config['trailing_slash_on_root'] ?? true;
 
         if (isset($config['controller'])) {
             $defaults['_controller'] = $config['controller'];
         }
 
-        $this->setCurrentDir(dirname($path));
+        $this->setCurrentDir(\dirname($path));
 
         $imported = $this->import($config['resource'], $type, false, $file);
 
-        if (!is_array($imported)) {
+        if (!\is_array($imported)) {
             $imported = array($imported);
         }
 
         foreach ($imported as $subCollection) {
             /* @var $subCollection RouteCollection */
-            $subCollection->addPrefix($prefix);
+            if (!\is_array($prefix)) {
+                $subCollection->addPrefix($prefix);
+                if (!$trailingSlashOnRoot) {
+                    $rootPath = (new Route(trim(trim($prefix), '/').'/'))->getPath();
+                    foreach ($subCollection->all() as $route) {
+                        if ($route->getPath() === $rootPath) {
+                            $route->setPath(rtrim($rootPath, '/'));
+                        }
+                    }
+                }
+            } else {
+                foreach ($prefix as $locale => $localePrefix) {
+                    $prefix[$locale] = trim(trim($localePrefix), '/');
+                }
+                foreach ($subCollection->all() as $name => $route) {
+                    if (null === $locale = $route->getDefault('_locale')) {
+                        $subCollection->remove($name);
+                        foreach ($prefix as $locale => $localePrefix) {
+                            $localizedRoute = clone $route;
+                            $localizedRoute->setDefault('_locale', $locale);
+                            $localizedRoute->setDefault('_canonical_route', $name);
+                            $localizedRoute->setPath($localePrefix.(!$trailingSlashOnRoot && '/' === $route->getPath() ? '' : $route->getPath()));
+                            $subCollection->add($name.'.'.$locale, $localizedRoute);
+                        }
+                    } elseif (!isset($prefix[$locale])) {
+                        throw new \InvalidArgumentException(sprintf('Route "%s" with locale "%s" is missing a corresponding prefix when imported in "%s".', $name, $locale, $file));
+                    } else {
+                        $route->setPath($prefix[$locale].(!$trailingSlashOnRoot && '/' === $route->getPath() ? '' : $route->getPath()));
+                        $subCollection->add($name, $route);
+                    }
+                }
+            }
+
             if (null !== $host) {
                 $subCollection->setHost($host);
             }
@@ -183,6 +220,10 @@ class YamlFileLoader extends FileLoader
             $subCollection->addRequirements($requirements);
             $subCollection->addOptions($options);
 
+            if (isset($config['name_prefix'])) {
+                $subCollection->addNamePrefix($config['name_prefix']);
+            }
+
             $collection->addCollection($subCollection);
         }
     }
@@ -199,32 +240,20 @@ class YamlFileLoader extends FileLoader
      */
     protected function validate($config, $name, $path)
     {
-        if (!is_array($config)) {
+        if (!\is_array($config)) {
             throw new \InvalidArgumentException(sprintf('The definition of "%s" in "%s" must be a YAML array.', $name, $path));
         }
         if ($extraKeys = array_diff(array_keys($config), self::$availableKeys)) {
-            throw new \InvalidArgumentException(sprintf(
-                'The routing file "%s" contains unsupported keys for "%s": "%s". Expected one of: "%s".',
-                $path, $name, implode('", "', $extraKeys), implode('", "', self::$availableKeys)
-            ));
+            throw new \InvalidArgumentException(sprintf('The routing file "%s" contains unsupported keys for "%s": "%s". Expected one of: "%s".', $path, $name, implode('", "', $extraKeys), implode('", "', self::$availableKeys)));
         }
         if (isset($config['resource']) && isset($config['path'])) {
-            throw new \InvalidArgumentException(sprintf(
-                'The routing file "%s" must not specify both the "resource" key and the "path" key for "%s". Choose between an import and a route definition.',
-                $path, $name
-            ));
+            throw new \InvalidArgumentException(sprintf('The routing file "%s" must not specify both the "resource" key and the "path" key for "%s". Choose between an import and a route definition.', $path, $name));
         }
         if (!isset($config['resource']) && isset($config['type'])) {
-            throw new \InvalidArgumentException(sprintf(
-                'The "type" key for the route definition "%s" in "%s" is unsupported. It is only available for imports in combination with the "resource" key.',
-                $name, $path
-            ));
+            throw new \InvalidArgumentException(sprintf('The "type" key for the route definition "%s" in "%s" is unsupported. It is only available for imports in combination with the "resource" key.', $name, $path));
         }
         if (!isset($config['resource']) && !isset($config['path'])) {
-            throw new \InvalidArgumentException(sprintf(
-                'You must define a "path" for the route "%s" in file "%s".',
-                $name, $path
-            ));
+            throw new \InvalidArgumentException(sprintf('You must define a "path" for the route "%s" in file "%s".', $name, $path));
         }
         if (isset($config['controller']) && isset($config['defaults']['_controller'])) {
             throw new \InvalidArgumentException(sprintf('The routing file "%s" must not specify both the "controller" key and the defaults key "_controller" for "%s".', $path, $name));
diff --git a/vendor/symfony/routing/Loader/schema/routing/routing-1.0.xsd b/vendor/symfony/routing/Loader/schema/routing/routing-1.0.xsd
index a97111aa..1ea4651c 100644
--- a/vendor/symfony/routing/Loader/schema/routing/routing-1.0.xsd
+++ b/vendor/symfony/routing/Loader/schema/routing/routing-1.0.xsd
@@ -24,6 +24,14 @@
     </xsd:choice>
   </xsd:complexType>
 
+  <xsd:complexType name="localized-path">
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:string">
+        <xsd:attribute name="locale" type="xsd:string" use="required" />
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
   <xsd:group name="configs">
     <xsd:choice>
       <xsd:element name="default" nillable="true" type="default" />
@@ -34,10 +42,12 @@
   </xsd:group>
 
   <xsd:complexType name="route">
-    <xsd:group ref="configs" minOccurs="0" maxOccurs="unbounded" />
-
+    <xsd:sequence>
+      <xsd:group ref="configs" minOccurs="0" maxOccurs="unbounded" />
+      <xsd:element name="path" type="localized-path" minOccurs="0" maxOccurs="unbounded" />
+    </xsd:sequence>
     <xsd:attribute name="id" type="xsd:string" use="required" />
-    <xsd:attribute name="path" type="xsd:string" use="required" />
+    <xsd:attribute name="path" type="xsd:string" />
     <xsd:attribute name="host" type="xsd:string" />
     <xsd:attribute name="schemes" type="xsd:string" />
     <xsd:attribute name="methods" type="xsd:string" />
@@ -45,15 +55,19 @@
   </xsd:complexType>
 
   <xsd:complexType name="import">
-    <xsd:group ref="configs" minOccurs="0" maxOccurs="unbounded" />
-
+    <xsd:sequence maxOccurs="unbounded" minOccurs="0">
+      <xsd:group ref="configs" minOccurs="0" maxOccurs="unbounded" />
+      <xsd:element name="prefix" type="localized-path" minOccurs="0" maxOccurs="unbounded" />
+    </xsd:sequence>
     <xsd:attribute name="resource" type="xsd:string" use="required" />
     <xsd:attribute name="type" type="xsd:string" />
     <xsd:attribute name="prefix" type="xsd:string" />
+    <xsd:attribute name="name-prefix" type="xsd:string" />
     <xsd:attribute name="host" type="xsd:string" />
     <xsd:attribute name="schemes" type="xsd:string" />
     <xsd:attribute name="methods" type="xsd:string" />
     <xsd:attribute name="controller" type="xsd:string" />
+    <xsd:attribute name="trailing-slash-on-root" type="xsd:boolean" />
   </xsd:complexType>
 
   <xsd:complexType name="default" mixed="true">
diff --git a/vendor/symfony/routing/Matcher/Dumper/DumperCollection.php b/vendor/symfony/routing/Matcher/Dumper/DumperCollection.php
deleted file mode 100644
index dd057d2e..00000000
--- a/vendor/symfony/routing/Matcher/Dumper/DumperCollection.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Routing\Matcher\Dumper;
-
-/**
- * Collection of routes.
- *
- * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
- *
- * @internal
- */
-class DumperCollection implements \IteratorAggregate
-{
-    /**
-     * @var DumperCollection|null
-     */
-    private $parent;
-
-    /**
-     * @var DumperCollection[]|DumperRoute[]
-     */
-    private $children = array();
-
-    /**
-     * @var array
-     */
-    private $attributes = array();
-
-    /**
-     * Returns the children routes and collections.
-     *
-     * @return self[]|DumperRoute[]
-     */
-    public function all()
-    {
-        return $this->children;
-    }
-
-    /**
-     * Adds a route or collection.
-     *
-     * @param DumperRoute|DumperCollection The route or collection
-     */
-    public function add($child)
-    {
-        if ($child instanceof self) {
-            $child->setParent($this);
-        }
-        $this->children[] = $child;
-    }
-
-    /**
-     * Sets children.
-     *
-     * @param array $children The children
-     */
-    public function setAll(array $children)
-    {
-        foreach ($children as $child) {
-            if ($child instanceof self) {
-                $child->setParent($this);
-            }
-        }
-        $this->children = $children;
-    }
-
-    /**
-     * Returns an iterator over the children.
-     *
-     * @return \Iterator|DumperCollection[]|DumperRoute[] The iterator
-     */
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->children);
-    }
-
-    /**
-     * Returns the root of the collection.
-     *
-     * @return self The root collection
-     */
-    public function getRoot()
-    {
-        return (null !== $this->parent) ? $this->parent->getRoot() : $this;
-    }
-
-    /**
-     * Returns the parent collection.
-     *
-     * @return self|null The parent collection or null if the collection has no parent
-     */
-    protected function getParent()
-    {
-        return $this->parent;
-    }
-
-    /**
-     * Sets the parent collection.
-     */
-    protected function setParent(self $parent)
-    {
-        $this->parent = $parent;
-    }
-
-    /**
-     * Returns true if the attribute is defined.
-     *
-     * @param string $name The attribute name
-     *
-     * @return bool true if the attribute is defined, false otherwise
-     */
-    public function hasAttribute($name)
-    {
-        return array_key_exists($name, $this->attributes);
-    }
-
-    /**
-     * Returns an attribute by name.
-     *
-     * @param string $name    The attribute name
-     * @param mixed  $default Default value is the attribute doesn't exist
-     *
-     * @return mixed The attribute value
-     */
-    public function getAttribute($name, $default = null)
-    {
-        return $this->hasAttribute($name) ? $this->attributes[$name] : $default;
-    }
-
-    /**
-     * Sets an attribute by name.
-     *
-     * @param string $name  The attribute name
-     * @param mixed  $value The attribute value
-     */
-    public function setAttribute($name, $value)
-    {
-        $this->attributes[$name] = $value;
-    }
-
-    /**
-     * Sets multiple attributes.
-     *
-     * @param array $attributes The attributes
-     */
-    public function setAttributes($attributes)
-    {
-        $this->attributes = $attributes;
-    }
-}
diff --git a/vendor/symfony/routing/Matcher/Dumper/DumperRoute.php b/vendor/symfony/routing/Matcher/Dumper/DumperRoute.php
deleted file mode 100644
index c71989a3..00000000
--- a/vendor/symfony/routing/Matcher/Dumper/DumperRoute.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Routing\Matcher\Dumper;
-
-use Symfony\Component\Routing\Route;
-
-/**
- * Container for a Route.
- *
- * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
- *
- * @internal
- */
-class DumperRoute
-{
-    private $name;
-    private $route;
-
-    /**
-     * @param string $name  The route name
-     * @param Route  $route The route
-     */
-    public function __construct($name, Route $route)
-    {
-        $this->name = $name;
-        $this->route = $route;
-    }
-
-    /**
-     * Returns the route name.
-     *
-     * @return string The route name
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Returns the route.
-     *
-     * @return Route The route
-     */
-    public function getRoute()
-    {
-        return $this->route;
-    }
-}
diff --git a/vendor/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php b/vendor/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php
index 40d8df67..14e5cc34 100644
--- a/vendor/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php
+++ b/vendor/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Routing\Matcher\Dumper;
 
+use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
+use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
+use Symfony\Component\Routing\Matcher\RedirectableUrlMatcherInterface;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
-use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
 
 /**
  * PhpMatcherDumper creates a PHP class able to match URLs for a given set of routes.
@@ -22,10 +23,12 @@ use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Tobias Schultze <http://tobion.de>
  * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
+ * @author Nicolas Grekas <p@tchwork.com>
  */
 class PhpMatcherDumper extends MatcherDumper
 {
     private $expressionLanguage;
+    private $signalingException;
 
     /**
      * @var ExpressionFunctionProviderInterface[]
@@ -53,7 +56,7 @@ class PhpMatcherDumper extends MatcherDumper
 
         // trailing slash support is only enabled if we know how to redirect the user
         $interfaces = class_implements($options['base_class']);
-        $supportsRedirections = isset($interfaces['Symfony\\Component\\Routing\\Matcher\\RedirectableUrlMatcherInterface']);
+        $supportsRedirections = isset($interfaces[RedirectableUrlMatcherInterface::class]);
 
         return <<<EOF
 <?php
@@ -86,263 +89,593 @@ EOF;
 
     /**
      * Generates the code for the match method implementing UrlMatcherInterface.
-     *
-     * @param bool $supportsRedirections Whether redirections are supported by the base class
-     *
-     * @return string Match method as PHP code
      */
-    private function generateMatchMethod($supportsRedirections)
+    private function generateMatchMethod(bool $supportsRedirections): string
     {
-        $code = rtrim($this->compileRoutes($this->getRoutes(), $supportsRedirections), "\n");
+        // Group hosts by same-suffix, re-order when possible
+        $matchHost = false;
+        $routes = new StaticPrefixCollection();
+        foreach ($this->getRoutes()->all() as $name => $route) {
+            if ($host = $route->getHost()) {
+                $matchHost = true;
+                $host = '/'.strtr(strrev($host), '}.{', '(/)');
+            }
 
-        return <<<EOF
-    public function match(\$rawPathinfo)
+            $routes->addRoute($host ?: '/(.*)', array($name, $route));
+        }
+        $routes = $matchHost ? $routes->populateCollection(new RouteCollection()) : $this->getRoutes();
+
+        $code = rtrim($this->compileRoutes($routes, $matchHost), "\n");
+        $fetchHost = $matchHost ? "        \$host = strtolower(\$context->getHost());\n" : '';
+
+        $code = <<<EOF
     {
-        \$allow = array();
+        \$allow = \$allowSchemes = array();
         \$pathinfo = rawurldecode(\$rawPathinfo);
-        \$trimmedPathinfo = rtrim(\$pathinfo, '/');
         \$context = \$this->context;
-        \$request = \$this->request ?: \$this->createRequest(\$pathinfo);
         \$requestMethod = \$canonicalMethod = \$context->getMethod();
-
+{$fetchHost}
         if ('HEAD' === \$requestMethod) {
             \$canonicalMethod = 'GET';
         }
 
 $code
 
-        throw 0 < count(\$allow) ? new MethodNotAllowedException(array_unique(\$allow)) : new ResourceNotFoundException();
-    }
 EOF;
+
+        if ($supportsRedirections) {
+            return <<<'EOF'
+    public function match($pathinfo)
+    {
+        $allow = $allowSchemes = array();
+        if ($ret = $this->doMatch($pathinfo, $allow, $allowSchemes)) {
+            return $ret;
+        }
+        if ($allow) {
+            throw new MethodNotAllowedException(array_keys($allow));
+        }
+        if (!in_array($this->context->getMethod(), array('HEAD', 'GET'), true)) {
+            // no-op
+        } elseif ($allowSchemes) {
+            redirect_scheme:
+            $scheme = $this->context->getScheme();
+            $this->context->setScheme(key($allowSchemes));
+            try {
+                if ($ret = $this->doMatch($pathinfo)) {
+                    return $this->redirect($pathinfo, $ret['_route'], $this->context->getScheme()) + $ret;
+                }
+            } finally {
+                $this->context->setScheme($scheme);
+            }
+        } elseif ('/' !== $pathinfo) {
+            $pathinfo = '/' !== $pathinfo[-1] ? $pathinfo.'/' : substr($pathinfo, 0, -1);
+            if ($ret = $this->doMatch($pathinfo, $allow, $allowSchemes)) {
+                return $this->redirect($pathinfo, $ret['_route']) + $ret;
+            }
+            if ($allowSchemes) {
+                goto redirect_scheme;
+            }
+        }
+
+        throw new ResourceNotFoundException();
+    }
+
+    private function doMatch(string $rawPathinfo, array &$allow = array(), array &$allowSchemes = array()): ?array
+
+EOF
+                .$code."\n        return null;\n    }";
+        }
+
+        return "    public function match(\$rawPathinfo)\n".$code."\n        throw \$allow ? new MethodNotAllowedException(array_keys(\$allow)) : new ResourceNotFoundException();\n    }";
     }
 
     /**
      * Generates PHP code to match a RouteCollection with all its routes.
-     *
-     * @param RouteCollection $routes               A RouteCollection instance
-     * @param bool            $supportsRedirections Whether redirections are supported by the base class
-     *
-     * @return string PHP code
      */
-    private function compileRoutes(RouteCollection $routes, $supportsRedirections)
+    private function compileRoutes(RouteCollection $routes, bool $matchHost): string
     {
-        $fetchedHost = false;
-        $groups = $this->groupRoutesByHostRegex($routes);
-        $code = '';
-
-        foreach ($groups as $collection) {
-            if (null !== $regex = $collection->getAttribute('host_regex')) {
-                if (!$fetchedHost) {
-                    $code .= "        \$host = \$context->getHost();\n\n";
-                    $fetchedHost = true;
+        list($staticRoutes, $dynamicRoutes) = $this->groupStaticRoutes($routes);
+
+        $code = $this->compileStaticRoutes($staticRoutes, $matchHost);
+        $chunkLimit = \count($dynamicRoutes);
+
+        while (true) {
+            try {
+                $this->signalingException = new \RuntimeException('preg_match(): Compilation failed: regular expression is too large');
+                $code .= $this->compileDynamicRoutes($dynamicRoutes, $matchHost, $chunkLimit);
+                break;
+            } catch (\Exception $e) {
+                if (1 < $chunkLimit && $this->signalingException === $e) {
+                    $chunkLimit = 1 + ($chunkLimit >> 1);
+                    continue;
                 }
-
-                $code .= sprintf("        if (preg_match(%s, \$host, \$hostMatches)) {\n", var_export($regex, true));
-            }
-
-            $tree = $this->buildStaticPrefixCollection($collection);
-            $groupCode = $this->compileStaticPrefixRoutes($tree, $supportsRedirections);
-
-            if (null !== $regex) {
-                // apply extra indention at each line (except empty ones)
-                $groupCode = preg_replace('/^.{2,}$/m', '    $0', $groupCode);
-                $code .= $groupCode;
-                $code .= "        }\n\n";
-            } else {
-                $code .= $groupCode;
+                throw $e;
             }
         }
 
         // used to display the Welcome Page in apps that don't define a homepage
-        $code .= "        if ('/' === \$pathinfo && !\$allow) {\n";
+        $code .= "        if ('/' === \$pathinfo && !\$allow && !\$allowSchemes) {\n";
         $code .= "            throw new Symfony\Component\Routing\Exception\NoConfigurationException();\n";
         $code .= "        }\n";
 
         return $code;
     }
 
-    private function buildStaticPrefixCollection(DumperCollection $collection)
+    /**
+     * Splits static routes from dynamic routes, so that they can be matched first, using a simple switch.
+     */
+    private function groupStaticRoutes(RouteCollection $collection): array
     {
-        $prefixCollection = new StaticPrefixCollection();
+        $staticRoutes = $dynamicRegex = array();
+        $dynamicRoutes = new RouteCollection();
+
+        foreach ($collection->all() as $name => $route) {
+            $compiledRoute = $route->compile();
+            $hostRegex = $compiledRoute->getHostRegex();
+            $regex = $compiledRoute->getRegex();
+            if (!$compiledRoute->getPathVariables()) {
+                $host = !$compiledRoute->getHostVariables() ? $route->getHost() : '';
+                $url = $route->getPath();
+                foreach ($dynamicRegex as list($hostRx, $rx)) {
+                    if (preg_match($rx, $url) && (!$host || !$hostRx || preg_match($hostRx, $host))) {
+                        $dynamicRegex[] = array($hostRegex, $regex);
+                        $dynamicRoutes->add($name, $route);
+                        continue 2;
+                    }
+                }
 
-        foreach ($collection as $dumperRoute) {
-            $prefix = $dumperRoute->getRoute()->compile()->getStaticPrefix();
-            $prefixCollection->addRoute($prefix, $dumperRoute);
+                $staticRoutes[$url][$name] = $route;
+            } else {
+                $dynamicRegex[] = array($hostRegex, $regex);
+                $dynamicRoutes->add($name, $route);
+            }
         }
 
-        $prefixCollection->optimizeGroups();
+        return array($staticRoutes, $dynamicRoutes);
+    }
 
-        return $prefixCollection;
+    /**
+     * Compiles static routes in a switch statement.
+     *
+     * Condition-less paths are put in a static array in the switch's default, with generic matching logic.
+     * Paths that can match two or more routes, or have user-specified conditions are put in separate switch's cases.
+     *
+     * @throws \LogicException
+     */
+    private function compileStaticRoutes(array $staticRoutes, bool $matchHost): string
+    {
+        if (!$staticRoutes) {
+            return '';
+        }
+        $code = $default = '';
+
+        foreach ($staticRoutes as $url => $routes) {
+            if (1 === \count($routes)) {
+                foreach ($routes as $name => $route) {
+                }
+
+                if (!$route->getCondition()) {
+                    $defaults = $route->getDefaults();
+                    if (isset($defaults['_canonical_route'])) {
+                        $name = $defaults['_canonical_route'];
+                        unset($defaults['_canonical_route']);
+                    }
+                    $default .= sprintf(
+                        "%s => array(%s, %s, %s, %s),\n",
+                        self::export($url),
+                        self::export(array('_route' => $name) + $defaults),
+                        self::export(!$route->compile()->getHostVariables() ? $route->getHost() : $route->compile()->getHostRegex() ?: null),
+                        self::export(array_flip($route->getMethods()) ?: null),
+                        self::export(array_flip($route->getSchemes()) ?: null)
+                    );
+                    continue;
+                }
+            }
+
+            $code .= sprintf("        case %s:\n", self::export($url));
+            foreach ($routes as $name => $route) {
+                $code .= $this->compileRoute($route, $name, true);
+            }
+            $code .= "            break;\n";
+        }
+
+        if ($default) {
+            $code .= <<<EOF
+        default:
+            \$routes = array(
+{$this->indent($default, 4)}            );
+
+            if (!isset(\$routes[\$pathinfo])) {
+                break;
+            }
+            list(\$ret, \$requiredHost, \$requiredMethods, \$requiredSchemes) = \$routes[\$pathinfo];
+{$this->compileSwitchDefault(false, $matchHost)}
+EOF;
+        }
+
+        return sprintf("        switch (\$pathinfo) {\n%s        }\n\n", $this->indent($code));
     }
 
     /**
-     * Generates PHP code to match a tree of routes.
+     * Compiles a regular expression followed by a switch statement to match dynamic routes.
+     *
+     * The regular expression matches both the host and the pathinfo at the same time. For stellar performance,
+     * it is built as a tree of patterns, with re-ordering logic to group same-prefix routes together when possible.
      *
-     * @param StaticPrefixCollection $collection           A StaticPrefixCollection instance
-     * @param bool                   $supportsRedirections Whether redirections are supported by the base class
-     * @param string                 $ifOrElseIf           either "if" or "elseif" to influence chaining
+     * Patterns are named so that we know which one matched (https://pcre.org/current/doc/html/pcre2syntax.html#SEC23).
+     * This name is used to "switch" to the additional logic required to match the final route.
      *
-     * @return string PHP code
+     * Condition-less paths are put in a static array in the switch's default, with generic matching logic.
+     * Paths that can match two or more routes, or have user-specified conditions are put in separate switch's cases.
+     *
+     * Last but not least:
+     *  - Because it is not possibe to mix unicode/non-unicode patterns in a single regexp, several of them can be generated.
+     *  - The same regexp can be used several times when the logic in the switch rejects the match. When this happens, the
+     *    matching-but-failing subpattern is blacklisted by replacing its name by "(*F)", which forces a failure-to-match.
+     *    To ease this backlisting operation, the name of subpatterns is also the string offset where the replacement should occur.
      */
-    private function compileStaticPrefixRoutes(StaticPrefixCollection $collection, $supportsRedirections, $ifOrElseIf = 'if')
+    private function compileDynamicRoutes(RouteCollection $collection, bool $matchHost, int $chunkLimit): string
     {
+        if (!$collection->all()) {
+            return '';
+        }
         $code = '';
-        $prefix = $collection->getPrefix();
+        $state = (object) array(
+            'regex' => '',
+            'switch' => '',
+            'default' => '',
+            'mark' => 0,
+            'markTail' => 0,
+            'hostVars' => array(),
+            'vars' => array(),
+        );
+        $state->getVars = static function ($m) use ($state) {
+            if ('_route' === $m[1]) {
+                return '?:';
+            }
+
+            $state->vars[] = $m[1];
+
+            return '';
+        };
+
+        $chunkSize = 0;
+        $prev = null;
+        $perModifiers = array();
+        foreach ($collection->all() as $name => $route) {
+            preg_match('#[a-zA-Z]*$#', $route->compile()->getRegex(), $rx);
+            if ($chunkLimit < ++$chunkSize || $prev !== $rx[0] && $route->compile()->getPathVariables()) {
+                $chunkSize = 1;
+                $routes = new RouteCollection();
+                $perModifiers[] = array($rx[0], $routes);
+                $prev = $rx[0];
+            }
+            $routes->add($name, $route);
+        }
+
+        foreach ($perModifiers as list($modifiers, $routes)) {
+            $prev = false;
+            $perHost = array();
+            foreach ($routes->all() as $name => $route) {
+                $regex = $route->compile()->getHostRegex();
+                if ($prev !== $regex) {
+                    $routes = new RouteCollection();
+                    $perHost[] = array($regex, $routes);
+                    $prev = $regex;
+                }
+                $routes->add($name, $route);
+            }
+            $prev = false;
+            $rx = '{^(?';
+            $code .= "\n            {$state->mark} => ".self::export($rx);
+            $state->mark += \strlen($rx);
+            $state->regex = $rx;
+
+            foreach ($perHost as list($hostRegex, $routes)) {
+                if ($matchHost) {
+                    if ($hostRegex) {
+                        preg_match('#^.\^(.*)\$.[a-zA-Z]*$#', $hostRegex, $rx);
+                        $state->vars = array();
+                        $hostRegex = '(?i:'.preg_replace_callback('#\?P<([^>]++)>#', $state->getVars, $rx[1]).')\.';
+                        $state->hostVars = $state->vars;
+                    } else {
+                        $hostRegex = '(?:(?:[^./]*+\.)++)';
+                        $state->hostVars = array();
+                    }
+                    $state->mark += \strlen($rx = ($prev ? ')' : '')."|{$hostRegex}(?");
+                    $code .= "\n                .".self::export($rx);
+                    $state->regex .= $rx;
+                    $prev = true;
+                }
+
+                $tree = new StaticPrefixCollection();
+                foreach ($routes->all() as $name => $route) {
+                    preg_match('#^.\^(.*)\$.[a-zA-Z]*$#', $route->compile()->getRegex(), $rx);
+
+                    $state->vars = array();
+                    $regex = preg_replace_callback('#\?P<([^>]++)>#', $state->getVars, $rx[1]);
+                    $tree->addRoute($regex, array($name, $regex, $state->vars, $route));
+                }
+
+                $code .= $this->compileStaticPrefixCollection($tree, $state);
+            }
+            if ($matchHost) {
+                $code .= "\n                .')'";
+                $state->regex .= ')';
+            }
+            $rx = ")$}{$modifiers}";
+            $code .= "\n                .'{$rx}',";
+            $state->regex .= $rx;
+            $state->markTail = 0;
+
+            // if the regex is too large, throw a signaling exception to recompute with smaller chunk size
+            set_error_handler(function ($type, $message) { throw 0 === strpos($message, $this->signalingException->getMessage()) ? $this->signalingException : new \ErrorException($message); });
+            try {
+                preg_match($state->regex, '');
+            } finally {
+                restore_error_handler();
+            }
+        }
+
+        if ($state->default) {
+            $state->switch .= <<<EOF
+        default:
+            \$routes = array(
+{$this->indent($state->default, 4)}            );
+
+            list(\$ret, \$vars, \$requiredMethods, \$requiredSchemes) = \$routes[\$m];
+{$this->compileSwitchDefault(true, $matchHost)}
+EOF;
+        }
+
+        $matchedPathinfo = $matchHost ? '$host.\'.\'.$pathinfo' : '$pathinfo';
+        unset($state->getVars);
 
-        if (!empty($prefix) && '/' !== $prefix) {
-            $code .= sprintf("    %s (0 === strpos(\$pathinfo, %s)) {\n", $ifOrElseIf, var_export($prefix, true));
+        return <<<EOF
+        \$matchedPathinfo = {$matchedPathinfo};
+        \$regexList = array({$code}
+        );
+
+        foreach (\$regexList as \$offset => \$regex) {
+            while (preg_match(\$regex, \$matchedPathinfo, \$matches)) {
+                switch (\$m = (int) \$matches['MARK']) {
+{$this->indent($state->switch, 3)}                }
+
+                if ({$state->mark} === \$m) {
+                    break;
+                }
+                \$regex = substr_replace(\$regex, 'F', \$m - \$offset, 1 + strlen(\$m));
+                \$offset += strlen(\$m);
+            }
         }
 
-        $ifOrElseIf = 'if';
+EOF;
+    }
 
-        foreach ($collection->getItems() as $route) {
+    /**
+     * Compiles a regexp tree of subpatterns that matches nested same-prefix routes.
+     *
+     * @param \stdClass $state A simple state object that keeps track of the progress of the compilation,
+     *                         and gathers the generated switch's "case" and "default" statements
+     */
+    private function compileStaticPrefixCollection(StaticPrefixCollection $tree, \stdClass $state, int $prefixLen = 0): string
+    {
+        $code = '';
+        $prevRegex = null;
+        $routes = $tree->getRoutes();
+
+        foreach ($routes as $i => $route) {
             if ($route instanceof StaticPrefixCollection) {
-                $code .= $this->compileStaticPrefixRoutes($route, $supportsRedirections, $ifOrElseIf);
-                $ifOrElseIf = 'elseif';
+                $prevRegex = null;
+                $prefix = substr($route->getPrefix(), $prefixLen);
+                $state->mark += \strlen($rx = "|{$prefix}(?");
+                $code .= "\n                    .".self::export($rx);
+                $state->regex .= $rx;
+                $code .= $this->indent($this->compileStaticPrefixCollection($route, $state, $prefixLen + \strlen($prefix)));
+                $code .= "\n                    .')'";
+                $state->regex .= ')';
+                ++$state->markTail;
+                continue;
+            }
+
+            list($name, $regex, $vars, $route) = $route;
+            $compiledRoute = $route->compile();
+
+            if ($compiledRoute->getRegex() === $prevRegex) {
+                $state->switch = substr_replace($state->switch, $this->compileRoute($route, $name, false)."\n", -19, 0);
+                continue;
+            }
+
+            $state->mark += 3 + $state->markTail + \strlen($regex) - $prefixLen;
+            $state->markTail = 2 + \strlen($state->mark);
+            $rx = sprintf('|%s(*:%s)', substr($regex, $prefixLen), $state->mark);
+            $code .= "\n                    .".self::export($rx);
+            $state->regex .= $rx;
+            $vars = array_merge($state->hostVars, $vars);
+
+            if (!$route->getCondition() && (!\is_array($next = $routes[1 + $i] ?? null) || $regex !== $next[1])) {
+                $prevRegex = null;
+                $defaults = $route->getDefaults();
+                if (isset($defaults['_canonical_route'])) {
+                    $name = $defaults['_canonical_route'];
+                    unset($defaults['_canonical_route']);
+                }
+                $state->default .= sprintf(
+                    "%s => array(%s, %s, %s, %s),\n",
+                    $state->mark,
+                    self::export(array('_route' => $name) + $defaults),
+                    self::export($vars),
+                    self::export(array_flip($route->getMethods()) ?: null),
+                    self::export(array_flip($route->getSchemes()) ?: null)
+                );
             } else {
-                $code .= $this->compileRoute($route[1]->getRoute(), $route[1]->getName(), $supportsRedirections, $prefix)."\n";
-                $ifOrElseIf = 'if';
+                $prevRegex = $compiledRoute->getRegex();
+                $combine = '            $matches = array(';
+                foreach ($vars as $j => $m) {
+                    $combine .= sprintf('%s => $matches[%d] ?? null, ', self::export($m), 1 + $j);
+                }
+                $combine = $vars ? substr_replace($combine, ");\n\n", -2) : '';
+
+                $state->switch .= <<<EOF
+        case {$state->mark}:
+{$combine}{$this->compileRoute($route, $name, false)}
+            break;
+
+EOF;
             }
         }
 
-        if (!empty($prefix) && '/' !== $prefix) {
-            $code .= "    }\n\n";
-            // apply extra indention at each line (except empty ones)
-            $code = preg_replace('/^.{2,}$/m', '    $0', $code);
+        return $code;
+    }
+
+    /**
+     * A simple helper to compiles the switch's "default" for both static and dynamic routes.
+     */
+    private function compileSwitchDefault(bool $hasVars, bool $matchHost): string
+    {
+        if ($hasVars) {
+            $code = <<<EOF
+
+            foreach (\$vars as \$i => \$v) {
+                if (isset(\$matches[1 + \$i])) {
+                    \$ret[\$v] = \$matches[1 + \$i];
+                }
+            }
+
+EOF;
+        } elseif ($matchHost) {
+            $code = <<<EOF
+
+            if (\$requiredHost) {
+                if ('#' !== \$requiredHost[0] ? \$requiredHost !== \$host : !preg_match(\$requiredHost, \$host, \$hostMatches)) {
+                    break;
+                }
+                if ('#' === \$requiredHost[0] && \$hostMatches) {
+                    \$hostMatches['_route'] = \$ret['_route'];
+                    \$ret = \$this->mergeDefaults(\$hostMatches, \$ret);
+                }
+            }
+
+EOF;
+        } else {
+            $code = '';
         }
 
+        $code .= <<<EOF
+
+            \$hasRequiredScheme = !\$requiredSchemes || isset(\$requiredSchemes[\$context->getScheme()]);
+            if (\$requiredMethods && !isset(\$requiredMethods[\$canonicalMethod]) && !isset(\$requiredMethods[\$requestMethod])) {
+                if (\$hasRequiredScheme) {
+                    \$allow += \$requiredMethods;
+                }
+                break;
+            }
+            if (!\$hasRequiredScheme) {
+                \$allowSchemes += \$requiredSchemes;
+                break;
+            }
+
+            return \$ret;
+
+EOF;
+
         return $code;
     }
 
     /**
      * Compiles a single Route to PHP code used to match it against the path info.
      *
-     * @param Route       $route                A Route instance
-     * @param string      $name                 The name of the Route
-     * @param bool        $supportsRedirections Whether redirections are supported by the base class
-     * @param string|null $parentPrefix         The prefix of the parent collection used to optimize the code
-     *
-     * @return string PHP code
-     *
      * @throws \LogicException
      */
-    private function compileRoute(Route $route, $name, $supportsRedirections, $parentPrefix = null)
+    private function compileRoute(Route $route, string $name, bool $checkHost): string
     {
         $code = '';
         $compiledRoute = $route->compile();
         $conditions = array();
-        $hasTrailingSlash = false;
-        $matches = false;
-        $hostMatches = false;
-        $methods = $route->getMethods();
-
-        $supportsTrailingSlash = $supportsRedirections && (!$methods || in_array('GET', $methods));
-        $regex = $compiledRoute->getRegex();
-
-        if (!count($compiledRoute->getPathVariables()) && false !== preg_match('#^(.)\^(?P<url>.*?)\$\1#'.('u' === substr($regex, -1) ? 'u' : ''), $regex, $m)) {
-            if ($supportsTrailingSlash && '/' === substr($m['url'], -1)) {
-                $conditions[] = sprintf('%s === $trimmedPathinfo', var_export(rtrim(str_replace('\\', '', $m['url']), '/'), true));
-                $hasTrailingSlash = true;
-            } else {
-                $conditions[] = sprintf('%s === $pathinfo', var_export(str_replace('\\', '', $m['url']), true));
-            }
-        } else {
-            if ($compiledRoute->getStaticPrefix() && $compiledRoute->getStaticPrefix() !== $parentPrefix) {
-                $conditions[] = sprintf('0 === strpos($pathinfo, %s)', var_export($compiledRoute->getStaticPrefix(), true));
-            }
+        $matches = (bool) $compiledRoute->getPathVariables();
+        $hostMatches = (bool) $compiledRoute->getHostVariables();
+        $methods = array_flip($route->getMethods());
 
-            if ($supportsTrailingSlash && $pos = strpos($regex, '/$')) {
-                $regex = substr($regex, 0, $pos).'/?$'.substr($regex, $pos + 2);
-                $hasTrailingSlash = true;
-            }
-            $conditions[] = sprintf('preg_match(%s, $pathinfo, $matches)', var_export($regex, true));
-
-            $matches = true;
-        }
+        if ($route->getCondition()) {
+            $expression = $this->getExpressionLanguage()->compile($route->getCondition(), array('context', 'request'));
 
-        if ($compiledRoute->getHostVariables()) {
-            $hostMatches = true;
+            if (false !== strpos($expression, '$request')) {
+                $conditions[] = '($request = $request ?? $this->request ?: $this->createRequest($pathinfo))';
+            }
+            $conditions[] = $expression;
         }
 
-        if ($route->getCondition()) {
-            $conditions[] = $this->getExpressionLanguage()->compile($route->getCondition(), array('context', 'request'));
+        if (!$checkHost || !$compiledRoute->getHostRegex()) {
+            // no-op
+        } elseif ($hostMatches) {
+            $conditions[] = sprintf('preg_match(%s, $host, $hostMatches)', self::export($compiledRoute->getHostRegex()));
+        } else {
+            $conditions[] = sprintf('%s === $host', self::export($route->getHost()));
         }
 
         $conditions = implode(' && ', $conditions);
 
-        $code .= <<<EOF
+        if ($conditions) {
+            $code .= <<<EOF
         // $name
         if ($conditions) {
 
 EOF;
+        } else {
+            $code .= "            // {$name}\n";
+        }
 
         $gotoname = 'not_'.preg_replace('/[^A-Za-z0-9_]/', '', $name);
 
         // the offset where the return value is appended below, with indendation
-        $retOffset = 12 + strlen($code);
+        $retOffset = 12 + \strlen($code);
+        $defaults = $route->getDefaults();
+        if (isset($defaults['_canonical_route'])) {
+            $name = $defaults['_canonical_route'];
+            unset($defaults['_canonical_route']);
+        }
 
         // optimize parameters array
         if ($matches || $hostMatches) {
-            $vars = array();
-            if ($hostMatches) {
-                $vars[] = '$hostMatches';
-            }
-            if ($matches) {
+            $vars = array("array('_route' => '$name')");
+            if ($matches || ($hostMatches && !$checkHost)) {
                 $vars[] = '$matches';
             }
-            $vars[] = "array('_route' => '$name')";
+            if ($hostMatches && $checkHost) {
+                $vars[] = '$hostMatches';
+            }
 
             $code .= sprintf(
-                "            \$ret = \$this->mergeDefaults(array_replace(%s), %s);\n",
-                implode(', ', $vars),
-                str_replace("\n", '', var_export($route->getDefaults(), true))
+                "            \$ret = \$this->mergeDefaults(%s, %s);\n",
+                implode(' + ', $vars),
+                self::export($defaults)
             );
-        } elseif ($route->getDefaults()) {
-            $code .= sprintf("            \$ret = %s;\n", str_replace("\n", '', var_export(array_replace($route->getDefaults(), array('_route' => $name)), true)));
+        } elseif ($defaults) {
+            $code .= sprintf("            \$ret = %s;\n", self::export(array('_route' => $name) + $defaults));
         } else {
             $code .= sprintf("            \$ret = array('_route' => '%s');\n", $name);
         }
 
-        if ($hasTrailingSlash) {
-            $code .= <<<EOF
-            if ('/' === substr(\$pathinfo, -1)) {
-                // no-op
-            } elseif ('GET' !== \$canonicalMethod) {
-                goto $gotoname;
-            } else {
-                return array_replace(\$ret, \$this->redirect(\$rawPathinfo.'/', '$name'));
-            }
-
-
-EOF;
-        }
-
         if ($methods) {
-            $methodVariable = in_array('GET', $methods) ? '$canonicalMethod' : '$requestMethod';
-            $methods = implode("', '", $methods);
+            $methodVariable = isset($methods['GET']) ? '$canonicalMethod' : '$requestMethod';
+            $methods = self::export($methods);
         }
 
         if ($schemes = $route->getSchemes()) {
-            if (!$supportsRedirections) {
-                throw new \LogicException('The "schemes" requirement is only supported for URL matchers that implement RedirectableUrlMatcherInterface.');
-            }
-            $schemes = str_replace("\n", '', var_export(array_flip($schemes), true));
+            $schemes = self::export(array_flip($schemes));
             if ($methods) {
                 $code .= <<<EOF
             \$requiredSchemes = $schemes;
             \$hasRequiredScheme = isset(\$requiredSchemes[\$context->getScheme()]);
-            if (!in_array($methodVariable, array('$methods'))) {
+            if (!isset((\$a = {$methods})[{$methodVariable}])) {
                 if (\$hasRequiredScheme) {
-                    \$allow = array_merge(\$allow, array('$methods'));
+                    \$allow += \$a;
                 }
                 goto $gotoname;
             }
             if (!\$hasRequiredScheme) {
-                if ('GET' !== \$canonicalMethod) {
-                    goto $gotoname;
-                }
-
-                return array_replace(\$ret, \$this->redirect(\$rawPathinfo, '$name', key(\$requiredSchemes)));
+                \$allowSchemes += \$requiredSchemes;
+                goto $gotoname;
             }
 
 
@@ -351,11 +684,8 @@ EOF;
                 $code .= <<<EOF
             \$requiredSchemes = $schemes;
             if (!isset(\$requiredSchemes[\$context->getScheme()])) {
-                if ('GET' !== \$canonicalMethod) {
-                    goto $gotoname;
-                }
-
-                return array_replace(\$ret, \$this->redirect(\$rawPathinfo, '$name', key(\$requiredSchemes)));
+                \$allowSchemes += \$requiredSchemes;
+                goto $gotoname;
             }
 
 
@@ -363,8 +693,8 @@ EOF;
             }
         } elseif ($methods) {
             $code .= <<<EOF
-            if (!in_array($methodVariable, array('$methods'))) {
-                \$allow = array_merge(\$allow, array('$methods'));
+            if (!isset((\$a = {$methods})[{$methodVariable}])) {
+                \$allow += \$a;
                 goto $gotoname;
             }
 
@@ -372,47 +702,22 @@ EOF;
 EOF;
         }
 
-        if ($hasTrailingSlash || $schemes || $methods) {
+        if ($schemes || $methods) {
             $code .= "            return \$ret;\n";
         } else {
             $code = substr_replace($code, 'return', $retOffset, 6);
         }
-        $code .= "        }\n";
-
-        if ($hasTrailingSlash || $schemes || $methods) {
-            $code .= "        $gotoname:\n";
+        if ($conditions) {
+            $code .= "        }\n";
+        } elseif ($schemes || $methods) {
+            $code .= '    ';
         }
 
-        return $code;
-    }
-
-    /**
-     * Groups consecutive routes having the same host regex.
-     *
-     * The result is a collection of collections of routes having the same host regex.
-     *
-     * @param RouteCollection $routes A flat RouteCollection
-     *
-     * @return DumperCollection A collection with routes grouped by host regex in sub-collections
-     */
-    private function groupRoutesByHostRegex(RouteCollection $routes)
-    {
-        $groups = new DumperCollection();
-        $currentGroup = new DumperCollection();
-        $currentGroup->setAttribute('host_regex', null);
-        $groups->add($currentGroup);
-
-        foreach ($routes as $name => $route) {
-            $hostRegex = $route->compile()->getHostRegex();
-            if ($currentGroup->getAttribute('host_regex') !== $hostRegex) {
-                $currentGroup = new DumperCollection();
-                $currentGroup->setAttribute('host_regex', $hostRegex);
-                $groups->add($currentGroup);
-            }
-            $currentGroup->add(new DumperRoute($name, $route));
+        if ($schemes || $methods) {
+            $code .= "        $gotoname:\n";
         }
 
-        return $groups;
+        return $conditions ? $this->indent($code) : $code;
     }
 
     private function getExpressionLanguage()
@@ -426,4 +731,48 @@ EOF;
 
         return $this->expressionLanguage;
     }
+
+    private function indent($code, $level = 1)
+    {
+        return preg_replace('/^./m', str_repeat('    ', $level).'$0', $code);
+    }
+
+    /**
+     * @internal
+     */
+    public static function export($value): string
+    {
+        if (null === $value) {
+            return 'null';
+        }
+        if (!\is_array($value)) {
+            if (\is_object($value)) {
+                throw new \InvalidArgumentException('Symfony\Component\Routing\Route cannot contain objects.');
+            }
+
+            return str_replace("\n", '\'."\n".\'', var_export($value, true));
+        }
+        if (!$value) {
+            return 'array()';
+        }
+
+        $i = 0;
+        $export = 'array(';
+
+        foreach ($value as $k => $v) {
+            if ($i === $k) {
+                ++$i;
+            } else {
+                $export .= self::export($k).' => ';
+
+                if (\is_int($k) && $i < $k) {
+                    $i = 1 + $k;
+                }
+            }
+
+            $export .= self::export($v).', ';
+        }
+
+        return substr_replace($export, ')', -2);
+    }
 }
diff --git a/vendor/symfony/routing/Matcher/Dumper/StaticPrefixCollection.php b/vendor/symfony/routing/Matcher/Dumper/StaticPrefixCollection.php
index 73658086..4eea8593 100644
--- a/vendor/symfony/routing/Matcher/Dumper/StaticPrefixCollection.php
+++ b/vendor/symfony/routing/Matcher/Dumper/StaticPrefixCollection.php
@@ -11,44 +11,49 @@
 
 namespace Symfony\Component\Routing\Matcher\Dumper;
 
+use Symfony\Component\Routing\RouteCollection;
+
 /**
  * Prefix tree of routes preserving routes order.
  *
  * @author Frank de Jonge <info@frankdejonge.nl>
+ * @author Nicolas Grekas <p@tchwork.com>
  *
  * @internal
  */
 class StaticPrefixCollection
 {
+    private $prefix;
+
     /**
-     * @var string
+     * @var string[]
      */
-    private $prefix;
+    private $staticPrefixes = array();
 
     /**
-     * @var array[]|StaticPrefixCollection[]
+     * @var string[]
      */
-    private $items = array();
+    private $prefixes = array();
 
     /**
-     * @var int
+     * @var array[]|self[]
      */
-    private $matchStart = 0;
+    private $items = array();
 
-    public function __construct($prefix = '')
+    public function __construct(string $prefix = '/')
     {
         $this->prefix = $prefix;
     }
 
-    public function getPrefix()
+    public function getPrefix(): string
     {
         return $this->prefix;
     }
 
     /**
-     * @return mixed[]|StaticPrefixCollection[]
+     * @return array[]|self[]
      */
-    public function getItems()
+    public function getRoutes(): array
     {
         return $this->items;
     }
@@ -56,183 +61,142 @@ class StaticPrefixCollection
     /**
      * Adds a route to a group.
      *
-     * @param string $prefix
-     * @param mixed  $route
+     * @param array|self $route
      */
-    public function addRoute($prefix, $route)
+    public function addRoute(string $prefix, $route)
     {
-        $prefix = '/' === $prefix ? $prefix : rtrim($prefix, '/');
-        $this->guardAgainstAddingNotAcceptedRoutes($prefix);
+        list($prefix, $staticPrefix) = $this->getCommonPrefix($prefix, $prefix);
 
-        if ($this->prefix === $prefix) {
-            // When a prefix is exactly the same as the base we move up the match start position.
-            // This is needed because otherwise routes that come afterwards have higher precedence
-            // than a possible regular expression, which goes against the input order sorting.
-            $this->items[] = array($prefix, $route);
-            $this->matchStart = count($this->items);
+        for ($i = \count($this->items) - 1; 0 <= $i; --$i) {
+            $item = $this->items[$i];
 
-            return;
-        }
+            list($commonPrefix, $commonStaticPrefix) = $this->getCommonPrefix($prefix, $this->prefixes[$i]);
 
-        foreach ($this->items as $i => $item) {
-            if ($i < $this->matchStart) {
-                continue;
-            }
+            if ($this->prefix === $commonPrefix) {
+                // the new route and a previous one have no common prefix, let's see if they are exclusive to each others
 
-            if ($item instanceof self && $item->accepts($prefix)) {
-                $item->addRoute($prefix, $route);
+                if ($this->prefix !== $staticPrefix && $this->prefix !== $this->staticPrefixes[$i]) {
+                    // the new route and the previous one have exclusive static prefixes
+                    continue;
+                }
 
-                return;
-            }
+                if ($this->prefix === $staticPrefix && $this->prefix === $this->staticPrefixes[$i]) {
+                    // the new route and the previous one have no static prefix
+                    break;
+                }
 
-            $group = $this->groupWithItem($item, $prefix, $route);
+                if ($this->prefixes[$i] !== $this->staticPrefixes[$i] && $this->prefix === $this->staticPrefixes[$i]) {
+                    // the previous route is non-static and has no static prefix
+                    break;
+                }
 
-            if ($group instanceof self) {
-                $this->items[$i] = $group;
+                if ($prefix !== $staticPrefix && $this->prefix === $staticPrefix) {
+                    // the new route is non-static and has no static prefix
+                    break;
+                }
 
-                return;
+                continue;
             }
-        }
 
-        // No optimised case was found, in this case we simple add the route for possible
-        // grouping when new routes are added.
-        $this->items[] = array($prefix, $route);
-    }
-
-    /**
-     * Tries to combine a route with another route or group.
-     *
-     * @param StaticPrefixCollection|array $item
-     * @param string                       $prefix
-     * @param mixed                        $route
-     *
-     * @return null|StaticPrefixCollection
-     */
-    private function groupWithItem($item, $prefix, $route)
-    {
-        $itemPrefix = $item instanceof self ? $item->prefix : $item[0];
-        $commonPrefix = $this->detectCommonPrefix($prefix, $itemPrefix);
+            if ($item instanceof self && $this->prefixes[$i] === $commonPrefix) {
+                // the new route is a child of a previous one, let's nest it
+                $item->addRoute($prefix, $route);
+            } else {
+                // the new route and a previous one have a common prefix, let's merge them
+                $child = new self($commonPrefix);
+                list($child->prefixes[0], $child->staticPrefixes[0]) = $child->getCommonPrefix($this->prefixes[$i], $this->prefixes[$i]);
+                list($child->prefixes[1], $child->staticPrefixes[1]) = $child->getCommonPrefix($prefix, $prefix);
+                $child->items = array($this->items[$i], $route);
+
+                $this->staticPrefixes[$i] = $commonStaticPrefix;
+                $this->prefixes[$i] = $commonPrefix;
+                $this->items[$i] = $child;
+            }
 
-        if (!$commonPrefix) {
             return;
         }
 
-        $child = new self($commonPrefix);
-
-        if ($item instanceof self) {
-            $child->items = array($item);
-        } else {
-            $child->addRoute($item[0], $item[1]);
-        }
-
-        $child->addRoute($prefix, $route);
-
-        return $child;
-    }
-
-    /**
-     * Checks whether a prefix can be contained within the group.
-     *
-     * @param string $prefix
-     *
-     * @return bool Whether a prefix could belong in a given group
-     */
-    private function accepts($prefix)
-    {
-        return '' === $this->prefix || 0 === strpos($prefix, $this->prefix);
+        // No optimised case was found, in this case we simple add the route for possible
+        // grouping when new routes are added.
+        $this->staticPrefixes[] = $staticPrefix;
+        $this->prefixes[] = $prefix;
+        $this->items[] = $route;
     }
 
     /**
-     * Detects whether there's a common prefix relative to the group prefix and returns it.
-     *
-     * @param string $prefix
-     * @param string $anotherPrefix
-     *
-     * @return false|string A common prefix, longer than the base/group prefix, or false when none available
+     * Linearizes back a set of nested routes into a collection.
      */
-    private function detectCommonPrefix($prefix, $anotherPrefix)
+    public function populateCollection(RouteCollection $routes): RouteCollection
     {
-        $baseLength = strlen($this->prefix);
-        $commonLength = $baseLength;
-        $end = min(strlen($prefix), strlen($anotherPrefix));
-
-        for ($i = $baseLength; $i <= $end; ++$i) {
-            if (substr($prefix, 0, $i) !== substr($anotherPrefix, 0, $i)) {
-                break;
+        foreach ($this->items as $route) {
+            if ($route instanceof self) {
+                $route->populateCollection($routes);
+            } else {
+                $routes->add(...$route);
             }
-
-            $commonLength = $i;
         }
 
-        $commonPrefix = rtrim(substr($prefix, 0, $commonLength), '/');
-
-        if (strlen($commonPrefix) > $baseLength) {
-            return $commonPrefix;
-        }
-
-        return false;
+        return $routes;
     }
 
     /**
-     * Optimizes the tree by inlining items from groups with less than 3 items.
+     * Gets the full and static common prefixes between two route patterns.
+     *
+     * The static prefix stops at last at the first opening bracket.
      */
-    public function optimizeGroups()
+    private function getCommonPrefix(string $prefix, string $anotherPrefix): array
     {
-        $index = -1;
-
-        while (isset($this->items[++$index])) {
-            $item = $this->items[$index];
-
-            if ($item instanceof self) {
-                $item->optimizeGroups();
-
-                // When a group contains only two items there's no reason to optimize because at minimum
-                // the amount of prefix check is 2. In this case inline the group.
-                if ($item->shouldBeInlined()) {
-                    array_splice($this->items, $index, 1, $item->items);
-
-                    // Lower index to pass through the same index again after optimizing.
-                    // The first item of the replacements might be a group needing optimization.
-                    --$index;
+        $baseLength = \strlen($this->prefix);
+        $end = min(\strlen($prefix), \strlen($anotherPrefix));
+        $staticLength = null;
+        set_error_handler(array(__CLASS__, 'handleError'));
+
+        for ($i = $baseLength; $i < $end && $prefix[$i] === $anotherPrefix[$i]; ++$i) {
+            if ('(' === $prefix[$i]) {
+                $staticLength = $staticLength ?? $i;
+                for ($j = 1 + $i, $n = 1; $j < $end && 0 < $n; ++$j) {
+                    if ($prefix[$j] !== $anotherPrefix[$j]) {
+                        break 2;
+                    }
+                    if ('(' === $prefix[$j]) {
+                        ++$n;
+                    } elseif (')' === $prefix[$j]) {
+                        --$n;
+                    } elseif ('\\' === $prefix[$j] && (++$j === $end || $prefix[$j] !== $anotherPrefix[$j])) {
+                        --$j;
+                        break;
+                    }
                 }
+                if (0 < $n) {
+                    break;
+                }
+                if (('?' === ($prefix[$j] ?? '') || '?' === ($anotherPrefix[$j] ?? '')) && ($prefix[$j] ?? '') !== ($anotherPrefix[$j] ?? '')) {
+                    break;
+                }
+                $subPattern = substr($prefix, $i, $j - $i);
+                if ($prefix !== $anotherPrefix && !preg_match('/^\(\[[^\]]++\]\+\+\)$/', $subPattern) && !preg_match('{(?<!'.$subPattern.')}', '')) {
+                    // sub-patterns of variable length are not considered as common prefixes because their greediness would break in-order matching
+                    break;
+                }
+                $i = $j - 1;
+            } elseif ('\\' === $prefix[$i] && (++$i === $end || $prefix[$i] !== $anotherPrefix[$i])) {
+                --$i;
+                break;
             }
         }
-    }
-
-    private function shouldBeInlined()
-    {
-        if (count($this->items) >= 3) {
-            return false;
-        }
-
-        foreach ($this->items as $item) {
-            if ($item instanceof self) {
-                return true;
-            }
-        }
-
-        foreach ($this->items as $item) {
-            if (is_array($item) && $item[0] === $this->prefix) {
-                return false;
-            }
+        restore_error_handler();
+        if ($i < $end && 0b10 === (\ord($prefix[$i]) >> 6) && preg_match('//u', $prefix.' '.$anotherPrefix)) {
+            do {
+                // Prevent cutting in the middle of an UTF-8 characters
+                --$i;
+            } while (0b10 === (\ord($prefix[$i]) >> 6));
         }
 
-        return true;
+        return array(substr($prefix, 0, $i), substr($prefix, 0, $staticLength ?? $i));
     }
 
-    /**
-     * Guards against adding incompatible prefixes in a group.
-     *
-     * @param string $prefix
-     *
-     * @throws \LogicException when a prefix does not belong in a group
-     */
-    private function guardAgainstAddingNotAcceptedRoutes($prefix)
+    public static function handleError($type, $msg)
     {
-        if (!$this->accepts($prefix)) {
-            $message = sprintf('Could not add route with prefix %s to collection with prefix %s', $prefix, $this->prefix);
-
-            throw new \LogicException($message);
-        }
+        return 0 === strpos($msg, 'preg_match(): Compilation failed: lookbehind assertion is not fixed length');
     }
 }
diff --git a/vendor/symfony/routing/Matcher/RedirectableUrlMatcher.php b/vendor/symfony/routing/Matcher/RedirectableUrlMatcher.php
index 3770a9c2..e60552f1 100644
--- a/vendor/symfony/routing/Matcher/RedirectableUrlMatcher.php
+++ b/vendor/symfony/routing/Matcher/RedirectableUrlMatcher.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Routing\Matcher;
 
+use Symfony\Component\Routing\Exception\ExceptionInterface;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-use Symfony\Component\Routing\Route;
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
@@ -25,41 +25,40 @@ abstract class RedirectableUrlMatcher extends UrlMatcher implements Redirectable
     public function match($pathinfo)
     {
         try {
-            $parameters = parent::match($pathinfo);
+            return parent::match($pathinfo);
         } catch (ResourceNotFoundException $e) {
-            if ('/' === substr($pathinfo, -1) || !in_array($this->context->getMethod(), array('HEAD', 'GET'))) {
+            if (!\in_array($this->context->getMethod(), array('HEAD', 'GET'), true)) {
                 throw $e;
             }
 
-            try {
-                $parameters = parent::match($pathinfo.'/');
+            if ($this->allowSchemes) {
+                redirect_scheme:
+                $scheme = $this->context->getScheme();
+                $this->context->setScheme(current($this->allowSchemes));
+                try {
+                    $ret = parent::match($pathinfo);
 
-                return array_replace($parameters, $this->redirect($pathinfo.'/', isset($parameters['_route']) ? $parameters['_route'] : null));
-            } catch (ResourceNotFoundException $e2) {
+                    return $this->redirect($pathinfo, $ret['_route'] ?? null, $this->context->getScheme()) + $ret;
+                } catch (ExceptionInterface $e2) {
+                    throw $e;
+                } finally {
+                    $this->context->setScheme($scheme);
+                }
+            } elseif ('/' === $pathinfo) {
                 throw $e;
-            }
-        }
-
-        return $parameters;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function handleRouteRequirements($pathinfo, $name, Route $route)
-    {
-        // expression condition
-        if ($route->getCondition() && !$this->getExpressionLanguage()->evaluate($route->getCondition(), array('context' => $this->context, 'request' => $this->request ?: $this->createRequest($pathinfo)))) {
-            return array(self::REQUIREMENT_MISMATCH, null);
-        }
+            } else {
+                try {
+                    $pathinfo = '/' !== $pathinfo[-1] ? $pathinfo.'/' : substr($pathinfo, 0, -1);
+                    $ret = parent::match($pathinfo);
 
-        // check HTTP scheme requirement
-        $scheme = $this->context->getScheme();
-        $schemes = $route->getSchemes();
-        if ($schemes && !$route->hasScheme($scheme)) {
-            return array(self::ROUTE_MATCH, $this->redirect($pathinfo, $name, current($schemes)));
+                    return $this->redirect($pathinfo, $ret['_route'] ?? null) + $ret;
+                } catch (ExceptionInterface $e2) {
+                    if ($this->allowSchemes) {
+                        goto redirect_scheme;
+                    }
+                    throw $e;
+                }
+            }
         }
-
-        return array(self::REQUIREMENT_MATCH, null);
     }
 }
diff --git a/vendor/symfony/routing/Matcher/RequestMatcherInterface.php b/vendor/symfony/routing/Matcher/RequestMatcherInterface.php
index 1eef778a..0c193ff2 100644
--- a/vendor/symfony/routing/Matcher/RequestMatcherInterface.php
+++ b/vendor/symfony/routing/Matcher/RequestMatcherInterface.php
@@ -12,9 +12,9 @@
 namespace Symfony\Component\Routing\Matcher;
 
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\Exception\NoConfigurationException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 
 /**
  * RequestMatcherInterface is the interface that all request matcher classes must implement.
diff --git a/vendor/symfony/routing/Matcher/TraceableUrlMatcher.php b/vendor/symfony/routing/Matcher/TraceableUrlMatcher.php
index 9085be04..61cad8e6 100644
--- a/vendor/symfony/routing/Matcher/TraceableUrlMatcher.php
+++ b/vendor/symfony/routing/Matcher/TraceableUrlMatcher.php
@@ -69,7 +69,7 @@ class TraceableUrlMatcher extends UrlMatcher
                     $r = new Route($route->getPath(), $route->getDefaults(), array($n => $regex), $route->getOptions());
                     $cr = $r->compile();
 
-                    if (in_array($n, $cr->getVariables()) && !preg_match($cr->getRegex(), $pathinfo)) {
+                    if (\in_array($n, $cr->getVariables()) && !preg_match($cr->getRegex(), $pathinfo)) {
                         $this->addTrace(sprintf('Requirement for "%s" does not match (%s)', $n, $regex), self::ROUTE_ALMOST_MATCHES, $name, $route);
 
                         continue 2;
@@ -94,7 +94,7 @@ class TraceableUrlMatcher extends UrlMatcher
                     $method = 'GET';
                 }
 
-                if (!in_array($method, $requiredMethods)) {
+                if (!\in_array($method, $requiredMethods)) {
                     $this->allow = array_merge($this->allow, $requiredMethods);
 
                     $this->addTrace(sprintf('Method "%s" does not match any of the required methods (%s)', $this->context->getMethod(), implode(', ', $requiredMethods)), self::ROUTE_ALMOST_MATCHES, $name, $route);
diff --git a/vendor/symfony/routing/Matcher/UrlMatcher.php b/vendor/symfony/routing/Matcher/UrlMatcher.php
index 445cfc4e..095e6dc2 100644
--- a/vendor/symfony/routing/Matcher/UrlMatcher.php
+++ b/vendor/symfony/routing/Matcher/UrlMatcher.php
@@ -11,15 +11,15 @@
 
 namespace Symfony\Component\Routing\Matcher;
 
+use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
+use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\Exception\NoConfigurationException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\Route;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
-use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
+use Symfony\Component\Routing\RouteCollection;
 
 /**
  * UrlMatcher matches URL based on a set of routes.
@@ -33,7 +33,19 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
     const ROUTE_MATCH = 2;
 
     protected $context;
+
+    /**
+     * Collects HTTP methods that would be allowed for the request.
+     */
     protected $allow = array();
+
+    /**
+     * Collects URI schemes that would be allowed for the request.
+     *
+     * @internal
+     */
+    protected $allowSchemes = array();
+
     protected $routes;
     protected $request;
     protected $expressionLanguage;
@@ -70,7 +82,7 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
      */
     public function match($pathinfo)
     {
-        $this->allow = array();
+        $this->allow = $this->allowSchemes = array();
 
         if ($ret = $this->matchCollection(rawurldecode($pathinfo), $this->routes)) {
             return $ret;
@@ -80,7 +92,7 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
             throw new NoConfigurationException();
         }
 
-        throw 0 < count($this->allow)
+        throw 0 < \count($this->allow)
             ? new MethodNotAllowedException(array_unique($this->allow))
             : new ResourceNotFoundException(sprintf('No routes found for "%s".', $pathinfo));
     }
@@ -141,15 +153,15 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
                 continue;
             }
 
-            // check HTTP method requirement
+            $hasRequiredScheme = !$route->getSchemes() || $route->hasScheme($this->context->getScheme());
             if ($requiredMethods = $route->getMethods()) {
                 // HEAD and GET are equivalent as per RFC
                 if ('HEAD' === $method = $this->context->getMethod()) {
                     $method = 'GET';
                 }
 
-                if (!in_array($method, $requiredMethods)) {
-                    if (self::REQUIREMENT_MATCH === $status[0]) {
+                if (!\in_array($method, $requiredMethods)) {
+                    if ($hasRequiredScheme) {
                         $this->allow = array_merge($this->allow, $requiredMethods);
                     }
 
@@ -157,6 +169,12 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
                 }
             }
 
+            if (!$hasRequiredScheme) {
+                $this->allowSchemes = array_merge($this->allowSchemes, $route->getSchemes());
+
+                continue;
+            }
+
             return $this->getAttributes($route, $name, array_replace($matches, $hostMatches, isset($status[1]) ? $status[1] : array()));
         }
     }
@@ -176,9 +194,14 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
      */
     protected function getAttributes(Route $route, $name, array $attributes)
     {
+        $defaults = $route->getDefaults();
+        if (isset($defaults['_canonical_route'])) {
+            $name = $defaults['_canonical_route'];
+            unset($defaults['_canonical_route']);
+        }
         $attributes['_route'] = $name;
 
-        return $this->mergeDefaults($attributes, $route->getDefaults());
+        return $this->mergeDefaults($attributes, $defaults);
     }
 
     /**
@@ -197,11 +220,7 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
             return array(self::REQUIREMENT_MISMATCH, null);
         }
 
-        // check HTTP scheme requirement
-        $scheme = $this->context->getScheme();
-        $status = $route->getSchemes() && !$route->hasScheme($scheme) ? self::REQUIREMENT_MISMATCH : self::REQUIREMENT_MATCH;
-
-        return array($status, null);
+        return array(self::REQUIREMENT_MATCH, null);
     }
 
     /**
@@ -215,7 +234,7 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
     protected function mergeDefaults($params, $defaults)
     {
         foreach ($params as $key => $value) {
-            if (!is_int($key)) {
+            if (!\is_int($key) && null !== $value) {
                 $defaults[$key] = $value;
             }
         }
diff --git a/vendor/symfony/routing/Matcher/UrlMatcherInterface.php b/vendor/symfony/routing/Matcher/UrlMatcherInterface.php
index 2c7c3135..17f1f97b 100644
--- a/vendor/symfony/routing/Matcher/UrlMatcherInterface.php
+++ b/vendor/symfony/routing/Matcher/UrlMatcherInterface.php
@@ -11,10 +11,10 @@
 
 namespace Symfony\Component\Routing\Matcher;
 
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\Exception\NoConfigurationException;
-use Symfony\Component\Routing\RequestContextAwareInterface;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\RequestContextAwareInterface;
 
 /**
  * UrlMatcherInterface is the interface that all URL matcher classes must implement.
diff --git a/vendor/symfony/routing/RequestContext.php b/vendor/symfony/routing/RequestContext.php
index d62a7766..0a68fe08 100644
--- a/vendor/symfony/routing/RequestContext.php
+++ b/vendor/symfony/routing/RequestContext.php
@@ -33,17 +33,7 @@ class RequestContext
     private $queryString;
     private $parameters = array();
 
-    /**
-     * @param string $baseUrl     The base URL
-     * @param string $method      The HTTP method
-     * @param string $host        The HTTP host name
-     * @param string $scheme      The HTTP scheme
-     * @param int    $httpPort    The HTTP port
-     * @param int    $httpsPort   The HTTPS port
-     * @param string $path        The path
-     * @param string $queryString The query string
-     */
-    public function __construct($baseUrl = '', $method = 'GET', $host = 'localhost', $scheme = 'http', $httpPort = 80, $httpsPort = 443, $path = '/', $queryString = '')
+    public function __construct(string $baseUrl = '', string $method = 'GET', string $host = 'localhost', string $scheme = 'http', int $httpPort = 80, int $httpsPort = 443, string $path = '/', string $queryString = '')
     {
         $this->setBaseUrl($baseUrl);
         $this->setMethod($method);
diff --git a/vendor/symfony/routing/Route.php b/vendor/symfony/routing/Route.php
index cd50ac82..46724dbd 100644
--- a/vendor/symfony/routing/Route.php
+++ b/vendor/symfony/routing/Route.php
@@ -29,7 +29,7 @@ class Route implements \Serializable
     private $condition = '';
 
     /**
-     * @var null|CompiledRoute
+     * @var CompiledRoute|null
      */
     private $compiled;
 
@@ -50,11 +50,11 @@ class Route implements \Serializable
      * @param string|string[] $methods      A required HTTP method or an array of restricted methods
      * @param string          $condition    A condition that should evaluate to true for the route to match
      */
-    public function __construct($path, array $defaults = array(), array $requirements = array(), array $options = array(), $host = '', $schemes = array(), $methods = array(), $condition = '')
+    public function __construct(string $path, array $defaults = array(), array $requirements = array(), array $options = array(), ?string $host = '', $schemes = array(), $methods = array(), ?string $condition = '')
     {
         $this->setPath($path);
-        $this->setDefaults($defaults);
-        $this->setRequirements($requirements);
+        $this->addDefaults($defaults);
+        $this->addRequirements($requirements);
         $this->setOptions($options);
         $this->setHost($host);
         $this->setSchemes($schemes);
@@ -123,6 +123,19 @@ class Route implements \Serializable
      */
     public function setPath($pattern)
     {
+        if (false !== strpbrk($pattern, '?<')) {
+            $pattern = preg_replace_callback('#\{(\w++)(<.*?>)?(\?[^\}]*+)?\}#', function ($m) {
+                if (isset($m[3][0])) {
+                    $this->setDefault($m[1], '?' !== $m[3] ? substr($m[3], 1) : null);
+                }
+                if (isset($m[2][0])) {
+                    $this->setRequirement($m[1], substr($m[2], 1, -1));
+                }
+
+                return '{'.$m[1].'}';
+            }, $pattern);
+        }
+
         // A pattern must start with a slash and must not have multiple slashes at the beginning because the
         // generated path for this route would be confused with a network path, e.g. '//domain.com/path'.
         $this->path = '/'.ltrim(trim($pattern), '/');
@@ -196,7 +209,7 @@ class Route implements \Serializable
      */
     public function hasScheme($scheme)
     {
-        return in_array(strtolower($scheme), $this->schemes, true);
+        return \in_array(strtolower($scheme), $this->schemes, true);
     }
 
     /**
@@ -537,7 +550,7 @@ class Route implements \Serializable
 
     private function sanitizeRequirement($key, $regex)
     {
-        if (!is_string($regex)) {
+        if (!\is_string($regex)) {
             throw new \InvalidArgumentException(sprintf('Routing requirement for "%s" must be a string.', $key));
         }
 
diff --git a/vendor/symfony/routing/RouteCollection.php b/vendor/symfony/routing/RouteCollection.php
index e22cbc5f..4525404d 100644
--- a/vendor/symfony/routing/RouteCollection.php
+++ b/vendor/symfony/routing/RouteCollection.php
@@ -63,7 +63,7 @@ class RouteCollection implements \IteratorAggregate, \Countable
      */
     public function count()
     {
-        return count($this->routes);
+        return \count($this->routes);
     }
 
     /**
@@ -153,6 +153,23 @@ class RouteCollection implements \IteratorAggregate, \Countable
         }
     }
 
+    /**
+     * Adds a prefix to the name of all the routes within in the collection.
+     */
+    public function addNamePrefix(string $prefix)
+    {
+        $prefixedRoutes = array();
+
+        foreach ($this->routes as $name => $route) {
+            $prefixedRoutes[$prefix.$name] = $route;
+            if (null !== $name = $route->getDefault('_canonical_route')) {
+                $route->setDefault('_canonical_route', $prefix.$name);
+            }
+        }
+
+        $this->routes = $prefixedRoutes;
+    }
+
     /**
      * Sets the host pattern on all routes.
      *
diff --git a/vendor/symfony/routing/RouteCollectionBuilder.php b/vendor/symfony/routing/RouteCollectionBuilder.php
index 3aec1469..eb42887f 100644
--- a/vendor/symfony/routing/RouteCollectionBuilder.php
+++ b/vendor/symfony/routing/RouteCollectionBuilder.php
@@ -46,7 +46,7 @@ class RouteCollectionBuilder
     /**
      * Import an external routing resource and returns the RouteCollectionBuilder.
      *
-     *  $routes->import('blog.yml', '/blog');
+     *     $routes->import('blog.yml', '/blog');
      *
      * @param mixed       $resource
      * @param string|null $prefix
@@ -58,7 +58,7 @@ class RouteCollectionBuilder
      */
     public function import($resource, $prefix = '/', $type = null)
     {
-        /** @var RouteCollection[] $collection */
+        /** @var RouteCollection[] $collections */
         $collections = $this->load($resource, $type);
 
         // create a builder from the RouteCollection
@@ -253,7 +253,7 @@ class RouteCollectionBuilder
      *
      * @return $this
      */
-    private function addResource(ResourceInterface $resource)
+    private function addResource(ResourceInterface $resource): self
     {
         $this->resources[] = $resource;
 
@@ -324,10 +324,8 @@ class RouteCollectionBuilder
 
     /**
      * Generates a route name based on details of this route.
-     *
-     * @return string
      */
-    private function generateRouteName(Route $route)
+    private function generateRouteName(Route $route): string
     {
         $methods = implode('_', $route->getMethods()).'_';
 
@@ -351,7 +349,7 @@ class RouteCollectionBuilder
      *
      * @throws FileLoaderLoadException If no loader is found
      */
-    private function load($resource, $type = null)
+    private function load($resource, string $type = null): array
     {
         if (null === $this->loader) {
             throw new \BadMethodCallException('Cannot import other routing resources: you must pass a LoaderInterface when constructing RouteCollectionBuilder.');
@@ -360,7 +358,7 @@ class RouteCollectionBuilder
         if ($this->loader->supports($resource, $type)) {
             $collections = $this->loader->load($resource, $type);
 
-            return is_array($collections) ? $collections : array($collections);
+            return \is_array($collections) ? $collections : array($collections);
         }
 
         if (null === $resolver = $this->loader->getResolver()) {
@@ -373,6 +371,6 @@ class RouteCollectionBuilder
 
         $collections = $loader->load($resource, $type);
 
-        return is_array($collections) ? $collections : array($collections);
+        return \is_array($collections) ? $collections : array($collections);
     }
 }
diff --git a/vendor/symfony/routing/RouteCompiler.php b/vendor/symfony/routing/RouteCompiler.php
index dc4e4f80..66b291b8 100644
--- a/vendor/symfony/routing/RouteCompiler.php
+++ b/vendor/symfony/routing/RouteCompiler.php
@@ -103,8 +103,7 @@ class RouteCompiler implements RouteCompilerInterface
         $needsUtf8 = $route->getOption('utf8');
 
         if (!$needsUtf8 && $useUtf8 && preg_match('/[\x80-\xFF]/', $pattern)) {
-            $needsUtf8 = true;
-            @trigger_error(sprintf('Using UTF-8 route patterns without setting the "utf8" option is deprecated since Symfony 3.2 and will throw a LogicException in 4.0. Turn on the "utf8" route option for pattern "%s".', $pattern), E_USER_DEPRECATED);
+            throw new \LogicException(sprintf('Cannot use UTF-8 route patterns without setting the "utf8" option for route "%s".', $route->getPath()));
         }
         if (!$useUtf8 && $needsUtf8) {
             throw new \LogicException(sprintf('Cannot mix UTF-8 requirements with non-UTF-8 pattern "%s".', $pattern));
@@ -117,9 +116,9 @@ class RouteCompiler implements RouteCompilerInterface
             $varName = substr($match[0][0], 1, -1);
             // get all static text preceding the current variable
             $precedingText = substr($pattern, $pos, $match[0][1] - $pos);
-            $pos = $match[0][1] + strlen($match[0][0]);
+            $pos = $match[0][1] + \strlen($match[0][0]);
 
-            if (!strlen($precedingText)) {
+            if (!\strlen($precedingText)) {
                 $precedingChar = '';
             } elseif ($useUtf8) {
                 preg_match('/.$/u', $precedingText, $precedingChar);
@@ -134,17 +133,17 @@ class RouteCompiler implements RouteCompilerInterface
             if (preg_match('/^\d/', $varName)) {
                 throw new \DomainException(sprintf('Variable name "%s" cannot start with a digit in route pattern "%s". Please use a different name.', $varName, $pattern));
             }
-            if (in_array($varName, $variables)) {
+            if (\in_array($varName, $variables)) {
                 throw new \LogicException(sprintf('Route pattern "%s" cannot reference variable name "%s" more than once.', $pattern, $varName));
             }
 
-            if (strlen($varName) > self::VARIABLE_MAXIMUM_LENGTH) {
+            if (\strlen($varName) > self::VARIABLE_MAXIMUM_LENGTH) {
                 throw new \DomainException(sprintf('Variable name "%s" cannot be longer than %s characters in route pattern "%s". Please use a shorter name.', $varName, self::VARIABLE_MAXIMUM_LENGTH, $pattern));
             }
 
             if ($isSeparator && $precedingText !== $precedingChar) {
-                $tokens[] = array('text', substr($precedingText, 0, -strlen($precedingChar)));
-            } elseif (!$isSeparator && strlen($precedingText) > 0) {
+                $tokens[] = array('text', substr($precedingText, 0, -\strlen($precedingChar)));
+            } elseif (!$isSeparator && \strlen($precedingText) > 0) {
                 $tokens[] = array('text', $precedingText);
             }
 
@@ -176,26 +175,26 @@ class RouteCompiler implements RouteCompilerInterface
                 if (!preg_match('//u', $regexp)) {
                     $useUtf8 = false;
                 } elseif (!$needsUtf8 && preg_match('/[\x80-\xFF]|(?<!\\\\)\\\\(?:\\\\\\\\)*+(?-i:X|[pP][\{CLMNPSZ]|x\{[A-Fa-f0-9]{3})/', $regexp)) {
-                    $needsUtf8 = true;
-                    @trigger_error(sprintf('Using UTF-8 route requirements without setting the "utf8" option is deprecated since Symfony 3.2 and will throw a LogicException in 4.0. Turn on the "utf8" route option for variable "%s" in pattern "%s".', $varName, $pattern), E_USER_DEPRECATED);
+                    throw new \LogicException(sprintf('Cannot use UTF-8 route requirements without setting the "utf8" option for variable "%s" in pattern "%s".', $varName, $pattern));
                 }
                 if (!$useUtf8 && $needsUtf8) {
                     throw new \LogicException(sprintf('Cannot mix UTF-8 requirement with non-UTF-8 charset for variable "%s" in pattern "%s".', $varName, $pattern));
                 }
+                $regexp = self::transformCapturingGroupsToNonCapturings($regexp);
             }
 
             $tokens[] = array('variable', $isSeparator ? $precedingChar : '', $regexp, $varName);
             $variables[] = $varName;
         }
 
-        if ($pos < strlen($pattern)) {
+        if ($pos < \strlen($pattern)) {
             $tokens[] = array('text', substr($pattern, $pos));
         }
 
         // find the first optional token
         $firstOptional = PHP_INT_MAX;
         if (!$isHost) {
-            for ($i = count($tokens) - 1; $i >= 0; --$i) {
+            for ($i = \count($tokens) - 1; $i >= 0; --$i) {
                 $token = $tokens[$i];
                 if ('variable' === $token[0] && $route->hasDefault($token[3])) {
                     $firstOptional = $i;
@@ -207,7 +206,7 @@ class RouteCompiler implements RouteCompilerInterface
 
         // compute the matching regexp
         $regexp = '';
-        for ($i = 0, $nbToken = count($tokens); $i < $nbToken; ++$i) {
+        for ($i = 0, $nbToken = \count($tokens); $i < $nbToken; ++$i) {
             $regexp .= self::computeRegexp($tokens, $i, $firstOptional);
         }
         $regexp = self::REGEX_DELIMITER.'^'.$regexp.'$'.self::REGEX_DELIMITER.'sD'.($isHost ? 'i' : '');
@@ -215,7 +214,7 @@ class RouteCompiler implements RouteCompilerInterface
         // enable Utf8 matching if really required
         if ($needsUtf8) {
             $regexp .= 'u';
-            for ($i = 0, $nbToken = count($tokens); $i < $nbToken; ++$i) {
+            for ($i = 0, $nbToken = \count($tokens); $i < $nbToken; ++$i) {
                 if ('variable' === $tokens[$i][0]) {
                     $tokens[$i][] = true;
                 }
@@ -232,10 +231,8 @@ class RouteCompiler implements RouteCompilerInterface
 
     /**
      * Determines the longest static prefix possible for a route.
-     *
-     * @return string The leading static part of a route's path
      */
-    private static function determineStaticPrefix(Route $route, array $tokens)
+    private static function determineStaticPrefix(Route $route, array $tokens): string
     {
         if ('text' !== $tokens[0][0]) {
             return ($route->hasDefault($tokens[0][3]) || '/' === $tokens[0][1]) ? '' : $tokens[0][1];
@@ -251,14 +248,9 @@ class RouteCompiler implements RouteCompilerInterface
     }
 
     /**
-     * Returns the next static character in the Route pattern that will serve as a separator.
-     *
-     * @param string $pattern The route pattern
-     * @param bool   $useUtf8 Whether the character is encoded in UTF-8 or not
-     *
-     * @return string The next static character that functions as separator (or empty string when none available)
+     * Returns the next static character in the Route pattern that will serve as a separator (or the empty string when none available).
      */
-    private static function findNextSeparator($pattern, $useUtf8)
+    private static function findNextSeparator(string $pattern, bool $useUtf8): string
     {
         if ('' == $pattern) {
             // return empty string if pattern is empty or false (false which can be returned by substr)
@@ -284,7 +276,7 @@ class RouteCompiler implements RouteCompilerInterface
      *
      * @return string The regexp pattern for a single token
      */
-    private static function computeRegexp(array $tokens, $index, $firstOptional)
+    private static function computeRegexp(array $tokens, int $index, int $firstOptional): string
     {
         $token = $tokens[$index];
         if ('text' === $token[0]) {
@@ -302,7 +294,7 @@ class RouteCompiler implements RouteCompilerInterface
                     // "?:" means it is non-capturing, i.e. the portion of the subject string that
                     // matched the optional subpattern is not passed back.
                     $regexp = "(?:$regexp";
-                    $nbTokens = count($tokens);
+                    $nbTokens = \count($tokens);
                     if ($nbTokens - 1 == $index) {
                         // Close the optional subpatterns
                         $regexp .= str_repeat(')?', $nbTokens - $firstOptional - (0 === $firstOptional ? 1 : 0));
@@ -313,4 +305,25 @@ class RouteCompiler implements RouteCompilerInterface
             }
         }
     }
+
+    private static function transformCapturingGroupsToNonCapturings(string $regexp): string
+    {
+        for ($i = 0; $i < \strlen($regexp); ++$i) {
+            if ('\\' === $regexp[$i]) {
+                ++$i;
+                continue;
+            }
+            if ('(' !== $regexp[$i] || !isset($regexp[$i + 2])) {
+                continue;
+            }
+            if ('*' === $regexp[++$i] || '?' === $regexp[$i]) {
+                ++$i;
+                continue;
+            }
+            $regexp = substr_replace($regexp, '?:', $i, 0);
+            ++$i;
+        }
+
+        return $regexp;
+    }
 }
diff --git a/vendor/symfony/routing/Router.php b/vendor/symfony/routing/Router.php
index ed56332e..56842a4d 100644
--- a/vendor/symfony/routing/Router.php
+++ b/vendor/symfony/routing/Router.php
@@ -11,19 +11,19 @@
 
 namespace Symfony\Component\Routing;
 
-use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\Config\ConfigCacheInterface;
-use Symfony\Component\Config\ConfigCacheFactoryInterface;
-use Symfony\Component\Config\ConfigCacheFactory;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Config\ConfigCacheFactory;
+use Symfony\Component\Config\ConfigCacheFactoryInterface;
+use Symfony\Component\Config\ConfigCacheInterface;
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Generator\ConfigurableRequirementsInterface;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\Generator\Dumper\GeneratorDumperInterface;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\Routing\Matcher\Dumper\MatcherDumperInterface;
 use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
 use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
-use Symfony\Component\Routing\Matcher\Dumper\MatcherDumperInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
 
 /**
  * The Router class is an example of the integration of all pieces of the
diff --git a/vendor/symfony/routing/Tests/Annotation/RouteTest.php b/vendor/symfony/routing/Tests/Annotation/RouteTest.php
index 9af22f29..4d6b2a9c 100644
--- a/vendor/symfony/routing/Tests/Annotation/RouteTest.php
+++ b/vendor/symfony/routing/Tests/Annotation/RouteTest.php
@@ -24,6 +24,14 @@ class RouteTest extends TestCase
         $route = new Route(array('foo' => 'bar'));
     }
 
+    /**
+     * @expectedException \BadMethodCallException
+     */
+    public function testTryingToSetLocalesDirectly()
+    {
+        $route = new Route(array('locales' => array('nl' => 'bar')));
+    }
+
     /**
      * @dataProvider getValidParameters
      */
@@ -45,6 +53,7 @@ class RouteTest extends TestCase
             array('methods', array('GET', 'POST'), 'getMethods'),
             array('host', '{locale}.example.com', 'getHost'),
             array('condition', 'context.getMethod() == "GET"', 'getCondition'),
+            array('value', array('nl' => '/hier', 'en' => '/here'), 'getLocalizedPaths'),
         );
     }
 }
diff --git a/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/AbstractClassController.php b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/AbstractClassController.php
new file mode 100644
index 00000000..50576bcf
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/AbstractClassController.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures;
+
+abstract class AbstractClassController
+{
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/ActionPathController.php b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/ActionPathController.php
new file mode 100644
index 00000000..b96c4d65
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/ActionPathController.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures;
+
+use Symfony\Component\Routing\Annotation\Route;
+
+class ActionPathController
+{
+    /**
+     * @Route("/path", name="action")
+     */
+    public function action()
+    {
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/DefaultValueController.php b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/DefaultValueController.php
new file mode 100644
index 00000000..e66bee91
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/DefaultValueController.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures;
+
+use Symfony\Component\Routing\Annotation\Route;
+
+class DefaultValueController
+{
+    /**
+     * @Route("/{default}/path", name="action")
+     */
+    public function action($default = 'value')
+    {
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/ExplicitLocalizedActionPathController.php b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/ExplicitLocalizedActionPathController.php
new file mode 100644
index 00000000..e832c6b3
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/ExplicitLocalizedActionPathController.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures;
+
+use Symfony\Component\Routing\Annotation\Route;
+
+class ExplicitLocalizedActionPathController
+{
+    /**
+     * @Route(path={"en": "/path", "nl": "/pad"}, name="action")
+     */
+    public function action()
+    {
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/InvokableController.php b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/InvokableController.php
new file mode 100644
index 00000000..b25a0ad9
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/InvokableController.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures;
+
+use Symfony\Component\Routing\Annotation\Route;
+
+/**
+ * @Route("/here", name="lol")
+ */
+class InvokableController
+{
+    public function __invoke()
+    {
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/InvokableLocalizedController.php b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/InvokableLocalizedController.php
new file mode 100644
index 00000000..d9633b9f
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/InvokableLocalizedController.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures;
+
+use Symfony\Component\Routing\Annotation\Route;
+
+/**
+ * @Route(path={"nl": "/hier", "en": "/here"}, name="action")
+ */
+class InvokableLocalizedController
+{
+    public function __invoke()
+    {
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/LocalizedActionPathController.php b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/LocalizedActionPathController.php
new file mode 100644
index 00000000..be6a3566
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/LocalizedActionPathController.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures;
+
+use Symfony\Component\Routing\Annotation\Route;
+
+class LocalizedActionPathController
+{
+    /**
+     * @Route(path={"en": "/path", "nl": "/pad"}, name="action")
+     */
+    public function action()
+    {
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/LocalizedMethodActionControllers.php b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/LocalizedMethodActionControllers.php
new file mode 100644
index 00000000..cadf3d1b
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/LocalizedMethodActionControllers.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures;
+
+use Symfony\Component\Routing\Annotation\Route;
+
+/**
+ * @Route(path={"en": "/the/path", "nl": "/het/pad"})
+ */
+class LocalizedMethodActionControllers
+{
+    /**
+     * @Route(name="post", methods={"POST"})
+     */
+    public function post()
+    {
+    }
+
+    /**
+     * @Route(name="put", methods={"PUT"})
+     */
+    public function put()
+    {
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/LocalizedPrefixLocalizedActionController.php b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/LocalizedPrefixLocalizedActionController.php
new file mode 100644
index 00000000..68f51b48
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/LocalizedPrefixLocalizedActionController.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures;
+
+use Symfony\Component\Routing\Annotation\Route;
+
+/**
+ * @Route(path={"nl": "/nl", "en": "/en"})
+ */
+class LocalizedPrefixLocalizedActionController
+{
+    /**
+     * @Route(path={"nl": "/actie", "en": "/action"}, name="action")
+     */
+    public function action()
+    {
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/LocalizedPrefixMissingLocaleActionController.php b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/LocalizedPrefixMissingLocaleActionController.php
new file mode 100644
index 00000000..a06e44e8
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/LocalizedPrefixMissingLocaleActionController.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures;
+
+use Symfony\Component\Routing\Annotation\Route;
+
+/**
+ * @Route(path={"nl": "/nl"})
+ */
+class LocalizedPrefixMissingLocaleActionController
+{
+    /**
+     * @Route(path={"nl": "/actie", "en": "/action"}, name="action")
+     */
+    public function action()
+    {
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/LocalizedPrefixMissingRouteLocaleActionController.php b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/LocalizedPrefixMissingRouteLocaleActionController.php
new file mode 100644
index 00000000..8c9d96bc
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/LocalizedPrefixMissingRouteLocaleActionController.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures;
+
+use Symfony\Component\Routing\Annotation\Route;
+
+/**
+ * @Route(path={"nl": "/nl", "en": "/en"})
+ */
+class LocalizedPrefixMissingRouteLocaleActionController
+{
+    /**
+     * @Route(path={"nl": "/actie"}, name="action")
+     */
+    public function action()
+    {
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/LocalizedPrefixWithRouteWithoutLocale.php b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/LocalizedPrefixWithRouteWithoutLocale.php
new file mode 100644
index 00000000..91dceb33
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/LocalizedPrefixWithRouteWithoutLocale.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures;
+
+use Symfony\Component\Routing\Annotation\Route;
+
+/**
+ * @Route(path={"en": "/en", "nl": "/nl"})
+ */
+class LocalizedPrefixWithRouteWithoutLocale
+{
+    /**
+     * @Route("/suffix", name="action")
+     */
+    public function action()
+    {
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/MethodActionControllers.php b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/MethodActionControllers.php
new file mode 100644
index 00000000..9350f3a9
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/MethodActionControllers.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures;
+
+use Symfony\Component\Routing\Annotation\Route;
+
+/**
+ * @Route("/the/path")
+ */
+class MethodActionControllers
+{
+    /**
+     * @Route(name="post", methods={"POST"})
+     */
+    public function post()
+    {
+    }
+
+    /**
+     * @Route(name="put", methods={"PUT"})
+     */
+    public function put()
+    {
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/MissingRouteNameController.php b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/MissingRouteNameController.php
new file mode 100644
index 00000000..7a4afb1e
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/MissingRouteNameController.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures;
+
+use Symfony\Component\Routing\Annotation\Route;
+
+class MissingRouteNameController
+{
+    /**
+     * @Route("/path")
+     */
+    public function action()
+    {
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/NothingButNameController.php b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/NothingButNameController.php
new file mode 100644
index 00000000..5aa1b07c
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/NothingButNameController.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures;
+
+use Symfony\Component\Routing\Annotation\Route;
+
+class NothingButNameController
+{
+    /**
+     * @Route(name="action")
+     */
+    public function action()
+    {
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/PrefixedActionLocalizedRouteController.php b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/PrefixedActionLocalizedRouteController.php
new file mode 100644
index 00000000..0b07d63d
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/PrefixedActionLocalizedRouteController.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures;
+
+use Symfony\Component\Routing\Annotation\Route;
+
+/**
+ * @Route("/prefix")
+ */
+class PrefixedActionLocalizedRouteController
+{
+    /**
+     * @Route(path={"en": "/path", "nl": "/pad"}, name="action")
+     */
+    public function action()
+    {
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/PrefixedActionPathController.php b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/PrefixedActionPathController.php
new file mode 100644
index 00000000..04c1d044
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/PrefixedActionPathController.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures;
+
+use Symfony\Component\Routing\Annotation\Route;
+
+/**
+ * @Route("/prefix", host="frankdejonge.nl", condition="lol=fun")
+ */
+class PrefixedActionPathController
+{
+    /**
+     * @Route("/path", name="action")
+     */
+    public function action()
+    {
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/RouteWithPrefixController.php b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/RouteWithPrefixController.php
new file mode 100644
index 00000000..a98a527a
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/AnnotationFixtures/RouteWithPrefixController.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures;
+
+use Symfony\Component\Routing\Annotation\Route;
+
+/**
+ * @Route("/prefix")
+ */
+class RouteWithPrefixController
+{
+    /**
+     * @Route("/path", name="action")
+     */
+    public function action()
+    {
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/CustomXmlFileLoader.php b/vendor/symfony/routing/Tests/Fixtures/CustomXmlFileLoader.php
index 9fd5754a..b7a02b60 100644
--- a/vendor/symfony/routing/Tests/Fixtures/CustomXmlFileLoader.php
+++ b/vendor/symfony/routing/Tests/Fixtures/CustomXmlFileLoader.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Routing\Tests\Fixtures;
 
-use Symfony\Component\Routing\Loader\XmlFileLoader;
 use Symfony\Component\Config\Util\XmlUtils;
+use Symfony\Component\Routing\Loader\XmlFileLoader;
 
 /**
  * XmlFileLoader with schema validation turned off.
diff --git a/vendor/symfony/routing/Tests/Fixtures/RedirectableUrlMatcher.php b/vendor/symfony/routing/Tests/Fixtures/RedirectableUrlMatcher.php
index 15937bcf..08b67a07 100644
--- a/vendor/symfony/routing/Tests/Fixtures/RedirectableUrlMatcher.php
+++ b/vendor/symfony/routing/Tests/Fixtures/RedirectableUrlMatcher.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Routing\Tests\Fixtures;
 
-use Symfony\Component\Routing\Matcher\UrlMatcher;
 use Symfony\Component\Routing\Matcher\RedirectableUrlMatcherInterface;
+use Symfony\Component\Routing\Matcher\UrlMatcher;
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
diff --git a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher0.php b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher0.php
index 9e9b9103..e7c07650 100644
--- a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher0.php
+++ b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher0.php
@@ -17,21 +17,19 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
 
     public function match($rawPathinfo)
     {
-        $allow = array();
+        $allow = $allowSchemes = array();
         $pathinfo = rawurldecode($rawPathinfo);
-        $trimmedPathinfo = rtrim($pathinfo, '/');
         $context = $this->context;
-        $request = $this->request ?: $this->createRequest($pathinfo);
         $requestMethod = $canonicalMethod = $context->getMethod();
 
         if ('HEAD' === $requestMethod) {
             $canonicalMethod = 'GET';
         }
 
-        if ('/' === $pathinfo && !$allow) {
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
-        throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();
+        throw $allow ? new MethodNotAllowedException(array_keys($allow)) : new ResourceNotFoundException();
     }
 }
diff --git a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher1.php b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher1.php
index 23a93c19..68e7741b 100644
--- a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher1.php
+++ b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher1.php
@@ -17,302 +17,231 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
 
     public function match($rawPathinfo)
     {
-        $allow = array();
+        $allow = $allowSchemes = array();
         $pathinfo = rawurldecode($rawPathinfo);
-        $trimmedPathinfo = rtrim($pathinfo, '/');
         $context = $this->context;
-        $request = $this->request ?: $this->createRequest($pathinfo);
         $requestMethod = $canonicalMethod = $context->getMethod();
+        $host = strtolower($context->getHost());
 
         if ('HEAD' === $requestMethod) {
             $canonicalMethod = 'GET';
         }
 
-        if (0 === strpos($pathinfo, '/foo')) {
-            // foo
-            if (preg_match('#^/foo/(?P<bar>baz|symfony)$#sD', $pathinfo, $matches)) {
-                return $this->mergeDefaults(array_replace($matches, array('_route' => 'foo')), array (  'def' => 'test',));
-            }
-
-            // foofoo
-            if ('/foofoo' === $pathinfo) {
-                return array (  'def' => 'test',  '_route' => 'foofoo',);
-            }
-
-        }
-
-        elseif (0 === strpos($pathinfo, '/bar')) {
-            // bar
-            if (preg_match('#^/bar/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
-                $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'bar')), array ());
-                if (!in_array($canonicalMethod, array('GET', 'HEAD'))) {
-                    $allow = array_merge($allow, array('GET', 'HEAD'));
-                    goto not_bar;
+        switch ($pathinfo) {
+            default:
+                $routes = array(
+                    '/test/baz' => array(array('_route' => 'baz'), null, null, null),
+                    '/test/baz.html' => array(array('_route' => 'baz2'), null, null, null),
+                    '/test/baz3/' => array(array('_route' => 'baz3'), null, null, null),
+                    '/foofoo' => array(array('_route' => 'foofoo', 'def' => 'test'), null, null, null),
+                    '/spa ce' => array(array('_route' => 'space'), null, null, null),
+                    '/multi/new' => array(array('_route' => 'overridden2'), null, null, null),
+                    '/multi/hey/' => array(array('_route' => 'hey'), null, null, null),
+                    '/ababa' => array(array('_route' => 'ababa'), null, null, null),
+                    '/route1' => array(array('_route' => 'route1'), 'a.example.com', null, null),
+                    '/c2/route2' => array(array('_route' => 'route2'), 'a.example.com', null, null),
+                    '/route4' => array(array('_route' => 'route4'), 'a.example.com', null, null),
+                    '/c2/route3' => array(array('_route' => 'route3'), 'b.example.com', null, null),
+                    '/route5' => array(array('_route' => 'route5'), 'c.example.com', null, null),
+                    '/route6' => array(array('_route' => 'route6'), null, null, null),
+                    '/route11' => array(array('_route' => 'route11'), '#^(?P<var1>[^\\.]++)\\.example\\.com$#sDi', null, null),
+                    '/route12' => array(array('_route' => 'route12', 'var1' => 'val'), '#^(?P<var1>[^\\.]++)\\.example\\.com$#sDi', null, null),
+                    '/route17' => array(array('_route' => 'route17'), null, null, null),
+                );
+
+                if (!isset($routes[$pathinfo])) {
+                    break;
                 }
-
-                return $ret;
-            }
-            not_bar:
-
-            // barhead
-            if (0 === strpos($pathinfo, '/barhead') && preg_match('#^/barhead/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
-                $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'barhead')), array ());
-                if (!in_array($canonicalMethod, array('GET'))) {
-                    $allow = array_merge($allow, array('GET'));
-                    goto not_barhead;
+                list($ret, $requiredHost, $requiredMethods, $requiredSchemes) = $routes[$pathinfo];
+
+                if ($requiredHost) {
+                    if ('#' !== $requiredHost[0] ? $requiredHost !== $host : !preg_match($requiredHost, $host, $hostMatches)) {
+                        break;
+                    }
+                    if ('#' === $requiredHost[0] && $hostMatches) {
+                        $hostMatches['_route'] = $ret['_route'];
+                        $ret = $this->mergeDefaults($hostMatches, $ret);
+                    }
                 }
 
-                return $ret;
-            }
-            not_barhead:
-
-        }
-
-        elseif (0 === strpos($pathinfo, '/test')) {
-            if (0 === strpos($pathinfo, '/test/baz')) {
-                // baz
-                if ('/test/baz' === $pathinfo) {
-                    return array('_route' => 'baz');
+                $hasRequiredScheme = !$requiredSchemes || isset($requiredSchemes[$context->getScheme()]);
+                if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {
+                    if ($hasRequiredScheme) {
+                        $allow += $requiredMethods;
+                    }
+                    break;
                 }
-
-                // baz2
-                if ('/test/baz.html' === $pathinfo) {
-                    return array('_route' => 'baz2');
-                }
-
-                // baz3
-                if ('/test/baz3/' === $pathinfo) {
-                    return array('_route' => 'baz3');
-                }
-
-            }
-
-            // baz4
-            if (preg_match('#^/test/(?P<foo>[^/]++)/$#sD', $pathinfo, $matches)) {
-                return $this->mergeDefaults(array_replace($matches, array('_route' => 'baz4')), array ());
-            }
-
-            // baz5
-            if (preg_match('#^/test/(?P<foo>[^/]++)/$#sD', $pathinfo, $matches)) {
-                $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'baz5')), array ());
-                if (!in_array($requestMethod, array('POST'))) {
-                    $allow = array_merge($allow, array('POST'));
-                    goto not_baz5;
-                }
-
-                return $ret;
-            }
-            not_baz5:
-
-            // baz.baz6
-            if (preg_match('#^/test/(?P<foo>[^/]++)/$#sD', $pathinfo, $matches)) {
-                $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'baz.baz6')), array ());
-                if (!in_array($requestMethod, array('PUT'))) {
-                    $allow = array_merge($allow, array('PUT'));
-                    goto not_bazbaz6;
+                if (!$hasRequiredScheme) {
+                    $allowSchemes += $requiredSchemes;
+                    break;
                 }
 
                 return $ret;
-            }
-            not_bazbaz6:
-
-        }
-
-        // quoter
-        if (preg_match('#^/(?P<quoter>[\']+)$#sD', $pathinfo, $matches)) {
-            return $this->mergeDefaults(array_replace($matches, array('_route' => 'quoter')), array ());
         }
 
-        // space
-        if ('/spa ce' === $pathinfo) {
-            return array('_route' => 'space');
-        }
-
-        if (0 === strpos($pathinfo, '/a')) {
-            if (0 === strpos($pathinfo, '/a/b\'b')) {
-                // foo1
-                if (preg_match('#^/a/b\'b/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
-                    return $this->mergeDefaults(array_replace($matches, array('_route' => 'foo1')), array ());
-                }
-
-                // bar1
-                if (preg_match('#^/a/b\'b/(?P<bar>[^/]++)$#sD', $pathinfo, $matches)) {
-                    return $this->mergeDefaults(array_replace($matches, array('_route' => 'bar1')), array ());
-                }
-
-            }
-
-            // overridden
-            if (preg_match('#^/a/(?P<var>.*)$#sD', $pathinfo, $matches)) {
-                return $this->mergeDefaults(array_replace($matches, array('_route' => 'overridden')), array ());
-            }
-
-            if (0 === strpos($pathinfo, '/a/b\'b')) {
-                // foo2
-                if (preg_match('#^/a/b\'b/(?P<foo1>[^/]++)$#sD', $pathinfo, $matches)) {
-                    return $this->mergeDefaults(array_replace($matches, array('_route' => 'foo2')), array ());
+        $matchedPathinfo = $host.'.'.$pathinfo;
+        $regexList = array(
+            0 => '{^(?'
+                .'|(?:(?:[^./]*+\\.)++)(?'
+                    .'|/foo/(baz|symfony)(*:47)'
+                    .'|/bar(?'
+                        .'|/([^/]++)(*:70)'
+                        .'|head/([^/]++)(*:90)'
+                    .')'
+                    .'|/test/([^/]++)/(?'
+                        .'|(*:116)'
+                    .')'
+                    .'|/([\']+)(*:132)'
+                    .'|/a/(?'
+                        .'|b\'b/([^/]++)(?'
+                            .'|(*:161)'
+                            .'|(*:169)'
+                        .')'
+                        .'|(.*)(*:182)'
+                        .'|b\'b/([^/]++)(?'
+                            .'|(*:205)'
+                            .'|(*:213)'
+                        .')'
+                    .')'
+                    .'|/multi/hello(?:/([^/]++))?(*:249)'
+                    .'|/([^/]++)/b/([^/]++)(?'
+                        .'|(*:280)'
+                        .'|(*:288)'
+                    .')'
+                    .'|/aba/([^/]++)(*:310)'
+                .')|(?i:([^\\.]++)\\.example\\.com)\\.(?'
+                    .'|/route1(?'
+                        .'|3/([^/]++)(*:372)'
+                        .'|4/([^/]++)(*:390)'
+                    .')'
+                .')|(?i:c\\.example\\.com)\\.(?'
+                    .'|/route15/([^/]++)(*:442)'
+                .')|(?:(?:[^./]*+\\.)++)(?'
+                    .'|/route16/([^/]++)(*:490)'
+                    .'|/a/(?'
+                        .'|a\\.\\.\\.(*:511)'
+                        .'|b/(?'
+                            .'|([^/]++)(*:532)'
+                            .'|c/([^/]++)(*:550)'
+                        .')'
+                    .')'
+                .')'
+                .')$}sD',
+        );
+
+        foreach ($regexList as $offset => $regex) {
+            while (preg_match($regex, $matchedPathinfo, $matches)) {
+                switch ($m = (int) $matches['MARK']) {
+                    case 116:
+                        $matches = array('foo' => $matches[1] ?? null);
+
+                        // baz4
+                        return $this->mergeDefaults(array('_route' => 'baz4') + $matches, array());
+
+                        // baz5
+                        $ret = $this->mergeDefaults(array('_route' => 'baz5') + $matches, array());
+                        if (!isset(($a = array('POST' => 0))[$requestMethod])) {
+                            $allow += $a;
+                            goto not_baz5;
+                        }
+
+                        return $ret;
+                        not_baz5:
+
+                        // baz.baz6
+                        $ret = $this->mergeDefaults(array('_route' => 'baz.baz6') + $matches, array());
+                        if (!isset(($a = array('PUT' => 0))[$requestMethod])) {
+                            $allow += $a;
+                            goto not_bazbaz6;
+                        }
+
+                        return $ret;
+                        not_bazbaz6:
+
+                        break;
+                    case 161:
+                        $matches = array('foo' => $matches[1] ?? null);
+
+                        // foo1
+                        $ret = $this->mergeDefaults(array('_route' => 'foo1') + $matches, array());
+                        if (!isset(($a = array('PUT' => 0))[$requestMethod])) {
+                            $allow += $a;
+                            goto not_foo1;
+                        }
+
+                        return $ret;
+                        not_foo1:
+
+                        break;
+                    case 205:
+                        $matches = array('foo1' => $matches[1] ?? null);
+
+                        // foo2
+                        return $this->mergeDefaults(array('_route' => 'foo2') + $matches, array());
+
+                        break;
+                    case 280:
+                        $matches = array('_locale' => $matches[1] ?? null, 'foo' => $matches[2] ?? null);
+
+                        // foo3
+                        return $this->mergeDefaults(array('_route' => 'foo3') + $matches, array());
+
+                        break;
+                    default:
+                        $routes = array(
+                            47 => array(array('_route' => 'foo', 'def' => 'test'), array('bar'), null, null),
+                            70 => array(array('_route' => 'bar'), array('foo'), array('GET' => 0, 'HEAD' => 1), null),
+                            90 => array(array('_route' => 'barhead'), array('foo'), array('GET' => 0), null),
+                            132 => array(array('_route' => 'quoter'), array('quoter'), null, null),
+                            169 => array(array('_route' => 'bar1'), array('bar'), null, null),
+                            182 => array(array('_route' => 'overridden'), array('var'), null, null),
+                            213 => array(array('_route' => 'bar2'), array('bar1'), null, null),
+                            249 => array(array('_route' => 'helloWorld', 'who' => 'World!'), array('who'), null, null),
+                            288 => array(array('_route' => 'bar3'), array('_locale', 'bar'), null, null),
+                            310 => array(array('_route' => 'foo4'), array('foo'), null, null),
+                            372 => array(array('_route' => 'route13'), array('var1', 'name'), null, null),
+                            390 => array(array('_route' => 'route14', 'var1' => 'val'), array('var1', 'name'), null, null),
+                            442 => array(array('_route' => 'route15'), array('name'), null, null),
+                            490 => array(array('_route' => 'route16', 'var1' => 'val'), array('name'), null, null),
+                            511 => array(array('_route' => 'a'), array(), null, null),
+                            532 => array(array('_route' => 'b'), array('var'), null, null),
+                            550 => array(array('_route' => 'c'), array('var'), null, null),
+                        );
+
+                        list($ret, $vars, $requiredMethods, $requiredSchemes) = $routes[$m];
+
+                        foreach ($vars as $i => $v) {
+                            if (isset($matches[1 + $i])) {
+                                $ret[$v] = $matches[1 + $i];
+                            }
+                        }
+
+                        $hasRequiredScheme = !$requiredSchemes || isset($requiredSchemes[$context->getScheme()]);
+                        if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {
+                            if ($hasRequiredScheme) {
+                                $allow += $requiredMethods;
+                            }
+                            break;
+                        }
+                        if (!$hasRequiredScheme) {
+                            $allowSchemes += $requiredSchemes;
+                            break;
+                        }
+
+                        return $ret;
                 }
 
-                // bar2
-                if (preg_match('#^/a/b\'b/(?P<bar1>[^/]++)$#sD', $pathinfo, $matches)) {
-                    return $this->mergeDefaults(array_replace($matches, array('_route' => 'bar2')), array ());
+                if (550 === $m) {
+                    break;
                 }
-
-            }
-
-        }
-
-        elseif (0 === strpos($pathinfo, '/multi')) {
-            // helloWorld
-            if (0 === strpos($pathinfo, '/multi/hello') && preg_match('#^/multi/hello(?:/(?P<who>[^/]++))?$#sD', $pathinfo, $matches)) {
-                return $this->mergeDefaults(array_replace($matches, array('_route' => 'helloWorld')), array (  'who' => 'World!',));
-            }
-
-            // hey
-            if ('/multi/hey/' === $pathinfo) {
-                return array('_route' => 'hey');
+                $regex = substr_replace($regex, 'F', $m - $offset, 1 + strlen($m));
+                $offset += strlen($m);
             }
-
-            // overridden2
-            if ('/multi/new' === $pathinfo) {
-                return array('_route' => 'overridden2');
-            }
-
-        }
-
-        // foo3
-        if (preg_match('#^/(?P<_locale>[^/]++)/b/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
-            return $this->mergeDefaults(array_replace($matches, array('_route' => 'foo3')), array ());
-        }
-
-        // bar3
-        if (preg_match('#^/(?P<_locale>[^/]++)/b/(?P<bar>[^/]++)$#sD', $pathinfo, $matches)) {
-            return $this->mergeDefaults(array_replace($matches, array('_route' => 'bar3')), array ());
         }
-
-        if (0 === strpos($pathinfo, '/aba')) {
-            // ababa
-            if ('/ababa' === $pathinfo) {
-                return array('_route' => 'ababa');
-            }
-
-            // foo4
-            if (preg_match('#^/aba/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
-                return $this->mergeDefaults(array_replace($matches, array('_route' => 'foo4')), array ());
-            }
-
-        }
-
-        $host = $context->getHost();
-
-        if (preg_match('#^a\\.example\\.com$#sDi', $host, $hostMatches)) {
-            // route1
-            if ('/route1' === $pathinfo) {
-                return array('_route' => 'route1');
-            }
-
-            // route2
-            if ('/c2/route2' === $pathinfo) {
-                return array('_route' => 'route2');
-            }
-
-        }
-
-        if (preg_match('#^b\\.example\\.com$#sDi', $host, $hostMatches)) {
-            // route3
-            if ('/c2/route3' === $pathinfo) {
-                return array('_route' => 'route3');
-            }
-
-        }
-
-        if (preg_match('#^a\\.example\\.com$#sDi', $host, $hostMatches)) {
-            // route4
-            if ('/route4' === $pathinfo) {
-                return array('_route' => 'route4');
-            }
-
-        }
-
-        if (preg_match('#^c\\.example\\.com$#sDi', $host, $hostMatches)) {
-            // route5
-            if ('/route5' === $pathinfo) {
-                return array('_route' => 'route5');
-            }
-
-        }
-
-        // route6
-        if ('/route6' === $pathinfo) {
-            return array('_route' => 'route6');
-        }
-
-        if (preg_match('#^(?P<var1>[^\\.]++)\\.example\\.com$#sDi', $host, $hostMatches)) {
-            if (0 === strpos($pathinfo, '/route1')) {
-                // route11
-                if ('/route11' === $pathinfo) {
-                    return $this->mergeDefaults(array_replace($hostMatches, array('_route' => 'route11')), array ());
-                }
-
-                // route12
-                if ('/route12' === $pathinfo) {
-                    return $this->mergeDefaults(array_replace($hostMatches, array('_route' => 'route12')), array (  'var1' => 'val',));
-                }
-
-                // route13
-                if (0 === strpos($pathinfo, '/route13') && preg_match('#^/route13/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
-                    return $this->mergeDefaults(array_replace($hostMatches, $matches, array('_route' => 'route13')), array ());
-                }
-
-                // route14
-                if (0 === strpos($pathinfo, '/route14') && preg_match('#^/route14/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
-                    return $this->mergeDefaults(array_replace($hostMatches, $matches, array('_route' => 'route14')), array (  'var1' => 'val',));
-                }
-
-            }
-
-        }
-
-        if (preg_match('#^c\\.example\\.com$#sDi', $host, $hostMatches)) {
-            // route15
-            if (0 === strpos($pathinfo, '/route15') && preg_match('#^/route15/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
-                return $this->mergeDefaults(array_replace($matches, array('_route' => 'route15')), array ());
-            }
-
-        }
-
-        // route16
-        if (0 === strpos($pathinfo, '/route16') && preg_match('#^/route16/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
-            return $this->mergeDefaults(array_replace($matches, array('_route' => 'route16')), array (  'var1' => 'val',));
-        }
-
-        // route17
-        if ('/route17' === $pathinfo) {
-            return array('_route' => 'route17');
-        }
-
-        // a
-        if ('/a/a...' === $pathinfo) {
-            return array('_route' => 'a');
-        }
-
-        if (0 === strpos($pathinfo, '/a/b')) {
-            // b
-            if (preg_match('#^/a/b/(?P<var>[^/]++)$#sD', $pathinfo, $matches)) {
-                return $this->mergeDefaults(array_replace($matches, array('_route' => 'b')), array ());
-            }
-
-            // c
-            if (0 === strpos($pathinfo, '/a/b/c') && preg_match('#^/a/b/c/(?P<var>[^/]++)$#sD', $pathinfo, $matches)) {
-                return $this->mergeDefaults(array_replace($matches, array('_route' => 'c')), array ());
-            }
-
-        }
-
-        if ('/' === $pathinfo && !$allow) {
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
-        throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();
+        throw $allow ? new MethodNotAllowedException(array_keys($allow)) : new ResourceNotFoundException();
     }
 }
diff --git a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher10.php b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher10.php
new file mode 100644
index 00000000..2f5cc3fc
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher10.php
@@ -0,0 +1,2830 @@
+<?php
+
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Symfony\Component\Routing\RequestContext;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Routing Component.
+ */
+class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
+{
+    public function __construct(RequestContext $context)
+    {
+        $this->context = $context;
+    }
+
+    public function match($rawPathinfo)
+    {
+        $allow = $allowSchemes = array();
+        $pathinfo = rawurldecode($rawPathinfo);
+        $context = $this->context;
+        $requestMethod = $canonicalMethod = $context->getMethod();
+
+        if ('HEAD' === $requestMethod) {
+            $canonicalMethod = 'GET';
+        }
+
+        $matchedPathinfo = $pathinfo;
+        $regexList = array(
+            0 => '{^(?'
+                    .'|/c(?'
+                        .'|f(?'
+                            .'|cd20/([^/]++)/([^/]++)/([^/]++)/cfcd20(*:54)'
+                            .'|e(?'
+                                .'|cdb/([^/]++)/([^/]++)/([^/]++)/cfecdb(*:102)'
+                                .'|e39/([^/]++)/([^/]++)/([^/]++)/cfee39(*:147)'
+                            .')'
+                            .'|a086/([^/]++)/([^/]++)/([^/]++)/cfa086(*:194)'
+                            .'|004f/([^/]++)/([^/]++)/([^/]++)/cf004f(*:240)'
+                        .')'
+                        .'|4(?'
+                            .'|ca42/([^/]++)/([^/]++)/([^/]++)/c4ca42(*:291)'
+                            .'|5147/([^/]++)/([^/]++)/([^/]++)/c45147(*:337)'
+                            .'|1000/([^/]++)/([^/]++)/([^/]++)/c41000(*:383)'
+                        .')'
+                        .'|8(?'
+                            .'|1e72/([^/]++)/([^/]++)/([^/]++)/c81e72(*:434)'
+                            .'|ffe9/([^/]++)/([^/]++)/([^/]++)/c8ffe9(*:480)'
+                            .'|6a7e/([^/]++)/([^/]++)/([^/]++)/c86a7e(*:526)'
+                        .')'
+                        .'|9(?'
+                            .'|f0f8/([^/]++)/([^/]++)/([^/]++)/c9f0f8(*:577)'
+                            .'|e107/([^/]++)/([^/]++)/([^/]++)/c9e107(*:623)'
+                        .')'
+                        .'|2(?'
+                            .'|0(?'
+                                .'|ad4/([^/]++)/([^/]++)/([^/]++)/c20ad4(*:677)'
+                                .'|3d8/([^/]++)/([^/]++)/([^/]++)/c203d8(*:722)'
+                            .')'
+                            .'|4cd7/([^/]++)/([^/]++)/([^/]++)/c24cd7(*:769)'
+                        .')'
+                        .'|5(?'
+                            .'|1ce4/([^/]++)/([^/]++)/([^/]++)/c51ce4(*:820)'
+                            .'|2f1b/([^/]++)/([^/]++)/([^/]++)/c52f1b(*:866)'
+                            .'|ff25/([^/]++)/([^/]++)/([^/]++)/c5ff25(*:912)'
+                        .')'
+                        .'|7(?'
+                            .'|4d97/([^/]++)/([^/]++)/([^/]++)/c74d97(*:963)'
+                            .'|e124/([^/]++)/([^/]++)/([^/]++)/c7e124(*:1009)'
+                        .')'
+                        .'|16a53/([^/]++)/([^/]++)/([^/]++)/c16a53(*:1058)'
+                        .'|0(?'
+                            .'|c7c7/([^/]++)/([^/]++)/([^/]++)/c0c7c7(*:1109)'
+                            .'|e190/([^/]++)/([^/]++)/([^/]++)/c0e190(*:1156)'
+                            .'|42f4/([^/]++)/([^/]++)/([^/]++)/c042f4(*:1203)'
+                            .'|58f5/([^/]++)/([^/]++)/([^/]++)/c058f5(*:1250)'
+                        .')'
+                        .'|e(?'
+                            .'|debb/([^/]++)/([^/]++)/([^/]++)/cedebb(*:1302)'
+                            .'|e631/([^/]++)/([^/]++)/([^/]++)/cee631(*:1349)'
+                        .')'
+                        .'|a(?'
+                            .'|46c1/([^/]++)/([^/]++)/([^/]++)/ca46c1(*:1401)'
+                            .'|f1a3/([^/]++)/([^/]++)/([^/]++)/caf1a3(*:1448)'
+                        .')'
+                        .'|b70ab/([^/]++)/([^/]++)/([^/]++)/cb70ab(*:1497)'
+                        .'|d0069/([^/]++)/([^/]++)/([^/]++)/cd0069(*:1545)'
+                        .'|3(?'
+                            .'|e878/([^/]++)/([^/]++)/([^/]++)/c3e878(*:1596)'
+                            .'|c59e/([^/]++)/([^/]++)/([^/]++)/c3c59e(*:1643)'
+                        .')'
+                    .')'
+                    .'|/e(?'
+                        .'|c(?'
+                            .'|cbc8/([^/]++)/([^/]++)/([^/]++)/eccbc8(*:1701)'
+                            .'|8(?'
+                                .'|956/([^/]++)/([^/]++)/([^/]++)/ec8956(*:1751)'
+                                .'|ce6/([^/]++)/([^/]++)/([^/]++)/ec8ce6(*:1797)'
+                            .')'
+                            .'|5dec/([^/]++)/([^/]++)/([^/]++)/ec5dec(*:1845)'
+                        .')'
+                        .'|4(?'
+                            .'|da3b/([^/]++)/([^/]++)/([^/]++)/e4da3b(*:1897)'
+                            .'|a622/([^/]++)/([^/]++)/([^/]++)/e4a622(*:1944)'
+                            .'|6de7/([^/]++)/([^/]++)/([^/]++)/e46de7(*:1991)'
+                            .'|4fea/([^/]++)/([^/]++)/([^/]++)/e44fea(*:2038)'
+                        .')'
+                        .'|3(?'
+                            .'|6985/([^/]++)/([^/]++)/([^/]++)/e36985(*:2090)'
+                            .'|796a/([^/]++)/([^/]++)/([^/]++)/e3796a(*:2137)'
+                        .')'
+                        .'|a(?'
+                            .'|5d2f/([^/]++)/([^/]++)/([^/]++)/ea5d2f(*:2189)'
+                            .'|e27d/([^/]++)/([^/]++)/([^/]++)/eae27d(*:2236)'
+                        .')'
+                        .'|2(?'
+                            .'|c(?'
+                                .'|420/([^/]++)/([^/]++)/([^/]++)/e2c420(*:2291)'
+                                .'|0be/([^/]++)/([^/]++)/([^/]++)/e2c0be(*:2337)'
+                            .')'
+                            .'|ef52/([^/]++)/([^/]++)/([^/]++)/e2ef52(*:2385)'
+                        .')'
+                        .'|d(?'
+                            .'|3d2c/([^/]++)/([^/]++)/([^/]++)/ed3d2c(*:2437)'
+                            .'|a80a/([^/]++)/([^/]++)/([^/]++)/eda80a(*:2484)'
+                            .'|dea8/([^/]++)/([^/]++)/([^/]++)/eddea8(*:2531)'
+                        .')'
+                        .'|b(?'
+                            .'|16(?'
+                                .'|0d/([^/]++)/([^/]++)/([^/]++)/eb160d(*:2586)'
+                                .'|37/([^/]++)/([^/]++)/([^/]++)/eb1637(*:2631)'
+                            .')'
+                            .'|a0dc/([^/]++)/([^/]++)/([^/]++)/eba0dc(*:2679)'
+                        .')'
+                        .'|0(?'
+                            .'|0da0/([^/]++)/([^/]++)/([^/]++)/e00da0(*:2731)'
+                            .'|c641/([^/]++)/([^/]++)/([^/]++)/e0c641(*:2778)'
+                        .')'
+                        .'|e(?'
+                            .'|cca5/([^/]++)/([^/]++)/([^/]++)/eecca5(*:2830)'
+                            .'|d5af/([^/]++)/([^/]++)/([^/]++)/eed5af(*:2877)'
+                        .')'
+                        .'|96ed4/([^/]++)/([^/]++)/([^/]++)/e96ed4(*:2926)'
+                        .'|1(?'
+                            .'|6542/([^/]++)/([^/]++)/([^/]++)/e16542(*:2977)'
+                            .'|e32e/([^/]++)/([^/]++)/([^/]++)/e1e32e(*:3024)'
+                        .')'
+                        .'|56954/([^/]++)/([^/]++)/([^/]++)/e56954(*:3073)'
+                        .'|f(?'
+                            .'|0d39/([^/]++)/([^/]++)/([^/]++)/ef0d39(*:3124)'
+                            .'|e937/([^/]++)/([^/]++)/([^/]++)/efe937(*:3171)'
+                            .'|575e/([^/]++)/([^/]++)/([^/]++)/ef575e(*:3218)'
+                        .')'
+                        .'|7b24b/([^/]++)/([^/]++)/([^/]++)/e7b24b(*:3267)'
+                        .'|836d8/([^/]++)/([^/]++)/([^/]++)/e836d8(*:3315)'
+                    .')'
+                    .'|/a(?'
+                        .'|8(?'
+                            .'|7ff6/([^/]++)/([^/]++)/([^/]++)/a87ff6(*:3372)'
+                            .'|baa5/([^/]++)/([^/]++)/([^/]++)/a8baa5(*:3419)'
+                            .'|f15e/([^/]++)/([^/]++)/([^/]++)/a8f15e(*:3466)'
+                            .'|c88a/([^/]++)/([^/]++)/([^/]++)/a8c88a(*:3513)'
+                            .'|abb4/([^/]++)/([^/]++)/([^/]++)/a8abb4(*:3560)'
+                        .')'
+                        .'|a(?'
+                            .'|b323/([^/]++)/([^/]++)/([^/]++)/aab323(*:3612)'
+                            .'|942a/([^/]++)/([^/]++)/([^/]++)/aa942a(*:3659)'
+                        .')'
+                        .'|5(?'
+                            .'|bfc9/([^/]++)/([^/]++)/([^/]++)/a5bfc9(*:3711)'
+                            .'|771b/([^/]++)/([^/]++)/([^/]++)/a5771b(*:3758)'
+                            .'|e001/([^/]++)/([^/]++)/([^/]++)/a5e001(*:3805)'
+                            .'|97e5/([^/]++)/([^/]++)/([^/]++)/a597e5(*:3852)'
+                            .'|16a8/([^/]++)/([^/]++)/([^/]++)/a516a8(*:3899)'
+                        .')'
+                        .'|1d0c6/([^/]++)/([^/]++)/([^/]++)/a1d0c6(*:3948)'
+                        .'|6(?'
+                            .'|84ec/([^/]++)/([^/]++)/([^/]++)/a684ec(*:3999)'
+                            .'|6658/([^/]++)/([^/]++)/([^/]++)/a66658(*:4046)'
+                        .')'
+                        .'|3(?'
+                            .'|f390/([^/]++)/([^/]++)/([^/]++)/a3f390(*:4098)'
+                            .'|c65c/([^/]++)/([^/]++)/([^/]++)/a3c65c(*:4145)'
+                        .')'
+                        .'|d(?'
+                            .'|61ab/([^/]++)/([^/]++)/([^/]++)/ad61ab(*:4197)'
+                            .'|13a2/([^/]++)/([^/]++)/([^/]++)/ad13a2(*:4244)'
+                            .'|972f/([^/]++)/([^/]++)/([^/]++)/ad972f(*:4291)'
+                        .')'
+                        .'|c(?'
+                            .'|627a/([^/]++)/([^/]++)/([^/]++)/ac627a(*:4343)'
+                            .'|1dd2/([^/]++)/([^/]++)/([^/]++)/ac1dd2(*:4390)'
+                        .')'
+                        .'|9(?'
+                            .'|7da6/([^/]++)/([^/]++)/([^/]++)/a97da6(*:4442)'
+                            .'|6b65/([^/]++)/([^/]++)/([^/]++)/a96b65(*:4489)'
+                        .')'
+                        .'|0(?'
+                            .'|a080/([^/]++)/([^/]++)/([^/]++)/a0a080(*:4541)'
+                            .'|2ffd/([^/]++)/([^/]++)/([^/]++)/a02ffd(*:4588)'
+                            .'|1a03/([^/]++)/([^/]++)/([^/]++)/a01a03(*:4635)'
+                        .')'
+                        .'|4(?'
+                            .'|a042/([^/]++)/([^/]++)/([^/]++)/a4a042(*:4687)'
+                            .'|f236/([^/]++)/([^/]++)/([^/]++)/a4f236(*:4734)'
+                            .'|9e94/([^/]++)/([^/]++)/([^/]++)/a49e94(*:4781)'
+                        .')'
+                        .'|2557a/([^/]++)/([^/]++)/([^/]++)/a2557a(*:4830)'
+                        .'|b817c/([^/]++)/([^/]++)/([^/]++)/ab817c(*:4878)'
+                    .')'
+                    .'|/1(?'
+                        .'|6(?'
+                            .'|7909/([^/]++)/([^/]++)/([^/]++)/167909(*:4935)'
+                            .'|a5cd/([^/]++)/([^/]++)/([^/]++)/16a5cd(*:4982)'
+                            .'|51cf/([^/]++)/([^/]++)/([^/]++)/1651cf(*:5029)'
+                        .')'
+                        .'|f(?'
+                            .'|0e3d/([^/]++)/([^/]++)/([^/]++)/1f0e3d(*:5081)'
+                            .'|f(?'
+                                .'|1de/([^/]++)/([^/]++)/([^/]++)/1ff1de(*:5131)'
+                                .'|8a7/([^/]++)/([^/]++)/([^/]++)/1ff8a7(*:5177)'
+                            .')'
+                        .')'
+                        .'|8(?'
+                            .'|2be0/([^/]++)/([^/]++)/([^/]++)/182be0(*:5230)'
+                            .'|d804/([^/]++)/([^/]++)/([^/]++)/18d804(*:5277)'
+                            .'|9977/([^/]++)/([^/]++)/([^/]++)/189977(*:5324)'
+                        .')'
+                        .'|c(?'
+                            .'|383c/([^/]++)/([^/]++)/([^/]++)/1c383c(*:5376)'
+                            .'|9ac0/([^/]++)/([^/]++)/([^/]++)/1c9ac0(*:5423)'
+                        .')'
+                        .'|9(?'
+                            .'|ca14/([^/]++)/([^/]++)/([^/]++)/19ca14(*:5475)'
+                            .'|f3cd/([^/]++)/([^/]++)/([^/]++)/19f3cd(*:5522)'
+                        .')'
+                        .'|7(?'
+                            .'|e621/([^/]++)/([^/]++)/([^/]++)/17e621(*:5574)'
+                            .'|0000/([^/]++)/([^/]++)/([^/]++)/170000(*:5621)'
+                            .'|d63b/([^/]++)/([^/]++)/([^/]++)/17d63b(*:5668)'
+                        .')'
+                        .'|4(?'
+                            .'|bfa6/([^/]++)/([^/]++)/([^/]++)/14bfa6(*:5720)'
+                            .'|0f69/([^/]++)/([^/]++)/([^/]++)/140f69(*:5767)'
+                            .'|9e96/([^/]++)/([^/]++)/([^/]++)/149e96(*:5814)'
+                            .'|2949/([^/]++)/([^/]++)/([^/]++)/142949(*:5861)'
+                        .')'
+                        .'|a(?'
+                            .'|fa34/([^/]++)/([^/]++)/([^/]++)/1afa34(*:5913)'
+                            .'|5b1e/([^/]++)/([^/]++)/([^/]++)/1a5b1e(*:5960)'
+                        .')'
+                        .'|3(?'
+                            .'|8(?'
+                                .'|597/([^/]++)/([^/]++)/([^/]++)/138597(*:6015)'
+                                .'|bb0/([^/]++)/([^/]++)/([^/]++)/138bb0(*:6061)'
+                            .')'
+                            .'|f(?'
+                                .'|e9d/([^/]++)/([^/]++)/([^/]++)/13fe9d(*:6112)'
+                                .'|989/([^/]++)/([^/]++)/([^/]++)/13f989(*:6158)'
+                                .'|3cf/([^/]++)/([^/]++)/([^/]++)/13f3cf(*:6204)'
+                            .')'
+                        .')'
+                        .'|d7f7a/([^/]++)/([^/]++)/([^/]++)/1d7f7a(*:6254)'
+                        .'|5(?'
+                            .'|34b7/([^/]++)/([^/]++)/([^/]++)/1534b7(*:6305)'
+                            .'|8f30/([^/]++)/([^/]++)/([^/]++)/158f30(*:6352)'
+                            .'|4384/([^/]++)/([^/]++)/([^/]++)/154384(*:6399)'
+                            .'|d4e8/([^/]++)/([^/]++)/([^/]++)/15d4e8(*:6446)'
+                        .')'
+                        .'|1(?'
+                            .'|5f89/([^/]++)/([^/]++)/([^/]++)/115f89(*:6498)'
+                            .'|b984/([^/]++)/([^/]++)/([^/]++)/11b984(*:6545)'
+                        .')'
+                        .'|068c6/([^/]++)/([^/]++)/([^/]++)/1068c6(*:6594)'
+                        .'|be3bc/([^/]++)/([^/]++)/([^/]++)/1be3bc(*:6642)'
+                    .')'
+                    .'|/8(?'
+                        .'|f(?'
+                            .'|1(?'
+                                .'|4e4/([^/]++)/([^/]++)/([^/]++)/8f14e4(*:6702)'
+                                .'|21c/([^/]++)/([^/]++)/([^/]++)/8f121c(*:6748)'
+                            .')'
+                            .'|8551/([^/]++)/([^/]++)/([^/]++)/8f8551(*:6796)'
+                            .'|5329/([^/]++)/([^/]++)/([^/]++)/8f5329(*:6843)'
+                            .'|e009/([^/]++)/([^/]++)/([^/]++)/8fe009(*:6890)'
+                        .')'
+                        .'|e(?'
+                            .'|296a/([^/]++)/([^/]++)/([^/]++)/8e296a(*:6942)'
+                            .'|98d8/([^/]++)/([^/]++)/([^/]++)/8e98d8(*:6989)'
+                            .'|fb10/([^/]++)/([^/]++)/([^/]++)/8efb10(*:7036)'
+                            .'|6b42/([^/]++)/([^/]++)/([^/]++)/8e6b42(*:7083)'
+                        .')'
+                        .'|61398/([^/]++)/([^/]++)/([^/]++)/861398(*:7132)'
+                        .'|1(?'
+                            .'|2b4b/([^/]++)/([^/]++)/([^/]++)/812b4b(*:7183)'
+                            .'|9f46/([^/]++)/([^/]++)/([^/]++)/819f46(*:7230)'
+                            .'|6b11/([^/]++)/([^/]++)/([^/]++)/816b11(*:7277)'
+                        .')'
+                        .'|d(?'
+                            .'|5e95/([^/]++)/([^/]++)/([^/]++)/8d5e95(*:7329)'
+                            .'|3bba/([^/]++)/([^/]++)/([^/]++)/8d3bba(*:7376)'
+                            .'|d48d/([^/]++)/([^/]++)/([^/]++)/8dd48d(*:7423)'
+                            .'|7d8e/([^/]++)/([^/]++)/([^/]++)/8d7d8e(*:7470)'
+                        .')'
+                        .'|2(?'
+                            .'|aa4b/([^/]++)/([^/]++)/([^/]++)/82aa4b(*:7522)'
+                            .'|1(?'
+                                .'|612/([^/]++)/([^/]++)/([^/]++)/821612(*:7572)'
+                                .'|fa7/([^/]++)/([^/]++)/([^/]++)/821fa7(*:7618)'
+                            .')'
+                            .'|cec9/([^/]++)/([^/]++)/([^/]++)/82cec9(*:7666)'
+                        .')'
+                        .'|5(?'
+                            .'|d8ce/([^/]++)/([^/]++)/([^/]++)/85d8ce(*:7718)'
+                            .'|4d(?'
+                                .'|6f/([^/]++)/([^/]++)/([^/]++)/854d6f(*:7768)'
+                                .'|9f/([^/]++)/([^/]++)/([^/]++)/854d9f(*:7813)'
+                            .')'
+                        .')'
+                        .'|4d9ee/([^/]++)/([^/]++)/([^/]++)/84d9ee(*:7863)'
+                        .'|c(?'
+                            .'|19f5/([^/]++)/([^/]++)/([^/]++)/8c19f5(*:7914)'
+                            .'|b22b/([^/]++)/([^/]++)/([^/]++)/8cb22b(*:7961)'
+                        .')'
+                        .'|39ab4/([^/]++)/([^/]++)/([^/]++)/839ab4(*:8010)'
+                        .'|9f0fd/([^/]++)/([^/]++)/([^/]++)/89f0fd(*:8058)'
+                        .'|bf121/([^/]++)/([^/]++)/([^/]++)/8bf121(*:8106)'
+                        .'|77a9b/([^/]++)/([^/]++)/([^/]++)/877a9b(*:8154)'
+                    .')'
+                    .'|/4(?'
+                        .'|5(?'
+                            .'|c48c/([^/]++)/([^/]++)/([^/]++)/45c48c(*:8211)'
+                            .'|fbc6/([^/]++)/([^/]++)/([^/]++)/45fbc6(*:8258)'
+                        .')'
+                        .'|e732c/([^/]++)/([^/]++)/([^/]++)/4e732c(*:8307)'
+                        .'|4f683/([^/]++)/([^/]++)/([^/]++)/44f683(*:8355)'
+                        .'|3(?'
+                            .'|ec51/([^/]++)/([^/]++)/([^/]++)/43ec51(*:8406)'
+                            .'|2aca/([^/]++)/([^/]++)/([^/]++)/432aca(*:8453)'
+                        .')'
+                        .'|c5(?'
+                            .'|6ff/([^/]++)/([^/]++)/([^/]++)/4c56ff(*:8505)'
+                            .'|bde/([^/]++)/([^/]++)/([^/]++)/4c5bde(*:8551)'
+                        .')'
+                        .'|2(?'
+                            .'|a0e1/([^/]++)/([^/]++)/([^/]++)/42a0e1(*:8603)'
+                            .'|e7aa/([^/]++)/([^/]++)/([^/]++)/42e7aa(*:8650)'
+                            .'|998c/([^/]++)/([^/]++)/([^/]++)/42998c(*:8697)'
+                            .'|8fca/([^/]++)/([^/]++)/([^/]++)/428fca(*:8744)'
+                        .')'
+                        .'|7(?'
+                            .'|d1e9/([^/]++)/([^/]++)/([^/]++)/47d1e9(*:8796)'
+                            .'|34ba/([^/]++)/([^/]++)/([^/]++)/4734ba(*:8843)'
+                        .')'
+                        .'|6ba9f/([^/]++)/([^/]++)/([^/]++)/46ba9f(*:8892)'
+                        .'|8aedb/([^/]++)/([^/]++)/([^/]++)/48aedb(*:8940)'
+                        .'|9(?'
+                            .'|182f/([^/]++)/([^/]++)/([^/]++)/49182f(*:8991)'
+                            .'|6e05/([^/]++)/([^/]++)/([^/]++)/496e05(*:9038)'
+                            .'|ae49/([^/]++)/([^/]++)/([^/]++)/49ae49(*:9085)'
+                        .')'
+                        .'|0008b/([^/]++)/([^/]++)/([^/]++)/40008b(*:9134)'
+                        .'|1(?'
+                            .'|f1f1/([^/]++)/([^/]++)/([^/]++)/41f1f1(*:9185)'
+                            .'|ae36/([^/]++)/([^/]++)/([^/]++)/41ae36(*:9232)'
+                        .')'
+                        .'|f(?'
+                            .'|6ffe/([^/]++)/([^/]++)/([^/]++)/4f6ffe(*:9284)'
+                            .'|4adc/([^/]++)/([^/]++)/([^/]++)/4f4adc(*:9331)'
+                        .')'
+                    .')'
+                    .'|/d(?'
+                        .'|3(?'
+                            .'|d944/([^/]++)/([^/]++)/([^/]++)/d3d944(*:9389)'
+                            .'|9577/([^/]++)/([^/]++)/([^/]++)/d39577(*:9436)'
+                            .'|4ab1/([^/]++)/([^/]++)/([^/]++)/d34ab1(*:9483)'
+                        .')'
+                        .'|6(?'
+                            .'|7d8a/([^/]++)/([^/]++)/([^/]++)/d67d8a(*:9535)'
+                            .'|4592/([^/]++)/([^/]++)/([^/]++)/d64592(*:9582)'
+                            .'|baf6/([^/]++)/([^/]++)/([^/]++)/d6baf6(*:9629)'
+                            .'|1e4b/([^/]++)/([^/]++)/([^/]++)/d61e4b(*:9676)'
+                        .')'
+                        .'|9(?'
+                            .'|d4f4/([^/]++)/([^/]++)/([^/]++)/d9d4f4(*:9728)'
+                            .'|6409/([^/]++)/([^/]++)/([^/]++)/d96409(*:9775)'
+                            .'|47bf/([^/]++)/([^/]++)/([^/]++)/d947bf(*:9822)'
+                            .'|fc5b/([^/]++)/([^/]++)/([^/]++)/d9fc5b(*:9869)'
+                        .')'
+                        .'|8(?'
+                            .'|2c8d/([^/]++)/([^/]++)/([^/]++)/d82c8d(*:9921)'
+                            .'|1f9c/([^/]++)/([^/]++)/([^/]++)/d81f9c(*:9968)'
+                        .')'
+                        .'|2(?'
+                            .'|ddea/([^/]++)/([^/]++)/([^/]++)/d2ddea(*:10020)'
+                            .'|96c1/([^/]++)/([^/]++)/([^/]++)/d296c1(*:10068)'
+                        .')'
+                        .'|0(?'
+                            .'|9bf4/([^/]++)/([^/]++)/([^/]++)/d09bf4(*:10121)'
+                            .'|7e70/([^/]++)/([^/]++)/([^/]++)/d07e70(*:10169)'
+                        .')'
+                        .'|1(?'
+                            .'|f(?'
+                                .'|e17/([^/]++)/([^/]++)/([^/]++)/d1fe17(*:10225)'
+                                .'|491/([^/]++)/([^/]++)/([^/]++)/d1f491(*:10272)'
+                                .'|255/([^/]++)/([^/]++)/([^/]++)/d1f255(*:10319)'
+                            .')'
+                            .'|c38a/([^/]++)/([^/]++)/([^/]++)/d1c38a(*:10368)'
+                            .'|8f65/([^/]++)/([^/]++)/([^/]++)/d18f65(*:10416)'
+                        .')'
+                        .'|a4fb5/([^/]++)/([^/]++)/([^/]++)/da4fb5(*:10466)'
+                        .'|b8e1a/([^/]++)/([^/]++)/([^/]++)/db8e1a(*:10515)'
+                        .'|709f3/([^/]++)/([^/]++)/([^/]++)/d709f3(*:10564)'
+                        .'|c(?'
+                            .'|912a/([^/]++)/([^/]++)/([^/]++)/dc912a(*:10616)'
+                            .'|6a64/([^/]++)/([^/]++)/([^/]++)/dc6a64(*:10664)'
+                        .')'
+                        .'|db306/([^/]++)/([^/]++)/([^/]++)/ddb306(*:10714)'
+                    .')'
+                    .'|/6(?'
+                        .'|5(?'
+                            .'|12bd/([^/]++)/([^/]++)/([^/]++)/6512bd(*:10772)'
+                            .'|b9ee/([^/]++)/([^/]++)/([^/]++)/65b9ee(*:10820)'
+                            .'|ded5/([^/]++)/([^/]++)/([^/]++)/65ded5(*:10868)'
+                        .')'
+                        .'|f(?'
+                            .'|4922/([^/]++)/([^/]++)/([^/]++)/6f4922(*:10921)'
+                            .'|3ef7/([^/]++)/([^/]++)/([^/]++)/6f3ef7(*:10969)'
+                            .'|aa80/([^/]++)/([^/]++)/([^/]++)/6faa80(*:11017)'
+                        .')'
+                        .'|e(?'
+                            .'|a(?'
+                                .'|9ab/([^/]++)/([^/]++)/([^/]++)/6ea9ab(*:11073)'
+                                .'|2ef/([^/]++)/([^/]++)/([^/]++)/6ea2ef(*:11120)'
+                            .')'
+                            .'|cbdd/([^/]++)/([^/]++)/([^/]++)/6ecbdd(*:11169)'
+                        .')'
+                        .'|3(?'
+                            .'|64d3/([^/]++)/([^/]++)/([^/]++)/6364d3(*:11222)'
+                            .'|dc7e/([^/]++)/([^/]++)/([^/]++)/63dc7e(*:11270)'
+                            .'|923f/([^/]++)/([^/]++)/([^/]++)/63923f(*:11318)'
+                        .')'
+                        .'|c(?'
+                            .'|8349/([^/]++)/([^/]++)/([^/]++)/6c8349(*:11371)'
+                            .'|4b76/([^/]++)/([^/]++)/([^/]++)/6c4b76(*:11419)'
+                            .'|dd60/([^/]++)/([^/]++)/([^/]++)/6cdd60(*:11467)'
+                            .'|9882/([^/]++)/([^/]++)/([^/]++)/6c9882(*:11515)'
+                            .'|524f/([^/]++)/([^/]++)/([^/]++)/6c524f(*:11563)'
+                        .')'
+                        .'|7(?'
+                            .'|c6a1/([^/]++)/([^/]++)/([^/]++)/67c6a1(*:11616)'
+                            .'|f7fb/([^/]++)/([^/]++)/([^/]++)/67f7fb(*:11664)'
+                        .')'
+                        .'|42e92/([^/]++)/([^/]++)/([^/]++)/642e92(*:11714)'
+                        .'|6(?'
+                            .'|f041/([^/]++)/([^/]++)/([^/]++)/66f041(*:11766)'
+                            .'|808e/([^/]++)/([^/]++)/([^/]++)/66808e(*:11814)'
+                            .'|3682/([^/]++)/([^/]++)/([^/]++)/663682(*:11862)'
+                        .')'
+                        .'|8(?'
+                            .'|d30a/([^/]++)/([^/]++)/([^/]++)/68d30a(*:11915)'
+                            .'|8396/([^/]++)/([^/]++)/([^/]++)/688396(*:11963)'
+                            .'|5545/([^/]++)/([^/]++)/([^/]++)/685545(*:12011)'
+                            .'|ce19/([^/]++)/([^/]++)/([^/]++)/68ce19(*:12059)'
+                        .')'
+                        .'|9(?'
+                            .'|74ce/([^/]++)/([^/]++)/([^/]++)/6974ce(*:12112)'
+                            .'|8d51/([^/]++)/([^/]++)/([^/]++)/698d51(*:12160)'
+                            .'|adc1/([^/]++)/([^/]++)/([^/]++)/69adc1(*:12208)'
+                            .'|cb3e/([^/]++)/([^/]++)/([^/]++)/69cb3e(*:12256)'
+                        .')'
+                        .'|da(?'
+                            .'|900/([^/]++)/([^/]++)/([^/]++)/6da900(*:12309)'
+                            .'|37d/([^/]++)/([^/]++)/([^/]++)/6da37d(*:12356)'
+                        .')'
+                        .'|21bf6/([^/]++)/([^/]++)/([^/]++)/621bf6(*:12406)'
+                        .'|a9aed/([^/]++)/([^/]++)/([^/]++)/6a9aed(*:12455)'
+                    .')'
+                    .'|/9(?'
+                        .'|b(?'
+                            .'|f31c/([^/]++)/([^/]++)/([^/]++)/9bf31c(*:12513)'
+                            .'|8619/([^/]++)/([^/]++)/([^/]++)/9b8619(*:12561)'
+                            .'|04d1/([^/]++)/([^/]++)/([^/]++)/9b04d1(*:12609)'
+                            .'|e40c/([^/]++)/([^/]++)/([^/]++)/9be40c(*:12657)'
+                            .'|70e8/([^/]++)/([^/]++)/([^/]++)/9b70e8(*:12705)'
+                        .')'
+                        .'|8(?'
+                            .'|f137/([^/]++)/([^/]++)/([^/]++)/98f137(*:12758)'
+                            .'|dce8/([^/]++)/([^/]++)/([^/]++)/98dce8(*:12806)'
+                            .'|72ed/([^/]++)/([^/]++)/([^/]++)/9872ed(*:12854)'
+                            .'|b297/([^/]++)/([^/]++)/([^/]++)/98b297(*:12902)'
+                        .')'
+                        .'|a(?'
+                            .'|1158/([^/]++)/([^/]++)/([^/]++)/9a1158(*:12955)'
+                            .'|9687/([^/]++)/([^/]++)/([^/]++)/9a9687(*:13003)'
+                        .')'
+                        .'|f(?'
+                            .'|6140/([^/]++)/([^/]++)/([^/]++)/9f6140(*:13056)'
+                            .'|c3d7/([^/]++)/([^/]++)/([^/]++)/9fc3d7(*:13104)'
+                            .'|d818/([^/]++)/([^/]++)/([^/]++)/9fd818(*:13152)'
+                        .')'
+                        .'|7(?'
+                            .'|78d5/([^/]++)/([^/]++)/([^/]++)/9778d5(*:13205)'
+                            .'|6652/([^/]++)/([^/]++)/([^/]++)/976652(*:13253)'
+                            .'|9d47/([^/]++)/([^/]++)/([^/]++)/979d47(*:13301)'
+                        .')'
+                        .'|3db85/([^/]++)/([^/]++)/([^/]++)/93db85(*:13351)'
+                        .'|2c(?'
+                            .'|c22/([^/]++)/([^/]++)/([^/]++)/92cc22(*:13403)'
+                            .'|8c9/([^/]++)/([^/]++)/([^/]++)/92c8c9(*:13450)'
+                        .')'
+                        .'|03ce9/([^/]++)/([^/]++)/([^/]++)/903ce9(*:13500)'
+                        .'|6da2f/([^/]++)/([^/]++)/([^/]++)/96da2f(*:13549)'
+                        .'|d(?'
+                            .'|cb88/([^/]++)/([^/]++)/([^/]++)/9dcb88(*:13601)'
+                            .'|fcd5/([^/]++)/([^/]++)/([^/]++)/9dfcd5(*:13649)'
+                            .'|e6d1/([^/]++)/([^/]++)/([^/]++)/9de6d1(*:13697)'
+                        .')'
+                        .'|c(?'
+                            .'|fdf1/([^/]++)/([^/]++)/([^/]++)/9cfdf1(*:13750)'
+                            .'|838d/([^/]++)/([^/]++)/([^/]++)/9c838d(*:13798)'
+                        .')'
+                        .'|18(?'
+                            .'|890/([^/]++)/([^/]++)/([^/]++)/918890(*:13851)'
+                            .'|317/([^/]++)/([^/]++)/([^/]++)/918317(*:13898)'
+                        .')'
+                        .'|4(?'
+                            .'|f6d7/([^/]++)/([^/]++)/([^/]++)/94f6d7(*:13951)'
+                            .'|1e1a/([^/]++)/([^/]++)/([^/]++)/941e1a(*:13999)'
+                            .'|31c8/([^/]++)/([^/]++)/([^/]++)/9431c8(*:14047)'
+                            .'|61cc/([^/]++)/([^/]++)/([^/]++)/9461cc(*:14095)'
+                        .')'
+                        .'|50a41/([^/]++)/([^/]++)/([^/]++)/950a41(*:14145)'
+                    .')'
+                    .'|/7(?'
+                        .'|0(?'
+                            .'|efdf/([^/]++)/([^/]++)/([^/]++)/70efdf(*:14203)'
+                            .'|5f21/([^/]++)/([^/]++)/([^/]++)/705f21(*:14251)'
+                            .'|c639/([^/]++)/([^/]++)/([^/]++)/70c639(*:14299)'
+                        .')'
+                        .'|2b32a/([^/]++)/([^/]++)/([^/]++)/72b32a(*:14349)'
+                        .'|f(?'
+                            .'|39f8/([^/]++)/([^/]++)/([^/]++)/7f39f8(*:14401)'
+                            .'|6ffa/([^/]++)/([^/]++)/([^/]++)/7f6ffa(*:14449)'
+                            .'|1(?'
+                                .'|de2/([^/]++)/([^/]++)/([^/]++)/7f1de2(*:14500)'
+                                .'|00b/([^/]++)/([^/]++)/([^/]++)/7f100b(*:14547)'
+                            .')'
+                            .'|e1f8/([^/]++)/([^/]++)/([^/]++)/7fe1f8(*:14596)'
+                        .')'
+                        .'|3(?'
+                            .'|5b90/([^/]++)/([^/]++)/([^/]++)/735b90(*:14649)'
+                            .'|278a/([^/]++)/([^/]++)/([^/]++)/73278a(*:14697)'
+                            .'|80ad/([^/]++)/([^/]++)/([^/]++)/7380ad(*:14745)'
+                        .')'
+                        .'|cbbc4/([^/]++)/([^/]++)/([^/]++)/7cbbc4(*:14795)'
+                        .'|6(?'
+                            .'|4796/([^/]++)/([^/]++)/([^/]++)/764796(*:14847)'
+                            .'|dc61/([^/]++)/([^/]++)/([^/]++)/76dc61(*:14895)'
+                        .')'
+                        .'|e(?'
+                            .'|f605/([^/]++)/([^/]++)/([^/]++)/7ef605(*:14948)'
+                            .'|7757/([^/]++)/([^/]++)/([^/]++)/7e7757(*:14996)'
+                            .'|a(?'
+                                .'|be3/([^/]++)/([^/]++)/([^/]++)/7eabe3(*:15047)'
+                                .'|cb5/([^/]++)/([^/]++)/([^/]++)/7eacb5(*:15094)'
+                            .')'
+                        .')'
+                        .'|5(?'
+                            .'|7b50/([^/]++)/([^/]++)/([^/]++)/757b50(*:15148)'
+                            .'|8874/([^/]++)/([^/]++)/([^/]++)/758874(*:15196)'
+                            .'|fc09/([^/]++)/([^/]++)/([^/]++)/75fc09(*:15244)'
+                        .')'
+                        .'|4(?'
+                            .'|db12/([^/]++)/([^/]++)/([^/]++)/74db12(*:15297)'
+                            .'|071a/([^/]++)/([^/]++)/([^/]++)/74071a(*:15345)'
+                        .')'
+                        .'|a614f/([^/]++)/([^/]++)/([^/]++)/7a614f(*:15395)'
+                        .'|d04bb/([^/]++)/([^/]++)/([^/]++)/7d04bb(*:15444)'
+                    .')'
+                    .'|/3(?'
+                        .'|c(?'
+                            .'|59dc/([^/]++)/([^/]++)/([^/]++)/3c59dc(*:15502)'
+                            .'|ec07/([^/]++)/([^/]++)/([^/]++)/3cec07(*:15550)'
+                            .'|7781/([^/]++)/([^/]++)/([^/]++)/3c7781(*:15598)'
+                            .'|f166/([^/]++)/([^/]++)/([^/]++)/3cf166(*:15646)'
+                        .')'
+                        .'|7(?'
+                            .'|693c/([^/]++)/([^/]++)/([^/]++)/37693c(*:15699)'
+                            .'|a749/([^/]++)/([^/]++)/([^/]++)/37a749(*:15747)'
+                            .'|bc2f/([^/]++)/([^/]++)/([^/]++)/37bc2f(*:15795)'
+                            .'|1bce/([^/]++)/([^/]++)/([^/]++)/371bce(*:15843)'
+                        .')'
+                        .'|3(?'
+                            .'|e75f/([^/]++)/([^/]++)/([^/]++)/33e75f(*:15896)'
+                            .'|5f53/([^/]++)/([^/]++)/([^/]++)/335f53(*:15944)'
+                        .')'
+                        .'|4(?'
+                            .'|1(?'
+                                .'|73c/([^/]++)/([^/]++)/([^/]++)/34173c(*:16000)'
+                                .'|6a7/([^/]++)/([^/]++)/([^/]++)/3416a7(*:16047)'
+                            .')'
+                            .'|ed06/([^/]++)/([^/]++)/([^/]++)/34ed06(*:16096)'
+                        .')'
+                        .'|2(?'
+                            .'|95c7/([^/]++)/([^/]++)/([^/]++)/3295c7(*:16149)'
+                            .'|bb90/([^/]++)/([^/]++)/([^/]++)/32bb90(*:16197)'
+                            .'|0722/([^/]++)/([^/]++)/([^/]++)/320722(*:16245)'
+                        .')'
+                        .'|5(?'
+                            .'|f4a8/([^/]++)/([^/]++)/([^/]++)/35f4a8(*:16298)'
+                            .'|7a6f/([^/]++)/([^/]++)/([^/]++)/357a6f(*:16346)'
+                            .'|2fe2/([^/]++)/([^/]++)/([^/]++)/352fe2(*:16394)'
+                            .'|0510/([^/]++)/([^/]++)/([^/]++)/350510(*:16442)'
+                        .')'
+                        .'|ef815/([^/]++)/([^/]++)/([^/]++)/3ef815(*:16492)'
+                        .'|8(?'
+                            .'|b3ef/([^/]++)/([^/]++)/([^/]++)/38b3ef(*:16544)'
+                            .'|af86/([^/]++)/([^/]++)/([^/]++)/38af86(*:16592)'
+                            .'|db3a/([^/]++)/([^/]++)/([^/]++)/38db3a(*:16640)'
+                        .')'
+                        .'|d(?'
+                            .'|ef18/([^/]++)/([^/]++)/([^/]++)/3def18(*:16693)'
+                            .'|d48a/([^/]++)/([^/]++)/([^/]++)/3dd48a(*:16741)'
+                        .')'
+                        .'|9(?'
+                            .'|88c7/([^/]++)/([^/]++)/([^/]++)/3988c7(*:16794)'
+                            .'|0597/([^/]++)/([^/]++)/([^/]++)/390597(*:16842)'
+                            .'|461a/([^/]++)/([^/]++)/([^/]++)/39461a(*:16890)'
+                        .')'
+                        .'|6(?'
+                            .'|3663/([^/]++)/([^/]++)/([^/]++)/363663(*:16943)'
+                            .'|44a6/([^/]++)/([^/]++)/([^/]++)/3644a6(*:16991)'
+                            .'|660e/([^/]++)/([^/]++)/([^/]++)/36660e(*:17039)'
+                        .')'
+                        .'|1(?'
+                            .'|fefc/([^/]++)/([^/]++)/([^/]++)/31fefc(*:17092)'
+                            .'|0dcb/([^/]++)/([^/]++)/([^/]++)/310dcb(*:17140)'
+                        .')'
+                        .'|b8a61/([^/]++)/([^/]++)/([^/]++)/3b8a61(*:17190)'
+                        .'|fe94a/([^/]++)/([^/]++)/([^/]++)/3fe94a(*:17239)'
+                        .'|ad7c2/([^/]++)/([^/]++)/([^/]++)/3ad7c2(*:17288)'
+                    .')'
+                    .'|/b(?'
+                        .'|6(?'
+                            .'|d767/([^/]++)/([^/]++)/([^/]++)/b6d767(*:17346)'
+                            .'|f047/([^/]++)/([^/]++)/([^/]++)/b6f047(*:17394)'
+                        .')'
+                        .'|53(?'
+                            .'|b3a/([^/]++)/([^/]++)/([^/]++)/b53b3a(*:17447)'
+                            .'|4ba/([^/]++)/([^/]++)/([^/]++)/b534ba(*:17494)'
+                        .')'
+                        .'|3(?'
+                            .'|e3e3/([^/]++)/([^/]++)/([^/]++)/b3e3e3(*:17547)'
+                            .'|967a/([^/]++)/([^/]++)/([^/]++)/b3967a(*:17595)'
+                        .')'
+                        .'|7(?'
+                            .'|3ce3/([^/]++)/([^/]++)/([^/]++)/b73ce3(*:17648)'
+                            .'|b16e/([^/]++)/([^/]++)/([^/]++)/b7b16e(*:17696)'
+                        .')'
+                        .'|d(?'
+                            .'|4c9a/([^/]++)/([^/]++)/([^/]++)/bd4c9a(*:17749)'
+                            .'|686f/([^/]++)/([^/]++)/([^/]++)/bd686f(*:17797)'
+                        .')'
+                        .'|f8229/([^/]++)/([^/]++)/([^/]++)/bf8229(*:17847)'
+                        .'|1(?'
+                            .'|d10e/([^/]++)/([^/]++)/([^/]++)/b1d10e(*:17899)'
+                            .'|a59b/([^/]++)/([^/]++)/([^/]++)/b1a59b(*:17947)'
+                        .')'
+                        .'|c(?'
+                            .'|be33/([^/]++)/([^/]++)/([^/]++)/bcbe33(*:18000)'
+                            .'|6dc4/([^/]++)/([^/]++)/([^/]++)/bc6dc4(*:18048)'
+                            .'|a82e/([^/]++)/([^/]++)/([^/]++)/bca82e(*:18096)'
+                        .')'
+                        .'|e(?'
+                            .'|83ab/([^/]++)/([^/]++)/([^/]++)/be83ab(*:18149)'
+                            .'|ed13/([^/]++)/([^/]++)/([^/]++)/beed13(*:18197)'
+                        .')'
+                        .'|2eb73/([^/]++)/([^/]++)/([^/]++)/b2eb73(*:18247)'
+                        .'|83aac/([^/]++)/([^/]++)/([^/]++)/b83aac(*:18296)'
+                        .'|ac916/([^/]++)/([^/]++)/([^/]++)/bac916(*:18345)'
+                        .'|b(?'
+                            .'|f94b/([^/]++)/([^/]++)/([^/]++)/bbf94b(*:18397)'
+                            .'|cbff/([^/]++)/([^/]++)/([^/]++)/bbcbff(*:18445)'
+                        .')'
+                        .'|9228e/([^/]++)/([^/]++)/([^/]++)/b9228e(*:18495)'
+                    .')'
+                    .'|/0(?'
+                        .'|2(?'
+                            .'|e74f/([^/]++)/([^/]++)/([^/]++)/02e74f(*:18553)'
+                            .'|522a/([^/]++)/([^/]++)/([^/]++)/02522a(*:18601)'
+                            .'|66e3/([^/]++)/([^/]++)/([^/]++)/0266e3(*:18649)'
+                        .')'
+                        .'|9(?'
+                            .'|3f65/([^/]++)/([^/]++)/([^/]++)/093f65(*:18702)'
+                            .'|1d58/([^/]++)/([^/]++)/([^/]++)/091d58(*:18750)'
+                        .')'
+                        .'|7(?'
+                            .'|2b03/([^/]++)/([^/]++)/([^/]++)/072b03(*:18803)'
+                            .'|e1cd/([^/]++)/([^/]++)/([^/]++)/07e1cd(*:18851)'
+                            .'|7(?'
+                                .'|7d5/([^/]++)/([^/]++)/([^/]++)/0777d5(*:18902)'
+                                .'|e29/([^/]++)/([^/]++)/([^/]++)/077e29(*:18949)'
+                            .')'
+                            .'|cdfd/([^/]++)/([^/]++)/([^/]++)/07cdfd(*:18998)'
+                        .')'
+                        .'|3(?'
+                            .'|afdb/([^/]++)/([^/]++)/([^/]++)/03afdb(*:19051)'
+                            .'|36dc/([^/]++)/([^/]++)/([^/]++)/0336dc(*:19099)'
+                            .'|c6b0/([^/]++)/([^/]++)/([^/]++)/03c6b0(*:19147)'
+                            .'|53ab/([^/]++)/([^/]++)/([^/]++)/0353ab(*:19195)'
+                        .')'
+                        .'|6(?'
+                            .'|9059/([^/]++)/([^/]++)/([^/]++)/069059(*:19248)'
+                            .'|4096/([^/]++)/([^/]++)/([^/]++)/064096(*:19296)'
+                            .'|0ad9/([^/]++)/([^/]++)/([^/]++)/060ad9(*:19344)'
+                            .'|138b/([^/]++)/([^/]++)/([^/]++)/06138b(*:19392)'
+                            .'|eb61/([^/]++)/([^/]++)/([^/]++)/06eb61(*:19440)'
+                        .')'
+                        .'|1(?'
+                            .'|3(?'
+                                .'|d40/([^/]++)/([^/]++)/([^/]++)/013d40(*:19496)'
+                                .'|86b/([^/]++)/([^/]++)/([^/]++)/01386b(*:19543)'
+                            .')'
+                            .'|161a/([^/]++)/([^/]++)/([^/]++)/01161a(*:19592)'
+                            .'|9d38/([^/]++)/([^/]++)/([^/]++)/019d38(*:19640)'
+                        .')'
+                        .'|f(?'
+                            .'|28b5/([^/]++)/([^/]++)/([^/]++)/0f28b5(*:19693)'
+                            .'|49c8/([^/]++)/([^/]++)/([^/]++)/0f49c8(*:19741)'
+                        .')'
+                        .'|a(?'
+                            .'|09c8/([^/]++)/([^/]++)/([^/]++)/0a09c8(*:19794)'
+                            .'|a188/([^/]++)/([^/]++)/([^/]++)/0aa188(*:19842)'
+                        .')'
+                        .'|0(?'
+                            .'|6f52/([^/]++)/([^/]++)/([^/]++)/006f52(*:19895)'
+                            .'|4114/([^/]++)/([^/]++)/([^/]++)/004114(*:19943)'
+                            .'|ec53/([^/]++)/([^/]++)/([^/]++)/00ec53(*:19991)'
+                        .')'
+                        .'|4(?'
+                            .'|5117/([^/]++)/([^/]++)/([^/]++)/045117(*:20044)'
+                            .'|0259/([^/]++)/([^/]++)/([^/]++)/040259(*:20092)'
+                        .')'
+                        .'|84b6f/([^/]++)/([^/]++)/([^/]++)/084b6f(*:20142)'
+                        .'|e(?'
+                            .'|6597/([^/]++)/([^/]++)/([^/]++)/0e6597(*:20194)'
+                            .'|0193/([^/]++)/([^/]++)/([^/]++)/0e0193(*:20242)'
+                        .')'
+                        .'|bb4ae/([^/]++)/([^/]++)/([^/]++)/0bb4ae(*:20292)'
+                        .'|5(?'
+                            .'|049e/([^/]++)/([^/]++)/([^/]++)/05049e(*:20344)'
+                            .'|84ce/([^/]++)/([^/]++)/([^/]++)/0584ce(*:20392)'
+                            .'|f971/([^/]++)/([^/]++)/([^/]++)/05f971(*:20440)'
+                        .')'
+                        .'|c74b7/([^/]++)/([^/]++)/([^/]++)/0c74b7(*:20490)'
+                        .'|d(?'
+                            .'|0fd7/([^/]++)/([^/]++)/([^/]++)/0d0fd7(*:20542)'
+                            .'|eb1c/([^/]++)/([^/]++)/([^/]++)/0deb1c(*:20590)'
+                        .')'
+                    .')'
+                    .'|/f(?'
+                        .'|7(?'
+                            .'|1(?'
+                                .'|771/([^/]++)/([^/]++)/([^/]++)/f71771(*:20652)'
+                                .'|849/([^/]++)/([^/]++)/([^/]++)/f71849(*:20699)'
+                            .')'
+                            .'|e6c8/([^/]++)/([^/]++)/([^/]++)/f7e6c8(*:20748)'
+                            .'|6640/([^/]++)/([^/]++)/([^/]++)/f76640(*:20796)'
+                            .'|3b76/([^/]++)/([^/]++)/([^/]++)/f73b76(*:20844)'
+                            .'|4909/([^/]++)/([^/]++)/([^/]++)/f74909(*:20892)'
+                            .'|70b6/([^/]++)/([^/]++)/([^/]++)/f770b6(*:20940)'
+                        .')'
+                        .'|4(?'
+                            .'|57c5/([^/]++)/([^/]++)/([^/]++)/f457c5(*:20993)'
+                            .'|b9ec/([^/]++)/([^/]++)/([^/]++)/f4b9ec(*:21041)'
+                            .'|f6dc/([^/]++)/([^/]++)/([^/]++)/f4f6dc(*:21089)'
+                        .')'
+                        .'|c(?'
+                            .'|490c/([^/]++)/([^/]++)/([^/]++)/fc490c(*:21142)'
+                            .'|2213/([^/]++)/([^/]++)/([^/]++)/fc2213(*:21190)'
+                            .'|cb60/([^/]++)/([^/]++)/([^/]++)/fccb60(*:21238)'
+                        .')'
+                        .'|b(?'
+                            .'|d793/([^/]++)/([^/]++)/([^/]++)/fbd793(*:21291)'
+                            .'|7b9f/([^/]++)/([^/]++)/([^/]++)/fb7b9f(*:21339)'
+                        .')'
+                        .'|0(?'
+                            .'|33ab/([^/]++)/([^/]++)/([^/]++)/f033ab(*:21392)'
+                            .'|935e/([^/]++)/([^/]++)/([^/]++)/f0935e(*:21440)'
+                        .')'
+                        .'|e(?'
+                            .'|9fc2/([^/]++)/([^/]++)/([^/]++)/fe9fc2(*:21493)'
+                            .'|131d/([^/]++)/([^/]++)/([^/]++)/fe131d(*:21541)'
+                            .'|73f6/([^/]++)/([^/]++)/([^/]++)/fe73f6(*:21589)'
+                        .')'
+                        .'|8(?'
+                            .'|9913/([^/]++)/([^/]++)/([^/]++)/f89913(*:21642)'
+                            .'|c1f2/([^/]++)/([^/]++)/([^/]++)/f8c1f2(*:21690)'
+                            .'|5454/([^/]++)/([^/]++)/([^/]++)/f85454(*:21738)'
+                        .')'
+                        .'|2(?'
+                            .'|2170/([^/]++)/([^/]++)/([^/]++)/f22170(*:21791)'
+                            .'|fc99/([^/]++)/([^/]++)/([^/]++)/f2fc99(*:21839)'
+                        .')'
+                        .'|a(?'
+                            .'|7cdf/([^/]++)/([^/]++)/([^/]++)/fa7cdf(*:21892)'
+                            .'|a9af/([^/]++)/([^/]++)/([^/]++)/faa9af(*:21940)'
+                        .')'
+                        .'|340f1/([^/]++)/([^/]++)/([^/]++)/f340f1(*:21990)'
+                        .'|9(?'
+                            .'|0f2a/([^/]++)/([^/]++)/([^/]++)/f90f2a(*:22042)'
+                            .'|b902/([^/]++)/([^/]++)/([^/]++)/f9b902(*:22090)'
+                        .')'
+                        .'|fd52f/([^/]++)/([^/]++)/([^/]++)/ffd52f(*:22140)'
+                        .'|61d69/([^/]++)/([^/]++)/([^/]++)/f61d69(*:22189)'
+                        .'|5f859/([^/]++)/([^/]++)/([^/]++)/f5f859(*:22238)'
+                        .'|1b6f2/([^/]++)/([^/]++)/([^/]++)/f1b6f2(*:22287)'
+                    .')'
+                    .'|/2(?'
+                        .'|8(?'
+                            .'|3802/([^/]++)/([^/]++)/([^/]++)/283802(*:22345)'
+                            .'|dd2c/([^/]++)/([^/]++)/([^/]++)/28dd2c(*:22393)'
+                            .'|9dff/([^/]++)/([^/]++)/([^/]++)/289dff(*:22441)'
+                            .'|f0b8/([^/]++)/([^/]++)/([^/]++)/28f0b8(*:22489)'
+                        .')'
+                        .'|a(?'
+                            .'|38a4/([^/]++)/([^/]++)/([^/]++)/2a38a4(*:22542)'
+                            .'|79ea/([^/]++)/([^/]++)/([^/]++)/2a79ea(*:22590)'
+                        .')'
+                        .'|6(?'
+                            .'|657d/([^/]++)/([^/]++)/([^/]++)/26657d(*:22643)'
+                            .'|e359/([^/]++)/([^/]++)/([^/]++)/26e359(*:22691)'
+                            .'|3373/([^/]++)/([^/]++)/([^/]++)/263373(*:22739)'
+                        .')'
+                        .'|7(?'
+                            .'|23d0/([^/]++)/([^/]++)/([^/]++)/2723d0(*:22792)'
+                            .'|4ad4/([^/]++)/([^/]++)/([^/]++)/274ad4(*:22840)'
+                        .')'
+                        .'|b(?'
+                            .'|4492/([^/]++)/([^/]++)/([^/]++)/2b4492(*:22893)'
+                            .'|24d4/([^/]++)/([^/]++)/([^/]++)/2b24d4(*:22941)'
+                        .')'
+                        .'|0(?'
+                            .'|2cb9/([^/]++)/([^/]++)/([^/]++)/202cb9(*:22994)'
+                            .'|f075/([^/]++)/([^/]++)/([^/]++)/20f075(*:23042)'
+                            .'|50e0/([^/]++)/([^/]++)/([^/]++)/2050e0(*:23090)'
+                        .')'
+                        .'|f(?'
+                            .'|2b26/([^/]++)/([^/]++)/([^/]++)/2f2b26(*:23143)'
+                            .'|5570/([^/]++)/([^/]++)/([^/]++)/2f5570(*:23191)'
+                        .')'
+                        .'|4(?'
+                            .'|b16f/([^/]++)/([^/]++)/([^/]++)/24b16f(*:23244)'
+                            .'|8e84/([^/]++)/([^/]++)/([^/]++)/248e84(*:23292)'
+                            .'|21fc/([^/]++)/([^/]++)/([^/]++)/2421fc(*:23340)'
+                        .')'
+                        .'|5(?'
+                            .'|b282/([^/]++)/([^/]++)/([^/]++)/25b282(*:23393)'
+                            .'|0cf8/([^/]++)/([^/]++)/([^/]++)/250cf8(*:23441)'
+                            .'|ddc0/([^/]++)/([^/]++)/([^/]++)/25ddc0(*:23489)'
+                        .')'
+                        .'|18a0a/([^/]++)/([^/]++)/([^/]++)/218a0a(*:23539)'
+                    .')'
+                    .'|/5(?'
+                        .'|4229a/([^/]++)/([^/]++)/([^/]++)/54229a(*:23594)'
+                        .'|f(?'
+                            .'|93f9/([^/]++)/([^/]++)/([^/]++)/5f93f9(*:23646)'
+                            .'|d0b3/([^/]++)/([^/]++)/([^/]++)/5fd0b3(*:23694)'
+                        .')'
+                        .'|ef(?'
+                            .'|0(?'
+                                .'|59/([^/]++)/([^/]++)/([^/]++)/5ef059(*:23750)'
+                                .'|b4/([^/]++)/([^/]++)/([^/]++)/5ef0b4(*:23796)'
+                            .')'
+                            .'|698/([^/]++)/([^/]++)/([^/]++)/5ef698(*:23844)'
+                        .')'
+                        .'|8(?'
+                            .'|78a7/([^/]++)/([^/]++)/([^/]++)/5878a7(*:23897)'
+                            .'|a2fc/([^/]++)/([^/]++)/([^/]++)/58a2fc(*:23945)'
+                            .'|238e/([^/]++)/([^/]++)/([^/]++)/58238e(*:23993)'
+                        .')'
+                        .'|7(?'
+                            .'|aeee/([^/]++)/([^/]++)/([^/]++)/57aeee(*:24046)'
+                            .'|7(?'
+                                .'|ef1/([^/]++)/([^/]++)/([^/]++)/577ef1(*:24097)'
+                                .'|bcc/([^/]++)/([^/]++)/([^/]++)/577bcc(*:24144)'
+                            .')'
+                            .'|37c6/([^/]++)/([^/]++)/([^/]++)/5737c6(*:24193)'
+                        .')'
+                        .'|3(?'
+                            .'|9fd5/([^/]++)/([^/]++)/([^/]++)/539fd5(*:24246)'
+                            .'|c3bc/([^/]++)/([^/]++)/([^/]++)/53c3bc(*:24294)'
+                        .')'
+                        .'|5(?'
+                            .'|5d67/([^/]++)/([^/]++)/([^/]++)/555d67(*:24347)'
+                            .'|0a14/([^/]++)/([^/]++)/([^/]++)/550a14(*:24395)'
+                            .'|9cb9/([^/]++)/([^/]++)/([^/]++)/559cb9(*:24443)'
+                            .'|a7cf/([^/]++)/([^/]++)/([^/]++)/55a7cf(*:24491)'
+                        .')'
+                        .'|02e4a/([^/]++)/([^/]++)/([^/]++)/502e4a(*:24541)'
+                        .'|b8add/([^/]++)/([^/]++)/([^/]++)/5b8add(*:24590)'
+                        .'|2720e/([^/]++)/([^/]++)/([^/]++)/52720e(*:24639)'
+                        .'|a4b25/([^/]++)/([^/]++)/([^/]++)/5a4b25(*:24688)'
+                        .'|1d92b/([^/]++)/([^/]++)/([^/]++)/51d92b(*:24737)'
+                        .'|98b3e/([^/]++)/([^/]++)/([^/]++)/598b3e(*:24786)'
+                    .')'
+                .')$}sD',
+            24786 => '{^(?'
+                    .'|/5(?'
+                        .'|b69b9/([^/]++)/([^/]++)/([^/]++)/5b69b9(*:24837)'
+                        .'|9(?'
+                            .'|b90e/([^/]++)/([^/]++)/([^/]++)/59b90e(*:24889)'
+                            .'|c330/([^/]++)/([^/]++)/([^/]++)/59c330(*:24937)'
+                        .')'
+                        .'|3(?'
+                            .'|fde9/([^/]++)/([^/]++)/([^/]++)/53fde9(*:24990)'
+                            .'|e3a7/([^/]++)/([^/]++)/([^/]++)/53e3a7(*:25038)'
+                        .')'
+                        .'|e(?'
+                            .'|a164/([^/]++)/([^/]++)/([^/]++)/5ea164(*:25091)'
+                            .'|3881/([^/]++)/([^/]++)/([^/]++)/5e3881(*:25139)'
+                            .'|9f92/([^/]++)/([^/]++)/([^/]++)/5e9f92(*:25187)'
+                            .'|c91a/([^/]++)/([^/]++)/([^/]++)/5ec91a(*:25235)'
+                        .')'
+                        .'|7(?'
+                            .'|3703/([^/]++)/([^/]++)/([^/]++)/573703(*:25288)'
+                            .'|51ec/([^/]++)/([^/]++)/([^/]++)/5751ec(*:25336)'
+                            .'|05e1/([^/]++)/([^/]++)/([^/]++)/5705e1(*:25384)'
+                        .')'
+                        .'|8(?'
+                            .'|ae74/([^/]++)/([^/]++)/([^/]++)/58ae74(*:25437)'
+                            .'|d4d1/([^/]++)/([^/]++)/([^/]++)/58d4d1(*:25485)'
+                            .'|07a6/([^/]++)/([^/]++)/([^/]++)/5807a6(*:25533)'
+                            .'|e4d4/([^/]++)/([^/]++)/([^/]++)/58e4d4(*:25581)'
+                        .')'
+                        .'|d(?'
+                            .'|44ee/([^/]++)/([^/]++)/([^/]++)/5d44ee(*:25634)'
+                            .'|d9db/([^/]++)/([^/]++)/([^/]++)/5dd9db(*:25682)'
+                        .')'
+                        .'|5(?'
+                            .'|b37c/([^/]++)/([^/]++)/([^/]++)/55b37c(*:25735)'
+                            .'|743c/([^/]++)/([^/]++)/([^/]++)/55743c(*:25783)'
+                            .'|6f39/([^/]++)/([^/]++)/([^/]++)/556f39(*:25831)'
+                        .')'
+                        .'|c(?'
+                            .'|0492/([^/]++)/([^/]++)/([^/]++)/5c0492(*:25884)'
+                            .'|572e/([^/]++)/([^/]++)/([^/]++)/5c572e(*:25932)'
+                            .'|9362/([^/]++)/([^/]++)/([^/]++)/5c9362(*:25980)'
+                        .')'
+                        .'|4(?'
+                            .'|8731/([^/]++)/([^/]++)/([^/]++)/548731(*:26033)'
+                            .'|a367/([^/]++)/([^/]++)/([^/]++)/54a367(*:26081)'
+                        .')'
+                        .'|0(?'
+                            .'|0e75/([^/]++)/([^/]++)/([^/]++)/500e75(*:26134)'
+                            .'|c3d7/([^/]++)/([^/]++)/([^/]++)/50c3d7(*:26182)'
+                        .')'
+                        .'|f(?'
+                            .'|2c22/([^/]++)/([^/]++)/([^/]++)/5f2c22(*:26235)'
+                            .'|0f5e/([^/]++)/([^/]++)/([^/]++)/5f0f5e(*:26283)'
+                        .')'
+                        .'|1ef18/([^/]++)/([^/]++)/([^/]++)/51ef18(*:26333)'
+                    .')'
+                    .'|/b(?'
+                        .'|5(?'
+                            .'|b41f/([^/]++)/([^/]++)/([^/]++)/b5b41f(*:26391)'
+                            .'|dc4e/([^/]++)/([^/]++)/([^/]++)/b5dc4e(*:26439)'
+                            .'|6a18/([^/]++)/([^/]++)/([^/]++)/b56a18(*:26487)'
+                            .'|5ec2/([^/]++)/([^/]++)/([^/]++)/b55ec2(*:26535)'
+                        .')'
+                        .'|337e8/([^/]++)/([^/]++)/([^/]++)/b337e8(*:26585)'
+                        .'|a(?'
+                            .'|2fd3/([^/]++)/([^/]++)/([^/]++)/ba2fd3(*:26637)'
+                            .'|3866/([^/]++)/([^/]++)/([^/]++)/ba3866(*:26685)'
+                        .')'
+                        .'|2(?'
+                            .'|eeb7/([^/]++)/([^/]++)/([^/]++)/b2eeb7(*:26738)'
+                            .'|f627/([^/]++)/([^/]++)/([^/]++)/b2f627(*:26786)'
+                        .')'
+                        .'|7(?'
+                            .'|3dfe/([^/]++)/([^/]++)/([^/]++)/b73dfe(*:26839)'
+                            .'|bb35/([^/]++)/([^/]++)/([^/]++)/b7bb35(*:26887)'
+                            .'|ee6f/([^/]++)/([^/]++)/([^/]++)/b7ee6f(*:26935)'
+                            .'|892f/([^/]++)/([^/]++)/([^/]++)/b7892f(*:26983)'
+                            .'|0683/([^/]++)/([^/]++)/([^/]++)/b70683(*:27031)'
+                        .')'
+                        .'|4(?'
+                            .'|288d/([^/]++)/([^/]++)/([^/]++)/b4288d(*:27084)'
+                            .'|a528/([^/]++)/([^/]++)/([^/]++)/b4a528(*:27132)'
+                        .')'
+                        .'|e(?'
+                            .'|3159/([^/]++)/([^/]++)/([^/]++)/be3159(*:27185)'
+                            .'|b22f/([^/]++)/([^/]++)/([^/]++)/beb22f(*:27233)'
+                            .'|a595/([^/]++)/([^/]++)/([^/]++)/bea595(*:27281)'
+                        .')'
+                        .'|1(?'
+                            .'|eec3/([^/]++)/([^/]++)/([^/]++)/b1eec3(*:27334)'
+                            .'|37fd/([^/]++)/([^/]++)/([^/]++)/b137fd(*:27382)'
+                        .')'
+                        .'|0(?'
+                            .'|56eb/([^/]++)/([^/]++)/([^/]++)/b056eb(*:27435)'
+                            .'|b183/([^/]++)/([^/]++)/([^/]++)/b0b183(*:27483)'
+                        .')'
+                        .'|f6276/([^/]++)/([^/]++)/([^/]++)/bf6276(*:27533)'
+                        .'|6(?'
+                            .'|edc1/([^/]++)/([^/]++)/([^/]++)/b6edc1(*:27585)'
+                            .'|a108/([^/]++)/([^/]++)/([^/]++)/b6a108(*:27633)'
+                        .')'
+                        .'|86e8d/([^/]++)/([^/]++)/([^/]++)/b86e8d(*:27683)'
+                    .')'
+                    .'|/2(?'
+                        .'|8(?'
+                            .'|5e19/([^/]++)/([^/]++)/([^/]++)/285e19(*:27741)'
+                            .'|2(?'
+                                .'|3f4/([^/]++)/([^/]++)/([^/]++)/2823f4(*:27792)'
+                                .'|67a/([^/]++)/([^/]++)/([^/]++)/28267a(*:27839)'
+                            .')'
+                            .'|8cc0/([^/]++)/([^/]++)/([^/]++)/288cc0(*:27888)'
+                            .'|7e03/([^/]++)/([^/]++)/([^/]++)/287e03(*:27936)'
+                        .')'
+                        .'|d(?'
+                            .'|6cc4/([^/]++)/([^/]++)/([^/]++)/2d6cc4(*:27989)'
+                            .'|ea61/([^/]++)/([^/]++)/([^/]++)/2dea61(*:28037)'
+                            .'|ace7/([^/]++)/([^/]++)/([^/]++)/2dace7(*:28085)'
+                        .')'
+                        .'|b(?'
+                            .'|8a61/([^/]++)/([^/]++)/([^/]++)/2b8a61(*:28138)'
+                            .'|b232/([^/]++)/([^/]++)/([^/]++)/2bb232(*:28186)'
+                            .'|a596/([^/]++)/([^/]++)/([^/]++)/2ba596(*:28234)'
+                            .'|cab9/([^/]++)/([^/]++)/([^/]++)/2bcab9(*:28282)'
+                        .')'
+                        .'|9(?'
+                            .'|8f95/([^/]++)/([^/]++)/([^/]++)/298f95(*:28335)'
+                            .'|1597/([^/]++)/([^/]++)/([^/]++)/291597(*:28383)'
+                        .')'
+                        .'|58be1/([^/]++)/([^/]++)/([^/]++)/258be1(*:28433)'
+                        .'|3(?'
+                            .'|3509/([^/]++)/([^/]++)/([^/]++)/233509(*:28485)'
+                            .'|ce18/([^/]++)/([^/]++)/([^/]++)/23ce18(*:28533)'
+                        .')'
+                        .'|6(?'
+                            .'|dd0d/([^/]++)/([^/]++)/([^/]++)/26dd0d(*:28586)'
+                            .'|408f/([^/]++)/([^/]++)/([^/]++)/26408f(*:28634)'
+                        .')'
+                        .'|f(?'
+                            .'|37d1/([^/]++)/([^/]++)/([^/]++)/2f37d1(*:28687)'
+                            .'|885d/([^/]++)/([^/]++)/([^/]++)/2f885d(*:28735)'
+                        .')'
+                        .'|2(?'
+                            .'|91d2/([^/]++)/([^/]++)/([^/]++)/2291d2(*:28788)'
+                            .'|ac3c/([^/]++)/([^/]++)/([^/]++)/22ac3c(*:28836)'
+                            .'|fb0c/([^/]++)/([^/]++)/([^/]++)/22fb0c(*:28884)'
+                        .')'
+                        .'|4(?'
+                            .'|6819/([^/]++)/([^/]++)/([^/]++)/246819(*:28937)'
+                            .'|896e/([^/]++)/([^/]++)/([^/]++)/24896e(*:28985)'
+                        .')'
+                        .'|a(?'
+                            .'|fe45/([^/]++)/([^/]++)/([^/]++)/2afe45(*:29038)'
+                            .'|084e/([^/]++)/([^/]++)/([^/]++)/2a084e(*:29086)'
+                            .'|9d12/([^/]++)/([^/]++)/([^/]++)/2a9d12(*:29134)'
+                            .'|b564/([^/]++)/([^/]++)/([^/]++)/2ab564(*:29182)'
+                        .')'
+                        .'|1(?'
+                            .'|7eed/([^/]++)/([^/]++)/([^/]++)/217eed(*:29235)'
+                            .'|0f76/([^/]++)/([^/]++)/([^/]++)/210f76(*:29283)'
+                        .')'
+                        .'|e65f2/([^/]++)/([^/]++)/([^/]++)/2e65f2(*:29333)'
+                        .'|ca65f/([^/]++)/([^/]++)/([^/]++)/2ca65f(*:29382)'
+                        .'|0aee3/([^/]++)/([^/]++)/([^/]++)/20aee3(*:29431)'
+                    .')'
+                    .'|/e(?'
+                        .'|8(?'
+                            .'|c065/([^/]++)/([^/]++)/([^/]++)/e8c065(*:29489)'
+                            .'|20a4/([^/]++)/([^/]++)/([^/]++)/e820a4(*:29537)'
+                        .')'
+                        .'|2(?'
+                            .'|230b/([^/]++)/([^/]++)/([^/]++)/e2230b(*:29590)'
+                            .'|a2dc/([^/]++)/([^/]++)/([^/]++)/e2a2dc(*:29638)'
+                            .'|05ee/([^/]++)/([^/]++)/([^/]++)/e205ee(*:29686)'
+                        .')'
+                        .'|b(?'
+                            .'|d962/([^/]++)/([^/]++)/([^/]++)/ebd962(*:29739)'
+                            .'|6fdc/([^/]++)/([^/]++)/([^/]++)/eb6fdc(*:29787)'
+                        .')'
+                        .'|d(?'
+                            .'|265b/([^/]++)/([^/]++)/([^/]++)/ed265b(*:29840)'
+                            .'|fbe1/([^/]++)/([^/]++)/([^/]++)/edfbe1(*:29888)'
+                            .'|e7e2/([^/]++)/([^/]++)/([^/]++)/ede7e2(*:29936)'
+                        .')'
+                        .'|6(?'
+                            .'|b4b2/([^/]++)/([^/]++)/([^/]++)/e6b4b2(*:29989)'
+                            .'|cb2a/([^/]++)/([^/]++)/([^/]++)/e6cb2a(*:30037)'
+                        .')'
+                        .'|5(?'
+                            .'|f6ad/([^/]++)/([^/]++)/([^/]++)/e5f6ad(*:30090)'
+                            .'|55eb/([^/]++)/([^/]++)/([^/]++)/e555eb(*:30138)'
+                            .'|841d/([^/]++)/([^/]++)/([^/]++)/e5841d(*:30186)'
+                            .'|7c6b/([^/]++)/([^/]++)/([^/]++)/e57c6b(*:30234)'
+                        .')'
+                        .'|aae33/([^/]++)/([^/]++)/([^/]++)/eaae33(*:30284)'
+                        .'|4(?'
+                            .'|bb4c/([^/]++)/([^/]++)/([^/]++)/e4bb4c(*:30336)'
+                            .'|9b8b/([^/]++)/([^/]++)/([^/]++)/e49b8b(*:30384)'
+                        .')'
+                        .'|7(?'
+                            .'|0611/([^/]++)/([^/]++)/([^/]++)/e70611(*:30437)'
+                            .'|f8a7/([^/]++)/([^/]++)/([^/]++)/e7f8a7(*:30485)'
+                            .'|44f9/([^/]++)/([^/]++)/([^/]++)/e744f9(*:30533)'
+                        .')'
+                        .'|9(?'
+                            .'|95f9/([^/]++)/([^/]++)/([^/]++)/e995f9(*:30586)'
+                            .'|4550/([^/]++)/([^/]++)/([^/]++)/e94550(*:30634)'
+                            .'|7ee2/([^/]++)/([^/]++)/([^/]++)/e97ee2(*:30682)'
+                        .')'
+                        .'|e(?'
+                            .'|fc9e/([^/]++)/([^/]++)/([^/]++)/eefc9e(*:30735)'
+                            .'|b69a/([^/]++)/([^/]++)/([^/]++)/eeb69a(*:30783)'
+                        .')'
+                        .'|0(?'
+                            .'|7413/([^/]++)/([^/]++)/([^/]++)/e07413(*:30836)'
+                            .'|cf1f/([^/]++)/([^/]++)/([^/]++)/e0cf1f(*:30884)'
+                            .'|ec45/([^/]++)/([^/]++)/([^/]++)/e0ec45(*:30932)'
+                        .')'
+                        .'|f4e3b/([^/]++)/([^/]++)/([^/]++)/ef4e3b(*:30982)'
+                        .'|c5aa0/([^/]++)/([^/]++)/([^/]++)/ec5aa0(*:31031)'
+                    .')'
+                    .'|/f(?'
+                        .'|f(?'
+                            .'|4d5f/([^/]++)/([^/]++)/([^/]++)/ff4d5f(*:31089)'
+                            .'|eabd/([^/]++)/([^/]++)/([^/]++)/ffeabd(*:31137)'
+                        .')'
+                        .'|3(?'
+                            .'|f27a/([^/]++)/([^/]++)/([^/]++)/f3f27a(*:31190)'
+                            .'|8762/([^/]++)/([^/]++)/([^/]++)/f38762(*:31238)'
+                        .')'
+                        .'|4(?'
+                            .'|be00/([^/]++)/([^/]++)/([^/]++)/f4be00(*:31291)'
+                            .'|5526/([^/]++)/([^/]++)/([^/]++)/f45526(*:31339)'
+                            .'|7d0a/([^/]++)/([^/]++)/([^/]++)/f47d0a(*:31387)'
+                        .')'
+                        .'|0(?'
+                            .'|e52b/([^/]++)/([^/]++)/([^/]++)/f0e52b(*:31440)'
+                            .'|adc8/([^/]++)/([^/]++)/([^/]++)/f0adc8(*:31488)'
+                        .')'
+                        .'|de926/([^/]++)/([^/]++)/([^/]++)/fde926(*:31538)'
+                        .'|5(?'
+                            .'|deae/([^/]++)/([^/]++)/([^/]++)/f5deae(*:31590)'
+                            .'|7a2f/([^/]++)/([^/]++)/([^/]++)/f57a2f(*:31638)'
+                        .')'
+                        .'|7(?'
+                            .'|6a89/([^/]++)/([^/]++)/([^/]++)/f76a89(*:31691)'
+                            .'|9921/([^/]++)/([^/]++)/([^/]++)/f79921(*:31739)'
+                            .'|e905/([^/]++)/([^/]++)/([^/]++)/f7e905(*:31787)'
+                        .')'
+                        .'|2(?'
+                            .'|9c21/([^/]++)/([^/]++)/([^/]++)/f29c21(*:31840)'
+                            .'|201f/([^/]++)/([^/]++)/([^/]++)/f2201f(*:31888)'
+                        .')'
+                        .'|a(?'
+                            .'|e0b2/([^/]++)/([^/]++)/([^/]++)/fae0b2(*:31941)'
+                            .'|14d4/([^/]++)/([^/]++)/([^/]++)/fa14d4(*:31989)'
+                            .'|3a3c/([^/]++)/([^/]++)/([^/]++)/fa3a3c(*:32037)'
+                            .'|83a1/([^/]++)/([^/]++)/([^/]++)/fa83a1(*:32085)'
+                        .')'
+                        .'|c(?'
+                            .'|cb3c/([^/]++)/([^/]++)/([^/]++)/fccb3c(*:32138)'
+                            .'|8001/([^/]++)/([^/]++)/([^/]++)/fc8001(*:32186)'
+                            .'|3cf4/([^/]++)/([^/]++)/([^/]++)/fc3cf4(*:32234)'
+                            .'|4930/([^/]++)/([^/]++)/([^/]++)/fc4930(*:32282)'
+                        .')'
+                        .'|64eac/([^/]++)/([^/]++)/([^/]++)/f64eac(*:32332)'
+                        .'|b8970/([^/]++)/([^/]++)/([^/]++)/fb8970(*:32381)'
+                        .'|1c159/([^/]++)/([^/]++)/([^/]++)/f1c159(*:32430)'
+                        .'|9(?'
+                            .'|028f/([^/]++)/([^/]++)/([^/]++)/f9028f(*:32482)'
+                            .'|a40a/([^/]++)/([^/]++)/([^/]++)/f9a40a(*:32530)'
+                        .')'
+                        .'|e(?'
+                            .'|8c15/([^/]++)/([^/]++)/([^/]++)/fe8c15(*:32583)'
+                            .'|c8d4/([^/]++)/([^/]++)/([^/]++)/fec8d4(*:32631)'
+                            .'|7ee8/([^/]++)/([^/]++)/([^/]++)/fe7ee8(*:32679)'
+                        .')'
+                    .')'
+                    .'|/3(?'
+                        .'|8(?'
+                            .'|9(?'
+                                .'|bc7/([^/]++)/([^/]++)/([^/]++)/389bc7(*:32741)'
+                                .'|13e/([^/]++)/([^/]++)/([^/]++)/38913e(*:32788)'
+                            .')'
+                            .'|71bd/([^/]++)/([^/]++)/([^/]++)/3871bd(*:32837)'
+                        .')'
+                        .'|d(?'
+                            .'|c487/([^/]++)/([^/]++)/([^/]++)/3dc487(*:32890)'
+                            .'|2d8c/([^/]++)/([^/]++)/([^/]++)/3d2d8c(*:32938)'
+                            .'|8e28/([^/]++)/([^/]++)/([^/]++)/3d8e28(*:32986)'
+                            .'|f1d4/([^/]++)/([^/]++)/([^/]++)/3df1d4(*:33034)'
+                        .')'
+                        .'|7f0e8/([^/]++)/([^/]++)/([^/]++)/37f0e8(*:33084)'
+                        .'|3(?'
+                            .'|e807/([^/]++)/([^/]++)/([^/]++)/33e807(*:33136)'
+                            .'|28bd/([^/]++)/([^/]++)/([^/]++)/3328bd(*:33184)'
+                        .')'
+                        .'|a(?'
+                            .'|0(?'
+                                .'|772/([^/]++)/([^/]++)/([^/]++)/3a0772(*:33240)'
+                                .'|66b/([^/]++)/([^/]++)/([^/]++)/3a066b(*:33287)'
+                            .')'
+                            .'|835d/([^/]++)/([^/]++)/([^/]++)/3a835d(*:33336)'
+                        .')'
+                        .'|0(?'
+                            .'|bb38/([^/]++)/([^/]++)/([^/]++)/30bb38(*:33389)'
+                            .'|3ed4/([^/]++)/([^/]++)/([^/]++)/303ed4(*:33437)'
+                            .'|ef30/([^/]++)/([^/]++)/([^/]++)/30ef30(*:33485)'
+                            .'|1ad0/([^/]++)/([^/]++)/([^/]++)/301ad0(*:33533)'
+                        .')'
+                        .'|4(?'
+                            .'|9389/([^/]++)/([^/]++)/([^/]++)/349389(*:33586)'
+                            .'|35c3/([^/]++)/([^/]++)/([^/]++)/3435c3(*:33634)'
+                        .')'
+                        .'|62(?'
+                            .'|1f1/([^/]++)/([^/]++)/([^/]++)/3621f1(*:33687)'
+                            .'|e80/([^/]++)/([^/]++)/([^/]++)/362e80(*:33734)'
+                        .')'
+                        .'|5(?'
+                            .'|cf86/([^/]++)/([^/]++)/([^/]++)/35cf86(*:33787)'
+                            .'|2407/([^/]++)/([^/]++)/([^/]++)/352407(*:33835)'
+                        .')'
+                        .'|2b30a/([^/]++)/([^/]++)/([^/]++)/32b30a(*:33885)'
+                        .'|1839b/([^/]++)/([^/]++)/([^/]++)/31839b(*:33934)'
+                        .'|b(?'
+                            .'|5dca/([^/]++)/([^/]++)/([^/]++)/3b5dca(*:33986)'
+                            .'|3dba/([^/]++)/([^/]++)/([^/]++)/3b3dba(*:34034)'
+                        .')'
+                        .'|e89eb/([^/]++)/([^/]++)/([^/]++)/3e89eb(*:34084)'
+                        .'|cef96/([^/]++)/([^/]++)/([^/]++)/3cef96(*:34133)'
+                    .')'
+                    .'|/0(?'
+                        .'|8(?'
+                            .'|7408/([^/]++)/([^/]++)/([^/]++)/087408(*:34191)'
+                            .'|b255/([^/]++)/([^/]++)/([^/]++)/08b255(*:34239)'
+                            .'|c543/([^/]++)/([^/]++)/([^/]++)/08c543(*:34287)'
+                            .'|d986/([^/]++)/([^/]++)/([^/]++)/08d986(*:34335)'
+                            .'|419b/([^/]++)/([^/]++)/([^/]++)/08419b(*:34383)'
+                        .')'
+                        .'|7(?'
+                            .'|563a/([^/]++)/([^/]++)/([^/]++)/07563a(*:34436)'
+                            .'|6a0c/([^/]++)/([^/]++)/([^/]++)/076a0c(*:34484)'
+                            .'|a96b/([^/]++)/([^/]++)/([^/]++)/07a96b(*:34532)'
+                            .'|c580/([^/]++)/([^/]++)/([^/]++)/07c580(*:34580)'
+                            .'|8719/([^/]++)/([^/]++)/([^/]++)/078719(*:34628)'
+                        .')'
+                        .'|f(?'
+                            .'|cbc6/([^/]++)/([^/]++)/([^/]++)/0fcbc6(*:34681)'
+                            .'|9661/([^/]++)/([^/]++)/([^/]++)/0f9661(*:34729)'
+                            .'|f(?'
+                                .'|39b/([^/]++)/([^/]++)/([^/]++)/0ff39b(*:34780)'
+                                .'|803/([^/]++)/([^/]++)/([^/]++)/0ff803(*:34827)'
+                            .')'
+                            .'|840b/([^/]++)/([^/]++)/([^/]++)/0f840b(*:34876)'
+                        .')'
+                        .'|1(?'
+                            .'|f78b/([^/]++)/([^/]++)/([^/]++)/01f78b(*:34929)'
+                            .'|3a00/([^/]++)/([^/]++)/([^/]++)/013a00(*:34977)'
+                            .'|8825/([^/]++)/([^/]++)/([^/]++)/018825(*:35025)'
+                        .')'
+                        .'|6(?'
+                            .'|9(?'
+                                .'|d3b/([^/]++)/([^/]++)/([^/]++)/069d3b(*:35081)'
+                                .'|97f/([^/]++)/([^/]++)/([^/]++)/06997f(*:35128)'
+                            .')'
+                            .'|1412/([^/]++)/([^/]++)/([^/]++)/061412(*:35177)'
+                        .')'
+                        .'|4(?'
+                            .'|ecb1/([^/]++)/([^/]++)/([^/]++)/04ecb1(*:35230)'
+                            .'|3c3d/([^/]++)/([^/]++)/([^/]++)/043c3d(*:35278)'
+                        .')'
+                        .'|0ac8e/([^/]++)/([^/]++)/([^/]++)/00ac8e(*:35328)'
+                        .'|5(?'
+                            .'|1e4e/([^/]++)/([^/]++)/([^/]++)/051e4e(*:35380)'
+                            .'|37fb/([^/]++)/([^/]++)/([^/]++)/0537fb(*:35428)'
+                        .')'
+                        .'|d(?'
+                            .'|7de1/([^/]++)/([^/]++)/([^/]++)/0d7de1(*:35481)'
+                            .'|3180/([^/]++)/([^/]++)/([^/]++)/0d3180(*:35529)'
+                            .'|0871/([^/]++)/([^/]++)/([^/]++)/0d0871(*:35577)'
+                        .')'
+                        .'|cb929/([^/]++)/([^/]++)/([^/]++)/0cb929(*:35627)'
+                        .'|2(?'
+                            .'|a32a/([^/]++)/([^/]++)/([^/]++)/02a32a(*:35679)'
+                            .'|4d7f/([^/]++)/([^/]++)/([^/]++)/024d7f(*:35727)'
+                        .')'
+                        .'|efe32/([^/]++)/([^/]++)/([^/]++)/0efe32(*:35777)'
+                        .'|a113e/([^/]++)/([^/]++)/([^/]++)/0a113e(*:35826)'
+                        .'|b8aff/([^/]++)/([^/]++)/([^/]++)/0b8aff(*:35875)'
+                    .')'
+                    .'|/a(?'
+                        .'|7(?'
+                            .'|6088/([^/]++)/([^/]++)/([^/]++)/a76088(*:35933)'
+                            .'|aeed/([^/]++)/([^/]++)/([^/]++)/a7aeed(*:35981)'
+                            .'|33fa/([^/]++)/([^/]++)/([^/]++)/a733fa(*:36029)'
+                        .')'
+                        .'|9a(?'
+                            .'|665/([^/]++)/([^/]++)/([^/]++)/a9a665(*:36082)'
+                            .'|1d5/([^/]++)/([^/]++)/([^/]++)/a9a1d5(*:36129)'
+                        .')'
+                        .'|8(?'
+                            .'|6c45/([^/]++)/([^/]++)/([^/]++)/a86c45(*:36182)'
+                            .'|849b/([^/]++)/([^/]++)/([^/]++)/a8849b(*:36230)'
+                            .'|e(?'
+                                .'|864/([^/]++)/([^/]++)/([^/]++)/a8e864(*:36281)'
+                                .'|cba/([^/]++)/([^/]++)/([^/]++)/a8ecba(*:36328)'
+                            .')'
+                        .')'
+                        .'|c(?'
+                            .'|c3e0/([^/]++)/([^/]++)/([^/]++)/acc3e0(*:36382)'
+                            .'|f4b8/([^/]++)/([^/]++)/([^/]++)/acf4b8(*:36430)'
+                        .')'
+                        .'|b(?'
+                            .'|d815/([^/]++)/([^/]++)/([^/]++)/abd815(*:36483)'
+                            .'|233b/([^/]++)/([^/]++)/([^/]++)/ab233b(*:36531)'
+                            .'|a3b6/([^/]++)/([^/]++)/([^/]++)/aba3b6(*:36579)'
+                            .'|88b1/([^/]++)/([^/]++)/([^/]++)/ab88b1(*:36627)'
+                        .')'
+                        .'|5(?'
+                            .'|3240/([^/]++)/([^/]++)/([^/]++)/a53240(*:36680)'
+                            .'|cdd4/([^/]++)/([^/]++)/([^/]++)/a5cdd4(*:36728)'
+                        .')'
+                        .'|f(?'
+                            .'|d(?'
+                                .'|483/([^/]++)/([^/]++)/([^/]++)/afd483(*:36784)'
+                                .'|a33/([^/]++)/([^/]++)/([^/]++)/afda33(*:36831)'
+                            .')'
+                            .'|f162/([^/]++)/([^/]++)/([^/]++)/aff162(*:36880)'
+                        .')'
+                        .'|e(?'
+                            .'|0eb3/([^/]++)/([^/]++)/([^/]++)/ae0eb3(*:36933)'
+                            .'|b313/([^/]++)/([^/]++)/([^/]++)/aeb313(*:36981)'
+                        .')'
+                        .'|1(?'
+                            .'|d33d/([^/]++)/([^/]++)/([^/]++)/a1d33d(*:37034)'
+                            .'|140a/([^/]++)/([^/]++)/([^/]++)/a1140a(*:37082)'
+                        .')'
+                        .'|ddfa9/([^/]++)/([^/]++)/([^/]++)/addfa9(*:37132)'
+                        .'|6(?'
+                            .'|7f09/([^/]++)/([^/]++)/([^/]++)/a67f09(*:37184)'
+                            .'|4c94/([^/]++)/([^/]++)/([^/]++)/a64c94(*:37232)'
+                        .')'
+                        .'|a169b/([^/]++)/([^/]++)/([^/]++)/aa169b(*:37282)'
+                        .'|4300b/([^/]++)/([^/]++)/([^/]++)/a4300b(*:37331)'
+                        .'|3d68b/([^/]++)/([^/]++)/([^/]++)/a3d68b(*:37380)'
+                    .')'
+                    .'|/1(?'
+                        .'|0(?'
+                            .'|a(?'
+                                .'|7cd/([^/]++)/([^/]++)/([^/]++)/10a7cd(*:37441)'
+                                .'|5ab/([^/]++)/([^/]++)/([^/]++)/10a5ab(*:37488)'
+                            .')'
+                            .'|9a0c/([^/]++)/([^/]++)/([^/]++)/109a0c(*:37537)'
+                        .')'
+                        .'|3f320/([^/]++)/([^/]++)/([^/]++)/13f320(*:37587)'
+                        .'|6(?'
+                            .'|c222/([^/]++)/([^/]++)/([^/]++)/16c222(*:37639)'
+                            .'|8908/([^/]++)/([^/]++)/([^/]++)/168908(*:37687)'
+                        .')'
+                        .'|5(?'
+                            .'|de21/([^/]++)/([^/]++)/([^/]++)/15de21(*:37740)'
+                            .'|95af/([^/]++)/([^/]++)/([^/]++)/1595af(*:37788)'
+                        .')'
+                        .'|1(?'
+                            .'|b921/([^/]++)/([^/]++)/([^/]++)/11b921(*:37841)'
+                            .'|4193/([^/]++)/([^/]++)/([^/]++)/114193(*:37889)'
+                        .')'
+                        .'|bb91f/([^/]++)/([^/]++)/([^/]++)/1bb91f(*:37939)'
+                        .'|7(?'
+                            .'|28ef/([^/]++)/([^/]++)/([^/]++)/1728ef(*:37991)'
+                            .'|c276/([^/]++)/([^/]++)/([^/]++)/17c276(*:38039)'
+                            .'|0c94/([^/]++)/([^/]++)/([^/]++)/170c94(*:38087)'
+                        .')'
+                        .'|85(?'
+                            .'|c29/([^/]++)/([^/]++)/([^/]++)/185c29(*:38140)'
+                            .'|e65/([^/]++)/([^/]++)/([^/]++)/185e65(*:38187)'
+                        .')'
+                        .'|9(?'
+                            .'|2fc0/([^/]++)/([^/]++)/([^/]++)/192fc0(*:38240)'
+                            .'|b(?'
+                                .'|c91/([^/]++)/([^/]++)/([^/]++)/19bc91(*:38291)'
+                                .'|650/([^/]++)/([^/]++)/([^/]++)/19b650(*:38338)'
+                            .')'
+                            .'|05ae/([^/]++)/([^/]++)/([^/]++)/1905ae(*:38387)'
+                        .')'
+                        .'|e(?'
+                            .'|cfb4/([^/]++)/([^/]++)/([^/]++)/1ecfb4(*:38440)'
+                            .'|fa39/([^/]++)/([^/]++)/([^/]++)/1efa39(*:38488)'
+                            .'|056d/([^/]++)/([^/]++)/([^/]++)/1e056d(*:38536)'
+                        .')'
+                        .'|aa48f/([^/]++)/([^/]++)/([^/]++)/1aa48f(*:38586)'
+                        .'|f(?'
+                            .'|c214/([^/]++)/([^/]++)/([^/]++)/1fc214(*:38638)'
+                            .'|5089/([^/]++)/([^/]++)/([^/]++)/1f5089(*:38686)'
+                            .'|4477/([^/]++)/([^/]++)/([^/]++)/1f4477(*:38734)'
+                        .')'
+                        .'|c(?'
+                            .'|c363/([^/]++)/([^/]++)/([^/]++)/1cc363(*:38787)'
+                            .'|1d4d/([^/]++)/([^/]++)/([^/]++)/1c1d4d(*:38835)'
+                            .'|e927/([^/]++)/([^/]++)/([^/]++)/1ce927(*:38883)'
+                        .')'
+                    .')'
+                    .'|/6(?'
+                        .'|3(?'
+                            .'|538f/([^/]++)/([^/]++)/([^/]++)/63538f(*:38942)'
+                            .'|2cee/([^/]++)/([^/]++)/([^/]++)/632cee(*:38990)'
+                            .'|95eb/([^/]++)/([^/]++)/([^/]++)/6395eb(*:39038)'
+                        .')'
+                        .'|9(?'
+                            .'|421f/([^/]++)/([^/]++)/([^/]++)/69421f(*:39091)'
+                            .'|2f93/([^/]++)/([^/]++)/([^/]++)/692f93(*:39139)'
+                        .')'
+                        .'|5658f/([^/]++)/([^/]++)/([^/]++)/65658f(*:39189)'
+                        .'|4(?'
+                            .'|7bba/([^/]++)/([^/]++)/([^/]++)/647bba(*:39241)'
+                            .'|223c/([^/]++)/([^/]++)/([^/]++)/64223c(*:39289)'
+                        .')'
+                        .'|e(?'
+                            .'|2713/([^/]++)/([^/]++)/([^/]++)/6e2713(*:39342)'
+                            .'|0721/([^/]++)/([^/]++)/([^/]++)/6e0721(*:39390)'
+                            .'|7b33/([^/]++)/([^/]++)/([^/]++)/6e7b33(*:39438)'
+                        .')'
+                        .'|0(?'
+                            .'|5ff7/([^/]++)/([^/]++)/([^/]++)/605ff7(*:39491)'
+                            .'|8159/([^/]++)/([^/]++)/([^/]++)/608159(*:39539)'
+                        .')'
+                        .'|a(?'
+                            .'|ca97/([^/]++)/([^/]++)/([^/]++)/6aca97(*:39592)'
+                            .'|10bb/([^/]++)/([^/]++)/([^/]++)/6a10bb(*:39640)'
+                            .'|ab12/([^/]++)/([^/]++)/([^/]++)/6aab12(*:39688)'
+                        .')'
+                        .'|7(?'
+                            .'|66aa/([^/]++)/([^/]++)/([^/]++)/6766aa(*:39741)'
+                            .'|e103/([^/]++)/([^/]++)/([^/]++)/67e103(*:39789)'
+                            .'|d(?'
+                                .'|96d/([^/]++)/([^/]++)/([^/]++)/67d96d(*:39840)'
+                                .'|16d/([^/]++)/([^/]++)/([^/]++)/67d16d(*:39887)'
+                            .')'
+                            .'|0e8a/([^/]++)/([^/]++)/([^/]++)/670e8a(*:39936)'
+                            .'|7e09/([^/]++)/([^/]++)/([^/]++)/677e09(*:39984)'
+                        .')'
+                        .'|8(?'
+                            .'|264b/([^/]++)/([^/]++)/([^/]++)/68264b(*:40037)'
+                            .'|053a/([^/]++)/([^/]++)/([^/]++)/68053a(*:40085)'
+                        .')'
+                        .'|c(?'
+                            .'|2979/([^/]++)/([^/]++)/([^/]++)/6c2979(*:40138)'
+                            .'|d67d/([^/]++)/([^/]++)/([^/]++)/6cd67d(*:40186)'
+                            .'|3cf7/([^/]++)/([^/]++)/([^/]++)/6c3cf7(*:40234)'
+                            .'|fe0e/([^/]++)/([^/]++)/([^/]++)/6cfe0e(*:40282)'
+                        .')'
+                        .'|bc24f/([^/]++)/([^/]++)/([^/]++)/6bc24f(*:40332)'
+                        .'|f2268/([^/]++)/([^/]++)/([^/]++)/6f2268(*:40381)'
+                        .'|1b4a6/([^/]++)/([^/]++)/([^/]++)/61b4a6(*:40430)'
+                        .'|21461/([^/]++)/([^/]++)/([^/]++)/621461(*:40479)'
+                        .'|d0f84/([^/]++)/([^/]++)/([^/]++)/6d0f84(*:40528)'
+                        .'|60229/([^/]++)/([^/]++)/([^/]++)/660229(*:40577)'
+                    .')'
+                    .'|/c(?'
+                        .'|f(?'
+                            .'|6735/([^/]++)/([^/]++)/([^/]++)/cf6735(*:40635)'
+                            .'|bce4/([^/]++)/([^/]++)/([^/]++)/cfbce4(*:40683)'
+                        .')'
+                        .'|3(?'
+                            .'|99(?'
+                                .'|86/([^/]++)/([^/]++)/([^/]++)/c39986(*:40739)'
+                                .'|2e/([^/]++)/([^/]++)/([^/]++)/c3992e(*:40785)'
+                            .')'
+                            .'|61bc/([^/]++)/([^/]++)/([^/]++)/c361bc(*:40834)'
+                            .'|2d9b/([^/]++)/([^/]++)/([^/]++)/c32d9b(*:40882)'
+                        .')'
+                        .'|75b6f/([^/]++)/([^/]++)/([^/]++)/c75b6f(*:40932)'
+                        .'|c(?'
+                            .'|b(?'
+                                .'|1d4/([^/]++)/([^/]++)/([^/]++)/ccb1d4(*:40987)'
+                                .'|098/([^/]++)/([^/]++)/([^/]++)/ccb098(*:41034)'
+                            .')'
+                            .'|c0aa/([^/]++)/([^/]++)/([^/]++)/ccc0aa(*:41083)'
+                            .'|1aa4/([^/]++)/([^/]++)/([^/]++)/cc1aa4(*:41131)'
+                        .')'
+                        .'|b(?'
+                            .'|cb58/([^/]++)/([^/]++)/([^/]++)/cbcb58(*:41184)'
+                            .'|b6a3/([^/]++)/([^/]++)/([^/]++)/cbb6a3(*:41232)'
+                        .')'
+                        .'|9892a/([^/]++)/([^/]++)/([^/]++)/c9892a(*:41282)'
+                        .'|6e19e/([^/]++)/([^/]++)/([^/]++)/c6e19e(*:41331)'
+                        .'|dc0d6/([^/]++)/([^/]++)/([^/]++)/cdc0d6(*:41380)'
+                        .'|5ab0b/([^/]++)/([^/]++)/([^/]++)/c5ab0b(*:41429)'
+                        .'|a(?'
+                            .'|9c26/([^/]++)/([^/]++)/([^/]++)/ca9c26(*:41481)'
+                            .'|8155/([^/]++)/([^/]++)/([^/]++)/ca8155(*:41529)'
+                            .'|7591/([^/]++)/([^/]++)/([^/]++)/ca7591(*:41577)'
+                        .')'
+                        .'|0(?'
+                            .'|6d06/([^/]++)/([^/]++)/([^/]++)/c06d06(*:41630)'
+                            .'|f168/([^/]++)/([^/]++)/([^/]++)/c0f168(*:41678)'
+                        .')'
+                        .'|8(?'
+                            .'|ed21/([^/]++)/([^/]++)/([^/]++)/c8ed21(*:41731)'
+                            .'|fbbc/([^/]++)/([^/]++)/([^/]++)/c8fbbc(*:41779)'
+                            .'|c41c/([^/]++)/([^/]++)/([^/]++)/c8c41c(*:41827)'
+                        .')'
+                        .'|15da1/([^/]++)/([^/]++)/([^/]++)/c15da1(*:41877)'
+                        .'|2(?'
+                            .'|626d/([^/]++)/([^/]++)/([^/]++)/c2626d(*:41929)'
+                            .'|aee8/([^/]++)/([^/]++)/([^/]++)/c2aee8(*:41977)'
+                            .'|2abf/([^/]++)/([^/]++)/([^/]++)/c22abf(*:42025)'
+                        .')'
+                        .'|e78d1/([^/]++)/([^/]++)/([^/]++)/ce78d1(*:42075)'
+                        .'|4(?'
+                            .'|015b/([^/]++)/([^/]++)/([^/]++)/c4015b(*:42127)'
+                            .'|b31c/([^/]++)/([^/]++)/([^/]++)/c4b31c(*:42175)'
+                        .')'
+                    .')'
+                    .'|/8(?'
+                        .'|5(?'
+                            .'|422a/([^/]++)/([^/]++)/([^/]++)/85422a(*:42234)'
+                            .'|1ddf/([^/]++)/([^/]++)/([^/]++)/851ddf(*:42282)'
+                            .'|fc37/([^/]++)/([^/]++)/([^/]++)/85fc37(*:42330)'
+                        .')'
+                        .'|1(?'
+                            .'|4481/([^/]++)/([^/]++)/([^/]++)/814481(*:42383)'
+                            .'|e74d/([^/]++)/([^/]++)/([^/]++)/81e74d(*:42431)'
+                        .')'
+                        .'|d(?'
+                            .'|3(?'
+                                .'|420/([^/]++)/([^/]++)/([^/]++)/8d3420(*:42487)'
+                                .'|17b/([^/]++)/([^/]++)/([^/]++)/8d317b(*:42534)'
+                            .')'
+                            .'|f707/([^/]++)/([^/]++)/([^/]++)/8df707(*:42583)'
+                            .'|6dc3/([^/]++)/([^/]++)/([^/]++)/8d6dc3(*:42631)'
+                        .')'
+                        .'|e(?'
+                            .'|efcf/([^/]++)/([^/]++)/([^/]++)/8eefcf(*:42684)'
+                            .'|bda5/([^/]++)/([^/]++)/([^/]++)/8ebda5(*:42732)'
+                            .'|82ab/([^/]++)/([^/]++)/([^/]++)/8e82ab(*:42780)'
+                        .')'
+                        .'|b(?'
+                            .'|16eb/([^/]++)/([^/]++)/([^/]++)/8b16eb(*:42833)'
+                            .'|6dd7/([^/]++)/([^/]++)/([^/]++)/8b6dd7(*:42881)'
+                            .'|5040/([^/]++)/([^/]++)/([^/]++)/8b5040(*:42929)'
+                        .')'
+                        .'|c(?'
+                            .'|7bbb/([^/]++)/([^/]++)/([^/]++)/8c7bbb(*:42982)'
+                            .'|6744/([^/]++)/([^/]++)/([^/]++)/8c6744(*:43030)'
+                            .'|235f/([^/]++)/([^/]++)/([^/]++)/8c235f(*:43078)'
+                        .')'
+                        .'|8(?'
+                            .'|4d24/([^/]++)/([^/]++)/([^/]++)/884d24(*:43131)'
+                            .'|ae63/([^/]++)/([^/]++)/([^/]++)/88ae63(*:43179)'
+                        .')'
+                        .'|7(?'
+                            .'|5715/([^/]++)/([^/]++)/([^/]++)/875715(*:43232)'
+                            .'|2488/([^/]++)/([^/]++)/([^/]++)/872488(*:43280)'
+                        .')'
+                        .'|4(?'
+                            .'|1172/([^/]++)/([^/]++)/([^/]++)/841172(*:43333)'
+                            .'|6c26/([^/]++)/([^/]++)/([^/]++)/846c26(*:43381)'
+                            .'|f7e6/([^/]++)/([^/]++)/([^/]++)/84f7e6(*:43429)'
+                            .'|7cc5/([^/]++)/([^/]++)/([^/]++)/847cc5(*:43477)'
+                        .')'
+                        .'|f(?'
+                            .'|ecb2/([^/]++)/([^/]++)/([^/]++)/8fecb2(*:43530)'
+                            .'|7d80/([^/]++)/([^/]++)/([^/]++)/8f7d80(*:43578)'
+                            .'|468c/([^/]++)/([^/]++)/([^/]++)/8f468c(*:43626)'
+                        .')'
+                        .'|a0e11/([^/]++)/([^/]++)/([^/]++)/8a0e11(*:43676)'
+                        .'|2(?'
+                            .'|f2b3/([^/]++)/([^/]++)/([^/]++)/82f2b3(*:43728)'
+                            .'|489c/([^/]++)/([^/]++)/([^/]++)/82489c(*:43776)'
+                        .')'
+                        .'|6(?'
+                            .'|b122/([^/]++)/([^/]++)/([^/]++)/86b122(*:43829)'
+                            .'|0320/([^/]++)/([^/]++)/([^/]++)/860320(*:43877)'
+                        .')'
+                        .'|9(?'
+                            .'|2c91/([^/]++)/([^/]++)/([^/]++)/892c91(*:43930)'
+                            .'|fcd0/([^/]++)/([^/]++)/([^/]++)/89fcd0(*:43978)'
+                        .')'
+                        .'|065d0/([^/]++)/([^/]++)/([^/]++)/8065d0(*:44028)'
+                    .')'
+                    .'|/d(?'
+                        .'|6(?'
+                            .'|4a34/([^/]++)/([^/]++)/([^/]++)/d64a34(*:44086)'
+                            .'|c651/([^/]++)/([^/]++)/([^/]++)/d6c651(*:44134)'
+                        .')'
+                        .'|f(?'
+                            .'|877f/([^/]++)/([^/]++)/([^/]++)/df877f(*:44187)'
+                            .'|263d/([^/]++)/([^/]++)/([^/]++)/df263d(*:44235)'
+                            .'|7f28/([^/]++)/([^/]++)/([^/]++)/df7f28(*:44283)'
+                            .'|6d23/([^/]++)/([^/]++)/([^/]++)/df6d23(*:44331)'
+                        .')'
+                        .'|b(?'
+                            .'|85e2/([^/]++)/([^/]++)/([^/]++)/db85e2(*:44384)'
+                            .'|e272/([^/]++)/([^/]++)/([^/]++)/dbe272(*:44432)'
+                        .')'
+                        .'|d(?'
+                            .'|45(?'
+                                .'|85/([^/]++)/([^/]++)/([^/]++)/dd4585(*:44488)'
+                                .'|04/([^/]++)/([^/]++)/([^/]++)/dd4504(*:44534)'
+                            .')'
+                            .'|8eb9/([^/]++)/([^/]++)/([^/]++)/dd8eb9(*:44583)'
+                        .')'
+                        .'|a(?'
+                            .'|ca41/([^/]++)/([^/]++)/([^/]++)/daca41(*:44636)'
+                            .'|8ce5/([^/]++)/([^/]++)/([^/]++)/da8ce5(*:44684)'
+                            .'|0d11/([^/]++)/([^/]++)/([^/]++)/da0d11(*:44732)'
+                        .')'
+                        .'|4(?'
+                            .'|90d7/([^/]++)/([^/]++)/([^/]++)/d490d7(*:44785)'
+                            .'|c2e4/([^/]++)/([^/]++)/([^/]++)/d4c2e4(*:44833)'
+                        .')'
+                        .'|8(?'
+                            .'|6ea6/([^/]++)/([^/]++)/([^/]++)/d86ea6(*:44886)'
+                            .'|40cc/([^/]++)/([^/]++)/([^/]++)/d840cc(*:44934)'
+                        .')'
+                        .'|c(?'
+                            .'|82d6/([^/]++)/([^/]++)/([^/]++)/dc82d6(*:44987)'
+                            .'|6a70/([^/]++)/([^/]++)/([^/]++)/dc6a70(*:45035)'
+                            .'|5689/([^/]++)/([^/]++)/([^/]++)/dc5689(*:45083)'
+                        .')'
+                        .'|7(?'
+                            .'|a728/([^/]++)/([^/]++)/([^/]++)/d7a728(*:45136)'
+                            .'|0732/([^/]++)/([^/]++)/([^/]++)/d70732(*:45184)'
+                            .'|9aac/([^/]++)/([^/]++)/([^/]++)/d79aac(*:45232)'
+                        .')'
+                        .'|14220/([^/]++)/([^/]++)/([^/]++)/d14220(*:45282)'
+                        .'|5(?'
+                            .'|cfea/([^/]++)/([^/]++)/([^/]++)/d5cfea(*:45334)'
+                            .'|8072/([^/]++)/([^/]++)/([^/]++)/d58072(*:45382)'
+                            .'|54f7/([^/]++)/([^/]++)/([^/]++)/d554f7(*:45430)'
+                            .'|16b1/([^/]++)/([^/]++)/([^/]++)/d516b1(*:45478)'
+                            .'|6b9f/([^/]++)/([^/]++)/([^/]++)/d56b9f(*:45526)'
+                        .')'
+                        .'|045c5/([^/]++)/([^/]++)/([^/]++)/d045c5(*:45576)'
+                        .'|2(?'
+                            .'|ed45/([^/]++)/([^/]++)/([^/]++)/d2ed45(*:45628)'
+                            .'|40e3/([^/]++)/([^/]++)/([^/]++)/d240e3(*:45676)'
+                        .')'
+                        .'|93ed5/([^/]++)/([^/]++)/([^/]++)/d93ed5(*:45726)'
+                    .')'
+                    .'|/7(?'
+                        .'|b(?'
+                            .'|cdf7/([^/]++)/([^/]++)/([^/]++)/7bcdf7(*:45784)'
+                            .'|13b2/([^/]++)/([^/]++)/([^/]++)/7b13b2(*:45832)'
+                        .')'
+                        .'|dcd34/([^/]++)/([^/]++)/([^/]++)/7dcd34(*:45882)'
+                        .'|f(?'
+                            .'|24d2/([^/]++)/([^/]++)/([^/]++)/7f24d2(*:45934)'
+                            .'|5d04/([^/]++)/([^/]++)/([^/]++)/7f5d04(*:45982)'
+                            .'|1171/([^/]++)/([^/]++)/([^/]++)/7f1171(*:46030)'
+                            .'|a732/([^/]++)/([^/]++)/([^/]++)/7fa732(*:46078)'
+                        .')'
+                        .'|6(?'
+                            .'|6ebc/([^/]++)/([^/]++)/([^/]++)/766ebc(*:46131)'
+                            .'|34ea/([^/]++)/([^/]++)/([^/]++)/7634ea(*:46179)'
+                        .')'
+                        .'|750ca/([^/]++)/([^/]++)/([^/]++)/7750ca(*:46229)'
+                        .'|1(?'
+                            .'|a(?'
+                                .'|3cb/([^/]++)/([^/]++)/([^/]++)/71a3cb(*:46284)'
+                                .'|d16/([^/]++)/([^/]++)/([^/]++)/71ad16(*:46331)'
+                            .')'
+                            .'|43d7/([^/]++)/([^/]++)/([^/]++)/7143d7(*:46380)'
+                        .')'
+                        .'|88d98/([^/]++)/([^/]++)/([^/]++)/788d98(*:46430)'
+                        .'|2(?'
+                            .'|da7f/([^/]++)/([^/]++)/([^/]++)/72da7f(*:46482)'
+                            .'|50eb/([^/]++)/([^/]++)/([^/]++)/7250eb(*:46530)'
+                        .')'
+                        .'|c(?'
+                            .'|590f/([^/]++)/([^/]++)/([^/]++)/7c590f(*:46583)'
+                            .'|e328/([^/]++)/([^/]++)/([^/]++)/7ce328(*:46631)'
+                        .')'
+                        .'|a5392/([^/]++)/([^/]++)/([^/]++)/7a5392(*:46681)'
+                        .'|95c7a/([^/]++)/([^/]++)/([^/]++)/795c7a(*:46730)'
+                        .'|504ad/([^/]++)/([^/]++)/([^/]++)/7504ad(*:46779)'
+                        .'|04afe/([^/]++)/([^/]++)/([^/]++)/704afe(*:46828)'
+                        .'|4bba2/([^/]++)/([^/]++)/([^/]++)/74bba2(*:46877)'
+                    .')'
+                    .'|/9(?'
+                        .'|b(?'
+                            .'|72e3/([^/]++)/([^/]++)/([^/]++)/9b72e3(*:46935)'
+                            .'|698e/([^/]++)/([^/]++)/([^/]++)/9b698e(*:46983)'
+                        .')'
+                        .'|7e852/([^/]++)/([^/]++)/([^/]++)/97e852(*:47033)'
+                        .'|4c7bb/([^/]++)/([^/]++)/([^/]++)/94c7bb(*:47082)'
+                        .'|9(?'
+                            .'|c5e0/([^/]++)/([^/]++)/([^/]++)/99c5e0(*:47134)'
+                            .'|6a7f/([^/]++)/([^/]++)/([^/]++)/996a7f(*:47182)'
+                            .'|bcfc/([^/]++)/([^/]++)/([^/]++)/99bcfc(*:47230)'
+                            .'|0827/([^/]++)/([^/]++)/([^/]++)/990827(*:47278)'
+                        .')'
+                        .'|a(?'
+                            .'|d6aa/([^/]++)/([^/]++)/([^/]++)/9ad6aa(*:47331)'
+                            .'|b0d8/([^/]++)/([^/]++)/([^/]++)/9ab0d8(*:47379)'
+                        .')'
+                        .'|c(?'
+                            .'|f81d/([^/]++)/([^/]++)/([^/]++)/9cf81d(*:47432)'
+                            .'|c138/([^/]++)/([^/]++)/([^/]++)/9cc138(*:47480)'
+                            .'|82c7/([^/]++)/([^/]++)/([^/]++)/9c82c7(*:47528)'
+                            .'|0180/([^/]++)/([^/]++)/([^/]++)/9c0180(*:47576)'
+                        .')'
+                        .'|f(?'
+                            .'|396f/([^/]++)/([^/]++)/([^/]++)/9f396f(*:47629)'
+                            .'|e859/([^/]++)/([^/]++)/([^/]++)/9fe859(*:47677)'
+                            .'|53d8/([^/]++)/([^/]++)/([^/]++)/9f53d8(*:47725)'
+                        .')'
+                        .'|12d2b/([^/]++)/([^/]++)/([^/]++)/912d2b(*:47775)'
+                        .'|59a55/([^/]++)/([^/]++)/([^/]++)/959a55(*:47824)'
+                        .'|6(?'
+                            .'|ea64/([^/]++)/([^/]++)/([^/]++)/96ea64(*:47876)'
+                            .'|b9bf/([^/]++)/([^/]++)/([^/]++)/96b9bf(*:47924)'
+                        .')'
+                        .'|e3cfc/([^/]++)/([^/]++)/([^/]++)/9e3cfc(*:47974)'
+                        .'|2(?'
+                            .'|fb0c/([^/]++)/([^/]++)/([^/]++)/92fb0c(*:48026)'
+                            .'|262b/([^/]++)/([^/]++)/([^/]++)/92262b(*:48074)'
+                            .'|32fe/([^/]++)/([^/]++)/([^/]++)/9232fe(*:48122)'
+                            .'|977a/([^/]++)/([^/]++)/([^/]++)/92977a(*:48170)'
+                        .')'
+                        .'|8d6f5/([^/]++)/([^/]++)/([^/]++)/98d6f5(*:48220)'
+                        .'|0794e/([^/]++)/([^/]++)/([^/]++)/90794e(*:48269)'
+                        .'|34815/([^/]++)/([^/]++)/([^/]++)/934815(*:48318)'
+                    .')'
+                    .'|/4(?'
+                        .'|e(?'
+                            .'|4b5f/([^/]++)/([^/]++)/([^/]++)/4e4b5f(*:48376)'
+                            .'|a06f/([^/]++)/([^/]++)/([^/]++)/4ea06f(*:48424)'
+                            .'|0(?'
+                                .'|928/([^/]++)/([^/]++)/([^/]++)/4e0928(*:48475)'
+                                .'|cb6/([^/]++)/([^/]++)/([^/]++)/4e0cb6(*:48522)'
+                            .')'
+                        .')'
+                        .'|6922a/([^/]++)/([^/]++)/([^/]++)/46922a(*:48573)'
+                        .'|4(?'
+                            .'|c4c1/([^/]++)/([^/]++)/([^/]++)/44c4c1(*:48625)'
+                            .'|3cb0/([^/]++)/([^/]++)/([^/]++)/443cb0(*:48673)'
+                        .')'
+                        .'|8ab2f/([^/]++)/([^/]++)/([^/]++)/48ab2f(*:48723)'
+                        .'|5(?'
+                            .'|645a/([^/]++)/([^/]++)/([^/]++)/45645a(*:48775)'
+                            .'|58db/([^/]++)/([^/]++)/([^/]++)/4558db(*:48823)'
+                        .')'
+                        .'|2e77b/([^/]++)/([^/]++)/([^/]++)/42e77b(*:48873)'
+                        .'|c27ce/([^/]++)/([^/]++)/([^/]++)/4c27ce(*:48922)'
+                        .'|f(?'
+                            .'|fce0/([^/]++)/([^/]++)/([^/]++)/4ffce0(*:48974)'
+                            .'|ac9b/([^/]++)/([^/]++)/([^/]++)/4fac9b(*:49022)'
+                        .')'
+                        .'|a47d2/([^/]++)/([^/]++)/([^/]++)/4a47d2(*:49072)'
+                        .'|70e7a/([^/]++)/([^/]++)/([^/]++)/470e7a(*:49121)'
+                        .'|b(?'
+                            .'|0(?'
+                                .'|4a6/([^/]++)/([^/]++)/([^/]++)/4b04a6(*:49176)'
+                                .'|a59/([^/]++)/([^/]++)/([^/]++)/4b0a59(*:49223)'
+                                .'|250/([^/]++)/([^/]++)/([^/]++)/4b0250(*:49270)'
+                            .')'
+                            .'|6538/([^/]++)/([^/]++)/([^/]++)/4b6538(*:49319)'
+                        .')'
+                        .'|3(?'
+                            .'|f(?'
+                                .'|a7f/([^/]++)/([^/]++)/([^/]++)/43fa7f(*:49375)'
+                                .'|eae/([^/]++)/([^/]++)/([^/]++)/43feae(*:49422)'
+                            .')'
+                            .'|0c36/([^/]++)/([^/]++)/([^/]++)/430c36(*:49471)'
+                            .'|7d7d/([^/]++)/([^/]++)/([^/]++)/437d7d(*:49519)'
+                            .'|1135/([^/]++)/([^/]++)/([^/]++)/431135(*:49567)'
+                        .')'
+                        .'|d(?'
+                            .'|5b99/([^/]++)/([^/]++)/([^/]++)/4d5b99(*:49620)'
+                            .'|aa3d/([^/]++)/([^/]++)/([^/]++)/4daa3d(*:49668)'
+                        .')'
+                        .'|9c9ad/([^/]++)/([^/]++)/([^/]++)/49c9ad(*:49718)'
+                    .')'
+                .')$}sD',
+        );
+
+        foreach ($regexList as $offset => $regex) {
+            while (preg_match($regex, $matchedPathinfo, $matches)) {
+                switch ($m = (int) $matches['MARK']) {
+                    default:
+                        $routes = array(
+                            54 => array(array('_route' => '_0'), array('a', 'b', 'c'), null, null),
+                            102 => array(array('_route' => '_190'), array('a', 'b', 'c'), null, null),
+                            147 => array(array('_route' => '_478'), array('a', 'b', 'c'), null, null),
+                            194 => array(array('_route' => '_259'), array('a', 'b', 'c'), null, null),
+                            240 => array(array('_route' => '_368'), array('a', 'b', 'c'), null, null),
+                            291 => array(array('_route' => '_1'), array('a', 'b', 'c'), null, null),
+                            337 => array(array('_route' => '_116'), array('a', 'b', 'c'), null, null),
+                            383 => array(array('_route' => '_490'), array('a', 'b', 'c'), null, null),
+                            434 => array(array('_route' => '_2'), array('a', 'b', 'c'), null, null),
+                            480 => array(array('_route' => '_124'), array('a', 'b', 'c'), null, null),
+                            526 => array(array('_route' => '_389'), array('a', 'b', 'c'), null, null),
+                            577 => array(array('_route' => '_8'), array('a', 'b', 'c'), null, null),
+                            623 => array(array('_route' => '_104'), array('a', 'b', 'c'), null, null),
+                            677 => array(array('_route' => '_12'), array('a', 'b', 'c'), null, null),
+                            722 => array(array('_route' => '_442'), array('a', 'b', 'c'), null, null),
+                            769 => array(array('_route' => '_253'), array('a', 'b', 'c'), null, null),
+                            820 => array(array('_route' => '_13'), array('a', 'b', 'c'), null, null),
+                            866 => array(array('_route' => '_254'), array('a', 'b', 'c'), null, null),
+                            912 => array(array('_route' => '_347'), array('a', 'b', 'c'), null, null),
+                            963 => array(array('_route' => '_16'), array('a', 'b', 'c'), null, null),
+                            1009 => array(array('_route' => '_87'), array('a', 'b', 'c'), null, null),
+                            1058 => array(array('_route' => '_31'), array('a', 'b', 'c'), null, null),
+                            1109 => array(array('_route' => '_50'), array('a', 'b', 'c'), null, null),
+                            1156 => array(array('_route' => '_219'), array('a', 'b', 'c'), null, null),
+                            1203 => array(array('_route' => '_332'), array('a', 'b', 'c'), null, null),
+                            1250 => array(array('_route' => '_359'), array('a', 'b', 'c'), null, null),
+                            1302 => array(array('_route' => '_183'), array('a', 'b', 'c'), null, null),
+                            1349 => array(array('_route' => '_500'), array('a', 'b', 'c'), null, null),
+                            1401 => array(array('_route' => '_214'), array('a', 'b', 'c'), null, null),
+                            1448 => array(array('_route' => '_321'), array('a', 'b', 'c'), null, null),
+                            1497 => array(array('_route' => '_243'), array('a', 'b', 'c'), null, null),
+                            1545 => array(array('_route' => '_328'), array('a', 'b', 'c'), null, null),
+                            1596 => array(array('_route' => '_362'), array('a', 'b', 'c'), null, null),
+                            1643 => array(array('_route' => '_488'), array('a', 'b', 'c'), null, null),
+                            1701 => array(array('_route' => '_3'), array('a', 'b', 'c'), null, null),
+                            1751 => array(array('_route' => '_102'), array('a', 'b', 'c'), null, null),
+                            1797 => array(array('_route' => '_220'), array('a', 'b', 'c'), null, null),
+                            1845 => array(array('_route' => '_127'), array('a', 'b', 'c'), null, null),
+                            1897 => array(array('_route' => '_5'), array('a', 'b', 'c'), null, null),
+                            1944 => array(array('_route' => '_242'), array('a', 'b', 'c'), null, null),
+                            1991 => array(array('_route' => '_397'), array('a', 'b', 'c'), null, null),
+                            2038 => array(array('_route' => '_454'), array('a', 'b', 'c'), null, null),
+                            2090 => array(array('_route' => '_34'), array('a', 'b', 'c'), null, null),
+                            2137 => array(array('_route' => '_281'), array('a', 'b', 'c'), null, null),
+                            2189 => array(array('_route' => '_64'), array('a', 'b', 'c'), null, null),
+                            2236 => array(array('_route' => '_205'), array('a', 'b', 'c'), null, null),
+                            2291 => array(array('_route' => '_71'), array('a', 'b', 'c'), null, null),
+                            2337 => array(array('_route' => '_203'), array('a', 'b', 'c'), null, null),
+                            2385 => array(array('_route' => '_97'), array('a', 'b', 'c'), null, null),
+                            2437 => array(array('_route' => '_98'), array('a', 'b', 'c'), null, null),
+                            2484 => array(array('_route' => '_267'), array('a', 'b', 'c'), null, null),
+                            2531 => array(array('_route' => '_309'), array('a', 'b', 'c'), null, null),
+                            2586 => array(array('_route' => '_117'), array('a', 'b', 'c'), null, null),
+                            2631 => array(array('_route' => '_211'), array('a', 'b', 'c'), null, null),
+                            2679 => array(array('_route' => '_484'), array('a', 'b', 'c'), null, null),
+                            2731 => array(array('_route' => '_139'), array('a', 'b', 'c'), null, null),
+                            2778 => array(array('_route' => '_421'), array('a', 'b', 'c'), null, null),
+                            2830 => array(array('_route' => '_185'), array('a', 'b', 'c'), null, null),
+                            2877 => array(array('_route' => '_439'), array('a', 'b', 'c'), null, null),
+                            2926 => array(array('_route' => '_218'), array('a', 'b', 'c'), null, null),
+                            2977 => array(array('_route' => '_233'), array('a', 'b', 'c'), null, null),
+                            3024 => array(array('_route' => '_483'), array('a', 'b', 'c'), null, null),
+                            3073 => array(array('_route' => '_265'), array('a', 'b', 'c'), null, null),
+                            3124 => array(array('_route' => '_299'), array('a', 'b', 'c'), null, null),
+                            3171 => array(array('_route' => '_351'), array('a', 'b', 'c'), null, null),
+                            3218 => array(array('_route' => '_472'), array('a', 'b', 'c'), null, null),
+                            3267 => array(array('_route' => '_360'), array('a', 'b', 'c'), null, null),
+                            3315 => array(array('_route' => '_466'), array('a', 'b', 'c'), null, null),
+                            3372 => array(array('_route' => '_4'), array('a', 'b', 'c'), null, null),
+                            3419 => array(array('_route' => '_142'), array('a', 'b', 'c'), null, null),
+                            3466 => array(array('_route' => '_151'), array('a', 'b', 'c'), null, null),
+                            3513 => array(array('_route' => '_308'), array('a', 'b', 'c'), null, null),
+                            3560 => array(array('_route' => '_440'), array('a', 'b', 'c'), null, null),
+                            3612 => array(array('_route' => '_14'), array('a', 'b', 'c'), null, null),
+                            3659 => array(array('_route' => '_358'), array('a', 'b', 'c'), null, null),
+                            3711 => array(array('_route' => '_37'), array('a', 'b', 'c'), null, null),
+                            3758 => array(array('_route' => '_38'), array('a', 'b', 'c'), null, null),
+                            3805 => array(array('_route' => '_146'), array('a', 'b', 'c'), null, null),
+                            3852 => array(array('_route' => '_194'), array('a', 'b', 'c'), null, null),
+                            3899 => array(array('_route' => '_487'), array('a', 'b', 'c'), null, null),
+                            3948 => array(array('_route' => '_42'), array('a', 'b', 'c'), null, null),
+                            3999 => array(array('_route' => '_54'), array('a', 'b', 'c'), null, null),
+                            4046 => array(array('_route' => '_326'), array('a', 'b', 'c'), null, null),
+                            4098 => array(array('_route' => '_68'), array('a', 'b', 'c'), null, null),
+                            4145 => array(array('_route' => '_108'), array('a', 'b', 'c'), null, null),
+                            4197 => array(array('_route' => '_74'), array('a', 'b', 'c'), null, null),
+                            4244 => array(array('_route' => '_315'), array('a', 'b', 'c'), null, null),
+                            4291 => array(array('_route' => '_374'), array('a', 'b', 'c'), null, null),
+                            4343 => array(array('_route' => '_99'), array('a', 'b', 'c'), null, null),
+                            4390 => array(array('_route' => '_238'), array('a', 'b', 'c'), null, null),
+                            4442 => array(array('_route' => '_107'), array('a', 'b', 'c'), null, null),
+                            4489 => array(array('_route' => '_409'), array('a', 'b', 'c'), null, null),
+                            4541 => array(array('_route' => '_122'), array('a', 'b', 'c'), null, null),
+                            4588 => array(array('_route' => '_379'), array('a', 'b', 'c'), null, null),
+                            4635 => array(array('_route' => '_390'), array('a', 'b', 'c'), null, null),
+                            4687 => array(array('_route' => '_171'), array('a', 'b', 'c'), null, null),
+                            4734 => array(array('_route' => '_260'), array('a', 'b', 'c'), null, null),
+                            4781 => array(array('_route' => '_434'), array('a', 'b', 'c'), null, null),
+                            4830 => array(array('_route' => '_189'), array('a', 'b', 'c'), null, null),
+                            4878 => array(array('_route' => '_467'), array('a', 'b', 'c'), null, null),
+                            4935 => array(array('_route' => '_6'), array('a', 'b', 'c'), null, null),
+                            4982 => array(array('_route' => '_286'), array('a', 'b', 'c'), null, null),
+                            5029 => array(array('_route' => '_438'), array('a', 'b', 'c'), null, null),
+                            5081 => array(array('_route' => '_19'), array('a', 'b', 'c'), null, null),
+                            5131 => array(array('_route' => '_24'), array('a', 'b', 'c'), null, null),
+                            5177 => array(array('_route' => '_172'), array('a', 'b', 'c'), null, null),
+                            5230 => array(array('_route' => '_33'), array('a', 'b', 'c'), null, null),
+                            5277 => array(array('_route' => '_400'), array('a', 'b', 'c'), null, null),
+                            5324 => array(array('_route' => '_427'), array('a', 'b', 'c'), null, null),
+                            5376 => array(array('_route' => '_35'), array('a', 'b', 'c'), null, null),
+                            5423 => array(array('_route' => '_156'), array('a', 'b', 'c'), null, null),
+                            5475 => array(array('_route' => '_36'), array('a', 'b', 'c'), null, null),
+                            5522 => array(array('_route' => '_251'), array('a', 'b', 'c'), null, null),
+                            5574 => array(array('_route' => '_43'), array('a', 'b', 'c'), null, null),
+                            5621 => array(array('_route' => '_292'), array('a', 'b', 'c'), null, null),
+                            5668 => array(array('_route' => '_411'), array('a', 'b', 'c'), null, null),
+                            5720 => array(array('_route' => '_69'), array('a', 'b', 'c'), null, null),
+                            5767 => array(array('_route' => '_159'), array('a', 'b', 'c'), null, null),
+                            5814 => array(array('_route' => '_170'), array('a', 'b', 'c'), null, null),
+                            5861 => array(array('_route' => '_376'), array('a', 'b', 'c'), null, null),
+                            5913 => array(array('_route' => '_131'), array('a', 'b', 'c'), null, null),
+                            5960 => array(array('_route' => '_446'), array('a', 'b', 'c'), null, null),
+                            6015 => array(array('_route' => '_140'), array('a', 'b', 'c'), null, null),
+                            6061 => array(array('_route' => '_353'), array('a', 'b', 'c'), null, null),
+                            6112 => array(array('_route' => '_224'), array('a', 'b', 'c'), null, null),
+                            6158 => array(array('_route' => '_346'), array('a', 'b', 'c'), null, null),
+                            6204 => array(array('_route' => '_443'), array('a', 'b', 'c'), null, null),
+                            6254 => array(array('_route' => '_154'), array('a', 'b', 'c'), null, null),
+                            6305 => array(array('_route' => '_212'), array('a', 'b', 'c'), null, null),
+                            6352 => array(array('_route' => '_313'), array('a', 'b', 'c'), null, null),
+                            6399 => array(array('_route' => '_395'), array('a', 'b', 'c'), null, null),
+                            6446 => array(array('_route' => '_441'), array('a', 'b', 'c'), null, null),
+                            6498 => array(array('_route' => '_223'), array('a', 'b', 'c'), null, null),
+                            6545 => array(array('_route' => '_303'), array('a', 'b', 'c'), null, null),
+                            6594 => array(array('_route' => '_410'), array('a', 'b', 'c'), null, null),
+                            6642 => array(array('_route' => '_494'), array('a', 'b', 'c'), null, null),
+                            6702 => array(array('_route' => '_7'), array('a', 'b', 'c'), null, null),
+                            6748 => array(array('_route' => '_268'), array('a', 'b', 'c'), null, null),
+                            6796 => array(array('_route' => '_178'), array('a', 'b', 'c'), null, null),
+                            6843 => array(array('_route' => '_179'), array('a', 'b', 'c'), null, null),
+                            6890 => array(array('_route' => '_416'), array('a', 'b', 'c'), null, null),
+                            6942 => array(array('_route' => '_25'), array('a', 'b', 'c'), null, null),
+                            6989 => array(array('_route' => '_307'), array('a', 'b', 'c'), null, null),
+                            7036 => array(array('_route' => '_387'), array('a', 'b', 'c'), null, null),
+                            7083 => array(array('_route' => '_471'), array('a', 'b', 'c'), null, null),
+                            7132 => array(array('_route' => '_90'), array('a', 'b', 'c'), null, null),
+                            7183 => array(array('_route' => '_95'), array('a', 'b', 'c'), null, null),
+                            7230 => array(array('_route' => '_338'), array('a', 'b', 'c'), null, null),
+                            7277 => array(array('_route' => '_401'), array('a', 'b', 'c'), null, null),
+                            7329 => array(array('_route' => '_147'), array('a', 'b', 'c'), null, null),
+                            7376 => array(array('_route' => '_319'), array('a', 'b', 'c'), null, null),
+                            7423 => array(array('_route' => '_354'), array('a', 'b', 'c'), null, null),
+                            7470 => array(array('_route' => '_428'), array('a', 'b', 'c'), null, null),
+                            7522 => array(array('_route' => '_162'), array('a', 'b', 'c'), null, null),
+                            7572 => array(array('_route' => '_175'), array('a', 'b', 'c'), null, null),
+                            7618 => array(array('_route' => '_455'), array('a', 'b', 'c'), null, null),
+                            7666 => array(array('_route' => '_355'), array('a', 'b', 'c'), null, null),
+                            7718 => array(array('_route' => '_197'), array('a', 'b', 'c'), null, null),
+                            7768 => array(array('_route' => '_202'), array('a', 'b', 'c'), null, null),
+                            7813 => array(array('_route' => '_489'), array('a', 'b', 'c'), null, null),
+                            7863 => array(array('_route' => '_199'), array('a', 'b', 'c'), null, null),
+                            7914 => array(array('_route' => '_263'), array('a', 'b', 'c'), null, null),
+                            7961 => array(array('_route' => '_406'), array('a', 'b', 'c'), null, null),
+                            8010 => array(array('_route' => '_289'), array('a', 'b', 'c'), null, null),
+                            8058 => array(array('_route' => '_325'), array('a', 'b', 'c'), null, null),
+                            8106 => array(array('_route' => '_378'), array('a', 'b', 'c'), null, null),
+                            8154 => array(array('_route' => '_468'), array('a', 'b', 'c'), null, null),
+                            8211 => array(array('_route' => '_9'), array('a', 'b', 'c'), null, null),
+                            8258 => array(array('_route' => '_216'), array('a', 'b', 'c'), null, null),
+                            8307 => array(array('_route' => '_26'), array('a', 'b', 'c'), null, null),
+                            8355 => array(array('_route' => '_62'), array('a', 'b', 'c'), null, null),
+                            8406 => array(array('_route' => '_81'), array('a', 'b', 'c'), null, null),
+                            8453 => array(array('_route' => '_318'), array('a', 'b', 'c'), null, null),
+                            8505 => array(array('_route' => '_121'), array('a', 'b', 'c'), null, null),
+                            8551 => array(array('_route' => '_182'), array('a', 'b', 'c'), null, null),
+                            8603 => array(array('_route' => '_136'), array('a', 'b', 'c'), null, null),
+                            8650 => array(array('_route' => '_415'), array('a', 'b', 'c'), null, null),
+                            8697 => array(array('_route' => '_457'), array('a', 'b', 'c'), null, null),
+                            8744 => array(array('_route' => '_463'), array('a', 'b', 'c'), null, null),
+                            8796 => array(array('_route' => '_148'), array('a', 'b', 'c'), null, null),
+                            8843 => array(array('_route' => '_273'), array('a', 'b', 'c'), null, null),
+                            8892 => array(array('_route' => '_284'), array('a', 'b', 'c'), null, null),
+                            8940 => array(array('_route' => '_288'), array('a', 'b', 'c'), null, null),
+                            8991 => array(array('_route' => '_295'), array('a', 'b', 'c'), null, null),
+                            9038 => array(array('_route' => '_305'), array('a', 'b', 'c'), null, null),
+                            9085 => array(array('_route' => '_453'), array('a', 'b', 'c'), null, null),
+                            9134 => array(array('_route' => '_340'), array('a', 'b', 'c'), null, null),
+                            9185 => array(array('_route' => '_371'), array('a', 'b', 'c'), null, null),
+                            9232 => array(array('_route' => '_417'), array('a', 'b', 'c'), null, null),
+                            9284 => array(array('_route' => '_382'), array('a', 'b', 'c'), null, null),
+                            9331 => array(array('_route' => '_404'), array('a', 'b', 'c'), null, null),
+                            9389 => array(array('_route' => '_10'), array('a', 'b', 'c'), null, null),
+                            9436 => array(array('_route' => '_279'), array('a', 'b', 'c'), null, null),
+                            9483 => array(array('_route' => '_377'), array('a', 'b', 'c'), null, null),
+                            9535 => array(array('_route' => '_39'), array('a', 'b', 'c'), null, null),
+                            9582 => array(array('_route' => '_40'), array('a', 'b', 'c'), null, null),
+                            9629 => array(array('_route' => '_264'), array('a', 'b', 'c'), null, null),
+                            9676 => array(array('_route' => '_449'), array('a', 'b', 'c'), null, null),
+                            9728 => array(array('_route' => '_46'), array('a', 'b', 'c'), null, null),
+                            9775 => array(array('_route' => '_257'), array('a', 'b', 'c'), null, null),
+                            9822 => array(array('_route' => '_274'), array('a', 'b', 'c'), null, null),
+                            9869 => array(array('_route' => '_388'), array('a', 'b', 'c'), null, null),
+                            9921 => array(array('_route' => '_53'), array('a', 'b', 'c'), null, null),
+                            9968 => array(array('_route' => '_345'), array('a', 'b', 'c'), null, null),
+                            10020 => array(array('_route' => '_73'), array('a', 'b', 'c'), null, null),
+                            10068 => array(array('_route' => '_296'), array('a', 'b', 'c'), null, null),
+                            10121 => array(array('_route' => '_75'), array('a', 'b', 'c'), null, null),
+                            10169 => array(array('_route' => '_458'), array('a', 'b', 'c'), null, null),
+                            10225 => array(array('_route' => '_79'), array('a', 'b', 'c'), null, null),
+                            10272 => array(array('_route' => '_129'), array('a', 'b', 'c'), null, null),
+                            10319 => array(array('_route' => '_418'), array('a', 'b', 'c'), null, null),
+                            10368 => array(array('_route' => '_225'), array('a', 'b', 'c'), null, null),
+                            10416 => array(array('_route' => '_479'), array('a', 'b', 'c'), null, null),
+                            10466 => array(array('_route' => '_120'), array('a', 'b', 'c'), null, null),
+                            10515 => array(array('_route' => '_276'), array('a', 'b', 'c'), null, null),
+                            10564 => array(array('_route' => '_370'), array('a', 'b', 'c'), null, null),
+                            10616 => array(array('_route' => '_385'), array('a', 'b', 'c'), null, null),
+                            10664 => array(array('_route' => '_469'), array('a', 'b', 'c'), null, null),
+                            10714 => array(array('_route' => '_435'), array('a', 'b', 'c'), null, null),
+                            10772 => array(array('_route' => '_11'), array('a', 'b', 'c'), null, null),
+                            10820 => array(array('_route' => '_105'), array('a', 'b', 'c'), null, null),
+                            10868 => array(array('_route' => '_132'), array('a', 'b', 'c'), null, null),
+                            10921 => array(array('_route' => '_18'), array('a', 'b', 'c'), null, null),
+                            10969 => array(array('_route' => '_210'), array('a', 'b', 'c'), null, null),
+                            11017 => array(array('_route' => '_329'), array('a', 'b', 'c'), null, null),
+                            11073 => array(array('_route' => '_29'), array('a', 'b', 'c'), null, null),
+                            11120 => array(array('_route' => '_480'), array('a', 'b', 'c'), null, null),
+                            11169 => array(array('_route' => '_426'), array('a', 'b', 'c'), null, null),
+                            11222 => array(array('_route' => '_32'), array('a', 'b', 'c'), null, null),
+                            11270 => array(array('_route' => '_217'), array('a', 'b', 'c'), null, null),
+                            11318 => array(array('_route' => '_275'), array('a', 'b', 'c'), null, null),
+                            11371 => array(array('_route' => '_45'), array('a', 'b', 'c'), null, null),
+                            11419 => array(array('_route' => '_157'), array('a', 'b', 'c'), null, null),
+                            11467 => array(array('_route' => '_184'), array('a', 'b', 'c'), null, null),
+                            11515 => array(array('_route' => '_250'), array('a', 'b', 'c'), null, null),
+                            11563 => array(array('_route' => '_356'), array('a', 'b', 'c'), null, null),
+                            11616 => array(array('_route' => '_47'), array('a', 'b', 'c'), null, null),
+                            11664 => array(array('_route' => '_445'), array('a', 'b', 'c'), null, null),
+                            11714 => array(array('_route' => '_48'), array('a', 'b', 'c'), null, null),
+                            11766 => array(array('_route' => '_58'), array('a', 'b', 'c'), null, null),
+                            11814 => array(array('_route' => '_414'), array('a', 'b', 'c'), null, null),
+                            11862 => array(array('_route' => '_431'), array('a', 'b', 'c'), null, null),
+                            11915 => array(array('_route' => '_84'), array('a', 'b', 'c'), null, null),
+                            11963 => array(array('_route' => '_294'), array('a', 'b', 'c'), null, null),
+                            12011 => array(array('_route' => '_336'), array('a', 'b', 'c'), null, null),
+                            12059 => array(array('_route' => '_465'), array('a', 'b', 'c'), null, null),
+                            12112 => array(array('_route' => '_103'), array('a', 'b', 'c'), null, null),
+                            12160 => array(array('_route' => '_111'), array('a', 'b', 'c'), null, null),
+                            12208 => array(array('_route' => '_207'), array('a', 'b', 'c'), null, null),
+                            12256 => array(array('_route' => '_402'), array('a', 'b', 'c'), null, null),
+                            12309 => array(array('_route' => '_230'), array('a', 'b', 'c'), null, null),
+                            12356 => array(array('_route' => '_331'), array('a', 'b', 'c'), null, null),
+                            12406 => array(array('_route' => '_248'), array('a', 'b', 'c'), null, null),
+                            12455 => array(array('_route' => '_282'), array('a', 'b', 'c'), null, null),
+                            12513 => array(array('_route' => '_15'), array('a', 'b', 'c'), null, null),
+                            12561 => array(array('_route' => '_130'), array('a', 'b', 'c'), null, null),
+                            12609 => array(array('_route' => '_231'), array('a', 'b', 'c'), null, null),
+                            12657 => array(array('_route' => '_365'), array('a', 'b', 'c'), null, null),
+                            12705 => array(array('_route' => '_448'), array('a', 'b', 'c'), null, null),
+                            12758 => array(array('_route' => '_20'), array('a', 'b', 'c'), null, null),
+                            12806 => array(array('_route' => '_93'), array('a', 'b', 'c'), null, null),
+                            12854 => array(array('_route' => '_186'), array('a', 'b', 'c'), null, null),
+                            12902 => array(array('_route' => '_460'), array('a', 'b', 'c'), null, null),
+                            12955 => array(array('_route' => '_52'), array('a', 'b', 'c'), null, null),
+                            13003 => array(array('_route' => '_447'), array('a', 'b', 'c'), null, null),
+                            13056 => array(array('_route' => '_56'), array('a', 'b', 'c'), null, null),
+                            13104 => array(array('_route' => '_133'), array('a', 'b', 'c'), null, null),
+                            13152 => array(array('_route' => '_297'), array('a', 'b', 'c'), null, null),
+                            13205 => array(array('_route' => '_82'), array('a', 'b', 'c'), null, null),
+                            13253 => array(array('_route' => '_165'), array('a', 'b', 'c'), null, null),
+                            13301 => array(array('_route' => '_213'), array('a', 'b', 'c'), null, null),
+                            13351 => array(array('_route' => '_86'), array('a', 'b', 'c'), null, null),
+                            13403 => array(array('_route' => '_92'), array('a', 'b', 'c'), null, null),
+                            13450 => array(array('_route' => '_280'), array('a', 'b', 'c'), null, null),
+                            13500 => array(array('_route' => '_143'), array('a', 'b', 'c'), null, null),
+                            13549 => array(array('_route' => '_177'), array('a', 'b', 'c'), null, null),
+                            13601 => array(array('_route' => '_188'), array('a', 'b', 'c'), null, null),
+                            13649 => array(array('_route' => '_311'), array('a', 'b', 'c'), null, null),
+                            13697 => array(array('_route' => '_350'), array('a', 'b', 'c'), null, null),
+                            13750 => array(array('_route' => '_226'), array('a', 'b', 'c'), null, null),
+                            13798 => array(array('_route' => '_291'), array('a', 'b', 'c'), null, null),
+                            13851 => array(array('_route' => '_244'), array('a', 'b', 'c'), null, null),
+                            13898 => array(array('_route' => '_287'), array('a', 'b', 'c'), null, null),
+                            13951 => array(array('_route' => '_300'), array('a', 'b', 'c'), null, null),
+                            13999 => array(array('_route' => '_451'), array('a', 'b', 'c'), null, null),
+                            14047 => array(array('_route' => '_452'), array('a', 'b', 'c'), null, null),
+                            14095 => array(array('_route' => '_481'), array('a', 'b', 'c'), null, null),
+                            14145 => array(array('_route' => '_312'), array('a', 'b', 'c'), null, null),
+                            14203 => array(array('_route' => '_17'), array('a', 'b', 'c'), null, null),
+                            14251 => array(array('_route' => '_227'), array('a', 'b', 'c'), null, null),
+                            14299 => array(array('_route' => '_393'), array('a', 'b', 'c'), null, null),
+                            14349 => array(array('_route' => '_57'), array('a', 'b', 'c'), null, null),
+                            14401 => array(array('_route' => '_61'), array('a', 'b', 'c'), null, null),
+                            14449 => array(array('_route' => '_112'), array('a', 'b', 'c'), null, null),
+                            14500 => array(array('_route' => '_135'), array('a', 'b', 'c'), null, null),
+                            14547 => array(array('_route' => '_271'), array('a', 'b', 'c'), null, null),
+                            14596 => array(array('_route' => '_459'), array('a', 'b', 'c'), null, null),
+                            14649 => array(array('_route' => '_67'), array('a', 'b', 'c'), null, null),
+                            14697 => array(array('_route' => '_113'), array('a', 'b', 'c'), null, null),
+                            14745 => array(array('_route' => '_497'), array('a', 'b', 'c'), null, null),
+                            14795 => array(array('_route' => '_70'), array('a', 'b', 'c'), null, null),
+                            14847 => array(array('_route' => '_89'), array('a', 'b', 'c'), null, null),
+                            14895 => array(array('_route' => '_128'), array('a', 'b', 'c'), null, null),
+                            14948 => array(array('_route' => '_150'), array('a', 'b', 'c'), null, null),
+                            14996 => array(array('_route' => '_166'), array('a', 'b', 'c'), null, null),
+                            15047 => array(array('_route' => '_206'), array('a', 'b', 'c'), null, null),
+                            15094 => array(array('_route' => '_419'), array('a', 'b', 'c'), null, null),
+                            15148 => array(array('_route' => '_201'), array('a', 'b', 'c'), null, null),
+                            15196 => array(array('_route' => '_314'), array('a', 'b', 'c'), null, null),
+                            15244 => array(array('_route' => '_429'), array('a', 'b', 'c'), null, null),
+                            15297 => array(array('_route' => '_228'), array('a', 'b', 'c'), null, null),
+                            15345 => array(array('_route' => '_477'), array('a', 'b', 'c'), null, null),
+                            15395 => array(array('_route' => '_272'), array('a', 'b', 'c'), null, null),
+                            15444 => array(array('_route' => '_486'), array('a', 'b', 'c'), null, null),
+                            15502 => array(array('_route' => '_21'), array('a', 'b', 'c'), null, null),
+                            15550 => array(array('_route' => '_247'), array('a', 'b', 'c'), null, null),
+                            15598 => array(array('_route' => '_424'), array('a', 'b', 'c'), null, null),
+                            15646 => array(array('_route' => '_499'), array('a', 'b', 'c'), null, null),
+                            15699 => array(array('_route' => '_23'), array('a', 'b', 'c'), null, null),
+                            15747 => array(array('_route' => '_152'), array('a', 'b', 'c'), null, null),
+                            15795 => array(array('_route' => '_304'), array('a', 'b', 'c'), null, null),
+                            15843 => array(array('_route' => '_352'), array('a', 'b', 'c'), null, null),
+                            15896 => array(array('_route' => '_28'), array('a', 'b', 'c'), null, null),
+                            15944 => array(array('_route' => '_240'), array('a', 'b', 'c'), null, null),
+                            16000 => array(array('_route' => '_30'), array('a', 'b', 'c'), null, null),
+                            16047 => array(array('_route' => '_41'), array('a', 'b', 'c'), null, null),
+                            16096 => array(array('_route' => '_301'), array('a', 'b', 'c'), null, null),
+                            16149 => array(array('_route' => '_66'), array('a', 'b', 'c'), null, null),
+                            16197 => array(array('_route' => '_72'), array('a', 'b', 'c'), null, null),
+                            16245 => array(array('_route' => '_320'), array('a', 'b', 'c'), null, null),
+                            16298 => array(array('_route' => '_78'), array('a', 'b', 'c'), null, null),
+                            16346 => array(array('_route' => '_337'), array('a', 'b', 'c'), null, null),
+                            16394 => array(array('_route' => '_399'), array('a', 'b', 'c'), null, null),
+                            16442 => array(array('_route' => '_495'), array('a', 'b', 'c'), null, null),
+                            16492 => array(array('_route' => '_85'), array('a', 'b', 'c'), null, null),
+                            16544 => array(array('_route' => '_101'), array('a', 'b', 'c'), null, null),
+                            16592 => array(array('_route' => '_176'), array('a', 'b', 'c'), null, null),
+                            16640 => array(array('_route' => '_246'), array('a', 'b', 'c'), null, null),
+                            16693 => array(array('_route' => '_125'), array('a', 'b', 'c'), null, null),
+                            16741 => array(array('_route' => '_341'), array('a', 'b', 'c'), null, null),
+                            16794 => array(array('_route' => '_137'), array('a', 'b', 'c'), null, null),
+                            16842 => array(array('_route' => '_270'), array('a', 'b', 'c'), null, null),
+                            16890 => array(array('_route' => '_386'), array('a', 'b', 'c'), null, null),
+                            16943 => array(array('_route' => '_169'), array('a', 'b', 'c'), null, null),
+                            16991 => array(array('_route' => '_200'), array('a', 'b', 'c'), null, null),
+                            17039 => array(array('_route' => '_262'), array('a', 'b', 'c'), null, null),
+                            17092 => array(array('_route' => '_187'), array('a', 'b', 'c'), null, null),
+                            17140 => array(array('_route' => '_333'), array('a', 'b', 'c'), null, null),
+                            17190 => array(array('_route' => '_215'), array('a', 'b', 'c'), null, null),
+                            17239 => array(array('_route' => '_316'), array('a', 'b', 'c'), null, null),
+                            17288 => array(array('_route' => '_343'), array('a', 'b', 'c'), null, null),
+                            17346 => array(array('_route' => '_22'), array('a', 'b', 'c'), null, null),
+                            17394 => array(array('_route' => '_420'), array('a', 'b', 'c'), null, null),
+                            17447 => array(array('_route' => '_55'), array('a', 'b', 'c'), null, null),
+                            17494 => array(array('_route' => '_496'), array('a', 'b', 'c'), null, null),
+                            17547 => array(array('_route' => '_153'), array('a', 'b', 'c'), null, null),
+                            17595 => array(array('_route' => '_344'), array('a', 'b', 'c'), null, null),
+                            17648 => array(array('_route' => '_160'), array('a', 'b', 'c'), null, null),
+                            17696 => array(array('_route' => '_398'), array('a', 'b', 'c'), null, null),
+                            17749 => array(array('_route' => '_161'), array('a', 'b', 'c'), null, null),
+                            17797 => array(array('_route' => '_193'), array('a', 'b', 'c'), null, null),
+                            17847 => array(array('_route' => '_174'), array('a', 'b', 'c'), null, null),
+                            17899 => array(array('_route' => '_209'), array('a', 'b', 'c'), null, null),
+                            17947 => array(array('_route' => '_261'), array('a', 'b', 'c'), null, null),
+                            18000 => array(array('_route' => '_222'), array('a', 'b', 'c'), null, null),
+                            18048 => array(array('_route' => '_323'), array('a', 'b', 'c'), null, null),
+                            18096 => array(array('_route' => '_380'), array('a', 'b', 'c'), null, null),
+                            18149 => array(array('_route' => '_232'), array('a', 'b', 'c'), null, null),
+                            18197 => array(array('_route' => '_383'), array('a', 'b', 'c'), null, null),
+                            18247 => array(array('_route' => '_306'), array('a', 'b', 'c'), null, null),
+                            18296 => array(array('_route' => '_327'), array('a', 'b', 'c'), null, null),
+                            18345 => array(array('_route' => '_364'), array('a', 'b', 'c'), null, null),
+                            18397 => array(array('_route' => '_403'), array('a', 'b', 'c'), null, null),
+                            18445 => array(array('_route' => '_405'), array('a', 'b', 'c'), null, null),
+                            18495 => array(array('_route' => '_412'), array('a', 'b', 'c'), null, null),
+                            18553 => array(array('_route' => '_27'), array('a', 'b', 'c'), null, null),
+                            18601 => array(array('_route' => '_134'), array('a', 'b', 'c'), null, null),
+                            18649 => array(array('_route' => '_245'), array('a', 'b', 'c'), null, null),
+                            18702 => array(array('_route' => '_59'), array('a', 'b', 'c'), null, null),
+                            18750 => array(array('_route' => '_208'), array('a', 'b', 'c'), null, null),
+                            18803 => array(array('_route' => '_60'), array('a', 'b', 'c'), null, null),
+                            18851 => array(array('_route' => '_119'), array('a', 'b', 'c'), null, null),
+                            18902 => array(array('_route' => '_163'), array('a', 'b', 'c'), null, null),
+                            18949 => array(array('_route' => '_249'), array('a', 'b', 'c'), null, null),
+                            18998 => array(array('_route' => '_278'), array('a', 'b', 'c'), null, null),
+                            19051 => array(array('_route' => '_63'), array('a', 'b', 'c'), null, null),
+                            19099 => array(array('_route' => '_195'), array('a', 'b', 'c'), null, null),
+                            19147 => array(array('_route' => '_252'), array('a', 'b', 'c'), null, null),
+                            19195 => array(array('_route' => '_461'), array('a', 'b', 'c'), null, null),
+                            19248 => array(array('_route' => '_126'), array('a', 'b', 'c'), null, null),
+                            19296 => array(array('_route' => '_158'), array('a', 'b', 'c'), null, null),
+                            19344 => array(array('_route' => '_221'), array('a', 'b', 'c'), null, null),
+                            19392 => array(array('_route' => '_269'), array('a', 'b', 'c'), null, null),
+                            19440 => array(array('_route' => '_310'), array('a', 'b', 'c'), null, null),
+                            19496 => array(array('_route' => '_138'), array('a', 'b', 'c'), null, null),
+                            19543 => array(array('_route' => '_348'), array('a', 'b', 'c'), null, null),
+                            19592 => array(array('_route' => '_236'), array('a', 'b', 'c'), null, null),
+                            19640 => array(array('_route' => '_433'), array('a', 'b', 'c'), null, null),
+                            19693 => array(array('_route' => '_141'), array('a', 'b', 'c'), null, null),
+                            19741 => array(array('_route' => '_283'), array('a', 'b', 'c'), null, null),
+                            19794 => array(array('_route' => '_144'), array('a', 'b', 'c'), null, null),
+                            19842 => array(array('_route' => '_191'), array('a', 'b', 'c'), null, null),
+                            19895 => array(array('_route' => '_168'), array('a', 'b', 'c'), null, null),
+                            19943 => array(array('_route' => '_363'), array('a', 'b', 'c'), null, null),
+                            19991 => array(array('_route' => '_381'), array('a', 'b', 'c'), null, null),
+                            20044 => array(array('_route' => '_180'), array('a', 'b', 'c'), null, null),
+                            20092 => array(array('_route' => '_339'), array('a', 'b', 'c'), null, null),
+                            20142 => array(array('_route' => '_196'), array('a', 'b', 'c'), null, null),
+                            20194 => array(array('_route' => '_198'), array('a', 'b', 'c'), null, null),
+                            20242 => array(array('_route' => '_285'), array('a', 'b', 'c'), null, null),
+                            20292 => array(array('_route' => '_349'), array('a', 'b', 'c'), null, null),
+                            20344 => array(array('_route' => '_367'), array('a', 'b', 'c'), null, null),
+                            20392 => array(array('_route' => '_384'), array('a', 'b', 'c'), null, null),
+                            20440 => array(array('_route' => '_498'), array('a', 'b', 'c'), null, null),
+                            20490 => array(array('_route' => '_369'), array('a', 'b', 'c'), null, null),
+                            20542 => array(array('_route' => '_408'), array('a', 'b', 'c'), null, null),
+                            20590 => array(array('_route' => '_413'), array('a', 'b', 'c'), null, null),
+                            20652 => array(array('_route' => '_44'), array('a', 'b', 'c'), null, null),
+                            20699 => array(array('_route' => '_256'), array('a', 'b', 'c'), null, null),
+                            20748 => array(array('_route' => '_173'), array('a', 'b', 'c'), null, null),
+                            20796 => array(array('_route' => '_266'), array('a', 'b', 'c'), null, null),
+                            20844 => array(array('_route' => '_392'), array('a', 'b', 'c'), null, null),
+                            20892 => array(array('_route' => '_430'), array('a', 'b', 'c'), null, null),
+                            20940 => array(array('_route' => '_482'), array('a', 'b', 'c'), null, null),
+                            20993 => array(array('_route' => '_49'), array('a', 'b', 'c'), null, null),
+                            21041 => array(array('_route' => '_94'), array('a', 'b', 'c'), null, null),
+                            21089 => array(array('_route' => '_407'), array('a', 'b', 'c'), null, null),
+                            21142 => array(array('_route' => '_65'), array('a', 'b', 'c'), null, null),
+                            21190 => array(array('_route' => '_181'), array('a', 'b', 'c'), null, null),
+                            21238 => array(array('_route' => '_437'), array('a', 'b', 'c'), null, null),
+                            21291 => array(array('_route' => '_76'), array('a', 'b', 'c'), null, null),
+                            21339 => array(array('_route' => '_357'), array('a', 'b', 'c'), null, null),
+                            21392 => array(array('_route' => '_80'), array('a', 'b', 'c'), null, null),
+                            21440 => array(array('_route' => '_106'), array('a', 'b', 'c'), null, null),
+                            21493 => array(array('_route' => '_83'), array('a', 'b', 'c'), null, null),
+                            21541 => array(array('_route' => '_255'), array('a', 'b', 'c'), null, null),
+                            21589 => array(array('_route' => '_330'), array('a', 'b', 'c'), null, null),
+                            21642 => array(array('_route' => '_100'), array('a', 'b', 'c'), null, null),
+                            21690 => array(array('_route' => '_396'), array('a', 'b', 'c'), null, null),
+                            21738 => array(array('_route' => '_422'), array('a', 'b', 'c'), null, null),
+                            21791 => array(array('_route' => '_149'), array('a', 'b', 'c'), null, null),
+                            21839 => array(array('_route' => '_324'), array('a', 'b', 'c'), null, null),
+                            21892 => array(array('_route' => '_164'), array('a', 'b', 'c'), null, null),
+                            21940 => array(array('_route' => '_423'), array('a', 'b', 'c'), null, null),
+                            21990 => array(array('_route' => '_241'), array('a', 'b', 'c'), null, null),
+                            22042 => array(array('_route' => '_290'), array('a', 'b', 'c'), null, null),
+                            22090 => array(array('_route' => '_335'), array('a', 'b', 'c'), null, null),
+                            22140 => array(array('_route' => '_373'), array('a', 'b', 'c'), null, null),
+                            22189 => array(array('_route' => '_375'), array('a', 'b', 'c'), null, null),
+                            22238 => array(array('_route' => '_450'), array('a', 'b', 'c'), null, null),
+                            22287 => array(array('_route' => '_464'), array('a', 'b', 'c'), null, null),
+                            22345 => array(array('_route' => '_51'), array('a', 'b', 'c'), null, null),
+                            22393 => array(array('_route' => '_77'), array('a', 'b', 'c'), null, null),
+                            22441 => array(array('_route' => '_234'), array('a', 'b', 'c'), null, null),
+                            22489 => array(array('_route' => '_394'), array('a', 'b', 'c'), null, null),
+                            22542 => array(array('_route' => '_88'), array('a', 'b', 'c'), null, null),
+                            22590 => array(array('_route' => '_155'), array('a', 'b', 'c'), null, null),
+                            22643 => array(array('_route' => '_96'), array('a', 'b', 'c'), null, null),
+                            22691 => array(array('_route' => '_298'), array('a', 'b', 'c'), null, null),
+                            22739 => array(array('_route' => '_470'), array('a', 'b', 'c'), null, null),
+                            22792 => array(array('_route' => '_109'), array('a', 'b', 'c'), null, null),
+                            22840 => array(array('_route' => '_204'), array('a', 'b', 'c'), null, null),
+                            22893 => array(array('_route' => '_115'), array('a', 'b', 'c'), null, null),
+                            22941 => array(array('_route' => '_145'), array('a', 'b', 'c'), null, null),
+                            22994 => array(array('_route' => '_123'), array('a', 'b', 'c'), null, null),
+                            23042 => array(array('_route' => '_277'), array('a', 'b', 'c'), null, null),
+                            23090 => array(array('_route' => '_473'), array('a', 'b', 'c'), null, null),
+                            23143 => array(array('_route' => '_334'), array('a', 'b', 'c'), null, null),
+                            23191 => array(array('_route' => '_493'), array('a', 'b', 'c'), null, null),
+                            23244 => array(array('_route' => '_372'), array('a', 'b', 'c'), null, null),
+                            23292 => array(array('_route' => '_432'), array('a', 'b', 'c'), null, null),
+                            23340 => array(array('_route' => '_436'), array('a', 'b', 'c'), null, null),
+                            23393 => array(array('_route' => '_425'), array('a', 'b', 'c'), null, null),
+                            23441 => array(array('_route' => '_456'), array('a', 'b', 'c'), null, null),
+                            23489 => array(array('_route' => '_474'), array('a', 'b', 'c'), null, null),
+                            23539 => array(array('_route' => '_485'), array('a', 'b', 'c'), null, null),
+                            23594 => array(array('_route' => '_91'), array('a', 'b', 'c'), null, null),
+                            23646 => array(array('_route' => '_110'), array('a', 'b', 'c'), null, null),
+                            23694 => array(array('_route' => '_114'), array('a', 'b', 'c'), null, null),
+                            23750 => array(array('_route' => '_118'), array('a', 'b', 'c'), null, null),
+                            23796 => array(array('_route' => '_475'), array('a', 'b', 'c'), null, null),
+                            23844 => array(array('_route' => '_366'), array('a', 'b', 'c'), null, null),
+                            23897 => array(array('_route' => '_167'), array('a', 'b', 'c'), null, null),
+                            23945 => array(array('_route' => '_192'), array('a', 'b', 'c'), null, null),
+                            23993 => array(array('_route' => '_342'), array('a', 'b', 'c'), null, null),
+                            24046 => array(array('_route' => '_229'), array('a', 'b', 'c'), null, null),
+                            24097 => array(array('_route' => '_235'), array('a', 'b', 'c'), null, null),
+                            24144 => array(array('_route' => '_302'), array('a', 'b', 'c'), null, null),
+                            24193 => array(array('_route' => '_322'), array('a', 'b', 'c'), null, null),
+                            24246 => array(array('_route' => '_237'), array('a', 'b', 'c'), null, null),
+                            24294 => array(array('_route' => '_293'), array('a', 'b', 'c'), null, null),
+                            24347 => array(array('_route' => '_239'), array('a', 'b', 'c'), null, null),
+                            24395 => array(array('_route' => '_444'), array('a', 'b', 'c'), null, null),
+                            24443 => array(array('_route' => '_491'), array('a', 'b', 'c'), null, null),
+                            24491 => array(array('_route' => '_492'), array('a', 'b', 'c'), null, null),
+                            24541 => array(array('_route' => '_258'), array('a', 'b', 'c'), null, null),
+                            24590 => array(array('_route' => '_317'), array('a', 'b', 'c'), null, null),
+                            24639 => array(array('_route' => '_361'), array('a', 'b', 'c'), null, null),
+                            24688 => array(array('_route' => '_391'), array('a', 'b', 'c'), null, null),
+                            24737 => array(array('_route' => '_462'), array('a', 'b', 'c'), null, null),
+                            24786 => array(array('_route' => '_476'), array('a', 'b', 'c'), null, null),
+                            24837 => array(array('_route' => '_501'), array('a', 'b', 'c'), null, null),
+                            24889 => array(array('_route' => '_514'), array('a', 'b', 'c'), null, null),
+                            24937 => array(array('_route' => '_731'), array('a', 'b', 'c'), null, null),
+                            24990 => array(array('_route' => '_522'), array('a', 'b', 'c'), null, null),
+                            25038 => array(array('_route' => '_693'), array('a', 'b', 'c'), null, null),
+                            25091 => array(array('_route' => '_537'), array('a', 'b', 'c'), null, null),
+                            25139 => array(array('_route' => '_554'), array('a', 'b', 'c'), null, null),
+                            25187 => array(array('_route' => '_645'), array('a', 'b', 'c'), null, null),
+                            25235 => array(array('_route' => '_862'), array('a', 'b', 'c'), null, null),
+                            25288 => array(array('_route' => '_539'), array('a', 'b', 'c'), null, null),
+                            25336 => array(array('_route' => '_729'), array('a', 'b', 'c'), null, null),
+                            25384 => array(array('_route' => '_897'), array('a', 'b', 'c'), null, null),
+                            25437 => array(array('_route' => '_561'), array('a', 'b', 'c'), null, null),
+                            25485 => array(array('_route' => '_615'), array('a', 'b', 'c'), null, null),
+                            25533 => array(array('_route' => '_764'), array('a', 'b', 'c'), null, null),
+                            25581 => array(array('_route' => '_948'), array('a', 'b', 'c'), null, null),
+                            25634 => array(array('_route' => '_617'), array('a', 'b', 'c'), null, null),
+                            25682 => array(array('_route' => '_671'), array('a', 'b', 'c'), null, null),
+                            25735 => array(array('_route' => '_649'), array('a', 'b', 'c'), null, null),
+                            25783 => array(array('_route' => '_651'), array('a', 'b', 'c'), null, null),
+                            25831 => array(array('_route' => '_684'), array('a', 'b', 'c'), null, null),
+                            25884 => array(array('_route' => '_669'), array('a', 'b', 'c'), null, null),
+                            25932 => array(array('_route' => '_743'), array('a', 'b', 'c'), null, null),
+                            25980 => array(array('_route' => '_962'), array('a', 'b', 'c'), null, null),
+                            26033 => array(array('_route' => '_694'), array('a', 'b', 'c'), null, null),
+                            26081 => array(array('_route' => '_985'), array('a', 'b', 'c'), null, null),
+                            26134 => array(array('_route' => '_707'), array('a', 'b', 'c'), null, null),
+                            26182 => array(array('_route' => '_718'), array('a', 'b', 'c'), null, null),
+                            26235 => array(array('_route' => '_720'), array('a', 'b', 'c'), null, null),
+                            26283 => array(array('_route' => '_745'), array('a', 'b', 'c'), null, null),
+                            26333 => array(array('_route' => '_874'), array('a', 'b', 'c'), null, null),
+                            26391 => array(array('_route' => '_502'), array('a', 'b', 'c'), null, null),
+                            26439 => array(array('_route' => '_667'), array('a', 'b', 'c'), null, null),
+                            26487 => array(array('_route' => '_911'), array('a', 'b', 'c'), null, null),
+                            26535 => array(array('_route' => '_942'), array('a', 'b', 'c'), null, null),
+                            26585 => array(array('_route' => '_504'), array('a', 'b', 'c'), null, null),
+                            26637 => array(array('_route' => '_524'), array('a', 'b', 'c'), null, null),
+                            26685 => array(array('_route' => '_732'), array('a', 'b', 'c'), null, null),
+                            26738 => array(array('_route' => '_596'), array('a', 'b', 'c'), null, null),
+                            26786 => array(array('_route' => '_601'), array('a', 'b', 'c'), null, null),
+                            26839 => array(array('_route' => '_620'), array('a', 'b', 'c'), null, null),
+                            26887 => array(array('_route' => '_631'), array('a', 'b', 'c'), null, null),
+                            26935 => array(array('_route' => '_771'), array('a', 'b', 'c'), null, null),
+                            26983 => array(array('_route' => '_937'), array('a', 'b', 'c'), null, null),
+                            27031 => array(array('_route' => '_999'), array('a', 'b', 'c'), null, null),
+                            27084 => array(array('_route' => '_657'), array('a', 'b', 'c'), null, null),
+                            27132 => array(array('_route' => '_701'), array('a', 'b', 'c'), null, null),
+                            27185 => array(array('_route' => '_662'), array('a', 'b', 'c'), null, null),
+                            27233 => array(array('_route' => '_797'), array('a', 'b', 'c'), null, null),
+                            27281 => array(array('_route' => '_924'), array('a', 'b', 'c'), null, null),
+                            27334 => array(array('_route' => '_702'), array('a', 'b', 'c'), null, null),
+                            27382 => array(array('_route' => '_750'), array('a', 'b', 'c'), null, null),
+                            27435 => array(array('_route' => '_749'), array('a', 'b', 'c'), null, null),
+                            27483 => array(array('_route' => '_837'), array('a', 'b', 'c'), null, null),
+                            27533 => array(array('_route' => '_758'), array('a', 'b', 'c'), null, null),
+                            27585 => array(array('_route' => '_810'), array('a', 'b', 'c'), null, null),
+                            27633 => array(array('_route' => '_902'), array('a', 'b', 'c'), null, null),
+                            27683 => array(array('_route' => '_845'), array('a', 'b', 'c'), null, null),
+                            27741 => array(array('_route' => '_503'), array('a', 'b', 'c'), null, null),
+                            27792 => array(array('_route' => '_756'), array('a', 'b', 'c'), null, null),
+                            27839 => array(array('_route' => '_799'), array('a', 'b', 'c'), null, null),
+                            27888 => array(array('_route' => '_769'), array('a', 'b', 'c'), null, null),
+                            27936 => array(array('_route' => '_981'), array('a', 'b', 'c'), null, null),
+                            27989 => array(array('_route' => '_507'), array('a', 'b', 'c'), null, null),
+                            28037 => array(array('_route' => '_672'), array('a', 'b', 'c'), null, null),
+                            28085 => array(array('_route' => '_790'), array('a', 'b', 'c'), null, null),
+                            28138 => array(array('_route' => '_515'), array('a', 'b', 'c'), null, null),
+                            28186 => array(array('_route' => '_523'), array('a', 'b', 'c'), null, null),
+                            28234 => array(array('_route' => '_957'), array('a', 'b', 'c'), null, null),
+                            28282 => array(array('_route' => '_995'), array('a', 'b', 'c'), null, null),
+                            28335 => array(array('_route' => '_532'), array('a', 'b', 'c'), null, null),
+                            28383 => array(array('_route' => '_642'), array('a', 'b', 'c'), null, null),
+                            28433 => array(array('_route' => '_579'), array('a', 'b', 'c'), null, null),
+                            28485 => array(array('_route' => '_625'), array('a', 'b', 'c'), null, null),
+                            28533 => array(array('_route' => '_916'), array('a', 'b', 'c'), null, null),
+                            28586 => array(array('_route' => '_633'), array('a', 'b', 'c'), null, null),
+                            28634 => array(array('_route' => '_656'), array('a', 'b', 'c'), null, null),
+                            28687 => array(array('_route' => '_658'), array('a', 'b', 'c'), null, null),
+                            28735 => array(array('_route' => '_943'), array('a', 'b', 'c'), null, null),
+                            28788 => array(array('_route' => '_664'), array('a', 'b', 'c'), null, null),
+                            28836 => array(array('_route' => '_852'), array('a', 'b', 'c'), null, null),
+                            28884 => array(array('_route' => '_870'), array('a', 'b', 'c'), null, null),
+                            28937 => array(array('_route' => '_683'), array('a', 'b', 'c'), null, null),
+                            28985 => array(array('_route' => '_915'), array('a', 'b', 'c'), null, null),
+                            29038 => array(array('_route' => '_719'), array('a', 'b', 'c'), null, null),
+                            29086 => array(array('_route' => '_859'), array('a', 'b', 'c'), null, null),
+                            29134 => array(array('_route' => '_912'), array('a', 'b', 'c'), null, null),
+                            29182 => array(array('_route' => '_978'), array('a', 'b', 'c'), null, null),
+                            29235 => array(array('_route' => '_738'), array('a', 'b', 'c'), null, null),
+                            29283 => array(array('_route' => '_883'), array('a', 'b', 'c'), null, null),
+                            29333 => array(array('_route' => '_741'), array('a', 'b', 'c'), null, null),
+                            29382 => array(array('_route' => '_760'), array('a', 'b', 'c'), null, null),
+                            29431 => array(array('_route' => '_895'), array('a', 'b', 'c'), null, null),
+                            29489 => array(array('_route' => '_505'), array('a', 'b', 'c'), null, null),
+                            29537 => array(array('_route' => '_935'), array('a', 'b', 'c'), null, null),
+                            29590 => array(array('_route' => '_509'), array('a', 'b', 'c'), null, null),
+                            29638 => array(array('_route' => '_820'), array('a', 'b', 'c'), null, null),
+                            29686 => array(array('_route' => '_910'), array('a', 'b', 'c'), null, null),
+                            29739 => array(array('_route' => '_518'), array('a', 'b', 'c'), null, null),
+                            29787 => array(array('_route' => '_618'), array('a', 'b', 'c'), null, null),
+                            29840 => array(array('_route' => '_546'), array('a', 'b', 'c'), null, null),
+                            29888 => array(array('_route' => '_740'), array('a', 'b', 'c'), null, null),
+                            29936 => array(array('_route' => '_867'), array('a', 'b', 'c'), null, null),
+                            29989 => array(array('_route' => '_572'), array('a', 'b', 'c'), null, null),
+                            30037 => array(array('_route' => '_952'), array('a', 'b', 'c'), null, null),
+                            30090 => array(array('_route' => '_573'), array('a', 'b', 'c'), null, null),
+                            30138 => array(array('_route' => '_692'), array('a', 'b', 'c'), null, null),
+                            30186 => array(array('_route' => '_700'), array('a', 'b', 'c'), null, null),
+                            30234 => array(array('_route' => '_772'), array('a', 'b', 'c'), null, null),
+                            30284 => array(array('_route' => '_653'), array('a', 'b', 'c'), null, null),
+                            30336 => array(array('_route' => '_695'), array('a', 'b', 'c'), null, null),
+                            30384 => array(array('_route' => '_748'), array('a', 'b', 'c'), null, null),
+                            30437 => array(array('_route' => '_710'), array('a', 'b', 'c'), null, null),
+                            30485 => array(array('_route' => '_716'), array('a', 'b', 'c'), null, null),
+                            30533 => array(array('_route' => '_969'), array('a', 'b', 'c'), null, null),
+                            30586 => array(array('_route' => '_734'), array('a', 'b', 'c'), null, null),
+                            30634 => array(array('_route' => '_742'), array('a', 'b', 'c'), null, null),
+                            30682 => array(array('_route' => '_844'), array('a', 'b', 'c'), null, null),
+                            30735 => array(array('_route' => '_763'), array('a', 'b', 'c'), null, null),
+                            30783 => array(array('_route' => '_965'), array('a', 'b', 'c'), null, null),
+                            30836 => array(array('_route' => '_778'), array('a', 'b', 'c'), null, null),
+                            30884 => array(array('_route' => '_813'), array('a', 'b', 'c'), null, null),
+                            30932 => array(array('_route' => '_831'), array('a', 'b', 'c'), null, null),
+                            30982 => array(array('_route' => '_955'), array('a', 'b', 'c'), null, null),
+                            31031 => array(array('_route' => '_997'), array('a', 'b', 'c'), null, null),
+                            31089 => array(array('_route' => '_506'), array('a', 'b', 'c'), null, null),
+                            31137 => array(array('_route' => '_575'), array('a', 'b', 'c'), null, null),
+                            31190 => array(array('_route' => '_516'), array('a', 'b', 'c'), null, null),
+                            31238 => array(array('_route' => '_553'), array('a', 'b', 'c'), null, null),
+                            31291 => array(array('_route' => '_528'), array('a', 'b', 'c'), null, null),
+                            31339 => array(array('_route' => '_847'), array('a', 'b', 'c'), null, null),
+                            31387 => array(array('_route' => '_904'), array('a', 'b', 'c'), null, null),
+                            31440 => array(array('_route' => '_574'), array('a', 'b', 'c'), null, null),
+                            31488 => array(array('_route' => '_818'), array('a', 'b', 'c'), null, null),
+                            31538 => array(array('_route' => '_577'), array('a', 'b', 'c'), null, null),
+                            31590 => array(array('_route' => '_584'), array('a', 'b', 'c'), null, null),
+                            31638 => array(array('_route' => '_905'), array('a', 'b', 'c'), null, null),
+                            31691 => array(array('_route' => '_612'), array('a', 'b', 'c'), null, null),
+                            31739 => array(array('_route' => '_688'), array('a', 'b', 'c'), null, null),
+                            31787 => array(array('_route' => '_854'), array('a', 'b', 'c'), null, null),
+                            31840 => array(array('_route' => '_613'), array('a', 'b', 'c'), null, null),
+                            31888 => array(array('_route' => '_767'), array('a', 'b', 'c'), null, null),
+                            31941 => array(array('_route' => '_666'), array('a', 'b', 'c'), null, null),
+                            31989 => array(array('_route' => '_759'), array('a', 'b', 'c'), null, null),
+                            32037 => array(array('_route' => '_827'), array('a', 'b', 'c'), null, null),
+                            32085 => array(array('_route' => '_840'), array('a', 'b', 'c'), null, null),
+                            32138 => array(array('_route' => '_680'), array('a', 'b', 'c'), null, null),
+                            32186 => array(array('_route' => '_784'), array('a', 'b', 'c'), null, null),
+                            32234 => array(array('_route' => '_842'), array('a', 'b', 'c'), null, null),
+                            32282 => array(array('_route' => '_860'), array('a', 'b', 'c'), null, null),
+                            32332 => array(array('_route' => '_704'), array('a', 'b', 'c'), null, null),
+                            32381 => array(array('_route' => '_727'), array('a', 'b', 'c'), null, null),
+                            32430 => array(array('_route' => '_777'), array('a', 'b', 'c'), null, null),
+                            32482 => array(array('_route' => '_838'), array('a', 'b', 'c'), null, null),
+                            32530 => array(array('_route' => '_861'), array('a', 'b', 'c'), null, null),
+                            32583 => array(array('_route' => '_849'), array('a', 'b', 'c'), null, null),
+                            32631 => array(array('_route' => '_982'), array('a', 'b', 'c'), null, null),
+                            32679 => array(array('_route' => '_986'), array('a', 'b', 'c'), null, null),
+                            32741 => array(array('_route' => '_508'), array('a', 'b', 'c'), null, null),
+                            32788 => array(array('_route' => '_517'), array('a', 'b', 'c'), null, null),
+                            32837 => array(array('_route' => '_622'), array('a', 'b', 'c'), null, null),
+                            32890 => array(array('_route' => '_513'), array('a', 'b', 'c'), null, null),
+                            32938 => array(array('_route' => '_655'), array('a', 'b', 'c'), null, null),
+                            32986 => array(array('_route' => '_843'), array('a', 'b', 'c'), null, null),
+                            33034 => array(array('_route' => '_939'), array('a', 'b', 'c'), null, null),
+                            33084 => array(array('_route' => '_529'), array('a', 'b', 'c'), null, null),
+                            33136 => array(array('_route' => '_535'), array('a', 'b', 'c'), null, null),
+                            33184 => array(array('_route' => '_685'), array('a', 'b', 'c'), null, null),
+                            33240 => array(array('_route' => '_559'), array('a', 'b', 'c'), null, null),
+                            33287 => array(array('_route' => '_661'), array('a', 'b', 'c'), null, null),
+                            33336 => array(array('_route' => '_768'), array('a', 'b', 'c'), null, null),
+                            33389 => array(array('_route' => '_589'), array('a', 'b', 'c'), null, null),
+                            33437 => array(array('_route' => '_647'), array('a', 'b', 'c'), null, null),
+                            33485 => array(array('_route' => '_652'), array('a', 'b', 'c'), null, null),
+                            33533 => array(array('_route' => '_834'), array('a', 'b', 'c'), null, null),
+                            33586 => array(array('_route' => '_591'), array('a', 'b', 'c'), null, null),
+                            33634 => array(array('_route' => '_599'), array('a', 'b', 'c'), null, null),
+                            33687 => array(array('_route' => '_787'), array('a', 'b', 'c'), null, null),
+                            33734 => array(array('_route' => '_848'), array('a', 'b', 'c'), null, null),
+                            33787 => array(array('_route' => '_796'), array('a', 'b', 'c'), null, null),
+                            33835 => array(array('_route' => '_877'), array('a', 'b', 'c'), null, null),
+                            33885 => array(array('_route' => '_809'), array('a', 'b', 'c'), null, null),
+                            33934 => array(array('_route' => '_817'), array('a', 'b', 'c'), null, null),
+                            33986 => array(array('_route' => '_819'), array('a', 'b', 'c'), null, null),
+                            34034 => array(array('_route' => '_865'), array('a', 'b', 'c'), null, null),
+                            34084 => array(array('_route' => '_919'), array('a', 'b', 'c'), null, null),
+                            34133 => array(array('_route' => '_949'), array('a', 'b', 'c'), null, null),
+                            34191 => array(array('_route' => '_510'), array('a', 'b', 'c'), null, null),
+                            34239 => array(array('_route' => '_590'), array('a', 'b', 'c'), null, null),
+                            34287 => array(array('_route' => '_597'), array('a', 'b', 'c'), null, null),
+                            34335 => array(array('_route' => '_682'), array('a', 'b', 'c'), null, null),
+                            34383 => array(array('_route' => '_723'), array('a', 'b', 'c'), null, null),
+                            34436 => array(array('_route' => '_521'), array('a', 'b', 'c'), null, null),
+                            34484 => array(array('_route' => '_594'), array('a', 'b', 'c'), null, null),
+                            34532 => array(array('_route' => '_689'), array('a', 'b', 'c'), null, null),
+                            34580 => array(array('_route' => '_713'), array('a', 'b', 'c'), null, null),
+                            34628 => array(array('_route' => '_889'), array('a', 'b', 'c'), null, null),
+                            34681 => array(array('_route' => '_531'), array('a', 'b', 'c'), null, null),
+                            34729 => array(array('_route' => '_639'), array('a', 'b', 'c'), null, null),
+                            34780 => array(array('_route' => '_646'), array('a', 'b', 'c'), null, null),
+                            34827 => array(array('_route' => '_659'), array('a', 'b', 'c'), null, null),
+                            34876 => array(array('_route' => '_959'), array('a', 'b', 'c'), null, null),
+                            34929 => array(array('_route' => '_550'), array('a', 'b', 'c'), null, null),
+                            34977 => array(array('_route' => '_833'), array('a', 'b', 'c'), null, null),
+                            35025 => array(array('_route' => '_899'), array('a', 'b', 'c'), null, null),
+                            35081 => array(array('_route' => '_580'), array('a', 'b', 'c'), null, null),
+                            35128 => array(array('_route' => '_762'), array('a', 'b', 'c'), null, null),
+                            35177 => array(array('_route' => '_896'), array('a', 'b', 'c'), null, null),
+                            35230 => array(array('_route' => '_595'), array('a', 'b', 'c'), null, null),
+                            35278 => array(array('_route' => '_933'), array('a', 'b', 'c'), null, null),
+                            35328 => array(array('_route' => '_610'), array('a', 'b', 'c'), null, null),
+                            35380 => array(array('_route' => '_629'), array('a', 'b', 'c'), null, null),
+                            35428 => array(array('_route' => '_744'), array('a', 'b', 'c'), null, null),
+                            35481 => array(array('_route' => '_674'), array('a', 'b', 'c'), null, null),
+                            35529 => array(array('_route' => '_726'), array('a', 'b', 'c'), null, null),
+                            35577 => array(array('_route' => '_929'), array('a', 'b', 'c'), null, null),
+                            35627 => array(array('_route' => '_696'), array('a', 'b', 'c'), null, null),
+                            35679 => array(array('_route' => '_841'), array('a', 'b', 'c'), null, null),
+                            35727 => array(array('_route' => '_890'), array('a', 'b', 'c'), null, null),
+                            35777 => array(array('_route' => '_885'), array('a', 'b', 'c'), null, null),
+                            35826 => array(array('_route' => '_888'), array('a', 'b', 'c'), null, null),
+                            35875 => array(array('_route' => '_996'), array('a', 'b', 'c'), null, null),
+                            35933 => array(array('_route' => '_511'), array('a', 'b', 'c'), null, null),
+                            35981 => array(array('_route' => '_576'), array('a', 'b', 'c'), null, null),
+                            36029 => array(array('_route' => '_623'), array('a', 'b', 'c'), null, null),
+                            36082 => array(array('_route' => '_560'), array('a', 'b', 'c'), null, null),
+                            36129 => array(array('_route' => '_585'), array('a', 'b', 'c'), null, null),
+                            36182 => array(array('_route' => '_570'), array('a', 'b', 'c'), null, null),
+                            36230 => array(array('_route' => '_578'), array('a', 'b', 'c'), null, null),
+                            36281 => array(array('_route' => '_780'), array('a', 'b', 'c'), null, null),
+                            36328 => array(array('_route' => '_808'), array('a', 'b', 'c'), null, null),
+                            36382 => array(array('_route' => '_593'), array('a', 'b', 'c'), null, null),
+                            36430 => array(array('_route' => '_900'), array('a', 'b', 'c'), null, null),
+                            36483 => array(array('_route' => '_632'), array('a', 'b', 'c'), null, null),
+                            36531 => array(array('_route' => '_654'), array('a', 'b', 'c'), null, null),
+                            36579 => array(array('_route' => '_721'), array('a', 'b', 'c'), null, null),
+                            36627 => array(array('_route' => '_836'), array('a', 'b', 'c'), null, null),
+                            36680 => array(array('_route' => '_637'), array('a', 'b', 'c'), null, null),
+                            36728 => array(array('_route' => '_737'), array('a', 'b', 'c'), null, null),
+                            36784 => array(array('_route' => '_699'), array('a', 'b', 'c'), null, null),
+                            36831 => array(array('_route' => '_822'), array('a', 'b', 'c'), null, null),
+                            36880 => array(array('_route' => '_853'), array('a', 'b', 'c'), null, null),
+                            36933 => array(array('_route' => '_708'), array('a', 'b', 'c'), null, null),
+                            36981 => array(array('_route' => '_871'), array('a', 'b', 'c'), null, null),
+                            37034 => array(array('_route' => '_752'), array('a', 'b', 'c'), null, null),
+                            37082 => array(array('_route' => '_989'), array('a', 'b', 'c'), null, null),
+                            37132 => array(array('_route' => '_855'), array('a', 'b', 'c'), null, null),
+                            37184 => array(array('_route' => '_858'), array('a', 'b', 'c'), null, null),
+                            37232 => array(array('_route' => '_898'), array('a', 'b', 'c'), null, null),
+                            37282 => array(array('_route' => '_903'), array('a', 'b', 'c'), null, null),
+                            37331 => array(array('_route' => '_909'), array('a', 'b', 'c'), null, null),
+                            37380 => array(array('_route' => '_950'), array('a', 'b', 'c'), null, null),
+                            37441 => array(array('_route' => '_512'), array('a', 'b', 'c'), null, null),
+                            37488 => array(array('_route' => '_691'), array('a', 'b', 'c'), null, null),
+                            37537 => array(array('_route' => '_686'), array('a', 'b', 'c'), null, null),
+                            37587 => array(array('_route' => '_527'), array('a', 'b', 'c'), null, null),
+                            37639 => array(array('_route' => '_541'), array('a', 'b', 'c'), null, null),
+                            37687 => array(array('_route' => '_956'), array('a', 'b', 'c'), null, null),
+                            37740 => array(array('_route' => '_555'), array('a', 'b', 'c'), null, null),
+                            37788 => array(array('_route' => '_681'), array('a', 'b', 'c'), null, null),
+                            37841 => array(array('_route' => '_556'), array('a', 'b', 'c'), null, null),
+                            37889 => array(array('_route' => '_802'), array('a', 'b', 'c'), null, null),
+                            37939 => array(array('_route' => '_558'), array('a', 'b', 'c'), null, null),
+                            37991 => array(array('_route' => '_564'), array('a', 'b', 'c'), null, null),
+                            38039 => array(array('_route' => '_670'), array('a', 'b', 'c'), null, null),
+                            38087 => array(array('_route' => '_884'), array('a', 'b', 'c'), null, null),
+                            38140 => array(array('_route' => '_627'), array('a', 'b', 'c'), null, null),
+                            38187 => array(array('_route' => '_746'), array('a', 'b', 'c'), null, null),
+                            38240 => array(array('_route' => '_668'), array('a', 'b', 'c'), null, null),
+                            38291 => array(array('_route' => '_712'), array('a', 'b', 'c'), null, null),
+                            38338 => array(array('_route' => '_863'), array('a', 'b', 'c'), null, null),
+                            38387 => array(array('_route' => '_801'), array('a', 'b', 'c'), null, null),
+                            38440 => array(array('_route' => '_709'), array('a', 'b', 'c'), null, null),
+                            38488 => array(array('_route' => '_850'), array('a', 'b', 'c'), null, null),
+                            38536 => array(array('_route' => '_918'), array('a', 'b', 'c'), null, null),
+                            38586 => array(array('_route' => '_803'), array('a', 'b', 'c'), null, null),
+                            38638 => array(array('_route' => '_864'), array('a', 'b', 'c'), null, null),
+                            38686 => array(array('_route' => '_880'), array('a', 'b', 'c'), null, null),
+                            38734 => array(array('_route' => '_927'), array('a', 'b', 'c'), null, null),
+                            38787 => array(array('_route' => '_930'), array('a', 'b', 'c'), null, null),
+                            38835 => array(array('_route' => '_951'), array('a', 'b', 'c'), null, null),
+                            38883 => array(array('_route' => '_963'), array('a', 'b', 'c'), null, null),
+                            38942 => array(array('_route' => '_519'), array('a', 'b', 'c'), null, null),
+                            38990 => array(array('_route' => '_823'), array('a', 'b', 'c'), null, null),
+                            39038 => array(array('_route' => '_954'), array('a', 'b', 'c'), null, null),
+                            39091 => array(array('_route' => '_525'), array('a', 'b', 'c'), null, null),
+                            39139 => array(array('_route' => '_991'), array('a', 'b', 'c'), null, null),
+                            39189 => array(array('_route' => '_536'), array('a', 'b', 'c'), null, null),
+                            39241 => array(array('_route' => '_545'), array('a', 'b', 'c'), null, null),
+                            39289 => array(array('_route' => '_944'), array('a', 'b', 'c'), null, null),
+                            39342 => array(array('_route' => '_557'), array('a', 'b', 'c'), null, null),
+                            39390 => array(array('_route' => '_783'), array('a', 'b', 'c'), null, null),
+                            39438 => array(array('_route' => '_807'), array('a', 'b', 'c'), null, null),
+                            39491 => array(array('_route' => '_586'), array('a', 'b', 'c'), null, null),
+                            39539 => array(array('_route' => '_711'), array('a', 'b', 'c'), null, null),
+                            39592 => array(array('_route' => '_598'), array('a', 'b', 'c'), null, null),
+                            39640 => array(array('_route' => '_635'), array('a', 'b', 'c'), null, null),
+                            39688 => array(array('_route' => '_983'), array('a', 'b', 'c'), null, null),
+                            39741 => array(array('_route' => '_634'), array('a', 'b', 'c'), null, null),
+                            39789 => array(array('_route' => '_641'), array('a', 'b', 'c'), null, null),
+                            39840 => array(array('_route' => '_779'), array('a', 'b', 'c'), null, null),
+                            39887 => array(array('_route' => '_876'), array('a', 'b', 'c'), null, null),
+                            39936 => array(array('_route' => '_811'), array('a', 'b', 'c'), null, null),
+                            39984 => array(array('_route' => '_824'), array('a', 'b', 'c'), null, null),
+                            40037 => array(array('_route' => '_660'), array('a', 'b', 'c'), null, null),
+                            40085 => array(array('_route' => '_789'), array('a', 'b', 'c'), null, null),
+                            40138 => array(array('_route' => '_733'), array('a', 'b', 'c'), null, null),
+                            40186 => array(array('_route' => '_735'), array('a', 'b', 'c'), null, null),
+                            40234 => array(array('_route' => '_882'), array('a', 'b', 'c'), null, null),
+                            40282 => array(array('_route' => '_967'), array('a', 'b', 'c'), null, null),
+                            40332 => array(array('_route' => '_736'), array('a', 'b', 'c'), null, null),
+                            40381 => array(array('_route' => '_753'), array('a', 'b', 'c'), null, null),
+                            40430 => array(array('_route' => '_786'), array('a', 'b', 'c'), null, null),
+                            40479 => array(array('_route' => '_907'), array('a', 'b', 'c'), null, null),
+                            40528 => array(array('_route' => '_920'), array('a', 'b', 'c'), null, null),
+                            40577 => array(array('_route' => '_971'), array('a', 'b', 'c'), null, null),
+                            40635 => array(array('_route' => '_520'), array('a', 'b', 'c'), null, null),
+                            40683 => array(array('_route' => '_891'), array('a', 'b', 'c'), null, null),
+                            40739 => array(array('_route' => '_534'), array('a', 'b', 'c'), null, null),
+                            40785 => array(array('_route' => '_602'), array('a', 'b', 'c'), null, null),
+                            40834 => array(array('_route' => '_605'), array('a', 'b', 'c'), null, null),
+                            40882 => array(array('_route' => '_979'), array('a', 'b', 'c'), null, null),
+                            40932 => array(array('_route' => '_547'), array('a', 'b', 'c'), null, null),
+                            40987 => array(array('_route' => '_549'), array('a', 'b', 'c'), null, null),
+                            41034 => array(array('_route' => '_755'), array('a', 'b', 'c'), null, null),
+                            41083 => array(array('_route' => '_922'), array('a', 'b', 'c'), null, null),
+                            41131 => array(array('_route' => '_977'), array('a', 'b', 'c'), null, null),
+                            41184 => array(array('_route' => '_565'), array('a', 'b', 'c'), null, null),
+                            41232 => array(array('_route' => '_926'), array('a', 'b', 'c'), null, null),
+                            41282 => array(array('_route' => '_571'), array('a', 'b', 'c'), null, null),
+                            41331 => array(array('_route' => '_581'), array('a', 'b', 'c'), null, null),
+                            41380 => array(array('_route' => '_619'), array('a', 'b', 'c'), null, null),
+                            41429 => array(array('_route' => '_636'), array('a', 'b', 'c'), null, null),
+                            41481 => array(array('_route' => '_679'), array('a', 'b', 'c'), null, null),
+                            41529 => array(array('_route' => '_866'), array('a', 'b', 'c'), null, null),
+                            41577 => array(array('_route' => '_973'), array('a', 'b', 'c'), null, null),
+                            41630 => array(array('_route' => '_690'), array('a', 'b', 'c'), null, null),
+                            41678 => array(array('_route' => '_775'), array('a', 'b', 'c'), null, null),
+                            41731 => array(array('_route' => '_722'), array('a', 'b', 'c'), null, null),
+                            41779 => array(array('_route' => '_906'), array('a', 'b', 'c'), null, null),
+                            41827 => array(array('_route' => '_946'), array('a', 'b', 'c'), null, null),
+                            41877 => array(array('_route' => '_788'), array('a', 'b', 'c'), null, null),
+                            41929 => array(array('_route' => '_828'), array('a', 'b', 'c'), null, null),
+                            41977 => array(array('_route' => '_892'), array('a', 'b', 'c'), null, null),
+                            42025 => array(array('_route' => '_972'), array('a', 'b', 'c'), null, null),
+                            42075 => array(array('_route' => '_829'), array('a', 'b', 'c'), null, null),
+                            42127 => array(array('_route' => '_923'), array('a', 'b', 'c'), null, null),
+                            42175 => array(array('_route' => '_947'), array('a', 'b', 'c'), null, null),
+                            42234 => array(array('_route' => '_526'), array('a', 'b', 'c'), null, null),
+                            42282 => array(array('_route' => '_614'), array('a', 'b', 'c'), null, null),
+                            42330 => array(array('_route' => '_621'), array('a', 'b', 'c'), null, null),
+                            42383 => array(array('_route' => '_543'), array('a', 'b', 'c'), null, null),
+                            42431 => array(array('_route' => '_812'), array('a', 'b', 'c'), null, null),
+                            42487 => array(array('_route' => '_548'), array('a', 'b', 'c'), null, null),
+                            42534 => array(array('_route' => '_747'), array('a', 'b', 'c'), null, null),
+                            42583 => array(array('_route' => '_715'), array('a', 'b', 'c'), null, null),
+                            42631 => array(array('_route' => '_940'), array('a', 'b', 'c'), null, null),
+                            42684 => array(array('_route' => '_563'), array('a', 'b', 'c'), null, null),
+                            42732 => array(array('_route' => '_611'), array('a', 'b', 'c'), null, null),
+                            42780 => array(array('_route' => '_830'), array('a', 'b', 'c'), null, null),
+                            42833 => array(array('_route' => '_569'), array('a', 'b', 'c'), null, null),
+                            42881 => array(array('_route' => '_908'), array('a', 'b', 'c'), null, null),
+                            42929 => array(array('_route' => '_913'), array('a', 'b', 'c'), null, null),
+                            42982 => array(array('_route' => '_644'), array('a', 'b', 'c'), null, null),
+                            43030 => array(array('_route' => '_776'), array('a', 'b', 'c'), null, null),
+                            43078 => array(array('_route' => '_856'), array('a', 'b', 'c'), null, null),
+                            43131 => array(array('_route' => '_650'), array('a', 'b', 'c'), null, null),
+                            43179 => array(array('_route' => '_761'), array('a', 'b', 'c'), null, null),
+                            43232 => array(array('_route' => '_663'), array('a', 'b', 'c'), null, null),
+                            43280 => array(array('_route' => '_754'), array('a', 'b', 'c'), null, null),
+                            43333 => array(array('_route' => '_665'), array('a', 'b', 'c'), null, null),
+                            43381 => array(array('_route' => '_805'), array('a', 'b', 'c'), null, null),
+                            43429 => array(array('_route' => '_846'), array('a', 'b', 'c'), null, null),
+                            43477 => array(array('_route' => '_857'), array('a', 'b', 'c'), null, null),
+                            43530 => array(array('_route' => '_675'), array('a', 'b', 'c'), null, null),
+                            43578 => array(array('_route' => '_839'), array('a', 'b', 'c'), null, null),
+                            43626 => array(array('_route' => '_968'), array('a', 'b', 'c'), null, null),
+                            43676 => array(array('_route' => '_697'), array('a', 'b', 'c'), null, null),
+                            43728 => array(array('_route' => '_725'), array('a', 'b', 'c'), null, null),
+                            43776 => array(array('_route' => '_794'), array('a', 'b', 'c'), null, null),
+                            43829 => array(array('_route' => '_773'), array('a', 'b', 'c'), null, null),
+                            43877 => array(array('_route' => '_992'), array('a', 'b', 'c'), null, null),
+                            43930 => array(array('_route' => '_901'), array('a', 'b', 'c'), null, null),
+                            43978 => array(array('_route' => '_970'), array('a', 'b', 'c'), null, null),
+                            44028 => array(array('_route' => '_964'), array('a', 'b', 'c'), null, null),
+                            44086 => array(array('_route' => '_530'), array('a', 'b', 'c'), null, null),
+                            44134 => array(array('_route' => '_703'), array('a', 'b', 'c'), null, null),
+                            44187 => array(array('_route' => '_533'), array('a', 'b', 'c'), null, null),
+                            44235 => array(array('_route' => '_739'), array('a', 'b', 'c'), null, null),
+                            44283 => array(array('_route' => '_791'), array('a', 'b', 'c'), null, null),
+                            44331 => array(array('_route' => '_987'), array('a', 'b', 'c'), null, null),
+                            44384 => array(array('_route' => '_566'), array('a', 'b', 'c'), null, null),
+                            44432 => array(array('_route' => '_592'), array('a', 'b', 'c'), null, null),
+                            44488 => array(array('_route' => '_568'), array('a', 'b', 'c'), null, null),
+                            44534 => array(array('_route' => '_868'), array('a', 'b', 'c'), null, null),
+                            44583 => array(array('_route' => '_878'), array('a', 'b', 'c'), null, null),
+                            44636 => array(array('_route' => '_588'), array('a', 'b', 'c'), null, null),
+                            44684 => array(array('_route' => '_793'), array('a', 'b', 'c'), null, null),
+                            44732 => array(array('_route' => '_917'), array('a', 'b', 'c'), null, null),
+                            44785 => array(array('_route' => '_600'), array('a', 'b', 'c'), null, null),
+                            44833 => array(array('_route' => '_728'), array('a', 'b', 'c'), null, null),
+                            44886 => array(array('_route' => '_603'), array('a', 'b', 'c'), null, null),
+                            44934 => array(array('_route' => '_765'), array('a', 'b', 'c'), null, null),
+                            44987 => array(array('_route' => '_607'), array('a', 'b', 'c'), null, null),
+                            45035 => array(array('_route' => '_676'), array('a', 'b', 'c'), null, null),
+                            45083 => array(array('_route' => '_804'), array('a', 'b', 'c'), null, null),
+                            45136 => array(array('_route' => '_609'), array('a', 'b', 'c'), null, null),
+                            45184 => array(array('_route' => '_961'), array('a', 'b', 'c'), null, null),
+                            45232 => array(array('_route' => '_980'), array('a', 'b', 'c'), null, null),
+                            45282 => array(array('_route' => '_714'), array('a', 'b', 'c'), null, null),
+                            45334 => array(array('_route' => '_730'), array('a', 'b', 'c'), null, null),
+                            45382 => array(array('_route' => '_806'), array('a', 'b', 'c'), null, null),
+                            45430 => array(array('_route' => '_825'), array('a', 'b', 'c'), null, null),
+                            45478 => array(array('_route' => '_879'), array('a', 'b', 'c'), null, null),
+                            45526 => array(array('_route' => '_893'), array('a', 'b', 'c'), null, null),
+                            45576 => array(array('_route' => '_928'), array('a', 'b', 'c'), null, null),
+                            45628 => array(array('_route' => '_932'), array('a', 'b', 'c'), null, null),
+                            45676 => array(array('_route' => '_958'), array('a', 'b', 'c'), null, null),
+                            45726 => array(array('_route' => '_984'), array('a', 'b', 'c'), null, null),
+                            45784 => array(array('_route' => '_538'), array('a', 'b', 'c'), null, null),
+                            45832 => array(array('_route' => '_993'), array('a', 'b', 'c'), null, null),
+                            45882 => array(array('_route' => '_542'), array('a', 'b', 'c'), null, null),
+                            45934 => array(array('_route' => '_551'), array('a', 'b', 'c'), null, null),
+                            45982 => array(array('_route' => '_687'), array('a', 'b', 'c'), null, null),
+                            46030 => array(array('_route' => '_724'), array('a', 'b', 'c'), null, null),
+                            46078 => array(array('_route' => '_925'), array('a', 'b', 'c'), null, null),
+                            46131 => array(array('_route' => '_587'), array('a', 'b', 'c'), null, null),
+                            46179 => array(array('_route' => '_914'), array('a', 'b', 'c'), null, null),
+                            46229 => array(array('_route' => '_616'), array('a', 'b', 'c'), null, null),
+                            46284 => array(array('_route' => '_677'), array('a', 'b', 'c'), null, null),
+                            46331 => array(array('_route' => '_815'), array('a', 'b', 'c'), null, null),
+                            46380 => array(array('_route' => '_781'), array('a', 'b', 'c'), null, null),
+                            46430 => array(array('_route' => '_717'), array('a', 'b', 'c'), null, null),
+                            46482 => array(array('_route' => '_782'), array('a', 'b', 'c'), null, null),
+                            46530 => array(array('_route' => '_832'), array('a', 'b', 'c'), null, null),
+                            46583 => array(array('_route' => '_795'), array('a', 'b', 'c'), null, null),
+                            46631 => array(array('_route' => '_887'), array('a', 'b', 'c'), null, null),
+                            46681 => array(array('_route' => '_800'), array('a', 'b', 'c'), null, null),
+                            46730 => array(array('_route' => '_826'), array('a', 'b', 'c'), null, null),
+                            46779 => array(array('_route' => '_881'), array('a', 'b', 'c'), null, null),
+                            46828 => array(array('_route' => '_886'), array('a', 'b', 'c'), null, null),
+                            46877 => array(array('_route' => '_938'), array('a', 'b', 'c'), null, null),
+                            46935 => array(array('_route' => '_540'), array('a', 'b', 'c'), null, null),
+                            46983 => array(array('_route' => '_643'), array('a', 'b', 'c'), null, null),
+                            47033 => array(array('_route' => '_544'), array('a', 'b', 'c'), null, null),
+                            47082 => array(array('_route' => '_552'), array('a', 'b', 'c'), null, null),
+                            47134 => array(array('_route' => '_567'), array('a', 'b', 'c'), null, null),
+                            47182 => array(array('_route' => '_608'), array('a', 'b', 'c'), null, null),
+                            47230 => array(array('_route' => '_698'), array('a', 'b', 'c'), null, null),
+                            47278 => array(array('_route' => '_988'), array('a', 'b', 'c'), null, null),
+                            47331 => array(array('_route' => '_583'), array('a', 'b', 'c'), null, null),
+                            47379 => array(array('_route' => '_998'), array('a', 'b', 'c'), null, null),
+                            47432 => array(array('_route' => '_604'), array('a', 'b', 'c'), null, null),
+                            47480 => array(array('_route' => '_630'), array('a', 'b', 'c'), null, null),
+                            47528 => array(array('_route' => '_706'), array('a', 'b', 'c'), null, null),
+                            47576 => array(array('_route' => '_976'), array('a', 'b', 'c'), null, null),
+                            47629 => array(array('_route' => '_673'), array('a', 'b', 'c'), null, null),
+                            47677 => array(array('_route' => '_678'), array('a', 'b', 'c'), null, null),
+                            47725 => array(array('_route' => '_931'), array('a', 'b', 'c'), null, null),
+                            47775 => array(array('_route' => '_751'), array('a', 'b', 'c'), null, null),
+                            47824 => array(array('_route' => '_766'), array('a', 'b', 'c'), null, null),
+                            47876 => array(array('_route' => '_792'), array('a', 'b', 'c'), null, null),
+                            47924 => array(array('_route' => '_814'), array('a', 'b', 'c'), null, null),
+                            47974 => array(array('_route' => '_798'), array('a', 'b', 'c'), null, null),
+                            48026 => array(array('_route' => '_851'), array('a', 'b', 'c'), null, null),
+                            48074 => array(array('_route' => '_941'), array('a', 'b', 'c'), null, null),
+                            48122 => array(array('_route' => '_953'), array('a', 'b', 'c'), null, null),
+                            48170 => array(array('_route' => '_975'), array('a', 'b', 'c'), null, null),
+                            48220 => array(array('_route' => '_873'), array('a', 'b', 'c'), null, null),
+                            48269 => array(array('_route' => '_936'), array('a', 'b', 'c'), null, null),
+                            48318 => array(array('_route' => '_994'), array('a', 'b', 'c'), null, null),
+                            48376 => array(array('_route' => '_562'), array('a', 'b', 'c'), null, null),
+                            48424 => array(array('_route' => '_770'), array('a', 'b', 'c'), null, null),
+                            48475 => array(array('_route' => '_774'), array('a', 'b', 'c'), null, null),
+                            48522 => array(array('_route' => '_966'), array('a', 'b', 'c'), null, null),
+                            48573 => array(array('_route' => '_582'), array('a', 'b', 'c'), null, null),
+                            48625 => array(array('_route' => '_606'), array('a', 'b', 'c'), null, null),
+                            48673 => array(array('_route' => '_648'), array('a', 'b', 'c'), null, null),
+                            48723 => array(array('_route' => '_624'), array('a', 'b', 'c'), null, null),
+                            48775 => array(array('_route' => '_626'), array('a', 'b', 'c'), null, null),
+                            48823 => array(array('_route' => '_821'), array('a', 'b', 'c'), null, null),
+                            48873 => array(array('_route' => '_628'), array('a', 'b', 'c'), null, null),
+                            48922 => array(array('_route' => '_638'), array('a', 'b', 'c'), null, null),
+                            48974 => array(array('_route' => '_640'), array('a', 'b', 'c'), null, null),
+                            49022 => array(array('_route' => '_990'), array('a', 'b', 'c'), null, null),
+                            49072 => array(array('_route' => '_705'), array('a', 'b', 'c'), null, null),
+                            49121 => array(array('_route' => '_757'), array('a', 'b', 'c'), null, null),
+                            49176 => array(array('_route' => '_785'), array('a', 'b', 'c'), null, null),
+                            49223 => array(array('_route' => '_875'), array('a', 'b', 'c'), null, null),
+                            49270 => array(array('_route' => '_894'), array('a', 'b', 'c'), null, null),
+                            49319 => array(array('_route' => '_945'), array('a', 'b', 'c'), null, null),
+                            49375 => array(array('_route' => '_816'), array('a', 'b', 'c'), null, null),
+                            49422 => array(array('_route' => '_872'), array('a', 'b', 'c'), null, null),
+                            49471 => array(array('_route' => '_921'), array('a', 'b', 'c'), null, null),
+                            49519 => array(array('_route' => '_960'), array('a', 'b', 'c'), null, null),
+                            49567 => array(array('_route' => '_974'), array('a', 'b', 'c'), null, null),
+                            49620 => array(array('_route' => '_835'), array('a', 'b', 'c'), null, null),
+                            49668 => array(array('_route' => '_934'), array('a', 'b', 'c'), null, null),
+                            49718 => array(array('_route' => '_869'), array('a', 'b', 'c'), null, null),
+                        );
+
+                        list($ret, $vars, $requiredMethods, $requiredSchemes) = $routes[$m];
+
+                        foreach ($vars as $i => $v) {
+                            if (isset($matches[1 + $i])) {
+                                $ret[$v] = $matches[1 + $i];
+                            }
+                        }
+
+                        $hasRequiredScheme = !$requiredSchemes || isset($requiredSchemes[$context->getScheme()]);
+                        if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {
+                            if ($hasRequiredScheme) {
+                                $allow += $requiredMethods;
+                            }
+                            break;
+                        }
+                        if (!$hasRequiredScheme) {
+                            $allowSchemes += $requiredSchemes;
+                            break;
+                        }
+
+                        return $ret;
+                }
+
+                if (49718 === $m) {
+                    break;
+                }
+                $regex = substr_replace($regex, 'F', $m - $offset, 1 + strlen($m));
+                $offset += strlen($m);
+            }
+        }
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
+            throw new Symfony\Component\Routing\Exception\NoConfigurationException();
+        }
+
+        throw $allow ? new MethodNotAllowedException(array_keys($allow)) : new ResourceNotFoundException();
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher11.php b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher11.php
new file mode 100644
index 00000000..173cc152
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher11.php
@@ -0,0 +1,151 @@
+<?php
+
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Symfony\Component\Routing\RequestContext;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Routing Component.
+ */
+class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\RedirectableUrlMatcher
+{
+    public function __construct(RequestContext $context)
+    {
+        $this->context = $context;
+    }
+
+    public function match($pathinfo)
+    {
+        $allow = $allowSchemes = array();
+        if ($ret = $this->doMatch($pathinfo, $allow, $allowSchemes)) {
+            return $ret;
+        }
+        if ($allow) {
+            throw new MethodNotAllowedException(array_keys($allow));
+        }
+        if (!in_array($this->context->getMethod(), array('HEAD', 'GET'), true)) {
+            // no-op
+        } elseif ($allowSchemes) {
+            redirect_scheme:
+            $scheme = $this->context->getScheme();
+            $this->context->setScheme(key($allowSchemes));
+            try {
+                if ($ret = $this->doMatch($pathinfo)) {
+                    return $this->redirect($pathinfo, $ret['_route'], $this->context->getScheme()) + $ret;
+                }
+            } finally {
+                $this->context->setScheme($scheme);
+            }
+        } elseif ('/' !== $pathinfo) {
+            $pathinfo = '/' !== $pathinfo[-1] ? $pathinfo.'/' : substr($pathinfo, 0, -1);
+            if ($ret = $this->doMatch($pathinfo, $allow, $allowSchemes)) {
+                return $this->redirect($pathinfo, $ret['_route']) + $ret;
+            }
+            if ($allowSchemes) {
+                goto redirect_scheme;
+            }
+        }
+
+        throw new ResourceNotFoundException();
+    }
+
+    private function doMatch(string $rawPathinfo, array &$allow = array(), array &$allowSchemes = array()): ?array
+    {
+        $allow = $allowSchemes = array();
+        $pathinfo = rawurldecode($rawPathinfo);
+        $context = $this->context;
+        $requestMethod = $canonicalMethod = $context->getMethod();
+
+        if ('HEAD' === $requestMethod) {
+            $canonicalMethod = 'GET';
+        }
+
+        $matchedPathinfo = $pathinfo;
+        $regexList = array(
+            0 => '{^(?'
+                    .'|/(en|fr)/(?'
+                        .'|admin/post/(?'
+                            .'|(*:33)'
+                            .'|new(*:43)'
+                            .'|(\\d+)(*:55)'
+                            .'|(\\d+)/edit(*:72)'
+                            .'|(\\d+)/delete(*:91)'
+                        .')'
+                        .'|blog/(?'
+                            .'|(*:107)'
+                            .'|rss\\.xml(*:123)'
+                            .'|p(?'
+                                .'|age/([^/]++)(*:147)'
+                                .'|osts/([^/]++)(*:168)'
+                            .')'
+                            .'|comments/(\\d+)/new(*:195)'
+                            .'|search(*:209)'
+                        .')'
+                        .'|log(?'
+                            .'|in(*:226)'
+                            .'|out(*:237)'
+                        .')'
+                    .')'
+                    .'|/(en|fr)?(*:256)'
+                .')$}sD',
+        );
+
+        foreach ($regexList as $offset => $regex) {
+            while (preg_match($regex, $matchedPathinfo, $matches)) {
+                switch ($m = (int) $matches['MARK']) {
+                    default:
+                        $routes = array(
+                            33 => array(array('_route' => 'a', '_locale' => 'en'), array('_locale'), null, null),
+                            43 => array(array('_route' => 'b', '_locale' => 'en'), array('_locale'), null, null),
+                            55 => array(array('_route' => 'c', '_locale' => 'en'), array('_locale', 'id'), null, null),
+                            72 => array(array('_route' => 'd', '_locale' => 'en'), array('_locale', 'id'), null, null),
+                            91 => array(array('_route' => 'e', '_locale' => 'en'), array('_locale', 'id'), null, null),
+                            107 => array(array('_route' => 'f', '_locale' => 'en'), array('_locale'), null, null),
+                            123 => array(array('_route' => 'g', '_locale' => 'en'), array('_locale'), null, null),
+                            147 => array(array('_route' => 'h', '_locale' => 'en'), array('_locale', 'page'), null, null),
+                            168 => array(array('_route' => 'i', '_locale' => 'en'), array('_locale', 'page'), null, null),
+                            195 => array(array('_route' => 'j', '_locale' => 'en'), array('_locale', 'id'), null, null),
+                            209 => array(array('_route' => 'k', '_locale' => 'en'), array('_locale'), null, null),
+                            226 => array(array('_route' => 'l', '_locale' => 'en'), array('_locale'), null, null),
+                            237 => array(array('_route' => 'm', '_locale' => 'en'), array('_locale'), null, null),
+                            256 => array(array('_route' => 'n', '_locale' => 'en'), array('_locale'), null, null),
+                        );
+
+                        list($ret, $vars, $requiredMethods, $requiredSchemes) = $routes[$m];
+
+                        foreach ($vars as $i => $v) {
+                            if (isset($matches[1 + $i])) {
+                                $ret[$v] = $matches[1 + $i];
+                            }
+                        }
+
+                        $hasRequiredScheme = !$requiredSchemes || isset($requiredSchemes[$context->getScheme()]);
+                        if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {
+                            if ($hasRequiredScheme) {
+                                $allow += $requiredMethods;
+                            }
+                            break;
+                        }
+                        if (!$hasRequiredScheme) {
+                            $allowSchemes += $requiredSchemes;
+                            break;
+                        }
+
+                        return $ret;
+                }
+
+                if (256 === $m) {
+                    break;
+                }
+                $regex = substr_replace($regex, 'F', $m - $offset, 1 + strlen($m));
+                $offset += strlen($m);
+            }
+        }
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
+            throw new Symfony\Component\Routing\Exception\NoConfigurationException();
+        }
+
+        return null;
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher12.php b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher12.php
new file mode 100644
index 00000000..eba4c8ac
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher12.php
@@ -0,0 +1,100 @@
+<?php
+
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Symfony\Component\Routing\RequestContext;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Routing Component.
+ */
+class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
+{
+    public function __construct(RequestContext $context)
+    {
+        $this->context = $context;
+    }
+
+    public function match($rawPathinfo)
+    {
+        $allow = $allowSchemes = array();
+        $pathinfo = rawurldecode($rawPathinfo);
+        $context = $this->context;
+        $requestMethod = $canonicalMethod = $context->getMethod();
+
+        if ('HEAD' === $requestMethod) {
+            $canonicalMethod = 'GET';
+        }
+
+        $matchedPathinfo = $pathinfo;
+        $regexList = array(
+            0 => '{^(?'
+                    .'|/abc([^/]++)/(?'
+                        .'|1(?'
+                            .'|(*:27)'
+                            .'|0(?'
+                                .'|(*:38)'
+                                .'|0(*:46)'
+                            .')'
+                        .')'
+                        .'|2(?'
+                            .'|(*:59)'
+                            .'|0(?'
+                                .'|(*:70)'
+                                .'|0(*:78)'
+                            .')'
+                        .')'
+                    .')'
+                .')$}sD',
+        );
+
+        foreach ($regexList as $offset => $regex) {
+            while (preg_match($regex, $matchedPathinfo, $matches)) {
+                switch ($m = (int) $matches['MARK']) {
+                    default:
+                        $routes = array(
+                            27 => array(array('_route' => 'r1'), array('foo'), null, null),
+                            38 => array(array('_route' => 'r10'), array('foo'), null, null),
+                            46 => array(array('_route' => 'r100'), array('foo'), null, null),
+                            59 => array(array('_route' => 'r2'), array('foo'), null, null),
+                            70 => array(array('_route' => 'r20'), array('foo'), null, null),
+                            78 => array(array('_route' => 'r200'), array('foo'), null, null),
+                        );
+
+                        list($ret, $vars, $requiredMethods, $requiredSchemes) = $routes[$m];
+
+                        foreach ($vars as $i => $v) {
+                            if (isset($matches[1 + $i])) {
+                                $ret[$v] = $matches[1 + $i];
+                            }
+                        }
+
+                        $hasRequiredScheme = !$requiredSchemes || isset($requiredSchemes[$context->getScheme()]);
+                        if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {
+                            if ($hasRequiredScheme) {
+                                $allow += $requiredMethods;
+                            }
+                            break;
+                        }
+                        if (!$hasRequiredScheme) {
+                            $allowSchemes += $requiredSchemes;
+                            break;
+                        }
+
+                        return $ret;
+                }
+
+                if (78 === $m) {
+                    break;
+                }
+                $regex = substr_replace($regex, 'F', $m - $offset, 1 + strlen($m));
+                $offset += strlen($m);
+            }
+        }
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
+            throw new Symfony\Component\Routing\Exception\NoConfigurationException();
+        }
+
+        throw $allow ? new MethodNotAllowedException(array_keys($allow)) : new ResourceNotFoundException();
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher13.php b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher13.php
new file mode 100644
index 00000000..5cda7753
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher13.php
@@ -0,0 +1,69 @@
+<?php
+
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Symfony\Component\Routing\RequestContext;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Routing Component.
+ */
+class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
+{
+    public function __construct(RequestContext $context)
+    {
+        $this->context = $context;
+    }
+
+    public function match($rawPathinfo)
+    {
+        $allow = $allowSchemes = array();
+        $pathinfo = rawurldecode($rawPathinfo);
+        $context = $this->context;
+        $requestMethod = $canonicalMethod = $context->getMethod();
+        $host = strtolower($context->getHost());
+
+        if ('HEAD' === $requestMethod) {
+            $canonicalMethod = 'GET';
+        }
+
+        $matchedPathinfo = $host.'.'.$pathinfo;
+        $regexList = array(
+            0 => '{^(?'
+                .'|(?i:([^\\.]++)\\.exampple\\.com)\\.(?'
+                    .'|/abc([^/]++)(?'
+                        .'|(*:56)'
+                    .')'
+                .')'
+                .')$}sD',
+        );
+
+        foreach ($regexList as $offset => $regex) {
+            while (preg_match($regex, $matchedPathinfo, $matches)) {
+                switch ($m = (int) $matches['MARK']) {
+                    case 56:
+                        $matches = array('foo' => $matches[1] ?? null, 'foo' => $matches[2] ?? null);
+
+                        // r1
+                        return $this->mergeDefaults(array('_route' => 'r1') + $matches, array());
+
+                        // r2
+                        return $this->mergeDefaults(array('_route' => 'r2') + $matches, array());
+
+                        break;
+                }
+
+                if (56 === $m) {
+                    break;
+                }
+                $regex = substr_replace($regex, 'F', $m - $offset, 1 + strlen($m));
+                $offset += strlen($m);
+            }
+        }
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
+            throw new Symfony\Component\Routing\Exception\NoConfigurationException();
+        }
+
+        throw $allow ? new MethodNotAllowedException(array_keys($allow)) : new ResourceNotFoundException();
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher2.php b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher2.php
index e430adb1..5aec5db0 100644
--- a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher2.php
+++ b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher2.php
@@ -15,366 +15,270 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
         $this->context = $context;
     }
 
-    public function match($rawPathinfo)
+    public function match($pathinfo)
     {
-        $allow = array();
-        $pathinfo = rawurldecode($rawPathinfo);
-        $trimmedPathinfo = rtrim($pathinfo, '/');
-        $context = $this->context;
-        $request = $this->request ?: $this->createRequest($pathinfo);
-        $requestMethod = $canonicalMethod = $context->getMethod();
-
-        if ('HEAD' === $requestMethod) {
-            $canonicalMethod = 'GET';
-        }
-
-        if (0 === strpos($pathinfo, '/foo')) {
-            // foo
-            if (preg_match('#^/foo/(?P<bar>baz|symfony)$#sD', $pathinfo, $matches)) {
-                return $this->mergeDefaults(array_replace($matches, array('_route' => 'foo')), array (  'def' => 'test',));
-            }
-
-            // foofoo
-            if ('/foofoo' === $pathinfo) {
-                return array (  'def' => 'test',  '_route' => 'foofoo',);
-            }
-
-        }
-
-        elseif (0 === strpos($pathinfo, '/bar')) {
-            // bar
-            if (preg_match('#^/bar/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
-                $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'bar')), array ());
-                if (!in_array($canonicalMethod, array('GET', 'HEAD'))) {
-                    $allow = array_merge($allow, array('GET', 'HEAD'));
-                    goto not_bar;
-                }
-
-                return $ret;
-            }
-            not_bar:
-
-            // barhead
-            if (0 === strpos($pathinfo, '/barhead') && preg_match('#^/barhead/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
-                $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'barhead')), array ());
-                if (!in_array($canonicalMethod, array('GET'))) {
-                    $allow = array_merge($allow, array('GET'));
-                    goto not_barhead;
-                }
-
-                return $ret;
-            }
-            not_barhead:
-
-        }
-
-        elseif (0 === strpos($pathinfo, '/test')) {
-            if (0 === strpos($pathinfo, '/test/baz')) {
-                // baz
-                if ('/test/baz' === $pathinfo) {
-                    return array('_route' => 'baz');
-                }
-
-                // baz2
-                if ('/test/baz.html' === $pathinfo) {
-                    return array('_route' => 'baz2');
-                }
-
-                // baz3
-                if ('/test/baz3' === $trimmedPathinfo) {
-                    $ret = array('_route' => 'baz3');
-                    if ('/' === substr($pathinfo, -1)) {
-                        // no-op
-                    } elseif ('GET' !== $canonicalMethod) {
-                        goto not_baz3;
-                    } else {
-                        return array_replace($ret, $this->redirect($rawPathinfo.'/', 'baz3'));
-                    }
-
-                    return $ret;
-                }
-                not_baz3:
-
-            }
-
-            // baz4
-            if (preg_match('#^/test/(?P<foo>[^/]++)/?$#sD', $pathinfo, $matches)) {
-                $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'baz4')), array ());
-                if ('/' === substr($pathinfo, -1)) {
-                    // no-op
-                } elseif ('GET' !== $canonicalMethod) {
-                    goto not_baz4;
-                } else {
-                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'baz4'));
-                }
-
-                return $ret;
-            }
-            not_baz4:
-
-            // baz5
-            if (preg_match('#^/test/(?P<foo>[^/]++)/$#sD', $pathinfo, $matches)) {
-                $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'baz5')), array ());
-                if (!in_array($requestMethod, array('POST'))) {
-                    $allow = array_merge($allow, array('POST'));
-                    goto not_baz5;
-                }
-
-                return $ret;
-            }
-            not_baz5:
-
-            // baz.baz6
-            if (preg_match('#^/test/(?P<foo>[^/]++)/$#sD', $pathinfo, $matches)) {
-                $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'baz.baz6')), array ());
-                if (!in_array($requestMethod, array('PUT'))) {
-                    $allow = array_merge($allow, array('PUT'));
-                    goto not_bazbaz6;
-                }
-
-                return $ret;
-            }
-            not_bazbaz6:
-
-        }
-
-        // quoter
-        if (preg_match('#^/(?P<quoter>[\']+)$#sD', $pathinfo, $matches)) {
-            return $this->mergeDefaults(array_replace($matches, array('_route' => 'quoter')), array ());
+        $allow = $allowSchemes = array();
+        if ($ret = $this->doMatch($pathinfo, $allow, $allowSchemes)) {
+            return $ret;
         }
-
-        // space
-        if ('/spa ce' === $pathinfo) {
-            return array('_route' => 'space');
+        if ($allow) {
+            throw new MethodNotAllowedException(array_keys($allow));
         }
-
-        if (0 === strpos($pathinfo, '/a')) {
-            if (0 === strpos($pathinfo, '/a/b\'b')) {
-                // foo1
-                if (preg_match('#^/a/b\'b/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
-                    return $this->mergeDefaults(array_replace($matches, array('_route' => 'foo1')), array ());
+        if (!in_array($this->context->getMethod(), array('HEAD', 'GET'), true)) {
+            // no-op
+        } elseif ($allowSchemes) {
+            redirect_scheme:
+            $scheme = $this->context->getScheme();
+            $this->context->setScheme(key($allowSchemes));
+            try {
+                if ($ret = $this->doMatch($pathinfo)) {
+                    return $this->redirect($pathinfo, $ret['_route'], $this->context->getScheme()) + $ret;
                 }
-
-                // bar1
-                if (preg_match('#^/a/b\'b/(?P<bar>[^/]++)$#sD', $pathinfo, $matches)) {
-                    return $this->mergeDefaults(array_replace($matches, array('_route' => 'bar1')), array ());
-                }
-
+            } finally {
+                $this->context->setScheme($scheme);
             }
-
-            // overridden
-            if (preg_match('#^/a/(?P<var>.*)$#sD', $pathinfo, $matches)) {
-                return $this->mergeDefaults(array_replace($matches, array('_route' => 'overridden')), array ());
+        } elseif ('/' !== $pathinfo) {
+            $pathinfo = '/' !== $pathinfo[-1] ? $pathinfo.'/' : substr($pathinfo, 0, -1);
+            if ($ret = $this->doMatch($pathinfo, $allow, $allowSchemes)) {
+                return $this->redirect($pathinfo, $ret['_route']) + $ret;
             }
-
-            if (0 === strpos($pathinfo, '/a/b\'b')) {
-                // foo2
-                if (preg_match('#^/a/b\'b/(?P<foo1>[^/]++)$#sD', $pathinfo, $matches)) {
-                    return $this->mergeDefaults(array_replace($matches, array('_route' => 'foo2')), array ());
-                }
-
-                // bar2
-                if (preg_match('#^/a/b\'b/(?P<bar1>[^/]++)$#sD', $pathinfo, $matches)) {
-                    return $this->mergeDefaults(array_replace($matches, array('_route' => 'bar2')), array ());
-                }
-
+            if ($allowSchemes) {
+                goto redirect_scheme;
             }
-
         }
 
-        elseif (0 === strpos($pathinfo, '/multi')) {
-            // helloWorld
-            if (0 === strpos($pathinfo, '/multi/hello') && preg_match('#^/multi/hello(?:/(?P<who>[^/]++))?$#sD', $pathinfo, $matches)) {
-                return $this->mergeDefaults(array_replace($matches, array('_route' => 'helloWorld')), array (  'who' => 'World!',));
-            }
-
-            // hey
-            if ('/multi/hey' === $trimmedPathinfo) {
-                $ret = array('_route' => 'hey');
-                if ('/' === substr($pathinfo, -1)) {
-                    // no-op
-                } elseif ('GET' !== $canonicalMethod) {
-                    goto not_hey;
-                } else {
-                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'hey'));
-                }
-
-                return $ret;
-            }
-            not_hey:
-
-            // overridden2
-            if ('/multi/new' === $pathinfo) {
-                return array('_route' => 'overridden2');
-            }
-
-        }
-
-        // foo3
-        if (preg_match('#^/(?P<_locale>[^/]++)/b/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
-            return $this->mergeDefaults(array_replace($matches, array('_route' => 'foo3')), array ());
-        }
-
-        // bar3
-        if (preg_match('#^/(?P<_locale>[^/]++)/b/(?P<bar>[^/]++)$#sD', $pathinfo, $matches)) {
-            return $this->mergeDefaults(array_replace($matches, array('_route' => 'bar3')), array ());
-        }
-
-        if (0 === strpos($pathinfo, '/aba')) {
-            // ababa
-            if ('/ababa' === $pathinfo) {
-                return array('_route' => 'ababa');
-            }
-
-            // foo4
-            if (preg_match('#^/aba/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
-                return $this->mergeDefaults(array_replace($matches, array('_route' => 'foo4')), array ());
-            }
-
-        }
-
-        $host = $context->getHost();
-
-        if (preg_match('#^a\\.example\\.com$#sDi', $host, $hostMatches)) {
-            // route1
-            if ('/route1' === $pathinfo) {
-                return array('_route' => 'route1');
-            }
-
-            // route2
-            if ('/c2/route2' === $pathinfo) {
-                return array('_route' => 'route2');
-            }
-
-        }
-
-        if (preg_match('#^b\\.example\\.com$#sDi', $host, $hostMatches)) {
-            // route3
-            if ('/c2/route3' === $pathinfo) {
-                return array('_route' => 'route3');
-            }
-
-        }
-
-        if (preg_match('#^a\\.example\\.com$#sDi', $host, $hostMatches)) {
-            // route4
-            if ('/route4' === $pathinfo) {
-                return array('_route' => 'route4');
-            }
-
-        }
-
-        if (preg_match('#^c\\.example\\.com$#sDi', $host, $hostMatches)) {
-            // route5
-            if ('/route5' === $pathinfo) {
-                return array('_route' => 'route5');
-            }
+        throw new ResourceNotFoundException();
+    }
 
-        }
+    private function doMatch(string $rawPathinfo, array &$allow = array(), array &$allowSchemes = array()): ?array
+    {
+        $allow = $allowSchemes = array();
+        $pathinfo = rawurldecode($rawPathinfo);
+        $context = $this->context;
+        $requestMethod = $canonicalMethod = $context->getMethod();
+        $host = strtolower($context->getHost());
 
-        // route6
-        if ('/route6' === $pathinfo) {
-            return array('_route' => 'route6');
+        if ('HEAD' === $requestMethod) {
+            $canonicalMethod = 'GET';
         }
 
-        if (preg_match('#^(?P<var1>[^\\.]++)\\.example\\.com$#sDi', $host, $hostMatches)) {
-            if (0 === strpos($pathinfo, '/route1')) {
-                // route11
-                if ('/route11' === $pathinfo) {
-                    return $this->mergeDefaults(array_replace($hostMatches, array('_route' => 'route11')), array ());
+        switch ($pathinfo) {
+            default:
+                $routes = array(
+                    '/test/baz' => array(array('_route' => 'baz'), null, null, null),
+                    '/test/baz.html' => array(array('_route' => 'baz2'), null, null, null),
+                    '/test/baz3/' => array(array('_route' => 'baz3'), null, null, null),
+                    '/foofoo' => array(array('_route' => 'foofoo', 'def' => 'test'), null, null, null),
+                    '/spa ce' => array(array('_route' => 'space'), null, null, null),
+                    '/multi/new' => array(array('_route' => 'overridden2'), null, null, null),
+                    '/multi/hey/' => array(array('_route' => 'hey'), null, null, null),
+                    '/ababa' => array(array('_route' => 'ababa'), null, null, null),
+                    '/route1' => array(array('_route' => 'route1'), 'a.example.com', null, null),
+                    '/c2/route2' => array(array('_route' => 'route2'), 'a.example.com', null, null),
+                    '/route4' => array(array('_route' => 'route4'), 'a.example.com', null, null),
+                    '/c2/route3' => array(array('_route' => 'route3'), 'b.example.com', null, null),
+                    '/route5' => array(array('_route' => 'route5'), 'c.example.com', null, null),
+                    '/route6' => array(array('_route' => 'route6'), null, null, null),
+                    '/route11' => array(array('_route' => 'route11'), '#^(?P<var1>[^\\.]++)\\.example\\.com$#sDi', null, null),
+                    '/route12' => array(array('_route' => 'route12', 'var1' => 'val'), '#^(?P<var1>[^\\.]++)\\.example\\.com$#sDi', null, null),
+                    '/route17' => array(array('_route' => 'route17'), null, null, null),
+                    '/secure' => array(array('_route' => 'secure'), null, null, array('https' => 0)),
+                    '/nonsecure' => array(array('_route' => 'nonsecure'), null, null, array('http' => 0)),
+                );
+
+                if (!isset($routes[$pathinfo])) {
+                    break;
                 }
+                list($ret, $requiredHost, $requiredMethods, $requiredSchemes) = $routes[$pathinfo];
 
-                // route12
-                if ('/route12' === $pathinfo) {
-                    return $this->mergeDefaults(array_replace($hostMatches, array('_route' => 'route12')), array (  'var1' => 'val',));
+                if ($requiredHost) {
+                    if ('#' !== $requiredHost[0] ? $requiredHost !== $host : !preg_match($requiredHost, $host, $hostMatches)) {
+                        break;
+                    }
+                    if ('#' === $requiredHost[0] && $hostMatches) {
+                        $hostMatches['_route'] = $ret['_route'];
+                        $ret = $this->mergeDefaults($hostMatches, $ret);
+                    }
                 }
 
-                // route13
-                if (0 === strpos($pathinfo, '/route13') && preg_match('#^/route13/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
-                    return $this->mergeDefaults(array_replace($hostMatches, $matches, array('_route' => 'route13')), array ());
+                $hasRequiredScheme = !$requiredSchemes || isset($requiredSchemes[$context->getScheme()]);
+                if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {
+                    if ($hasRequiredScheme) {
+                        $allow += $requiredMethods;
+                    }
+                    break;
                 }
-
-                // route14
-                if (0 === strpos($pathinfo, '/route14') && preg_match('#^/route14/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
-                    return $this->mergeDefaults(array_replace($hostMatches, $matches, array('_route' => 'route14')), array (  'var1' => 'val',));
+                if (!$hasRequiredScheme) {
+                    $allowSchemes += $requiredSchemes;
+                    break;
                 }
 
-            }
-
-        }
-
-        if (preg_match('#^c\\.example\\.com$#sDi', $host, $hostMatches)) {
-            // route15
-            if (0 === strpos($pathinfo, '/route15') && preg_match('#^/route15/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
-                return $this->mergeDefaults(array_replace($matches, array('_route' => 'route15')), array ());
-            }
-
-        }
-
-        // route16
-        if (0 === strpos($pathinfo, '/route16') && preg_match('#^/route16/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
-            return $this->mergeDefaults(array_replace($matches, array('_route' => 'route16')), array (  'var1' => 'val',));
-        }
-
-        // route17
-        if ('/route17' === $pathinfo) {
-            return array('_route' => 'route17');
-        }
-
-        // a
-        if ('/a/a...' === $pathinfo) {
-            return array('_route' => 'a');
-        }
-
-        if (0 === strpos($pathinfo, '/a/b')) {
-            // b
-            if (preg_match('#^/a/b/(?P<var>[^/]++)$#sD', $pathinfo, $matches)) {
-                return $this->mergeDefaults(array_replace($matches, array('_route' => 'b')), array ());
-            }
-
-            // c
-            if (0 === strpos($pathinfo, '/a/b/c') && preg_match('#^/a/b/c/(?P<var>[^/]++)$#sD', $pathinfo, $matches)) {
-                return $this->mergeDefaults(array_replace($matches, array('_route' => 'c')), array ());
-            }
-
+                return $ret;
         }
 
-        // secure
-        if ('/secure' === $pathinfo) {
-            $ret = array('_route' => 'secure');
-            $requiredSchemes = array (  'https' => 0,);
-            if (!isset($requiredSchemes[$context->getScheme()])) {
-                if ('GET' !== $canonicalMethod) {
-                    goto not_secure;
+        $matchedPathinfo = $host.'.'.$pathinfo;
+        $regexList = array(
+            0 => '{^(?'
+                .'|(?:(?:[^./]*+\\.)++)(?'
+                    .'|/foo/(baz|symfony)(*:47)'
+                    .'|/bar(?'
+                        .'|/([^/]++)(*:70)'
+                        .'|head/([^/]++)(*:90)'
+                    .')'
+                    .'|/test/([^/]++)/(?'
+                        .'|(*:116)'
+                    .')'
+                    .'|/([\']+)(*:132)'
+                    .'|/a/(?'
+                        .'|b\'b/([^/]++)(?'
+                            .'|(*:161)'
+                            .'|(*:169)'
+                        .')'
+                        .'|(.*)(*:182)'
+                        .'|b\'b/([^/]++)(?'
+                            .'|(*:205)'
+                            .'|(*:213)'
+                        .')'
+                    .')'
+                    .'|/multi/hello(?:/([^/]++))?(*:249)'
+                    .'|/([^/]++)/b/([^/]++)(?'
+                        .'|(*:280)'
+                        .'|(*:288)'
+                    .')'
+                    .'|/aba/([^/]++)(*:310)'
+                .')|(?i:([^\\.]++)\\.example\\.com)\\.(?'
+                    .'|/route1(?'
+                        .'|3/([^/]++)(*:372)'
+                        .'|4/([^/]++)(*:390)'
+                    .')'
+                .')|(?i:c\\.example\\.com)\\.(?'
+                    .'|/route15/([^/]++)(*:442)'
+                .')|(?:(?:[^./]*+\\.)++)(?'
+                    .'|/route16/([^/]++)(*:490)'
+                    .'|/a/(?'
+                        .'|a\\.\\.\\.(*:511)'
+                        .'|b/(?'
+                            .'|([^/]++)(*:532)'
+                            .'|c/([^/]++)(*:550)'
+                        .')'
+                    .')'
+                .')'
+                .')$}sD',
+        );
+
+        foreach ($regexList as $offset => $regex) {
+            while (preg_match($regex, $matchedPathinfo, $matches)) {
+                switch ($m = (int) $matches['MARK']) {
+                    case 116:
+                        $matches = array('foo' => $matches[1] ?? null);
+
+                        // baz4
+                        return $this->mergeDefaults(array('_route' => 'baz4') + $matches, array());
+
+                        // baz5
+                        $ret = $this->mergeDefaults(array('_route' => 'baz5') + $matches, array());
+                        if (!isset(($a = array('POST' => 0))[$requestMethod])) {
+                            $allow += $a;
+                            goto not_baz5;
+                        }
+
+                        return $ret;
+                        not_baz5:
+
+                        // baz.baz6
+                        $ret = $this->mergeDefaults(array('_route' => 'baz.baz6') + $matches, array());
+                        if (!isset(($a = array('PUT' => 0))[$requestMethod])) {
+                            $allow += $a;
+                            goto not_bazbaz6;
+                        }
+
+                        return $ret;
+                        not_bazbaz6:
+
+                        break;
+                    case 161:
+                        $matches = array('foo' => $matches[1] ?? null);
+
+                        // foo1
+                        $ret = $this->mergeDefaults(array('_route' => 'foo1') + $matches, array());
+                        if (!isset(($a = array('PUT' => 0))[$requestMethod])) {
+                            $allow += $a;
+                            goto not_foo1;
+                        }
+
+                        return $ret;
+                        not_foo1:
+
+                        break;
+                    case 205:
+                        $matches = array('foo1' => $matches[1] ?? null);
+
+                        // foo2
+                        return $this->mergeDefaults(array('_route' => 'foo2') + $matches, array());
+
+                        break;
+                    case 280:
+                        $matches = array('_locale' => $matches[1] ?? null, 'foo' => $matches[2] ?? null);
+
+                        // foo3
+                        return $this->mergeDefaults(array('_route' => 'foo3') + $matches, array());
+
+                        break;
+                    default:
+                        $routes = array(
+                            47 => array(array('_route' => 'foo', 'def' => 'test'), array('bar'), null, null),
+                            70 => array(array('_route' => 'bar'), array('foo'), array('GET' => 0, 'HEAD' => 1), null),
+                            90 => array(array('_route' => 'barhead'), array('foo'), array('GET' => 0), null),
+                            132 => array(array('_route' => 'quoter'), array('quoter'), null, null),
+                            169 => array(array('_route' => 'bar1'), array('bar'), null, null),
+                            182 => array(array('_route' => 'overridden'), array('var'), null, null),
+                            213 => array(array('_route' => 'bar2'), array('bar1'), null, null),
+                            249 => array(array('_route' => 'helloWorld', 'who' => 'World!'), array('who'), null, null),
+                            288 => array(array('_route' => 'bar3'), array('_locale', 'bar'), null, null),
+                            310 => array(array('_route' => 'foo4'), array('foo'), null, null),
+                            372 => array(array('_route' => 'route13'), array('var1', 'name'), null, null),
+                            390 => array(array('_route' => 'route14', 'var1' => 'val'), array('var1', 'name'), null, null),
+                            442 => array(array('_route' => 'route15'), array('name'), null, null),
+                            490 => array(array('_route' => 'route16', 'var1' => 'val'), array('name'), null, null),
+                            511 => array(array('_route' => 'a'), array(), null, null),
+                            532 => array(array('_route' => 'b'), array('var'), null, null),
+                            550 => array(array('_route' => 'c'), array('var'), null, null),
+                        );
+
+                        list($ret, $vars, $requiredMethods, $requiredSchemes) = $routes[$m];
+
+                        foreach ($vars as $i => $v) {
+                            if (isset($matches[1 + $i])) {
+                                $ret[$v] = $matches[1 + $i];
+                            }
+                        }
+
+                        $hasRequiredScheme = !$requiredSchemes || isset($requiredSchemes[$context->getScheme()]);
+                        if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {
+                            if ($hasRequiredScheme) {
+                                $allow += $requiredMethods;
+                            }
+                            break;
+                        }
+                        if (!$hasRequiredScheme) {
+                            $allowSchemes += $requiredSchemes;
+                            break;
+                        }
+
+                        return $ret;
                 }
 
-                return array_replace($ret, $this->redirect($rawPathinfo, 'secure', key($requiredSchemes)));
-            }
-
-            return $ret;
-        }
-        not_secure:
-
-        // nonsecure
-        if ('/nonsecure' === $pathinfo) {
-            $ret = array('_route' => 'nonsecure');
-            $requiredSchemes = array (  'http' => 0,);
-            if (!isset($requiredSchemes[$context->getScheme()])) {
-                if ('GET' !== $canonicalMethod) {
-                    goto not_nonsecure;
+                if (550 === $m) {
+                    break;
                 }
-
-                return array_replace($ret, $this->redirect($rawPathinfo, 'nonsecure', key($requiredSchemes)));
+                $regex = substr_replace($regex, 'F', $m - $offset, 1 + strlen($m));
+                $offset += strlen($m);
             }
-
-            return $ret;
         }
-        not_nonsecure:
-
-        if ('/' === $pathinfo && !$allow) {
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
-        throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();
+        return null;
     }
 }
diff --git a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher3.php b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher3.php
index 67c46674..6f1c45aa 100644
--- a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher3.php
+++ b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher3.php
@@ -17,39 +17,96 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
 
     public function match($rawPathinfo)
     {
-        $allow = array();
+        $allow = $allowSchemes = array();
         $pathinfo = rawurldecode($rawPathinfo);
-        $trimmedPathinfo = rtrim($pathinfo, '/');
         $context = $this->context;
-        $request = $this->request ?: $this->createRequest($pathinfo);
         $requestMethod = $canonicalMethod = $context->getMethod();
 
         if ('HEAD' === $requestMethod) {
             $canonicalMethod = 'GET';
         }
 
-        if (0 === strpos($pathinfo, '/rootprefix')) {
-            // static
-            if ('/rootprefix/test' === $pathinfo) {
-                return array('_route' => 'static');
-            }
+        switch ($pathinfo) {
+            case '/with-condition':
+                // with-condition
+                if (($context->getMethod() == "GET")) {
+                    return array('_route' => 'with-condition');
+                }
+                break;
+            default:
+                $routes = array(
+                    '/rootprefix/test' => array(array('_route' => 'static'), null, null, null),
+                );
 
-            // dynamic
-            if (preg_match('#^/rootprefix/(?P<var>[^/]++)$#sD', $pathinfo, $matches)) {
-                return $this->mergeDefaults(array_replace($matches, array('_route' => 'dynamic')), array ());
-            }
+                if (!isset($routes[$pathinfo])) {
+                    break;
+                }
+                list($ret, $requiredHost, $requiredMethods, $requiredSchemes) = $routes[$pathinfo];
 
-        }
+                $hasRequiredScheme = !$requiredSchemes || isset($requiredSchemes[$context->getScheme()]);
+                if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {
+                    if ($hasRequiredScheme) {
+                        $allow += $requiredMethods;
+                    }
+                    break;
+                }
+                if (!$hasRequiredScheme) {
+                    $allowSchemes += $requiredSchemes;
+                    break;
+                }
 
-        // with-condition
-        if ('/with-condition' === $pathinfo && ($context->getMethod() == "GET")) {
-            return array('_route' => 'with-condition');
+                return $ret;
         }
 
-        if ('/' === $pathinfo && !$allow) {
+        $matchedPathinfo = $pathinfo;
+        $regexList = array(
+            0 => '{^(?'
+                    .'|/rootprefix/([^/]++)(*:27)'
+                .')$}sD',
+        );
+
+        foreach ($regexList as $offset => $regex) {
+            while (preg_match($regex, $matchedPathinfo, $matches)) {
+                switch ($m = (int) $matches['MARK']) {
+                    default:
+                        $routes = array(
+                            27 => array(array('_route' => 'dynamic'), array('var'), null, null),
+                        );
+
+                        list($ret, $vars, $requiredMethods, $requiredSchemes) = $routes[$m];
+
+                        foreach ($vars as $i => $v) {
+                            if (isset($matches[1 + $i])) {
+                                $ret[$v] = $matches[1 + $i];
+                            }
+                        }
+
+                        $hasRequiredScheme = !$requiredSchemes || isset($requiredSchemes[$context->getScheme()]);
+                        if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {
+                            if ($hasRequiredScheme) {
+                                $allow += $requiredMethods;
+                            }
+                            break;
+                        }
+                        if (!$hasRequiredScheme) {
+                            $allowSchemes += $requiredSchemes;
+                            break;
+                        }
+
+                        return $ret;
+                }
+
+                if (27 === $m) {
+                    break;
+                }
+                $regex = substr_replace($regex, 'F', $m - $offset, 1 + strlen($m));
+                $offset += strlen($m);
+            }
+        }
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
-        throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();
+        throw $allow ? new MethodNotAllowedException(array_keys($allow)) : new ResourceNotFoundException();
     }
 }
diff --git a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher4.php b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher4.php
index ed07194a..418f8e0b 100644
--- a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher4.php
+++ b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher4.php
@@ -17,96 +17,68 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
 
     public function match($rawPathinfo)
     {
-        $allow = array();
+        $allow = $allowSchemes = array();
         $pathinfo = rawurldecode($rawPathinfo);
-        $trimmedPathinfo = rtrim($pathinfo, '/');
         $context = $this->context;
-        $request = $this->request ?: $this->createRequest($pathinfo);
         $requestMethod = $canonicalMethod = $context->getMethod();
 
         if ('HEAD' === $requestMethod) {
             $canonicalMethod = 'GET';
         }
 
-        // just_head
-        if ('/just_head' === $pathinfo) {
-            $ret = array('_route' => 'just_head');
-            if (!in_array($requestMethod, array('HEAD'))) {
-                $allow = array_merge($allow, array('HEAD'));
-                goto not_just_head;
-            }
-
-            return $ret;
-        }
-        not_just_head:
-
-        // head_and_get
-        if ('/head_and_get' === $pathinfo) {
-            $ret = array('_route' => 'head_and_get');
-            if (!in_array($canonicalMethod, array('HEAD', 'GET'))) {
-                $allow = array_merge($allow, array('HEAD', 'GET'));
-                goto not_head_and_get;
-            }
-
-            return $ret;
-        }
-        not_head_and_get:
-
-        // get_and_head
-        if ('/get_and_head' === $pathinfo) {
-            $ret = array('_route' => 'get_and_head');
-            if (!in_array($canonicalMethod, array('GET', 'HEAD'))) {
-                $allow = array_merge($allow, array('GET', 'HEAD'));
-                goto not_get_and_head;
-            }
-
-            return $ret;
-        }
-        not_get_and_head:
-
-        // post_and_head
-        if ('/post_and_head' === $pathinfo) {
-            $ret = array('_route' => 'post_and_head');
-            if (!in_array($requestMethod, array('POST', 'HEAD'))) {
-                $allow = array_merge($allow, array('POST', 'HEAD'));
-                goto not_post_and_head;
-            }
-
-            return $ret;
-        }
-        not_post_and_head:
-
-        if (0 === strpos($pathinfo, '/put_and_post')) {
-            // put_and_post
-            if ('/put_and_post' === $pathinfo) {
+        switch ($pathinfo) {
+            case '/put_and_post':
+                // put_and_post
                 $ret = array('_route' => 'put_and_post');
-                if (!in_array($requestMethod, array('PUT', 'POST'))) {
-                    $allow = array_merge($allow, array('PUT', 'POST'));
+                if (!isset(($a = array('PUT' => 0, 'POST' => 1))[$requestMethod])) {
+                    $allow += $a;
                     goto not_put_and_post;
                 }
 
                 return $ret;
-            }
-            not_put_and_post:
-
-            // put_and_get_and_head
-            if ('/put_and_post' === $pathinfo) {
+                not_put_and_post:
+                // put_and_get_and_head
                 $ret = array('_route' => 'put_and_get_and_head');
-                if (!in_array($canonicalMethod, array('PUT', 'GET', 'HEAD'))) {
-                    $allow = array_merge($allow, array('PUT', 'GET', 'HEAD'));
+                if (!isset(($a = array('PUT' => 0, 'GET' => 1, 'HEAD' => 2))[$canonicalMethod])) {
+                    $allow += $a;
                     goto not_put_and_get_and_head;
                 }
 
                 return $ret;
-            }
-            not_put_and_get_and_head:
+                not_put_and_get_and_head:
+                break;
+            default:
+                $routes = array(
+                    '/just_head' => array(array('_route' => 'just_head'), null, array('HEAD' => 0), null),
+                    '/head_and_get' => array(array('_route' => 'head_and_get'), null, array('HEAD' => 0, 'GET' => 1), null),
+                    '/get_and_head' => array(array('_route' => 'get_and_head'), null, array('GET' => 0, 'HEAD' => 1), null),
+                    '/post_and_head' => array(array('_route' => 'post_and_head'), null, array('POST' => 0, 'HEAD' => 1), null),
+                );
+
+                if (!isset($routes[$pathinfo])) {
+                    break;
+                }
+                list($ret, $requiredHost, $requiredMethods, $requiredSchemes) = $routes[$pathinfo];
+
+                $hasRequiredScheme = !$requiredSchemes || isset($requiredSchemes[$context->getScheme()]);
+                if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {
+                    if ($hasRequiredScheme) {
+                        $allow += $requiredMethods;
+                    }
+                    break;
+                }
+                if (!$hasRequiredScheme) {
+                    $allowSchemes += $requiredSchemes;
+                    break;
+                }
 
+                return $ret;
         }
 
-        if ('/' === $pathinfo && !$allow) {
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
-        throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();
+        throw $allow ? new MethodNotAllowedException(array_keys($allow)) : new ResourceNotFoundException();
     }
 }
diff --git a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher5.php b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher5.php
index 2b22513a..976a25fb 100644
--- a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher5.php
+++ b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher5.php
@@ -15,195 +15,140 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
         $this->context = $context;
     }
 
-    public function match($rawPathinfo)
+    public function match($pathinfo)
     {
-        $allow = array();
-        $pathinfo = rawurldecode($rawPathinfo);
-        $trimmedPathinfo = rtrim($pathinfo, '/');
-        $context = $this->context;
-        $request = $this->request ?: $this->createRequest($pathinfo);
-        $requestMethod = $canonicalMethod = $context->getMethod();
-
-        if ('HEAD' === $requestMethod) {
-            $canonicalMethod = 'GET';
-        }
-
-        if (0 === strpos($pathinfo, '/a')) {
-            // a_first
-            if ('/a/11' === $pathinfo) {
-                return array('_route' => 'a_first');
-            }
-
-            // a_second
-            if ('/a/22' === $pathinfo) {
-                return array('_route' => 'a_second');
-            }
-
-            // a_third
-            if ('/a/333' === $pathinfo) {
-                return array('_route' => 'a_third');
-            }
-
+        $allow = $allowSchemes = array();
+        if ($ret = $this->doMatch($pathinfo, $allow, $allowSchemes)) {
+            return $ret;
         }
-
-        // a_wildcard
-        if (preg_match('#^/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
-            return $this->mergeDefaults(array_replace($matches, array('_route' => 'a_wildcard')), array ());
+        if ($allow) {
+            throw new MethodNotAllowedException(array_keys($allow));
         }
-
-        if (0 === strpos($pathinfo, '/a')) {
-            // a_fourth
-            if ('/a/44' === $trimmedPathinfo) {
-                $ret = array('_route' => 'a_fourth');
-                if ('/' === substr($pathinfo, -1)) {
-                    // no-op
-                } elseif ('GET' !== $canonicalMethod) {
-                    goto not_a_fourth;
-                } else {
-                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'a_fourth'));
+        if (!in_array($this->context->getMethod(), array('HEAD', 'GET'), true)) {
+            // no-op
+        } elseif ($allowSchemes) {
+            redirect_scheme:
+            $scheme = $this->context->getScheme();
+            $this->context->setScheme(key($allowSchemes));
+            try {
+                if ($ret = $this->doMatch($pathinfo)) {
+                    return $this->redirect($pathinfo, $ret['_route'], $this->context->getScheme()) + $ret;
                 }
-
-                return $ret;
+            } finally {
+                $this->context->setScheme($scheme);
             }
-            not_a_fourth:
-
-            // a_fifth
-            if ('/a/55' === $trimmedPathinfo) {
-                $ret = array('_route' => 'a_fifth');
-                if ('/' === substr($pathinfo, -1)) {
-                    // no-op
-                } elseif ('GET' !== $canonicalMethod) {
-                    goto not_a_fifth;
-                } else {
-                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'a_fifth'));
-                }
-
-                return $ret;
+        } elseif ('/' !== $pathinfo) {
+            $pathinfo = '/' !== $pathinfo[-1] ? $pathinfo.'/' : substr($pathinfo, 0, -1);
+            if ($ret = $this->doMatch($pathinfo, $allow, $allowSchemes)) {
+                return $this->redirect($pathinfo, $ret['_route']) + $ret;
             }
-            not_a_fifth:
-
-            // a_sixth
-            if ('/a/66' === $trimmedPathinfo) {
-                $ret = array('_route' => 'a_sixth');
-                if ('/' === substr($pathinfo, -1)) {
-                    // no-op
-                } elseif ('GET' !== $canonicalMethod) {
-                    goto not_a_sixth;
-                } else {
-                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'a_sixth'));
-                }
-
-                return $ret;
+            if ($allowSchemes) {
+                goto redirect_scheme;
             }
-            not_a_sixth:
-
         }
 
-        // nested_wildcard
-        if (0 === strpos($pathinfo, '/nested') && preg_match('#^/nested/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
-            return $this->mergeDefaults(array_replace($matches, array('_route' => 'nested_wildcard')), array ());
+        throw new ResourceNotFoundException();
+    }
+
+    private function doMatch(string $rawPathinfo, array &$allow = array(), array &$allowSchemes = array()): ?array
+    {
+        $allow = $allowSchemes = array();
+        $pathinfo = rawurldecode($rawPathinfo);
+        $context = $this->context;
+        $requestMethod = $canonicalMethod = $context->getMethod();
+
+        if ('HEAD' === $requestMethod) {
+            $canonicalMethod = 'GET';
         }
 
-        if (0 === strpos($pathinfo, '/nested/group')) {
-            // nested_a
-            if ('/nested/group/a' === $trimmedPathinfo) {
-                $ret = array('_route' => 'nested_a');
-                if ('/' === substr($pathinfo, -1)) {
-                    // no-op
-                } elseif ('GET' !== $canonicalMethod) {
-                    goto not_nested_a;
-                } else {
-                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'nested_a'));
+        switch ($pathinfo) {
+            default:
+                $routes = array(
+                    '/a/11' => array(array('_route' => 'a_first'), null, null, null),
+                    '/a/22' => array(array('_route' => 'a_second'), null, null, null),
+                    '/a/333' => array(array('_route' => 'a_third'), null, null, null),
+                    '/a/44/' => array(array('_route' => 'a_fourth'), null, null, null),
+                    '/a/55/' => array(array('_route' => 'a_fifth'), null, null, null),
+                    '/a/66/' => array(array('_route' => 'a_sixth'), null, null, null),
+                    '/nested/group/a/' => array(array('_route' => 'nested_a'), null, null, null),
+                    '/nested/group/b/' => array(array('_route' => 'nested_b'), null, null, null),
+                    '/nested/group/c/' => array(array('_route' => 'nested_c'), null, null, null),
+                    '/slashed/group/' => array(array('_route' => 'slashed_a'), null, null, null),
+                    '/slashed/group/b/' => array(array('_route' => 'slashed_b'), null, null, null),
+                    '/slashed/group/c/' => array(array('_route' => 'slashed_c'), null, null, null),
+                );
+
+                if (!isset($routes[$pathinfo])) {
+                    break;
                 }
-
-                return $ret;
-            }
-            not_nested_a:
-
-            // nested_b
-            if ('/nested/group/b' === $trimmedPathinfo) {
-                $ret = array('_route' => 'nested_b');
-                if ('/' === substr($pathinfo, -1)) {
-                    // no-op
-                } elseif ('GET' !== $canonicalMethod) {
-                    goto not_nested_b;
-                } else {
-                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'nested_b'));
+                list($ret, $requiredHost, $requiredMethods, $requiredSchemes) = $routes[$pathinfo];
+
+                $hasRequiredScheme = !$requiredSchemes || isset($requiredSchemes[$context->getScheme()]);
+                if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {
+                    if ($hasRequiredScheme) {
+                        $allow += $requiredMethods;
+                    }
+                    break;
                 }
-
-                return $ret;
-            }
-            not_nested_b:
-
-            // nested_c
-            if ('/nested/group/c' === $trimmedPathinfo) {
-                $ret = array('_route' => 'nested_c');
-                if ('/' === substr($pathinfo, -1)) {
-                    // no-op
-                } elseif ('GET' !== $canonicalMethod) {
-                    goto not_nested_c;
-                } else {
-                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'nested_c'));
+                if (!$hasRequiredScheme) {
+                    $allowSchemes += $requiredSchemes;
+                    break;
                 }
 
                 return $ret;
-            }
-            not_nested_c:
-
         }
 
-        elseif (0 === strpos($pathinfo, '/slashed/group')) {
-            // slashed_a
-            if ('/slashed/group' === $trimmedPathinfo) {
-                $ret = array('_route' => 'slashed_a');
-                if ('/' === substr($pathinfo, -1)) {
-                    // no-op
-                } elseif ('GET' !== $canonicalMethod) {
-                    goto not_slashed_a;
-                } else {
-                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'slashed_a'));
+        $matchedPathinfo = $pathinfo;
+        $regexList = array(
+            0 => '{^(?'
+                    .'|/([^/]++)(*:16)'
+                    .'|/nested/([^/]++)(*:39)'
+                .')$}sD',
+        );
+
+        foreach ($regexList as $offset => $regex) {
+            while (preg_match($regex, $matchedPathinfo, $matches)) {
+                switch ($m = (int) $matches['MARK']) {
+                    default:
+                        $routes = array(
+                            16 => array(array('_route' => 'a_wildcard'), array('param'), null, null),
+                            39 => array(array('_route' => 'nested_wildcard'), array('param'), null, null),
+                        );
+
+                        list($ret, $vars, $requiredMethods, $requiredSchemes) = $routes[$m];
+
+                        foreach ($vars as $i => $v) {
+                            if (isset($matches[1 + $i])) {
+                                $ret[$v] = $matches[1 + $i];
+                            }
+                        }
+
+                        $hasRequiredScheme = !$requiredSchemes || isset($requiredSchemes[$context->getScheme()]);
+                        if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {
+                            if ($hasRequiredScheme) {
+                                $allow += $requiredMethods;
+                            }
+                            break;
+                        }
+                        if (!$hasRequiredScheme) {
+                            $allowSchemes += $requiredSchemes;
+                            break;
+                        }
+
+                        return $ret;
                 }
 
-                return $ret;
-            }
-            not_slashed_a:
-
-            // slashed_b
-            if ('/slashed/group/b' === $trimmedPathinfo) {
-                $ret = array('_route' => 'slashed_b');
-                if ('/' === substr($pathinfo, -1)) {
-                    // no-op
-                } elseif ('GET' !== $canonicalMethod) {
-                    goto not_slashed_b;
-                } else {
-                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'slashed_b'));
+                if (39 === $m) {
+                    break;
                 }
-
-                return $ret;
+                $regex = substr_replace($regex, 'F', $m - $offset, 1 + strlen($m));
+                $offset += strlen($m);
             }
-            not_slashed_b:
-
-            // slashed_c
-            if ('/slashed/group/c' === $trimmedPathinfo) {
-                $ret = array('_route' => 'slashed_c');
-                if ('/' === substr($pathinfo, -1)) {
-                    // no-op
-                } elseif ('GET' !== $canonicalMethod) {
-                    goto not_slashed_c;
-                } else {
-                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'slashed_c'));
-                }
-
-                return $ret;
-            }
-            not_slashed_c:
-
         }
-
-        if ('/' === $pathinfo && !$allow) {
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
-        throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();
+        return null;
     }
 }
diff --git a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher6.php b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher6.php
index 48ecdf81..9cebf2d9 100644
--- a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher6.php
+++ b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher6.php
@@ -17,197 +17,115 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
 
     public function match($rawPathinfo)
     {
-        $allow = array();
+        $allow = $allowSchemes = array();
         $pathinfo = rawurldecode($rawPathinfo);
-        $trimmedPathinfo = rtrim($pathinfo, '/');
         $context = $this->context;
-        $request = $this->request ?: $this->createRequest($pathinfo);
         $requestMethod = $canonicalMethod = $context->getMethod();
 
         if ('HEAD' === $requestMethod) {
             $canonicalMethod = 'GET';
         }
 
-        if (0 === strpos($pathinfo, '/trailing/simple')) {
-            // simple_trailing_slash_no_methods
-            if ('/trailing/simple/no-methods/' === $pathinfo) {
-                return array('_route' => 'simple_trailing_slash_no_methods');
-            }
-
-            // simple_trailing_slash_GET_method
-            if ('/trailing/simple/get-method/' === $pathinfo) {
-                $ret = array('_route' => 'simple_trailing_slash_GET_method');
-                if (!in_array($canonicalMethod, array('GET'))) {
-                    $allow = array_merge($allow, array('GET'));
-                    goto not_simple_trailing_slash_GET_method;
-                }
-
-                return $ret;
-            }
-            not_simple_trailing_slash_GET_method:
-
-            // simple_trailing_slash_HEAD_method
-            if ('/trailing/simple/head-method/' === $pathinfo) {
-                $ret = array('_route' => 'simple_trailing_slash_HEAD_method');
-                if (!in_array($requestMethod, array('HEAD'))) {
-                    $allow = array_merge($allow, array('HEAD'));
-                    goto not_simple_trailing_slash_HEAD_method;
-                }
-
-                return $ret;
-            }
-            not_simple_trailing_slash_HEAD_method:
-
-            // simple_trailing_slash_POST_method
-            if ('/trailing/simple/post-method/' === $pathinfo) {
-                $ret = array('_route' => 'simple_trailing_slash_POST_method');
-                if (!in_array($requestMethod, array('POST'))) {
-                    $allow = array_merge($allow, array('POST'));
-                    goto not_simple_trailing_slash_POST_method;
-                }
-
-                return $ret;
-            }
-            not_simple_trailing_slash_POST_method:
-
-        }
-
-        elseif (0 === strpos($pathinfo, '/trailing/regex')) {
-            // regex_trailing_slash_no_methods
-            if (0 === strpos($pathinfo, '/trailing/regex/no-methods') && preg_match('#^/trailing/regex/no\\-methods/(?P<param>[^/]++)/$#sD', $pathinfo, $matches)) {
-                return $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_no_methods')), array ());
-            }
-
-            // regex_trailing_slash_GET_method
-            if (0 === strpos($pathinfo, '/trailing/regex/get-method') && preg_match('#^/trailing/regex/get\\-method/(?P<param>[^/]++)/$#sD', $pathinfo, $matches)) {
-                $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_GET_method')), array ());
-                if (!in_array($canonicalMethod, array('GET'))) {
-                    $allow = array_merge($allow, array('GET'));
-                    goto not_regex_trailing_slash_GET_method;
-                }
-
-                return $ret;
-            }
-            not_regex_trailing_slash_GET_method:
-
-            // regex_trailing_slash_HEAD_method
-            if (0 === strpos($pathinfo, '/trailing/regex/head-method') && preg_match('#^/trailing/regex/head\\-method/(?P<param>[^/]++)/$#sD', $pathinfo, $matches)) {
-                $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_HEAD_method')), array ());
-                if (!in_array($requestMethod, array('HEAD'))) {
-                    $allow = array_merge($allow, array('HEAD'));
-                    goto not_regex_trailing_slash_HEAD_method;
-                }
-
-                return $ret;
-            }
-            not_regex_trailing_slash_HEAD_method:
-
-            // regex_trailing_slash_POST_method
-            if (0 === strpos($pathinfo, '/trailing/regex/post-method') && preg_match('#^/trailing/regex/post\\-method/(?P<param>[^/]++)/$#sD', $pathinfo, $matches)) {
-                $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_POST_method')), array ());
-                if (!in_array($requestMethod, array('POST'))) {
-                    $allow = array_merge($allow, array('POST'));
-                    goto not_regex_trailing_slash_POST_method;
-                }
-
-                return $ret;
-            }
-            not_regex_trailing_slash_POST_method:
-
-        }
-
-        elseif (0 === strpos($pathinfo, '/not-trailing/simple')) {
-            // simple_not_trailing_slash_no_methods
-            if ('/not-trailing/simple/no-methods' === $pathinfo) {
-                return array('_route' => 'simple_not_trailing_slash_no_methods');
-            }
-
-            // simple_not_trailing_slash_GET_method
-            if ('/not-trailing/simple/get-method' === $pathinfo) {
-                $ret = array('_route' => 'simple_not_trailing_slash_GET_method');
-                if (!in_array($canonicalMethod, array('GET'))) {
-                    $allow = array_merge($allow, array('GET'));
-                    goto not_simple_not_trailing_slash_GET_method;
+        switch ($pathinfo) {
+            default:
+                $routes = array(
+                    '/trailing/simple/no-methods/' => array(array('_route' => 'simple_trailing_slash_no_methods'), null, null, null),
+                    '/trailing/simple/get-method/' => array(array('_route' => 'simple_trailing_slash_GET_method'), null, array('GET' => 0), null),
+                    '/trailing/simple/head-method/' => array(array('_route' => 'simple_trailing_slash_HEAD_method'), null, array('HEAD' => 0), null),
+                    '/trailing/simple/post-method/' => array(array('_route' => 'simple_trailing_slash_POST_method'), null, array('POST' => 0), null),
+                    '/not-trailing/simple/no-methods' => array(array('_route' => 'simple_not_trailing_slash_no_methods'), null, null, null),
+                    '/not-trailing/simple/get-method' => array(array('_route' => 'simple_not_trailing_slash_GET_method'), null, array('GET' => 0), null),
+                    '/not-trailing/simple/head-method' => array(array('_route' => 'simple_not_trailing_slash_HEAD_method'), null, array('HEAD' => 0), null),
+                    '/not-trailing/simple/post-method' => array(array('_route' => 'simple_not_trailing_slash_POST_method'), null, array('POST' => 0), null),
+                );
+
+                if (!isset($routes[$pathinfo])) {
+                    break;
                 }
-
-                return $ret;
-            }
-            not_simple_not_trailing_slash_GET_method:
-
-            // simple_not_trailing_slash_HEAD_method
-            if ('/not-trailing/simple/head-method' === $pathinfo) {
-                $ret = array('_route' => 'simple_not_trailing_slash_HEAD_method');
-                if (!in_array($requestMethod, array('HEAD'))) {
-                    $allow = array_merge($allow, array('HEAD'));
-                    goto not_simple_not_trailing_slash_HEAD_method;
+                list($ret, $requiredHost, $requiredMethods, $requiredSchemes) = $routes[$pathinfo];
+
+                $hasRequiredScheme = !$requiredSchemes || isset($requiredSchemes[$context->getScheme()]);
+                if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {
+                    if ($hasRequiredScheme) {
+                        $allow += $requiredMethods;
+                    }
+                    break;
                 }
-
-                return $ret;
-            }
-            not_simple_not_trailing_slash_HEAD_method:
-
-            // simple_not_trailing_slash_POST_method
-            if ('/not-trailing/simple/post-method' === $pathinfo) {
-                $ret = array('_route' => 'simple_not_trailing_slash_POST_method');
-                if (!in_array($requestMethod, array('POST'))) {
-                    $allow = array_merge($allow, array('POST'));
-                    goto not_simple_not_trailing_slash_POST_method;
+                if (!$hasRequiredScheme) {
+                    $allowSchemes += $requiredSchemes;
+                    break;
                 }
 
                 return $ret;
-            }
-            not_simple_not_trailing_slash_POST_method:
-
         }
 
-        elseif (0 === strpos($pathinfo, '/not-trailing/regex')) {
-            // regex_not_trailing_slash_no_methods
-            if (0 === strpos($pathinfo, '/not-trailing/regex/no-methods') && preg_match('#^/not\\-trailing/regex/no\\-methods/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
-                return $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_not_trailing_slash_no_methods')), array ());
-            }
-
-            // regex_not_trailing_slash_GET_method
-            if (0 === strpos($pathinfo, '/not-trailing/regex/get-method') && preg_match('#^/not\\-trailing/regex/get\\-method/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
-                $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_not_trailing_slash_GET_method')), array ());
-                if (!in_array($canonicalMethod, array('GET'))) {
-                    $allow = array_merge($allow, array('GET'));
-                    goto not_regex_not_trailing_slash_GET_method;
-                }
-
-                return $ret;
-            }
-            not_regex_not_trailing_slash_GET_method:
-
-            // regex_not_trailing_slash_HEAD_method
-            if (0 === strpos($pathinfo, '/not-trailing/regex/head-method') && preg_match('#^/not\\-trailing/regex/head\\-method/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
-                $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_not_trailing_slash_HEAD_method')), array ());
-                if (!in_array($requestMethod, array('HEAD'))) {
-                    $allow = array_merge($allow, array('HEAD'));
-                    goto not_regex_not_trailing_slash_HEAD_method;
+        $matchedPathinfo = $pathinfo;
+        $regexList = array(
+            0 => '{^(?'
+                    .'|/trailing/regex/(?'
+                        .'|no\\-methods/([^/]++)/(*:47)'
+                        .'|get\\-method/([^/]++)/(*:75)'
+                        .'|head\\-method/([^/]++)/(*:104)'
+                        .'|post\\-method/([^/]++)/(*:134)'
+                    .')'
+                    .'|/not\\-trailing/regex/(?'
+                        .'|no\\-methods/([^/]++)(*:187)'
+                        .'|get\\-method/([^/]++)(*:215)'
+                        .'|head\\-method/([^/]++)(*:244)'
+                        .'|post\\-method/([^/]++)(*:273)'
+                    .')'
+                .')$}sD',
+        );
+
+        foreach ($regexList as $offset => $regex) {
+            while (preg_match($regex, $matchedPathinfo, $matches)) {
+                switch ($m = (int) $matches['MARK']) {
+                    default:
+                        $routes = array(
+                            47 => array(array('_route' => 'regex_trailing_slash_no_methods'), array('param'), null, null),
+                            75 => array(array('_route' => 'regex_trailing_slash_GET_method'), array('param'), array('GET' => 0), null),
+                            104 => array(array('_route' => 'regex_trailing_slash_HEAD_method'), array('param'), array('HEAD' => 0), null),
+                            134 => array(array('_route' => 'regex_trailing_slash_POST_method'), array('param'), array('POST' => 0), null),
+                            187 => array(array('_route' => 'regex_not_trailing_slash_no_methods'), array('param'), null, null),
+                            215 => array(array('_route' => 'regex_not_trailing_slash_GET_method'), array('param'), array('GET' => 0), null),
+                            244 => array(array('_route' => 'regex_not_trailing_slash_HEAD_method'), array('param'), array('HEAD' => 0), null),
+                            273 => array(array('_route' => 'regex_not_trailing_slash_POST_method'), array('param'), array('POST' => 0), null),
+                        );
+
+                        list($ret, $vars, $requiredMethods, $requiredSchemes) = $routes[$m];
+
+                        foreach ($vars as $i => $v) {
+                            if (isset($matches[1 + $i])) {
+                                $ret[$v] = $matches[1 + $i];
+                            }
+                        }
+
+                        $hasRequiredScheme = !$requiredSchemes || isset($requiredSchemes[$context->getScheme()]);
+                        if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {
+                            if ($hasRequiredScheme) {
+                                $allow += $requiredMethods;
+                            }
+                            break;
+                        }
+                        if (!$hasRequiredScheme) {
+                            $allowSchemes += $requiredSchemes;
+                            break;
+                        }
+
+                        return $ret;
                 }
 
-                return $ret;
-            }
-            not_regex_not_trailing_slash_HEAD_method:
-
-            // regex_not_trailing_slash_POST_method
-            if (0 === strpos($pathinfo, '/not-trailing/regex/post-method') && preg_match('#^/not\\-trailing/regex/post\\-method/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
-                $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_not_trailing_slash_POST_method')), array ());
-                if (!in_array($requestMethod, array('POST'))) {
-                    $allow = array_merge($allow, array('POST'));
-                    goto not_regex_not_trailing_slash_POST_method;
+                if (273 === $m) {
+                    break;
                 }
-
-                return $ret;
+                $regex = substr_replace($regex, 'F', $m - $offset, 1 + strlen($m));
+                $offset += strlen($m);
             }
-            not_regex_not_trailing_slash_POST_method:
-
         }
-
-        if ('/' === $pathinfo && !$allow) {
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
-        throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();
+        throw $allow ? new MethodNotAllowedException(array_keys($allow)) : new ResourceNotFoundException();
     }
 }
diff --git a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher7.php b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher7.php
index 81d76ea4..b2b70721 100644
--- a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher7.php
+++ b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher7.php
@@ -15,235 +15,152 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
         $this->context = $context;
     }
 
-    public function match($rawPathinfo)
+    public function match($pathinfo)
     {
-        $allow = array();
-        $pathinfo = rawurldecode($rawPathinfo);
-        $trimmedPathinfo = rtrim($pathinfo, '/');
-        $context = $this->context;
-        $request = $this->request ?: $this->createRequest($pathinfo);
-        $requestMethod = $canonicalMethod = $context->getMethod();
-
-        if ('HEAD' === $requestMethod) {
-            $canonicalMethod = 'GET';
+        $allow = $allowSchemes = array();
+        if ($ret = $this->doMatch($pathinfo, $allow, $allowSchemes)) {
+            return $ret;
         }
-
-        if (0 === strpos($pathinfo, '/trailing/simple')) {
-            // simple_trailing_slash_no_methods
-            if ('/trailing/simple/no-methods' === $trimmedPathinfo) {
-                $ret = array('_route' => 'simple_trailing_slash_no_methods');
-                if ('/' === substr($pathinfo, -1)) {
-                    // no-op
-                } elseif ('GET' !== $canonicalMethod) {
-                    goto not_simple_trailing_slash_no_methods;
-                } else {
-                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'simple_trailing_slash_no_methods'));
-                }
-
-                return $ret;
-            }
-            not_simple_trailing_slash_no_methods:
-
-            // simple_trailing_slash_GET_method
-            if ('/trailing/simple/get-method' === $trimmedPathinfo) {
-                $ret = array('_route' => 'simple_trailing_slash_GET_method');
-                if ('/' === substr($pathinfo, -1)) {
-                    // no-op
-                } elseif ('GET' !== $canonicalMethod) {
-                    goto not_simple_trailing_slash_GET_method;
-                } else {
-                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'simple_trailing_slash_GET_method'));
-                }
-
-                if (!in_array($canonicalMethod, array('GET'))) {
-                    $allow = array_merge($allow, array('GET'));
-                    goto not_simple_trailing_slash_GET_method;
-                }
-
-                return $ret;
-            }
-            not_simple_trailing_slash_GET_method:
-
-            // simple_trailing_slash_HEAD_method
-            if ('/trailing/simple/head-method/' === $pathinfo) {
-                $ret = array('_route' => 'simple_trailing_slash_HEAD_method');
-                if (!in_array($requestMethod, array('HEAD'))) {
-                    $allow = array_merge($allow, array('HEAD'));
-                    goto not_simple_trailing_slash_HEAD_method;
-                }
-
-                return $ret;
-            }
-            not_simple_trailing_slash_HEAD_method:
-
-            // simple_trailing_slash_POST_method
-            if ('/trailing/simple/post-method/' === $pathinfo) {
-                $ret = array('_route' => 'simple_trailing_slash_POST_method');
-                if (!in_array($requestMethod, array('POST'))) {
-                    $allow = array_merge($allow, array('POST'));
-                    goto not_simple_trailing_slash_POST_method;
-                }
-
-                return $ret;
-            }
-            not_simple_trailing_slash_POST_method:
-
+        if ($allow) {
+            throw new MethodNotAllowedException(array_keys($allow));
         }
-
-        elseif (0 === strpos($pathinfo, '/trailing/regex')) {
-            // regex_trailing_slash_no_methods
-            if (0 === strpos($pathinfo, '/trailing/regex/no-methods') && preg_match('#^/trailing/regex/no\\-methods/(?P<param>[^/]++)/?$#sD', $pathinfo, $matches)) {
-                $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_no_methods')), array ());
-                if ('/' === substr($pathinfo, -1)) {
-                    // no-op
-                } elseif ('GET' !== $canonicalMethod) {
-                    goto not_regex_trailing_slash_no_methods;
-                } else {
-                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'regex_trailing_slash_no_methods'));
-                }
-
-                return $ret;
+        if (!in_array($this->context->getMethod(), array('HEAD', 'GET'), true)) {
+            // no-op
+        } elseif ($allowSchemes) {
+            redirect_scheme:
+            $scheme = $this->context->getScheme();
+            $this->context->setScheme(key($allowSchemes));
+            try {
+                if ($ret = $this->doMatch($pathinfo)) {
+                    return $this->redirect($pathinfo, $ret['_route'], $this->context->getScheme()) + $ret;
+                }
+            } finally {
+                $this->context->setScheme($scheme);
+            }
+        } elseif ('/' !== $pathinfo) {
+            $pathinfo = '/' !== $pathinfo[-1] ? $pathinfo.'/' : substr($pathinfo, 0, -1);
+            if ($ret = $this->doMatch($pathinfo, $allow, $allowSchemes)) {
+                return $this->redirect($pathinfo, $ret['_route']) + $ret;
+            }
+            if ($allowSchemes) {
+                goto redirect_scheme;
             }
-            not_regex_trailing_slash_no_methods:
-
-            // regex_trailing_slash_GET_method
-            if (0 === strpos($pathinfo, '/trailing/regex/get-method') && preg_match('#^/trailing/regex/get\\-method/(?P<param>[^/]++)/?$#sD', $pathinfo, $matches)) {
-                $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_GET_method')), array ());
-                if ('/' === substr($pathinfo, -1)) {
-                    // no-op
-                } elseif ('GET' !== $canonicalMethod) {
-                    goto not_regex_trailing_slash_GET_method;
-                } else {
-                    return array_replace($ret, $this->redirect($rawPathinfo.'/', 'regex_trailing_slash_GET_method'));
-                }
-
-                if (!in_array($canonicalMethod, array('GET'))) {
-                    $allow = array_merge($allow, array('GET'));
-                    goto not_regex_trailing_slash_GET_method;
-                }
-
-                return $ret;
-            }
-            not_regex_trailing_slash_GET_method:
-
-            // regex_trailing_slash_HEAD_method
-            if (0 === strpos($pathinfo, '/trailing/regex/head-method') && preg_match('#^/trailing/regex/head\\-method/(?P<param>[^/]++)/$#sD', $pathinfo, $matches)) {
-                $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_HEAD_method')), array ());
-                if (!in_array($requestMethod, array('HEAD'))) {
-                    $allow = array_merge($allow, array('HEAD'));
-                    goto not_regex_trailing_slash_HEAD_method;
-                }
+        }
 
-                return $ret;
-            }
-            not_regex_trailing_slash_HEAD_method:
-
-            // regex_trailing_slash_POST_method
-            if (0 === strpos($pathinfo, '/trailing/regex/post-method') && preg_match('#^/trailing/regex/post\\-method/(?P<param>[^/]++)/$#sD', $pathinfo, $matches)) {
-                $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_POST_method')), array ());
-                if (!in_array($requestMethod, array('POST'))) {
-                    $allow = array_merge($allow, array('POST'));
-                    goto not_regex_trailing_slash_POST_method;
-                }
+        throw new ResourceNotFoundException();
+    }
 
-                return $ret;
-            }
-            not_regex_trailing_slash_POST_method:
+    private function doMatch(string $rawPathinfo, array &$allow = array(), array &$allowSchemes = array()): ?array
+    {
+        $allow = $allowSchemes = array();
+        $pathinfo = rawurldecode($rawPathinfo);
+        $context = $this->context;
+        $requestMethod = $canonicalMethod = $context->getMethod();
 
+        if ('HEAD' === $requestMethod) {
+            $canonicalMethod = 'GET';
         }
 
-        elseif (0 === strpos($pathinfo, '/not-trailing/simple')) {
-            // simple_not_trailing_slash_no_methods
-            if ('/not-trailing/simple/no-methods' === $pathinfo) {
-                return array('_route' => 'simple_not_trailing_slash_no_methods');
-            }
+        switch ($pathinfo) {
+            default:
+                $routes = array(
+                    '/trailing/simple/no-methods/' => array(array('_route' => 'simple_trailing_slash_no_methods'), null, null, null),
+                    '/trailing/simple/get-method/' => array(array('_route' => 'simple_trailing_slash_GET_method'), null, array('GET' => 0), null),
+                    '/trailing/simple/head-method/' => array(array('_route' => 'simple_trailing_slash_HEAD_method'), null, array('HEAD' => 0), null),
+                    '/trailing/simple/post-method/' => array(array('_route' => 'simple_trailing_slash_POST_method'), null, array('POST' => 0), null),
+                    '/not-trailing/simple/no-methods' => array(array('_route' => 'simple_not_trailing_slash_no_methods'), null, null, null),
+                    '/not-trailing/simple/get-method' => array(array('_route' => 'simple_not_trailing_slash_GET_method'), null, array('GET' => 0), null),
+                    '/not-trailing/simple/head-method' => array(array('_route' => 'simple_not_trailing_slash_HEAD_method'), null, array('HEAD' => 0), null),
+                    '/not-trailing/simple/post-method' => array(array('_route' => 'simple_not_trailing_slash_POST_method'), null, array('POST' => 0), null),
+                );
 
-            // simple_not_trailing_slash_GET_method
-            if ('/not-trailing/simple/get-method' === $pathinfo) {
-                $ret = array('_route' => 'simple_not_trailing_slash_GET_method');
-                if (!in_array($canonicalMethod, array('GET'))) {
-                    $allow = array_merge($allow, array('GET'));
-                    goto not_simple_not_trailing_slash_GET_method;
+                if (!isset($routes[$pathinfo])) {
+                    break;
                 }
+                list($ret, $requiredHost, $requiredMethods, $requiredSchemes) = $routes[$pathinfo];
 
-                return $ret;
-            }
-            not_simple_not_trailing_slash_GET_method:
-
-            // simple_not_trailing_slash_HEAD_method
-            if ('/not-trailing/simple/head-method' === $pathinfo) {
-                $ret = array('_route' => 'simple_not_trailing_slash_HEAD_method');
-                if (!in_array($requestMethod, array('HEAD'))) {
-                    $allow = array_merge($allow, array('HEAD'));
-                    goto not_simple_not_trailing_slash_HEAD_method;
+                $hasRequiredScheme = !$requiredSchemes || isset($requiredSchemes[$context->getScheme()]);
+                if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {
+                    if ($hasRequiredScheme) {
+                        $allow += $requiredMethods;
+                    }
+                    break;
                 }
-
-                return $ret;
-            }
-            not_simple_not_trailing_slash_HEAD_method:
-
-            // simple_not_trailing_slash_POST_method
-            if ('/not-trailing/simple/post-method' === $pathinfo) {
-                $ret = array('_route' => 'simple_not_trailing_slash_POST_method');
-                if (!in_array($requestMethod, array('POST'))) {
-                    $allow = array_merge($allow, array('POST'));
-                    goto not_simple_not_trailing_slash_POST_method;
+                if (!$hasRequiredScheme) {
+                    $allowSchemes += $requiredSchemes;
+                    break;
                 }
 
                 return $ret;
-            }
-            not_simple_not_trailing_slash_POST_method:
-
         }
 
-        elseif (0 === strpos($pathinfo, '/not-trailing/regex')) {
-            // regex_not_trailing_slash_no_methods
-            if (0 === strpos($pathinfo, '/not-trailing/regex/no-methods') && preg_match('#^/not\\-trailing/regex/no\\-methods/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
-                return $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_not_trailing_slash_no_methods')), array ());
-            }
-
-            // regex_not_trailing_slash_GET_method
-            if (0 === strpos($pathinfo, '/not-trailing/regex/get-method') && preg_match('#^/not\\-trailing/regex/get\\-method/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
-                $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_not_trailing_slash_GET_method')), array ());
-                if (!in_array($canonicalMethod, array('GET'))) {
-                    $allow = array_merge($allow, array('GET'));
-                    goto not_regex_not_trailing_slash_GET_method;
-                }
-
-                return $ret;
-            }
-            not_regex_not_trailing_slash_GET_method:
-
-            // regex_not_trailing_slash_HEAD_method
-            if (0 === strpos($pathinfo, '/not-trailing/regex/head-method') && preg_match('#^/not\\-trailing/regex/head\\-method/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
-                $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_not_trailing_slash_HEAD_method')), array ());
-                if (!in_array($requestMethod, array('HEAD'))) {
-                    $allow = array_merge($allow, array('HEAD'));
-                    goto not_regex_not_trailing_slash_HEAD_method;
-                }
-
-                return $ret;
+        $matchedPathinfo = $pathinfo;
+        $regexList = array(
+            0 => '{^(?'
+                    .'|/trailing/regex/(?'
+                        .'|no\\-methods/([^/]++)/(*:47)'
+                        .'|get\\-method/([^/]++)/(*:75)'
+                        .'|head\\-method/([^/]++)/(*:104)'
+                        .'|post\\-method/([^/]++)/(*:134)'
+                    .')'
+                    .'|/not\\-trailing/regex/(?'
+                        .'|no\\-methods/([^/]++)(*:187)'
+                        .'|get\\-method/([^/]++)(*:215)'
+                        .'|head\\-method/([^/]++)(*:244)'
+                        .'|post\\-method/([^/]++)(*:273)'
+                    .')'
+                .')$}sD',
+        );
+
+        foreach ($regexList as $offset => $regex) {
+            while (preg_match($regex, $matchedPathinfo, $matches)) {
+                switch ($m = (int) $matches['MARK']) {
+                    default:
+                        $routes = array(
+                            47 => array(array('_route' => 'regex_trailing_slash_no_methods'), array('param'), null, null),
+                            75 => array(array('_route' => 'regex_trailing_slash_GET_method'), array('param'), array('GET' => 0), null),
+                            104 => array(array('_route' => 'regex_trailing_slash_HEAD_method'), array('param'), array('HEAD' => 0), null),
+                            134 => array(array('_route' => 'regex_trailing_slash_POST_method'), array('param'), array('POST' => 0), null),
+                            187 => array(array('_route' => 'regex_not_trailing_slash_no_methods'), array('param'), null, null),
+                            215 => array(array('_route' => 'regex_not_trailing_slash_GET_method'), array('param'), array('GET' => 0), null),
+                            244 => array(array('_route' => 'regex_not_trailing_slash_HEAD_method'), array('param'), array('HEAD' => 0), null),
+                            273 => array(array('_route' => 'regex_not_trailing_slash_POST_method'), array('param'), array('POST' => 0), null),
+                        );
+
+                        list($ret, $vars, $requiredMethods, $requiredSchemes) = $routes[$m];
+
+                        foreach ($vars as $i => $v) {
+                            if (isset($matches[1 + $i])) {
+                                $ret[$v] = $matches[1 + $i];
+                            }
+                        }
+
+                        $hasRequiredScheme = !$requiredSchemes || isset($requiredSchemes[$context->getScheme()]);
+                        if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {
+                            if ($hasRequiredScheme) {
+                                $allow += $requiredMethods;
+                            }
+                            break;
+                        }
+                        if (!$hasRequiredScheme) {
+                            $allowSchemes += $requiredSchemes;
+                            break;
+                        }
+
+                        return $ret;
+                }
+
+                if (273 === $m) {
+                    break;
+                }
+                $regex = substr_replace($regex, 'F', $m - $offset, 1 + strlen($m));
+                $offset += strlen($m);
             }
-            not_regex_not_trailing_slash_HEAD_method:
-
-            // regex_not_trailing_slash_POST_method
-            if (0 === strpos($pathinfo, '/not-trailing/regex/post-method') && preg_match('#^/not\\-trailing/regex/post\\-method/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
-                $ret = $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_not_trailing_slash_POST_method')), array ());
-                if (!in_array($requestMethod, array('POST'))) {
-                    $allow = array_merge($allow, array('POST'));
-                    goto not_regex_not_trailing_slash_POST_method;
-                }
-
-                return $ret;
-            }
-            not_regex_not_trailing_slash_POST_method:
-
         }
-
-        if ('/' === $pathinfo && !$allow) {
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
-        throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();
+        return null;
     }
 }
diff --git a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher8.php b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher8.php
new file mode 100644
index 00000000..38bbfa22
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher8.php
@@ -0,0 +1,88 @@
+<?php
+
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Symfony\Component\Routing\RequestContext;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Routing Component.
+ */
+class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
+{
+    public function __construct(RequestContext $context)
+    {
+        $this->context = $context;
+    }
+
+    public function match($rawPathinfo)
+    {
+        $allow = $allowSchemes = array();
+        $pathinfo = rawurldecode($rawPathinfo);
+        $context = $this->context;
+        $requestMethod = $canonicalMethod = $context->getMethod();
+
+        if ('HEAD' === $requestMethod) {
+            $canonicalMethod = 'GET';
+        }
+
+        $matchedPathinfo = $pathinfo;
+        $regexList = array(
+            0 => '{^(?'
+                    .'|/(a)(*:11)'
+                .')$}sD',
+            11 => '{^(?'
+                    .'|/(.)(*:22)'
+                .')$}sDu',
+            22 => '{^(?'
+                    .'|/(.)(*:33)'
+                .')$}sD',
+        );
+
+        foreach ($regexList as $offset => $regex) {
+            while (preg_match($regex, $matchedPathinfo, $matches)) {
+                switch ($m = (int) $matches['MARK']) {
+                    default:
+                        $routes = array(
+                            11 => array(array('_route' => 'a'), array('a'), null, null),
+                            22 => array(array('_route' => 'b'), array('a'), null, null),
+                            33 => array(array('_route' => 'c'), array('a'), null, null),
+                        );
+
+                        list($ret, $vars, $requiredMethods, $requiredSchemes) = $routes[$m];
+
+                        foreach ($vars as $i => $v) {
+                            if (isset($matches[1 + $i])) {
+                                $ret[$v] = $matches[1 + $i];
+                            }
+                        }
+
+                        $hasRequiredScheme = !$requiredSchemes || isset($requiredSchemes[$context->getScheme()]);
+                        if ($requiredMethods && !isset($requiredMethods[$canonicalMethod]) && !isset($requiredMethods[$requestMethod])) {
+                            if ($hasRequiredScheme) {
+                                $allow += $requiredMethods;
+                            }
+                            break;
+                        }
+                        if (!$hasRequiredScheme) {
+                            $allowSchemes += $requiredSchemes;
+                            break;
+                        }
+
+                        return $ret;
+                }
+
+                if (33 === $m) {
+                    break;
+                }
+                $regex = substr_replace($regex, 'F', $m - $offset, 1 + strlen($m));
+                $offset += strlen($m);
+            }
+        }
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
+            throw new Symfony\Component\Routing\Exception\NoConfigurationException();
+        }
+
+        throw $allow ? new MethodNotAllowedException(array_keys($allow)) : new ResourceNotFoundException();
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher9.php b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher9.php
new file mode 100644
index 00000000..cfcd1d44
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/dumper/url_matcher9.php
@@ -0,0 +1,53 @@
+<?php
+
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Symfony\Component\Routing\RequestContext;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Routing Component.
+ */
+class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
+{
+    public function __construct(RequestContext $context)
+    {
+        $this->context = $context;
+    }
+
+    public function match($rawPathinfo)
+    {
+        $allow = $allowSchemes = array();
+        $pathinfo = rawurldecode($rawPathinfo);
+        $context = $this->context;
+        $requestMethod = $canonicalMethod = $context->getMethod();
+        $host = strtolower($context->getHost());
+
+        if ('HEAD' === $requestMethod) {
+            $canonicalMethod = 'GET';
+        }
+
+        switch ($pathinfo) {
+            case '/':
+                // a
+                if (preg_match('#^(?P<d>[^\\.]++)\\.e\\.c\\.b\\.a$#sDi', $host, $hostMatches)) {
+                    return $this->mergeDefaults(array('_route' => 'a') + $hostMatches, array());
+                }
+                // c
+                if (preg_match('#^(?P<e>[^\\.]++)\\.e\\.c\\.b\\.a$#sDi', $host, $hostMatches)) {
+                    return $this->mergeDefaults(array('_route' => 'c') + $hostMatches, array());
+                }
+                // b
+                if ('d.c.b.a' === $host) {
+                    return array('_route' => 'b');
+                }
+                break;
+        }
+
+        if ('/' === $pathinfo && !$allow && !$allowSchemes) {
+            throw new Symfony\Component\Routing\Exception\NoConfigurationException();
+        }
+
+        throw $allow ? new MethodNotAllowedException(array_keys($allow)) : new ResourceNotFoundException();
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Fixtures/import_with_name_prefix/routing.xml b/vendor/symfony/routing/Tests/Fixtures/import_with_name_prefix/routing.xml
new file mode 100644
index 00000000..b158dadb
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/import_with_name_prefix/routing.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        http://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <import resource="../controller/routing.xml" />
+    <import resource="../controller/routing.xml" prefix="/api" name-prefix="api_" />
+
+</routes>
diff --git a/vendor/symfony/routing/Tests/Fixtures/import_with_name_prefix/routing.yml b/vendor/symfony/routing/Tests/Fixtures/import_with_name_prefix/routing.yml
new file mode 100644
index 00000000..90dce0ea
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/import_with_name_prefix/routing.yml
@@ -0,0 +1,7 @@
+app:
+    resource: ../controller/routing.yml
+
+api:
+    resource: ../controller/routing.yml
+    name_prefix: api_
+    prefix: /api
diff --git a/vendor/symfony/routing/Tests/Fixtures/import_with_no_trailing_slash/routing.xml b/vendor/symfony/routing/Tests/Fixtures/import_with_no_trailing_slash/routing.xml
new file mode 100644
index 00000000..f4b23a23
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/import_with_no_trailing_slash/routing.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        http://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <import resource="../controller/routing.xml" prefix="/slash" name-prefix="a_" />
+    <import resource="../controller/routing.xml" prefix="/no-slash" name-prefix="b_" trailing-slash-on-root="false" />
+
+</routes>
diff --git a/vendor/symfony/routing/Tests/Fixtures/import_with_no_trailing_slash/routing.yml b/vendor/symfony/routing/Tests/Fixtures/import_with_no_trailing_slash/routing.yml
new file mode 100644
index 00000000..f840ecf8
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/import_with_no_trailing_slash/routing.yml
@@ -0,0 +1,10 @@
+app:
+    resource: ../controller/routing.yml
+    name_prefix: a_
+    prefix: /slash
+
+api:
+    resource: ../controller/routing.yml
+    name_prefix: b_
+    prefix: /no-slash
+    trailing_slash_on_root: false
diff --git a/vendor/symfony/routing/Tests/Fixtures/localized.xml b/vendor/symfony/routing/Tests/Fixtures/localized.xml
new file mode 100644
index 00000000..8146f959
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/localized.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="localized">
+        <default key="_controller">MyBundle:Blog:show</default>
+        <path locale="en">/path</path>
+        <path locale="fr">/route</path>
+    </route>
+
+</routes>
diff --git a/vendor/symfony/routing/Tests/Fixtures/localized/imported-with-locale-but-not-localized.xml b/vendor/symfony/routing/Tests/Fixtures/localized/imported-with-locale-but-not-localized.xml
new file mode 100644
index 00000000..aab6a962
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/localized/imported-with-locale-but-not-localized.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        http://symfony.com/schema/routing/routing-1.0.xsd">
+    <route id="imported" path="/suffix">
+        <default key="_controller">MyBundle:Blog:show</default>
+    </route>
+</routes>
diff --git a/vendor/symfony/routing/Tests/Fixtures/localized/imported-with-locale-but-not-localized.yml b/vendor/symfony/routing/Tests/Fixtures/localized/imported-with-locale-but-not-localized.yml
new file mode 100644
index 00000000..b62b5693
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/localized/imported-with-locale-but-not-localized.yml
@@ -0,0 +1,4 @@
+---
+imported:
+    controller: ImportedController::someAction
+    path: /imported
diff --git a/vendor/symfony/routing/Tests/Fixtures/localized/imported-with-locale.xml b/vendor/symfony/routing/Tests/Fixtures/localized/imported-with-locale.xml
new file mode 100644
index 00000000..7661dbb9
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/localized/imported-with-locale.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        http://symfony.com/schema/routing/routing-1.0.xsd">
+    <route id="imported">
+        <default key="_controller">MyBundle:Blog:show</default>
+        <path locale="en">/suffix</path>
+        <path locale="fr">/le-suffix</path>
+    </route>
+</routes>
diff --git a/vendor/symfony/routing/Tests/Fixtures/localized/imported-with-locale.yml b/vendor/symfony/routing/Tests/Fixtures/localized/imported-with-locale.yml
new file mode 100644
index 00000000..65def8a9
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/localized/imported-with-locale.yml
@@ -0,0 +1,6 @@
+---
+imported:
+    controller: ImportedController::someAction
+    path:
+        nl: /voorbeeld
+        en: /example
diff --git a/vendor/symfony/routing/Tests/Fixtures/localized/importer-with-controller-default.yml b/vendor/symfony/routing/Tests/Fixtures/localized/importer-with-controller-default.yml
new file mode 100644
index 00000000..1d13a063
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/localized/importer-with-controller-default.yml
@@ -0,0 +1,5 @@
+---
+i_need:
+    defaults:
+        _controller: DefaultController::defaultAction
+    resource: ./localized-route.yml
diff --git a/vendor/symfony/routing/Tests/Fixtures/localized/importer-with-locale-imports-non-localized-route.xml b/vendor/symfony/routing/Tests/Fixtures/localized/importer-with-locale-imports-non-localized-route.xml
new file mode 100644
index 00000000..dc3ff44d
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/localized/importer-with-locale-imports-non-localized-route.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        http://symfony.com/schema/routing/routing-1.0.xsd">
+    <import resource="./imported-with-locale-but-not-localized.xml">
+        <prefix locale="fr">/le-prefix</prefix>
+        <prefix locale="en">/the-prefix</prefix>
+    </import>
+</routes>
diff --git a/vendor/symfony/routing/Tests/Fixtures/localized/importer-with-locale-imports-non-localized-route.yml b/vendor/symfony/routing/Tests/Fixtures/localized/importer-with-locale-imports-non-localized-route.yml
new file mode 100644
index 00000000..bc33f3f8
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/localized/importer-with-locale-imports-non-localized-route.yml
@@ -0,0 +1,6 @@
+---
+i_need:
+    resource: ./imported-with-locale-but-not-localized.yml
+    prefix:
+        nl: /nl
+        en: /en
diff --git a/vendor/symfony/routing/Tests/Fixtures/localized/importer-with-locale.xml b/vendor/symfony/routing/Tests/Fixtures/localized/importer-with-locale.xml
new file mode 100644
index 00000000..c245f620
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/localized/importer-with-locale.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing
+        http://symfony.com/schema/routing/routing-1.0.xsd">
+    <import resource="./imported-with-locale.xml">
+        <prefix locale="fr">/le-prefix</prefix>
+        <prefix locale="en">/the-prefix</prefix>
+    </import>
+</routes>
diff --git a/vendor/symfony/routing/Tests/Fixtures/localized/importer-with-locale.yml b/vendor/symfony/routing/Tests/Fixtures/localized/importer-with-locale.yml
new file mode 100644
index 00000000..29d3571b
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/localized/importer-with-locale.yml
@@ -0,0 +1,6 @@
+---
+i_need:
+    resource: ./imported-with-locale.yml
+    prefix:
+        nl: /nl
+        en: /en
diff --git a/vendor/symfony/routing/Tests/Fixtures/localized/importing-localized-route.yml b/vendor/symfony/routing/Tests/Fixtures/localized/importing-localized-route.yml
new file mode 100644
index 00000000..ab54ee49
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/localized/importing-localized-route.yml
@@ -0,0 +1,3 @@
+---
+i_need:
+    resource: ./localized-route.yml
diff --git a/vendor/symfony/routing/Tests/Fixtures/localized/localized-route.yml b/vendor/symfony/routing/Tests/Fixtures/localized/localized-route.yml
new file mode 100644
index 00000000..351a4180
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/localized/localized-route.yml
@@ -0,0 +1,9 @@
+---
+home:
+    path:
+        nl: /nl
+        en: /en
+
+not_localized:
+    controller: HomeController::otherAction
+    path: /here
diff --git a/vendor/symfony/routing/Tests/Fixtures/localized/missing-locale-in-importer.yml b/vendor/symfony/routing/Tests/Fixtures/localized/missing-locale-in-importer.yml
new file mode 100644
index 00000000..b6d3f5ec
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/localized/missing-locale-in-importer.yml
@@ -0,0 +1,5 @@
+---
+importing_with_missing_prefix:
+    resource: ./localized-route.yml
+    prefix:
+    nl: /prefix
diff --git a/vendor/symfony/routing/Tests/Fixtures/localized/not-localized.yml b/vendor/symfony/routing/Tests/Fixtures/localized/not-localized.yml
new file mode 100644
index 00000000..4be493da
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/localized/not-localized.yml
@@ -0,0 +1,4 @@
+---
+not_localized:
+    controller: string
+    path: /here
diff --git a/vendor/symfony/routing/Tests/Fixtures/localized/officially_formatted_locales.yml b/vendor/symfony/routing/Tests/Fixtures/localized/officially_formatted_locales.yml
new file mode 100644
index 00000000..a125a4ef
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/localized/officially_formatted_locales.yml
@@ -0,0 +1,7 @@
+---
+official:
+    controller: HomeController::someAction
+    path:
+        fr.UTF-8: /omelette-au-fromage
+        pt-PT: /eu-não-sou-espanhol
+        pt_BR: /churrasco
diff --git a/vendor/symfony/routing/Tests/Fixtures/localized/route-without-path-or-locales.yml b/vendor/symfony/routing/Tests/Fixtures/localized/route-without-path-or-locales.yml
new file mode 100644
index 00000000..4c7c599f
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/localized/route-without-path-or-locales.yml
@@ -0,0 +1,3 @@
+---
+routename:
+    controller: Here::here
diff --git a/vendor/symfony/routing/Tests/Fixtures/nonvalidkeys.yml b/vendor/symfony/routing/Tests/Fixtures/nonvalidkeys.yml
index 015e270f..b01d5027 100644
--- a/vendor/symfony/routing/Tests/Fixtures/nonvalidkeys.yml
+++ b/vendor/symfony/routing/Tests/Fixtures/nonvalidkeys.yml
@@ -1,3 +1,3 @@
 someroute:
   resource: path/to/some.yml
-  name_prefix: test_
+  not_valid_key: test_
diff --git a/vendor/symfony/routing/Tests/Fixtures/php_dsl.php b/vendor/symfony/routing/Tests/Fixtures/php_dsl.php
index 0780c9fa..fbcab15a 100644
--- a/vendor/symfony/routing/Tests/Fixtures/php_dsl.php
+++ b/vendor/symfony/routing/Tests/Fixtures/php_dsl.php
@@ -15,6 +15,13 @@ return function (RoutingConfigurator $routes) {
         ->prefix('/sub')
         ->requirements(array('id' => '\d+'));
 
+    $routes->import('php_dsl_sub.php')
+        ->namePrefix('z_')
+        ->prefix('/zub');
+
+    $routes->import('php_dsl_sub_root.php')
+        ->prefix('/bus', false);
+
     $routes->add('ouf', '/ouf')
         ->schemes(array('https'))
         ->methods(array('GET'))
diff --git a/vendor/symfony/routing/Tests/Fixtures/php_dsl_i18n.php b/vendor/symfony/routing/Tests/Fixtures/php_dsl_i18n.php
new file mode 100644
index 00000000..ed4a0e22
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/php_dsl_i18n.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Symfony\Component\Routing\Loader\Configurator;
+
+return function (RoutingConfigurator $routes) {
+    $routes
+        ->collection()
+        ->prefix(array('en' => '/glish'))
+        ->add('foo', '/foo')
+        ->add('bar', array('en' => '/bar'));
+
+    $routes
+        ->add('baz', array('en' => '/baz'));
+
+    $routes->import('php_dsl_sub_i18n.php')
+        ->prefix(array('fr' => '/ench'));
+};
diff --git a/vendor/symfony/routing/Tests/Fixtures/php_dsl_sub.php b/vendor/symfony/routing/Tests/Fixtures/php_dsl_sub.php
index 9eb444de..08b05633 100644
--- a/vendor/symfony/routing/Tests/Fixtures/php_dsl_sub.php
+++ b/vendor/symfony/routing/Tests/Fixtures/php_dsl_sub.php
@@ -6,6 +6,7 @@ return function (RoutingConfigurator $routes) {
     $add = $routes->collection('c_')
         ->prefix('pub');
 
+    $add('root', '/');
     $add('bar', '/bar');
 
     $add->collection('pub_')
diff --git a/vendor/symfony/routing/Tests/Fixtures/php_dsl_sub_i18n.php b/vendor/symfony/routing/Tests/Fixtures/php_dsl_sub_i18n.php
new file mode 100644
index 00000000..c112e716
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/php_dsl_sub_i18n.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Symfony\Component\Routing\Loader\Configurator;
+
+return function (RoutingConfigurator $routes) {
+    $add = $routes->collection('c_')
+        ->prefix('pub');
+
+    $add('foo', array('fr' => '/foo'));
+    $add('bar', array('fr' => '/bar'));
+};
diff --git a/vendor/symfony/routing/Tests/Fixtures/php_dsl_sub_root.php b/vendor/symfony/routing/Tests/Fixtures/php_dsl_sub_root.php
new file mode 100644
index 00000000..9b309fc1
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/php_dsl_sub_root.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\Routing\Loader\Configurator;
+
+return function (RoutingConfigurator $routes) {
+    $add = $routes->collection('r_');
+
+    $add('root', '/');
+    $add('bar', '/bar/');
+};
diff --git a/vendor/symfony/routing/Tests/Fixtures/php_object_dsl.php b/vendor/symfony/routing/Tests/Fixtures/php_object_dsl.php
new file mode 100644
index 00000000..f21f402e
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Fixtures/php_object_dsl.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Symfony\Component\Routing\Loader\Configurator;
+
+return new class() {
+    public function __invoke(RoutingConfigurator $routes)
+    {
+        $routes
+            ->collection()
+            ->add('foo', '/foo')
+            ->condition('abc')
+            ->options(array('utf8' => true))
+            ->add('buz', 'zub')
+            ->controller('foo:act');
+
+        $routes->import('php_dsl_sub.php')
+            ->prefix('/sub')
+            ->requirements(array('id' => '\d+'));
+
+        $routes->import('php_dsl_sub.php')
+            ->namePrefix('z_')
+            ->prefix('/zub');
+
+        $routes->import('php_dsl_sub_root.php')
+            ->prefix('/bus', false);
+
+        $routes->add('ouf', '/ouf')
+            ->schemes(array('https'))
+            ->methods(array('GET'))
+            ->defaults(array('id' => 0));
+    }
+};
diff --git a/vendor/symfony/routing/Tests/Fixtures/validpattern.php b/vendor/symfony/routing/Tests/Fixtures/validpattern.php
index edc16d8c..52ddfde0 100644
--- a/vendor/symfony/routing/Tests/Fixtures/validpattern.php
+++ b/vendor/symfony/routing/Tests/Fixtures/validpattern.php
@@ -1,7 +1,7 @@
 <?php
 
-use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
 
 $collection = new RouteCollection();
 $collection->add('blog_show', new Route(
diff --git a/vendor/symfony/routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php b/vendor/symfony/routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
index f84802b3..dcfb2304 100644
--- a/vendor/symfony/routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
+++ b/vendor/symfony/routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
@@ -12,11 +12,11 @@
 namespace Symfony\Component\Routing\Tests\Generator\Dumper;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\Generator\Dumper\PhpGeneratorDumper;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
 
 class PhpGeneratorDumperTest extends TestCase
 {
@@ -46,8 +46,8 @@ class PhpGeneratorDumperTest extends TestCase
 
         $this->routeCollection = new RouteCollection();
         $this->generatorDumper = new PhpGeneratorDumper($this->routeCollection);
-        $this->testTmpFilepath = sys_get_temp_dir().DIRECTORY_SEPARATOR.'php_generator.'.$this->getName().'.php';
-        $this->largeTestTmpFilepath = sys_get_temp_dir().DIRECTORY_SEPARATOR.'php_generator.'.$this->getName().'.large.php';
+        $this->testTmpFilepath = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'php_generator.'.$this->getName().'.php';
+        $this->largeTestTmpFilepath = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'php_generator.'.$this->getName().'.large.php';
         @unlink($this->testTmpFilepath);
         @unlink($this->largeTestTmpFilepath);
     }
@@ -84,12 +84,35 @@ class PhpGeneratorDumperTest extends TestCase
         $this->assertEquals('/app.php/testing2', $relativeUrlWithoutParameter);
     }
 
-    public function testDumpWithTooManyRoutes()
+    public function testDumpWithLocalizedRoutes()
     {
-        if (defined('HHVM_VERSION_ID')) {
-            $this->markTestSkipped('HHVM consumes too much memory on this test.');
-        }
+        $this->routeCollection->add('test.en', (new Route('/testing/is/fun'))->setDefault('_locale', 'en')->setDefault('_canonical_route', 'test'));
+        $this->routeCollection->add('test.nl', (new Route('/testen/is/leuk'))->setDefault('_locale', 'nl')->setDefault('_canonical_route', 'test'));
 
+        $code = $this->generatorDumper->dump(array(
+            'class' => 'LocalizedProjectUrlGenerator',
+        ));
+        file_put_contents($this->testTmpFilepath, $code);
+        include $this->testTmpFilepath;
+
+        $context = new RequestContext('/app.php');
+        $projectUrlGenerator = new \LocalizedProjectUrlGenerator($context, null, 'en');
+
+        $urlWithDefaultLocale = $projectUrlGenerator->generate('test');
+        $urlWithSpecifiedLocale = $projectUrlGenerator->generate('test', array('_locale' => 'nl'));
+        $context->setParameter('_locale', 'en');
+        $urlWithEnglishContext = $projectUrlGenerator->generate('test');
+        $context->setParameter('_locale', 'nl');
+        $urlWithDutchContext = $projectUrlGenerator->generate('test');
+
+        $this->assertEquals('/app.php/testing/is/fun', $urlWithDefaultLocale);
+        $this->assertEquals('/app.php/testen/is/leuk', $urlWithSpecifiedLocale);
+        $this->assertEquals('/app.php/testing/is/fun', $urlWithEnglishContext);
+        $this->assertEquals('/app.php/testen/is/leuk', $urlWithDutchContext);
+    }
+
+    public function testDumpWithTooManyRoutes()
+    {
         $this->routeCollection->add('Test', new Route('/testing/{foo}'));
         for ($i = 0; $i < 32769; ++$i) {
             $this->routeCollection->add('route_'.$i, new Route('/route_'.$i));
diff --git a/vendor/symfony/routing/Tests/Generator/UrlGeneratorTest.php b/vendor/symfony/routing/Tests/Generator/UrlGeneratorTest.php
index 68add771..d4bf18cc 100644
--- a/vendor/symfony/routing/Tests/Generator/UrlGeneratorTest.php
+++ b/vendor/symfony/routing/Tests/Generator/UrlGeneratorTest.php
@@ -12,11 +12,11 @@
 namespace Symfony\Component\Routing\Tests\Generator;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\Generator\UrlGenerator;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
 
 class UrlGeneratorTest extends TestCase
 {
diff --git a/vendor/symfony/routing/Tests/Loader/AnnotationClassLoaderTest.php b/vendor/symfony/routing/Tests/Loader/AnnotationClassLoaderTest.php
index 32e40129..dd9af9db 100644
--- a/vendor/symfony/routing/Tests/Loader/AnnotationClassLoaderTest.php
+++ b/vendor/symfony/routing/Tests/Loader/AnnotationClassLoaderTest.php
@@ -11,35 +11,46 @@
 
 namespace Symfony\Component\Routing\Tests\Loader;
 
-use Symfony\Component\Routing\Annotation\Route;
+use Doctrine\Common\Annotations\AnnotationReader;
+use Doctrine\Common\Annotations\AnnotationRegistry;
+use Symfony\Component\Routing\Annotation\Route as RouteAnnotation;
+use Symfony\Component\Routing\Loader\AnnotationClassLoader;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\AbstractClassController;
+use Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\ActionPathController;
+use Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\DefaultValueController;
+use Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\ExplicitLocalizedActionPathController;
+use Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\InvokableController;
+use Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\InvokableLocalizedController;
+use Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\LocalizedActionPathController;
+use Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\LocalizedMethodActionControllers;
+use Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\LocalizedPrefixLocalizedActionController;
+use Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\LocalizedPrefixMissingLocaleActionController;
+use Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\LocalizedPrefixMissingRouteLocaleActionController;
+use Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\LocalizedPrefixWithRouteWithoutLocale;
+use Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\MethodActionControllers;
+use Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\MissingRouteNameController;
+use Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\NothingButNameController;
+use Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\PrefixedActionLocalizedRouteController;
+use Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\PrefixedActionPathController;
+use Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\RouteWithPrefixController;
 
 class AnnotationClassLoaderTest extends AbstractAnnotationLoaderTest
 {
-    protected $loader;
-    private $reader;
-
-    protected function setUp()
-    {
-        parent::setUp();
-
-        $this->reader = $this->getReader();
-        $this->loader = $this->getClassLoader($this->reader);
-    }
-
     /**
-     * @expectedException \InvalidArgumentException
+     * @var AnnotationClassLoader
      */
-    public function testLoadMissingClass()
-    {
-        $this->loader->load('MissingClass');
-    }
+    private $loader;
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testLoadAbstractClass()
+    protected function setUp()
     {
-        $this->loader->load('Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\AbstractClass');
+        $reader = new AnnotationReader();
+        $this->loader = new class($reader) extends AnnotationClassLoader {
+            protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, $annot)
+            {
+            }
+        };
+        AnnotationRegistry::registerLoader('class_exists');
     }
 
     /**
@@ -69,144 +80,92 @@ class AnnotationClassLoaderTest extends AbstractAnnotationLoaderTest
         $this->assertFalse($this->loader->supports('class', 'foo'), '->supports() checks the resource type if specified');
     }
 
-    public function getLoadTests()
+    public function testSimplePathRoute()
     {
-        return array(
-            array(
-                'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BarClass',
-                array('name' => 'route1', 'path' => '/path'),
-                array('arg2' => 'defaultValue2', 'arg3' => 'defaultValue3'),
-            ),
-            array(
-                'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BarClass',
-                array('defaults' => array('arg2' => 'foo'), 'requirements' => array('arg3' => '\w+')),
-                array('arg2' => 'defaultValue2', 'arg3' => 'defaultValue3'),
-            ),
-            array(
-                'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BarClass',
-                array('options' => array('foo' => 'bar')),
-                array('arg2' => 'defaultValue2', 'arg3' => 'defaultValue3'),
-            ),
-            array(
-                'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BarClass',
-                array('schemes' => array('https'), 'methods' => array('GET')),
-                array('arg2' => 'defaultValue2', 'arg3' => 'defaultValue3'),
-            ),
-            array(
-                'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BarClass',
-                array('condition' => 'context.getMethod() == "GET"'),
-                array('arg2' => 'defaultValue2', 'arg3' => 'defaultValue3'),
-            ),
-        );
+        $routes = $this->loader->load(ActionPathController::class);
+        $this->assertCount(1, $routes);
+        $this->assertEquals('/path', $routes->get('action')->getPath());
     }
 
-    /**
-     * @dataProvider getLoadTests
-     */
-    public function testLoad($className, $routeData = array(), $methodArgs = array())
+    public function testInvokableControllerLoader()
     {
-        $routeData = array_replace(array(
-            'name' => 'route',
-            'path' => '/',
-            'requirements' => array(),
-            'options' => array(),
-            'defaults' => array(),
-            'schemes' => array(),
-            'methods' => array(),
-            'condition' => '',
-        ), $routeData);
-
-        $this->reader
-            ->expects($this->once())
-            ->method('getMethodAnnotations')
-            ->will($this->returnValue(array($this->getAnnotatedRoute($routeData))))
-        ;
-
-        $routeCollection = $this->loader->load($className);
-        $route = $routeCollection->get($routeData['name']);
-
-        $this->assertSame($routeData['path'], $route->getPath(), '->load preserves path annotation');
-        $this->assertCount(
-            count($routeData['requirements']),
-            array_intersect_assoc($routeData['requirements'], $route->getRequirements()),
-            '->load preserves requirements annotation'
-        );
-        $this->assertCount(
-            count($routeData['options']),
-            array_intersect_assoc($routeData['options'], $route->getOptions()),
-            '->load preserves options annotation'
-        );
-        $this->assertCount(
-            count($routeData['defaults']),
-            $route->getDefaults(),
-            '->load preserves defaults annotation'
-        );
-        $this->assertEquals($routeData['schemes'], $route->getSchemes(), '->load preserves schemes annotation');
-        $this->assertEquals($routeData['methods'], $route->getMethods(), '->load preserves methods annotation');
-        $this->assertSame($routeData['condition'], $route->getCondition(), '->load preserves condition annotation');
+        $routes = $this->loader->load(InvokableController::class);
+        $this->assertCount(1, $routes);
+        $this->assertEquals('/here', $routes->get('lol')->getPath());
     }
 
-    public function testClassRouteLoad()
+    public function testInvokableLocalizedControllerLoading()
     {
-        $classRouteData = array(
-            'name' => 'prefix_',
-            'path' => '/prefix',
-            'schemes' => array('https'),
-            'methods' => array('GET'),
-        );
+        $routes = $this->loader->load(InvokableLocalizedController::class);
+        $this->assertCount(2, $routes);
+        $this->assertEquals('/here', $routes->get('action.en')->getPath());
+        $this->assertEquals('/hier', $routes->get('action.nl')->getPath());
+    }
 
-        $methodRouteData = array(
-            'name' => 'route1',
-            'path' => '/path',
-            'schemes' => array('http'),
-            'methods' => array('POST', 'PUT'),
-        );
+    public function testLocalizedPathRoutes()
+    {
+        $routes = $this->loader->load(LocalizedActionPathController::class);
+        $this->assertCount(2, $routes);
+        $this->assertEquals('/path', $routes->get('action.en')->getPath());
+        $this->assertEquals('/pad', $routes->get('action.nl')->getPath());
+    }
 
-        $this->reader
-            ->expects($this->once())
-            ->method('getClassAnnotation')
-            ->will($this->returnValue($this->getAnnotatedRoute($classRouteData)))
-        ;
-        $this->reader
-            ->expects($this->once())
-            ->method('getMethodAnnotations')
-            ->will($this->returnValue(array($this->getAnnotatedRoute($methodRouteData))))
-        ;
+    public function testLocalizedPathRoutesWithExplicitPathPropety()
+    {
+        $routes = $this->loader->load(ExplicitLocalizedActionPathController::class);
+        $this->assertCount(2, $routes);
+        $this->assertEquals('/path', $routes->get('action.en')->getPath());
+        $this->assertEquals('/pad', $routes->get('action.nl')->getPath());
+    }
 
-        $routeCollection = $this->loader->load('Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BarClass');
-        $route = $routeCollection->get($classRouteData['name'].$methodRouteData['name']);
+    public function testDefaultValuesForMethods()
+    {
+        $routes = $this->loader->load(DefaultValueController::class);
+        $this->assertCount(1, $routes);
+        $this->assertEquals('/{default}/path', $routes->get('action')->getPath());
+        $this->assertEquals('value', $routes->get('action')->getDefault('default'));
+    }
 
-        $this->assertSame($classRouteData['path'].$methodRouteData['path'], $route->getPath(), '->load concatenates class and method route path');
-        $this->assertEquals(array_merge($classRouteData['schemes'], $methodRouteData['schemes']), $route->getSchemes(), '->load merges class and method route schemes');
-        $this->assertEquals(array_merge($classRouteData['methods'], $methodRouteData['methods']), $route->getMethods(), '->load merges class and method route methods');
+    public function testMethodActionControllers()
+    {
+        $routes = $this->loader->load(MethodActionControllers::class);
+        $this->assertCount(2, $routes);
+        $this->assertEquals('/the/path', $routes->get('put')->getPath());
+        $this->assertEquals('/the/path', $routes->get('post')->getPath());
     }
 
-    public function testInvokableClassRouteLoad()
+    public function testLocalizedMethodActionControllers()
     {
-        $classRouteData = array(
-            'name' => 'route1',
-            'path' => '/',
-            'schemes' => array('https'),
-            'methods' => array('GET'),
-        );
+        $routes = $this->loader->load(LocalizedMethodActionControllers::class);
+        $this->assertCount(4, $routes);
+        $this->assertEquals('/the/path', $routes->get('put.en')->getPath());
+        $this->assertEquals('/the/path', $routes->get('post.en')->getPath());
+    }
 
-        $this->reader
-            ->expects($this->exactly(1))
-            ->method('getClassAnnotations')
-            ->will($this->returnValue(array($this->getAnnotatedRoute($classRouteData))))
-        ;
-        $this->reader
-            ->expects($this->once())
-            ->method('getMethodAnnotations')
-            ->will($this->returnValue(array()))
-        ;
+    public function testRouteWithPathWithPrefix()
+    {
+        $routes = $this->loader->load(PrefixedActionPathController::class);
+        $this->assertCount(1, $routes);
+        $route = $routes->get('action');
+        $this->assertEquals('/prefix/path', $route->getPath());
+        $this->assertEquals('lol=fun', $route->getCondition());
+        $this->assertEquals('frankdejonge.nl', $route->getHost());
+    }
 
-        $routeCollection = $this->loader->load('Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BazClass');
-        $route = $routeCollection->get($classRouteData['name']);
+    public function testLocalizedRouteWithPathWithPrefix()
+    {
+        $routes = $this->loader->load(PrefixedActionLocalizedRouteController::class);
+        $this->assertCount(2, $routes);
+        $this->assertEquals('/prefix/path', $routes->get('action.en')->getPath());
+        $this->assertEquals('/prefix/pad', $routes->get('action.nl')->getPath());
+    }
 
-        $this->assertSame($classRouteData['path'], $route->getPath(), '->load preserves class route path');
-        $this->assertEquals($classRouteData['schemes'], $route->getSchemes(), '->load preserves class route schemes');
-        $this->assertEquals($classRouteData['methods'], $route->getMethods(), '->load preserves class route methods');
+    public function testLocalizedPrefixLocalizedRoute()
+    {
+        $routes = $this->loader->load(LocalizedPrefixLocalizedActionController::class);
+        $this->assertCount(2, $routes);
+        $this->assertEquals('/nl/actie', $routes->get('action.nl')->getPath());
+        $this->assertEquals('/en/action', $routes->get('action.en')->getPath());
     }
 
     public function testInvokableClassMultipleRouteLoad()
@@ -225,18 +184,24 @@ class AnnotationClassLoaderTest extends AbstractAnnotationLoaderTest
             'methods' => array('GET'),
         );
 
-        $this->reader
+        $reader = $this->getReader();
+        $reader
             ->expects($this->exactly(1))
             ->method('getClassAnnotations')
-            ->will($this->returnValue(array($this->getAnnotatedRoute($classRouteData1), $this->getAnnotatedRoute($classRouteData2))))
+            ->will($this->returnValue(array(new RouteAnnotation($classRouteData1), new RouteAnnotation($classRouteData2))))
         ;
-        $this->reader
+        $reader
             ->expects($this->once())
             ->method('getMethodAnnotations')
             ->will($this->returnValue(array()))
         ;
+        $loader = new class($reader) extends AnnotationClassLoader {
+            protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, $annot)
+            {
+            }
+        };
 
-        $routeCollection = $this->loader->load('Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BazClass');
+        $routeCollection = $loader->load('Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BazClass');
         $route = $routeCollection->get($classRouteData1['name']);
 
         $this->assertSame($classRouteData1['path'], $route->getPath(), '->load preserves class route path');
@@ -250,47 +215,56 @@ class AnnotationClassLoaderTest extends AbstractAnnotationLoaderTest
         $this->assertEquals($classRouteData2['methods'], $route->getMethods(), '->load preserves class route methods');
     }
 
-    public function testInvokableClassWithMethodRouteLoad()
+    public function testMissingPrefixLocale()
     {
-        $classRouteData = array(
-            'name' => 'route1',
-            'path' => '/prefix',
-            'schemes' => array('https'),
-            'methods' => array('GET'),
-        );
+        $this->expectException(\LogicException::class);
+        $this->loader->load(LocalizedPrefixMissingLocaleActionController::class);
+    }
 
-        $methodRouteData = array(
-            'name' => 'route2',
-            'path' => '/path',
-            'schemes' => array('http'),
-            'methods' => array('POST', 'PUT'),
-        );
+    public function testMissingRouteLocale()
+    {
+        $this->expectException(\LogicException::class);
+        $this->loader->load(LocalizedPrefixMissingRouteLocaleActionController::class);
+    }
 
-        $this->reader
-            ->expects($this->once())
-            ->method('getClassAnnotation')
-            ->will($this->returnValue($this->getAnnotatedRoute($classRouteData)))
-        ;
-        $this->reader
-            ->expects($this->once())
-            ->method('getMethodAnnotations')
-            ->will($this->returnValue(array($this->getAnnotatedRoute($methodRouteData))))
-        ;
+    public function testRouteWithoutName()
+    {
+        $routes = $this->loader->load(MissingRouteNameController::class)->all();
+        $this->assertCount(1, $routes);
+        $this->assertEquals('/path', reset($routes)->getPath());
+    }
 
-        $routeCollection = $this->loader->load('Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BazClass');
-        $route = $routeCollection->get($classRouteData['name']);
+    public function testNothingButName()
+    {
+        $routes = $this->loader->load(NothingButNameController::class)->all();
+        $this->assertCount(1, $routes);
+        $this->assertEquals('/', reset($routes)->getPath());
+    }
 
-        $this->assertNull($route, '->load ignores class route');
+    public function testNonExistingClass()
+    {
+        $this->expectException(\LogicException::class);
+        $this->loader->load('ClassThatDoesNotExist');
+    }
 
-        $route = $routeCollection->get($classRouteData['name'].$methodRouteData['name']);
+    public function testLoadingAbstractClass()
+    {
+        $this->expectException(\LogicException::class);
+        $this->loader->load(AbstractClassController::class);
+    }
 
-        $this->assertSame($classRouteData['path'].$methodRouteData['path'], $route->getPath(), '->load concatenates class and method route path');
-        $this->assertEquals(array_merge($classRouteData['schemes'], $methodRouteData['schemes']), $route->getSchemes(), '->load merges class and method route schemes');
-        $this->assertEquals(array_merge($classRouteData['methods'], $methodRouteData['methods']), $route->getMethods(), '->load merges class and method route methods');
+    public function testLocalizedPrefixWithoutRouteLocale()
+    {
+        $routes = $this->loader->load(LocalizedPrefixWithRouteWithoutLocale::class);
+        $this->assertCount(2, $routes);
+        $this->assertEquals('/en/suffix', $routes->get('action.en')->getPath());
+        $this->assertEquals('/nl/suffix', $routes->get('action.nl')->getPath());
     }
 
-    private function getAnnotatedRoute($data)
+    public function testLoadingRouteWithPrefix()
     {
-        return new Route($data);
+        $routes = $this->loader->load(RouteWithPrefixController::class);
+        $this->assertCount(1, $routes);
+        $this->assertEquals('/prefix/path', $routes->get('action')->getPath());
     }
 }
diff --git a/vendor/symfony/routing/Tests/Loader/AnnotationDirectoryLoaderTest.php b/vendor/symfony/routing/Tests/Loader/AnnotationDirectoryLoaderTest.php
index 8a6668e0..901b858d 100644
--- a/vendor/symfony/routing/Tests/Loader/AnnotationDirectoryLoaderTest.php
+++ b/vendor/symfony/routing/Tests/Loader/AnnotationDirectoryLoaderTest.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Routing\Tests\Loader;
 
-use Symfony\Component\Routing\Loader\AnnotationDirectoryLoader;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Routing\Loader\AnnotationDirectoryLoader;
 
 class AnnotationDirectoryLoaderTest extends AbstractAnnotationLoaderTest
 {
@@ -100,10 +100,10 @@ class AnnotationDirectoryLoaderTest extends AbstractAnnotationLoaderTest
 
     private function expectAnnotationsToBeReadFrom(array $classes)
     {
-        $this->reader->expects($this->exactly(count($classes)))
+        $this->reader->expects($this->exactly(\count($classes)))
             ->method('getClassAnnotation')
             ->with($this->callback(function (\ReflectionClass $class) use ($classes) {
-                return in_array($class->getName(), $classes);
+                return \in_array($class->getName(), $classes);
             }));
     }
 }
diff --git a/vendor/symfony/routing/Tests/Loader/AnnotationFileLoaderTest.php b/vendor/symfony/routing/Tests/Loader/AnnotationFileLoaderTest.php
index 7f1d5765..50e212b3 100644
--- a/vendor/symfony/routing/Tests/Loader/AnnotationFileLoaderTest.php
+++ b/vendor/symfony/routing/Tests/Loader/AnnotationFileLoaderTest.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\Routing\Tests\Loader;
 
-use Symfony\Component\Routing\Loader\AnnotationFileLoader;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Loader\AnnotationFileLoader;
 
 class AnnotationFileLoaderTest extends AbstractAnnotationLoaderTest
 {
@@ -35,9 +35,6 @@ class AnnotationFileLoaderTest extends AbstractAnnotationLoaderTest
         $this->loader->load(__DIR__.'/../Fixtures/AnnotatedClasses/FooClass.php');
     }
 
-    /**
-     * @requires PHP 5.4
-     */
     public function testLoadTraitWithClassConstant()
     {
         $this->reader->expects($this->never())->method('getClassAnnotation');
@@ -54,9 +51,6 @@ class AnnotationFileLoaderTest extends AbstractAnnotationLoaderTest
         $this->loader->load(__DIR__.'/../Fixtures/OtherAnnotatedClasses/NoStartTagClass.php');
     }
 
-    /**
-     * @requires PHP 5.6
-     */
     public function testLoadVariadic()
     {
         $route = new Route(array('path' => '/path/to/{id}'));
diff --git a/vendor/symfony/routing/Tests/Loader/DirectoryLoaderTest.php b/vendor/symfony/routing/Tests/Loader/DirectoryLoaderTest.php
index fc29d371..45968551 100644
--- a/vendor/symfony/routing/Tests/Loader/DirectoryLoaderTest.php
+++ b/vendor/symfony/routing/Tests/Loader/DirectoryLoaderTest.php
@@ -11,11 +11,11 @@
 
 namespace Symfony\Component\Routing\Tests\Loader;
 
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Loader\LoaderResolver;
+use Symfony\Component\Routing\Loader\AnnotationFileLoader;
 use Symfony\Component\Routing\Loader\DirectoryLoader;
 use Symfony\Component\Routing\Loader\YamlFileLoader;
-use Symfony\Component\Routing\Loader\AnnotationFileLoader;
-use Symfony\Component\Config\Loader\LoaderResolver;
-use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Routing\RouteCollection;
 
 class DirectoryLoaderTest extends AbstractAnnotationLoaderTest
diff --git a/vendor/symfony/routing/Tests/Loader/FileLocatorStub.php b/vendor/symfony/routing/Tests/Loader/FileLocatorStub.php
new file mode 100644
index 00000000..870c3cf4
--- /dev/null
+++ b/vendor/symfony/routing/Tests/Loader/FileLocatorStub.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Loader;
+
+use Symfony\Component\Config\FileLocatorInterface;
+
+class FileLocatorStub implements FileLocatorInterface
+{
+    public function locate($name, $currentPath = null, $first = true)
+    {
+        if (0 === strpos($name, 'http')) {
+            return $name;
+        }
+
+        return rtrim($currentPath, '/').'/'.$name;
+    }
+}
diff --git a/vendor/symfony/routing/Tests/Loader/GlobFileLoaderTest.php b/vendor/symfony/routing/Tests/Loader/GlobFileLoaderTest.php
index 08d806a8..e4e12b88 100644
--- a/vendor/symfony/routing/Tests/Loader/GlobFileLoaderTest.php
+++ b/vendor/symfony/routing/Tests/Loader/GlobFileLoaderTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Routing\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Config\Resource\GlobResource;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Resource\GlobResource;
 use Symfony\Component\Routing\Loader\GlobFileLoader;
 use Symfony\Component\Routing\RouteCollection;
 
diff --git a/vendor/symfony/routing/Tests/Loader/ObjectRouteLoaderTest.php b/vendor/symfony/routing/Tests/Loader/ObjectRouteLoaderTest.php
index 408fa0b4..ed650682 100644
--- a/vendor/symfony/routing/Tests/Loader/ObjectRouteLoaderTest.php
+++ b/vendor/symfony/routing/Tests/Loader/ObjectRouteLoaderTest.php
@@ -18,7 +18,11 @@ use Symfony\Component\Routing\RouteCollection;
 
 class ObjectRouteLoaderTest extends TestCase
 {
-    public function testLoadCallsServiceAndReturnsCollection()
+    /**
+     * @group legacy
+     * @expectedDeprecation Referencing service route loaders with a single colon is deprecated since Symfony 4.1. Use my_route_provider_service::loadRoutes instead.
+     */
+    public function testLoadCallsServiceAndReturnsCollectionWithLegacyNotation()
     {
         $loader = new ObjectRouteLoaderForTest();
 
@@ -40,6 +44,28 @@ class ObjectRouteLoaderTest extends TestCase
         $this->assertNotEmpty($actualRoutes->getResources());
     }
 
+    public function testLoadCallsServiceAndReturnsCollection()
+    {
+        $loader = new ObjectRouteLoaderForTest();
+
+        // create a basic collection that will be returned
+        $collection = new RouteCollection();
+        $collection->add('foo', new Route('/foo'));
+
+        $loader->loaderMap = array(
+            'my_route_provider_service' => new RouteService($collection),
+        );
+
+        $actualRoutes = $loader->load(
+            'my_route_provider_service::loadRoutes',
+            'service'
+        );
+
+        $this->assertSame($collection, $actualRoutes);
+        // the service file should be listed as a resource
+        $this->assertNotEmpty($actualRoutes->getResources());
+    }
+
     /**
      * @expectedException \InvalidArgumentException
      * @dataProvider getBadResourceStrings
@@ -54,7 +80,6 @@ class ObjectRouteLoaderTest extends TestCase
     {
         return array(
             array('Foo'),
-            array('Bar::baz'),
             array('Foo:Bar:baz'),
         );
     }
@@ -66,7 +91,7 @@ class ObjectRouteLoaderTest extends TestCase
     {
         $loader = new ObjectRouteLoaderForTest();
         $loader->loaderMap = array('my_service' => 'NOT_AN_OBJECT');
-        $loader->load('my_service:method');
+        $loader->load('my_service::method');
     }
 
     /**
@@ -76,7 +101,7 @@ class ObjectRouteLoaderTest extends TestCase
     {
         $loader = new ObjectRouteLoaderForTest();
         $loader->loaderMap = array('my_service' => new \stdClass());
-        $loader->load('my_service:method');
+        $loader->load('my_service::method');
     }
 
     /**
@@ -93,7 +118,7 @@ class ObjectRouteLoaderTest extends TestCase
 
         $loader = new ObjectRouteLoaderForTest();
         $loader->loaderMap = array('my_service' => $service);
-        $loader->load('my_service:loadRoutes');
+        $loader->load('my_service::loadRoutes');
     }
 }
 
diff --git a/vendor/symfony/routing/Tests/Loader/PhpFileLoaderTest.php b/vendor/symfony/routing/Tests/Loader/PhpFileLoaderTest.php
index 0dcf5d49..a148e9ee 100644
--- a/vendor/symfony/routing/Tests/Loader/PhpFileLoaderTest.php
+++ b/vendor/symfony/routing/Tests/Loader/PhpFileLoaderTest.php
@@ -88,7 +88,8 @@ class PhpFileLoaderTest extends TestCase
     {
         $locator = new FileLocator(array(__DIR__.'/../Fixtures'));
         $loader = new PhpFileLoader($locator);
-        $routeCollection = $loader->load('php_dsl.php');
+        $routeCollectionClosure = $loader->load('php_dsl.php');
+        $routeCollectionObject = $loader->load('php_object_dsl.php');
 
         $expectedCollection = new RouteCollection();
 
@@ -99,6 +100,9 @@ class PhpFileLoaderTest extends TestCase
         $expectedCollection->add('buz', (new Route('/zub'))
             ->setDefaults(array('_controller' => 'foo:act'))
         );
+        $expectedCollection->add('c_root', (new Route('/sub/pub/'))
+            ->setRequirements(array('id' => '\d+'))
+        );
         $expectedCollection->add('c_bar', (new Route('/sub/pub/bar'))
             ->setRequirements(array('id' => '\d+'))
         );
@@ -106,6 +110,11 @@ class PhpFileLoaderTest extends TestCase
             ->setHost('host')
             ->setRequirements(array('id' => '\d+'))
         );
+        $expectedCollection->add('z_c_root', new Route('/zub/pub/'));
+        $expectedCollection->add('z_c_bar', new Route('/zub/pub/bar'));
+        $expectedCollection->add('z_c_pub_buz', (new Route('/zub/pub/buz'))->setHost('host'));
+        $expectedCollection->add('r_root', new Route('/bus'));
+        $expectedCollection->add('r_bar', new Route('/bus/bar/'));
         $expectedCollection->add('ouf', (new Route('/ouf'))
             ->setSchemes(array('https'))
             ->setMethods(array('GET'))
@@ -113,9 +122,16 @@ class PhpFileLoaderTest extends TestCase
         );
 
         $expectedCollection->addResource(new FileResource(realpath(__DIR__.'/../Fixtures/php_dsl_sub.php')));
-        $expectedCollection->addResource(new FileResource(realpath(__DIR__.'/../Fixtures/php_dsl.php')));
+        $expectedCollection->addResource(new FileResource(realpath(__DIR__.'/../Fixtures/php_dsl_sub_root.php')));
 
-        $this->assertEquals($expectedCollection, $routeCollection);
+        $expectedCollectionClosure = $expectedCollection;
+        $expectedCollectionObject = clone $expectedCollection;
+
+        $expectedCollectionClosure->addResource(new FileResource(realpath(__DIR__.'/../Fixtures/php_dsl.php')));
+        $expectedCollectionObject->addResource(new FileResource(realpath(__DIR__.'/../Fixtures/php_object_dsl.php')));
+
+        $this->assertEquals($expectedCollectionClosure, $routeCollectionClosure);
+        $this->assertEquals($expectedCollectionObject, $routeCollectionObject);
     }
 
     public function testRoutingConfiguratorCanImportGlobPatterns()
@@ -130,4 +146,24 @@ class PhpFileLoaderTest extends TestCase
         $route = $routeCollection->get('baz_route');
         $this->assertSame('AppBundle:Baz:view', $route->getDefault('_controller'));
     }
+
+    public function testRoutingI18nConfigurator()
+    {
+        $locator = new FileLocator(array(__DIR__.'/../Fixtures'));
+        $loader = new PhpFileLoader($locator);
+        $routeCollection = $loader->load('php_dsl_i18n.php');
+
+        $expectedCollection = new RouteCollection();
+
+        $expectedCollection->add('foo.en', (new Route('/glish/foo'))->setDefaults(array('_locale' => 'en', '_canonical_route' => 'foo')));
+        $expectedCollection->add('bar.en', (new Route('/glish/bar'))->setDefaults(array('_locale' => 'en', '_canonical_route' => 'bar')));
+        $expectedCollection->add('baz.en', (new Route('/baz'))->setDefaults(array('_locale' => 'en', '_canonical_route' => 'baz')));
+        $expectedCollection->add('c_foo.fr', (new Route('/ench/pub/foo'))->setDefaults(array('_locale' => 'fr', '_canonical_route' => 'c_foo')));
+        $expectedCollection->add('c_bar.fr', (new Route('/ench/pub/bar'))->setDefaults(array('_locale' => 'fr', '_canonical_route' => 'c_bar')));
+
+        $expectedCollection->addResource(new FileResource(realpath(__DIR__.'/../Fixtures/php_dsl_sub_i18n.php')));
+        $expectedCollection->addResource(new FileResource(realpath(__DIR__.'/../Fixtures/php_dsl_i18n.php')));
+
+        $this->assertEquals($expectedCollection, $routeCollection);
+    }
 }
diff --git a/vendor/symfony/routing/Tests/Loader/XmlFileLoaderTest.php b/vendor/symfony/routing/Tests/Loader/XmlFileLoaderTest.php
index 21fc3400..fff4154b 100644
--- a/vendor/symfony/routing/Tests/Loader/XmlFileLoaderTest.php
+++ b/vendor/symfony/routing/Tests/Loader/XmlFileLoaderTest.php
@@ -83,6 +83,45 @@ class XmlFileLoaderTest extends TestCase
         }
     }
 
+    public function testLoadLocalized()
+    {
+        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
+        $routeCollection = $loader->load('localized.xml');
+        $routes = $routeCollection->all();
+
+        $this->assertCount(2, $routes, 'Two routes are loaded');
+        $this->assertContainsOnly('Symfony\Component\Routing\Route', $routes);
+
+        $this->assertEquals('/route', $routeCollection->get('localized.fr')->getPath());
+        $this->assertEquals('/path', $routeCollection->get('localized.en')->getPath());
+    }
+
+    public function testLocalizedImports()
+    {
+        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/localized')));
+        $routeCollection = $loader->load('importer-with-locale.xml');
+        $routes = $routeCollection->all();
+
+        $this->assertCount(2, $routes, 'Two routes are loaded');
+        $this->assertContainsOnly('Symfony\Component\Routing\Route', $routes);
+
+        $this->assertEquals('/le-prefix/le-suffix', $routeCollection->get('imported.fr')->getPath());
+        $this->assertEquals('/the-prefix/suffix', $routeCollection->get('imported.en')->getPath());
+    }
+
+    public function testLocalizedImportsOfNotLocalizedRoutes()
+    {
+        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/localized')));
+        $routeCollection = $loader->load('importer-with-locale-imports-non-localized-route.xml');
+        $routes = $routeCollection->all();
+
+        $this->assertCount(2, $routes, 'Two routes are loaded');
+        $this->assertContainsOnly('Symfony\Component\Routing\Route', $routes);
+
+        $this->assertEquals('/le-prefix/suffix', $routeCollection->get('imported.fr')->getPath());
+        $this->assertEquals('/the-prefix/suffix', $routeCollection->get('imported.en')->getPath());
+    }
+
     /**
      * @expectedException \InvalidArgumentException
      * @dataProvider getPathsToInvalidFiles
@@ -382,4 +421,24 @@ class XmlFileLoaderTest extends TestCase
         $route = $routeCollection->get('baz_route');
         $this->assertSame('AppBundle:Baz:view', $route->getDefault('_controller'));
     }
+
+    public function testImportRouteWithNamePrefix()
+    {
+        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/import_with_name_prefix')));
+        $routeCollection = $loader->load('routing.xml');
+
+        $this->assertNotNull($routeCollection->get('app_blog'));
+        $this->assertEquals('/blog', $routeCollection->get('app_blog')->getPath());
+        $this->assertNotNull($routeCollection->get('api_app_blog'));
+        $this->assertEquals('/api/blog', $routeCollection->get('api_app_blog')->getPath());
+    }
+
+    public function testImportRouteWithNoTrailingSlash()
+    {
+        $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/import_with_no_trailing_slash')));
+        $routeCollection = $loader->load('routing.xml');
+
+        $this->assertEquals('/slash/', $routeCollection->get('a_app_homepage')->getPath());
+        $this->assertEquals('/no-slash', $routeCollection->get('b_app_homepage')->getPath());
+    }
 }
diff --git a/vendor/symfony/routing/Tests/Loader/YamlFileLoaderTest.php b/vendor/symfony/routing/Tests/Loader/YamlFileLoaderTest.php
index 822bddf1..41f87bb5 100644
--- a/vendor/symfony/routing/Tests/Loader/YamlFileLoaderTest.php
+++ b/vendor/symfony/routing/Tests/Loader/YamlFileLoaderTest.php
@@ -13,8 +13,8 @@ namespace Symfony\Component\Routing\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\Routing\Loader\YamlFileLoader;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Routing\Loader\YamlFileLoader;
 
 class YamlFileLoaderTest extends TestCase
 {
@@ -203,4 +203,105 @@ class YamlFileLoaderTest extends TestCase
         $route = $routeCollection->get('baz_route');
         $this->assertSame('AppBundle:Baz:view', $route->getDefault('_controller'));
     }
+
+    public function testImportRouteWithNamePrefix()
+    {
+        $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/import_with_name_prefix')));
+        $routeCollection = $loader->load('routing.yml');
+
+        $this->assertNotNull($routeCollection->get('app_blog'));
+        $this->assertEquals('/blog', $routeCollection->get('app_blog')->getPath());
+        $this->assertNotNull($routeCollection->get('api_app_blog'));
+        $this->assertEquals('/api/blog', $routeCollection->get('api_app_blog')->getPath());
+    }
+
+    public function testRemoteSourcesAreNotAccepted()
+    {
+        $loader = new YamlFileLoader(new FileLocatorStub());
+        $this->expectException(\InvalidArgumentException::class);
+        $loader->load('http://remote.com/here.yml');
+    }
+
+    public function testLoadingLocalizedRoute()
+    {
+        $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/localized')));
+        $routes = $loader->load('localized-route.yml');
+
+        $this->assertCount(3, $routes);
+    }
+
+    public function testImportingRoutesFromDefinition()
+    {
+        $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/localized')));
+        $routes = $loader->load('importing-localized-route.yml');
+
+        $this->assertCount(3, $routes);
+        $this->assertEquals('/nl', $routes->get('home.nl')->getPath());
+        $this->assertEquals('/en', $routes->get('home.en')->getPath());
+        $this->assertEquals('/here', $routes->get('not_localized')->getPath());
+    }
+
+    public function testImportingRoutesWithLocales()
+    {
+        $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/localized')));
+        $routes = $loader->load('importer-with-locale.yml');
+
+        $this->assertCount(2, $routes);
+        $this->assertEquals('/nl/voorbeeld', $routes->get('imported.nl')->getPath());
+        $this->assertEquals('/en/example', $routes->get('imported.en')->getPath());
+    }
+
+    public function testImportingNonLocalizedRoutesWithLocales()
+    {
+        $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/localized')));
+        $routes = $loader->load('importer-with-locale-imports-non-localized-route.yml');
+
+        $this->assertCount(2, $routes);
+        $this->assertEquals('/nl/imported', $routes->get('imported.nl')->getPath());
+        $this->assertEquals('/en/imported', $routes->get('imported.en')->getPath());
+    }
+
+    public function testImportingRoutesWithOfficialLocales()
+    {
+        $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/localized')));
+        $routes = $loader->load('officially_formatted_locales.yml');
+
+        $this->assertCount(3, $routes);
+        $this->assertEquals('/omelette-au-fromage', $routes->get('official.fr.UTF-8')->getPath());
+        $this->assertEquals('/eu-não-sou-espanhol', $routes->get('official.pt-PT')->getPath());
+        $this->assertEquals('/churrasco', $routes->get('official.pt_BR')->getPath());
+    }
+
+    public function testImportingRoutesFromDefinitionMissingLocalePrefix()
+    {
+        $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/localized')));
+        $this->expectException(\InvalidArgumentException::class);
+        $loader->load('missing-locale-in-importer.yml');
+    }
+
+    public function testImportingRouteWithoutPathOrLocales()
+    {
+        $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/localized')));
+        $this->expectException(\InvalidArgumentException::class);
+        $loader->load('route-without-path-or-locales.yml');
+    }
+
+    public function testImportingWithControllerDefault()
+    {
+        $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/localized')));
+        $routes = $loader->load('importer-with-controller-default.yml');
+        $this->assertCount(3, $routes);
+        $this->assertEquals('DefaultController::defaultAction', $routes->get('home.en')->getDefault('_controller'));
+        $this->assertEquals('DefaultController::defaultAction', $routes->get('home.nl')->getDefault('_controller'));
+        $this->assertEquals('DefaultController::defaultAction', $routes->get('not_localized')->getDefault('_controller'));
+    }
+
+    public function testImportRouteWithNoTrailingSlash()
+    {
+        $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/import_with_no_trailing_slash')));
+        $routeCollection = $loader->load('routing.yml');
+
+        $this->assertEquals('/slash/', $routeCollection->get('a_app_homepage')->getPath());
+        $this->assertEquals('/no-slash', $routeCollection->get('b_app_homepage')->getPath());
+    }
 }
diff --git a/vendor/symfony/routing/Tests/Matcher/DumpedRedirectableUrlMatcherTest.php b/vendor/symfony/routing/Tests/Matcher/DumpedRedirectableUrlMatcherTest.php
index cfbb524d..1785c3ad 100644
--- a/vendor/symfony/routing/Tests/Matcher/DumpedRedirectableUrlMatcherTest.php
+++ b/vendor/symfony/routing/Tests/Matcher/DumpedRedirectableUrlMatcherTest.php
@@ -14,8 +14,8 @@ namespace Symfony\Component\Routing\Tests\Matcher;
 use Symfony\Component\Routing\Matcher\Dumper\PhpMatcherDumper;
 use Symfony\Component\Routing\Matcher\RedirectableUrlMatcherInterface;
 use Symfony\Component\Routing\Matcher\UrlMatcher;
-use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\RouteCollection;
 
 class DumpedRedirectableUrlMatcherTest extends RedirectableUrlMatcherTest
 {
diff --git a/vendor/symfony/routing/Tests/Matcher/DumpedUrlMatcherTest.php b/vendor/symfony/routing/Tests/Matcher/DumpedUrlMatcherTest.php
index 880b2b13..47e32516 100644
--- a/vendor/symfony/routing/Tests/Matcher/DumpedUrlMatcherTest.php
+++ b/vendor/symfony/routing/Tests/Matcher/DumpedUrlMatcherTest.php
@@ -12,29 +12,11 @@
 namespace Symfony\Component\Routing\Tests\Matcher;
 
 use Symfony\Component\Routing\Matcher\Dumper\PhpMatcherDumper;
-use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\RouteCollection;
 
 class DumpedUrlMatcherTest extends UrlMatcherTest
 {
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage The "schemes" requirement is only supported for URL matchers that implement RedirectableUrlMatcherInterface.
-     */
-    public function testSchemeRequirement()
-    {
-        parent::testSchemeRequirement();
-    }
-
-    /**
-     * @expectedException \LogicException
-     * @expectedExceptionMessage The "schemes" requirement is only supported for URL matchers that implement RedirectableUrlMatcherInterface.
-     */
-    public function testSchemeAndMethodMismatch()
-    {
-        parent::testSchemeRequirement();
-    }
-
     protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null)
     {
         static $i = 0;
diff --git a/vendor/symfony/routing/Tests/Matcher/Dumper/DumperCollectionTest.php b/vendor/symfony/routing/Tests/Matcher/Dumper/DumperCollectionTest.php
deleted file mode 100644
index 823efdb8..00000000
--- a/vendor/symfony/routing/Tests/Matcher/Dumper/DumperCollectionTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Routing\Tests\Matcher\Dumper;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\Routing\Matcher\Dumper\DumperCollection;
-
-class DumperCollectionTest extends TestCase
-{
-    public function testGetRoot()
-    {
-        $a = new DumperCollection();
-
-        $b = new DumperCollection();
-        $a->add($b);
-
-        $c = new DumperCollection();
-        $b->add($c);
-
-        $d = new DumperCollection();
-        $c->add($d);
-
-        $this->assertSame($a, $c->getRoot());
-    }
-}
diff --git a/vendor/symfony/routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php b/vendor/symfony/routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
index f29a6d6a..166129cc 100644
--- a/vendor/symfony/routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
+++ b/vendor/symfony/routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
@@ -36,7 +36,7 @@ class PhpMatcherDumperTest extends TestCase
         parent::setUp();
 
         $this->matcherClass = uniqid('ProjectUrlMatcher');
-        $this->dumpPath = sys_get_temp_dir().DIRECTORY_SEPARATOR.'php_matcher.'.$this->matcherClass.'.php';
+        $this->dumpPath = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'php_matcher.'.$this->matcherClass.'.php';
     }
 
     protected function tearDown()
@@ -46,24 +46,6 @@ class PhpMatcherDumperTest extends TestCase
         @unlink($this->dumpPath);
     }
 
-    /**
-     * @expectedException \LogicException
-     */
-    public function testDumpWhenSchemeIsUsedWithoutAProperDumper()
-    {
-        $collection = new RouteCollection();
-        $collection->add('secure', new Route(
-            '/secure',
-            array(),
-            array(),
-            array(),
-            '',
-            array('https')
-        ));
-        $dumper = new PhpMatcherDumper($collection);
-        $dumper->dump();
-    }
-
     public function testRedirectPreservesUrlEncoding()
     {
         $collection = new RouteCollection();
@@ -181,7 +163,7 @@ class PhpMatcherDumperTest extends TestCase
         // prefixes
         $collection1 = new RouteCollection();
         $collection1->add('overridden', new Route('/overridden1'));
-        $collection1->add('foo1', new Route('/{foo}'));
+        $collection1->add('foo1', (new Route('/{foo}'))->setMethods('PUT'));
         $collection1->add('bar1', new Route('/{bar}'));
         $collection1->addPrefix('/b\'b');
         $collection2 = new RouteCollection();
@@ -399,6 +381,7 @@ class PhpMatcherDumperTest extends TestCase
         $groupOptimisedCollection->add('slashed_b', new Route('/slashed/group/b/'));
         $groupOptimisedCollection->add('slashed_c', new Route('/slashed/group/c/'));
 
+        /* test case 6 & 7 */
         $trailingSlashCollection = new RouteCollection();
         $trailingSlashCollection->add('simple_trailing_slash_no_methods', new Route('/trailing/simple/no-methods/', array(), array(), array(), '', array(), array()));
         $trailingSlashCollection->add('simple_trailing_slash_GET_method', new Route('/trailing/simple/get-method/', array(), array(), array(), '', array(), array('GET')));
@@ -418,6 +401,59 @@ class PhpMatcherDumperTest extends TestCase
         $trailingSlashCollection->add('regex_not_trailing_slash_HEAD_method', new Route('/not-trailing/regex/head-method/{param}', array(), array(), array(), '', array(), array('HEAD')));
         $trailingSlashCollection->add('regex_not_trailing_slash_POST_method', new Route('/not-trailing/regex/post-method/{param}', array(), array(), array(), '', array(), array('POST')));
 
+        /* test case 8 */
+        $unicodeCollection = new RouteCollection();
+        $unicodeCollection->add('a', new Route('/{a}', array(), array('a' => 'a'), array('utf8' => false)));
+        $unicodeCollection->add('b', new Route('/{a}', array(), array('a' => '.'), array('utf8' => true)));
+        $unicodeCollection->add('c', new Route('/{a}', array(), array('a' => '.'), array('utf8' => false)));
+
+        /* test case 9 */
+        $hostTreeCollection = new RouteCollection();
+        $hostTreeCollection->add('a', (new Route('/'))->setHost('{d}.e.c.b.a'));
+        $hostTreeCollection->add('b', (new Route('/'))->setHost('d.c.b.a'));
+        $hostTreeCollection->add('c', (new Route('/'))->setHost('{e}.e.c.b.a'));
+
+        /* test case 10 */
+        $chunkedCollection = new RouteCollection();
+        for ($i = 0; $i < 1000; ++$i) {
+            $h = substr(md5($i), 0, 6);
+            $chunkedCollection->add('_'.$i, new Route('/'.$h.'/{a}/{b}/{c}/'.$h));
+        }
+
+        /* test case 11 */
+        $demoCollection = new RouteCollection();
+        $demoCollection->add('a', new Route('/admin/post/'));
+        $demoCollection->add('b', new Route('/admin/post/new'));
+        $demoCollection->add('c', (new Route('/admin/post/{id}'))->setRequirements(array('id' => '\d+')));
+        $demoCollection->add('d', (new Route('/admin/post/{id}/edit'))->setRequirements(array('id' => '\d+')));
+        $demoCollection->add('e', (new Route('/admin/post/{id}/delete'))->setRequirements(array('id' => '\d+')));
+        $demoCollection->add('f', new Route('/blog/'));
+        $demoCollection->add('g', new Route('/blog/rss.xml'));
+        $demoCollection->add('h', (new Route('/blog/page/{page}'))->setRequirements(array('id' => '\d+')));
+        $demoCollection->add('i', (new Route('/blog/posts/{page}'))->setRequirements(array('id' => '\d+')));
+        $demoCollection->add('j', (new Route('/blog/comments/{id}/new'))->setRequirements(array('id' => '\d+')));
+        $demoCollection->add('k', new Route('/blog/search'));
+        $demoCollection->add('l', new Route('/login'));
+        $demoCollection->add('m', new Route('/logout'));
+        $demoCollection->addPrefix('/{_locale}');
+        $demoCollection->add('n', new Route('/{_locale}'));
+        $demoCollection->addRequirements(array('_locale' => 'en|fr'));
+        $demoCollection->addDefaults(array('_locale' => 'en'));
+
+        /* test case 12 */
+        $suffixCollection = new RouteCollection();
+        $suffixCollection->add('r1', new Route('abc{foo}/1'));
+        $suffixCollection->add('r2', new Route('abc{foo}/2'));
+        $suffixCollection->add('r10', new Route('abc{foo}/10'));
+        $suffixCollection->add('r20', new Route('abc{foo}/20'));
+        $suffixCollection->add('r100', new Route('abc{foo}/100'));
+        $suffixCollection->add('r200', new Route('abc{foo}/200'));
+
+        /* test case 13 */
+        $hostCollection = new RouteCollection();
+        $hostCollection->add('r1', (new Route('abc{foo}'))->setHost('{foo}.exampple.com'));
+        $hostCollection->add('r2', (new Route('abc{foo}'))->setHost('{foo}.exampple.com'));
+
         return array(
            array(new RouteCollection(), 'url_matcher0.php', array()),
            array($collection, 'url_matcher1.php', array()),
@@ -427,6 +463,12 @@ class PhpMatcherDumperTest extends TestCase
            array($groupOptimisedCollection, 'url_matcher5.php', array('base_class' => 'Symfony\Component\Routing\Tests\Fixtures\RedirectableUrlMatcher')),
            array($trailingSlashCollection, 'url_matcher6.php', array()),
            array($trailingSlashCollection, 'url_matcher7.php', array('base_class' => 'Symfony\Component\Routing\Tests\Fixtures\RedirectableUrlMatcher')),
+           array($unicodeCollection, 'url_matcher8.php', array()),
+           array($hostTreeCollection, 'url_matcher9.php', array()),
+           array($chunkedCollection, 'url_matcher10.php', array()),
+           array($demoCollection, 'url_matcher11.php', array('base_class' => 'Symfony\Component\Routing\Tests\Fixtures\RedirectableUrlMatcher')),
+           array($suffixCollection, 'url_matcher12.php', array()),
+           array($hostCollection, 'url_matcher13.php', array()),
         );
     }
 
@@ -449,6 +491,18 @@ class PhpMatcherDumperTest extends TestCase
 
         return $this->matcherClass;
     }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Symfony\Component\Routing\Route cannot contain objects
+     */
+    public function testGenerateDumperMatcherWithObject()
+    {
+        $routeCollection = new RouteCollection();
+        $routeCollection->add('_', new Route('/', array(new \stdClass())));
+        $dumper = new PhpMatcherDumper($routeCollection);
+        $dumper->dump();
+    }
 }
 
 abstract class RedirectableUrlMatcherStub extends UrlMatcher implements RedirectableUrlMatcherInterface
diff --git a/vendor/symfony/routing/Tests/Matcher/Dumper/StaticPrefixCollectionTest.php b/vendor/symfony/routing/Tests/Matcher/Dumper/StaticPrefixCollectionTest.php
index 37419e77..24e12ac1 100644
--- a/vendor/symfony/routing/Tests/Matcher/Dumper/StaticPrefixCollectionTest.php
+++ b/vendor/symfony/routing/Tests/Matcher/Dumper/StaticPrefixCollectionTest.php
@@ -18,10 +18,9 @@ class StaticPrefixCollectionTest extends TestCase
         foreach ($routes as $route) {
             list($path, $name) = $route;
             $staticPrefix = (new Route($path))->compile()->getStaticPrefix();
-            $collection->addRoute($staticPrefix, $name);
+            $collection->addRoute($staticPrefix, array($name));
         }
 
-        $collection->optimizeGroups();
         $dumped = $this->dumpCollection($collection);
         $this->assertEquals($expected, $dumped);
     }
@@ -36,21 +35,22 @@ class StaticPrefixCollectionTest extends TestCase
                     array('/leading/segment/', 'leading_segment'),
                 ),
                 <<<EOF
-/ root
-/prefix/segment prefix_segment
-/leading/segment leading_segment
+root
+prefix_segment
+leading_segment
 EOF
             ),
-            'Not nested - group too small' => array(
+            'Nested - small group' => array(
                 array(
                     array('/', 'root'),
                     array('/prefix/segment/aa', 'prefix_segment'),
                     array('/prefix/segment/bb', 'leading_segment'),
                 ),
                 <<<EOF
-/ root
-/prefix/segment/aa prefix_segment
-/prefix/segment/bb leading_segment
+root
+/prefix/segment/
+-> prefix_segment
+-> leading_segment
 EOF
             ),
             'Nested - contains item at intersection' => array(
@@ -60,10 +60,10 @@ EOF
                     array('/prefix/segment/bb', 'leading_segment'),
                 ),
                 <<<EOF
-/ root
-/prefix/segment
--> /prefix/segment prefix_segment
--> /prefix/segment/bb leading_segment
+root
+/prefix/segment/
+-> prefix_segment
+-> leading_segment
 EOF
             ),
             'Simple one level nesting' => array(
@@ -74,11 +74,11 @@ EOF
                     array('/group/other/', 'other_segment'),
                 ),
                 <<<EOF
-/ root
-/group
--> /group/segment nested_segment
--> /group/thing some_segment
--> /group/other other_segment
+root
+/group/
+-> nested_segment
+-> some_segment
+-> other_segment
 EOF
             ),
             'Retain matching order with groups' => array(
@@ -86,21 +86,21 @@ EOF
                     array('/group/aa/', 'aa'),
                     array('/group/bb/', 'bb'),
                     array('/group/cc/', 'cc'),
-                    array('/', 'root'),
+                    array('/(.*)', 'root'),
                     array('/group/dd/', 'dd'),
                     array('/group/ee/', 'ee'),
                     array('/group/ff/', 'ff'),
                 ),
                 <<<EOF
-/group
--> /group/aa aa
--> /group/bb bb
--> /group/cc cc
-/ root
-/group
--> /group/dd dd
--> /group/ee ee
--> /group/ff ff
+/group/
+-> aa
+-> bb
+-> cc
+root
+/group/
+-> dd
+-> ee
+-> ff
 EOF
             ),
             'Retain complex matching order with groups at base' => array(
@@ -109,28 +109,30 @@ EOF
                     array('/prefixed/group/aa/', 'aa'),
                     array('/prefixed/group/bb/', 'bb'),
                     array('/prefixed/group/cc/', 'cc'),
-                    array('/prefixed/', 'root'),
+                    array('/prefixed/(.*)', 'root'),
                     array('/prefixed/group/dd/', 'dd'),
                     array('/prefixed/group/ee/', 'ee'),
+                    array('/prefixed/', 'parent'),
                     array('/prefixed/group/ff/', 'ff'),
                     array('/aaa/222/', 'second_aaa'),
                     array('/aaa/333/', 'third_aaa'),
                 ),
                 <<<EOF
-/aaa
--> /aaa/111 first_aaa
--> /aaa/222 second_aaa
--> /aaa/333 third_aaa
-/prefixed
--> /prefixed/group
--> -> /prefixed/group/aa aa
--> -> /prefixed/group/bb bb
--> -> /prefixed/group/cc cc
--> /prefixed root
--> /prefixed/group
--> -> /prefixed/group/dd dd
--> -> /prefixed/group/ee ee
--> -> /prefixed/group/ff ff
+/aaa/
+-> first_aaa
+-> second_aaa
+-> third_aaa
+/prefixed/
+-> /prefixed/group/
+-> -> aa
+-> -> bb
+-> -> cc
+-> root
+-> /prefixed/group/
+-> -> dd
+-> -> ee
+-> -> ff
+-> parent
 EOF
             ),
 
@@ -145,13 +147,13 @@ EOF
                 ),
                 <<<EOF
 /aaa-
--> /aaa-111 a1
--> /aaa-222 a2
--> /aaa-333 a3
+-> a1
+-> a2
+-> a3
 /group-
--> /group-aa g1
--> /group-bb g2
--> /group-cc g3
+-> g1
+-> g2
+-> g3
 EOF
             ),
         );
@@ -161,7 +163,7 @@ EOF
     {
         $lines = array();
 
-        foreach ($collection->getItems() as $item) {
+        foreach ($collection->getRoutes() as $item) {
             if ($item instanceof StaticPrefixCollection) {
                 $lines[] = $prefix.$item->getPrefix();
                 $lines[] = $this->dumpCollection($item, $prefix.'-> ');
diff --git a/vendor/symfony/routing/Tests/Matcher/RedirectableUrlMatcherTest.php b/vendor/symfony/routing/Tests/Matcher/RedirectableUrlMatcherTest.php
index 7984391e..e3679622 100644
--- a/vendor/symfony/routing/Tests/Matcher/RedirectableUrlMatcherTest.php
+++ b/vendor/symfony/routing/Tests/Matcher/RedirectableUrlMatcherTest.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\Routing\Tests\Matcher;
 
+use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\RequestContext;
 
 class RedirectableUrlMatcherTest extends UrlMatcherTest
 {
@@ -27,6 +27,16 @@ class RedirectableUrlMatcherTest extends UrlMatcherTest
         $matcher->match('/foo');
     }
 
+    public function testExtraTrailingSlash()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo'));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $matcher->expects($this->once())->method('redirect')->will($this->returnValue(array()));
+        $matcher->match('/foo/');
+    }
+
     /**
      * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
      */
@@ -83,6 +93,20 @@ class RedirectableUrlMatcherTest extends UrlMatcherTest
         $this->assertEquals(array('_route' => 'foo', 'bar' => 'baz', 'redirect' => 'value'), $matcher->match('/foo/baz'));
     }
 
+    public function testSchemeRedirectForRoot()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/', array(), array(), array(), '', array('https')));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $matcher
+            ->expects($this->once())
+            ->method('redirect')
+            ->with('/', 'foo', 'https')
+            ->will($this->returnValue(array('redirect' => 'value')));
+        $this->assertEquals(array('_route' => 'foo', 'redirect' => 'value'), $matcher->match('/'));
+    }
+
     public function testSlashRedirectWithParams()
     {
         $coll = new RouteCollection();
@@ -117,6 +141,16 @@ class RedirectableUrlMatcherTest extends UrlMatcherTest
         $this->assertSame(array('_route' => 'foo'), $matcher->match('/foo'));
     }
 
+    public function testMissingTrailingSlashAndScheme()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', (new Route('/foo/'))->setSchemes(array('https')));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $matcher->expects($this->once())->method('redirect')->with('/foo/', 'foo', 'https')->will($this->returnValue(array()));
+        $matcher->match('/foo');
+    }
+
     protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null)
     {
         return $this->getMockForAbstractClass('Symfony\Component\Routing\Matcher\RedirectableUrlMatcher', array($routes, $context ?: new RequestContext()));
diff --git a/vendor/symfony/routing/Tests/Matcher/TraceableUrlMatcherTest.php b/vendor/symfony/routing/Tests/Matcher/TraceableUrlMatcherTest.php
index 9f0529e2..1f026a6e 100644
--- a/vendor/symfony/routing/Tests/Matcher/TraceableUrlMatcherTest.php
+++ b/vendor/symfony/routing/Tests/Matcher/TraceableUrlMatcherTest.php
@@ -13,10 +13,10 @@ namespace Symfony\Component\Routing\Tests\Matcher;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Matcher\TraceableUrlMatcher;
+use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\RequestContext;
-use Symfony\Component\Routing\Matcher\TraceableUrlMatcher;
 
 class TraceableUrlMatcherTest extends TestCase
 {
diff --git a/vendor/symfony/routing/Tests/Matcher/UrlMatcherTest.php b/vendor/symfony/routing/Tests/Matcher/UrlMatcherTest.php
index e8d31e22..c1add962 100644
--- a/vendor/symfony/routing/Tests/Matcher/UrlMatcherTest.php
+++ b/vendor/symfony/routing/Tests/Matcher/UrlMatcherTest.php
@@ -15,9 +15,9 @@ use PHPUnit\Framework\TestCase;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\Matcher\UrlMatcher;
+use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\RequestContext;
 
 class UrlMatcherTest extends TestCase
 {
@@ -245,6 +245,18 @@ class UrlMatcherTest extends TestCase
         }
     }
 
+    public function testMultipleParams()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo1', new Route('/foo/{a}/{b}'));
+        $coll->add('foo2', new Route('/foo/{a}/test/test/{b}'));
+        $coll->add('foo3', new Route('/foo/{a}/{b}/{c}/{d}'));
+
+        $route = $this->getUrlMatcher($coll)->match('/foo/test/test/test/bar')['_route'];
+
+        $this->assertEquals('foo2', $route);
+    }
+
     public function testDefaultRequirementForOptionalVariables()
     {
         $coll = new RouteCollection();
@@ -340,6 +352,58 @@ class UrlMatcherTest extends TestCase
         $matcher->match('/do.t.html');
     }
 
+    /**
+     * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
+     */
+    public function testMissingTrailingSlash()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo/'));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $matcher->match('/foo');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
+     */
+    public function testExtraTrailingSlash()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo'));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $matcher->match('/foo/');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
+     */
+    public function testMissingTrailingSlashForNonSafeMethod()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo/'));
+
+        $context = new RequestContext();
+        $context->setMethod('POST');
+        $matcher = $this->getUrlMatcher($coll, $context);
+        $matcher->match('/foo');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
+     */
+    public function testExtraTrailingSlashForNonSafeMethod()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo'));
+
+        $context = new RequestContext();
+        $context->setMethod('POST');
+        $matcher = $this->getUrlMatcher($coll, $context);
+        $matcher->match('/foo/');
+    }
+
     /**
      * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
      */
@@ -351,6 +415,29 @@ class UrlMatcherTest extends TestCase
         $matcher->match('/foo');
     }
 
+    /**
+     * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
+     */
+    public function testSchemeRequirementForNonSafeMethod()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo', array(), array(), array(), '', array('https')));
+
+        $context = new RequestContext();
+        $context->setMethod('POST');
+        $matcher = $this->getUrlMatcher($coll, $context);
+        $matcher->match('/foo');
+    }
+
+    public function testSamePathWithDifferentScheme()
+    {
+        $coll = new RouteCollection();
+        $coll->add('https_route', new Route('/', array(), array(), array(), '', array('https')));
+        $coll->add('http_route', new Route('/', array(), array(), array(), '', array('http')));
+        $matcher = $this->getUrlMatcher($coll);
+        $this->assertEquals(array('_route' => 'http_route'), $matcher->match('/'));
+    }
+
     /**
      * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
      */
@@ -502,6 +589,97 @@ class UrlMatcherTest extends TestCase
         $matcher->match('/');
     }
 
+    public function testSiblingRoutes()
+    {
+        $coll = new RouteCollection();
+        $coll->add('a', (new Route('/a{a}'))->setMethods('POST'));
+        $coll->add('b', (new Route('/a{a}'))->setMethods('PUT'));
+        $coll->add('c', new Route('/a{a}'));
+        $coll->add('d', (new Route('/b{a}'))->setCondition('false'));
+        $coll->add('e', (new Route('/{b}{a}'))->setCondition('false'));
+        $coll->add('f', (new Route('/{b}{a}'))->setRequirements(array('b' => 'b')));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $this->assertEquals(array('_route' => 'c', 'a' => 'a'), $matcher->match('/aa'));
+        $this->assertEquals(array('_route' => 'f', 'b' => 'b', 'a' => 'a'), $matcher->match('/ba'));
+    }
+
+    public function testUnicodeRoute()
+    {
+        $coll = new RouteCollection();
+        $coll->add('a', new Route('/{a}', array(), array('a' => '.'), array('utf8' => false)));
+        $coll->add('b', new Route('/{a}', array(), array('a' => '.'), array('utf8' => true)));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $this->assertEquals(array('_route' => 'b', 'a' => 'é'), $matcher->match('/é'));
+    }
+
+    public function testRequirementWithCapturingGroup()
+    {
+        $coll = new RouteCollection();
+        $coll->add('a', new Route('/{a}/{b}', array(), array('a' => '(a|b)')));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $this->assertEquals(array('_route' => 'a', 'a' => 'a', 'b' => 'b'), $matcher->match('/a/b'));
+    }
+
+    public function testDotAllWithCatchAll()
+    {
+        $coll = new RouteCollection();
+        $coll->add('a', new Route('/{id}.html', array(), array('id' => '.+')));
+        $coll->add('b', new Route('/{all}', array(), array('all' => '.+')));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $this->assertEquals(array('_route' => 'a', 'id' => 'foo/bar'), $matcher->match('/foo/bar.html'));
+    }
+
+    public function testHostPattern()
+    {
+        $coll = new RouteCollection();
+        $coll->add('a', new Route('/{app}/{action}/{unused}', array(), array(), array(), '{host}'));
+
+        $expected = array(
+            '_route' => 'a',
+            'app' => 'an_app',
+            'action' => 'an_action',
+            'unused' => 'unused',
+            'host' => 'foo',
+        );
+        $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'foo'));
+        $this->assertEquals($expected, $matcher->match('/an_app/an_action/unused'));
+    }
+
+    public function testUtf8Prefix()
+    {
+        $coll = new RouteCollection();
+        $coll->add('a', new Route('/é{foo}', array(), array(), array('utf8' => true)));
+        $coll->add('b', new Route('/è{bar}', array(), array(), array('utf8' => true)));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $this->assertEquals('a', $matcher->match('/éo')['_route']);
+    }
+
+    public function testUtf8AndMethodMatching()
+    {
+        $coll = new RouteCollection();
+        $coll->add('a', new Route('/admin/api/list/{shortClassName}/{id}.{_format}', array(), array(), array('utf8' => true), '', array(), array('PUT')));
+        $coll->add('b', new Route('/admin/api/package.{_format}', array(), array(), array(), '', array(), array('POST')));
+        $coll->add('c', new Route('/admin/api/package.{_format}', array('_format' => 'json'), array(), array(), '', array(), array('GET')));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $this->assertEquals('c', $matcher->match('/admin/api/package.json')['_route']);
+    }
+
+    public function testHostWithDot()
+    {
+        $coll = new RouteCollection();
+        $coll->add('a', new Route('/foo', array(), array(), array(), 'foo.example.com'));
+        $coll->add('b', new Route('/bar/{baz}'));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $this->assertEquals('b', $matcher->match('/bar/abc.123')['_route']);
+    }
+
     protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null)
     {
         return new UrlMatcher($routes, $context ?: new RequestContext());
diff --git a/vendor/symfony/routing/Tests/RouteCollectionTest.php b/vendor/symfony/routing/Tests/RouteCollectionTest.php
index 83457ff1..dd477326 100644
--- a/vendor/symfony/routing/Tests/RouteCollectionTest.php
+++ b/vendor/symfony/routing/Tests/RouteCollectionTest.php
@@ -12,9 +12,9 @@
 namespace Symfony\Component\Routing\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\Route;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
 
 class RouteCollectionTest extends TestCase
 {
@@ -302,4 +302,32 @@ class RouteCollectionTest extends TestCase
         $this->assertEquals(array('PUT'), $routea->getMethods());
         $this->assertEquals(array('PUT'), $routeb->getMethods());
     }
+
+    public function testAddNamePrefix()
+    {
+        $collection = new RouteCollection();
+        $collection->add('foo', $foo = new Route('/foo'));
+        $collection->add('bar', $bar = new Route('/bar'));
+        $collection->add('api_foo', $apiFoo = new Route('/api/foo'));
+        $collection->addNamePrefix('api_');
+
+        $this->assertEquals($foo, $collection->get('api_foo'));
+        $this->assertEquals($bar, $collection->get('api_bar'));
+        $this->assertEquals($apiFoo, $collection->get('api_api_foo'));
+        $this->assertNull($collection->get('foo'));
+        $this->assertNull($collection->get('bar'));
+    }
+
+    public function testAddNamePrefixCanonicalRouteName()
+    {
+        $collection = new RouteCollection();
+        $collection->add('foo', new Route('/foo', array('_canonical_route' => 'foo')));
+        $collection->add('bar', new Route('/bar', array('_canonical_route' => 'bar')));
+        $collection->add('api_foo', new Route('/api/foo', array('_canonical_route' => 'api_foo')));
+        $collection->addNamePrefix('api_');
+
+        $this->assertEquals('api_foo', $collection->get('api_foo')->getDefault('_canonical_route'));
+        $this->assertEquals('api_bar', $collection->get('api_bar')->getDefault('_canonical_route'));
+        $this->assertEquals('api_api_foo', $collection->get('api_api_foo')->getDefault('_canonical_route'));
+    }
 }
diff --git a/vendor/symfony/routing/Tests/RouteCompilerTest.php b/vendor/symfony/routing/Tests/RouteCompilerTest.php
index dc304e3e..04bcdac9 100644
--- a/vendor/symfony/routing/Tests/RouteCompilerTest.php
+++ b/vendor/symfony/routing/Tests/RouteCompilerTest.php
@@ -110,8 +110,8 @@ class RouteCompilerTest extends TestCase
             array(
                 'Route with an optional variable as the first segment with requirements',
                 array('/{bar}', array('bar' => 'bar'), array('bar' => '(foo|bar)')),
-                '', '#^/(?P<bar>(foo|bar))?$#sD', array('bar'), array(
-                    array('variable', '/', '(foo|bar)', 'bar'),
+                '', '#^/(?P<bar>(?:foo|bar))?$#sD', array('bar'), array(
+                    array('variable', '/', '(?:foo|bar)', 'bar'),
                 ),
             ),
 
@@ -146,10 +146,10 @@ class RouteCompilerTest extends TestCase
             array(
                 'Route without separator between variables',
                 array('/{w}{x}{y}{z}.{_format}', array('z' => 'default-z', '_format' => 'html'), array('y' => '(y|Y)')),
-                '', '#^/(?P<w>[^/\.]+)(?P<x>[^/\.]+)(?P<y>(y|Y))(?:(?P<z>[^/\.]++)(?:\.(?P<_format>[^/]++))?)?$#sD', array('w', 'x', 'y', 'z', '_format'), array(
+                '', '#^/(?P<w>[^/\.]+)(?P<x>[^/\.]+)(?P<y>(?:y|Y))(?:(?P<z>[^/\.]++)(?:\.(?P<_format>[^/]++))?)?$#sD', array('w', 'x', 'y', 'z', '_format'), array(
                     array('variable', '.', '[^/]++', '_format'),
                     array('variable', '', '[^/\.]++', 'z'),
-                    array('variable', '', '(y|Y)', 'y'),
+                    array('variable', '', '(?:y|Y)', 'y'),
                     array('variable', '', '[^/\.]+', 'x'),
                     array('variable', '/', '[^/\.]+', 'w'),
                 ),
@@ -184,9 +184,8 @@ class RouteCompilerTest extends TestCase
     }
 
     /**
-     * @group legacy
      * @dataProvider provideCompileImplicitUtf8Data
-     * @expectedDeprecation Using UTF-8 route %s without setting the "utf8" option is deprecated %s.
+     * @expectedException \LogicException
      */
     public function testCompileImplicitUtf8Data($name, $arguments, $prefix, $regex, $variables, $tokens, $deprecationType)
     {
@@ -381,6 +380,26 @@ class RouteCompilerTest extends TestCase
         $route = new Route(sprintf('/{%s}', str_repeat('a', RouteCompiler::VARIABLE_MAXIMUM_LENGTH + 1)));
         $route->compile();
     }
+
+    /**
+     * @dataProvider provideRemoveCapturingGroup
+     */
+    public function testRemoveCapturingGroup($regex, $requirement)
+    {
+        $route = new Route('/{foo}', array(), array('foo' => $requirement));
+
+        $this->assertSame($regex, $route->compile()->getRegex());
+    }
+
+    public function provideRemoveCapturingGroup()
+    {
+        yield array('#^/(?P<foo>a(?:b|c)(?:d|e)f)$#sD', 'a(b|c)(d|e)f');
+        yield array('#^/(?P<foo>a\(b\)c)$#sD', 'a\(b\)c');
+        yield array('#^/(?P<foo>(?:b))$#sD', '(?:b)');
+        yield array('#^/(?P<foo>(?(b)b))$#sD', '(?(b)b)');
+        yield array('#^/(?P<foo>(*F))$#sD', '(*F)');
+        yield array('#^/(?P<foo>(?:(?:foo)))$#sD', '((foo))');
+    }
 }
 
 class Utf8RouteCompiler extends RouteCompiler
diff --git a/vendor/symfony/routing/Tests/RouteTest.php b/vendor/symfony/routing/Tests/RouteTest.php
index c7af058e..e28cdaf5 100644
--- a/vendor/symfony/routing/Tests/RouteTest.php
+++ b/vendor/symfony/routing/Tests/RouteTest.php
@@ -203,6 +203,22 @@ class RouteTest extends TestCase
         $this->assertNotSame($route, $unserialized);
     }
 
+    public function testInlineDefaultAndRequirement()
+    {
+        $this->assertEquals((new Route('/foo/{bar}'))->setDefault('bar', null), new Route('/foo/{bar?}'));
+        $this->assertEquals((new Route('/foo/{bar}'))->setDefault('bar', 'baz'), new Route('/foo/{bar?baz}'));
+        $this->assertEquals((new Route('/foo/{bar}'))->setDefault('bar', 'baz<buz>'), new Route('/foo/{bar?baz<buz>}'));
+        $this->assertEquals((new Route('/foo/{bar}'))->setDefault('bar', 'baz'), new Route('/foo/{bar?}', array('bar' => 'baz')));
+
+        $this->assertEquals((new Route('/foo/{bar}'))->setRequirement('bar', '.*'), new Route('/foo/{bar<.*>}'));
+        $this->assertEquals((new Route('/foo/{bar}'))->setRequirement('bar', '>'), new Route('/foo/{bar<>>}'));
+        $this->assertEquals((new Route('/foo/{bar}'))->setRequirement('bar', '\d+'), new Route('/foo/{bar<.*>}', array(), array('bar' => '\d+')));
+        $this->assertEquals((new Route('/foo/{bar}'))->setRequirement('bar', '[a-z]{2}'), new Route('/foo/{bar<[a-z]{2}>}'));
+
+        $this->assertEquals((new Route('/foo/{bar}'))->setDefault('bar', null)->setRequirement('bar', '.*'), new Route('/foo/{bar<.*>?}'));
+        $this->assertEquals((new Route('/foo/{bar}'))->setDefault('bar', '<>')->setRequirement('bar', '>'), new Route('/foo/{bar<>>?<>}'));
+    }
+
     /**
      * Tests that the compiled version is also serialized to prevent the overhead
      * of compiling it again after unserialize.
diff --git a/vendor/symfony/routing/Tests/RouterTest.php b/vendor/symfony/routing/Tests/RouterTest.php
index 3e3d43f8..e01bd9c6 100644
--- a/vendor/symfony/routing/Tests/RouterTest.php
+++ b/vendor/symfony/routing/Tests/RouterTest.php
@@ -12,9 +12,9 @@
 namespace Symfony\Component\Routing\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\Router;
-use Symfony\Component\HttpFoundation\Request;
 
 class RouterTest extends TestCase
 {
diff --git a/vendor/symfony/routing/composer.json b/vendor/symfony/routing/composer.json
index 4d820cc2..052b0e11 100644
--- a/vendor/symfony/routing/composer.json
+++ b/vendor/symfony/routing/composer.json
@@ -16,21 +16,20 @@
         }
     ],
     "require": {
-        "php": "^5.5.9|>=7.0.8"
+        "php": "^7.1.3"
     },
     "require-dev": {
-        "symfony/config": "^3.3.1|~4.0",
-        "symfony/http-foundation": "~2.8|~3.0|~4.0",
+        "symfony/config": "~3.4|~4.0",
+        "symfony/http-foundation": "~3.4|~4.0",
         "symfony/yaml": "~3.4|~4.0",
-        "symfony/expression-language": "~2.8|~3.0|~4.0",
-        "symfony/dependency-injection": "~3.3|~4.0",
+        "symfony/expression-language": "~3.4|~4.0",
+        "symfony/dependency-injection": "~3.4|~4.0",
         "doctrine/annotations": "~1.0",
-        "doctrine/common": "~2.2",
         "psr/log": "~1.0"
     },
     "conflict": {
-        "symfony/config": "<3.3.1",
-        "symfony/dependency-injection": "<3.3",
+        "symfony/config": "<3.4",
+        "symfony/dependency-injection": "<3.4",
         "symfony/yaml": "<3.4"
     },
     "suggest": {
@@ -50,7 +49,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "3.4-dev"
+            "dev-master": "4.1-dev"
         }
     }
 }
diff --git a/vendor/symfony/thanks/src/Command/ThanksCommand.php b/vendor/symfony/thanks/src/Command/ThanksCommand.php
index cafbb933..9e72a74f 100644
--- a/vendor/symfony/thanks/src/Command/ThanksCommand.php
+++ b/vendor/symfony/thanks/src/Command/ThanksCommand.php
@@ -12,96 +12,25 @@
 namespace Symfony\Thanks\Command;
 
 use Composer\Command\BaseCommand;
-use Composer\Composer;
-use Composer\Downloader\TransportException;
-use Composer\Json\JsonFile;
-use Composer\Util\RemoteFilesystem;
-use Composer\Factory;
-use Composer\Plugin\PluginEvents;
-use Composer\Plugin\PreFileDownloadEvent;
-use Hirak\Prestissimo\CurlRemoteFilesystem;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Thanks\GitHubClient;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
 class ThanksCommand extends BaseCommand
 {
-    // This is a list of projects that should get a star on their main repository
-    // (when there is one) whenever you use any of their other repositories.
-    // When a project's main repo is also a dependency of their other repos (like amphp/amp),
-    // there is no need to list it here, as starring will transitively happen anyway.
-    private static $mainRepositories = [
-        'api-platform' => [
-            'name' => 'api-platform/api-platform',
-            'url' => 'https://github.com/api-platform/api-platform',
-        ],
-        'cakephp' => [
-            'name' => 'cakephp/cakephp',
-            'url' => 'https://github.com/cakephp/cakephp',
-        ],
-        'drupal' => [
-            'name' => 'drupal/drupal',
-            'url' => 'https://github.com/drupal/drupal',
-        ],
-        'laravel' => [
-            'name' => 'laravel/laravel',
-            'url' => 'https://github.com/laravel/laravel',
-        ],
-        'illuminate' => [
-            'name' => 'laravel/laravel',
-            'url' => 'https://github.com/laravel/laravel',
-        ],
-        'nette' => [
-            'name' => 'nette/nette',
-            'url' => 'https://github.com/nette/nette',
-        ],
-        'phpDocumentor' => [
-            'name' => 'phpDocumentor/phpDocumentor2',
-            'url' => 'https://github.com/phpDocumentor/phpDocumentor2',
-        ],
-        'piwik' => [
-            'name' => 'piwik/piwik',
-            'url' => 'https://github.com/piwik/piwik',
-        ],
-        'reactphp' => [
-            'name' => 'reactphp/react',
-            'url' => 'https://github.com/reactphp/react',
-        ],
-        'sebastianbergmann' => [
-            'name' => 'phpunit/phpunit',
-            'url' => 'https://github.com/sebastianbergmann/phpunit',
-        ],
-        'slimphp' => [
-            'name' => 'slimphp/Slim',
-            'url' => 'https://github.com/slimphp/Slim',
-        ],
-        'Sylius' => [
-            'name' => 'Sylius/Sylius',
-            'url' => 'https://github.com/Sylius/Sylius',
-        ],
-        'symfony' => [
-            'name' => 'symfony/symfony',
-            'url' => 'https://github.com/symfony/symfony',
-        ],
-        'yiisoft' => [
-            'name' => 'yiisoft/yii2',
-            'url' => 'https://github.com/yiisoft/yii2',
-        ],
-        'zendframework' => [
-            'name' => 'zendframework/zendframework',
-            'url' => 'https://github.com/zendframework/zendframework',
-        ],
-    ];
-
     private $star = '★ ';
     private $love = '💖 ';
 
     protected function configure()
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
+        if ('Hyper' === getenv('TERM_PROGRAM')) {
+            $this->star = '⭐ ';
+            $this->love = '💖 ';
+        } elseif ('\\' === \DIRECTORY_SEPARATOR) {
             $this->star = '*';
             $this->love = '<3';
         }
@@ -117,59 +46,9 @@ class ThanksCommand extends BaseCommand
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $composer = $this->getComposer();
-        $repo = $composer->getRepositoryManager()->getLocalRepository();
-
-        $urls = [
-            'composer/composer' => 'https://github.com/composer/composer',
-            'php/php-src' => 'https://github.com/php/php-src',
-            'symfony/thanks' => 'https://github.com/symfony/thanks',
-        ];
-
-        $directPackages = $this->getDirectlyRequiredPackageNames();
-        // symfony/thanks shouldn't trigger thanking symfony/symfony
-        unset($directPackages['symfony/thanks']);
-        foreach ($repo->getPackages() as $package) {
-            $extra = $package->getExtra();
+        $gitHub = new GitHubClient($composer, $this->getIO());
 
-            if (isset($extra['thanks']['name'], $extra['thanks']['url'])) {
-                $urls += [$extra['thanks']['name'] => $extra['thanks']['url']];
-            }
-
-            if (!$url = $package->getSourceUrl()) {
-                continue;
-            }
-
-            $urls[$package->getName()] = $url;
-
-            if (!preg_match('#^https://github.com/([^/]++)#', $url, $url)) {
-                continue;
-            }
-            $owner = $url[1];
-
-            // star the main repository, but only if this package is directly
-            // being required by the user's composer.json
-            if (isset(self::$mainRepositories[$owner], $directPackages[$package->getName()])) {
-                $urls[self::$mainRepositories[$owner]['name']] = self::$mainRepositories[$owner]['url'];
-            }
-        }
-
-        ksort($urls);
-
-        $rfs = Factory::createRemoteFilesystem($this->getIo(), $composer->getConfig());
-
-        $i = 0;
-        $template = '_%d: repository(owner:"%s",name:"%s"){id,viewerHasStarred}'."\n";
-        $graphql = '';
-
-        foreach ($urls as $package => $url) {
-            if (preg_match('#^https://github.com/([^/]++)/([^./]++)#', $url, $url)) {
-                $graphql .= sprintf($template, ++$i, $url[1], $url[2]);
-                $aliases['_'.$i] = [$package, $url[0]];
-            }
-        }
-
-        $failures = [];
-        $repos = $this->callGitHub($rfs, sprintf("query{\n%s}", $graphql), $failures);
+        $repos = $gitHub->getRepositories($failures);
 
         $template = '%1$s: addStar(input:{clientMutationId:"%s",starrableId:"%s"}){clientMutationId}'."\n";
         $graphql = '';
@@ -186,12 +65,12 @@ class ThanksCommand extends BaseCommand
             $output->writeln('You already starred all your GitHub dependencies.');
         } else {
             if (!$input->getOption('dry-run')) {
-                $notStarred = $this->callGitHub($rfs, sprintf("mutation{\n%s}", $graphql));
+                $notStarred = $gitHub->call(sprintf("mutation{\n%s}", $graphql));
             }
 
             $output->writeln('Stars <comment>sent</> to:');
             foreach ($repos as $alias => $repo) {
-                $output->writeln(sprintf(' %s %s - %s', $this->star, sprintf(isset($notStarred[$alias]) ? '<comment>%s</>' : '%s', $aliases[$alias][0]), $aliases[$alias][1]));
+                $output->writeln(sprintf(' %s %s - %s', $this->star, sprintf(isset($notStarred[$alias]) ? '<comment>%s</>' : '%s', $repo['package']), $repo['url']));
             }
         }
 
@@ -199,63 +78,16 @@ class ThanksCommand extends BaseCommand
             $output->writeln('');
             $output->writeln('Some repositories could not be starred, please run <info>composer update</info> and try again:');
 
-            foreach ($failures as $alias => $message) {
-                $output->writeln(sprintf(' * %s - %s', $aliases[$alias][1], $message));
+            foreach ($failures as $alias => $failure) {
+                foreach ($failure['messages'] as $message) {
+                    $output->writeln(sprintf(' * %s - %s', $failure['url'], $message));
+                }
             }
         }
 
         $output->writeln(sprintf("\nThanks to you! %s", $this->love));
-        $output->writeln("Please consider contributing back in any way if you can!");
+        $output->writeln('Please consider contributing back in any way if you can!');
 
         return 0;
     }
-
-    private function callGitHub(RemoteFilesystem $rfs, $graphql, &$failures = [])
-    {
-        if ($eventDispatcher = $this->getComposer()->getEventDispatcher()) {
-            $preFileDownloadEvent = new PreFileDownloadEvent(PluginEvents::PRE_FILE_DOWNLOAD, $rfs, 'https://api.github.com/graphql');
-            $eventDispatcher->dispatch($preFileDownloadEvent->getName(), $preFileDownloadEvent);
-            if (!$preFileDownloadEvent->getRemoteFilesystem() instanceof CurlRemoteFilesystem) {
-                $rfs = $preFileDownloadEvent->getRemoteFilesystem();
-            }
-        }
-
-        $result = $rfs->getContents('github.com', 'https://api.github.com/graphql', false, [
-            'http' => [
-                'method' => 'POST',
-                'content' => json_encode(['query' => $graphql]),
-                'header' => ['Content-Type: application/json'],
-            ],
-        ]);
-        $result = json_decode($result, true);
-
-        if (isset($result['errors'][0]['message'])) {
-            if (!$result['data']) {
-                throw new TransportException($result['errors'][0]['message']);
-            }
-
-            foreach ($result['errors'] as $error) {
-                foreach ($error['path'] as $path) {
-                    $failures += [$path => $error['message']];
-                    unset($result['data'][$path]);
-                }
-            }
-        }
-
-        return $result['data'];
-    }
-
-    private function getDirectlyRequiredPackageNames()
-    {
-        $file = new JsonFile(Factory::getComposerFile(), null, $this->getIO());
-
-        if (!$file->exists()) {
-            throw new \Exception('Could not find your composer.json file!');
-        }
-
-        $data = $file->read() + ['require' => [], 'require-dev' => []];
-        $data = array_keys($data['require'] + $data['require-dev']);
-
-        return array_combine($data, $data);
-    }
 }
diff --git a/vendor/symfony/thanks/src/GitHubClient.php b/vendor/symfony/thanks/src/GitHubClient.php
new file mode 100644
index 00000000..9c4b9683
--- /dev/null
+++ b/vendor/symfony/thanks/src/GitHubClient.php
@@ -0,0 +1,227 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Thanks;
+
+use Composer\Composer;
+use Composer\Downloader\TransportException;
+use Composer\Factory;
+use Composer\IO\IOInterface;
+use Composer\Json\JsonFile;
+use Composer\Plugin\PluginEvents;
+use Composer\Plugin\PreFileDownloadEvent;
+use Hirak\Prestissimo\CurlRemoteFilesystem;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class GitHubClient
+{
+    // This is a list of projects that should get a star on their main repository
+    // (when there is one) whenever you use any of their other repositories.
+    // When a project's main repo is also a dependency of their other repos (like amphp/amp),
+    // there is no need to list it here, as starring will transitively happen anyway.
+    private static $mainRepositories = [
+        'api-platform' => [
+            'name' => 'api-platform/api-platform',
+            'url' => 'https://github.com/api-platform/api-platform',
+        ],
+        'cakephp' => [
+            'name' => 'cakephp/cakephp',
+            'url' => 'https://github.com/cakephp/cakephp',
+        ],
+        'drupal' => [
+            'name' => 'drupal/drupal',
+            'url' => 'https://github.com/drupal/drupal',
+        ],
+        'laravel' => [
+            'name' => 'laravel/laravel',
+            'url' => 'https://github.com/laravel/laravel',
+        ],
+        'illuminate' => [
+            'name' => 'laravel/laravel',
+            'url' => 'https://github.com/laravel/laravel',
+        ],
+        'nette' => [
+            'name' => 'nette/nette',
+            'url' => 'https://github.com/nette/nette',
+        ],
+        'phpDocumentor' => [
+            'name' => 'phpDocumentor/phpDocumentor2',
+            'url' => 'https://github.com/phpDocumentor/phpDocumentor2',
+        ],
+        'piwik' => [
+            'name' => 'piwik/piwik',
+            'url' => 'https://github.com/piwik/piwik',
+        ],
+        'reactphp' => [
+            'name' => 'reactphp/react',
+            'url' => 'https://github.com/reactphp/react',
+        ],
+        'sebastianbergmann' => [
+            'name' => 'phpunit/phpunit',
+            'url' => 'https://github.com/sebastianbergmann/phpunit',
+        ],
+        'slimphp' => [
+            'name' => 'slimphp/Slim',
+            'url' => 'https://github.com/slimphp/Slim',
+        ],
+        'Sylius' => [
+            'name' => 'Sylius/Sylius',
+            'url' => 'https://github.com/Sylius/Sylius',
+        ],
+        'symfony' => [
+            'name' => 'symfony/symfony',
+            'url' => 'https://github.com/symfony/symfony',
+        ],
+        'yiisoft' => [
+            'name' => 'yiisoft/yii2',
+            'url' => 'https://github.com/yiisoft/yii2',
+        ],
+        'zendframework' => [
+            'name' => 'zendframework/zendframework',
+            'url' => 'https://github.com/zendframework/zendframework',
+        ],
+    ];
+
+    private $composer;
+    private $io;
+    private $rfs;
+
+    public function __construct(Composer $composer, IOInterface $io)
+    {
+        $this->composer = $composer;
+        $this->io = $io;
+        $this->rfs = Factory::createRemoteFilesystem($io, $composer->getConfig());
+    }
+
+    public function getRepositories(array &$failures = null)
+    {
+        $repo = $this->composer->getRepositoryManager()->getLocalRepository();
+
+        $urls = [
+            'composer/composer' => 'https://github.com/composer/composer',
+            'php/php-src' => 'https://github.com/php/php-src',
+            'symfony/thanks' => 'https://github.com/symfony/thanks',
+        ];
+
+        $directPackages = $this->getDirectlyRequiredPackageNames();
+        // symfony/thanks shouldn't trigger thanking symfony/symfony
+        unset($directPackages['symfony/thanks']);
+        foreach ($repo->getPackages() as $package) {
+            $extra = $package->getExtra();
+
+            if (isset($extra['thanks']['name'], $extra['thanks']['url'])) {
+                $urls += [$extra['thanks']['name'] => $extra['thanks']['url']];
+            }
+
+            if (!$url = $package->getSourceUrl()) {
+                continue;
+            }
+
+            $urls[$package->getName()] = $url;
+
+            if (!preg_match('#^https://github.com/([^/]++)#', $url, $url)) {
+                continue;
+            }
+            $owner = $url[1];
+
+            // star the main repository, but only if this package is directly
+            // being required by the user's composer.json
+            if (isset(self::$mainRepositories[$owner], $directPackages[$package->getName()])) {
+                $urls[self::$mainRepositories[$owner]['name']] = self::$mainRepositories[$owner]['url'];
+            }
+        }
+
+        ksort($urls);
+
+        $i = 0;
+        $template = '_%d: repository(owner:"%s",name:"%s"){id,viewerHasStarred}'."\n";
+        $graphql = '';
+
+        foreach ($urls as $package => $url) {
+            if (preg_match('#^https://github.com/([^/]++)/(.*?)(?:\.git)?$#i', $url, $url)) {
+                $graphql .= sprintf($template, ++$i, $url[1], $url[2]);
+                $aliases['_'.$i] = [$package, $url[0]];
+            }
+        }
+
+        $failures = [];
+        $repos = [];
+
+        foreach ($this->call(sprintf("query{\n%s}", $graphql), $failures) as $alias => $repo) {
+            $repo['package'] = $aliases[$alias][0];
+            $repo['url'] = $aliases[$alias][1];
+            $repos[$alias] = $repo;
+        }
+
+        foreach ($failures as $alias => $messages) {
+            $failures[$alias] = [
+                'messages' => $messages,
+                'package' => $aliases[$alias][0],
+                'url' => $aliases[$alias][1],
+            ];
+        }
+
+        return $repos;
+    }
+
+    public function call($graphql, array &$failures = [])
+    {
+        $rfs = $this->rfs;
+
+        if ($eventDispatcher = $this->composer->getEventDispatcher()) {
+            $preFileDownloadEvent = new PreFileDownloadEvent(PluginEvents::PRE_FILE_DOWNLOAD, $rfs, 'https://api.github.com/graphql');
+            $eventDispatcher->dispatch($preFileDownloadEvent->getName(), $preFileDownloadEvent);
+            if (!$preFileDownloadEvent->getRemoteFilesystem() instanceof CurlRemoteFilesystem) {
+                $rfs = $preFileDownloadEvent->getRemoteFilesystem();
+            }
+        }
+
+        $result = $rfs->getContents('github.com', 'https://api.github.com/graphql', false, [
+            'http' => [
+                'method' => 'POST',
+                'content' => json_encode(['query' => $graphql]),
+                'header' => ['Content-Type: application/json'],
+            ],
+        ]);
+        $result = json_decode($result, true);
+
+        if (isset($result['errors'][0]['message'])) {
+            if (!$result['data']) {
+                throw new TransportException($result['errors'][0]['message']);
+            }
+
+            foreach ($result['errors'] as $error) {
+                foreach ($error['path'] as $path) {
+                    $failures += [$path => $error['message']];
+                    unset($result['data'][$path]);
+                }
+            }
+        }
+
+        return $result['data'];
+    }
+
+    private function getDirectlyRequiredPackageNames()
+    {
+        $file = new JsonFile(Factory::getComposerFile(), null, $this->io);
+
+        if (!$file->exists()) {
+            throw new \Exception('Could not find your composer.json file!');
+        }
+
+        $data = $file->read() + ['require' => [], 'require-dev' => []];
+        $data = array_keys($data['require'] + $data['require-dev']);
+
+        return array_combine($data, $data);
+    }
+}
diff --git a/vendor/symfony/thanks/src/Thanks.php b/vendor/symfony/thanks/src/Thanks.php
index b9935408..a354420e 100644
--- a/vendor/symfony/thanks/src/Thanks.php
+++ b/vendor/symfony/thanks/src/Thanks.php
@@ -73,12 +73,28 @@ class Thanks implements EventSubscriberInterface, PluginInterface
             return;
         }
 
-        $love = '\\' === DIRECTORY_SEPARATOR ? 'love' : '💖 ';
-        $star = '\\' === DIRECTORY_SEPARATOR ? 'star' : '★ ';
+        $gitHub = new GitHubClient($event->getComposer(), $event->getIO());
+
+        $notStarred = 0;
+        foreach ($gitHub->getRepositories() as $repo) {
+            $notStarred += (int) !$repo['viewerHasStarred'];
+        }
+
+        if (!$notStarred) {
+            return;
+        }
+
+        if ('Hyper' === getenv('TERM_PROGRAM')) {
+            $love = '💖 ';
+            $star = '⭐ ';
+        } else {
+            $love = '\\' === \DIRECTORY_SEPARATOR ? 'love' : '💖 ';
+            $star = '\\' === \DIRECTORY_SEPARATOR ? 'star' : '★ ';
+        }
 
         $this->io->writeError('');
         $this->io->writeError('What about running <comment>composer thanks</> now?');
-        $this->io->writeError(sprintf('This will spread some %s by sending a %s to the GitHub repositories of your fellow package maintainers.', $love, $star));
+        $this->io->writeError(sprintf('This will spread some %s by sending a %s to <comment>%d</comment> GitHub repositor%s of your fellow package maintainers.', $love, $star, $notStarred, 1 < $notStarred ? 'ies' : 'y'));
         $this->io->writeError('');
     }
 
diff --git a/vendor/symfony/translation/Catalogue/AbstractOperation.php b/vendor/symfony/translation/Catalogue/AbstractOperation.php
index 022bad48..a0765ddd 100644
--- a/vendor/symfony/translation/Catalogue/AbstractOperation.php
+++ b/vendor/symfony/translation/Catalogue/AbstractOperation.php
@@ -11,10 +11,10 @@
 
 namespace Symfony\Component\Translation\Catalogue;
 
-use Symfony\Component\Translation\MessageCatalogue;
-use Symfony\Component\Translation\MessageCatalogueInterface;
 use Symfony\Component\Translation\Exception\InvalidArgumentException;
 use Symfony\Component\Translation\Exception\LogicException;
+use Symfony\Component\Translation\MessageCatalogue;
+use Symfony\Component\Translation\MessageCatalogueInterface;
 
 /**
  * Base catalogues binary operation class.
@@ -31,7 +31,7 @@ abstract class AbstractOperation implements OperationInterface
     protected $result;
 
     /**
-     * @var null|array The domains affected by this operation
+     * @var array|null The domains affected by this operation
      */
     private $domains;
 
@@ -39,21 +39,20 @@ abstract class AbstractOperation implements OperationInterface
      * This array stores 'all', 'new' and 'obsolete' messages for all valid domains.
      *
      * The data structure of this array is as follows:
-     * ```php
-     * array(
-     *     'domain 1' => array(
-     *         'all' => array(...),
-     *         'new' => array(...),
-     *         'obsolete' => array(...)
-     *     ),
-     *     'domain 2' => array(
-     *         'all' => array(...),
-     *         'new' => array(...),
-     *         'obsolete' => array(...)
-     *     ),
-     *     ...
-     * )
-     * ```
+     *
+     *     array(
+     *         'domain 1' => array(
+     *             'all' => array(...),
+     *             'new' => array(...),
+     *             'obsolete' => array(...)
+     *         ),
+     *         'domain 2' => array(
+     *             'all' => array(...),
+     *             'new' => array(...),
+     *             'obsolete' => array(...)
+     *         ),
+     *         ...
+     *     )
      *
      * @var array The array that stores 'all', 'new' and 'obsolete' messages
      */
@@ -91,7 +90,7 @@ abstract class AbstractOperation implements OperationInterface
      */
     public function getMessages($domain)
     {
-        if (!in_array($domain, $this->getDomains())) {
+        if (!\in_array($domain, $this->getDomains())) {
             throw new InvalidArgumentException(sprintf('Invalid domain: %s.', $domain));
         }
 
@@ -107,7 +106,7 @@ abstract class AbstractOperation implements OperationInterface
      */
     public function getNewMessages($domain)
     {
-        if (!in_array($domain, $this->getDomains())) {
+        if (!\in_array($domain, $this->getDomains())) {
             throw new InvalidArgumentException(sprintf('Invalid domain: %s.', $domain));
         }
 
@@ -123,7 +122,7 @@ abstract class AbstractOperation implements OperationInterface
      */
     public function getObsoleteMessages($domain)
     {
-        if (!in_array($domain, $this->getDomains())) {
+        if (!\in_array($domain, $this->getDomains())) {
             throw new InvalidArgumentException(sprintf('Invalid domain: %s.', $domain));
         }
 
diff --git a/vendor/symfony/translation/Command/XliffLintCommand.php b/vendor/symfony/translation/Command/XliffLintCommand.php
index 2caa6abe..378788f5 100644
--- a/vendor/symfony/translation/Command/XliffLintCommand.php
+++ b/vendor/symfony/translation/Command/XliffLintCommand.php
@@ -130,16 +130,16 @@ EOF
         $document->schemaValidate(__DIR__.'/../Resources/schemas/xliff-core-1.2-strict.xsd');
         foreach (libxml_get_errors() as $xmlError) {
             $errors[] = array(
-                    'line' => $xmlError->line,
-                    'column' => $xmlError->column,
-                    'message' => trim($xmlError->message),
-                );
+                'line' => $xmlError->line,
+                'column' => $xmlError->column,
+                'message' => trim($xmlError->message),
+            );
         }
 
         libxml_clear_errors();
         libxml_use_internal_errors(false);
 
-        return array('file' => $file, 'valid' => 0 === count($errors), 'messages' => $errors);
+        return array('file' => $file, 'valid' => 0 === \count($errors), 'messages' => $errors);
     }
 
     private function display(SymfonyStyle $io, array $files)
@@ -156,7 +156,7 @@ EOF
 
     private function displayTxt(SymfonyStyle $io, array $filesInfo)
     {
-        $countFiles = count($filesInfo);
+        $countFiles = \count($filesInfo);
         $erroredFiles = 0;
 
         foreach ($filesInfo as $info) {
@@ -206,7 +206,7 @@ EOF
         }
 
         foreach ($this->getDirectoryIterator($fileOrDirectory) as $file) {
-            if (!in_array($file->getExtension(), array('xlf', 'xliff'))) {
+            if (!\in_array($file->getExtension(), array('xlf', 'xliff'))) {
                 continue;
             }
 
@@ -238,7 +238,7 @@ EOF
         };
 
         if (null !== $this->directoryIteratorProvider) {
-            return call_user_func($this->directoryIteratorProvider, $directory, $default);
+            return \call_user_func($this->directoryIteratorProvider, $directory, $default);
         }
 
         return $default($directory);
@@ -251,7 +251,7 @@ EOF
         };
 
         if (null !== $this->isReadableProvider) {
-            return call_user_func($this->isReadableProvider, $fileOrDirectory, $default);
+            return \call_user_func($this->isReadableProvider, $fileOrDirectory, $default);
         }
 
         return $default($fileOrDirectory);
diff --git a/vendor/symfony/translation/DataCollector/TranslationDataCollector.php b/vendor/symfony/translation/DataCollector/TranslationDataCollector.php
index 5d97a670..edd712dd 100644
--- a/vendor/symfony/translation/DataCollector/TranslationDataCollector.php
+++ b/vendor/symfony/translation/DataCollector/TranslationDataCollector.php
@@ -99,7 +99,7 @@ class TranslationDataCollector extends DataCollector implements LateDataCollecto
 
     public function getFallbackLocales()
     {
-        return (isset($this->data['fallback_locales']) && count($this->data['fallback_locales']) > 0) ? $this->data['fallback_locales'] : array();
+        return (isset($this->data['fallback_locales']) && \count($this->data['fallback_locales']) > 0) ? $this->data['fallback_locales'] : array();
     }
 
     /**
@@ -158,7 +158,7 @@ class TranslationDataCollector extends DataCollector implements LateDataCollecto
             if (mb_strlen($string, $encoding) > $length) {
                 return mb_substr($string, 0, $length - 3, $encoding).'...';
             }
-        } elseif (strlen($string) > $length) {
+        } elseif (\strlen($string) > $length) {
             return substr($string, 0, $length - 3).'...';
         }
 
diff --git a/vendor/symfony/translation/DataCollectorTranslator.php b/vendor/symfony/translation/DataCollectorTranslator.php
index 715c390f..5d4d819e 100644
--- a/vendor/symfony/translation/DataCollectorTranslator.php
+++ b/vendor/symfony/translation/DataCollectorTranslator.php
@@ -35,7 +35,7 @@ class DataCollectorTranslator implements TranslatorInterface, TranslatorBagInter
     public function __construct(TranslatorInterface $translator)
     {
         if (!$translator instanceof TranslatorBagInterface) {
-            throw new InvalidArgumentException(sprintf('The Translator "%s" must implement TranslatorInterface and TranslatorBagInterface.', get_class($translator)));
+            throw new InvalidArgumentException(sprintf('The Translator "%s" must implement TranslatorInterface and TranslatorBagInterface.', \get_class($translator)));
         }
 
         $this->translator = $translator;
@@ -106,7 +106,7 @@ class DataCollectorTranslator implements TranslatorInterface, TranslatorBagInter
      */
     public function __call($method, $args)
     {
-        return call_user_func_array(array($this->translator, $method), $args);
+        return \call_user_func_array(array($this->translator, $method), $args);
     }
 
     /**
diff --git a/vendor/symfony/translation/DependencyInjection/TranslationDumperPass.php b/vendor/symfony/translation/DependencyInjection/TranslationDumperPass.php
index e620226e..31d791dc 100644
--- a/vendor/symfony/translation/DependencyInjection/TranslationDumperPass.php
+++ b/vendor/symfony/translation/DependencyInjection/TranslationDumperPass.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\Translation\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
 
 /**
  * Adds tagged translation.formatter services to translation writer.
diff --git a/vendor/symfony/translation/DependencyInjection/TranslationExtractorPass.php b/vendor/symfony/translation/DependencyInjection/TranslationExtractorPass.php
index 18c67f68..b7e6f734 100644
--- a/vendor/symfony/translation/DependencyInjection/TranslationExtractorPass.php
+++ b/vendor/symfony/translation/DependencyInjection/TranslationExtractorPass.php
@@ -11,10 +11,10 @@
 
 namespace Symfony\Component\Translation\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\Reference;
 
 /**
  * Adds tagged translation.extractor services to translation extractor.
diff --git a/vendor/symfony/translation/DependencyInjection/TranslatorPass.php b/vendor/symfony/translation/DependencyInjection/TranslatorPass.php
index 1f7839db..cbaa43db 100644
--- a/vendor/symfony/translation/DependencyInjection/TranslatorPass.php
+++ b/vendor/symfony/translation/DependencyInjection/TranslatorPass.php
@@ -11,10 +11,10 @@
 
 namespace Symfony\Component\Translation\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
 
 class TranslatorPass implements CompilerPassInterface
 {
diff --git a/vendor/symfony/translation/Dumper/CsvFileDumper.php b/vendor/symfony/translation/Dumper/CsvFileDumper.php
index ebfa831d..0880528d 100644
--- a/vendor/symfony/translation/Dumper/CsvFileDumper.php
+++ b/vendor/symfony/translation/Dumper/CsvFileDumper.php
@@ -28,7 +28,7 @@ class CsvFileDumper extends FileDumper
      */
     public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
     {
-        $handle = fopen('php://memory', 'rb+');
+        $handle = fopen('php://memory', 'r+b');
 
         foreach ($messages->all($domain) as $source => $target) {
             fputcsv($handle, array($source, $target), $this->delimiter, $this->enclosure);
diff --git a/vendor/symfony/translation/Dumper/FileDumper.php b/vendor/symfony/translation/Dumper/FileDumper.php
index 5a67b3a0..5b10e452 100644
--- a/vendor/symfony/translation/Dumper/FileDumper.php
+++ b/vendor/symfony/translation/Dumper/FileDumper.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\Translation\Dumper;
 
-use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Exception\InvalidArgumentException;
 use Symfony\Component\Translation\Exception\RuntimeException;
+use Symfony\Component\Translation\MessageCatalogue;
 
 /**
  * FileDumper is an implementation of DumperInterface that dump a message catalogue to file(s).
@@ -51,7 +51,7 @@ abstract class FileDumper implements DumperInterface
      */
     public function setBackup($backup)
     {
-        @trigger_error(sprintf('The %s() method is deprecated since Symfony 4.1.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1.', __METHOD__), E_USER_DEPRECATED);
 
         if (false !== $backup) {
             throw new \LogicException('The backup feature is no longer supported.');
@@ -71,7 +71,7 @@ abstract class FileDumper implements DumperInterface
         foreach ($messages->getDomains() as $domain) {
             $fullpath = $options['path'].'/'.$this->getRelativePath($domain, $messages->getLocale());
             if (!file_exists($fullpath)) {
-                $directory = dirname($fullpath);
+                $directory = \dirname($fullpath);
                 if (!file_exists($directory) && !@mkdir($directory, 0777, true)) {
                     throw new RuntimeException(sprintf('Unable to create directory "%s".', $directory));
                 }
diff --git a/vendor/symfony/translation/Dumper/IcuResFileDumper.php b/vendor/symfony/translation/Dumper/IcuResFileDumper.php
index 42f15950..efa9d7fe 100644
--- a/vendor/symfony/translation/Dumper/IcuResFileDumper.php
+++ b/vendor/symfony/translation/Dumper/IcuResFileDumper.php
@@ -33,7 +33,7 @@ class IcuResFileDumper extends FileDumper
         $data = $indexes = $resources = '';
 
         foreach ($messages->all($domain) as $source => $target) {
-            $indexes .= pack('v', strlen($data) + 28);
+            $indexes .= pack('v', \strlen($data) + 28);
             $data .= $source."\0";
         }
 
@@ -44,7 +44,7 @@ class IcuResFileDumper extends FileDumper
         foreach ($messages->all($domain) as $source => $target) {
             $resources .= pack('V', $this->getPosition($data));
 
-            $data .= pack('V', strlen($target))
+            $data .= pack('V', \strlen($target))
                 .mb_convert_encoding($target."\0", 'UTF-16LE', 'UTF-8')
                 .$this->writePadding($data)
                   ;
@@ -52,7 +52,7 @@ class IcuResFileDumper extends FileDumper
 
         $resOffset = $this->getPosition($data);
 
-        $data .= pack('v', count($messages->all($domain)))
+        $data .= pack('v', \count($messages->all($domain)))
             .$indexes
             .$this->writePadding($data)
             .$resources
@@ -66,7 +66,7 @@ class IcuResFileDumper extends FileDumper
             $keyTop,                        // Index keys top
             $bundleTop,                     // Index resources top
             $bundleTop,                     // Index bundle top
-            count($messages->all($domain)), // Index max table length
+            \count($messages->all($domain)), // Index max table length
             0                               // Index attributes
         );
 
@@ -84,7 +84,7 @@ class IcuResFileDumper extends FileDumper
 
     private function writePadding($data)
     {
-        $padding = strlen($data) % 4;
+        $padding = \strlen($data) % 4;
 
         if ($padding) {
             return str_repeat("\xAA", 4 - $padding);
@@ -93,7 +93,7 @@ class IcuResFileDumper extends FileDumper
 
     private function getPosition($data)
     {
-        return (strlen($data) + 28) / 4;
+        return (\strlen($data) + 28) / 4;
     }
 
     /**
diff --git a/vendor/symfony/translation/Dumper/MoFileDumper.php b/vendor/symfony/translation/Dumper/MoFileDumper.php
index 00a33d25..32ed0ac2 100644
--- a/vendor/symfony/translation/Dumper/MoFileDumper.php
+++ b/vendor/symfony/translation/Dumper/MoFileDumper.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Translation\Dumper;
 
-use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Loader\MoFileLoader;
+use Symfony\Component\Translation\MessageCatalogue;
 
 /**
  * MoFileDumper generates a gettext formatted string representation of a message catalogue.
@@ -47,7 +47,7 @@ class MoFileDumper extends FileDumper
             'offsetHashes' => MoFileLoader::MO_HEADER_SIZE + (16 * $size),
         );
 
-        $sourcesSize = strlen($sources);
+        $sourcesSize = \strlen($sources);
         $sourcesStart = $header['offsetHashes'] + 1;
 
         foreach ($offsets as $offset) {
@@ -57,7 +57,7 @@ class MoFileDumper extends FileDumper
                           .$this->writeLong($offset[2] + $sourcesStart + $sourcesSize);
         }
 
-        $output = implode(array_map(array($this, 'writeLong'), $header))
+        $output = implode('', array_map(array($this, 'writeLong'), $header))
                .$sourceOffsets
                .$targetOffsets
                .$sources
diff --git a/vendor/symfony/translation/Dumper/XliffFileDumper.php b/vendor/symfony/translation/Dumper/XliffFileDumper.php
index afeae3ac..c12454cd 100644
--- a/vendor/symfony/translation/Dumper/XliffFileDumper.php
+++ b/vendor/symfony/translation/Dumper/XliffFileDumper.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Translation\Dumper;
 
-use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Exception\InvalidArgumentException;
+use Symfony\Component\Translation\MessageCatalogue;
 
 /**
  * XliffFileDumper generates xliff files from a message catalogue.
@@ -147,7 +147,7 @@ class XliffFileDumper extends FileDumper
             $translation = $dom->createElement('unit');
             $translation->setAttribute('id', strtr(substr(base64_encode(hash('sha256', $source, true)), 0, 7), '/+', '._'));
             $name = $source;
-            if (strlen($source) > 80) {
+            if (\strlen($source) > 80) {
                 $name = substr(md5($source), -7);
             }
             $translation->setAttribute('name', $name);
@@ -200,6 +200,6 @@ class XliffFileDumper extends FileDumper
      */
     private function hasMetadataArrayInfo($key, $metadata = null)
     {
-        return null !== $metadata && array_key_exists($key, $metadata) && ($metadata[$key] instanceof \Traversable || is_array($metadata[$key]));
+        return null !== $metadata && array_key_exists($key, $metadata) && ($metadata[$key] instanceof \Traversable || \is_array($metadata[$key]));
     }
 }
diff --git a/vendor/symfony/translation/Dumper/YamlFileDumper.php b/vendor/symfony/translation/Dumper/YamlFileDumper.php
index db9e4b36..b19b9ae1 100644
--- a/vendor/symfony/translation/Dumper/YamlFileDumper.php
+++ b/vendor/symfony/translation/Dumper/YamlFileDumper.php
@@ -11,10 +11,10 @@
 
 namespace Symfony\Component\Translation\Dumper;
 
+use Symfony\Component\Translation\Exception\LogicException;
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Util\ArrayConverter;
 use Symfony\Component\Yaml\Yaml;
-use Symfony\Component\Translation\Exception\LogicException;
 
 /**
  * YamlFileDumper generates yaml files from a message catalogue.
diff --git a/vendor/symfony/translation/Extractor/AbstractFileExtractor.php b/vendor/symfony/translation/Extractor/AbstractFileExtractor.php
index 40b36451..bebd6d91 100644
--- a/vendor/symfony/translation/Extractor/AbstractFileExtractor.php
+++ b/vendor/symfony/translation/Extractor/AbstractFileExtractor.php
@@ -27,7 +27,7 @@ abstract class AbstractFileExtractor
      */
     protected function extractFiles($resource)
     {
-        if (is_array($resource) || $resource instanceof \Traversable) {
+        if (\is_array($resource) || $resource instanceof \Traversable) {
             $files = array();
             foreach ($resource as $file) {
                 if ($this->canBeExtracted($file)) {
@@ -45,7 +45,7 @@ abstract class AbstractFileExtractor
 
     private function toSplFileInfo(string $file): \SplFileInfo
     {
-        return ($file instanceof \SplFileInfo) ? $file : new \SplFileInfo($file);
+        return new \SplFileInfo($file);
     }
 
     /**
diff --git a/vendor/symfony/translation/Extractor/PhpExtractor.php b/vendor/symfony/translation/Extractor/PhpExtractor.php
index f364bdec..b4b32361 100644
--- a/vendor/symfony/translation/Extractor/PhpExtractor.php
+++ b/vendor/symfony/translation/Extractor/PhpExtractor.php
@@ -208,7 +208,7 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
                     } elseif (self::MESSAGE_TOKEN === $item) {
                         $message = $this->getValue($tokenIterator);
 
-                        if (count($sequence) === ($sequenceKey + 1)) {
+                        if (\count($sequence) === ($sequenceKey + 1)) {
                             break;
                         }
                     } elseif (self::METHOD_ARGUMENTS_TOKEN === $item) {
diff --git a/vendor/symfony/translation/Extractor/PhpStringTokenParser.php b/vendor/symfony/translation/Extractor/PhpStringTokenParser.php
index bab4ce0c..e8094e6c 100644
--- a/vendor/symfony/translation/Extractor/PhpStringTokenParser.php
+++ b/vendor/symfony/translation/Extractor/PhpStringTokenParser.php
@@ -89,7 +89,7 @@ class PhpStringTokenParser
      * Parses escape sequences in strings (all string types apart from single quoted).
      *
      * @param string      $str   String without quotes
-     * @param null|string $quote Quote type
+     * @param string|null $quote Quote type
      *
      * @return string String with escape sequences parsed
      */
@@ -113,9 +113,9 @@ class PhpStringTokenParser
         if (isset(self::$replacements[$str])) {
             return self::$replacements[$str];
         } elseif ('x' === $str[0] || 'X' === $str[0]) {
-            return chr(hexdec($str));
+            return \chr(hexdec($str));
         } else {
-            return chr(octdec($str));
+            return \chr(octdec($str));
         }
     }
 
diff --git a/vendor/symfony/translation/Loader/ArrayLoader.php b/vendor/symfony/translation/Loader/ArrayLoader.php
index 9a595b7d..7bbfca68 100644
--- a/vendor/symfony/translation/Loader/ArrayLoader.php
+++ b/vendor/symfony/translation/Loader/ArrayLoader.php
@@ -52,7 +52,7 @@ class ArrayLoader implements LoaderInterface
             $subnode = &$messages;
         }
         foreach ($subnode as $key => $value) {
-            if (is_array($value)) {
+            if (\is_array($value)) {
                 $nodePath = $path ? $path.'.'.$key : $key;
                 $this->flatten($messages, $value, $nodePath);
                 if (null === $path) {
diff --git a/vendor/symfony/translation/Loader/CsvFileLoader.php b/vendor/symfony/translation/Loader/CsvFileLoader.php
index e454d169..8a763e72 100644
--- a/vendor/symfony/translation/Loader/CsvFileLoader.php
+++ b/vendor/symfony/translation/Loader/CsvFileLoader.php
@@ -41,7 +41,7 @@ class CsvFileLoader extends FileLoader
         $file->setCsvControl($this->delimiter, $this->enclosure, $this->escape);
 
         foreach ($file as $data) {
-            if ('#' !== substr($data[0], 0, 1) && isset($data[1]) && 2 === count($data)) {
+            if ('#' !== substr($data[0], 0, 1) && isset($data[1]) && 2 === \count($data)) {
                 $messages[$data[0]] = $data[1];
             }
         }
diff --git a/vendor/symfony/translation/Loader/FileLoader.php b/vendor/symfony/translation/Loader/FileLoader.php
index 322679d2..9a02f525 100644
--- a/vendor/symfony/translation/Loader/FileLoader.php
+++ b/vendor/symfony/translation/Loader/FileLoader.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\Translation\Loader;
 
+use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Translation\Exception\InvalidResourceException;
 use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Config\Resource\FileResource;
 
 /**
  * @author Abdellatif Ait boudad <a.aitboudad@gmail.com>
@@ -41,7 +41,7 @@ abstract class FileLoader extends ArrayLoader
         }
 
         // not an array
-        if (!is_array($messages)) {
+        if (!\is_array($messages)) {
             throw new InvalidResourceException(sprintf('Unable to load file "%s".', $resource));
         }
 
diff --git a/vendor/symfony/translation/Loader/IcuDatFileLoader.php b/vendor/symfony/translation/Loader/IcuDatFileLoader.php
index 822bc362..7bbf4c20 100644
--- a/vendor/symfony/translation/Loader/IcuDatFileLoader.php
+++ b/vendor/symfony/translation/Loader/IcuDatFileLoader.php
@@ -11,10 +11,10 @@
 
 namespace Symfony\Component\Translation\Loader;
 
-use Symfony\Component\Translation\MessageCatalogue;
+use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Translation\Exception\InvalidResourceException;
 use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Translation\MessageCatalogue;
 
 /**
  * IcuResFileLoader loads translations from a resource bundle.
diff --git a/vendor/symfony/translation/Loader/IcuResFileLoader.php b/vendor/symfony/translation/Loader/IcuResFileLoader.php
index 927cae16..28ace297 100644
--- a/vendor/symfony/translation/Loader/IcuResFileLoader.php
+++ b/vendor/symfony/translation/Loader/IcuResFileLoader.php
@@ -11,10 +11,10 @@
 
 namespace Symfony\Component\Translation\Loader;
 
-use Symfony\Component\Translation\MessageCatalogue;
+use Symfony\Component\Config\Resource\DirectoryResource;
 use Symfony\Component\Translation\Exception\InvalidResourceException;
 use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Config\Resource\DirectoryResource;
+use Symfony\Component\Translation\MessageCatalogue;
 
 /**
  * IcuResFileLoader loads translations from a resource bundle.
diff --git a/vendor/symfony/translation/Loader/LoaderInterface.php b/vendor/symfony/translation/Loader/LoaderInterface.php
index 6b65fe38..1785402d 100644
--- a/vendor/symfony/translation/Loader/LoaderInterface.php
+++ b/vendor/symfony/translation/Loader/LoaderInterface.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\Translation\Loader;
 
-use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Exception\InvalidResourceException;
 use Symfony\Component\Translation\Exception\NotFoundResourceException;
+use Symfony\Component\Translation\MessageCatalogue;
 
 /**
  * LoaderInterface is the interface implemented by all translation loaders.
diff --git a/vendor/symfony/translation/Loader/MoFileLoader.php b/vendor/symfony/translation/Loader/MoFileLoader.php
index 918bf94a..a1d7c4ae 100644
--- a/vendor/symfony/translation/Loader/MoFileLoader.php
+++ b/vendor/symfony/translation/Loader/MoFileLoader.php
@@ -111,7 +111,7 @@ class MoFileLoader extends FileLoader
             $ids = array('singular' => $singularId, 'plural' => $pluralId);
             $item = compact('ids', 'translated');
 
-            if (is_array($item['translated'])) {
+            if (\is_array($item['translated'])) {
                 $messages[$item['ids']['singular']] = stripcslashes($item['translated'][0]);
                 if (isset($item['ids']['plural'])) {
                     $plurals = array();
diff --git a/vendor/symfony/translation/Loader/PoFileLoader.php b/vendor/symfony/translation/Loader/PoFileLoader.php
index 7ce7d2df..066168dc 100644
--- a/vendor/symfony/translation/Loader/PoFileLoader.php
+++ b/vendor/symfony/translation/Loader/PoFileLoader.php
@@ -78,7 +78,7 @@ class PoFileLoader extends FileLoader
 
             if ('' === $line) {
                 // Whitespace indicated current item is done
-                if (!in_array('fuzzy', $flags)) {
+                if (!\in_array('fuzzy', $flags)) {
                     $this->addMessage($messages, $item);
                 }
                 $item = $defaults;
@@ -96,7 +96,7 @@ class PoFileLoader extends FileLoader
             } elseif ('"' === $line[0]) {
                 $continues = isset($item['translated']) ? 'translated' : 'ids';
 
-                if (is_array($item[$continues])) {
+                if (\is_array($item[$continues])) {
                     end($item[$continues]);
                     $item[$continues][key($item[$continues])] .= substr($line, 1, -1);
                 } else {
@@ -110,7 +110,7 @@ class PoFileLoader extends FileLoader
             }
         }
         // save last item
-        if (!in_array('fuzzy', $flags)) {
+        if (!\in_array('fuzzy', $flags)) {
             $this->addMessage($messages, $item);
         }
         fclose($stream);
@@ -126,7 +126,7 @@ class PoFileLoader extends FileLoader
      */
     private function addMessage(array &$messages, array $item)
     {
-        if (is_array($item['translated'])) {
+        if (\is_array($item['translated'])) {
             $messages[stripcslashes($item['ids']['singular'])] = stripcslashes($item['translated'][0]);
             if (isset($item['ids']['plural'])) {
                 $plurals = $item['translated'];
diff --git a/vendor/symfony/translation/Loader/QtFileLoader.php b/vendor/symfony/translation/Loader/QtFileLoader.php
index 22536aa8..2d4a4c08 100644
--- a/vendor/symfony/translation/Loader/QtFileLoader.php
+++ b/vendor/symfony/translation/Loader/QtFileLoader.php
@@ -11,11 +11,11 @@
 
 namespace Symfony\Component\Translation\Loader;
 
+use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Config\Util\XmlUtils;
-use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Exception\InvalidResourceException;
 use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Translation\MessageCatalogue;
 
 /**
  * QtFileLoader loads translations from QT Translations XML files.
diff --git a/vendor/symfony/translation/Loader/XliffFileLoader.php b/vendor/symfony/translation/Loader/XliffFileLoader.php
index b20d4909..9c6b8c9f 100644
--- a/vendor/symfony/translation/Loader/XliffFileLoader.php
+++ b/vendor/symfony/translation/Loader/XliffFileLoader.php
@@ -11,12 +11,12 @@
 
 namespace Symfony\Component\Translation\Loader;
 
+use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Config\Util\XmlUtils;
-use Symfony\Component\Translation\MessageCatalogue;
+use Symfony\Component\Translation\Exception\InvalidArgumentException;
 use Symfony\Component\Translation\Exception\InvalidResourceException;
 use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Translation\Exception\InvalidArgumentException;
-use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Translation\MessageCatalogue;
 
 /**
  * XliffFileLoader loads translations from XLIFF files.
@@ -228,7 +228,7 @@ class XliffFileLoader implements LoaderInterface
             }
         }
 
-        $drive = '\\' === DIRECTORY_SEPARATOR ? array_shift($parts).'/' : '';
+        $drive = '\\' === \DIRECTORY_SEPARATOR ? array_shift($parts).'/' : '';
         $newPath = $locationstart.$drive.implode('/', array_map('rawurlencode', $parts));
 
         return str_replace($xmlUri, $newPath, $schemaSource);
diff --git a/vendor/symfony/translation/Loader/YamlFileLoader.php b/vendor/symfony/translation/Loader/YamlFileLoader.php
index ef84c32f..584a055c 100644
--- a/vendor/symfony/translation/Loader/YamlFileLoader.php
+++ b/vendor/symfony/translation/Loader/YamlFileLoader.php
@@ -13,8 +13,8 @@ namespace Symfony\Component\Translation\Loader;
 
 use Symfony\Component\Translation\Exception\InvalidResourceException;
 use Symfony\Component\Translation\Exception\LogicException;
-use Symfony\Component\Yaml\Parser as YamlParser;
 use Symfony\Component\Yaml\Exception\ParseException;
+use Symfony\Component\Yaml\Parser as YamlParser;
 use Symfony\Component\Yaml\Yaml;
 
 /**
diff --git a/vendor/symfony/translation/LoggingTranslator.php b/vendor/symfony/translation/LoggingTranslator.php
index 337c1143..01456708 100644
--- a/vendor/symfony/translation/LoggingTranslator.php
+++ b/vendor/symfony/translation/LoggingTranslator.php
@@ -33,7 +33,7 @@ class LoggingTranslator implements TranslatorInterface, TranslatorBagInterface
     public function __construct(TranslatorInterface $translator, LoggerInterface $logger)
     {
         if (!$translator instanceof TranslatorBagInterface) {
-            throw new InvalidArgumentException(sprintf('The Translator "%s" must implement TranslatorInterface and TranslatorBagInterface.', get_class($translator)));
+            throw new InvalidArgumentException(sprintf('The Translator "%s" must implement TranslatorInterface and TranslatorBagInterface.', \get_class($translator)));
         }
 
         $this->translator = $translator;
@@ -105,7 +105,7 @@ class LoggingTranslator implements TranslatorInterface, TranslatorBagInterface
      */
     public function __call($method, $args)
     {
-        return call_user_func_array(array($this->translator, $method), $args);
+        return \call_user_func_array(array($this->translator, $method), $args);
     }
 
     /**
diff --git a/vendor/symfony/translation/MessageSelector.php b/vendor/symfony/translation/MessageSelector.php
index 31304cd0..5de171c5 100644
--- a/vendor/symfony/translation/MessageSelector.php
+++ b/vendor/symfony/translation/MessageSelector.php
@@ -82,7 +82,7 @@ class MessageSelector
         if (!isset($standardRules[$position])) {
             // when there's exactly one rule given, and that rule is a standard
             // rule, use this rule
-            if (1 === count($parts) && isset($standardRules[0])) {
+            if (1 === \count($parts) && isset($standardRules[0])) {
                 return $standardRules[0];
             }
 
diff --git a/vendor/symfony/translation/PluralizationRules.php b/vendor/symfony/translation/PluralizationRules.php
index 48a6c608..3aca0ba9 100644
--- a/vendor/symfony/translation/PluralizationRules.php
+++ b/vendor/symfony/translation/PluralizationRules.php
@@ -35,14 +35,14 @@ class PluralizationRules
             $locale = 'xbr';
         }
 
-        if (strlen($locale) > 3) {
-            $locale = substr($locale, 0, -strlen(strrchr($locale, '_')));
+        if (\strlen($locale) > 3) {
+            $locale = substr($locale, 0, -\strlen(strrchr($locale, '_')));
         }
 
         if (isset(self::$rules[$locale])) {
-            $return = call_user_func(self::$rules[$locale], $number);
+            $return = \call_user_func(self::$rules[$locale], $number);
 
-            if (!is_int($return) || $return < 0) {
+            if (!\is_int($return) || $return < 0) {
                 return 0;
             }
 
@@ -144,6 +144,7 @@ class PluralizationRules
             case 'bs':
             case 'hr':
             case 'ru':
+            case 'sh':
             case 'sr':
             case 'uk':
                 return ((1 == $number % 10) && (11 != $number % 100)) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
@@ -200,8 +201,8 @@ class PluralizationRules
             $locale = 'xbr';
         }
 
-        if (strlen($locale) > 3) {
-            $locale = substr($locale, 0, -strlen(strrchr($locale, '_')));
+        if (\strlen($locale) > 3) {
+            $locale = substr($locale, 0, -\strlen(strrchr($locale, '_')));
         }
 
         self::$rules[$locale] = $rule;
diff --git a/vendor/symfony/translation/Reader/TranslationReader.php b/vendor/symfony/translation/Reader/TranslationReader.php
index d2ad774e..948edec4 100644
--- a/vendor/symfony/translation/Reader/TranslationReader.php
+++ b/vendor/symfony/translation/Reader/TranslationReader.php
@@ -55,7 +55,7 @@ class TranslationReader implements TranslationReaderInterface
             $extension = $catalogue->getLocale().'.'.$format;
             $files = $finder->files()->name('*.'.$extension)->in($directory);
             foreach ($files as $file) {
-                $domain = substr($file->getFilename(), 0, -1 * strlen($extension) - 1);
+                $domain = substr($file->getFilename(), 0, -1 * \strlen($extension) - 1);
                 $catalogue->addCatalogue($loader->load($file->getPathname(), $catalogue->getLocale(), $domain));
             }
         }
diff --git a/vendor/symfony/translation/Resources/schemas/xliff-core-1.2-strict.xsd b/vendor/symfony/translation/Resources/schemas/xliff-core-1.2-strict.xsd
index dface628..4102d647 100644
--- a/vendor/symfony/translation/Resources/schemas/xliff-core-1.2-strict.xsd
+++ b/vendor/symfony/translation/Resources/schemas/xliff-core-1.2-strict.xsd
@@ -30,7 +30,7 @@ Jan-10-2006
 -->
 <xsd:schema xmlns:xlf="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="urn:oasis:names:tc:xliff:document:1.2" xml:lang="en">
   <!-- Import for xml:lang and xml:space -->
-  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="../../Loader/schema/dic/xliff-core/xml.xsd"/>
   <!-- Attributes Lists -->
   <xsd:simpleType name="XTend">
     <xsd:restriction base="xsd:string">
diff --git a/vendor/symfony/translation/Tests/DataCollector/TranslationDataCollectorTest.php b/vendor/symfony/translation/Tests/DataCollector/TranslationDataCollectorTest.php
index 5611c877..6665eca4 100644
--- a/vendor/symfony/translation/Tests/DataCollector/TranslationDataCollectorTest.php
+++ b/vendor/symfony/translation/Tests/DataCollector/TranslationDataCollectorTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Translation\Tests\DataCollector;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\DataCollectorTranslator;
 use Symfony\Component\Translation\DataCollector\TranslationDataCollector;
+use Symfony\Component\Translation\DataCollectorTranslator;
 
 class TranslationDataCollectorTest extends TestCase
 {
@@ -42,85 +42,85 @@ class TranslationDataCollectorTest extends TestCase
     {
         $collectedMessages = array(
             array(
-                  'id' => 'foo',
-                  'translation' => 'foo (en)',
-                  'locale' => 'en',
-                  'domain' => 'messages',
-                  'state' => DataCollectorTranslator::MESSAGE_DEFINED,
-                  'parameters' => array(),
-                  'transChoiceNumber' => null,
+                'id' => 'foo',
+                'translation' => 'foo (en)',
+                'locale' => 'en',
+                'domain' => 'messages',
+                'state' => DataCollectorTranslator::MESSAGE_DEFINED,
+                'parameters' => array(),
+                'transChoiceNumber' => null,
             ),
             array(
-                  'id' => 'bar',
-                  'translation' => 'bar (fr)',
-                  'locale' => 'fr',
-                  'domain' => 'messages',
-                  'state' => DataCollectorTranslator::MESSAGE_EQUALS_FALLBACK,
-                  'parameters' => array(),
-                  'transChoiceNumber' => null,
+                'id' => 'bar',
+                'translation' => 'bar (fr)',
+                'locale' => 'fr',
+                'domain' => 'messages',
+                'state' => DataCollectorTranslator::MESSAGE_EQUALS_FALLBACK,
+                'parameters' => array(),
+                'transChoiceNumber' => null,
             ),
             array(
-                  'id' => 'choice',
-                  'translation' => 'choice',
-                  'locale' => 'en',
-                  'domain' => 'messages',
-                  'state' => DataCollectorTranslator::MESSAGE_MISSING,
-                  'parameters' => array('%count%' => 3),
-                  'transChoiceNumber' => 3,
+                'id' => 'choice',
+                'translation' => 'choice',
+                'locale' => 'en',
+                'domain' => 'messages',
+                'state' => DataCollectorTranslator::MESSAGE_MISSING,
+                'parameters' => array('%count%' => 3),
+                'transChoiceNumber' => 3,
             ),
             array(
-                  'id' => 'choice',
-                  'translation' => 'choice',
-                  'locale' => 'en',
-                  'domain' => 'messages',
-                  'state' => DataCollectorTranslator::MESSAGE_MISSING,
-                  'parameters' => array('%count%' => 3),
-                  'transChoiceNumber' => 3,
+                'id' => 'choice',
+                'translation' => 'choice',
+                'locale' => 'en',
+                'domain' => 'messages',
+                'state' => DataCollectorTranslator::MESSAGE_MISSING,
+                'parameters' => array('%count%' => 3),
+                'transChoiceNumber' => 3,
             ),
             array(
-                  'id' => 'choice',
-                  'translation' => 'choice',
-                  'locale' => 'en',
-                  'domain' => 'messages',
-                  'state' => DataCollectorTranslator::MESSAGE_MISSING,
-                  'parameters' => array('%count%' => 4, '%foo%' => 'bar'),
-                  'transChoiceNumber' => 4,
+                'id' => 'choice',
+                'translation' => 'choice',
+                'locale' => 'en',
+                'domain' => 'messages',
+                'state' => DataCollectorTranslator::MESSAGE_MISSING,
+                'parameters' => array('%count%' => 4, '%foo%' => 'bar'),
+                'transChoiceNumber' => 4,
             ),
         );
         $expectedMessages = array(
             array(
-                  'id' => 'foo',
-                  'translation' => 'foo (en)',
-                  'locale' => 'en',
-                  'domain' => 'messages',
-                  'state' => DataCollectorTranslator::MESSAGE_DEFINED,
-                  'count' => 1,
-                  'parameters' => array(),
-                  'transChoiceNumber' => null,
+                'id' => 'foo',
+                'translation' => 'foo (en)',
+                'locale' => 'en',
+                'domain' => 'messages',
+                'state' => DataCollectorTranslator::MESSAGE_DEFINED,
+                'count' => 1,
+                'parameters' => array(),
+                'transChoiceNumber' => null,
             ),
             array(
-                  'id' => 'bar',
-                  'translation' => 'bar (fr)',
-                  'locale' => 'fr',
-                  'domain' => 'messages',
-                  'state' => DataCollectorTranslator::MESSAGE_EQUALS_FALLBACK,
-                  'count' => 1,
-                  'parameters' => array(),
-                  'transChoiceNumber' => null,
+                'id' => 'bar',
+                'translation' => 'bar (fr)',
+                'locale' => 'fr',
+                'domain' => 'messages',
+                'state' => DataCollectorTranslator::MESSAGE_EQUALS_FALLBACK,
+                'count' => 1,
+                'parameters' => array(),
+                'transChoiceNumber' => null,
             ),
             array(
-                  'id' => 'choice',
-                  'translation' => 'choice',
-                  'locale' => 'en',
-                  'domain' => 'messages',
-                  'state' => DataCollectorTranslator::MESSAGE_MISSING,
-                  'count' => 3,
-                  'parameters' => array(
-                      array('%count%' => 3),
-                      array('%count%' => 3),
-                      array('%count%' => 4, '%foo%' => 'bar'),
-                  ),
-                  'transChoiceNumber' => 3,
+                'id' => 'choice',
+                'translation' => 'choice',
+                'locale' => 'en',
+                'domain' => 'messages',
+                'state' => DataCollectorTranslator::MESSAGE_MISSING,
+                'count' => 3,
+                'parameters' => array(
+                    array('%count%' => 3),
+                    array('%count%' => 3),
+                    array('%count%' => 4, '%foo%' => 'bar'),
+                ),
+                'transChoiceNumber' => 3,
             ),
         );
 
diff --git a/vendor/symfony/translation/Tests/DataCollectorTranslatorTest.php b/vendor/symfony/translation/Tests/DataCollectorTranslatorTest.php
index 1b417379..1cdd33b3 100644
--- a/vendor/symfony/translation/Tests/DataCollectorTranslatorTest.php
+++ b/vendor/symfony/translation/Tests/DataCollectorTranslatorTest.php
@@ -12,9 +12,9 @@
 namespace Symfony\Component\Translation\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\Translator;
 use Symfony\Component\Translation\DataCollectorTranslator;
 use Symfony\Component\Translation\Loader\ArrayLoader;
+use Symfony\Component\Translation\Translator;
 
 class DataCollectorTranslatorTest extends TestCase
 {
@@ -31,49 +31,49 @@ class DataCollectorTranslatorTest extends TestCase
 
         $expectedMessages = array();
         $expectedMessages[] = array(
-              'id' => 'foo',
-              'translation' => 'foo (en)',
-              'locale' => 'en',
-              'domain' => 'messages',
-              'state' => DataCollectorTranslator::MESSAGE_DEFINED,
-              'parameters' => array(),
-              'transChoiceNumber' => null,
+            'id' => 'foo',
+            'translation' => 'foo (en)',
+            'locale' => 'en',
+            'domain' => 'messages',
+            'state' => DataCollectorTranslator::MESSAGE_DEFINED,
+            'parameters' => array(),
+            'transChoiceNumber' => null,
         );
         $expectedMessages[] = array(
-              'id' => 'bar',
-              'translation' => 'bar (fr)',
-              'locale' => 'fr',
-              'domain' => 'messages',
-              'state' => DataCollectorTranslator::MESSAGE_EQUALS_FALLBACK,
-              'parameters' => array(),
-              'transChoiceNumber' => null,
+            'id' => 'bar',
+            'translation' => 'bar (fr)',
+            'locale' => 'fr',
+            'domain' => 'messages',
+            'state' => DataCollectorTranslator::MESSAGE_EQUALS_FALLBACK,
+            'parameters' => array(),
+            'transChoiceNumber' => null,
         );
         $expectedMessages[] = array(
-              'id' => 'choice',
-              'translation' => 'choice',
-              'locale' => 'en',
-              'domain' => 'messages',
-              'state' => DataCollectorTranslator::MESSAGE_MISSING,
-              'parameters' => array(),
-              'transChoiceNumber' => 0,
+            'id' => 'choice',
+            'translation' => 'choice',
+            'locale' => 'en',
+            'domain' => 'messages',
+            'state' => DataCollectorTranslator::MESSAGE_MISSING,
+            'parameters' => array(),
+            'transChoiceNumber' => 0,
         );
         $expectedMessages[] = array(
-              'id' => 'bar_ru',
-              'translation' => 'bar (ru)',
-              'locale' => 'ru',
-              'domain' => 'messages',
-              'state' => DataCollectorTranslator::MESSAGE_EQUALS_FALLBACK,
-              'parameters' => array(),
-              'transChoiceNumber' => null,
+            'id' => 'bar_ru',
+            'translation' => 'bar (ru)',
+            'locale' => 'ru',
+            'domain' => 'messages',
+            'state' => DataCollectorTranslator::MESSAGE_EQUALS_FALLBACK,
+            'parameters' => array(),
+            'transChoiceNumber' => null,
         );
         $expectedMessages[] = array(
-              'id' => 'bar_ru',
-              'translation' => 'bar (ru)',
-              'locale' => 'ru',
-              'domain' => 'messages',
-              'state' => DataCollectorTranslator::MESSAGE_EQUALS_FALLBACK,
-              'parameters' => array('foo' => 'bar'),
-              'transChoiceNumber' => null,
+            'id' => 'bar_ru',
+            'translation' => 'bar (ru)',
+            'locale' => 'ru',
+            'domain' => 'messages',
+            'state' => DataCollectorTranslator::MESSAGE_EQUALS_FALLBACK,
+            'parameters' => array('foo' => 'bar'),
+            'transChoiceNumber' => null,
         );
 
         $this->assertEquals($expectedMessages, $collector->getCollectedMessages());
diff --git a/vendor/symfony/translation/Tests/DependencyInjection/TranslationDumperPassTest.php b/vendor/symfony/translation/Tests/DependencyInjection/TranslationDumperPassTest.php
index 3e02cb43..759bb0e9 100644
--- a/vendor/symfony/translation/Tests/DependencyInjection/TranslationDumperPassTest.php
+++ b/vendor/symfony/translation/Tests/DependencyInjection/TranslationDumperPassTest.php
@@ -35,8 +35,8 @@ class TranslationDumperPassTest extends TestCase
     {
         $container = new ContainerBuilder();
 
-        $definitionsBefore = count($container->getDefinitions());
-        $aliasesBefore = count($container->getAliases());
+        $definitionsBefore = \count($container->getDefinitions());
+        $aliasesBefore = \count($container->getAliases());
 
         $translationDumperPass = new TranslationDumperPass();
         $translationDumperPass->process($container);
diff --git a/vendor/symfony/translation/Tests/DependencyInjection/TranslationExtractorPassTest.php b/vendor/symfony/translation/Tests/DependencyInjection/TranslationExtractorPassTest.php
index b3313e63..14d164d0 100644
--- a/vendor/symfony/translation/Tests/DependencyInjection/TranslationExtractorPassTest.php
+++ b/vendor/symfony/translation/Tests/DependencyInjection/TranslationExtractorPassTest.php
@@ -35,8 +35,8 @@ class TranslationExtractorPassTest extends TestCase
     {
         $container = new ContainerBuilder();
 
-        $definitionsBefore = count($container->getDefinitions());
-        $aliasesBefore = count($container->getAliases());
+        $definitionsBefore = \count($container->getDefinitions());
+        $aliasesBefore = \count($container->getAliases());
 
         $translationDumperPass = new TranslationExtractorPass();
         $translationDumperPass->process($container);
diff --git a/vendor/symfony/translation/Tests/Dumper/CsvFileDumperTest.php b/vendor/symfony/translation/Tests/Dumper/CsvFileDumperTest.php
index 73fe922d..9a7a059a 100644
--- a/vendor/symfony/translation/Tests/Dumper/CsvFileDumperTest.php
+++ b/vendor/symfony/translation/Tests/Dumper/CsvFileDumperTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Translation\Tests\Dumper;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Dumper\CsvFileDumper;
+use Symfony\Component\Translation\MessageCatalogue;
 
 class CsvFileDumperTest extends TestCase
 {
diff --git a/vendor/symfony/translation/Tests/Dumper/FileDumperTest.php b/vendor/symfony/translation/Tests/Dumper/FileDumperTest.php
index 25b85610..d1524d6e 100644
--- a/vendor/symfony/translation/Tests/Dumper/FileDumperTest.php
+++ b/vendor/symfony/translation/Tests/Dumper/FileDumperTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Translation\Tests\Dumper;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Dumper\FileDumper;
+use Symfony\Component\Translation\MessageCatalogue;
 
 class FileDumperTest extends TestCase
 {
diff --git a/vendor/symfony/translation/Tests/Dumper/IcuResFileDumperTest.php b/vendor/symfony/translation/Tests/Dumper/IcuResFileDumperTest.php
index 2f19d08d..78d0abb6 100644
--- a/vendor/symfony/translation/Tests/Dumper/IcuResFileDumperTest.php
+++ b/vendor/symfony/translation/Tests/Dumper/IcuResFileDumperTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Translation\Tests\Dumper;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Dumper\IcuResFileDumper;
+use Symfony\Component\Translation\MessageCatalogue;
 
 class IcuResFileDumperTest extends TestCase
 {
diff --git a/vendor/symfony/translation/Tests/Dumper/IniFileDumperTest.php b/vendor/symfony/translation/Tests/Dumper/IniFileDumperTest.php
index 72bd9166..5f3c1236 100644
--- a/vendor/symfony/translation/Tests/Dumper/IniFileDumperTest.php
+++ b/vendor/symfony/translation/Tests/Dumper/IniFileDumperTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Translation\Tests\Dumper;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Dumper\IniFileDumper;
+use Symfony\Component\Translation\MessageCatalogue;
 
 class IniFileDumperTest extends TestCase
 {
diff --git a/vendor/symfony/translation/Tests/Dumper/JsonFileDumperTest.php b/vendor/symfony/translation/Tests/Dumper/JsonFileDumperTest.php
index 5e66f718..b134ce4f 100644
--- a/vendor/symfony/translation/Tests/Dumper/JsonFileDumperTest.php
+++ b/vendor/symfony/translation/Tests/Dumper/JsonFileDumperTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Translation\Tests\Dumper;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Dumper\JsonFileDumper;
+use Symfony\Component\Translation\MessageCatalogue;
 
 class JsonFileDumperTest extends TestCase
 {
diff --git a/vendor/symfony/translation/Tests/Dumper/MoFileDumperTest.php b/vendor/symfony/translation/Tests/Dumper/MoFileDumperTest.php
index 3a2054f3..d0519675 100644
--- a/vendor/symfony/translation/Tests/Dumper/MoFileDumperTest.php
+++ b/vendor/symfony/translation/Tests/Dumper/MoFileDumperTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Translation\Tests\Dumper;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Dumper\MoFileDumper;
+use Symfony\Component\Translation\MessageCatalogue;
 
 class MoFileDumperTest extends TestCase
 {
diff --git a/vendor/symfony/translation/Tests/Dumper/PhpFileDumperTest.php b/vendor/symfony/translation/Tests/Dumper/PhpFileDumperTest.php
index c2f70354..22a39dd4 100644
--- a/vendor/symfony/translation/Tests/Dumper/PhpFileDumperTest.php
+++ b/vendor/symfony/translation/Tests/Dumper/PhpFileDumperTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Translation\Tests\Dumper;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Dumper\PhpFileDumper;
+use Symfony\Component\Translation\MessageCatalogue;
 
 class PhpFileDumperTest extends TestCase
 {
diff --git a/vendor/symfony/translation/Tests/Dumper/PoFileDumperTest.php b/vendor/symfony/translation/Tests/Dumper/PoFileDumperTest.php
index b00c5d13..5d752471 100644
--- a/vendor/symfony/translation/Tests/Dumper/PoFileDumperTest.php
+++ b/vendor/symfony/translation/Tests/Dumper/PoFileDumperTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Translation\Tests\Dumper;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Dumper\PoFileDumper;
+use Symfony\Component\Translation\MessageCatalogue;
 
 class PoFileDumperTest extends TestCase
 {
diff --git a/vendor/symfony/translation/Tests/Dumper/QtFileDumperTest.php b/vendor/symfony/translation/Tests/Dumper/QtFileDumperTest.php
index 9213bbae..8e4a6f43 100644
--- a/vendor/symfony/translation/Tests/Dumper/QtFileDumperTest.php
+++ b/vendor/symfony/translation/Tests/Dumper/QtFileDumperTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Translation\Tests\Dumper;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Dumper\QtFileDumper;
+use Symfony\Component\Translation\MessageCatalogue;
 
 class QtFileDumperTest extends TestCase
 {
diff --git a/vendor/symfony/translation/Tests/Dumper/XliffFileDumperTest.php b/vendor/symfony/translation/Tests/Dumper/XliffFileDumperTest.php
index 738d4b3b..443dccf2 100644
--- a/vendor/symfony/translation/Tests/Dumper/XliffFileDumperTest.php
+++ b/vendor/symfony/translation/Tests/Dumper/XliffFileDumperTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Translation\Tests\Dumper;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Dumper\XliffFileDumper;
+use Symfony\Component\Translation\MessageCatalogue;
 
 class XliffFileDumperTest extends TestCase
 {
diff --git a/vendor/symfony/translation/Tests/Dumper/YamlFileDumperTest.php b/vendor/symfony/translation/Tests/Dumper/YamlFileDumperTest.php
index 0541ac10..a5549a2e 100644
--- a/vendor/symfony/translation/Tests/Dumper/YamlFileDumperTest.php
+++ b/vendor/symfony/translation/Tests/Dumper/YamlFileDumperTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Translation\Tests\Dumper;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Dumper\YamlFileDumper;
+use Symfony\Component\Translation\MessageCatalogue;
 
 class YamlFileDumperTest extends TestCase
 {
diff --git a/vendor/symfony/translation/Tests/Loader/CsvFileLoaderTest.php b/vendor/symfony/translation/Tests/Loader/CsvFileLoaderTest.php
index 27a4456e..29efdef0 100644
--- a/vendor/symfony/translation/Tests/Loader/CsvFileLoaderTest.php
+++ b/vendor/symfony/translation/Tests/Loader/CsvFileLoaderTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Translation\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\Loader\CsvFileLoader;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Translation\Loader\CsvFileLoader;
 
 class CsvFileLoaderTest extends TestCase
 {
diff --git a/vendor/symfony/translation/Tests/Loader/IcuDatFileLoaderTest.php b/vendor/symfony/translation/Tests/Loader/IcuDatFileLoaderTest.php
index 888fb615..e28db601 100644
--- a/vendor/symfony/translation/Tests/Loader/IcuDatFileLoaderTest.php
+++ b/vendor/symfony/translation/Tests/Loader/IcuDatFileLoaderTest.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Translation\Tests\Loader;
 
-use Symfony\Component\Translation\Loader\IcuDatFileLoader;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Translation\Loader\IcuDatFileLoader;
 
 /**
  * @requires extension intl
diff --git a/vendor/symfony/translation/Tests/Loader/IcuResFileLoaderTest.php b/vendor/symfony/translation/Tests/Loader/IcuResFileLoaderTest.php
index 8d9ed199..92d8933c 100644
--- a/vendor/symfony/translation/Tests/Loader/IcuResFileLoaderTest.php
+++ b/vendor/symfony/translation/Tests/Loader/IcuResFileLoaderTest.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Translation\Tests\Loader;
 
-use Symfony\Component\Translation\Loader\IcuResFileLoader;
 use Symfony\Component\Config\Resource\DirectoryResource;
+use Symfony\Component\Translation\Loader\IcuResFileLoader;
 
 /**
  * @requires extension intl
diff --git a/vendor/symfony/translation/Tests/Loader/IniFileLoaderTest.php b/vendor/symfony/translation/Tests/Loader/IniFileLoaderTest.php
index dbf22d10..d9dcc5e8 100644
--- a/vendor/symfony/translation/Tests/Loader/IniFileLoaderTest.php
+++ b/vendor/symfony/translation/Tests/Loader/IniFileLoaderTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Translation\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\Loader\IniFileLoader;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Translation\Loader\IniFileLoader;
 
 class IniFileLoaderTest extends TestCase
 {
diff --git a/vendor/symfony/translation/Tests/Loader/JsonFileLoaderTest.php b/vendor/symfony/translation/Tests/Loader/JsonFileLoaderTest.php
index 46261b66..cea0aef4 100644
--- a/vendor/symfony/translation/Tests/Loader/JsonFileLoaderTest.php
+++ b/vendor/symfony/translation/Tests/Loader/JsonFileLoaderTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Translation\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\Loader\JsonFileLoader;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Translation\Loader\JsonFileLoader;
 
 class JsonFileLoaderTest extends TestCase
 {
diff --git a/vendor/symfony/translation/Tests/Loader/LocalizedTestCase.php b/vendor/symfony/translation/Tests/Loader/LocalizedTestCase.php
index a655c69d..279e9fde 100644
--- a/vendor/symfony/translation/Tests/Loader/LocalizedTestCase.php
+++ b/vendor/symfony/translation/Tests/Loader/LocalizedTestCase.php
@@ -17,7 +17,7 @@ abstract class LocalizedTestCase extends TestCase
 {
     protected function setUp()
     {
-        if (!extension_loaded('intl')) {
+        if (!\extension_loaded('intl')) {
             $this->markTestSkipped('Extension intl is required.');
         }
     }
diff --git a/vendor/symfony/translation/Tests/Loader/MoFileLoaderTest.php b/vendor/symfony/translation/Tests/Loader/MoFileLoaderTest.php
index b9f754fc..6ad3d44d 100644
--- a/vendor/symfony/translation/Tests/Loader/MoFileLoaderTest.php
+++ b/vendor/symfony/translation/Tests/Loader/MoFileLoaderTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Translation\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\Loader\MoFileLoader;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Translation\Loader\MoFileLoader;
 
 class MoFileLoaderTest extends TestCase
 {
diff --git a/vendor/symfony/translation/Tests/Loader/PhpFileLoaderTest.php b/vendor/symfony/translation/Tests/Loader/PhpFileLoaderTest.php
index 9fc83e34..01b7a5fe 100644
--- a/vendor/symfony/translation/Tests/Loader/PhpFileLoaderTest.php
+++ b/vendor/symfony/translation/Tests/Loader/PhpFileLoaderTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Translation\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\Loader\PhpFileLoader;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Translation\Loader\PhpFileLoader;
 
 class PhpFileLoaderTest extends TestCase
 {
diff --git a/vendor/symfony/translation/Tests/Loader/PoFileLoaderTest.php b/vendor/symfony/translation/Tests/Loader/PoFileLoaderTest.php
index 884dec9a..4176cb7f 100644
--- a/vendor/symfony/translation/Tests/Loader/PoFileLoaderTest.php
+++ b/vendor/symfony/translation/Tests/Loader/PoFileLoaderTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Translation\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\Loader\PoFileLoader;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Translation\Loader\PoFileLoader;
 
 class PoFileLoaderTest extends TestCase
 {
diff --git a/vendor/symfony/translation/Tests/Loader/QtFileLoaderTest.php b/vendor/symfony/translation/Tests/Loader/QtFileLoaderTest.php
index 7ee62b06..8a00fded 100644
--- a/vendor/symfony/translation/Tests/Loader/QtFileLoaderTest.php
+++ b/vendor/symfony/translation/Tests/Loader/QtFileLoaderTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Translation\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\Loader\QtFileLoader;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Translation\Loader\QtFileLoader;
 
 class QtFileLoaderTest extends TestCase
 {
diff --git a/vendor/symfony/translation/Tests/Loader/XliffFileLoaderTest.php b/vendor/symfony/translation/Tests/Loader/XliffFileLoaderTest.php
index a8182895..94406fd5 100644
--- a/vendor/symfony/translation/Tests/Loader/XliffFileLoaderTest.php
+++ b/vendor/symfony/translation/Tests/Loader/XliffFileLoaderTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Translation\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\Loader\XliffFileLoader;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Translation\Loader\XliffFileLoader;
 
 class XliffFileLoaderTest extends TestCase
 {
diff --git a/vendor/symfony/translation/Tests/Loader/YamlFileLoaderTest.php b/vendor/symfony/translation/Tests/Loader/YamlFileLoaderTest.php
index e1ba514b..bb3c1a99 100644
--- a/vendor/symfony/translation/Tests/Loader/YamlFileLoaderTest.php
+++ b/vendor/symfony/translation/Tests/Loader/YamlFileLoaderTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Translation\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\Loader\YamlFileLoader;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Translation\Loader\YamlFileLoader;
 
 class YamlFileLoaderTest extends TestCase
 {
diff --git a/vendor/symfony/translation/Tests/LoggingTranslatorTest.php b/vendor/symfony/translation/Tests/LoggingTranslatorTest.php
index 891230a2..022379e9 100644
--- a/vendor/symfony/translation/Tests/LoggingTranslatorTest.php
+++ b/vendor/symfony/translation/Tests/LoggingTranslatorTest.php
@@ -12,9 +12,9 @@
 namespace Symfony\Component\Translation\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\Translator;
-use Symfony\Component\Translation\LoggingTranslator;
 use Symfony\Component\Translation\Loader\ArrayLoader;
+use Symfony\Component\Translation\LoggingTranslator;
+use Symfony\Component\Translation\Translator;
 
 class LoggingTranslatorTest extends TestCase
 {
diff --git a/vendor/symfony/translation/Tests/PluralizationRulesTest.php b/vendor/symfony/translation/Tests/PluralizationRulesTest.php
index a0624e29..5eb6c01f 100644
--- a/vendor/symfony/translation/Tests/PluralizationRulesTest.php
+++ b/vendor/symfony/translation/Tests/PluralizationRulesTest.php
@@ -100,9 +100,9 @@ class PluralizationRulesTest extends TestCase
         foreach ($matrix as $langCode => $data) {
             $indexes = array_flip($data);
             if ($expectSuccess) {
-                $this->assertEquals($nplural, count($indexes), "Langcode '$langCode' has '$nplural' plural forms.");
+                $this->assertEquals($nplural, \count($indexes), "Langcode '$langCode' has '$nplural' plural forms.");
             } else {
-                $this->assertNotEquals((int) $nplural, count($indexes), "Langcode '$langCode' has '$nplural' plural forms.");
+                $this->assertNotEquals((int) $nplural, \count($indexes), "Langcode '$langCode' has '$nplural' plural forms.");
             }
         }
     }
diff --git a/vendor/symfony/translation/Tests/TranslatorCacheTest.php b/vendor/symfony/translation/Tests/TranslatorCacheTest.php
index a60690f8..3e71ae74 100644
--- a/vendor/symfony/translation/Tests/TranslatorCacheTest.php
+++ b/vendor/symfony/translation/Tests/TranslatorCacheTest.php
@@ -15,8 +15,8 @@ use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Resource\SelfCheckingResourceInterface;
 use Symfony\Component\Translation\Loader\ArrayLoader;
 use Symfony\Component\Translation\Loader\LoaderInterface;
-use Symfony\Component\Translation\Translator;
 use Symfony\Component\Translation\MessageCatalogue;
+use Symfony\Component\Translation\Translator;
 
 class TranslatorCacheTest extends TestCase
 {
diff --git a/vendor/symfony/translation/Tests/TranslatorTest.php b/vendor/symfony/translation/Tests/TranslatorTest.php
index d30ea587..3e54839f 100644
--- a/vendor/symfony/translation/Tests/TranslatorTest.php
+++ b/vendor/symfony/translation/Tests/TranslatorTest.php
@@ -12,9 +12,9 @@
 namespace Symfony\Component\Translation\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Translation\Translator;
 use Symfony\Component\Translation\Loader\ArrayLoader;
 use Symfony\Component\Translation\MessageCatalogue;
+use Symfony\Component\Translation\Translator;
 
 class TranslatorTest extends TestCase
 {
@@ -297,12 +297,12 @@ class TranslatorTest extends TestCase
 
         $resources = $translator->getCatalogue('en')->getResources();
         $this->assertCount(1, $resources);
-        $this->assertContains(__DIR__.DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'resources.yml', $resources);
+        $this->assertContains(__DIR__.\DIRECTORY_SEPARATOR.'fixtures'.\DIRECTORY_SEPARATOR.'resources.yml', $resources);
 
         $resources = $translator->getCatalogue('en_GB')->getResources();
         $this->assertCount(2, $resources);
-        $this->assertContains(__DIR__.DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'empty.yml', $resources);
-        $this->assertContains(__DIR__.DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'resources.yml', $resources);
+        $this->assertContains(__DIR__.\DIRECTORY_SEPARATOR.'fixtures'.\DIRECTORY_SEPARATOR.'empty.yml', $resources);
+        $this->assertContains(__DIR__.\DIRECTORY_SEPARATOR.'fixtures'.\DIRECTORY_SEPARATOR.'resources.yml', $resources);
     }
 
     /**
diff --git a/vendor/symfony/translation/Translator.php b/vendor/symfony/translation/Translator.php
index 2899db01..97690410 100644
--- a/vendor/symfony/translation/Translator.php
+++ b/vendor/symfony/translation/Translator.php
@@ -11,17 +11,17 @@
 
 namespace Symfony\Component\Translation;
 
-use Symfony\Component\Translation\Loader\LoaderInterface;
-use Symfony\Component\Translation\Exception\NotFoundResourceException;
+use Symfony\Component\Config\ConfigCacheFactory;
+use Symfony\Component\Config\ConfigCacheFactoryInterface;
+use Symfony\Component\Config\ConfigCacheInterface;
 use Symfony\Component\Translation\Exception\InvalidArgumentException;
 use Symfony\Component\Translation\Exception\LogicException;
+use Symfony\Component\Translation\Exception\NotFoundResourceException;
 use Symfony\Component\Translation\Exception\RuntimeException;
-use Symfony\Component\Config\ConfigCacheInterface;
-use Symfony\Component\Config\ConfigCacheFactoryInterface;
-use Symfony\Component\Config\ConfigCacheFactory;
-use Symfony\Component\Translation\Formatter\MessageFormatterInterface;
 use Symfony\Component\Translation\Formatter\ChoiceMessageFormatterInterface;
 use Symfony\Component\Translation\Formatter\MessageFormatter;
+use Symfony\Component\Translation\Formatter\MessageFormatterInterface;
+use Symfony\Component\Translation\Loader\LoaderInterface;
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
@@ -125,7 +125,7 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
 
         $this->resources[$locale][] = array($format, $resource, $domain);
 
-        if (in_array($locale, $this->fallbackLocales)) {
+        if (\in_array($locale, $this->fallbackLocales)) {
             $this->catalogues = array();
         } else {
             unset($this->catalogues[$locale]);
@@ -196,7 +196,7 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
     public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
     {
         if (!$this->formatter instanceof ChoiceMessageFormatterInterface) {
-            throw new LogicException(sprintf('The formatter "%s" does not support plural translations.', get_class($this->formatter)));
+            throw new LogicException(sprintf('The formatter "%s" does not support plural translations.', \get_class($this->formatter)));
         }
 
         if (null === $domain) {
@@ -402,7 +402,7 @@ EOF
         }
 
         if (false !== strrchr($locale, '_')) {
-            array_unshift($locales, substr($locale, 0, -strlen(strrchr($locale, '_'))));
+            array_unshift($locales, substr($locale, 0, -\strlen(strrchr($locale, '_'))));
         }
 
         return array_unique($locales);
diff --git a/vendor/symfony/translation/Util/ArrayConverter.php b/vendor/symfony/translation/Util/ArrayConverter.php
index 9c0a420a..b98e7ce8 100644
--- a/vendor/symfony/translation/Util/ArrayConverter.php
+++ b/vendor/symfony/translation/Util/ArrayConverter.php
@@ -54,7 +54,7 @@ class ArrayConverter
         $parentOfElem = null;
 
         foreach ($parts as $i => $part) {
-            if (isset($elem[$part]) && is_string($elem[$part])) {
+            if (isset($elem[$part]) && \is_string($elem[$part])) {
                 /* Process next case:
                  *    'foo': 'test1',
                  *    'foo.bar': 'test2'
@@ -62,14 +62,14 @@ class ArrayConverter
                  * $tree['foo'] was string before we found array {bar: test2}.
                  *  Treat new element as string too, e.g. add $tree['foo.bar'] = 'test2';
                  */
-                $elem = &$elem[implode('.', array_slice($parts, $i))];
+                $elem = &$elem[implode('.', \array_slice($parts, $i))];
                 break;
             }
             $parentOfElem = &$elem;
             $elem = &$elem[$part];
         }
 
-        if (is_array($elem) && count($elem) > 0 && $parentOfElem) {
+        if (\is_array($elem) && \count($elem) > 0 && $parentOfElem) {
             /* Process next case:
              *    'foo.bar': 'test1'
              *    'foo': 'test2'
@@ -89,7 +89,7 @@ class ArrayConverter
         $prefix .= '.';
 
         foreach ($node as $id => $value) {
-            if (is_string($value)) {
+            if (\is_string($value)) {
                 $tree[$prefix.$id] = $value;
             } else {
                 self::cancelExpand($tree, $prefix.$id, $value);
diff --git a/vendor/symfony/translation/Writer/TranslationWriter.php b/vendor/symfony/translation/Writer/TranslationWriter.php
index c03ded3c..762733b4 100644
--- a/vendor/symfony/translation/Writer/TranslationWriter.php
+++ b/vendor/symfony/translation/Writer/TranslationWriter.php
@@ -11,10 +11,10 @@
 
 namespace Symfony\Component\Translation\Writer;
 
-use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Dumper\DumperInterface;
 use Symfony\Component\Translation\Exception\InvalidArgumentException;
 use Symfony\Component\Translation\Exception\RuntimeException;
+use Symfony\Component\Translation\MessageCatalogue;
 
 /**
  * TranslationWriter writes translation messages.
@@ -43,7 +43,7 @@ class TranslationWriter implements TranslationWriterInterface
      */
     public function disableBackup()
     {
-        @trigger_error(sprintf('The %s() method is deprecated since Symfony 4.1.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1.', __METHOD__), E_USER_DEPRECATED);
 
         foreach ($this->dumpers as $dumper) {
             if (method_exists($dumper, 'setBackup')) {
diff --git a/vendor/symfony/var-dumper/CHANGELOG.md b/vendor/symfony/var-dumper/CHANGELOG.md
index 2d44cad2..34d9bbb0 100644
--- a/vendor/symfony/var-dumper/CHANGELOG.md
+++ b/vendor/symfony/var-dumper/CHANGELOG.md
@@ -1,6 +1,25 @@
 CHANGELOG
 =========
 
+4.1.0
+-----
+
+ * added a `ServerDumper` to send serialized Data clones to a server
+ * added a `ServerDumpCommand` and `DumpServer` to run a server collecting
+   and displaying dumps on a single place with multiple formats support
+ * added `CliDescriptor` and `HtmlDescriptor` descriptors for `server:dump` CLI and HTML formats support
+
+4.0.0
+-----
+
+ * support for passing `\ReflectionClass` instances to the `Caster::castObject()`
+   method has been dropped, pass class names as strings instead
+ * the `Data::getRawData()` method has been removed
+ * the `VarDumperTestTrait::assertDumpEquals()` method expects a 3rd `$context = null`
+   argument and moves `$message = ''` argument at 4th position.
+ * the `VarDumperTestTrait::assertDumpMatchesFormat()` method expects a 3rd `$context = null`
+   argument and moves `$message = ''` argument at 4th position.
+
 3.4.0
 -----
 
diff --git a/vendor/symfony/var-dumper/Caster/ArgsStub.php b/vendor/symfony/var-dumper/Caster/ArgsStub.php
index 6675caa0..582d15e2 100644
--- a/vendor/symfony/var-dumper/Caster/ArgsStub.php
+++ b/vendor/symfony/var-dumper/Caster/ArgsStub.php
@@ -22,7 +22,7 @@ class ArgsStub extends EnumStub
 {
     private static $parameters = array();
 
-    public function __construct(array $args, $function, $class)
+    public function __construct(array $args, string $function, ?string $class)
     {
         list($variadic, $params) = self::getParameters($function, $class);
 
@@ -35,10 +35,10 @@ class ArgsStub extends EnumStub
 
             return;
         }
-        if (count($values) < count($params)) {
-            $params = array_slice($params, 0, count($values));
-        } elseif (count($values) > count($params)) {
-            $values[] = new EnumStub(array_splice($values, count($params)), false);
+        if (\count($values) < \count($params)) {
+            $params = \array_slice($params, 0, \count($values));
+        } elseif (\count($values) > \count($params)) {
+            $values[] = new EnumStub(array_splice($values, \count($params)), false);
             $params[] = $variadic;
         }
         if (array('...') === $params) {
@@ -68,7 +68,7 @@ class ArgsStub extends EnumStub
             if ($v->isPassedByReference()) {
                 $k = '&'.$k;
             }
-            if (method_exists($v, 'isVariadic') && $v->isVariadic()) {
+            if ($v->isVariadic()) {
                 $variadic .= $k;
             } else {
                 $params[] = $k;
diff --git a/vendor/symfony/var-dumper/Caster/Caster.php b/vendor/symfony/var-dumper/Caster/Caster.php
index 2676fb78..c82ce827 100644
--- a/vendor/symfony/var-dumper/Caster/Caster.php
+++ b/vendor/symfony/var-dumper/Caster/Caster.php
@@ -48,11 +48,6 @@ class Caster
      */
     public static function castObject($obj, $class, $hasDebugInfo = false)
     {
-        if ($class instanceof \ReflectionClass) {
-            @trigger_error(sprintf('Passing a ReflectionClass to %s() is deprecated since Symfony 3.3 and will be unsupported in 4.0. Pass the class name as string instead.', __METHOD__), E_USER_DEPRECATED);
-            $hasDebugInfo = $class->hasMethod('__debugInfo');
-            $class = $class->name;
-        }
         if ($hasDebugInfo) {
             $a = $obj->__debugInfo();
         } elseif ($obj instanceof \Closure) {
@@ -122,10 +117,10 @@ class Caster
             } elseif (false === $v || '' === $v || '0' === $v || 0 === $v || 0.0 === $v || array() === $v) {
                 $type |= self::EXCLUDE_EMPTY & $filter;
             }
-            if ((self::EXCLUDE_NOT_IMPORTANT & $filter) && !in_array($k, $listedProperties, true)) {
+            if ((self::EXCLUDE_NOT_IMPORTANT & $filter) && !\in_array($k, $listedProperties, true)) {
                 $type |= self::EXCLUDE_NOT_IMPORTANT;
             }
-            if ((self::EXCLUDE_VERBOSE & $filter) && in_array($k, $listedProperties, true)) {
+            if ((self::EXCLUDE_VERBOSE & $filter) && \in_array($k, $listedProperties, true)) {
                 $type |= self::EXCLUDE_VERBOSE;
             }
 
diff --git a/vendor/symfony/var-dumper/Caster/ClassStub.php b/vendor/symfony/var-dumper/Caster/ClassStub.php
index 2e1f41c1..b609a6ed 100644
--- a/vendor/symfony/var-dumper/Caster/ClassStub.php
+++ b/vendor/symfony/var-dumper/Caster/ClassStub.php
@@ -22,12 +22,12 @@ class ClassStub extends ConstStub
      * @param string   A PHP identifier, e.g. a class, method, interface, etc. name
      * @param callable The callable targeted by the identifier when it is ambiguous or not a real PHP identifier
      */
-    public function __construct($identifier, $callable = null)
+    public function __construct(string $identifier, $callable = null)
     {
         $this->value = $identifier;
 
         if (0 < $i = strrpos($identifier, '\\')) {
-            $this->attr['ellipsis'] = strlen($identifier) - $i;
+            $this->attr['ellipsis'] = \strlen($identifier) - $i;
             $this->attr['ellipsis-type'] = 'class';
             $this->attr['ellipsis-tail'] = 1;
         }
@@ -36,9 +36,9 @@ class ClassStub extends ConstStub
             if (null !== $callable) {
                 if ($callable instanceof \Closure) {
                     $r = new \ReflectionFunction($callable);
-                } elseif (is_object($callable)) {
+                } elseif (\is_object($callable)) {
                     $r = array($callable, '__invoke');
-                } elseif (is_array($callable)) {
+                } elseif (\is_array($callable)) {
                     $r = $callable;
                 } elseif (false !== $i = strpos($callable, '::')) {
                     $r = array(substr($callable, 0, $i), substr($callable, 2 + $i));
@@ -51,7 +51,7 @@ class ClassStub extends ConstStub
                 $r = new \ReflectionClass($identifier);
             }
 
-            if (is_array($r)) {
+            if (\is_array($r)) {
                 try {
                     $r = new \ReflectionMethod($r[0], $r[1]);
                 } catch (\ReflectionException $e) {
@@ -70,13 +70,13 @@ class ClassStub extends ConstStub
 
     public static function wrapCallable($callable)
     {
-        if (is_object($callable) || !is_callable($callable)) {
+        if (\is_object($callable) || !\is_callable($callable)) {
             return $callable;
         }
 
-        if (!is_array($callable)) {
+        if (!\is_array($callable)) {
             $callable = new static($callable);
-        } elseif (is_string($callable[0])) {
+        } elseif (\is_string($callable[0])) {
             $callable[0] = new static($callable[0]);
         } else {
             $callable[1] = new static($callable[1], $callable);
diff --git a/vendor/symfony/var-dumper/Caster/ConstStub.php b/vendor/symfony/var-dumper/Caster/ConstStub.php
index 26c0010b..250a250a 100644
--- a/vendor/symfony/var-dumper/Caster/ConstStub.php
+++ b/vendor/symfony/var-dumper/Caster/ConstStub.php
@@ -20,7 +20,7 @@ use Symfony\Component\VarDumper\Cloner\Stub;
  */
 class ConstStub extends Stub
 {
-    public function __construct($name, $value)
+    public function __construct(string $name, $value)
     {
         $this->class = $name;
         $this->value = $value;
diff --git a/vendor/symfony/var-dumper/Caster/CutArrayStub.php b/vendor/symfony/var-dumper/Caster/CutArrayStub.php
index f2a80305..0e4fb363 100644
--- a/vendor/symfony/var-dumper/Caster/CutArrayStub.php
+++ b/vendor/symfony/var-dumper/Caster/CutArrayStub.php
@@ -25,6 +25,6 @@ class CutArrayStub extends CutStub
         parent::__construct($value);
 
         $this->preservedSubset = array_intersect_key($value, array_flip($preservedKeys));
-        $this->cut -= count($this->preservedSubset);
+        $this->cut -= \count($this->preservedSubset);
     }
 }
diff --git a/vendor/symfony/var-dumper/Caster/CutStub.php b/vendor/symfony/var-dumper/Caster/CutStub.php
index 61140eb3..690338f5 100644
--- a/vendor/symfony/var-dumper/Caster/CutStub.php
+++ b/vendor/symfony/var-dumper/Caster/CutStub.php
@@ -24,17 +24,17 @@ class CutStub extends Stub
     {
         $this->value = $value;
 
-        switch (gettype($value)) {
+        switch (\gettype($value)) {
             case 'object':
                 $this->type = self::TYPE_OBJECT;
-                $this->class = get_class($value);
+                $this->class = \get_class($value);
                 $this->cut = -1;
                 break;
 
             case 'array':
                 $this->type = self::TYPE_ARRAY;
                 $this->class = self::ARRAY_ASSOC;
-                $this->cut = $this->value = count($value);
+                $this->cut = $this->value = \count($value);
                 break;
 
             case 'resource':
@@ -51,7 +51,7 @@ class CutStub extends Stub
             case 'string':
                 $this->type = self::TYPE_STRING;
                 $this->class = preg_match('//u', $value) ? self::STRING_UTF8 : self::STRING_BINARY;
-                $this->cut = self::STRING_BINARY === $this->class ? strlen($value) : mb_strlen($value, 'UTF-8');
+                $this->cut = self::STRING_BINARY === $this->class ? \strlen($value) : mb_strlen($value, 'UTF-8');
                 $this->value = '';
                 break;
         }
diff --git a/vendor/symfony/var-dumper/Caster/DateCaster.php b/vendor/symfony/var-dumper/Caster/DateCaster.php
index 7e883129..da6a5a70 100644
--- a/vendor/symfony/var-dumper/Caster/DateCaster.php
+++ b/vendor/symfony/var-dumper/Caster/DateCaster.php
@@ -20,6 +20,8 @@ use Symfony\Component\VarDumper\Cloner\Stub;
  */
 class DateCaster
 {
+    private const PERIOD_LIMIT = 3;
+
     public static function castDateTime(\DateTimeInterface $d, array $a, Stub $stub, $isNested, $filter)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
@@ -61,12 +63,7 @@ class DateCaster
             $format .= ($i->y ? '%yy ' : '').($i->m ? '%mm ' : '').($i->d ? '%dd ' : '');
         }
 
-        if (\PHP_VERSION_ID >= 70100 && isset($i->f)) {
-            $format .= $i->h || $i->i || $i->s || $i->f ? '%H:%I:'.self::formatSeconds($i->s, substr($i->f, 2)) : '';
-        } else {
-            $format .= $i->h || $i->i || $i->s ? '%H:%I:%S' : '';
-        }
-
+        $format .= $i->h || $i->i || $i->s || $i->f ? '%H:%I:'.self::formatSeconds($i->s, substr($i->f, 2)) : '';
         $format = '%R ' === $format ? '0s' : $format;
 
         return $i->format(rtrim($format));
@@ -76,7 +73,7 @@ class DateCaster
     {
         $location = $timeZone->getLocation();
         $formatted = (new \DateTime('now', $timeZone))->format($location ? 'e (P)' : 'P');
-        $title = $location && extension_loaded('intl') ? \Locale::getDisplayRegion('-'.$location['country_code'], \Locale::getDefault()) : '';
+        $title = $location && \extension_loaded('intl') ? \Locale::getDisplayRegion('-'.$location['country_code']) : '';
 
         $z = array(Caster::PREFIX_VIRTUAL.'timezone' => new ConstStub($formatted, $title));
 
@@ -85,14 +82,10 @@ class DateCaster
 
     public static function castPeriod(\DatePeriod $p, array $a, Stub $stub, $isNested, $filter)
     {
-        if (defined('HHVM_VERSION_ID') || \PHP_VERSION_ID < 50620 || (\PHP_VERSION_ID >= 70000 && \PHP_VERSION_ID < 70005)) { // see https://bugs.php.net/bug.php?id=71635
-            return $a;
-        }
-
         $dates = array();
         if (\PHP_VERSION_ID >= 70107) { // see https://bugs.php.net/bug.php?id=74639
             foreach (clone $p as $i => $d) {
-                if (3 === $i) {
+                if (self::PERIOD_LIMIT === $i) {
                     $now = new \DateTimeImmutable();
                     $dates[] = sprintf('%s more', ($end = $p->getEndDate())
                         ? ceil(($end->format('U.u') - $d->format('U.u')) / ($now->add($p->getDateInterval())->format('U.u') - $now->format('U.u')))
@@ -124,6 +117,6 @@ class DateCaster
 
     private static function formatSeconds($s, $us)
     {
-        return sprintf('%02d.%s', $s, 0 === ($len = strlen($t = rtrim($us, '0'))) ? '0' : ($len <= 3 ? str_pad($t, 3, '0') : $us));
+        return sprintf('%02d.%s', $s, 0 === ($len = \strlen($t = rtrim($us, '0'))) ? '0' : ($len <= 3 ? str_pad($t, 3, '0') : $us));
     }
 }
diff --git a/vendor/symfony/var-dumper/Caster/DoctrineCaster.php b/vendor/symfony/var-dumper/Caster/DoctrineCaster.php
index f6573b34..785d0270 100644
--- a/vendor/symfony/var-dumper/Caster/DoctrineCaster.php
+++ b/vendor/symfony/var-dumper/Caster/DoctrineCaster.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\VarDumper\Caster;
 
 use Doctrine\Common\Proxy\Proxy as CommonProxy;
-use Doctrine\ORM\Proxy\Proxy as OrmProxy;
 use Doctrine\ORM\PersistentCollection;
+use Doctrine\ORM\Proxy\Proxy as OrmProxy;
 use Symfony\Component\VarDumper\Cloner\Stub;
 
 /**
diff --git a/vendor/symfony/var-dumper/Caster/EnumStub.php b/vendor/symfony/var-dumper/Caster/EnumStub.php
index 3cee23ea..7a4e98a2 100644
--- a/vendor/symfony/var-dumper/Caster/EnumStub.php
+++ b/vendor/symfony/var-dumper/Caster/EnumStub.php
@@ -22,7 +22,7 @@ class EnumStub extends Stub
 {
     public $dumpKeys = true;
 
-    public function __construct(array $values, $dumpKeys = true)
+    public function __construct(array $values, bool $dumpKeys = true)
     {
         $this->value = $values;
         $this->dumpKeys = $dumpKeys;
diff --git a/vendor/symfony/var-dumper/Caster/ExceptionCaster.php b/vendor/symfony/var-dumper/Caster/ExceptionCaster.php
index df61aefb..49df71da 100644
--- a/vendor/symfony/var-dumper/Caster/ExceptionCaster.php
+++ b/vendor/symfony/var-dumper/Caster/ExceptionCaster.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\VarDumper\Caster;
 
 use Symfony\Component\Debug\Exception\SilencedErrorContext;
-use Symfony\Component\VarDumper\Exception\ThrowingCasterException;
 use Symfony\Component\VarDumper\Cloner\Stub;
+use Symfony\Component\VarDumper\Exception\ThrowingCasterException;
 
 /**
  * Casts common Exception classes to array representation.
@@ -71,8 +71,8 @@ class ExceptionCaster
 
         if (isset($a[$xPrefix.'previous'], $a[$trace]) && $a[$xPrefix.'previous'] instanceof \Exception) {
             $b = (array) $a[$xPrefix.'previous'];
-            self::traceUnshift($b[$xPrefix.'trace'], get_class($a[$xPrefix.'previous']), $b[$prefix.'file'], $b[$prefix.'line']);
-            $a[$trace] = new TraceStub($b[$xPrefix.'trace'], false, 0, -count($a[$trace]->value));
+            self::traceUnshift($b[$xPrefix.'trace'], \get_class($a[$xPrefix.'previous']), $b[$prefix.'file'], $b[$prefix.'line']);
+            $a[$trace] = new TraceStub($b[$xPrefix.'trace'], false, 0, -\count($a[$trace]->value));
         }
 
         unset($a[$xPrefix.'previous'], $a[$prefix.'code'], $a[$prefix.'file'], $a[$prefix.'line']);
@@ -118,7 +118,7 @@ class ExceptionCaster
         $prefix = Caster::PREFIX_VIRTUAL;
 
         $a = array();
-        $j = count($frames);
+        $j = \count($frames);
         if (0 > $i = $trace->sliceOffset) {
             $i = max(0, $j + $i);
         }
@@ -175,7 +175,7 @@ class ExceptionCaster
             $lastCall = $call;
         }
         if (null !== $trace->sliceLength) {
-            $a = array_slice($a, 0, $trace->sliceLength, true);
+            $a = \array_slice($a, 0, $trace->sliceLength, true);
         }
 
         return $a;
@@ -199,7 +199,7 @@ class ExceptionCaster
                 $a[$prefix.'src'] = self::$framesCache[$cacheKey];
             } else {
                 if (preg_match('/\((\d+)\)(?:\([\da-f]{32}\))? : (?:eval\(\)\'d code|runtime-created function)$/', $f['file'], $match)) {
-                    $f['file'] = substr($f['file'], 0, -strlen($match[0]));
+                    $f['file'] = substr($f['file'], 0, -\strlen($match[0]));
                     $f['line'] = (int) $match[1];
                 }
                 $caller = isset($f['function']) ? sprintf('in %s() on line %d', (isset($f['class']) ? $f['class'].$f['type'] : '').$f['function'], $f['line']) : null;
@@ -212,7 +212,7 @@ class ExceptionCaster
 
                 if (file_exists($f['file']) && 0 <= self::$srcContext) {
                     if (!empty($f['class']) && (is_subclass_of($f['class'], 'Twig\Template') || is_subclass_of($f['class'], 'Twig_Template')) && method_exists($f['class'], 'getDebugInfo')) {
-                        $template = isset($f['object']) ? $f['object'] : unserialize(sprintf('O:%d:"%s":0:{}', strlen($f['class']), $f['class']));
+                        $template = isset($f['object']) ? $f['object'] : unserialize(sprintf('O:%d:"%s":0:{}', \strlen($f['class']), $f['class']));
 
                         $ellipsis = 0;
                         $templateSrc = method_exists($template, 'getSourceContext') ? $template->getSourceContext()->getCode() : (method_exists($template, 'getSource') ? $template->getSource() : '');
@@ -231,7 +231,7 @@ class ExceptionCaster
                         $src = self::extractSource(file_get_contents($f['file']), $f['line'], self::$srcContext, $caller, 'php', $f['file']);
                         $srcKey .= ':'.$f['line'];
                         if ($ellipsis) {
-                            $ellipsis += 1 + strlen($f['line']);
+                            $ellipsis += 1 + \strlen($f['line']);
                         }
                     }
                     $srcAttr .= '&separator= ';
diff --git a/vendor/symfony/var-dumper/Caster/FrameStub.php b/vendor/symfony/var-dumper/Caster/FrameStub.php
index 1e1194dc..87867552 100644
--- a/vendor/symfony/var-dumper/Caster/FrameStub.php
+++ b/vendor/symfony/var-dumper/Caster/FrameStub.php
@@ -21,7 +21,7 @@ class FrameStub extends EnumStub
     public $keepArgs;
     public $inTraceStub;
 
-    public function __construct(array $frame, $keepArgs = true, $inTraceStub = false)
+    public function __construct(array $frame, bool $keepArgs = true, bool $inTraceStub = false)
     {
         $this->value = $frame;
         $this->keepArgs = $keepArgs;
diff --git a/vendor/symfony/var-dumper/Caster/GmpCaster.php b/vendor/symfony/var-dumper/Caster/GmpCaster.php
new file mode 100644
index 00000000..504dc078
--- /dev/null
+++ b/vendor/symfony/var-dumper/Caster/GmpCaster.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * Casts GMP objects to array representation.
+ *
+ * @author Hamza Amrouche <hamza.simperfit@gmail.com>
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class GmpCaster
+{
+    public static function castGmp(\GMP $gmp, array $a, Stub $stub, $isNested, $filter): array
+    {
+        $a[Caster::PREFIX_VIRTUAL.'value'] = new ConstStub(gmp_strval($gmp), gmp_strval($gmp));
+
+        return $a;
+    }
+}
diff --git a/vendor/symfony/var-dumper/Caster/LinkStub.php b/vendor/symfony/var-dumper/Caster/LinkStub.php
index 24f360b8..5c133c66 100644
--- a/vendor/symfony/var-dumper/Caster/LinkStub.php
+++ b/vendor/symfony/var-dumper/Caster/LinkStub.php
@@ -23,14 +23,14 @@ class LinkStub extends ConstStub
     private static $vendorRoots;
     private static $composerRoots;
 
-    public function __construct($label, $line = 0, $href = null)
+    public function __construct($label, int $line = 0, $href = null)
     {
         $this->value = $label;
 
         if (null === $href) {
             $href = $label;
         }
-        if (!is_string($href)) {
+        if (!\is_string($href)) {
             return;
         }
         if (0 === strpos($href, 'file://')) {
@@ -53,11 +53,11 @@ class LinkStub extends ConstStub
             return;
         }
         if ($composerRoot = $this->getComposerRoot($href, $this->inVendor)) {
-            $this->attr['ellipsis'] = strlen($href) - strlen($composerRoot) + 1;
+            $this->attr['ellipsis'] = \strlen($href) - \strlen($composerRoot) + 1;
             $this->attr['ellipsis-type'] = 'path';
-            $this->attr['ellipsis-tail'] = 1 + ($this->inVendor ? 2 + strlen(implode(array_slice(explode(DIRECTORY_SEPARATOR, substr($href, 1 - $this->attr['ellipsis'])), 0, 2))) : 0);
-        } elseif (3 < count($ellipsis = explode(DIRECTORY_SEPARATOR, $href))) {
-            $this->attr['ellipsis'] = 2 + strlen(implode(array_slice($ellipsis, -2)));
+            $this->attr['ellipsis-tail'] = 1 + ($this->inVendor ? 2 + \strlen(implode('', \array_slice(explode(\DIRECTORY_SEPARATOR, substr($href, 1 - $this->attr['ellipsis'])), 0, 2))) : 0);
+        } elseif (3 < \count($ellipsis = explode(\DIRECTORY_SEPARATOR, $href))) {
+            $this->attr['ellipsis'] = 2 + \strlen(implode('', \array_slice($ellipsis, -2)));
             $this->attr['ellipsis-type'] = 'path';
             $this->attr['ellipsis-tail'] = 1;
         }
@@ -71,16 +71,16 @@ class LinkStub extends ConstStub
             foreach (get_declared_classes() as $class) {
                 if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
                     $r = new \ReflectionClass($class);
-                    $v = dirname(dirname($r->getFileName()));
+                    $v = \dirname(\dirname($r->getFileName()));
                     if (file_exists($v.'/composer/installed.json')) {
-                        self::$vendorRoots[] = $v.DIRECTORY_SEPARATOR;
+                        self::$vendorRoots[] = $v.\DIRECTORY_SEPARATOR;
                     }
                 }
             }
         }
         $inVendor = false;
 
-        if (isset(self::$composerRoots[$dir = dirname($file)])) {
+        if (isset(self::$composerRoots[$dir = \dirname($file)])) {
             return self::$composerRoots[$dir];
         }
 
@@ -96,13 +96,13 @@ class LinkStub extends ConstStub
                 // open_basedir restriction in effect
                 break;
             }
-            if ($parent === dirname($parent)) {
+            if ($parent === \dirname($parent)) {
                 return self::$composerRoots[$dir] = false;
             }
 
-            $parent = dirname($parent);
+            $parent = \dirname($parent);
         }
 
-        return self::$composerRoots[$dir] = $parent.DIRECTORY_SEPARATOR;
+        return self::$composerRoots[$dir] = $parent.\DIRECTORY_SEPARATOR;
     }
 }
diff --git a/vendor/symfony/var-dumper/Caster/MongoCaster.php b/vendor/symfony/var-dumper/Caster/MongoCaster.php
deleted file mode 100644
index 3b8fb338..00000000
--- a/vendor/symfony/var-dumper/Caster/MongoCaster.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\VarDumper\Caster;
-
-use Symfony\Component\VarDumper\Cloner\Stub;
-
-@trigger_error('The '.__NAMESPACE__.'\MongoCaster class is deprecated since Symfony 3.4 and will be removed in 4.0.', E_USER_DEPRECATED);
-
-/**
- * Casts classes from the MongoDb extension to array representation.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- *
- * @deprecated since version 3.4, to be removed in 4.0.
- */
-class MongoCaster
-{
-    public static function castCursor(\MongoCursorInterface $cursor, array $a, Stub $stub, $isNested)
-    {
-        if ($info = $cursor->info()) {
-            foreach ($info as $k => $v) {
-                $a[Caster::PREFIX_VIRTUAL.$k] = $v;
-            }
-        }
-        $a[Caster::PREFIX_VIRTUAL.'dead'] = $cursor->dead();
-
-        return $a;
-    }
-}
diff --git a/vendor/symfony/var-dumper/Caster/PdoCaster.php b/vendor/symfony/var-dumper/Caster/PdoCaster.php
index b8667824..83a001d9 100644
--- a/vendor/symfony/var-dumper/Caster/PdoCaster.php
+++ b/vendor/symfony/var-dumper/Caster/PdoCaster.php
@@ -70,7 +70,7 @@ class PdoCaster
             }
 
             try {
-                $attr[$k] = 'ERRMODE' === $k ? $errmode : $c->getAttribute(constant('PDO::ATTR_'.$k));
+                $attr[$k] = 'ERRMODE' === $k ? $errmode : $c->getAttribute(\constant('PDO::ATTR_'.$k));
                 if ($v && isset($v[$attr[$k]])) {
                     $attr[$k] = new ConstStub($v[$attr[$k]], $attr[$k]);
                 }
diff --git a/vendor/symfony/var-dumper/Caster/RedisCaster.php b/vendor/symfony/var-dumper/Caster/RedisCaster.php
index 07a3a1b0..112097fd 100644
--- a/vendor/symfony/var-dumper/Caster/RedisCaster.php
+++ b/vendor/symfony/var-dumper/Caster/RedisCaster.php
@@ -30,15 +30,6 @@ class RedisCaster
     {
         $prefix = Caster::PREFIX_VIRTUAL;
 
-        if (defined('HHVM_VERSION_ID')) {
-            if (isset($a[Caster::PREFIX_PROTECTED.'serializer'])) {
-                $ser = $a[Caster::PREFIX_PROTECTED.'serializer'];
-                $a[Caster::PREFIX_PROTECTED.'serializer'] = isset(self::$serializer[$ser]) ? new ConstStub(self::$serializer[$ser], $ser) : $ser;
-            }
-
-            return $a;
-        }
-
         if (!$connected = $c->isConnected()) {
             return $a + array(
                 $prefix.'isConnected' => $connected,
@@ -46,7 +37,7 @@ class RedisCaster
         }
 
         $ser = $c->getOption(\Redis::OPT_SERIALIZER);
-        $retry = defined('Redis::OPT_SCAN') ? $c->getOption(\Redis::OPT_SCAN) : 0;
+        $retry = \defined('Redis::OPT_SCAN') ? $c->getOption(\Redis::OPT_SCAN) : 0;
 
         return $a + array(
             $prefix.'isConnected' => $connected,
diff --git a/vendor/symfony/var-dumper/Caster/ReflectionCaster.php b/vendor/symfony/var-dumper/Caster/ReflectionCaster.php
index 4634fb91..c625e787 100644
--- a/vendor/symfony/var-dumper/Caster/ReflectionCaster.php
+++ b/vendor/symfony/var-dumper/Caster/ReflectionCaster.php
@@ -36,7 +36,6 @@ class ReflectionCaster
         $prefix = Caster::PREFIX_VIRTUAL;
         $c = new \ReflectionFunction($c);
 
-        $stub->class = 'Closure'; // HHVM generates unique class names for closures
         $a = static::castFunctionAbstract($c, $a, $stub, $isNested, $filter);
 
         if (isset($a[$prefix.'parameters'])) {
@@ -86,7 +85,7 @@ class ReflectionCaster
         $prefix = Caster::PREFIX_VIRTUAL;
 
         $a += array(
-            $prefix.'name' => $c instanceof \ReflectionNamedType ? $c->getName() : $c->__toString(),
+            $prefix.'name' => $c->getName(),
             $prefix.'allowsNull' => $c->allowsNull(),
             $prefix.'isBuiltin' => $c->isBuiltin(),
         );
@@ -173,7 +172,7 @@ class ReflectionCaster
 
         if (isset($a[$prefix.'returnType'])) {
             $v = $a[$prefix.'returnType'];
-            $v = $v instanceof \ReflectionNamedType ? $v->getName() : $v->__toString();
+            $v = $v->getName();
             $a[$prefix.'returnType'] = new ClassStub($a[$prefix.'returnType']->allowsNull() ? '?'.$v : $v, array(class_exists($v, false) || interface_exists($v, false) || trait_exists($v, false) ? $v : '', ''));
         }
         if (isset($a[$prefix.'class'])) {
@@ -185,7 +184,7 @@ class ReflectionCaster
 
         foreach ($c->getParameters() as $v) {
             $k = '$'.$v->name;
-            if (method_exists($v, 'isVariadic') && $v->isVariadic()) {
+            if ($v->isVariadic()) {
                 $k = '...'.$k;
             }
             if ($v->isPassedByReference()) {
@@ -199,7 +198,7 @@ class ReflectionCaster
 
         if ($v = $c->getStaticVariables()) {
             foreach ($v as $k => &$v) {
-                if (is_object($v)) {
+                if (\is_object($v)) {
                     $a[$prefix.'use']['$'.$k] = new CutStub($v);
                 } else {
                     $a[$prefix.'use']['$'.$k] = &$v;
@@ -213,9 +212,6 @@ class ReflectionCaster
             self::addExtra($a, $c);
         }
 
-        // Added by HHVM
-        unset($a[Caster::PREFIX_DYNAMIC.'static']);
-
         return $a;
     }
 
@@ -230,9 +226,6 @@ class ReflectionCaster
     {
         $prefix = Caster::PREFIX_VIRTUAL;
 
-        // Added by HHVM
-        unset($a['info']);
-
         self::addMap($a, $c, array(
             'position' => 'getPosition',
             'isVariadic' => 'isVariadic',
@@ -240,12 +233,8 @@ class ReflectionCaster
             'allowsNull' => 'allowsNull',
         ));
 
-        if (method_exists($c, 'getType')) {
-            if ($v = $c->getType()) {
-                $a[$prefix.'typeHint'] = $v instanceof \ReflectionNamedType ? $v->getName() : $v->__toString();
-            }
-        } elseif (preg_match('/^(?:[^ ]++ ){4}([a-zA-Z_\x7F-\xFF][^ ]++)/', $c, $v)) {
-            $a[$prefix.'typeHint'] = $v[1];
+        if ($v = $c->getType()) {
+            $a[$prefix.'typeHint'] = $v->getName();
         }
 
         if (isset($a[$prefix.'typeHint'])) {
@@ -257,17 +246,13 @@ class ReflectionCaster
 
         try {
             $a[$prefix.'default'] = $v = $c->getDefaultValue();
-            if (method_exists($c, 'isDefaultValueConstant') && $c->isDefaultValueConstant()) {
+            if ($c->isDefaultValueConstant()) {
                 $a[$prefix.'default'] = new ConstStub($c->getDefaultValueConstantName(), $v);
             }
             if (null === $v) {
                 unset($a[$prefix.'allowsNull']);
             }
         } catch (\ReflectionException $e) {
-            if (isset($a[$prefix.'typeHint']) && $c->allowsNull() && !class_exists('ReflectionNamedType', false)) {
-                $a[$prefix.'default'] = null;
-                unset($a[$prefix.'allowsNull']);
-            }
         }
 
         return $a;
diff --git a/vendor/symfony/var-dumper/Caster/SplCaster.php b/vendor/symfony/var-dumper/Caster/SplCaster.php
index e8be74d6..0780c0a3 100644
--- a/vendor/symfony/var-dumper/Caster/SplCaster.php
+++ b/vendor/symfony/var-dumper/Caster/SplCaster.php
@@ -29,30 +29,12 @@ class SplCaster
 
     public static function castArrayObject(\ArrayObject $c, array $a, Stub $stub, $isNested)
     {
-        $prefix = Caster::PREFIX_VIRTUAL;
-        $class = $stub->class;
-        $flags = $c->getFlags();
-
-        $b = array(
-            $prefix.'flag::STD_PROP_LIST' => (bool) ($flags & \ArrayObject::STD_PROP_LIST),
-            $prefix.'flag::ARRAY_AS_PROPS' => (bool) ($flags & \ArrayObject::ARRAY_AS_PROPS),
-            $prefix.'iteratorClass' => new ClassStub($c->getIteratorClass()),
-            $prefix.'storage' => $c->getArrayCopy(),
-        );
-
-        if ('ArrayObject' === $class) {
-            $a = $b;
-        } else {
-            if (!($flags & \ArrayObject::STD_PROP_LIST)) {
-                $c->setFlags(\ArrayObject::STD_PROP_LIST);
-                $a = Caster::castObject($c, $class);
-                $c->setFlags($flags);
-            }
-
-            $a += $b;
-        }
+        return self::castSplArray($c, $a, $stub, $isNested);
+    }
 
-        return $a;
+    public static function castArrayIterator(\ArrayIterator $c, array $a, Stub $stub, $isNested)
+    {
+        return self::castSplArray($c, $a, $stub, $isNested);
     }
 
     public static function castHeap(\Iterator $c, array $a, Stub $stub, $isNested)
@@ -186,7 +168,7 @@ class SplCaster
 
         $clone = clone $c;
         foreach ($clone as $obj) {
-            $storage[spl_object_hash($obj)] = array(
+            $storage[] = array(
                 'object' => $obj,
                 'info' => $clone->getInfo(),
              );
@@ -205,4 +187,27 @@ class SplCaster
 
         return $a;
     }
+
+    private static function castSplArray($c, array $a, Stub $stub, $isNested)
+    {
+        $prefix = Caster::PREFIX_VIRTUAL;
+        $class = $stub->class;
+        $flags = $c->getFlags();
+
+        if (!($flags & \ArrayObject::STD_PROP_LIST)) {
+            $c->setFlags(\ArrayObject::STD_PROP_LIST);
+            $a = Caster::castObject($c, $class);
+            $c->setFlags($flags);
+        }
+        $a += array(
+            $prefix.'flag::STD_PROP_LIST' => (bool) ($flags & \ArrayObject::STD_PROP_LIST),
+            $prefix.'flag::ARRAY_AS_PROPS' => (bool) ($flags & \ArrayObject::ARRAY_AS_PROPS),
+        );
+        if ($c instanceof \ArrayObject) {
+            $a[$prefix.'iteratorClass'] = new ClassStub($c->getIteratorClass());
+        }
+        $a[$prefix.'storage'] = $c->getArrayCopy();
+
+        return $a;
+    }
 }
diff --git a/vendor/symfony/var-dumper/Caster/StubCaster.php b/vendor/symfony/var-dumper/Caster/StubCaster.php
index 2ec096c5..b0bf5dc8 100644
--- a/vendor/symfony/var-dumper/Caster/StubCaster.php
+++ b/vendor/symfony/var-dumper/Caster/StubCaster.php
@@ -30,7 +30,7 @@ class StubCaster
             $stub->cut = $c->cut;
             $stub->attr = $c->attr;
 
-            if (Stub::TYPE_REF === $c->type && !$c->class && is_string($c->value) && !preg_match('//u', $c->value)) {
+            if (Stub::TYPE_REF === $c->type && !$c->class && \is_string($c->value) && !preg_match('//u', $c->value)) {
                 $stub->type = Stub::TYPE_STRING;
                 $stub->class = Stub::STRING_BINARY;
             }
@@ -49,7 +49,7 @@ class StubCaster
     public static function cutInternals($obj, array $a, Stub $stub, $isNested)
     {
         if ($isNested) {
-            $stub->cut += count($a);
+            $stub->cut += \count($a);
 
             return array();
         }
diff --git a/vendor/symfony/var-dumper/Caster/TraceStub.php b/vendor/symfony/var-dumper/Caster/TraceStub.php
index 59548aca..5eea1c87 100644
--- a/vendor/symfony/var-dumper/Caster/TraceStub.php
+++ b/vendor/symfony/var-dumper/Caster/TraceStub.php
@@ -25,7 +25,7 @@ class TraceStub extends Stub
     public $sliceLength;
     public $numberingOffset;
 
-    public function __construct(array $trace, $keepArgs = true, $sliceOffset = 0, $sliceLength = null, $numberingOffset = 0)
+    public function __construct(array $trace, bool $keepArgs = true, int $sliceOffset = 0, int $sliceLength = null, int $numberingOffset = 0)
     {
         $this->value = $trace;
         $this->keepArgs = $keepArgs;
diff --git a/vendor/symfony/var-dumper/Cloner/AbstractCloner.php b/vendor/symfony/var-dumper/Cloner/AbstractCloner.php
index e3246927..f8dfa97c 100644
--- a/vendor/symfony/var-dumper/Cloner/AbstractCloner.php
+++ b/vendor/symfony/var-dumper/Cloner/AbstractCloner.php
@@ -95,6 +95,7 @@ abstract class AbstractCloner implements ClonerInterface
         'AMQPEnvelope' => array('Symfony\Component\VarDumper\Caster\AmqpCaster', 'castEnvelope'),
 
         'ArrayObject' => array('Symfony\Component\VarDumper\Caster\SplCaster', 'castArrayObject'),
+        'ArrayIterator' => array('Symfony\Component\VarDumper\Caster\SplCaster', 'castArrayIterator'),
         'SplDoublyLinkedList' => array('Symfony\Component\VarDumper\Caster\SplCaster', 'castDoublyLinkedList'),
         'SplFileInfo' => array('Symfony\Component\VarDumper\Caster\SplCaster', 'castFileInfo'),
         'SplFileObject' => array('Symfony\Component\VarDumper\Caster\SplCaster', 'castFileObject'),
@@ -104,8 +105,6 @@ abstract class AbstractCloner implements ClonerInterface
         'SplPriorityQueue' => array('Symfony\Component\VarDumper\Caster\SplCaster', 'castHeap'),
         'OuterIterator' => array('Symfony\Component\VarDumper\Caster\SplCaster', 'castOuterIterator'),
 
-        'MongoCursorInterface' => array('Symfony\Component\VarDumper\Caster\MongoCaster', 'castCursor'),
-
         'Redis' => array('Symfony\Component\VarDumper\Caster\RedisCaster', 'castRedis'),
         'RedisArray' => array('Symfony\Component\VarDumper\Caster\RedisCaster', 'castRedisArray'),
 
@@ -114,6 +113,8 @@ abstract class AbstractCloner implements ClonerInterface
         'DateTimeZone' => array('Symfony\Component\VarDumper\Caster\DateCaster', 'castTimeZone'),
         'DatePeriod' => array('Symfony\Component\VarDumper\Caster\DateCaster', 'castPeriod'),
 
+        'GMP' => array('Symfony\Component\VarDumper\Caster\GmpCaster', 'castGmp'),
+
         ':curl' => array('Symfony\Component\VarDumper\Caster\ResourceCaster', 'castCurl'),
         ':dba' => array('Symfony\Component\VarDumper\Caster\ResourceCaster', 'castDba'),
         ':dba persistent' => array('Symfony\Component\VarDumper\Caster\ResourceCaster', 'castDba'),
@@ -133,7 +134,6 @@ abstract class AbstractCloner implements ClonerInterface
     protected $maxItems = 2500;
     protected $maxString = -1;
     protected $minDepth = 1;
-    protected $useExt;
 
     private $casters = array();
     private $prevErrorHandler;
@@ -151,7 +151,6 @@ abstract class AbstractCloner implements ClonerInterface
             $casters = static::$defaultCasters;
         }
         $this->addCasters($casters);
-        $this->useExt = extension_loaded('symfony_debug');
     }
 
     /**
@@ -167,7 +166,7 @@ abstract class AbstractCloner implements ClonerInterface
     public function addCasters(array $casters)
     {
         foreach ($casters as $type => $callback) {
-            $this->casters[strtolower($type)][] = is_string($callback) && false !== strpos($callback, '::') ? explode('::', $callback, 2) : $callback;
+            $this->casters[strtolower($type)][] = \is_string($callback) && false !== strpos($callback, '::') ? explode('::', $callback, 2) : $callback;
         }
     }
 
@@ -219,7 +218,7 @@ abstract class AbstractCloner implements ClonerInterface
             }
 
             if ($this->prevErrorHandler) {
-                return call_user_func($this->prevErrorHandler, $type, $msg, $file, $line, $context);
+                return \call_user_func($this->prevErrorHandler, $type, $msg, $file, $line, $context);
             }
 
             return false;
diff --git a/vendor/symfony/var-dumper/Cloner/Data.php b/vendor/symfony/var-dumper/Cloner/Data.php
index 75ded291..0dbff7ae 100644
--- a/vendor/symfony/var-dumper/Cloner/Data.php
+++ b/vendor/symfony/var-dumper/Cloner/Data.php
@@ -44,7 +44,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
             $item = $item->value;
         }
         if (!$item instanceof Stub) {
-            return gettype($item);
+            return \gettype($item);
         }
         if (Stub::TYPE_STRING === $item->type) {
             return 'string';
@@ -63,7 +63,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
     /**
      * @param bool $recursive Whether values should be resolved recursively or not
      *
-     * @return string|int|float|bool|array|null|Data[] A native representation of the original value
+     * @return string|int|float|bool|array|Data[]|null A native representation of the original value
      */
     public function getValue($recursive = false)
     {
@@ -106,13 +106,13 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
 
     public function count()
     {
-        return count($this->getValue());
+        return \count($this->getValue());
     }
 
     public function getIterator()
     {
-        if (!is_array($value = $this->getValue())) {
-            throw new \LogicException(sprintf('%s object holds non-iterable type "%s".', self::class, gettype($value)));
+        if (!\is_array($value = $this->getValue())) {
+            throw new \LogicException(sprintf('%s object holds non-iterable type "%s".', self::class, \gettype($value)));
         }
 
         foreach ($value as $k => $v) {
@@ -158,23 +158,11 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
     {
         $value = $this->getValue();
 
-        if (!is_array($value)) {
+        if (!\is_array($value)) {
             return (string) $value;
         }
 
-        return sprintf('%s (count=%d)', $this->getType(), count($value));
-    }
-
-    /**
-     * @return array The raw data structure
-     *
-     * @deprecated since version 3.3. Use array or object access instead.
-     */
-    public function getRawData()
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the array or object access instead.', __METHOD__));
-
-        return $this->data;
+        return sprintf('%s (count=%d)', $this->getType(), \count($value));
     }
 
     /**
@@ -312,7 +300,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
                 $cursor->hardRefCount = $item->refCount;
             }
             $cursor->attr = $item->attr;
-            $type = $item->class ?: gettype($item->value);
+            $type = $item->class ?: \gettype($item->value);
             $item = $this->getStub($item->value);
         }
         if ($item instanceof Stub) {
@@ -334,7 +322,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
 
                 if ($cursor->stop) {
                     if ($cut >= 0) {
-                        $cut += count($children);
+                        $cut += \count($children);
                     }
                     $children = array();
                 }
@@ -363,7 +351,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
                             $cut = $this->dumpChildren($dumper, $cursor, $refs, $children, $cut, $item->type, null !== $item->class);
                         }
                     } elseif ($children && 0 <= $cut) {
-                        $cut += count($children);
+                        $cut += \count($children);
                     }
                     $cursor->skipChildren = false;
                     $dumper->leaveHash($cursor, $item->type, $item->class, $withChildren, $cut);
@@ -401,7 +389,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
         ++$cursor->depth;
         $cursor->hashType = $hashType;
         $cursor->hashIndex = 0;
-        $cursor->hashLength = count($children);
+        $cursor->hashLength = \count($children);
         $cursor->hashCut = $hashCut;
         foreach ($children as $key => $child) {
             $cursor->hashKeyIsBinary = isset($key[0]) && !preg_match('//u', $key);
diff --git a/vendor/symfony/var-dumper/Cloner/VarCloner.php b/vendor/symfony/var-dumper/Cloner/VarCloner.php
index 3664609c..012743cd 100644
--- a/vendor/symfony/var-dumper/Cloner/VarCloner.php
+++ b/vendor/symfony/var-dumper/Cloner/VarCloner.php
@@ -17,8 +17,6 @@ namespace Symfony\Component\VarDumper\Cloner;
 class VarCloner extends AbstractCloner
 {
     private static $gid;
-    private static $hashMask = 0;
-    private static $hashOffset = 0;
     private static $arrayCache = array();
 
     /**
@@ -31,10 +29,10 @@ class VarCloner extends AbstractCloner
         $refsCounter = 0;               // Hard references counter
         $queue = array(array($var));    // This breadth-first queue is the return value
         $indexedArrays = array();       // Map of queue indexes that hold numerically indexed arrays
-        $hardRefs = array();            // Map of original zval hashes to stub objects
+        $hardRefs = array();            // Map of original zval ids to stub objects
         $objRefs = array();             // Map of original object handles to their stub object couterpart
         $resRefs = array();             // Map of original resource handles to their stub object couterpart
-        $values = array();              // Map of stub objects' hashes to original values
+        $values = array();              // Map of stub objects' ids to original values
         $maxItems = $this->maxItems;
         $maxString = $this->maxString;
         $minDepth = $this->minDepth;
@@ -46,13 +44,9 @@ class VarCloner extends AbstractCloner
         $stub = null;                   // Stub capturing the main properties of an original item value
                                         // or null if the original value is used directly
 
-        if (!self::$hashMask) {
-            self::$gid = uniqid(mt_rand(), true); // Unique string used to detect the special $GLOBALS variable
-            self::initHashMask();
+        if (!$gid = self::$gid) {
+            $gid = self::$gid = uniqid(mt_rand(), true); // Unique string used to detect the special $GLOBALS variable
         }
-        $gid = self::$gid;
-        $hashMask = self::$hashMask;
-        $hashOffset = self::$hashOffset;
         $arrayStub = new Stub();
         $arrayStub->type = Stub::TYPE_ARRAY;
         $fromObjCast = false;
@@ -89,7 +83,7 @@ class VarCloner extends AbstractCloner
                 if ($zvalIsRef = $vals[$k] === $cookie) {
                     $vals[$k] = &$stub;         // Break hard references to make $queue completely
                     unset($stub);               // independent from the original structure
-                    if ($v instanceof Stub && isset($hardRefs[\spl_object_hash($v)])) {
+                    if ($v instanceof Stub && isset($hardRefs[\spl_object_id($v)])) {
                         $vals[$k] = $refs[$k] = $v;
                         if ($v->value instanceof Stub && (Stub::TYPE_OBJECT === $v->value->type || Stub::TYPE_RESOURCE === $v->value->type)) {
                             ++$v->value->refCount;
@@ -99,7 +93,7 @@ class VarCloner extends AbstractCloner
                     }
                     $refs[$k] = $vals[$k] = new Stub();
                     $refs[$k]->value = $v;
-                    $h = \spl_object_hash($refs[$k]);
+                    $h = \spl_object_id($refs[$k]);
                     $hardRefs[$h] = &$refs[$k];
                     $values[$h] = $v;
                     $vals[$k]->handle = ++$refsCounter;
@@ -178,7 +172,7 @@ class VarCloner extends AbstractCloner
 
                     case \is_object($v):
                     case $v instanceof \__PHP_Incomplete_Class:
-                        if (empty($objRefs[$h = $hashMask ^ \hexdec(\substr(\spl_object_hash($v), $hashOffset, \PHP_INT_SIZE))])) {
+                        if (empty($objRefs[$h = \spl_object_id($v)])) {
                             $stub = new Stub();
                             $stub->type = Stub::TYPE_OBJECT;
                             $stub->class = \get_class($v);
@@ -189,8 +183,7 @@ class VarCloner extends AbstractCloner
                                 if (Stub::TYPE_OBJECT !== $stub->type || null === $stub->value) {
                                     break;
                                 }
-                                $h = $hashMask ^ \hexdec(\substr(\spl_object_hash($stub->value), $hashOffset, \PHP_INT_SIZE));
-                                $stub->handle = $h;
+                                $stub->handle = $h = \spl_object_id($stub->value);
                             }
                             $stub->value = null;
                             if (0 <= $maxItems && $maxItems <= $pos && $minimumDepthReached) {
@@ -297,31 +290,4 @@ class VarCloner extends AbstractCloner
 
         return $queue;
     }
-
-    private static function initHashMask()
-    {
-        $obj = (object) array();
-        self::$hashOffset = 16 - PHP_INT_SIZE;
-        self::$hashMask = -1;
-
-        if (defined('HHVM_VERSION')) {
-            self::$hashOffset += 16;
-        } else {
-            // check if we are nested in an output buffering handler to prevent a fatal error with ob_start() below
-            $obFuncs = array('ob_clean', 'ob_end_clean', 'ob_flush', 'ob_end_flush', 'ob_get_contents', 'ob_get_flush');
-            foreach (debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS) as $frame) {
-                if (isset($frame['function'][0]) && !isset($frame['class']) && 'o' === $frame['function'][0] && in_array($frame['function'], $obFuncs)) {
-                    $frame['line'] = 0;
-                    break;
-                }
-            }
-            if (!empty($frame['line'])) {
-                ob_start();
-                debug_zval_dump($obj);
-                self::$hashMask = (int) substr(ob_get_clean(), 17);
-            }
-        }
-
-        self::$hashMask ^= hexdec(substr(spl_object_hash($obj), self::$hashOffset, PHP_INT_SIZE));
-    }
 }
diff --git a/vendor/symfony/var-dumper/Command/Descriptor/CliDescriptor.php b/vendor/symfony/var-dumper/Command/Descriptor/CliDescriptor.php
new file mode 100644
index 00000000..1422960c
--- /dev/null
+++ b/vendor/symfony/var-dumper/Command/Descriptor/CliDescriptor.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Command\Descriptor;
+
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\VarDumper\Cloner\Data;
+use Symfony\Component\VarDumper\Dumper\CliDumper;
+
+/**
+ * Describe collected data clones for cli output.
+ *
+ * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
+ *
+ * @final
+ */
+class CliDescriptor implements DumpDescriptorInterface
+{
+    private $dumper;
+    private $lastIdentifier;
+
+    public function __construct(CliDumper $dumper)
+    {
+        $this->dumper = $dumper;
+    }
+
+    public function describe(OutputInterface $output, Data $data, array $context, int $clientId): void
+    {
+        $io = $output instanceof SymfonyStyle ? $output : new SymfonyStyle(new ArrayInput(array()), $output);
+        $this->dumper->setColors($output->isDecorated());
+
+        $rows = array(array('date', date('r', $context['timestamp'])));
+        $lastIdentifier = $this->lastIdentifier;
+        $this->lastIdentifier = $clientId;
+
+        $section = "Received from client #$clientId";
+        if (isset($context['request'])) {
+            $request = $context['request'];
+            $this->lastIdentifier = $request['identifier'];
+            $section = sprintf('%s %s', $request['method'], $request['uri']);
+            if ($controller = $request['controller']) {
+                $rows[] = array('controller', rtrim($this->dumper->dump($controller, true), "\n"));
+            }
+        } elseif (isset($context['cli'])) {
+            $this->lastIdentifier = $context['cli']['identifier'];
+            $section = '$ '.$context['cli']['command_line'];
+        }
+
+        if ($this->lastIdentifier !== $lastIdentifier) {
+            $io->section($section);
+        }
+
+        if (isset($context['source'])) {
+            $source = $context['source'];
+            $rows[] = array('source', sprintf('%s on line %d', $source['name'], $source['line']));
+            $file = $source['file_relative'] ?? $source['file'];
+            $rows[] = array('file', $file);
+            $fileLink = $source['file_link'] ?? null;
+        }
+
+        $io->table(array(), $rows);
+
+        if (isset($fileLink)) {
+            $io->writeln(array('<info>Open source in your IDE/browser:</info>', $fileLink));
+            $io->newLine();
+        }
+
+        $this->dumper->dump($data);
+        $io->newLine();
+    }
+}
diff --git a/vendor/symfony/var-dumper/Command/Descriptor/DumpDescriptorInterface.php b/vendor/symfony/var-dumper/Command/Descriptor/DumpDescriptorInterface.php
new file mode 100644
index 00000000..267d27bf
--- /dev/null
+++ b/vendor/symfony/var-dumper/Command/Descriptor/DumpDescriptorInterface.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Command\Descriptor;
+
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\VarDumper\Cloner\Data;
+
+/**
+ * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
+ */
+interface DumpDescriptorInterface
+{
+    public function describe(OutputInterface $output, Data $data, array $context, int $clientId): void;
+}
diff --git a/vendor/symfony/var-dumper/Command/Descriptor/HtmlDescriptor.php b/vendor/symfony/var-dumper/Command/Descriptor/HtmlDescriptor.php
new file mode 100644
index 00000000..e786964d
--- /dev/null
+++ b/vendor/symfony/var-dumper/Command/Descriptor/HtmlDescriptor.php
@@ -0,0 +1,119 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Command\Descriptor;
+
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\VarDumper\Cloner\Data;
+use Symfony\Component\VarDumper\Dumper\HtmlDumper;
+
+/**
+ * Describe collected data clones for html output.
+ *
+ * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
+ *
+ * @final
+ */
+class HtmlDescriptor implements DumpDescriptorInterface
+{
+    private $dumper;
+    private $initialized = false;
+
+    public function __construct(HtmlDumper $dumper)
+    {
+        $this->dumper = $dumper;
+    }
+
+    public function describe(OutputInterface $output, Data $data, array $context, int $clientId): void
+    {
+        if (!$this->initialized) {
+            $styles = file_get_contents(__DIR__.'/../../Resources/css/htmlDescriptor.css');
+            $scripts = file_get_contents(__DIR__.'/../../Resources/js/htmlDescriptor.js');
+            $output->writeln("<style>$styles</style><script>$scripts</script>");
+            $this->initialized = true;
+        }
+
+        $title = '-';
+        if (isset($context['request'])) {
+            $request = $context['request'];
+            $controller = "<span class='dumped-tag'>{$this->dumper->dump($request['controller'], true, array('maxDepth' => 0))}</span>";
+            $title = sprintf('<code>%s</code> <a href="%s">%s</a>', $request['method'], $uri = $request['uri'], $uri);
+            $dedupIdentifier = $request['identifier'];
+        } elseif (isset($context['cli'])) {
+            $title = '<code>$ </code>'.$context['cli']['command_line'];
+            $dedupIdentifier = $context['cli']['identifier'];
+        } else {
+            $dedupIdentifier = uniqid('', true);
+        }
+
+        $sourceDescription = '';
+        if (isset($context['source'])) {
+            $source = $context['source'];
+            $projectDir = $source['project_dir'];
+            $sourceDescription = sprintf('%s on line %d', $source['name'], $source['line']);
+            if (isset($source['file_link'])) {
+                $sourceDescription = sprintf('<a href="%s">%s</a>', $source['file_link'], $sourceDescription);
+            }
+        }
+
+        $isoDate = $this->extractDate($context, 'c');
+        $tags = array_filter(array(
+            'controller' => $controller ?? null,
+            'project dir' => $projectDir ?? null,
+        ));
+
+        $output->writeln(<<<HTML
+<article data-dedup-id="$dedupIdentifier">
+    <header>
+        <div class="row">
+            <h2 class="col">$title</h2>
+            <time class="col text-small" title="$isoDate" datetime="$isoDate">
+                {$this->extractDate($context)}
+            </time>
+        </div>
+        {$this->renderTags($tags)}
+    </header>
+    <section class="body">
+        <p class="text-small">
+            $sourceDescription
+        </p>
+        {$this->dumper->dump($data, true)}
+    </section>
+</article>
+HTML
+        );
+    }
+
+    private function extractDate(array $context, string $format = 'r'): string
+    {
+        return date($format, $context['timestamp']);
+    }
+
+    private function renderTags(array $tags): string
+    {
+        if (!$tags) {
+            return '';
+        }
+
+        $renderedTags = '';
+        foreach ($tags as $key => $value) {
+            $renderedTags .= sprintf('<li><span class="badge">%s</span>%s</li>', $key, $value);
+        }
+
+        return <<<HTML
+<div class="row">
+    <ul class="tags">
+        $renderedTags
+    </ul>
+</div>
+HTML;
+    }
+}
diff --git a/vendor/symfony/var-dumper/Command/ServerDumpCommand.php b/vendor/symfony/var-dumper/Command/ServerDumpCommand.php
new file mode 100644
index 00000000..16194505
--- /dev/null
+++ b/vendor/symfony/var-dumper/Command/ServerDumpCommand.php
@@ -0,0 +1,99 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\VarDumper\Cloner\Data;
+use Symfony\Component\VarDumper\Command\Descriptor\CliDescriptor;
+use Symfony\Component\VarDumper\Command\Descriptor\DumpDescriptorInterface;
+use Symfony\Component\VarDumper\Command\Descriptor\HtmlDescriptor;
+use Symfony\Component\VarDumper\Dumper\CliDumper;
+use Symfony\Component\VarDumper\Dumper\HtmlDumper;
+use Symfony\Component\VarDumper\Server\DumpServer;
+
+/**
+ * Starts a dump server to collect and output dumps on a single place with multiple formats support.
+ *
+ * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
+ *
+ * @final
+ */
+class ServerDumpCommand extends Command
+{
+    protected static $defaultName = 'server:dump';
+
+    private $server;
+
+    /** @var DumpDescriptorInterface[] */
+    private $descriptors;
+
+    public function __construct(DumpServer $server, array $descriptors = array())
+    {
+        $this->server = $server;
+        $this->descriptors = $descriptors + array(
+            'cli' => new CliDescriptor(new CliDumper()),
+            'html' => new HtmlDescriptor(new HtmlDumper()),
+        );
+
+        parent::__construct();
+    }
+
+    protected function configure()
+    {
+        $availableFormats = implode(', ', array_keys($this->descriptors));
+
+        $this
+            ->addOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format (%s)', $availableFormats), 'cli')
+            ->setDescription('Starts a dump server that collects and displays dumps in a single place')
+            ->setHelp(<<<'EOF'
+<info>%command.name%</info> starts a dump server that collects and displays
+dumps in a single place for debugging you application:
+
+  <info>php %command.full_name%</info>
+
+You can consult dumped data in HTML format in your browser by providing the <comment>--format=html</comment> option
+and redirecting the output to a file:
+
+  <info>php %command.full_name% --format="html" > dump.html</info>
+
+EOF
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $io = new SymfonyStyle($input, $output);
+        $format = $input->getOption('format');
+
+        if (!$descriptor = $this->descriptors[$format] ?? null) {
+            throw new InvalidArgumentException(sprintf('Unsupported format "%s".', $format));
+        }
+
+        $errorIo = $io->getErrorStyle();
+        $errorIo->title('Symfony Var Dumper Server');
+
+        $this->server->start();
+
+        $errorIo->success(sprintf('Server listening on %s', $this->server->getHost()));
+        $errorIo->comment('Quit the server with CONTROL-C.');
+
+        $this->server->listen(function (Data $data, array $context, int $clientId) use ($descriptor, $io) {
+            $descriptor->describe($io, $data, $context, $clientId);
+        });
+    }
+}
diff --git a/vendor/symfony/var-dumper/Dumper/AbstractDumper.php b/vendor/symfony/var-dumper/Dumper/AbstractDumper.php
index e27675ad..abcda1af 100644
--- a/vendor/symfony/var-dumper/Dumper/AbstractDumper.php
+++ b/vendor/symfony/var-dumper/Dumper/AbstractDumper.php
@@ -42,14 +42,14 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface
      * @param string                        $charset The default character encoding to use for non-UTF8 strings
      * @param int                           $flags   A bit field of static::DUMP_* constants to fine tune dumps representation
      */
-    public function __construct($output = null, $charset = null, $flags = 0)
+    public function __construct($output = null, string $charset = null, int $flags = 0)
     {
-        $this->flags = (int) $flags;
+        $this->flags = $flags;
         $this->setCharset($charset ?: ini_get('php.output_encoding') ?: ini_get('default_charset') ?: 'UTF-8');
         $this->decimalPoint = localeconv();
         $this->decimalPoint = $this->decimalPoint['decimal_point'];
         $this->setOutput($output ?: static::$defaultOutput);
-        if (!$output && is_string(static::$defaultOutput)) {
+        if (!$output && \is_string(static::$defaultOutput)) {
             static::$defaultOutput = $this->outputStream;
         }
     }
@@ -65,11 +65,11 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface
     {
         $prev = null !== $this->outputStream ? $this->outputStream : $this->lineDumper;
 
-        if (is_callable($output)) {
+        if (\is_callable($output)) {
             $this->outputStream = null;
             $this->lineDumper = $output;
         } else {
-            if (is_string($output)) {
+            if (\is_string($output)) {
                 $output = fopen($output, 'wb');
             }
             $this->outputStream = $output;
@@ -164,7 +164,7 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface
      */
     protected function dumpLine($depth)
     {
-        call_user_func($this->lineDumper, $this->line, $depth, $this->indentPad);
+        \call_user_func($this->lineDumper, $this->line, $depth, $this->indentPad);
         $this->line = '';
     }
 
@@ -195,7 +195,7 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface
             return $s;
         }
 
-        if (!function_exists('iconv')) {
+        if (!\function_exists('iconv')) {
             throw new \RuntimeException('Unable to convert a non-UTF-8 string to UTF-8: required function iconv() does not exist. You should install ext-iconv or symfony/polyfill-iconv.');
         }
 
diff --git a/vendor/symfony/var-dumper/Dumper/CliDumper.php b/vendor/symfony/var-dumper/Dumper/CliDumper.php
index f1de350d..9fcd6c41 100644
--- a/vendor/symfony/var-dumper/Dumper/CliDumper.php
+++ b/vendor/symfony/var-dumper/Dumper/CliDumper.php
@@ -58,11 +58,11 @@ class CliDumper extends AbstractDumper
     /**
      * {@inheritdoc}
      */
-    public function __construct($output = null, $charset = null, $flags = 0)
+    public function __construct($output = null, string $charset = null, int $flags = 0)
     {
         parent::__construct($output, $charset, $flags);
 
-        if ('\\' === DIRECTORY_SEPARATOR && !$this->isWindowsTrueColor()) {
+        if ('\\' === \DIRECTORY_SEPARATOR && !$this->isWindowsTrueColor()) {
             // Use only the base 16 xterm colors when using ANSICON or standard Windows 10 CLI
             $this->setStyles(array(
                 'default' => '31',
@@ -186,7 +186,7 @@ class CliDumper extends AbstractDumper
                 unset($str[1]);
                 $str[0] .= "\n";
             }
-            $m = count($str) - 1;
+            $m = \count($str) - 1;
             $i = $lineCut = 0;
 
             if (self::DUMP_STRING_LENGTH & $this->flags) {
@@ -339,7 +339,7 @@ class CliDumper extends AbstractDumper
                     $style = 'index';
                     // no break
                 case Cursor::HASH_ASSOC:
-                    if (is_int($key)) {
+                    if (\is_int($key)) {
                         $this->line .= $this->style($style, $key).' => ';
                     } else {
                         $this->line .= $bin.'"'.$this->style($style, $key).'" => ';
@@ -417,8 +417,8 @@ class CliDumper extends AbstractDumper
 
         if (isset($attr['ellipsis'], $attr['ellipsis-type'])) {
             $prefix = substr($value, 0, -$attr['ellipsis']);
-            if ('cli' === PHP_SAPI && 'path' === $attr['ellipsis-type'] && isset($_SERVER[$pwd = '\\' === DIRECTORY_SEPARATOR ? 'CD' : 'PWD']) && 0 === strpos($prefix, $_SERVER[$pwd])) {
-                $prefix = '.'.substr($prefix, strlen($_SERVER[$pwd]));
+            if ('cli' === \PHP_SAPI && 'path' === $attr['ellipsis-type'] && isset($_SERVER[$pwd = '\\' === \DIRECTORY_SEPARATOR ? 'CD' : 'PWD']) && 0 === strpos($prefix, $_SERVER[$pwd])) {
+                $prefix = '.'.substr($prefix, \strlen($_SERVER[$pwd]));
             }
             if (!empty($attr['ellipsis-tail'])) {
                 $prefix .= substr($value, -$attr['ellipsis'], $attr['ellipsis-tail']);
@@ -439,7 +439,7 @@ class CliDumper extends AbstractDumper
             $s = $startCchr;
             $c = $c[$i = 0];
             do {
-                $s .= isset($map[$c[$i]]) ? $map[$c[$i]] : sprintf('\x%02X', ord($c[$i]));
+                $s .= isset($map[$c[$i]]) ? $map[$c[$i]] : sprintf('\x%02X', \ord($c[$i]));
             } while (isset($c[++$i]));
 
             return $s.$endCchr;
@@ -447,12 +447,12 @@ class CliDumper extends AbstractDumper
 
         if ($this->colors) {
             if ($cchrCount && "\033" === $value[0]) {
-                $value = substr($value, strlen($startCchr));
+                $value = substr($value, \strlen($startCchr));
             } else {
                 $value = "\033[{$style}m".$value;
             }
-            if ($cchrCount && $endCchr === substr($value, -strlen($endCchr))) {
-                $value = substr($value, 0, -strlen($endCchr));
+            if ($cchrCount && $endCchr === substr($value, -\strlen($endCchr))) {
+                $value = substr($value, 0, -\strlen($endCchr));
             } else {
                 $value .= "\033[{$this->styles['default']}m";
             }
@@ -474,7 +474,7 @@ class CliDumper extends AbstractDumper
         }
         if (isset($_SERVER['argv'][1])) {
             $colors = $_SERVER['argv'];
-            $i = count($colors);
+            $i = \count($colors);
             while (--$i > 0) {
                 if (isset($colors[$i][5])) {
                     switch ($colors[$i]) {
@@ -537,23 +537,27 @@ class CliDumper extends AbstractDumper
      */
     private function hasColorSupport($stream)
     {
-        if (!is_resource($stream) || 'stream' !== get_resource_type($stream)) {
+        if (!\is_resource($stream) || 'stream' !== get_resource_type($stream)) {
             return false;
         }
 
-        if (DIRECTORY_SEPARATOR === '\\') {
-            return (function_exists('sapi_windows_vt100_support')
+        if ('Hyper' === getenv('TERM_PROGRAM')) {
+            return true;
+        }
+
+        if (\DIRECTORY_SEPARATOR === '\\') {
+            return (\function_exists('sapi_windows_vt100_support')
                 && @sapi_windows_vt100_support($stream))
                 || false !== getenv('ANSICON')
                 || 'ON' === getenv('ConEmuANSI')
                 || 'xterm' === getenv('TERM');
         }
 
-        if (function_exists('stream_isatty')) {
+        if (\function_exists('stream_isatty')) {
             return @stream_isatty($stream);
         }
 
-        if (function_exists('posix_isatty')) {
+        if (\function_exists('posix_isatty')) {
             return @posix_isatty($stream);
         }
 
@@ -575,9 +579,10 @@ class CliDumper extends AbstractDumper
     {
         $result = 183 <= getenv('ANSICON_VER')
             || 'ON' === getenv('ConEmuANSI')
-            || 'xterm' === getenv('TERM');
+            || 'xterm' === getenv('TERM')
+            || 'Hyper' === getenv('TERM_PROGRAM');
 
-        if (!$result && PHP_VERSION_ID >= 70200) {
+        if (!$result && \PHP_VERSION_ID >= 70200) {
             $version = sprintf(
                 '%s.%s.%s',
                 PHP_WINDOWS_VERSION_MAJOR,
diff --git a/vendor/symfony/var-dumper/Dumper/ContextProvider/CliContextProvider.php b/vendor/symfony/var-dumper/Dumper/ContextProvider/CliContextProvider.php
new file mode 100644
index 00000000..1f8c0c84
--- /dev/null
+++ b/vendor/symfony/var-dumper/Dumper/ContextProvider/CliContextProvider.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Dumper\ContextProvider;
+
+/**
+ * Tries to provide context on CLI.
+ *
+ * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
+ */
+final class CliContextProvider implements ContextProviderInterface
+{
+    public function getContext(): ?array
+    {
+        if ('cli' !== \PHP_SAPI) {
+            return null;
+        }
+
+        return array(
+            'command_line' => $commandLine = implode(' ', $_SERVER['argv']),
+            'identifier' => hash('crc32b', $commandLine.$_SERVER['REQUEST_TIME_FLOAT']),
+        );
+    }
+}
diff --git a/vendor/symfony/var-dumper/Dumper/ContextProvider/ContextProviderInterface.php b/vendor/symfony/var-dumper/Dumper/ContextProvider/ContextProviderInterface.php
new file mode 100644
index 00000000..38ef3b0f
--- /dev/null
+++ b/vendor/symfony/var-dumper/Dumper/ContextProvider/ContextProviderInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Dumper\ContextProvider;
+
+/**
+ * Interface to provide contextual data about dump data clones sent to a server.
+ *
+ * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
+ */
+interface ContextProviderInterface
+{
+    /**
+     * @return array|null Context data or null if unable to provide any context
+     */
+    public function getContext(): ?array;
+}
diff --git a/vendor/symfony/var-dumper/Dumper/ContextProvider/RequestContextProvider.php b/vendor/symfony/var-dumper/Dumper/ContextProvider/RequestContextProvider.php
new file mode 100644
index 00000000..10b14065
--- /dev/null
+++ b/vendor/symfony/var-dumper/Dumper/ContextProvider/RequestContextProvider.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Dumper\ContextProvider;
+
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+
+/**
+ * Tries to provide context from a request.
+ *
+ * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
+ */
+final class RequestContextProvider implements ContextProviderInterface
+{
+    private $requestStack;
+    private $cloner;
+
+    public function __construct(RequestStack $requestStack)
+    {
+        $this->requestStack = $requestStack;
+        $this->cloner = new VarCloner();
+        $this->cloner->setMaxItems(0);
+    }
+
+    public function getContext(): ?array
+    {
+        if (null === $request = $this->requestStack->getCurrentRequest()) {
+            return null;
+        }
+
+        $controller = $request->attributes->get('_controller');
+
+        return array(
+            'uri' => $request->getUri(),
+            'method' => $request->getMethod(),
+            'controller' => $controller ? $this->cloner->cloneVar($controller) : $controller,
+            'identifier' => spl_object_hash($request),
+        );
+    }
+}
diff --git a/vendor/symfony/var-dumper/Dumper/ContextProvider/SourceContextProvider.php b/vendor/symfony/var-dumper/Dumper/ContextProvider/SourceContextProvider.php
new file mode 100644
index 00000000..0c091041
--- /dev/null
+++ b/vendor/symfony/var-dumper/Dumper/ContextProvider/SourceContextProvider.php
@@ -0,0 +1,126 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Dumper\ContextProvider;
+
+use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\HtmlDumper;
+use Symfony\Component\VarDumper\VarDumper;
+use Twig\Template;
+
+/**
+ * Tries to provide context from sources (class name, file, line, code excerpt, ...).
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
+ */
+final class SourceContextProvider implements ContextProviderInterface
+{
+    private $limit;
+    private $charset;
+    private $projectDir;
+    private $fileLinkFormatter;
+
+    public function __construct(string $charset = null, string $projectDir = null, FileLinkFormatter $fileLinkFormatter = null, int $limit = 9)
+    {
+        $this->charset = $charset;
+        $this->projectDir = $projectDir;
+        $this->fileLinkFormatter = $fileLinkFormatter;
+        $this->limit = $limit;
+    }
+
+    public function getContext(): ?array
+    {
+        $trace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT | DEBUG_BACKTRACE_IGNORE_ARGS, $this->limit);
+
+        $file = $trace[1]['file'];
+        $line = $trace[1]['line'];
+        $name = false;
+        $fileExcerpt = false;
+
+        for ($i = 2; $i < $this->limit; ++$i) {
+            if (isset($trace[$i]['class'], $trace[$i]['function'])
+                && 'dump' === $trace[$i]['function']
+                && VarDumper::class === $trace[$i]['class']
+            ) {
+                $file = $trace[$i]['file'];
+                $line = $trace[$i]['line'];
+
+                while (++$i < $this->limit) {
+                    if (isset($trace[$i]['function'], $trace[$i]['file']) && empty($trace[$i]['class']) && 0 !== strpos($trace[$i]['function'], 'call_user_func')) {
+                        $file = $trace[$i]['file'];
+                        $line = $trace[$i]['line'];
+
+                        break;
+                    } elseif (isset($trace[$i]['object']) && $trace[$i]['object'] instanceof Template) {
+                        $template = $trace[$i]['object'];
+                        $name = $template->getTemplateName();
+                        $src = method_exists($template, 'getSourceContext') ? $template->getSourceContext()->getCode() : (method_exists($template, 'getSource') ? $template->getSource() : false);
+                        $info = $template->getDebugInfo();
+                        if (isset($info[$trace[$i - 1]['line']])) {
+                            $line = $info[$trace[$i - 1]['line']];
+                            $file = method_exists($template, 'getSourceContext') ? $template->getSourceContext()->getPath() : null;
+
+                            if ($src) {
+                                $src = explode("\n", $src);
+                                $fileExcerpt = array();
+
+                                for ($i = max($line - 3, 1), $max = min($line + 3, \count($src)); $i <= $max; ++$i) {
+                                    $fileExcerpt[] = '<li'.($i === $line ? ' class="selected"' : '').'><code>'.$this->htmlEncode($src[$i - 1]).'</code></li>';
+                                }
+
+                                $fileExcerpt = '<ol start="'.max($line - 3, 1).'">'.implode("\n", $fileExcerpt).'</ol>';
+                            }
+                        }
+                        break;
+                    }
+                }
+                break;
+            }
+        }
+
+        if (false === $name) {
+            $name = str_replace('\\', '/', $file);
+            $name = substr($name, strrpos($name, '/') + 1);
+        }
+
+        $context = array('name' => $name, 'file' => $file, 'line' => $line);
+        $context['file_excerpt'] = $fileExcerpt;
+
+        if (null !== $this->projectDir) {
+            $context['project_dir'] = $this->projectDir;
+            if (0 === strpos($file, $this->projectDir)) {
+                $context['file_relative'] = ltrim(substr($file, \strlen($this->projectDir)), \DIRECTORY_SEPARATOR);
+            }
+        }
+
+        if ($this->fileLinkFormatter && $fileLink = $this->fileLinkFormatter->format($context['file'], $context['line'])) {
+            $context['file_link'] = $fileLink;
+        }
+
+        return $context;
+    }
+
+    private function htmlEncode(string $s): string
+    {
+        $html = '';
+
+        $dumper = new HtmlDumper(function ($line) use (&$html) { $html .= $line; }, $this->charset);
+        $dumper->setDumpHeader('');
+        $dumper->setDumpBoundaries('', '');
+
+        $cloner = new VarCloner();
+        $dumper->dump($cloner->cloneVar($s));
+
+        return substr(strip_tags($html), 1, -1);
+    }
+}
diff --git a/vendor/symfony/var-dumper/Dumper/HtmlDumper.php b/vendor/symfony/var-dumper/Dumper/HtmlDumper.php
index 2ba7ebf5..0edb97cd 100644
--- a/vendor/symfony/var-dumper/Dumper/HtmlDumper.php
+++ b/vendor/symfony/var-dumper/Dumper/HtmlDumper.php
@@ -56,7 +56,7 @@ class HtmlDumper extends CliDumper
     /**
      * {@inheritdoc}
      */
-    public function __construct($output = null, $charset = null, $flags = 0)
+    public function __construct($output = null, string $charset = null, int $flags = 0)
     {
         AbstractDumper::__construct($output, $charset, $flags);
         $this->dumpId = 'sf-dump-'.mt_rand();
@@ -826,10 +826,10 @@ EOHTML
             }
             $label = esc(substr($value, -$attr['ellipsis']));
             $style = str_replace(' title="', " title=\"$v\n", $style);
-            $v = sprintf('<span class=%s>%s</span>', $class, substr($v, 0, -strlen($label)));
+            $v = sprintf('<span class=%s>%s</span>', $class, substr($v, 0, -\strlen($label)));
 
             if (!empty($attr['ellipsis-tail'])) {
-                $tail = strlen(esc(substr($value, -$attr['ellipsis'], $attr['ellipsis-tail'])));
+                $tail = \strlen(esc(substr($value, -$attr['ellipsis'], $attr['ellipsis-tail'])));
                 $v .= sprintf('<span class=sf-dump-ellipsis>%s</span>%s', substr($label, 0, $tail), substr($label, $tail));
             } else {
                 $v .= $label;
@@ -840,7 +840,7 @@ EOHTML
             $s = '<span class=sf-dump-default>';
             $c = $c[$i = 0];
             do {
-                $s .= isset($map[$c[$i]]) ? $map[$c[$i]] : sprintf('\x%02X', ord($c[$i]));
+                $s .= isset($map[$c[$i]]) ? $map[$c[$i]] : sprintf('\x%02X', \ord($c[$i]));
             } while (isset($c[++$i]));
 
             return $s.'</span>';
@@ -895,7 +895,7 @@ EOHTML
         $options = $this->extraDisplayOptions + $this->displayOptions;
 
         if ($fmt = $options['fileLinkFormat']) {
-            return is_string($fmt) ? strtr($fmt, array('%f' => $file, '%l' => $line)) : $fmt->format($file, $line);
+            return \is_string($fmt) ? strtr($fmt, array('%f' => $file, '%l' => $line)) : $fmt->format($file, $line);
         }
 
         return false;
diff --git a/vendor/symfony/var-dumper/Dumper/ServerDumper.php b/vendor/symfony/var-dumper/Dumper/ServerDumper.php
new file mode 100644
index 00000000..32e1f124
--- /dev/null
+++ b/vendor/symfony/var-dumper/Dumper/ServerDumper.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Dumper;
+
+use Symfony\Component\VarDumper\Cloner\Data;
+use Symfony\Component\VarDumper\Dumper\ContextProvider\ContextProviderInterface;
+use Symfony\Component\VarDumper\Server\Connection;
+
+/**
+ * ServerDumper forwards serialized Data clones to a server.
+ *
+ * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
+ */
+class ServerDumper implements DataDumperInterface
+{
+    private $connection;
+    private $wrappedDumper;
+
+    /**
+     * @param string                     $host             The server host
+     * @param DataDumperInterface|null   $wrappedDumper    A wrapped instance used whenever we failed contacting the server
+     * @param ContextProviderInterface[] $contextProviders Context providers indexed by context name
+     */
+    public function __construct(string $host, DataDumperInterface $wrappedDumper = null, array $contextProviders = array())
+    {
+        $this->connection = new Connection($host, $contextProviders);
+        $this->wrappedDumper = $wrappedDumper;
+    }
+
+    public function getContextProviders(): array
+    {
+        return $this->connection->getContextProviders();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function dump(Data $data)
+    {
+        if (!$this->connection->write($data) && $this->wrappedDumper) {
+            $this->wrappedDumper->dump($data);
+        }
+    }
+}
diff --git a/vendor/symfony/var-dumper/Exception/ThrowingCasterException.php b/vendor/symfony/var-dumper/Exception/ThrowingCasterException.php
index 976f4439..af47753a 100644
--- a/vendor/symfony/var-dumper/Exception/ThrowingCasterException.php
+++ b/vendor/symfony/var-dumper/Exception/ThrowingCasterException.php
@@ -21,6 +21,6 @@ class ThrowingCasterException extends \Exception
      */
     public function __construct(\Exception $prev)
     {
-        parent::__construct('Unexpected '.get_class($prev).' thrown from a caster: '.$prev->getMessage(), 0, $prev);
+        parent::__construct('Unexpected '.\get_class($prev).' thrown from a caster: '.$prev->getMessage(), 0, $prev);
     }
 }
diff --git a/vendor/symfony/var-dumper/Resources/bin/var-dump-server b/vendor/symfony/var-dumper/Resources/bin/var-dump-server
new file mode 100755
index 00000000..98c813a0
--- /dev/null
+++ b/vendor/symfony/var-dumper/Resources/bin/var-dump-server
@@ -0,0 +1,63 @@
+#!/usr/bin/env php
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Starts a dump server to collect and output dumps on a single place with multiple formats support.
+ *
+ * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
+ */
+
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Logger\ConsoleLogger;
+use Symfony\Component\Console\Output\ConsoleOutput;
+use Symfony\Component\VarDumper\Command\ServerDumpCommand;
+use Symfony\Component\VarDumper\Server\DumpServer;
+
+function includeIfExists(string $file): bool
+{
+    return file_exists($file) && include $file;
+}
+
+if (
+    !includeIfExists(__DIR__ . '/../../../../autoload.php') &&
+    !includeIfExists(__DIR__ . '/../../vendor/autoload.php') &&
+    !includeIfExists(__DIR__ . '/../../../../../../vendor/autoload.php')
+) {
+    fwrite(STDERR, 'Install dependencies using Composer.'.PHP_EOL);
+    exit(1);
+}
+
+if (!class_exists(Application::class)) {
+    fwrite(STDERR, 'You need the "symfony/console" component in order to run the VarDumper server.'.PHP_EOL);
+    exit(1);
+}
+
+$input = new ArgvInput();
+$output = new ConsoleOutput();
+$defaultHost = '127.0.0.1:9912';
+$host = $input->getParameterOption(['--host'], $_SERVER['VAR_DUMPER_SERVER'] ?? $defaultHost, true);
+$logger = interface_exists(LoggerInterface::class) ? new ConsoleLogger($output->getErrorOutput()) : null;
+
+$app = new Application();
+
+$app->getDefinition()->addOption(
+    new InputOption('--host', null, InputOption::VALUE_REQUIRED, 'The address the server should listen to', $defaultHost)
+);
+
+$app->add($command = new ServerDumpCommand(new DumpServer($host, $logger)))
+    ->getApplication()
+    ->setDefaultCommand($command->getName(), true)
+    ->run($input, $output)
+;
diff --git a/vendor/symfony/var-dumper/Resources/css/htmlDescriptor.css b/vendor/symfony/var-dumper/Resources/css/htmlDescriptor.css
new file mode 100644
index 00000000..65da8137
--- /dev/null
+++ b/vendor/symfony/var-dumper/Resources/css/htmlDescriptor.css
@@ -0,0 +1,129 @@
+body {
+    display: flex;
+    flex-direction: column-reverse;
+    justify-content: flex-end;
+    max-width: 1140px;
+    margin: auto;
+    padding: 15px;
+    word-wrap: break-word;
+    background-color: #F9F9F9;
+    color: #222;
+    font-family: Helvetica, Arial, sans-serif;
+    font-size: 14px;
+    line-height: 1.4;
+}
+p {
+    margin: 0;
+}
+a {
+    color: #218BC3;
+    text-decoration: none;
+}
+a:hover {
+    text-decoration: underline;
+}
+.text-small {
+    font-size: 12px !important;
+}
+article {
+    margin: 5px;
+    margin-bottom: 10px;
+}
+article > header > .row {
+    display: flex;
+    flex-direction: row;
+    align-items: baseline;
+    margin-bottom: 10px;
+}
+article > header > .row > .col {
+    flex: 1;
+    display: flex;
+    align-items: baseline;
+}
+article > header > .row > h2 {
+    font-size: 14px;
+    color: #222;
+    font-weight: normal;
+    font-family: "Lucida Console", monospace, sans-serif;
+    word-break: break-all;
+    margin: 20px 5px 0 0;
+    user-select: all;
+}
+article > header > .row > h2 > code {
+    white-space: nowrap;
+    user-select: none;
+    color: #cc2255;
+    background-color: #f7f7f9;
+    border: 1px solid #e1e1e8;
+    border-radius: 3px;
+    margin-right: 5px;
+    padding: 0 3px;
+}
+article > header > .row > time.col {
+    flex: 0;
+    text-align: right;
+    white-space: nowrap;
+    color: #999;
+    font-style: italic;
+}
+article > header ul.tags {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+    font-size: 12px;
+}
+article > header ul.tags > li {
+    user-select: all;
+    margin-bottom: 2px;
+}
+article > header ul.tags > li > span.badge {
+    display: inline-block;
+    padding: .25em .4em;
+    margin-right: 5px;
+    border-radius: 4px;
+    background-color: #6c757d3b;
+    color: #524d4d;
+    font-size: 12px;
+    text-align: center;
+    font-weight: 700;
+    line-height: 1;
+    white-space: nowrap;
+    vertical-align: baseline;
+    user-select: none;
+}
+article > section.body {
+    border: 1px solid #d8d8d8;
+    background: #FFF;
+    padding: 10px;
+    border-radius: 3px;
+}
+pre.sf-dump {
+    border-radius: 3px;
+    margin-bottom: 0;
+}
+.hidden {
+    display: none !important;
+}
+.dumped-tag > .sf-dump {
+    display: inline-block;
+    margin: 0;
+    padding: 1px 5px;
+    line-height: 1.4;
+    vertical-align: top;
+    background-color: transparent;
+    user-select: auto;
+}
+.dumped-tag > pre.sf-dump,
+.dumped-tag > .sf-dump-default {
+    color: #CC7832;
+    background: none;
+}
+.dumped-tag > .sf-dump .sf-dump-str { color: #629755; }
+.dumped-tag > .sf-dump .sf-dump-private,
+.dumped-tag > .sf-dump .sf-dump-protected,
+.dumped-tag > .sf-dump .sf-dump-public { color: #262626; }
+.dumped-tag > .sf-dump .sf-dump-note { color: #6897BB; }
+.dumped-tag > .sf-dump .sf-dump-key { color: #789339; }
+.dumped-tag > .sf-dump .sf-dump-ref { color: #6E6E6E; }
+.dumped-tag > .sf-dump .sf-dump-ellipsis { color: #CC7832; max-width: 100em; }
+.dumped-tag > .sf-dump .sf-dump-ellipsis-path { max-width: 5em; }
diff --git a/vendor/symfony/var-dumper/Resources/functions/dump.php b/vendor/symfony/var-dumper/Resources/functions/dump.php
index 95d8bb59..248f2551 100644
--- a/vendor/symfony/var-dumper/Resources/functions/dump.php
+++ b/vendor/symfony/var-dumper/Resources/functions/dump.php
@@ -15,10 +15,12 @@ if (!function_exists('dump')) {
     /**
      * @author Nicolas Grekas <p@tchwork.com>
      */
-    function dump($var)
+    function dump($var, ...$moreVars)
     {
-        foreach (func_get_args() as $var) {
-            VarDumper::dump($var);
+        VarDumper::dump($var);
+
+        foreach ($moreVars as $v) {
+            VarDumper::dump($v);
         }
 
         if (1 < func_num_args()) {
@@ -28,3 +30,16 @@ if (!function_exists('dump')) {
         return $var;
     }
 }
+
+if (!function_exists('dd')) {
+    function dd($var, ...$moreVars)
+    {
+        VarDumper::dump($var);
+
+        foreach ($moreVars as $v) {
+            VarDumper::dump($v);
+        }
+
+        exit(1);
+    }
+}
diff --git a/vendor/symfony/var-dumper/Resources/js/htmlDescriptor.js b/vendor/symfony/var-dumper/Resources/js/htmlDescriptor.js
new file mode 100644
index 00000000..63101e57
--- /dev/null
+++ b/vendor/symfony/var-dumper/Resources/js/htmlDescriptor.js
@@ -0,0 +1,10 @@
+document.addEventListener('DOMContentLoaded', function() {
+  let prev = null;
+  Array.from(document.getElementsByTagName('article')).reverse().forEach(function (article) {
+    const dedupId = article.dataset.dedupId;
+    if (dedupId === prev) {
+      article.getElementsByTagName('header')[0].classList.add('hidden');
+    }
+    prev = dedupId;
+  });
+});
diff --git a/vendor/symfony/var-dumper/Server/Connection.php b/vendor/symfony/var-dumper/Server/Connection.php
new file mode 100644
index 00000000..d447b0a9
--- /dev/null
+++ b/vendor/symfony/var-dumper/Server/Connection.php
@@ -0,0 +1,97 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Server;
+
+use Symfony\Component\VarDumper\Cloner\Data;
+use Symfony\Component\VarDumper\Dumper\ContextProvider\ContextProviderInterface;
+
+/**
+ * Forwards serialized Data clones to a server.
+ *
+ * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
+ */
+class Connection
+{
+    private $host;
+    private $contextProviders;
+    private $socket;
+
+    /**
+     * @param string                     $host             The server host
+     * @param ContextProviderInterface[] $contextProviders Context providers indexed by context name
+     */
+    public function __construct(string $host, array $contextProviders = array())
+    {
+        if (false === strpos($host, '://')) {
+            $host = 'tcp://'.$host;
+        }
+
+        $this->host = $host;
+        $this->contextProviders = $contextProviders;
+    }
+
+    public function getContextProviders(): array
+    {
+        return $this->contextProviders;
+    }
+
+    public function write(Data $data): bool
+    {
+        $socketIsFresh = !$this->socket;
+        if (!$this->socket = $this->socket ?: $this->createSocket()) {
+            return false;
+        }
+
+        $context = array('timestamp' => microtime(true));
+        foreach ($this->contextProviders as $name => $provider) {
+            $context[$name] = $provider->getContext();
+        }
+        $context = array_filter($context);
+        $encodedPayload = base64_encode(serialize(array($data, $context)))."\n";
+
+        set_error_handler(array(self::class, 'nullErrorHandler'));
+        try {
+            if (-1 !== stream_socket_sendto($this->socket, $encodedPayload)) {
+                return true;
+            }
+            if (!$socketIsFresh) {
+                stream_socket_shutdown($this->socket, STREAM_SHUT_RDWR);
+                fclose($this->socket);
+                $this->socket = $this->createSocket();
+            }
+            if (-1 !== stream_socket_sendto($this->socket, $encodedPayload)) {
+                return true;
+            }
+        } finally {
+            restore_error_handler();
+        }
+
+        return false;
+    }
+
+    private static function nullErrorHandler($t, $m)
+    {
+        // no-op
+    }
+
+    private function createSocket()
+    {
+        set_error_handler(array(self::class, 'nullErrorHandler'));
+        try {
+            return stream_socket_client($this->host, $errno, $errstr, 3, STREAM_CLIENT_CONNECT | STREAM_CLIENT_ASYNC_CONNECT);
+        } finally {
+            restore_error_handler();
+        }
+
+        return $socket;
+    }
+}
diff --git a/vendor/symfony/var-dumper/Server/DumpServer.php b/vendor/symfony/var-dumper/Server/DumpServer.php
new file mode 100644
index 00000000..6f79ca4c
--- /dev/null
+++ b/vendor/symfony/var-dumper/Server/DumpServer.php
@@ -0,0 +1,107 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Server;
+
+use Psr\Log\LoggerInterface;
+use Symfony\Component\VarDumper\Cloner\Data;
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * A server collecting Data clones sent by a ServerDumper.
+ *
+ * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
+ *
+ * @final
+ */
+class DumpServer
+{
+    private $host;
+    private $socket;
+    private $logger;
+
+    public function __construct(string $host, LoggerInterface $logger = null)
+    {
+        if (false === strpos($host, '://')) {
+            $host = 'tcp://'.$host;
+        }
+
+        $this->host = $host;
+        $this->logger = $logger;
+    }
+
+    public function start(): void
+    {
+        if (!$this->socket = stream_socket_server($this->host, $errno, $errstr)) {
+            throw new \RuntimeException(sprintf('Server start failed on "%s": %s %s.', $this->host, $errstr, $errno));
+        }
+    }
+
+    public function listen(callable $callback): void
+    {
+        if (null === $this->socket) {
+            $this->start();
+        }
+
+        foreach ($this->getMessages() as $clientId => $message) {
+            $payload = @unserialize(base64_decode($message), array('allowed_classes' => array(Data::class, Stub::class)));
+
+            // Impossible to decode the message, give up.
+            if (false === $payload) {
+                if ($this->logger) {
+                    $this->logger->warning('Unable to decode a message from {clientId} client.', array('clientId' => $clientId));
+                }
+
+                continue;
+            }
+
+            if (!\is_array($payload) || \count($payload) < 2 || !$payload[0] instanceof Data || !\is_array($payload[1])) {
+                if ($this->logger) {
+                    $this->logger->warning('Invalid payload from {clientId} client. Expected an array of two elements (Data $data, array $context)', array('clientId' => $clientId));
+                }
+
+                continue;
+            }
+
+            list($data, $context) = $payload;
+
+            $callback($data, $context, $clientId);
+        }
+    }
+
+    public function getHost(): string
+    {
+        return $this->host;
+    }
+
+    private function getMessages(): iterable
+    {
+        $sockets = array((int) $this->socket => $this->socket);
+        $write = array();
+
+        while (true) {
+            $read = $sockets;
+            stream_select($read, $write, $write, null);
+
+            foreach ($read as $stream) {
+                if ($this->socket === $stream) {
+                    $stream = stream_socket_accept($this->socket);
+                    $sockets[(int) $stream] = $stream;
+                } elseif (feof($stream)) {
+                    unset($sockets[(int) $stream]);
+                    fclose($stream);
+                } else {
+                    yield (int) $stream => fgets($stream);
+                }
+            }
+        }
+    }
+}
diff --git a/vendor/symfony/var-dumper/Test/VarDumperTestTrait.php b/vendor/symfony/var-dumper/Test/VarDumperTestTrait.php
index 0fffd551..bcf55dee 100644
--- a/vendor/symfony/var-dumper/Test/VarDumperTestTrait.php
+++ b/vendor/symfony/var-dumper/Test/VarDumperTestTrait.php
@@ -19,26 +19,14 @@ use Symfony\Component\VarDumper\Dumper\CliDumper;
  */
 trait VarDumperTestTrait
 {
-    public function assertDumpEquals($dump, $data, $filter = 0, $message = '')
+    public function assertDumpEquals($expected, $data, $filter = 0, $message = '')
     {
-        if (is_string($filter)) {
-            @trigger_error(sprintf('The $message argument of the "%s()" method at 3rd position is deprecated since Symfony 3.4 and will be moved at 4th position in 4.0.', __METHOD__), E_USER_DEPRECATED);
-            $message = $filter;
-            $filter = 0;
-        }
-
-        $this->assertSame(rtrim($dump), $this->getDump($data, null, $filter), $message);
+        $this->assertSame($this->prepareExpectation($expected, $filter), $this->getDump($data, null, $filter), $message);
     }
 
-    public function assertDumpMatchesFormat($dump, $data, $filter = 0, $message = '')
+    public function assertDumpMatchesFormat($expected, $data, $filter = 0, $message = '')
     {
-        if (is_string($filter)) {
-            @trigger_error(sprintf('The $message argument of the "%s()" method at 3rd position is deprecated since Symfony 3.4 and will be moved at 4th position in 4.0.', __METHOD__), E_USER_DEPRECATED);
-            $message = $filter;
-            $filter = 0;
-        }
-
-        $this->assertStringMatchesFormat(rtrim($dump), $this->getDump($data, null, $filter), $message);
+        $this->assertStringMatchesFormat($this->prepareExpectation($expected, $filter), $this->getDump($data, null, $filter), $message);
     }
 
     protected function getDump($data, $key = null, $filter = 0)
@@ -57,4 +45,13 @@ trait VarDumperTestTrait
 
         return rtrim($dumper->dump($data, true));
     }
+
+    private function prepareExpectation($expected, $filter)
+    {
+        if (!\is_string($expected)) {
+            $expected = $this->getDump($expected, null, $filter);
+        }
+
+        return rtrim($expected);
+    }
 }
diff --git a/vendor/symfony/var-dumper/Tests/Caster/CasterTest.php b/vendor/symfony/var-dumper/Tests/Caster/CasterTest.php
index 105d5638..1dacce59 100644
--- a/vendor/symfony/var-dumper/Tests/Caster/CasterTest.php
+++ b/vendor/symfony/var-dumper/Tests/Caster/CasterTest.php
@@ -151,9 +151,6 @@ class CasterTest extends TestCase
         );
     }
 
-    /**
-     * @requires PHP 7.0
-     */
     public function testAnonymousClass()
     {
         $c = eval('return new class extends stdClass { private $foo = "foo"; };');
diff --git a/vendor/symfony/var-dumper/Tests/Caster/DateCasterTest.php b/vendor/symfony/var-dumper/Tests/Caster/DateCasterTest.php
index 96c167d3..d2796866 100644
--- a/vendor/symfony/var-dumper/Tests/Caster/DateCasterTest.php
+++ b/vendor/symfony/var-dumper/Tests/Caster/DateCasterTest.php
@@ -29,10 +29,6 @@ class DateCasterTest extends TestCase
      */
     public function testDumpDateTime($time, $timezone, $xDate, $xTimestamp)
     {
-        if ((defined('HHVM_VERSION_ID') || PHP_VERSION_ID <= 50509) && preg_match('/[-+]\d{2}:\d{2}/', $timezone)) {
-            $this->markTestSkipped('DateTimeZone GMT offsets are supported since 5.5.10. See https://github.com/facebook/hhvm/issues/5875 for HHVM.');
-        }
-
         $date = new \DateTime($time, new \DateTimeZone($timezone));
 
         $xDump = <<<EODUMP
@@ -49,10 +45,6 @@ EODUMP;
      */
     public function testCastDateTime($time, $timezone, $xDate, $xTimestamp, $xInfos)
     {
-        if ((defined('HHVM_VERSION_ID') || PHP_VERSION_ID <= 50509) && preg_match('/[-+]\d{2}:\d{2}/', $timezone)) {
-            $this->markTestSkipped('DateTimeZone GMT offsets are supported since 5.5.10. See https://github.com/facebook/hhvm/issues/5875 for HHVM.');
-        }
-
         $stub = new Stub();
         $date = new \DateTime($time, new \DateTimeZone($timezone));
         $cast = DateCaster::castDateTime($date, array('foo' => 'bar'), $stub, false, 0);
@@ -102,7 +94,7 @@ EODUMP;
      */
     public function testDumpInterval($intervalSpec, $ms, $invert, $expected)
     {
-        if ($ms && PHP_VERSION_ID >= 70200 && version_compare(PHP_VERSION, '7.2.0rc3', '<=')) {
+        if ($ms && \PHP_VERSION_ID >= 70200 && version_compare(PHP_VERSION, '7.2.0rc3', '<=')) {
             $this->markTestSkipped('Skipped on 7.2 before rc4 because of php bug #75354.');
         }
 
@@ -122,7 +114,7 @@ EODUMP;
      */
     public function testDumpIntervalExcludingVerbosity($intervalSpec, $ms, $invert, $expected)
     {
-        if ($ms && PHP_VERSION_ID >= 70200 && version_compare(PHP_VERSION, '7.2.0rc3', '<=')) {
+        if ($ms && \PHP_VERSION_ID >= 70200 && version_compare(PHP_VERSION, '7.2.0rc3', '<=')) {
             $this->markTestSkipped('Skipped on 7.2 before rc4 because of php bug #75354.');
         }
 
@@ -142,7 +134,7 @@ EODUMP;
      */
     public function testCastInterval($intervalSpec, $ms, $invert, $xInterval, $xSeconds)
     {
-        if ($ms && PHP_VERSION_ID >= 70200 && version_compare(PHP_VERSION, '7.2.0rc3', '<=')) {
+        if ($ms && \PHP_VERSION_ID >= 70200 && version_compare(PHP_VERSION, '7.2.0rc3', '<=')) {
             $this->markTestSkipped('Skipped on 7.2 before rc4 because of php bug #75354.');
         }
 
@@ -181,35 +173,32 @@ EODUMP;
 
     public function provideIntervals()
     {
-        $i = new \DateInterval('PT0S');
-        $ms = ($withMs = \PHP_VERSION_ID >= 70100 && isset($i->f)) ? '.0' : '';
-
         return array(
             array('PT0S', 0, 0, '0s', '0s'),
-            array('PT0S', 0.1, 0, $withMs ? '+ 00:00:00.100' : '0s', '%is'),
-            array('PT1S', 0, 0, '+ 00:00:01'.$ms, '%is'),
-            array('PT2M', 0, 0, '+ 00:02:00'.$ms, '%is'),
-            array('PT3H', 0, 0, '+ 03:00:00'.$ms, '%ss'),
+            array('PT0S', 0.1, 0, '+ 00:00:00.100', '%is'),
+            array('PT1S', 0, 0, '+ 00:00:01.0', '%is'),
+            array('PT2M', 0, 0, '+ 00:02:00.0', '%is'),
+            array('PT3H', 0, 0, '+ 03:00:00.0', '%ss'),
             array('P4D', 0, 0, '+ 4d', '%ss'),
             array('P5M', 0, 0, '+ 5m', null),
             array('P6Y', 0, 0, '+ 6y', null),
-            array('P1Y2M3DT4H5M6S', 0, 0, '+ 1y 2m 3d 04:05:06'.$ms, null),
-            array('PT1M60S', 0, 0, '+ 00:02:00'.$ms, null),
-            array('PT1H60M', 0, 0, '+ 02:00:00'.$ms, null),
+            array('P1Y2M3DT4H5M6S', 0, 0, '+ 1y 2m 3d 04:05:06.0', null),
+            array('PT1M60S', 0, 0, '+ 00:02:00.0', null),
+            array('PT1H60M', 0, 0, '+ 02:00:00.0', null),
             array('P1DT24H', 0, 0, '+ 2d', null),
             array('P1M32D', 0, 0, '+ 1m 32d', null),
 
             array('PT0S', 0, 1, '0s', '0s'),
-            array('PT0S', 0.1, 1, $withMs ? '- 00:00:00.100' : '0s', '%is'),
-            array('PT1S', 0, 1, '- 00:00:01'.$ms, '%is'),
-            array('PT2M', 0, 1, '- 00:02:00'.$ms, '%is'),
-            array('PT3H', 0, 1, '- 03:00:00'.$ms, '%ss'),
+            array('PT0S', 0.1, 1, '- 00:00:00.100', '%is'),
+            array('PT1S', 0, 1, '- 00:00:01.0', '%is'),
+            array('PT2M', 0, 1, '- 00:02:00.0', '%is'),
+            array('PT3H', 0, 1, '- 03:00:00.0', '%ss'),
             array('P4D', 0, 1, '- 4d', '%ss'),
             array('P5M', 0, 1, '- 5m', null),
             array('P6Y', 0, 1, '- 6y', null),
-            array('P1Y2M3DT4H5M6S', 0, 1, '- 1y 2m 3d 04:05:06'.$ms, null),
-            array('PT1M60S', 0, 1, '- 00:02:00'.$ms, null),
-            array('PT1H60M', 0, 1, '- 02:00:00'.$ms, null),
+            array('P1Y2M3DT4H5M6S', 0, 1, '- 1y 2m 3d 04:05:06.0', null),
+            array('PT1M60S', 0, 1, '- 00:02:00.0', null),
+            array('PT1H60M', 0, 1, '- 02:00:00.0', null),
             array('P1DT24H', 0, 1, '- 2d', null),
             array('P1M32D', 0, 1, '- 1m 32d', null),
         );
@@ -220,10 +209,6 @@ EODUMP;
      */
     public function testDumpTimeZone($timezone, $expected)
     {
-        if ((defined('HHVM_VERSION_ID') || PHP_VERSION_ID <= 50509) && !preg_match('/\w+\/\w+/', $timezone)) {
-            $this->markTestSkipped('DateTimeZone GMT offsets are supported since 5.5.10. See https://github.com/facebook/hhvm/issues/5875 for HHVM.');
-        }
-
         $timezone = new \DateTimeZone($timezone);
 
         $xDump = <<<EODUMP
@@ -240,10 +225,6 @@ EODUMP;
      */
     public function testDumpTimeZoneExcludingVerbosity($timezone, $expected)
     {
-        if ((defined('HHVM_VERSION_ID') || PHP_VERSION_ID <= 50509) && !preg_match('/\w+\/\w+/', $timezone)) {
-            $this->markTestSkipped('DateTimeZone GMT offsets are supported since 5.5.10. See https://github.com/facebook/hhvm/issues/5875 for HHVM.');
-        }
-
         $timezone = new \DateTimeZone($timezone);
 
         $xDump = <<<EODUMP
@@ -260,10 +241,6 @@ EODUMP;
      */
     public function testCastTimeZone($timezone, $xTimezone, $xRegion)
     {
-        if ((defined('HHVM_VERSION_ID') || PHP_VERSION_ID <= 50509) && !preg_match('/\w+\/\w+/', $timezone)) {
-            $this->markTestSkipped('DateTimeZone GMT offsets are supported since 5.5.10. See https://github.com/facebook/hhvm/issues/5875 for HHVM.');
-        }
-
         $timezone = new \DateTimeZone($timezone);
         $stub = new Stub();
 
@@ -295,7 +272,7 @@ EODUMP;
 
     public function provideTimeZones()
     {
-        $xRegion = extension_loaded('intl') ? '%s' : '';
+        $xRegion = \extension_loaded('intl') ? '%s' : '';
 
         return array(
             // type 1 (UTC offset)
@@ -325,11 +302,7 @@ EODUMP;
      */
     public function testDumpPeriod($start, $interval, $end, $options, $expected)
     {
-        if (defined('HHVM_VERSION_ID') || \PHP_VERSION_ID < 50620 || (\PHP_VERSION_ID >= 70000 && \PHP_VERSION_ID < 70005)) {
-            $this->markTestSkipped();
-        }
-
-        $p = new \DatePeriod(new \DateTime($start), new \DateInterval($interval), is_int($end) ? $end : new \DateTime($end), $options);
+        $p = new \DatePeriod(new \DateTime($start), new \DateInterval($interval), \is_int($end) ? $end : new \DateTime($end), $options);
 
         $xDump = <<<EODUMP
 DatePeriod {
@@ -345,11 +318,7 @@ EODUMP;
      */
     public function testCastPeriod($start, $interval, $end, $options, $xPeriod, $xDates)
     {
-        if (defined('HHVM_VERSION_ID') || \PHP_VERSION_ID < 50620 || (\PHP_VERSION_ID >= 70000 && \PHP_VERSION_ID < 70005)) {
-            $this->markTestSkipped();
-        }
-
-        $p = new \DatePeriod(new \DateTime($start), new \DateInterval($interval), is_int($end) ? $end : new \DateTime($end), $options);
+        $p = new \DatePeriod(new \DateTime($start), new \DateInterval($interval), \is_int($end) ? $end : new \DateTime($end), $options);
         $stub = new Stub();
 
         $cast = DateCaster::castPeriod($p, array(), $stub, false, 0);
@@ -380,9 +349,6 @@ EODUMP;
 
     public function providePeriods()
     {
-        $i = new \DateInterval('PT0S');
-        $ms = \PHP_VERSION_ID >= 70100 && isset($i->f) ? '.0' : '';
-
         $periods = array(
             array('2017-01-01', 'P1D', '2017-01-03', 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) to 2017-01-03 00:00:00.0', '1) 2017-01-01%a2) 2017-01-02'),
             array('2017-01-01', 'P1D', 1, 0, 'every + 1d, from 2017-01-01 00:00:00.0 (included) recurring 2 time/s', '1) 2017-01-01%a2) 2017-01-02'),
@@ -399,8 +365,8 @@ EODUMP;
             array('2017-01-01 01:00:00', 'P1D', '2017-01-03 01:00:00', 0, 'every + 1d, from 2017-01-01 01:00:00.0 (included) to 2017-01-03 01:00:00.0', '1) 2017-01-01 01:00:00.0%a2) 2017-01-02 01:00:00.0'),
             array('2017-01-01 01:00:00', 'P1D', 1, 0, 'every + 1d, from 2017-01-01 01:00:00.0 (included) recurring 2 time/s', '1) 2017-01-01 01:00:00.0%a2) 2017-01-02 01:00:00.0'),
 
-            array('2017-01-01', 'P1DT1H', '2017-01-03', 0, "every + 1d 01:00:00$ms, from 2017-01-01 00:00:00.0 (included) to 2017-01-03 00:00:00.0", '1) 2017-01-01 00:00:00.0%a2) 2017-01-02 01:00:00.0'),
-            array('2017-01-01', 'P1DT1H', 1, 0, "every + 1d 01:00:00$ms, from 2017-01-01 00:00:00.0 (included) recurring 2 time/s", '1) 2017-01-01 00:00:00.0%a2) 2017-01-02 01:00:00.0'),
+            array('2017-01-01', 'P1DT1H', '2017-01-03', 0, 'every + 1d 01:00:00.0, from 2017-01-01 00:00:00.0 (included) to 2017-01-03 00:00:00.0', '1) 2017-01-01 00:00:00.0%a2) 2017-01-02 01:00:00.0'),
+            array('2017-01-01', 'P1DT1H', 1, 0, 'every + 1d 01:00:00.0, from 2017-01-01 00:00:00.0 (included) recurring 2 time/s', '1) 2017-01-01 00:00:00.0%a2) 2017-01-02 01:00:00.0'),
 
             array('2017-01-01', 'P1D', '2017-01-04', \DatePeriod::EXCLUDE_START_DATE, 'every + 1d, from 2017-01-01 00:00:00.0 (excluded) to 2017-01-04 00:00:00.0', '1) 2017-01-02%a2) 2017-01-03'),
             array('2017-01-01', 'P1D', 2, \DatePeriod::EXCLUDE_START_DATE, 'every + 1d, from 2017-01-01 00:00:00.0 (excluded) recurring 2 time/s', '1) 2017-01-02%a2) 2017-01-03'),
@@ -416,9 +382,7 @@ EODUMP;
     private function createInterval($intervalSpec, $ms, $invert)
     {
         $interval = new \DateInterval($intervalSpec);
-        if (\PHP_VERSION_ID >= 70100 && isset($interval->f)) {
-            $interval->f = $ms;
-        }
+        $interval->f = $ms;
         $interval->invert = $invert;
 
         return $interval;
diff --git a/vendor/symfony/var-dumper/Tests/Caster/ExceptionCasterTest.php b/vendor/symfony/var-dumper/Tests/Caster/ExceptionCasterTest.php
index c9cc24f2..4f9b538a 100644
--- a/vendor/symfony/var-dumper/Tests/Caster/ExceptionCasterTest.php
+++ b/vendor/symfony/var-dumper/Tests/Caster/ExceptionCasterTest.php
@@ -164,16 +164,16 @@ EODUMP;
      */
     public function testFrameWithTwig()
     {
-        require_once dirname(__DIR__).'/Fixtures/Twig.php';
+        require_once \dirname(__DIR__).'/Fixtures/Twig.php';
 
         $f = array(
             new FrameStub(array(
-                'file' => dirname(__DIR__).'/Fixtures/Twig.php',
+                'file' => \dirname(__DIR__).'/Fixtures/Twig.php',
                 'line' => 20,
                 'class' => '__TwigTemplate_VarDumperFixture_u75a09',
             )),
             new FrameStub(array(
-                'file' => dirname(__DIR__).'/Fixtures/Twig.php',
+                'file' => \dirname(__DIR__).'/Fixtures/Twig.php',
                 'line' => 21,
                 'class' => '__TwigTemplate_VarDumperFixture_u75a09',
                 'object' => new \__TwigTemplate_VarDumperFixture_u75a09(null, __FILE__),
diff --git a/vendor/symfony/var-dumper/Tests/Caster/GmpCasterTest.php b/vendor/symfony/var-dumper/Tests/Caster/GmpCasterTest.php
new file mode 100644
index 00000000..1ddf8974
--- /dev/null
+++ b/vendor/symfony/var-dumper/Tests/Caster/GmpCasterTest.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Caster\GmpCaster;
+use Symfony\Component\VarDumper\Cloner\Stub;
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+
+class GmpCasterTest extends TestCase
+{
+    use VarDumperTestTrait;
+
+    /**
+     * @requires extension gmp
+     */
+    public function testCastGmp()
+    {
+        $gmpString = gmp_init('1234');
+        $gmpOctal = gmp_init(010);
+        $gmp = gmp_init('01101');
+        $gmpDump = <<<EODUMP
+array:1 [
+  "\\x00~\\x00value" => %s
+]
+EODUMP;
+        $this->assertDumpEquals(sprintf($gmpDump, $gmpString), GmpCaster::castGmp($gmpString, array(), new Stub(), false, 0));
+        $this->assertDumpEquals(sprintf($gmpDump, $gmpOctal), GmpCaster::castGmp($gmpOctal, array(), new Stub(), false, 0));
+        $this->assertDumpEquals(sprintf($gmpDump, $gmp), GmpCaster::castGmp($gmp, array(), new Stub(), false, 0));
+
+        $dump = <<<EODUMP
+GMP {
+  value: 577
+}
+EODUMP;
+
+        $this->assertDumpEquals($dump, $gmp);
+    }
+}
diff --git a/vendor/symfony/var-dumper/Tests/Caster/RedisCasterTest.php b/vendor/symfony/var-dumper/Tests/Caster/RedisCasterTest.php
index 80acdb66..f724639d 100644
--- a/vendor/symfony/var-dumper/Tests/Caster/RedisCasterTest.php
+++ b/vendor/symfony/var-dumper/Tests/Caster/RedisCasterTest.php
@@ -26,20 +26,11 @@ class RedisCasterTest extends TestCase
     {
         $redis = new \Redis();
 
-        if (defined('HHVM_VERSION_ID')) {
-            $xCast = <<<'EODUMP'
-Redis {
-  #host: ""
-%A
-}
-EODUMP;
-        } else {
-            $xCast = <<<'EODUMP'
+        $xCast = <<<'EODUMP'
 Redis {
   isConnected: false
 }
 EODUMP;
-        }
 
         $this->assertDumpMatchesFormat($xCast, $redis);
     }
@@ -52,15 +43,7 @@ EODUMP;
             self::markTestSkipped($e['message']);
         }
 
-        if (defined('HHVM_VERSION_ID')) {
-            $xCast = <<<'EODUMP'
-Redis {
-  #host: "127.0.0.1"
-%A
-}
-EODUMP;
-        } else {
-            $xCast = <<<'EODUMP'
+        $xCast = <<<'EODUMP'
 Redis {%A
   isConnected: true
   host: "127.0.0.1"
@@ -77,7 +60,6 @@ Redis {%A
   }
 }
 EODUMP;
-        }
 
         $this->assertDumpMatchesFormat($xCast, $redis);
     }
diff --git a/vendor/symfony/var-dumper/Tests/Caster/ReflectionCasterTest.php b/vendor/symfony/var-dumper/Tests/Caster/ReflectionCasterTest.php
index 71eecc1a..828fc30b 100644
--- a/vendor/symfony/var-dumper/Tests/Caster/ReflectionCasterTest.php
+++ b/vendor/symfony/var-dumper/Tests/Caster/ReflectionCasterTest.php
@@ -116,9 +116,6 @@ EOTXT
         );
     }
 
-    /**
-     * @requires PHP 7.0
-     */
     public function testReflectionParameterScalar()
     {
         $f = eval('return function (int $a) {};');
@@ -136,9 +133,6 @@ EOTXT
         );
     }
 
-    /**
-     * @requires PHP 7.0
-     */
     public function testReturnType()
     {
         $f = eval('return function ():int {};');
@@ -158,12 +152,9 @@ EOTXT
         );
     }
 
-    /**
-     * @requires PHP 7.0
-     */
     public function testGenerator()
     {
-        if (extension_loaded('xdebug')) {
+        if (\extension_loaded('xdebug')) {
             $this->markTestSkipped('xdebug is active');
         }
 
diff --git a/vendor/symfony/var-dumper/Tests/Caster/SplCasterTest.php b/vendor/symfony/var-dumper/Tests/Caster/SplCasterTest.php
index 48531562..2d7e73a9 100644
--- a/vendor/symfony/var-dumper/Tests/Caster/SplCasterTest.php
+++ b/vendor/symfony/var-dumper/Tests/Caster/SplCasterTest.php
@@ -163,4 +163,45 @@ EOTXT;
 
         $this->assertDumpMatchesFormat('%ADateTime%A', $var);
     }
+
+    public function testCastArrayObject()
+    {
+        $var = new \ArrayObject(array(123));
+        $var->foo = 234;
+
+        $expected = <<<EOTXT
+ArrayObject {
+  +"foo": 234
+  flag::STD_PROP_LIST: false
+  flag::ARRAY_AS_PROPS: false
+  iteratorClass: "ArrayIterator"
+  storage: array:1 [
+    0 => 123
+  ]
+}
+EOTXT;
+        $this->assertDumpEquals($expected, $var);
+    }
+
+    public function testArrayIterator()
+    {
+        $var = new MyArrayIterator(array(234));
+
+        $expected = <<<EOTXT
+Symfony\Component\VarDumper\Tests\Caster\MyArrayIterator {
+  -foo: 123
+  flag::STD_PROP_LIST: false
+  flag::ARRAY_AS_PROPS: false
+  storage: array:1 [
+    0 => 234
+  ]
+}
+EOTXT;
+        $this->assertDumpEquals($expected, $var);
+    }
+}
+
+class MyArrayIterator extends \ArrayIterator
+{
+    private $foo = 123;
 }
diff --git a/vendor/symfony/var-dumper/Tests/Cloner/DataTest.php b/vendor/symfony/var-dumper/Tests/Cloner/DataTest.php
index 83f6b600..d10951be 100644
--- a/vendor/symfony/var-dumper/Tests/Cloner/DataTest.php
+++ b/vendor/symfony/var-dumper/Tests/Cloner/DataTest.php
@@ -26,14 +26,14 @@ class DataTest extends TestCase
         $clonedValues = array();
 
         $this->assertInstanceOf(Data::class, $data);
-        $this->assertCount(count($values), $data);
+        $this->assertCount(\count($values), $data);
         $this->assertFalse(isset($data->{0}));
         $this->assertFalse(isset($data[0]));
 
         foreach ($data as $k => $v) {
             $this->assertTrue(isset($data->{$k}));
             $this->assertTrue(isset($data[$k]));
-            $this->assertSame(gettype($values[$k]), $data->seek($k)->getType());
+            $this->assertSame(\gettype($values[$k]), $data->seek($k)->getType());
             $this->assertSame($values[$k], $data->seek($k)->getValue());
             $this->assertSame($values[$k], $data->{$k});
             $this->assertSame($values[$k], $data[$k]);
diff --git a/vendor/symfony/var-dumper/Tests/Dumper/CliDumperTest.php b/vendor/symfony/var-dumper/Tests/Dumper/CliDumperTest.php
index 88c7f300..d25f88d1 100644
--- a/vendor/symfony/var-dumper/Tests/Dumper/CliDumperTest.php
+++ b/vendor/symfony/var-dumper/Tests/Dumper/CliDumperTest.php
@@ -48,7 +48,6 @@ class CliDumperTest extends TestCase
         $intMax = PHP_INT_MAX;
         $res = (int) $var['res'];
 
-        $r = defined('HHVM_VERSION') ? '' : '#%d';
         $this->assertStringMatchesFormat(
             <<<EOTXT
 array:24 [
@@ -76,9 +75,9 @@ array:24 [
     +foo: "foo"
     +"bar": "bar"
   }
-  "closure" => Closure {{$r}
+  "closure" => Closure {#%d
     class: "Symfony\Component\VarDumper\Tests\Dumper\CliDumperTest"
-    this: Symfony\Component\VarDumper\Tests\Dumper\CliDumperTest {{$r} …}
+    this: Symfony\Component\VarDumper\Tests\Dumper\CliDumperTest {#%d …}
     parameters: {
       \$a: {}
       &\$b: {
@@ -290,10 +289,6 @@ EOTXT
 
     public function testClosedResource()
     {
-        if (defined('HHVM_VERSION') && HHVM_VERSION_ID < 30600) {
-            $this->markTestSkipped();
-        }
-
         $var = fopen(__FILE__, 'r');
         fclose($var);
 
@@ -384,11 +379,10 @@ EOTXT
         $dumper->dump($data, $out);
         $out = stream_get_contents($out, -1, 0);
 
-        $r = defined('HHVM_VERSION') ? '' : '#%d';
         $this->assertStringMatchesFormat(
             <<<EOTXT
 stream resource {@{$ref}
-  ⚠: Symfony\Component\VarDumper\Exception\ThrowingCasterException {{$r}
+  ⚠: Symfony\Component\VarDumper\Exception\ThrowingCasterException {#%d
     #message: "Unexpected Exception thrown from a caster: Foobar"
     trace: {
       %sTwig.php:2 {
@@ -429,10 +423,9 @@ EOTXT
         $data = $cloner->cloneVar($var);
         $out = $dumper->dump($data, true);
 
-        $r = defined('HHVM_VERSION') ? '' : '#%d';
         $this->assertStringMatchesFormat(
             <<<EOTXT
-{{$r}
+{#%d
   +"foo": &1 "foo"
   +"bar": &1 "foo"
 }
@@ -446,7 +439,6 @@ EOTXT
     /**
      * @runInSeparateProcess
      * @preserveGlobalState disabled
-     * @requires PHP 5.6
      */
     public function testSpecialVars56()
     {
@@ -477,7 +469,7 @@ EOTXT
      * @runInSeparateProcess
      * @preserveGlobalState disabled
      */
-    public function testGlobalsNoExt()
+    public function testGlobals()
     {
         $var = $this->getSpecialVars();
         unset($var[0]);
@@ -491,10 +483,6 @@ EOTXT
         $dumper->setColors(false);
         $cloner = new VarCloner();
 
-        $refl = new \ReflectionProperty($cloner, 'useExt');
-        $refl->setAccessible(true);
-        $refl->setValue($cloner, false);
-
         $data = $cloner->cloneVar($var);
         $dumper->dump($data);
 
@@ -509,47 +497,6 @@ array:2 [
   2 => &1 array:1 [&1]
 ]
 
-EOTXT
-            ,
-            $out
-        );
-    }
-
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testBuggyRefs()
-    {
-        if (\PHP_VERSION_ID >= 50600) {
-            $this->markTestSkipped('PHP 5.6 fixed refs counting');
-        }
-
-        $var = $this->getSpecialVars();
-        $var = $var[0];
-
-        $dumper = new CliDumper();
-        $dumper->setColors(false);
-        $cloner = new VarCloner();
-
-        $data = $cloner->cloneVar($var)->withMaxDepth(3);
-        $out = '';
-        $dumper->dump($data, function ($line, $depth) use (&$out) {
-            if ($depth >= 0) {
-                $out .= str_repeat('  ', $depth).$line."\n";
-            }
-        });
-
-        $this->assertSame(
-            <<<'EOTXT'
-array:1 [
-  0 => array:1 [
-    0 => array:1 [
-      0 => array:1 [ …1]
-    ]
-  ]
-]
-
 EOTXT
             ,
             $out
diff --git a/vendor/symfony/var-dumper/Tests/Dumper/FunctionsTest.php b/vendor/symfony/var-dumper/Tests/Dumper/FunctionsTest.php
new file mode 100644
index 00000000..81ecdddc
--- /dev/null
+++ b/vendor/symfony/var-dumper/Tests/Dumper/FunctionsTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Dumper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\CliDumper;
+use Symfony\Component\VarDumper\VarDumper;
+
+class FunctionsTest extends TestCase
+{
+    public function testDumpReturnsFirstArg()
+    {
+        $this->setupVarDumper();
+
+        $var1 = 'a';
+
+        ob_start();
+        $return = dump($var1);
+        $out = ob_get_clean();
+
+        $this->assertEquals($var1, $return);
+    }
+
+    public function testDumpReturnsAllArgsInArray()
+    {
+        $this->setupVarDumper();
+
+        $var1 = 'a';
+        $var2 = 'b';
+        $var3 = 'c';
+
+        ob_start();
+        $return = dump($var1, $var2, $var3);
+        $out = ob_get_clean();
+
+        $this->assertEquals(array($var1, $var2, $var3), $return);
+    }
+
+    protected function setupVarDumper()
+    {
+        $cloner = new VarCloner();
+        $dumper = new CliDumper('php://output');
+        VarDumper::setHandler(function ($var) use ($cloner, $dumper) {
+            $dumper->dump($cloner->cloneVar($var));
+        });
+    }
+}
diff --git a/vendor/symfony/var-dumper/Tests/Dumper/HtmlDumperTest.php b/vendor/symfony/var-dumper/Tests/Dumper/HtmlDumperTest.php
index eac82644..ac2f8f2c 100644
--- a/vendor/symfony/var-dumper/Tests/Dumper/HtmlDumperTest.php
+++ b/vendor/symfony/var-dumper/Tests/Dumper/HtmlDumperTest.php
@@ -51,7 +51,6 @@ class HtmlDumperTest extends TestCase
         $dumpId = $dumpId[0];
         $res = (int) $var['res'];
 
-        $r = defined('HHVM_VERSION') ? '' : '<a class=sf-dump-ref>#%d</a>';
         $this->assertStringMatchesFormat(
             <<<EOTXT
 <foo></foo><bar><span class=sf-dump-note>array:24</span> [<samp>
@@ -79,10 +78,10 @@ class HtmlDumperTest extends TestCase
     +<span class=sf-dump-public title="Public property">foo</span>: "<span class=sf-dump-str title="3 characters">foo</span>"
     +"<span class=sf-dump-public title="Runtime added dynamic property">bar</span>": "<span class=sf-dump-str title="3 characters">bar</span>"
   </samp>}
-  "<span class=sf-dump-key>closure</span>" => <span class=sf-dump-note>Closure</span> {{$r}<samp>
+  "<span class=sf-dump-key>closure</span>" => <span class=sf-dump-note>Closure</span> {<a class=sf-dump-ref>#%d</a><samp>
     <span class=sf-dump-meta>class</span>: "<span class=sf-dump-str title="Symfony\Component\VarDumper\Tests\Dumper\HtmlDumperTest
 55 characters"><span class="sf-dump-ellipsis sf-dump-ellipsis-class">Symfony\Component\VarDumper\Tests\Dumper</span><span class=sf-dump-ellipsis>\</span>HtmlDumperTest</span>"
-    <span class=sf-dump-meta>this</span>: <abbr title="Symfony\Component\VarDumper\Tests\Dumper\HtmlDumperTest" class=sf-dump-note>HtmlDumperTest</abbr> {{$r} &%s;}
+    <span class=sf-dump-meta>this</span>: <abbr title="Symfony\Component\VarDumper\Tests\Dumper\HtmlDumperTest" class=sf-dump-note>HtmlDumperTest</abbr> {<a class=sf-dump-ref>#%d</a> &%s;}
     <span class=sf-dump-meta>parameters</span>: {<samp>
       <span class=sf-dump-meta>\$a</span>: {}
       <span class=sf-dump-meta>&amp;\$b</span>: {<samp>
diff --git a/vendor/symfony/var-dumper/Tests/Dumper/ServerDumperTest.php b/vendor/symfony/var-dumper/Tests/Dumper/ServerDumperTest.php
new file mode 100644
index 00000000..288391bf
--- /dev/null
+++ b/vendor/symfony/var-dumper/Tests/Dumper/ServerDumperTest.php
@@ -0,0 +1,95 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Dumper;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Process\PhpProcess;
+use Symfony\Component\Process\Process;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\ContextProvider\ContextProviderInterface;
+use Symfony\Component\VarDumper\Dumper\DataDumperInterface;
+use Symfony\Component\VarDumper\Dumper\ServerDumper;
+
+class ServerDumperTest extends TestCase
+{
+    private const VAR_DUMPER_SERVER = 'tcp://127.0.0.1:9913';
+
+    public function testDumpForwardsToWrappedDumperWhenServerIsUnavailable()
+    {
+        $wrappedDumper = $this->getMockBuilder(DataDumperInterface::class)->getMock();
+
+        $dumper = new ServerDumper(self::VAR_DUMPER_SERVER, $wrappedDumper);
+
+        $cloner = new VarCloner();
+        $data = $cloner->cloneVar('foo');
+
+        $wrappedDumper->expects($this->once())->method('dump')->with($data);
+
+        $dumper->dump($data);
+    }
+
+    public function testDump()
+    {
+        $wrappedDumper = $this->getMockBuilder(DataDumperInterface::class)->getMock();
+        $wrappedDumper->expects($this->never())->method('dump'); // test wrapped dumper is not used
+
+        $cloner = new VarCloner();
+        $data = $cloner->cloneVar('foo');
+        $dumper = new ServerDumper(self::VAR_DUMPER_SERVER, $wrappedDumper, array(
+            'foo_provider' => new class() implements ContextProviderInterface {
+                public function getContext(): ?array
+                {
+                    return array('foo');
+                }
+            },
+        ));
+
+        $dumped = null;
+        $process = $this->getServerProcess();
+        $process->start(function ($type, $buffer) use ($process, &$dumped, $dumper, $data) {
+            if (Process::ERR === $type) {
+                $process->stop();
+                $this->fail();
+            } elseif ("READY\n" === $buffer) {
+                $dumper->dump($data);
+            } else {
+                $dumped .= $buffer;
+            }
+        });
+
+        $process->wait();
+
+        $this->assertTrue($process->isSuccessful());
+        $this->assertStringMatchesFormat(<<<'DUMP'
+(3) "foo"
+[
+  "timestamp" => %d.%d
+  "foo_provider" => [
+    (3) "foo"
+  ]
+]
+%d
+DUMP
+        , $dumped);
+    }
+
+    private function getServerProcess(): Process
+    {
+        $process = new PhpProcess(file_get_contents(__DIR__.'/../Fixtures/dump_server.php'), null, array(
+            'COMPONENT_ROOT' => __DIR__.'/../../',
+            'VAR_DUMPER_SERVER' => self::VAR_DUMPER_SERVER,
+        ));
+        $process->inheritEnvironmentVariables(true);
+
+        return $process->setTimeout(9);
+    }
+}
diff --git a/vendor/symfony/var-dumper/Tests/Fixtures/dump_server.php b/vendor/symfony/var-dumper/Tests/Fixtures/dump_server.php
new file mode 100644
index 00000000..ed8bbfba
--- /dev/null
+++ b/vendor/symfony/var-dumper/Tests/Fixtures/dump_server.php
@@ -0,0 +1,38 @@
+<?php
+
+use Symfony\Component\VarDumper\Cloner\Data;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\CliDumper;
+use Symfony\Component\VarDumper\Server\DumpServer;
+use Symfony\Component\VarDumper\VarDumper;
+
+$componentRoot = $_SERVER['COMPONENT_ROOT'];
+
+if (!is_file($file = $componentRoot.'/vendor/autoload.php')) {
+    $file = $componentRoot.'/../../../../vendor/autoload.php';
+}
+
+require $file;
+
+$cloner = new VarCloner();
+$cloner->setMaxItems(-1);
+
+$dumper = new CliDumper(null, null, CliDumper::DUMP_LIGHT_ARRAY | CliDumper::DUMP_STRING_LENGTH);
+$dumper->setColors(false);
+
+VarDumper::setHandler(function ($var) use ($cloner, $dumper) {
+    $data = $cloner->cloneVar($var)->withRefHandles(false);
+    $dumper->dump($data);
+});
+
+$server = new DumpServer(getenv('VAR_DUMPER_SERVER'));
+
+$server->start();
+
+echo "READY\n";
+
+$server->listen(function (Data $data, array $context, $clientId) {
+    dump((string) $data, $context, $clientId);
+
+    exit(0);
+});
diff --git a/vendor/symfony/var-dumper/Tests/Server/ConnectionTest.php b/vendor/symfony/var-dumper/Tests/Server/ConnectionTest.php
new file mode 100644
index 00000000..eeb7495d
--- /dev/null
+++ b/vendor/symfony/var-dumper/Tests/Server/ConnectionTest.php
@@ -0,0 +1,88 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Server;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Process\PhpProcess;
+use Symfony\Component\Process\Process;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\ContextProvider\ContextProviderInterface;
+use Symfony\Component\VarDumper\Server\Connection;
+
+class ConnectionTest extends TestCase
+{
+    private const VAR_DUMPER_SERVER = 'tcp://127.0.0.1:9913';
+
+    public function testDump()
+    {
+        $cloner = new VarCloner();
+        $data = $cloner->cloneVar('foo');
+        $connection = new Connection(self::VAR_DUMPER_SERVER, array(
+            'foo_provider' => new class() implements ContextProviderInterface {
+                public function getContext(): ?array
+                {
+                    return array('foo');
+                }
+            },
+        ));
+
+        $dumped = null;
+        $process = $this->getServerProcess();
+        $process->start(function ($type, $buffer) use ($process, &$dumped, $connection, $data) {
+            if (Process::ERR === $type) {
+                $process->stop();
+                $this->fail();
+            } elseif ("READY\n" === $buffer) {
+                $connection->write($data);
+            } else {
+                $dumped .= $buffer;
+            }
+        });
+
+        $process->wait();
+
+        $this->assertTrue($process->isSuccessful());
+        $this->assertStringMatchesFormat(<<<'DUMP'
+(3) "foo"
+[
+  "timestamp" => %d.%d
+  "foo_provider" => [
+    (3) "foo"
+  ]
+]
+%d
+
+DUMP
+        , $dumped);
+    }
+
+    public function testNoServer()
+    {
+        $cloner = new VarCloner();
+        $data = $cloner->cloneVar('foo');
+        $connection = new Connection(self::VAR_DUMPER_SERVER);
+        $start = microtime(true);
+        $this->assertFalse($connection->write($data));
+        $this->assertLessThan(1, microtime(true) - $start);
+    }
+
+    private function getServerProcess(): Process
+    {
+        $process = new PhpProcess(file_get_contents(__DIR__.'/../Fixtures/dump_server.php'), null, array(
+            'COMPONENT_ROOT' => __DIR__.'/../../',
+            'VAR_DUMPER_SERVER' => self::VAR_DUMPER_SERVER,
+        ));
+        $process->inheritEnvironmentVariables(true);
+
+        return $process->setTimeout(9);
+    }
+}
diff --git a/vendor/symfony/var-dumper/Tests/Test/VarDumperTestTraitTest.php b/vendor/symfony/var-dumper/Tests/Test/VarDumperTestTraitTest.php
index 464d67f6..25ce23c5 100644
--- a/vendor/symfony/var-dumper/Tests/Test/VarDumperTestTraitTest.php
+++ b/vendor/symfony/var-dumper/Tests/Test/VarDumperTestTraitTest.php
@@ -38,4 +38,9 @@ EODUMP;
 
         $this->assertDumpEquals($expected, $data);
     }
+
+    public function testAllowsNonScalarExpectation()
+    {
+        $this->assertDumpEquals(new \ArrayObject(array('bim' => 'bam')), new \ArrayObject(array('bim' => 'bam')));
+    }
 }
diff --git a/vendor/symfony/var-dumper/VarDumper.php b/vendor/symfony/var-dumper/VarDumper.php
index 137c4747..a9ed05b3 100644
--- a/vendor/symfony/var-dumper/VarDumper.php
+++ b/vendor/symfony/var-dumper/VarDumper.php
@@ -29,13 +29,13 @@ class VarDumper
     {
         if (null === self::$handler) {
             $cloner = new VarCloner();
-            $dumper = \in_array(PHP_SAPI, array('cli', 'phpdbg'), true) ? new CliDumper() : new HtmlDumper();
+            $dumper = \in_array(\PHP_SAPI, array('cli', 'phpdbg'), true) ? new CliDumper() : new HtmlDumper();
             self::$handler = function ($var) use ($cloner, $dumper) {
                 $dumper->dump($cloner->cloneVar($var));
             };
         }
 
-        return call_user_func(self::$handler, $var);
+        return \call_user_func(self::$handler, $var);
     }
 
     public static function setHandler(callable $callable = null)
diff --git a/vendor/symfony/var-dumper/composer.json b/vendor/symfony/var-dumper/composer.json
index d31e0b49..59e92017 100644
--- a/vendor/symfony/var-dumper/composer.json
+++ b/vendor/symfony/var-dumper/composer.json
@@ -16,20 +16,23 @@
         }
     ],
     "require": {
-        "php": "^5.5.9|>=7.0.8",
-        "symfony/polyfill-mbstring": "~1.0"
+        "php": "^7.1.3",
+        "symfony/polyfill-mbstring": "~1.0",
+        "symfony/polyfill-php72": "~1.5"
     },
     "require-dev": {
         "ext-iconv": "*",
+        "symfony/process": "~3.4|~4.0",
         "twig/twig": "~1.34|~2.4"
     },
     "conflict": {
-        "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
+        "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
+        "symfony/console": "<3.4"
     },
     "suggest": {
         "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
         "ext-intl": "To show region name in time zone dump",
-        "ext-symfony_debug": ""
+        "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script"
     },
     "autoload": {
         "files": [ "Resources/functions/dump.php" ],
@@ -38,10 +41,13 @@
             "/Tests/"
         ]
     },
+    "bin": [
+        "Resources/bin/var-dump-server"
+    ],
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "3.4-dev"
+            "dev-master": "4.1-dev"
         }
     }
 }
diff --git a/vendor/vlucas/phpdotenv/composer.json b/vendor/vlucas/phpdotenv/composer.json
index 2abf464f..2db50fef 100644
--- a/vendor/vlucas/phpdotenv/composer.json
+++ b/vendor/vlucas/phpdotenv/composer.json
@@ -2,7 +2,7 @@
     "name": "vlucas/phpdotenv",
     "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
     "keywords": ["env", "dotenv", "environment"],
-    "license" : "BSD-3-Clause-Attribution",
+    "license" : "BSD-3-Clause",
     "authors" : [
         {
             "name": "Vance Lucas",
@@ -14,7 +14,7 @@
         "php": ">=5.3.9"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8 || ^5.0"
+        "phpunit/phpunit": "^4.8.35 || ^5.0"
     },
     "autoload": {
         "psr-4": {
@@ -23,7 +23,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev"
+            "dev-master": "2.5-dev"
         }
     }
 }
diff --git a/vendor/vlucas/phpdotenv/src/Dotenv.php b/vendor/vlucas/phpdotenv/src/Dotenv.php
index e77802f5..22fc0f18 100644
--- a/vendor/vlucas/phpdotenv/src/Dotenv.php
+++ b/vendor/vlucas/phpdotenv/src/Dotenv.php
@@ -2,6 +2,8 @@
 
 namespace Dotenv;
 
+use Dotenv\Exception\InvalidPathException;
+
 /**
  * This is the dotenv class.
  *
@@ -48,6 +50,21 @@ class Dotenv
         return $this->loadData();
     }
 
+    /**
+     * Load environment file in given directory, suppress InvalidPathException.
+     *
+     * @return array
+     */
+    public function safeLoad()
+    {
+        try {
+            return $this->loadData();
+        } catch (InvalidPathException $e) {
+            // suppressing exception
+            return array();
+        }
+    }
+
     /**
      * Load environment file in given directory.
      *
@@ -86,9 +103,7 @@ class Dotenv
      */
     protected function loadData($overload = false)
     {
-        $this->loader = new Loader($this->filePath, !$overload);
-
-        return $this->loader->load();
+        return $this->loader->setImmutable(!$overload)->load();
     }
 
     /**
@@ -102,4 +117,14 @@ class Dotenv
     {
         return new Validator((array) $variable, $this->loader);
     }
+
+    /**
+     * Get the list of environment variables declared inside the 'env' file.
+     *
+     * @return array
+     */
+    public function getEnvironmentVariableNames()
+    {
+        return $this->loader->variableNames;
+    }
 }
diff --git a/vendor/vlucas/phpdotenv/src/Loader.php b/vendor/vlucas/phpdotenv/src/Loader.php
index 7f11ffd9..cb3508fa 100644
--- a/vendor/vlucas/phpdotenv/src/Loader.php
+++ b/vendor/vlucas/phpdotenv/src/Loader.php
@@ -28,6 +28,13 @@ class Loader
      */
     protected $immutable;
 
+    /**
+     * The list of environment variables declared inside the 'env' file.
+     *
+     * @var array
+     */
+    public $variableNames = array();
+
     /**
      * Create a new loader instance.
      *
@@ -42,6 +49,29 @@ class Loader
         $this->immutable = $immutable;
     }
 
+    /**
+     * Set immutable value.
+     *
+     * @param bool $immutable
+     * @return $this
+     */
+    public function setImmutable($immutable = false)
+    {
+        $this->immutable = $immutable;
+
+        return $this;
+    }
+
+    /**
+     * Get immutable value.
+     *
+     * @return bool
+     */
+    public function getImmutable()
+    {
+        return $this->immutable;
+    }
+
     /**
      * Load `.env` file in given directory.
      *
@@ -92,9 +122,7 @@ class Loader
      */
     protected function normaliseEnvironmentVariable($name, $value)
     {
-        list($name, $value) = $this->splitCompoundStringIntoParts($name, $value);
-        list($name, $value) = $this->sanitiseVariableName($name, $value);
-        list($name, $value) = $this->sanitiseVariableValue($name, $value);
+        list($name, $value) = $this->processFilters($name, $value);
 
         $value = $this->resolveNestedVariables($value);
 
@@ -104,7 +132,7 @@ class Loader
     /**
      * Process the runtime filters.
      *
-     * Called from the `VariableFactory`, passed as a callback in `$this->loadFromFile()`.
+     * Called from `normaliseEnvironmentVariable` and the `VariableFactory`, passed as a callback in `$this->loadFromFile()`.
      *
      * @param string $name
      * @param string $value
@@ -147,7 +175,9 @@ class Loader
      */
     protected function isComment($line)
     {
-        return strpos(ltrim($line), '#') === 0;
+        $line = ltrim($line);
+
+        return isset($line[0]) && $line[0] === '#';
     }
 
     /**
@@ -203,16 +233,16 @@ class Loader
             $quote = $value[0];
             $regexPattern = sprintf(
                 '/^
-                %1$s          # match a quote at the start of the value
-                (             # capturing sub-pattern used
-                 (?:          # we do not need to capture this
-                  [^%1$s\\\\] # any character other than a quote or backslash
-                  |\\\\\\\\   # or two backslashes together
-                  |\\\\%1$s   # or an escaped quote e.g \"
-                 )*           # as many characters that match the previous rules
-                )             # end of the capturing sub-pattern
-                %1$s          # and the closing quote
-                .*$           # and discard any string after the closing quote
+                %1$s           # match a quote at the start of the value
+                (              # capturing sub-pattern used
+                 (?:           # we do not need to capture this
+                  [^%1$s\\\\]* # any character other than a quote or backslash
+                  |\\\\\\\\    # or two backslashes together
+                  |\\\\%1$s    # or an escaped quote e.g \"
+                 )*            # as many characters that match the previous rules
+                )              # end of the capturing sub-pattern
+                %1$s           # and the closing quote
+                .*$            # and discard any string after the closing quote
                 /mx',
                 $quote
             );
@@ -225,7 +255,12 @@ class Loader
 
             // Unquoted values cannot contain whitespace
             if (preg_match('/\s+/', $value) > 0) {
-                throw new InvalidFileException('Dotenv values containing spaces must be surrounded by quotes.');
+                // Check if value is a comment (usually triggered when empty value with comment)
+                if (preg_match('/^#/', $value) > 0) {
+                    $value = '';
+                } else {
+                    throw new InvalidFileException('Dotenv values containing spaces must be surrounded by quotes.');
+                }
             }
         }
 
@@ -235,7 +270,7 @@ class Loader
     /**
      * Resolve the nested variables.
      *
-     * Look for {$varname} patterns in the variable value and replace with an
+     * Look for ${varname} patterns in the variable value and replace with an
      * existing environment variable.
      *
      * @param string $value
@@ -247,7 +282,7 @@ class Loader
         if (strpos($value, '$') !== false) {
             $loader = $this;
             $value = preg_replace_callback(
-                '/\${([a-zA-Z0-9_]+)}/',
+                '/\${([a-zA-Z0-9_.]+)}/',
                 function ($matchedPatterns) use ($loader) {
                     $nestedVariable = $loader->getEnvironmentVariable($matchedPatterns[1]);
                     if ($nestedVariable === null) {
@@ -287,7 +322,7 @@ class Loader
      */
     protected function beginsWithAQuote($value)
     {
-        return strpbrk($value[0], '"\'') !== false;
+        return isset($value[0]) && ($value[0] === '"' || $value[0] === '\'');
     }
 
     /**
@@ -329,6 +364,8 @@ class Loader
     {
         list($name, $value) = $this->normaliseEnvironmentVariable($name, $value);
 
+        $this->variableNames[] = $name;
+
         // Don't overwrite existing environment variables if we're immutable
         // Ruby's dotenv does this with `ENV[key] ||= value`.
         if ($this->immutable && $this->getEnvironmentVariable($name) !== null) {
diff --git a/vendor/vlucas/phpdotenv/src/Validator.php b/vendor/vlucas/phpdotenv/src/Validator.php
index aa3cb0e4..53a7fd5a 100644
--- a/vendor/vlucas/phpdotenv/src/Validator.php
+++ b/vendor/vlucas/phpdotenv/src/Validator.php
@@ -77,6 +77,25 @@ class Validator
         );
     }
 
+    /**
+     * Assert that each specified variable is a boolean.
+     *
+     * @return \Dotenv\Validator
+     */
+    public function isBoolean()
+    {
+        return $this->assertCallback(
+            function ($value) {
+                if ($value === '') {
+                    return false;
+                }
+
+                return (filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) !== NULL);
+            },
+            'is not a boolean'
+        );
+    }
+
     /**
      * Assert that each variable is amongst the given choices.
      *